1408 files changed, 59660 insertions, 24591 deletions

diff --git a/Documentation/ABI/testing/sysfs-devices-memory b/Documentation/ABI/testing/sysfs-devices-memory
index 9fe91c02ee40..bf1627b02a03 100644
--- a/Documentation/ABI/testing/sysfs-devices-memory
+++ b/Documentation/ABI/testing/sysfs-devices-memory
@@ -60,6 +60,19 @@ Description:
 Users:          hotplug memory remove tools
                 https://w3.opensource.ibm.com/projects/powerpc-utils/
 
+
+What:           /sys/devices/system/memoryX/nodeY
+Date:           October 2009
+Contact:        Linux Memory Management list <linux-mm@kvack.org>
+Description:
+                When CONFIG_NUMA is enabled, a symbolic link that
+                points to the corresponding NUMA node directory.
+
+                For example, the following symbolic link is created for
+                memory section 9 on node0:
+                /sys/devices/system/memory/memory9/node0 -> ../../node/node0
+
+
 What:           /sys/devices/system/node/nodeX/memoryY
 Date:           September 2008
 Contact:        Gary Hade <garyhade@us.ibm.com>
@@ -70,4 +83,3 @@ Description:
                 memory section directory.  For example, the following symbolic
                 link is created for memory section 9 on node0.
                 /sys/devices/system/node/node0/memory9 -> ../../memory/memory9
-
diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu
index 2aae06fcbed7..84a710f87c64 100644
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
@@ -92,6 +92,20 @@ Description:	Discover NUMA node a CPU belongs to
                 /sys/devices/system/cpu/cpu42/node2 -> ../../node/node2
 
 
+What:           /sys/devices/system/cpu/cpu#/node
+Date:           October 2009
+Contact:        Linux memory management mailing list <linux-mm@kvack.org>
+Description:    Discover NUMA node a CPU belongs to
+
+                When CONFIG_NUMA is enabled, a symbolic link that points
+                to the corresponding NUMA node directory.
+
+                For example, the following symlink is created for cpu42
+                in NUMA node 2:
+
+                /sys/devices/system/cpu/cpu42/node2 -> ../../node/node2
+
+
 What:           /sys/devices/system/cpu/cpu#/topology/core_id
                 /sys/devices/system/cpu/cpu#/topology/core_siblings
                 /sys/devices/system/cpu/cpu#/topology/core_siblings_list
diff --git a/Documentation/Changes b/Documentation/Changes
index 6d0f1efc5bf6..f08b313cd235 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -49,6 +49,8 @@ o  oprofile               0.9                     # oprofiled --version
 o  udev                   081                     # udevinfo -V
 o  grub                   0.93                    # grub --version
 o  mcelog                 0.6
+o  iptables               1.4.1                   # iptables -V
+
 
 Kernel compilation
 ==================
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index ab8300f67182..325cfd1d6d99 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -8,7 +8,7 @@
 
 DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
             kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
-            procfs-guide.xml writing_usb_driver.xml networking.xml \
+            writing_usb_driver.xml networking.xml \
             kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
             gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
             genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
@@ -32,10 +32,10 @@ PS_METHOD	= $(prefer-db2x)
 
 ###
 # The targets that may be used.
-PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs media
+PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs xmldoclinks
 
 BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
-xmldocs: $(BOOKS)
+xmldocs: $(BOOKS) xmldoclinks
 sgmldocs: xmldocs
 
 PS := $(patsubst %.xml, %.ps, $(BOOKS))
@@ -45,15 +45,24 @@ PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
 pdfdocs: $(PDF)
 
 HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
-htmldocs: media $(HTML)
+htmldocs: $(HTML)
         $(call build_main_index)
+        $(call build_images)
 
 MAN := $(patsubst %.xml, %.9, $(BOOKS))
 mandocs: $(MAN)
 
-media:
-        mkdir -p $(srctree)/Documentation/DocBook/media/
-        cp $(srctree)/Documentation/DocBook/dvb/*.png $(srctree)/Documentation/DocBook/v4l/*.gif $(srctree)/Documentation/DocBook/media/
+build_images = mkdir -p $(objtree)/Documentation/DocBook/media/ && \
+               cp $(srctree)/Documentation/DocBook/dvb/*.png $(srctree)/Documentation/DocBook/v4l/*.gif $(objtree)/Documentation/DocBook/media/
+
+xmldoclinks:
+ifneq ($(objtree),$(srctree))
+        for dep in dvb media-entities.tmpl media-indices.tmpl v4l; do \
+                rm -f $(objtree)/Documentation/DocBook/$$dep \
+                && ln -s $(srctree)/Documentation/DocBook/$$dep $(objtree)/Documentation/DocBook/ \
+                || exit; \
+        done
+endif
 
 installmandocs: mandocs
         mkdir -p /usr/local/man/man9/
@@ -65,7 +74,7 @@ KERNELDOC = $(srctree)/scripts/kernel-doc
 DOCPROC   = $(objtree)/scripts/basic/docproc
 
 XMLTOFLAGS = -m $(srctree)/Documentation/DocBook/stylesheet.xsl
-#XMLTOFLAGS += --skip-validation
+XMLTOFLAGS += --skip-validation
 
 ###
 # DOCPROC is used for two purposes:
@@ -101,17 +110,6 @@ endif
 # Changes in kernel-doc force a rebuild of all documentation
 $(BOOKS): $(KERNELDOC)
 
-###
-# procfs guide uses a .c file as example code.
-# This requires an explicit dependency
-C-procfs-example = procfs_example.xml
-C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))
-$(obj)/procfs-guide.xml: $(C-procfs-example2)
-
-# List of programs to build
-##oops, this is a kernel module::hostprogs-y := procfs_example
-obj-m += procfs_example.o
-
 # Tell kbuild to always build the programs
 always := $(hostprogs-y)
 
@@ -238,7 +236,7 @@ clean-files := $(DOCBOOKS) \
         $(patsubst %.xml, %.pdf,  $(DOCBOOKS)) \
         $(patsubst %.xml, %.html, $(DOCBOOKS)) \
         $(patsubst %.xml, %.9,    $(DOCBOOKS)) \
-        $(C-procfs-example) $(index)
+        $(index)
 
 clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
 
diff --git a/Documentation/DocBook/media-entities.tmpl b/Documentation/DocBook/media-entities.tmpl
index bb5ab741220e..c725cb852c54 100644
--- a/Documentation/DocBook/media-entities.tmpl
+++ b/Documentation/DocBook/media-entities.tmpl
@@ -23,6 +23,7 @@
 <!ENTITY VIDIOC-ENUMINPUT "<link linkend='vidioc-enuminput'><constant>VIDIOC_ENUMINPUT</constant></link>">
 <!ENTITY VIDIOC-ENUMOUTPUT "<link linkend='vidioc-enumoutput'><constant>VIDIOC_ENUMOUTPUT</constant></link>">
 <!ENTITY VIDIOC-ENUMSTD "<link linkend='vidioc-enumstd'><constant>VIDIOC_ENUMSTD</constant></link>">
+<!ENTITY VIDIOC-ENUM-DV-PRESETS "<link linkend='vidioc-enum-dv-presets'><constant>VIDIOC_ENUM_DV_PRESETS</constant></link>">
 <!ENTITY VIDIOC-ENUM-FMT "<link linkend='vidioc-enum-fmt'><constant>VIDIOC_ENUM_FMT</constant></link>">
 <!ENTITY VIDIOC-ENUM-FRAMEINTERVALS "<link linkend='vidioc-enum-frameintervals'><constant>VIDIOC_ENUM_FRAMEINTERVALS</constant></link>">
 <!ENTITY VIDIOC-ENUM-FRAMESIZES "<link linkend='vidioc-enum-framesizes'><constant>VIDIOC_ENUM_FRAMESIZES</constant></link>">
@@ -30,6 +31,8 @@
 <!ENTITY VIDIOC-G-AUDOUT "<link linkend='vidioc-g-audioout'><constant>VIDIOC_G_AUDOUT</constant></link>">
 <!ENTITY VIDIOC-G-CROP "<link linkend='vidioc-g-crop'><constant>VIDIOC_G_CROP</constant></link>">
 <!ENTITY VIDIOC-G-CTRL "<link linkend='vidioc-g-ctrl'><constant>VIDIOC_G_CTRL</constant></link>">
+<!ENTITY VIDIOC-G-DV-PRESET "<link linkend='vidioc-g-dv-preset'><constant>VIDIOC_G_DV_PRESET</constant></link>">
+<!ENTITY VIDIOC-G-DV-TIMINGS "<link linkend='vidioc-g-dv-timings'><constant>VIDIOC_G_DV_TIMINGS</constant></link>">
 <!ENTITY VIDIOC-G-ENC-INDEX "<link linkend='vidioc-g-enc-index'><constant>VIDIOC_G_ENC_INDEX</constant></link>">
 <!ENTITY VIDIOC-G-EXT-CTRLS "<link linkend='vidioc-g-ext-ctrls'><constant>VIDIOC_G_EXT_CTRLS</constant></link>">
 <!ENTITY VIDIOC-G-FBUF "<link linkend='vidioc-g-fbuf'><constant>VIDIOC_G_FBUF</constant></link>">
@@ -53,6 +56,7 @@
 <!ENTITY VIDIOC-QUERYCTRL "<link linkend='vidioc-queryctrl'><constant>VIDIOC_QUERYCTRL</constant></link>">
 <!ENTITY VIDIOC-QUERYMENU "<link linkend='vidioc-queryctrl'><constant>VIDIOC_QUERYMENU</constant></link>">
 <!ENTITY VIDIOC-QUERYSTD "<link linkend='vidioc-querystd'><constant>VIDIOC_QUERYSTD</constant></link>">
+<!ENTITY VIDIOC-QUERY-DV-PRESET "<link linkend='vidioc-query-dv-preset'><constant>VIDIOC_QUERY_DV_PRESET</constant></link>">
 <!ENTITY VIDIOC-REQBUFS "<link linkend='vidioc-reqbufs'><constant>VIDIOC_REQBUFS</constant></link>">
 <!ENTITY VIDIOC-STREAMOFF "<link linkend='vidioc-streamon'><constant>VIDIOC_STREAMOFF</constant></link>">
 <!ENTITY VIDIOC-STREAMON "<link linkend='vidioc-streamon'><constant>VIDIOC_STREAMON</constant></link>">
@@ -60,6 +64,8 @@
 <!ENTITY VIDIOC-S-AUDOUT "<link linkend='vidioc-g-audioout'><constant>VIDIOC_S_AUDOUT</constant></link>">
 <!ENTITY VIDIOC-S-CROP "<link linkend='vidioc-g-crop'><constant>VIDIOC_S_CROP</constant></link>">
 <!ENTITY VIDIOC-S-CTRL "<link linkend='vidioc-g-ctrl'><constant>VIDIOC_S_CTRL</constant></link>">
+<!ENTITY VIDIOC-S-DV-PRESET "<link linkend='vidioc-g-dv-preset'><constant>VIDIOC_S_DV_PRESET</constant></link>">
+<!ENTITY VIDIOC-S-DV-TIMINGS "<link linkend='vidioc-g-dv-timings'><constant>VIDIOC_S_DV_TIMINGS</constant></link>">
 <!ENTITY VIDIOC-S-EXT-CTRLS "<link linkend='vidioc-g-ext-ctrls'><constant>VIDIOC_S_EXT_CTRLS</constant></link>">
 <!ENTITY VIDIOC-S-FBUF "<link linkend='vidioc-g-fbuf'><constant>VIDIOC_S_FBUF</constant></link>">
 <!ENTITY VIDIOC-S-FMT "<link linkend='vidioc-g-fmt'><constant>VIDIOC_S_FMT</constant></link>">
@@ -118,6 +124,7 @@
 <!-- Structures -->
 <!ENTITY v4l2-audio "struct&nbsp;<link linkend='v4l2-audio'>v4l2_audio</link>">
 <!ENTITY v4l2-audioout "struct&nbsp;<link linkend='v4l2-audioout'>v4l2_audioout</link>">
+<!ENTITY v4l2-bt-timings "struct&nbsp;<link linkend='v4l2-bt-timings'>v4l2_bt_timings</link>">
 <!ENTITY v4l2-buffer "struct&nbsp;<link linkend='v4l2-buffer'>v4l2_buffer</link>">
 <!ENTITY v4l2-capability "struct&nbsp;<link linkend='v4l2-capability'>v4l2_capability</link>">
 <!ENTITY v4l2-captureparm "struct&nbsp;<link linkend='v4l2-captureparm'>v4l2_captureparm</link>">
@@ -128,6 +135,9 @@
 <!ENTITY v4l2-dbg-chip-ident "struct&nbsp;<link linkend='v4l2-dbg-chip-ident'>v4l2_dbg_chip_ident</link>">
 <!ENTITY v4l2-dbg-match "struct&nbsp;<link linkend='v4l2-dbg-match'>v4l2_dbg_match</link>">
 <!ENTITY v4l2-dbg-register "struct&nbsp;<link linkend='v4l2-dbg-register'>v4l2_dbg_register</link>">
+<!ENTITY v4l2-dv-enum-preset "struct&nbsp;<link linkend='v4l2-dv-enum-preset'>v4l2_dv_enum_preset</link>">
+<!ENTITY v4l2-dv-preset "struct&nbsp;<link linkend='v4l2-dv-preset'>v4l2_dv_preset</link>">
+<!ENTITY v4l2-dv-timings "struct&nbsp;<link linkend='v4l2-dv-timings'>v4l2_dv_timings</link>">
 <!ENTITY v4l2-enc-idx "struct&nbsp;<link linkend='v4l2-enc-idx'>v4l2_enc_idx</link>">
 <!ENTITY v4l2-enc-idx-entry "struct&nbsp;<link linkend='v4l2-enc-idx-entry'>v4l2_enc_idx_entry</link>">
 <!ENTITY v4l2-encoder-cmd "struct&nbsp;<link linkend='v4l2-encoder-cmd'>v4l2_encoder_cmd</link>">
@@ -243,6 +253,10 @@
 <!ENTITY sub-enumaudioout SYSTEM "v4l/vidioc-enumaudioout.xml">
 <!ENTITY sub-enuminput SYSTEM "v4l/vidioc-enuminput.xml">
 <!ENTITY sub-enumoutput SYSTEM "v4l/vidioc-enumoutput.xml">
+<!ENTITY sub-enum-dv-presets SYSTEM "v4l/vidioc-enum-dv-presets.xml">
+<!ENTITY sub-g-dv-preset SYSTEM "v4l/vidioc-g-dv-preset.xml">
+<!ENTITY sub-query-dv-preset SYSTEM "v4l/vidioc-query-dv-preset.xml">
+<!ENTITY sub-g-dv-timings SYSTEM "v4l/vidioc-g-dv-timings.xml">
 <!ENTITY sub-enumstd SYSTEM "v4l/vidioc-enumstd.xml">
 <!ENTITY sub-g-audio SYSTEM "v4l/vidioc-g-audio.xml">
 <!ENTITY sub-g-audioout SYSTEM "v4l/vidioc-g-audioout.xml">
@@ -333,6 +347,10 @@
 <!ENTITY enumaudioout SYSTEM "v4l/vidioc-enumaudioout.xml">
 <!ENTITY enuminput SYSTEM "v4l/vidioc-enuminput.xml">
 <!ENTITY enumoutput SYSTEM "v4l/vidioc-enumoutput.xml">
+<!ENTITY enum-dv-presets SYSTEM "v4l/vidioc-enum-dv-presets.xml">
+<!ENTITY g-dv-preset SYSTEM "v4l/vidioc-g-dv-preset.xml">
+<!ENTITY query-dv-preset SYSTEM "v4l/vidioc-query-dv-preset.xml">
+<!ENTITY g-dv-timings SYSTEM "v4l/vidioc-g-dv-timings.xml">
 <!ENTITY enumstd SYSTEM "v4l/vidioc-enumstd.xml">
 <!ENTITY g-audio SYSTEM "v4l/vidioc-g-audio.xml">
 <!ENTITY g-audioout SYSTEM "v4l/vidioc-g-audioout.xml">
diff --git a/Documentation/DocBook/media-indices.tmpl b/Documentation/DocBook/media-indices.tmpl
index 9e30a236d74f..78d6031de001 100644
--- a/Documentation/DocBook/media-indices.tmpl
+++ b/Documentation/DocBook/media-indices.tmpl
@@ -36,6 +36,7 @@
 <indexentry><primaryie>enum&nbsp;<link linkend='v4l2-preemphasis'>v4l2_preemphasis</link></primaryie></indexentry>
 <indexentry><primaryie>struct&nbsp;<link linkend='v4l2-audio'>v4l2_audio</link></primaryie></indexentry>
 <indexentry><primaryie>struct&nbsp;<link linkend='v4l2-audioout'>v4l2_audioout</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-bt-timings'>v4l2_bt_timings</link></primaryie></indexentry>
 <indexentry><primaryie>struct&nbsp;<link linkend='v4l2-buffer'>v4l2_buffer</link></primaryie></indexentry>
 <indexentry><primaryie>struct&nbsp;<link linkend='v4l2-capability'>v4l2_capability</link></primaryie></indexentry>
 <indexentry><primaryie>struct&nbsp;<link linkend='v4l2-captureparm'>v4l2_captureparm</link></primaryie></indexentry>
@@ -46,6 +47,9 @@
 <indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dbg-chip-ident'>v4l2_dbg_chip_ident</link></primaryie></indexentry>
 <indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dbg-match'>v4l2_dbg_match</link></primaryie></indexentry>
 <indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dbg-register'>v4l2_dbg_register</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dv-enum-preset'>v4l2_dv_enum_preset</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dv-preset'>v4l2_dv_preset</link></primaryie></indexentry>
+<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dv-timings'>v4l2_dv_timings</link></primaryie></indexentry>
 <indexentry><primaryie>struct&nbsp;<link linkend='v4l2-enc-idx'>v4l2_enc_idx</link></primaryie></indexentry>
 <indexentry><primaryie>struct&nbsp;<link linkend='v4l2-enc-idx-entry'>v4l2_enc_idx_entry</link></primaryie></indexentry>
 <indexentry><primaryie>struct&nbsp;<link linkend='v4l2-encoder-cmd'>v4l2_encoder_cmd</link></primaryie></indexentry>
diff --git a/Documentation/DocBook/procfs-guide.tmpl b/Documentation/DocBook/procfs-guide.tmpl
deleted file mode 100644
index 9eba4b7af73d..000000000000
--- a/Documentation/DocBook/procfs-guide.tmpl
+++ /dev/null
@@ -1,626 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY procfsexample SYSTEM "procfs_example.xml">
-]>
-
-<book id="LKProcfsGuide">
-  <bookinfo>
-    <title>Linux Kernel Procfs Guide</title>
-
-    <authorgroup>
-      <author>
-        <firstname>Erik</firstname>
-        <othername>(J.A.K.)</othername>
-        <surname>Mouw</surname>
-        <affiliation>
-          <address>
-            <email>mouw@nl.linux.org</email>
-          </address>
-        </affiliation>
-      </author>
-      <othercredit>
-        <contrib>
-        This software and documentation were written while working on the
-        LART computing board
-        (<ulink url="http://www.lartmaker.nl/">http://www.lartmaker.nl/</ulink>),
-        which was sponsored by the Delt University of Technology projects
-        Mobile Multi-media Communications and Ubiquitous Communications.
-        </contrib>
-      </othercredit>
-    </authorgroup>
-
-    <revhistory>
-      <revision>
-        <revnumber>1.0</revnumber>
-        <date>May 30, 2001</date>
-        <revremark>Initial revision posted to linux-kernel</revremark>
-      </revision>
-      <revision>
-        <revnumber>1.1</revnumber>
-        <date>June 3, 2001</date>
-        <revremark>Revised after comments from linux-kernel</revremark>
-      </revision>
-    </revhistory>
-
-    <copyright>
-      <year>2001</year>
-      <holder>Erik Mouw</holder>
-    </copyright>
-
-
-    <legalnotice>
-      <para>
-        This documentation 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.
-      </para>
-      
-      <para>
-        This documentation 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.
-      </para>
-      
-      <para>
-        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
-      </para>
-      
-      <para>
-        For more details see the file COPYING in the source
-        distribution of Linux.
-      </para>
-    </legalnotice>
-  </bookinfo>
-
-
-
-
-  <toc>
-  </toc>
-
-
-
-
-  <preface id="Preface">
-    <title>Preface</title>
-
-    <para>
-      This guide describes the use of the procfs file system from
-      within the Linux kernel. The idea to write this guide came up on
-      the #kernelnewbies IRC channel (see <ulink
-      url="http://www.kernelnewbies.org/">http://www.kernelnewbies.org/</ulink>),
-      when Jeff Garzik explained the use of procfs and forwarded me a
-      message Alexander Viro wrote to the linux-kernel mailing list. I
-      agreed to write it up nicely, so here it is.
-    </para>
-
-    <para>
-      I'd like to thank Jeff Garzik
-      <email>jgarzik@pobox.com</email> and Alexander Viro
-      <email>viro@parcelfarce.linux.theplanet.co.uk</email> for their input,
-      Tim Waugh <email>twaugh@redhat.com</email> for his <ulink
-      url="http://people.redhat.com/twaugh/docbook/selfdocbook/">Selfdocbook</ulink>,
-      and Marc Joosen <email>marcj@historia.et.tudelft.nl</email> for
-      proofreading.
-    </para>
-
-    <para>
-      Erik
-    </para>
-  </preface>
-
-
-
-
-  <chapter id="intro">
-    <title>Introduction</title>
-
-    <para>
-      The <filename class="directory">/proc</filename> file system
-      (procfs) is a special file system in the linux kernel. It's a
-      virtual file system: it is not associated with a block device
-      but exists only in memory. The files in the procfs are there to
-      allow userland programs access to certain information from the
-      kernel (like process information in <filename
-      class="directory">/proc/[0-9]+/</filename>), but also for debug
-      purposes (like <filename>/proc/ksyms</filename>).
-    </para>
-
-    <para>
-      This guide describes the use of the procfs file system from
-      within the Linux kernel. It starts by introducing all relevant
-      functions to manage the files within the file system. After that
-      it shows how to communicate with userland, and some tips and
-      tricks will be pointed out. Finally a complete example will be
-      shown.
-    </para>
-
-    <para>
-      Note that the files in <filename
-      class="directory">/proc/sys</filename> are sysctl files: they
-      don't belong to procfs and are governed by a completely
-      different API described in the Kernel API book.
-    </para>
-  </chapter>
-
-
-
-
-  <chapter id="managing">
-    <title>Managing procfs entries</title>
-    
-    <para>
-      This chapter describes the functions that various kernel
-      components use to populate the procfs with files, symlinks,
-      device nodes, and directories.
-    </para>
-
-    <para>
-      A minor note before we start: if you want to use any of the
-      procfs functions, be sure to include the correct header file! 
-      This should be one of the first lines in your code:
-    </para>
-
-    <programlisting>
-#include &lt;linux/proc_fs.h&gt;
-    </programlisting>
-
-
-
-
-    <sect1 id="regularfile">
-      <title>Creating a regular file</title>
-      
-      <funcsynopsis>
-        <funcprototype>
-          <funcdef>struct proc_dir_entry* <function>create_proc_entry</function></funcdef>
-          <paramdef>const char* <parameter>name</parameter></paramdef>
-          <paramdef>mode_t <parameter>mode</parameter></paramdef>
-          <paramdef>struct proc_dir_entry* <parameter>parent</parameter></paramdef>
-        </funcprototype>
-      </funcsynopsis>
-
-      <para>
-        This function creates a regular file with the name
-        <parameter>name</parameter>, file mode
-        <parameter>mode</parameter> in the directory
-        <parameter>parent</parameter>. To create a file in the root of
-        the procfs, use <constant>NULL</constant> as
-        <parameter>parent</parameter> parameter. When successful, the
-        function will return a pointer to the freshly created
-        <structname>struct proc_dir_entry</structname>; otherwise it
-        will return <constant>NULL</constant>. <xref
-        linkend="userland"/> describes how to do something useful with
-        regular files.
-      </para>
-
-      <para>
-        Note that it is specifically supported that you can pass a
-        path that spans multiple directories. For example
-        <function>create_proc_entry</function>(<parameter>"drivers/via0/info"</parameter>)
-        will create the <filename class="directory">via0</filename>
-        directory if necessary, with standard
-        <constant>0755</constant> permissions.
-      </para>
-
-    <para>
-      If you only want to be able to read the file, the function
-      <function>create_proc_read_entry</function> described in <xref
-      linkend="convenience"/> may be used to create and initialise
-      the procfs entry in one single call.
-    </para>
-    </sect1>
-
-
-
-
-    <sect1 id="Creating_a_symlink">
-      <title>Creating a symlink</title>
-
-      <funcsynopsis>
-        <funcprototype>
-          <funcdef>struct proc_dir_entry*
-          <function>proc_symlink</function></funcdef> <paramdef>const
-          char* <parameter>name</parameter></paramdef>
-          <paramdef>struct proc_dir_entry*
-          <parameter>parent</parameter></paramdef> <paramdef>const
-          char* <parameter>dest</parameter></paramdef>
-        </funcprototype>
-      </funcsynopsis>
-      
-      <para>
-        This creates a symlink in the procfs directory
-        <parameter>parent</parameter> that points from
-        <parameter>name</parameter> to
-        <parameter>dest</parameter>. This translates in userland to
-        <literal>ln -s</literal> <parameter>dest</parameter>
-        <parameter>name</parameter>.
-      </para>
-    </sect1>
-
-    <sect1 id="Creating_a_directory">
-      <title>Creating a directory</title>
-      
-      <funcsynopsis>
-        <funcprototype>
-          <funcdef>struct proc_dir_entry* <function>proc_mkdir</function></funcdef>
-          <paramdef>const char* <parameter>name</parameter></paramdef>
-          <paramdef>struct proc_dir_entry* <parameter>parent</parameter></paramdef>
-        </funcprototype>
-      </funcsynopsis>
-
-      <para>
-        Create a directory <parameter>name</parameter> in the procfs
-        directory <parameter>parent</parameter>.
-      </para>
-    </sect1>
-
-
-
-
-    <sect1 id="Removing_an_entry">
-      <title>Removing an entry</title>
-      
-      <funcsynopsis>
-        <funcprototype>
-          <funcdef>void <function>remove_proc_entry</function></funcdef>
-          <paramdef>const char* <parameter>name</parameter></paramdef>
-          <paramdef>struct proc_dir_entry* <parameter>parent</parameter></paramdef>
-        </funcprototype>
-      </funcsynopsis>
-
-      <para>
-        Removes the entry <parameter>name</parameter> in the directory
-        <parameter>parent</parameter> from the procfs. Entries are
-        removed by their <emphasis>name</emphasis>, not by the
-        <structname>struct proc_dir_entry</structname> returned by the
-        various create functions. Note that this function doesn't
-        recursively remove entries.
-      </para>
-
-      <para>
-        Be sure to free the <structfield>data</structfield> entry from
-        the <structname>struct proc_dir_entry</structname> before
-        <function>remove_proc_entry</function> is called (that is: if
-        there was some <structfield>data</structfield> allocated, of
-        course). See <xref linkend="usingdata"/> for more information
-        on using the <structfield>data</structfield> entry.
-      </para>
-    </sect1>
-  </chapter>
-
-
-
-
-  <chapter id="userland">
-    <title>Communicating with userland</title>
-    
-    <para>
-       Instead of reading (or writing) information directly from
-       kernel memory, procfs works with <emphasis>call back
-       functions</emphasis> for files: functions that are called when
-       a specific file is being read or written. Such functions have
-       to be initialised after the procfs file is created by setting
-       the <structfield>read_proc</structfield> and/or
-       <structfield>write_proc</structfield> fields in the
-       <structname>struct proc_dir_entry*</structname> that the
-       function <function>create_proc_entry</function> returned:
-    </para>
-
-    <programlisting>
-struct proc_dir_entry* entry;
-
-entry->read_proc = read_proc_foo;
-entry->write_proc = write_proc_foo;
-    </programlisting>
-
-    <para>
-      If you only want to use a the
-      <structfield>read_proc</structfield>, the function
-      <function>create_proc_read_entry</function> described in <xref
-      linkend="convenience"/> may be used to create and initialise the
-      procfs entry in one single call.
-    </para>
-
-
-
-    <sect1 id="Reading_data">
-      <title>Reading data</title>
-
-      <para>
-        The read function is a call back function that allows userland
-        processes to read data from the kernel. The read function
-        should have the following format:
-      </para>
-
-      <funcsynopsis>
-        <funcprototype>
-          <funcdef>int <function>read_func</function></funcdef>
-          <paramdef>char* <parameter>buffer</parameter></paramdef>
-          <paramdef>char** <parameter>start</parameter></paramdef>
-          <paramdef>off_t <parameter>off</parameter></paramdef>
-          <paramdef>int <parameter>count</parameter></paramdef>
-          <paramdef>int* <parameter>peof</parameter></paramdef>
-          <paramdef>void* <parameter>data</parameter></paramdef>
-        </funcprototype>
-      </funcsynopsis>
-
-      <para>
-        The read function should write its information into the
-        <parameter>buffer</parameter>, which will be exactly
-        <literal>PAGE_SIZE</literal> bytes long.
-      </para>
-
-      <para>
-        The parameter
-        <parameter>peof</parameter> should be used to signal that the
-        end of the file has been reached by writing
-        <literal>1</literal> to the memory location
-        <parameter>peof</parameter> points to.
-      </para>
-
-      <para>
-        The <parameter>data</parameter>
-        parameter can be used to create a single call back function for
-        several files, see <xref linkend="usingdata"/>.
-      </para>
-
-      <para>
-        The rest of the parameters and the return value are described
-        by a comment in <filename>fs/proc/generic.c</filename> as follows:
-      </para>
-
-      <blockquote>
-        <para>
-        You have three ways to return data:
-        </para>
-        <orderedlist>
-          <listitem>
-            <para>
-              Leave <literal>*start = NULL</literal>.  (This is the default.)
-              Put the data of the requested offset at that
-              offset within the buffer.  Return the number (<literal>n</literal>)
-              of bytes there are from the beginning of the
-              buffer up to the last byte of data.  If the
-              number of supplied bytes (<literal>= n - offset</literal>) is
-              greater than zero and you didn't signal eof
-              and the reader is prepared to take more data
-              you will be called again with the requested
-              offset advanced by the number of bytes
-              absorbed.  This interface is useful for files
-              no larger than the buffer.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Set <literal>*start</literal> to an unsigned long value less than
-              the buffer address but greater than zero.
-              Put the data of the requested offset at the
-              beginning of the buffer.  Return the number of
-              bytes of data placed there.  If this number is
-              greater than zero and you didn't signal eof
-              and the reader is prepared to take more data
-              you will be called again with the requested
-              offset advanced by <literal>*start</literal>.  This interface is
-              useful when you have a large file consisting
-              of a series of blocks which you want to count
-              and return as wholes.
-              (Hack by Paul.Russell@rustcorp.com.au)
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Set <literal>*start</literal> to an address within the buffer.
-              Put the data of the requested offset at <literal>*start</literal>.
-              Return the number of bytes of data placed there.
-              If this number is greater than zero and you
-              didn't signal eof and the reader is prepared to
-              take more data you will be called again with the
-              requested offset advanced by the number of bytes
-              absorbed.
-            </para>
-          </listitem>
-        </orderedlist>
-      </blockquote>
-
-      <para>
-        <xref linkend="example"/> shows how to use a read call back
-        function.
-      </para>
-    </sect1>
-
-
-
-
-    <sect1 id="Writing_data">
-      <title>Writing data</title>
-
-      <para>
-        The write call back function allows a userland process to write
-        data to the kernel, so it has some kind of control over the
-        kernel. The write function should have the following format:
-      </para>
-
-      <funcsynopsis>
-        <funcprototype>
-          <funcdef>int <function>write_func</function></funcdef>
-          <paramdef>struct file* <parameter>file</parameter></paramdef>
-          <paramdef>const char* <parameter>buffer</parameter></paramdef>
-          <paramdef>unsigned long <parameter>count</parameter></paramdef>
-          <paramdef>void* <parameter>data</parameter></paramdef>
-        </funcprototype>
-      </funcsynopsis>
-
-      <para>
-        The write function should read <parameter>count</parameter>
-        bytes at maximum from the <parameter>buffer</parameter>. Note
-        that the <parameter>buffer</parameter> doesn't live in the
-        kernel's memory space, so it should first be copied to kernel
-        space with <function>copy_from_user</function>. The
-        <parameter>file</parameter> parameter is usually
-        ignored. <xref linkend="usingdata"/> shows how to use the
-        <parameter>data</parameter> parameter.
-      </para>
-
-      <para>
-        Again, <xref linkend="example"/> shows how to use this call back
-        function.
-      </para>
-    </sect1>
-
-
-
-
-    <sect1 id="usingdata">
-      <title>A single call back for many files</title>
-
-      <para>
-         When a large number of almost identical files is used, it's
-         quite inconvenient to use a separate call back function for
-         each file. A better approach is to have a single call back
-         function that distinguishes between the files by using the
-         <structfield>data</structfield> field in <structname>struct
-         proc_dir_entry</structname>. First of all, the
-         <structfield>data</structfield> field has to be initialised:
-      </para>
-
-      <programlisting>
-struct proc_dir_entry* entry;
-struct my_file_data *file_data;
-
-file_data = kmalloc(sizeof(struct my_file_data), GFP_KERNEL);
-entry->data = file_data;
-      </programlisting>
-     
-      <para>
-          The <structfield>data</structfield> field is a <type>void
-          *</type>, so it can be initialised with anything.
-      </para>
-
-      <para>
-        Now that the <structfield>data</structfield> field is set, the
-        <function>read_proc</function> and
-        <function>write_proc</function> can use it to distinguish
-        between files because they get it passed into their
-        <parameter>data</parameter> parameter:
-      </para>
-
-      <programlisting>
-int foo_read_func(char *page, char **start, off_t off,
-                  int count, int *eof, void *data)
-{
-        int len;
-
-        if(data == file_data) {
-                /* special case for this file */
-        } else {
-                /* normal processing */
-        }
-
-        return len;
-}
-      </programlisting>
-
-      <para>
-        Be sure to free the <structfield>data</structfield> data field
-        when removing the procfs entry.
-      </para>
-    </sect1>
-  </chapter>
-
-
-
-
-  <chapter id="tips">
-    <title>Tips and tricks</title>
-
-
-
-
-    <sect1 id="convenience">
-      <title>Convenience functions</title>
-
-      <funcsynopsis>
-        <funcprototype>
-          <funcdef>struct proc_dir_entry* <function>create_proc_read_entry</function></funcdef>
-          <paramdef>const char* <parameter>name</parameter></paramdef>
-          <paramdef>mode_t <parameter>mode</parameter></paramdef>
-          <paramdef>struct proc_dir_entry* <parameter>parent</parameter></paramdef>
-          <paramdef>read_proc_t* <parameter>read_proc</parameter></paramdef>
-          <paramdef>void* <parameter>data</parameter></paramdef>
-        </funcprototype>
-      </funcsynopsis>
-      
-      <para>
-        This function creates a regular file in exactly the same way
-        as <function>create_proc_entry</function> from <xref
-        linkend="regularfile"/> does, but also allows to set the read
-        function <parameter>read_proc</parameter> in one call. This
-        function can set the <parameter>data</parameter> as well, like
-        explained in <xref linkend="usingdata"/>.
-      </para>
-    </sect1>
-
-
-
-    <sect1 id="Modules">
-      <title>Modules</title>
-
-      <para>
-        If procfs is being used from within a module, be sure to set
-        the <structfield>owner</structfield> field in the
-        <structname>struct proc_dir_entry</structname> to
-        <constant>THIS_MODULE</constant>.
-      </para>
-
-      <programlisting>
-struct proc_dir_entry* entry;
-
-entry->owner = THIS_MODULE;
-      </programlisting>
-    </sect1>
-
-
-
-
-    <sect1 id="Mode_and_ownership">
-      <title>Mode and ownership</title>
-
-      <para>
-        Sometimes it is useful to change the mode and/or ownership of
-        a procfs entry. Here is an example that shows how to achieve
-        that:
-      </para>
-
-      <programlisting>
-struct proc_dir_entry* entry;
-
-entry->mode =  S_IWUSR |S_IRUSR | S_IRGRP | S_IROTH;
-entry->uid = 0;
-entry->gid = 100;
-      </programlisting>
-
-    </sect1>
-  </chapter>
-
-
-
-
-  <chapter id="example">
-    <title>Example</title>
-
-    <!-- be careful with the example code: it shouldn't be wider than
-    approx. 60 columns, or otherwise it won't fit properly on a page
-    -->
-
-&procfsexample;
-
-  </chapter>
-</book>
diff --git a/Documentation/DocBook/procfs_example.c b/Documentation/DocBook/procfs_example.c
deleted file mode 100644
index a5b11793b1e0..000000000000
--- a/Documentation/DocBook/procfs_example.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * procfs_example.c: an example proc interface
- *
- * Copyright (C) 2001, Erik Mouw (mouw@nl.linux.org)
- *
- * This file accompanies the procfs-guide in the Linux kernel
- * source. Its main use is to demonstrate the concepts and
- * functions described in the guide.
- *
- * This software has been developed while working on the LART
- * computing board (http://www.lartmaker.nl), which was sponsored
- * by the Delt University of Technology projects Mobile Multi-media
- * Communications and Ubiquitous Communications.
- *
- * This program is free software; you can redistribute
- * it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be
- * useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/proc_fs.h>
-#include <linux/jiffies.h>
-#include <asm/uaccess.h>
-
-
-#define MODULE_VERS "1.0"
-#define MODULE_NAME "procfs_example"
-
-#define FOOBAR_LEN 8
-
-struct fb_data_t {
-        char name[FOOBAR_LEN + 1];
-        char value[FOOBAR_LEN + 1];
-};
-
-
-static struct proc_dir_entry *example_dir, *foo_file,
-        *bar_file, *jiffies_file, *symlink;
-
-
-struct fb_data_t foo_data, bar_data;
-
-
-static int proc_read_jiffies(char *page, char **start,
-                             off_t off, int count,
-                             int *eof, void *data)
-{
-        int len;
-
-        len = sprintf(page, "jiffies = %ld\n",
-                      jiffies);
-
-        return len;
-}
-
-
-static int proc_read_foobar(char *page, char **start,
-                            off_t off, int count, 
-                            int *eof, void *data)
-{
-        int len;
-        struct fb_data_t *fb_data = (struct fb_data_t *)data;
-
-        /* DON'T DO THAT - buffer overruns are bad */
-        len = sprintf(page, "%s = '%s'\n", 
-                      fb_data->name, fb_data->value);
-
-        return len;
-}
-
-
-static int proc_write_foobar(struct file *file,
-                             const char *buffer,
-                             unsigned long count, 
-                             void *data)
-{
-        int len;
-        struct fb_data_t *fb_data = (struct fb_data_t *)data;
-
-        if(count > FOOBAR_LEN)
-                len = FOOBAR_LEN;
-        else
-                len = count;
-
-        if(copy_from_user(fb_data->value, buffer, len))
-                return -EFAULT;
-
-        fb_data->value[len] = '\0';
-
-        return len;
-}
-
-
-static int __init init_procfs_example(void)
-{
-        int rv = 0;
-
-        /* create directory */
-        example_dir = proc_mkdir(MODULE_NAME, NULL);
-        if(example_dir == NULL) {
-                rv = -ENOMEM;
-                goto out;
-        }
-        /* create jiffies using convenience function */
-        jiffies_file = create_proc_read_entry("jiffies", 
-                                              0444, example_dir, 
-                                              proc_read_jiffies,
-                                              NULL);
-        if(jiffies_file == NULL) {
-                rv  = -ENOMEM;
-                goto no_jiffies;
-        }
-
-        /* create foo and bar files using same callback
-         * functions 
-         */
-        foo_file = create_proc_entry("foo", 0644, example_dir);
-        if(foo_file == NULL) {
-                rv = -ENOMEM;
-                goto no_foo;
-        }
-
-        strcpy(foo_data.name, "foo");
-        strcpy(foo_data.value, "foo");
-        foo_file->data = &foo_data;
-        foo_file->read_proc = proc_read_foobar;
-        foo_file->write_proc = proc_write_foobar;
-                
-        bar_file = create_proc_entry("bar", 0644, example_dir);
-        if(bar_file == NULL) {
-                rv = -ENOMEM;
-                goto no_bar;
-        }
-
-        strcpy(bar_data.name, "bar");
-        strcpy(bar_data.value, "bar");
-        bar_file->data = &bar_data;
-        bar_file->read_proc = proc_read_foobar;
-        bar_file->write_proc = proc_write_foobar;
-                
-        /* create symlink */
-        symlink = proc_symlink("jiffies_too", example_dir, 
-                               "jiffies");
-        if(symlink == NULL) {
-                rv = -ENOMEM;
-                goto no_symlink;
-        }
-
-        /* everything OK */
-        printk(KERN_INFO "%s %s initialised\n",
-               MODULE_NAME, MODULE_VERS);
-        return 0;
-
-no_symlink:
-        remove_proc_entry("bar", example_dir);
-no_bar:
-        remove_proc_entry("foo", example_dir);
-no_foo:
-        remove_proc_entry("jiffies", example_dir);
-no_jiffies:                           
-        remove_proc_entry(MODULE_NAME, NULL);
-out:
-        return rv;
-}
-
-
-static void __exit cleanup_procfs_example(void)
-{
-        remove_proc_entry("jiffies_too", example_dir);
-        remove_proc_entry("bar", example_dir);
-        remove_proc_entry("foo", example_dir);
-        remove_proc_entry("jiffies", example_dir);
-        remove_proc_entry(MODULE_NAME, NULL);
-
-        printk(KERN_INFO "%s %s removed\n",
-               MODULE_NAME, MODULE_VERS);
-}
-
-
-module_init(init_procfs_example);
-module_exit(cleanup_procfs_example);
-
-MODULE_AUTHOR("Erik Mouw");
-MODULE_DESCRIPTION("procfs examples");
-MODULE_LICENSE("GPL");
diff --git a/Documentation/DocBook/v4l/common.xml b/Documentation/DocBook/v4l/common.xml
index b1a81d246d58..c65f0ac9b6ee 100644
--- a/Documentation/DocBook/v4l/common.xml
+++ b/Documentation/DocBook/v4l/common.xml
@@ -716,6 +716,41 @@ if (-1 == ioctl (fd, &VIDIOC-S-STD;, &amp;std_id)) {
 }
       </programlisting>
     </example>
+  <section id="dv-timings">
+        <title>Digital Video (DV) Timings</title>
+        <para>
+        The video standards discussed so far has been dealing with Analog TV and the
+corresponding video timings. Today there are many more different hardware interfaces
+such as High Definition TV interfaces (HDMI), VGA, DVI connectors etc., that carry
+video signals and there is a need to extend the API to select the video timings
+for these interfaces. Since it is not possible to extend the &v4l2-std-id; due to
+the limited bits available, a new set of IOCTLs is added to set/get video timings at
+the input and output: </para><itemizedlist>
+        <listitem>
+        <para>DV Presets: Digital Video (DV) presets. These are IDs representing a
+video timing at the input/output. Presets are pre-defined timings implemented
+by the hardware according to video standards. A __u32 data type is used to represent
+a preset unlike the bit mask that is used in &v4l2-std-id; allowing future extensions
+to support as many different presets as needed.</para>
+        </listitem>
+        <listitem>
+        <para>Custom DV Timings: This will allow applications to define more detailed
+custom video timings for the interface. This includes parameters such as width, height,
+polarities, frontporch, backporch etc.
+        </para>
+        </listitem>
+        </itemizedlist>
+        <para>To enumerate and query the attributes of DV presets supported by a device,
+applications use the &VIDIOC-ENUM-DV-PRESETS; ioctl. To get the current DV preset,
+applications use the &VIDIOC-G-DV-PRESET; ioctl and to set a preset they use the
+&VIDIOC-S-DV-PRESET; ioctl.</para>
+        <para>To set custom DV timings for the device, applications use the
+&VIDIOC-S-DV-TIMINGS; ioctl and to get current custom DV timings they use the
+&VIDIOC-G-DV-TIMINGS; ioctl.</para>
+        <para>Applications can make use of the <xref linkend="input-capabilities" /> and
+<xref linkend="output-capabilities"/> flags to decide what ioctls are available to set the
+video timings for the device.</para>
+        </section>
   </section>
 
   &sub-controls;
diff --git a/Documentation/DocBook/v4l/compat.xml b/Documentation/DocBook/v4l/compat.xml
index 4d1902a54d61..b9dbdf9e6d29 100644
--- a/Documentation/DocBook/v4l/compat.xml
+++ b/Documentation/DocBook/v4l/compat.xml
@@ -2291,8 +2291,8 @@ was renamed to <structname id="v4l2-chip-ident-old">v4l2_chip_ident_old</structn
         <listitem>
           <para>New control <constant>V4L2_CID_COLORFX</constant> was added.</para>
         </listitem>
-       </orderedlist>
-     </section>
+      </orderedlist>
+    </section>
     <section>
       <title>V4L2 in Linux 2.6.32</title>
       <orderedlist>
@@ -2322,8 +2322,16 @@ more information.</para>
         <listitem>
           <para>Added Remote Controller chapter, describing the default Remote Controller mapping for media devices.</para>
         </listitem>
-       </orderedlist>
-     </section>
+      </orderedlist>
+    </section>
+    <section>
+      <title>V4L2 in Linux 2.6.33</title>
+      <orderedlist>
+        <listitem>
+          <para>Added support for Digital Video timings in order to support HDTV receivers and transmitters.</para>
+        </listitem>
+      </orderedlist>
+    </section>
    </section>
 
    <section id="other">
diff --git a/Documentation/DocBook/v4l/v4l2.xml b/Documentation/DocBook/v4l/v4l2.xml
index 937b4157a5d0..060105af49e5 100644
--- a/Documentation/DocBook/v4l/v4l2.xml
+++ b/Documentation/DocBook/v4l/v4l2.xml
@@ -74,6 +74,17 @@ Remote Controller chapter.</contrib>
           </address>
         </affiliation>
       </author>
+
+      <author>
+        <firstname>Muralidharan</firstname>
+        <surname>Karicheri</surname>
+        <contrib>Documented the Digital Video timings API.</contrib>
+        <affiliation>
+          <address>
+            <email>m-karicheri2@ti.com</email>
+          </address>
+        </affiliation>
+      </author>
     </authorgroup>
 
     <copyright>
@@ -89,7 +100,7 @@ Remote Controller chapter.</contrib>
       <year>2008</year>
       <year>2009</year>
       <holder>Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin
-Rubli, Andy Walls, Mauro Carvalho Chehab</holder>
+Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab</holder>
     </copyright>
     <legalnotice>
     <para>Except when explicitly stated as GPL, programming examples within
@@ -103,6 +114,13 @@ structs, ioctls) must be noted in more detail in the history chapter
 applications. -->
 
       <revision>
+        <revnumber>2.6.33</revnumber>
+        <date>2009-12-03</date>
+        <authorinitials>mk</authorinitials>
+        <revremark>Added documentation for the Digital Video timings API.</revremark>
+      </revision>
+
+      <revision>
         <revnumber>2.6.32</revnumber>
         <date>2009-08-31</date>
         <authorinitials>mcc</authorinitials>
@@ -355,7 +373,7 @@ and discussions on the V4L mailing list.</revremark>
 </partinfo>
 
 <title>Video for Linux Two API Specification</title>
- <subtitle>Revision 2.6.32</subtitle>
+ <subtitle>Revision 2.6.33</subtitle>
 
   <chapter id="common">
     &sub-common;
@@ -411,6 +429,7 @@ and discussions on the V4L mailing list.</revremark>
     &sub-encoder-cmd;
     &sub-enumaudio;
     &sub-enumaudioout;
+    &sub-enum-dv-presets;
     &sub-enum-fmt;
     &sub-enum-framesizes;
     &sub-enum-frameintervals;
@@ -421,6 +440,8 @@ and discussions on the V4L mailing list.</revremark>
     &sub-g-audioout;
     &sub-g-crop;
     &sub-g-ctrl;
+    &sub-g-dv-preset;
+    &sub-g-dv-timings;
     &sub-g-enc-index;
     &sub-g-ext-ctrls;
     &sub-g-fbuf;
@@ -441,6 +462,7 @@ and discussions on the V4L mailing list.</revremark>
     &sub-querybuf;
     &sub-querycap;
     &sub-queryctrl;
+    &sub-query-dv-preset;
     &sub-querystd;
     &sub-reqbufs;
     &sub-s-hw-freq-seek;
diff --git a/Documentation/DocBook/v4l/videodev2.h.xml b/Documentation/DocBook/v4l/videodev2.h.xml
index 3e282ed9f593..068325940658 100644
--- a/Documentation/DocBook/v4l/videodev2.h.xml
+++ b/Documentation/DocBook/v4l/videodev2.h.xml
@@ -734,6 +734,99 @@ struct <link linkend="v4l2-standard">v4l2_standard</link> {
 };
 
 /*
+ *      V I D E O       T I M I N G S   D V     P R E S E T
+ */
+struct <link linkend="v4l2-dv-preset">v4l2_dv_preset</link> {
+        __u32   preset;
+        __u32   reserved[4];
+};
+
+/*
+ *      D V     P R E S E T S   E N U M E R A T I O N
+ */
+struct <link linkend="v4l2-dv-enum-preset">v4l2_dv_enum_preset</link> {
+        __u32   index;
+        __u32   preset;
+        __u8    name[32]; /* Name of the preset timing */
+        __u32   width;
+        __u32   height;
+        __u32   reserved[4];
+};
+
+/*
+ *      D V     P R E S E T     V A L U E S
+ */
+#define         V4L2_DV_INVALID         0
+#define         V4L2_DV_480P59_94       1 /* BT.1362 */
+#define         V4L2_DV_576P50          2 /* BT.1362 */
+#define         V4L2_DV_720P24          3 /* SMPTE 296M */
+#define         V4L2_DV_720P25          4 /* SMPTE 296M */
+#define         V4L2_DV_720P30          5 /* SMPTE 296M */
+#define         V4L2_DV_720P50          6 /* SMPTE 296M */
+#define         V4L2_DV_720P59_94       7 /* SMPTE 274M */
+#define         V4L2_DV_720P60          8 /* SMPTE 274M/296M */
+#define         V4L2_DV_1080I29_97      9 /* BT.1120/ SMPTE 274M */
+#define         V4L2_DV_1080I30         10 /* BT.1120/ SMPTE 274M */
+#define         V4L2_DV_1080I25         11 /* BT.1120 */
+#define         V4L2_DV_1080I50         12 /* SMPTE 296M */
+#define         V4L2_DV_1080I60         13 /* SMPTE 296M */
+#define         V4L2_DV_1080P24         14 /* SMPTE 296M */
+#define         V4L2_DV_1080P25         15 /* SMPTE 296M */
+#define         V4L2_DV_1080P30         16 /* SMPTE 296M */
+#define         V4L2_DV_1080P50         17 /* BT.1120 */
+#define         V4L2_DV_1080P60         18 /* BT.1120 */
+
+/*
+ *      D V     B T     T I M I N G S
+ */
+
+/* BT.656/BT.1120 timing data */
+struct <link linkend="v4l2-bt-timings">v4l2_bt_timings</link> {
+        __u32   width;          /* width in pixels */
+        __u32   height;         /* height in lines */
+        __u32   interlaced;     /* Interlaced or progressive */
+        __u32   polarities;     /* Positive or negative polarity */
+        __u64   pixelclock;     /* Pixel clock in HZ. Ex. 74.25MHz-&gt;74250000 */
+        __u32   hfrontporch;    /* Horizpontal front porch in pixels */
+        __u32   hsync;          /* Horizontal Sync length in pixels */
+        __u32   hbackporch;     /* Horizontal back porch in pixels */
+        __u32   vfrontporch;    /* Vertical front porch in pixels */
+        __u32   vsync;          /* Vertical Sync length in lines */
+        __u32   vbackporch;     /* Vertical back porch in lines */
+        __u32   il_vfrontporch; /* Vertical front porch for bottom field of
+                                 * interlaced field formats
+                                 */
+        __u32   il_vsync;       /* Vertical sync length for bottom field of
+                                 * interlaced field formats
+                                 */
+        __u32   il_vbackporch;  /* Vertical back porch for bottom field of
+                                 * interlaced field formats
+                                 */
+        __u32   reserved[16];
+} __attribute__ ((packed));
+
+/* Interlaced or progressive format */
+#define V4L2_DV_PROGRESSIVE     0
+#define V4L2_DV_INTERLACED      1
+
+/* Polarities. If bit is not set, it is assumed to be negative polarity */
+#define V4L2_DV_VSYNC_POS_POL   0x00000001
+#define V4L2_DV_HSYNC_POS_POL   0x00000002
+
+
+/* DV timings */
+struct <link linkend="v4l2-dv-timings">v4l2_dv_timings</link> {
+        __u32 type;
+        union {
+                struct <link linkend="v4l2-bt-timings">v4l2_bt_timings</link>  bt;
+                __u32   reserved[32];
+        };
+} __attribute__ ((packed));
+
+/* Values for the type field */
+#define V4L2_DV_BT_656_1120     0       /* BT.656/1120 timing type */
+
+/*
  *      V I D E O   I N P U T S
  */
 struct <link linkend="v4l2-input">v4l2_input</link> {
@@ -744,7 +837,8 @@ struct <link linkend="v4l2-input">v4l2_input</link> {
         __u32        tuner;             /*  Associated tuner */
         v4l2_std_id  std;
         __u32        status;
-        __u32        reserved[4];
+        __u32        capabilities;
+        __u32        reserved[3];
 };
 
 /*  Values for the 'type' field */
@@ -775,6 +869,11 @@ struct <link linkend="v4l2-input">v4l2_input</link> {
 #define V4L2_IN_ST_NO_ACCESS   0x02000000  /* Conditional access denied */
 #define V4L2_IN_ST_VTR         0x04000000  /* VTR time constant */
 
+/* capabilities flags */
+#define V4L2_IN_CAP_PRESETS             0x00000001 /* Supports S_DV_PRESET */
+#define V4L2_IN_CAP_CUSTOM_TIMINGS      0x00000002 /* Supports S_DV_TIMINGS */
+#define V4L2_IN_CAP_STD                 0x00000004 /* Supports S_STD */
+
 /*
  *      V I D E O   O U T P U T S
  */
@@ -785,13 +884,19 @@ struct <link linkend="v4l2-output">v4l2_output</link> {
         __u32        audioset;          /*  Associated audios (bitfield) */
         __u32        modulator;         /*  Associated modulator */
         v4l2_std_id  std;
-        __u32        reserved[4];
+        __u32        capabilities;
+        __u32        reserved[3];
 };
 /*  Values for the 'type' field */
 #define V4L2_OUTPUT_TYPE_MODULATOR              1
 #define V4L2_OUTPUT_TYPE_ANALOG                 2
 #define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY       3
 
+/* capabilities flags */
+#define V4L2_OUT_CAP_PRESETS            0x00000001 /* Supports S_DV_PRESET */
+#define V4L2_OUT_CAP_CUSTOM_TIMINGS     0x00000002 /* Supports S_DV_TIMINGS */
+#define V4L2_OUT_CAP_STD                0x00000004 /* Supports S_STD */
+
 /*
  *      C O N T R O L S
  */
@@ -1626,6 +1731,13 @@ struct <link linkend="v4l2-dbg-chip-ident">v4l2_dbg_chip_ident</link> {
 #endif
 
 #define VIDIOC_S_HW_FREQ_SEEK    _IOW('V', 82, struct <link linkend="v4l2-hw-freq-seek">v4l2_hw_freq_seek</link>)
+#define VIDIOC_ENUM_DV_PRESETS  _IOWR('V', 83, struct <link linkend="v4l2-dv-enum-preset">v4l2_dv_enum_preset</link>)
+#define VIDIOC_S_DV_PRESET      _IOWR('V', 84, struct <link linkend="v4l2-dv-preset">v4l2_dv_preset</link>)
+#define VIDIOC_G_DV_PRESET      _IOWR('V', 85, struct <link linkend="v4l2-dv-preset">v4l2_dv_preset</link>)
+#define VIDIOC_QUERY_DV_PRESET  _IOR('V',  86, struct <link linkend="v4l2-dv-preset">v4l2_dv_preset</link>)
+#define VIDIOC_S_DV_TIMINGS     _IOWR('V', 87, struct <link linkend="v4l2-dv-timings">v4l2_dv_timings</link>)
+#define VIDIOC_G_DV_TIMINGS     _IOWR('V', 88, struct <link linkend="v4l2-dv-timings">v4l2_dv_timings</link>)
+
 /* Reminder: when adding new ioctls please add support for them to
    drivers/media/video/v4l2-compat-ioctl32.c as well! */
 
diff --git a/Documentation/DocBook/v4l/vidioc-enum-dv-presets.xml b/Documentation/DocBook/v4l/vidioc-enum-dv-presets.xml
new file mode 100644
index 000000000000..1d31427edd1b
--- /dev/null
+++ b/Documentation/DocBook/v4l/vidioc-enum-dv-presets.xml
@@ -0,0 +1,238 @@
+<refentry id="vidioc-enum-dv-presets">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_ENUM_DV_PRESETS</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_ENUM_DV_PRESETS</refname>
+    <refpurpose>Enumerate supported Digital Video presets</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+        <funcdef>int <function>ioctl</function></funcdef>
+        <paramdef>int <parameter>fd</parameter></paramdef>
+        <paramdef>int <parameter>request</parameter></paramdef>
+        <paramdef>struct v4l2_dv_enum_preset *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><parameter>fd</parameter></term>
+        <listitem>
+          <para>&fd;</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>request</parameter></term>
+        <listitem>
+          <para>VIDIOC_ENUM_DV_PRESETS</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>argp</parameter></term>
+        <listitem>
+          <para></para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>To query the attributes of a DV preset, applications initialize the
+<structfield>index</structfield> field and zero the reserved array of &v4l2-dv-enum-preset;
+and call the <constant>VIDIOC_ENUM_DV_PRESETS</constant> ioctl with a pointer to this
+structure. Drivers fill the rest of the structure or return an
+&EINVAL; when the index is out of bounds. To enumerate all DV Presets supported,
+applications shall begin at index zero, incrementing by one until the
+driver returns <errorcode>EINVAL</errorcode>. Drivers may enumerate a
+different set of DV presets after switching the video input or
+output.</para>
+
+    <table pgwide="1" frame="none" id="v4l2-dv-enum-preset">
+      <title>struct <structname>v4l2_dv_enum_presets</structname></title>
+      <tgroup cols="3">
+        &cs-str;
+        <tbody valign="top">
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>index</structfield></entry>
+            <entry>Number of the DV preset, set by the
+application.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>preset</structfield></entry>
+            <entry>This field identifies one of the DV preset values listed in <xref linkend="v4l2-dv-presets-vals"/>.</entry>
+          </row>
+          <row>
+            <entry>__u8</entry>
+            <entry><structfield>name</structfield>[24]</entry>
+            <entry>Name of the preset, a NUL-terminated ASCII string, for example: "720P-60", "1080I-60". This information is
+intended for the user.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>width</structfield></entry>
+            <entry>Width of the active video in pixels for the DV preset.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>height</structfield></entry>
+            <entry>Height of the active video in lines for the DV preset.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>reserved</structfield>[4]</entry>
+            <entry>Reserved for future extensions. Drivers must set the array to zero.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-dv-presets-vals">
+      <title>struct <structname>DV Presets</structname></title>
+      <tgroup cols="3">
+        &cs-str;
+        <tbody valign="top">
+          <row>
+            <entry>Preset</entry>
+            <entry>Preset value</entry>
+            <entry>Description</entry>
+          </row>
+          <row>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_INVALID</entry>
+            <entry>0</entry>
+            <entry>Invalid preset value.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_480P59_94</entry>
+            <entry>1</entry>
+            <entry>720x480 progressive video at 59.94 fps as per BT.1362.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_576P50</entry>
+            <entry>2</entry>
+            <entry>720x576 progressive video at 50 fps as per BT.1362.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_720P24</entry>
+            <entry>3</entry>
+            <entry>1280x720 progressive video at 24 fps as per SMPTE 296M.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_720P25</entry>
+            <entry>4</entry>
+            <entry>1280x720 progressive video at 25 fps as per SMPTE 296M.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_720P30</entry>
+            <entry>5</entry>
+            <entry>1280x720 progressive video at 30 fps as per SMPTE 296M.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_720P50</entry>
+            <entry>6</entry>
+            <entry>1280x720 progressive video at 50 fps as per SMPTE 296M.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_720P59_94</entry>
+            <entry>7</entry>
+            <entry>1280x720 progressive video at 59.94 fps as per SMPTE 274M.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_720P60</entry>
+            <entry>8</entry>
+            <entry>1280x720 progressive video at 60 fps as per SMPTE 274M/296M.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_1080I29_97</entry>
+            <entry>9</entry>
+            <entry>1920x1080 interlaced video at 29.97 fps as per BT.1120/SMPTE 274M.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_1080I30</entry>
+            <entry>10</entry>
+            <entry>1920x1080 interlaced video at 30 fps as per BT.1120/SMPTE 274M.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_1080I25</entry>
+            <entry>11</entry>
+            <entry>1920x1080 interlaced video at 25 fps as per BT.1120.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_1080I50</entry>
+            <entry>12</entry>
+            <entry>1920x1080 interlaced video at 50 fps as per SMPTE 296M.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_1080I60</entry>
+            <entry>13</entry>
+            <entry>1920x1080 interlaced video at 60 fps as per SMPTE 296M.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_1080P24</entry>
+            <entry>14</entry>
+            <entry>1920x1080 progressive video at 24 fps as per SMPTE 296M.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_1080P25</entry>
+            <entry>15</entry>
+            <entry>1920x1080 progressive video at 25 fps as per SMPTE 296M.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_1080P30</entry>
+            <entry>16</entry>
+            <entry>1920x1080 progressive video at 30 fps as per SMPTE 296M.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_1080P50</entry>
+            <entry>17</entry>
+            <entry>1920x1080 progressive video at 50 fps as per BT.1120.</entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_1080P60</entry>
+            <entry>18</entry>
+            <entry>1920x1080 progressive video at 60 fps as per BT.1120.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+        <term><errorcode>EINVAL</errorcode></term>
+        <listitem>
+          <para>The &v4l2-dv-enum-preset; <structfield>index</structfield>
+is out of bounds.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-enuminput.xml b/Documentation/DocBook/v4l/vidioc-enuminput.xml
index 414856b82473..71b868e2fb8f 100644
--- a/Documentation/DocBook/v4l/vidioc-enuminput.xml
+++ b/Documentation/DocBook/v4l/vidioc-enuminput.xml
@@ -124,7 +124,13 @@ current input.</entry>
           </row>
           <row>
             <entry>__u32</entry>
-            <entry><structfield>reserved</structfield>[4]</entry>
+            <entry><structfield>capabilities</structfield></entry>
+            <entry>This field provides capabilities for the
+input. See <xref linkend="input-capabilities" /> for flags.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>reserved</structfield>[3]</entry>
             <entry>Reserved for future extensions. Drivers must set
 the array to zero.</entry>
           </row>
@@ -261,6 +267,34 @@ flag is set Macrovision has been detected.</entry>
         </tbody>
       </tgroup>
     </table>
+
+    <!-- Capability flags based on video timings RFC by Muralidharan
+Karicheri, titled RFC (v1.2): V4L - Support for video timings at the
+input/output interface to linux-media@vger.kernel.org on 19 Oct 2009.
+        -->
+    <table frame="none" pgwide="1" id="input-capabilities">
+      <title>Input capabilities</title>
+      <tgroup cols="3">
+        &cs-def;
+        <tbody valign="top">
+          <row>
+            <entry><constant>V4L2_IN_CAP_PRESETS</constant></entry>
+            <entry>0x00000001</entry>
+            <entry>This input supports setting DV presets by using VIDIOC_S_DV_PRESET.</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_OUT_CAP_CUSTOM_TIMINGS</constant></entry>
+            <entry>0x00000002</entry>
+            <entry>This input supports setting custom video timings by using VIDIOC_S_DV_TIMINGS.</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_IN_CAP_STD</constant></entry>
+            <entry>0x00000004</entry>
+            <entry>This input supports setting the TV standard by using VIDIOC_S_STD.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
   </refsect1>
 
   <refsect1>
diff --git a/Documentation/DocBook/v4l/vidioc-enumoutput.xml b/Documentation/DocBook/v4l/vidioc-enumoutput.xml
index e8d16dcd50cf..a281d26a195f 100644
--- a/Documentation/DocBook/v4l/vidioc-enumoutput.xml
+++ b/Documentation/DocBook/v4l/vidioc-enumoutput.xml
@@ -114,7 +114,13 @@ details on video standards and how to switch see <xref
           </row>
           <row>
             <entry>__u32</entry>
-            <entry><structfield>reserved</structfield>[4]</entry>
+            <entry><structfield>capabilities</structfield></entry>
+            <entry>This field provides capabilities for the
+output. See <xref linkend="output-capabilities" /> for flags.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>reserved</structfield>[3]</entry>
             <entry>Reserved for future extensions. Drivers must set
 the array to zero.</entry>
           </row>
@@ -147,6 +153,34 @@ CVBS, S-Video, RGB.</entry>
       </tgroup>
     </table>
 
+    <!-- Capabilities flags based on video timings RFC by Muralidharan
+Karicheri, titled RFC (v1.2): V4L - Support for video timings at the
+input/output interface to linux-media@vger.kernel.org on 19 Oct 2009.
+        -->
+    <table frame="none" pgwide="1" id="output-capabilities">
+      <title>Output capabilities</title>
+      <tgroup cols="3">
+        &cs-def;
+        <tbody valign="top">
+          <row>
+            <entry><constant>V4L2_OUT_CAP_PRESETS</constant></entry>
+            <entry>0x00000001</entry>
+            <entry>This output supports setting DV presets by using VIDIOC_S_DV_PRESET.</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_OUT_CAP_CUSTOM_TIMINGS</constant></entry>
+            <entry>0x00000002</entry>
+            <entry>This output supports setting custom video timings by using VIDIOC_S_DV_TIMINGS.</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_OUT_CAP_STD</constant></entry>
+            <entry>0x00000004</entry>
+            <entry>This output supports setting the TV standard by using VIDIOC_S_STD.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
   </refsect1>
   <refsect1>
     &return-value;
diff --git a/Documentation/DocBook/v4l/vidioc-g-dv-preset.xml b/Documentation/DocBook/v4l/vidioc-g-dv-preset.xml
new file mode 100644
index 000000000000..3c6784e132f3
--- /dev/null
+++ b/Documentation/DocBook/v4l/vidioc-g-dv-preset.xml
@@ -0,0 +1,111 @@
+<refentry id="vidioc-g-dv-preset">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_DV_PRESET, VIDIOC_S_DV_PRESET</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_DV_PRESET</refname>
+    <refname>VIDIOC_S_DV_PRESET</refname>
+    <refpurpose>Query or select the DV preset of the current input or output</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+        <funcdef>int <function>ioctl</function></funcdef>
+        <paramdef>int <parameter>fd</parameter></paramdef>
+        <paramdef>int <parameter>request</parameter></paramdef>
+        <paramdef>&v4l2-dv-preset;
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><parameter>fd</parameter></term>
+        <listitem>
+          <para>&fd;</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>request</parameter></term>
+        <listitem>
+          <para>VIDIOC_G_DV_PRESET, VIDIOC_S_DV_PRESET</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>argp</parameter></term>
+        <listitem>
+          <para></para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+    <para>To query and select the current DV preset, applications
+use the <constant>VIDIOC_G_DV_PRESET</constant> and <constant>VIDIOC_S_DV_PRESET</constant>
+ioctls which take a pointer to a &v4l2-dv-preset; type as argument.
+Applications must zero the reserved array in &v4l2-dv-preset;.
+<constant>VIDIOC_G_DV_PRESET</constant> returns a dv preset in the field
+<structfield>preset</structfield> of &v4l2-dv-preset;.</para>
+
+    <para><constant>VIDIOC_S_DV_PRESET</constant> accepts a pointer to a &v4l2-dv-preset;
+that has the preset value to be set. Applications must zero the reserved array in &v4l2-dv-preset;.
+If the preset is not supported, it returns an &EINVAL; </para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+        <term><errorcode>EINVAL</errorcode></term>
+        <listitem>
+          <para>This ioctl is not supported, or the
+<constant>VIDIOC_S_DV_PRESET</constant>,<constant>VIDIOC_S_DV_PRESET</constant> parameter was unsuitable.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><errorcode>EBUSY</errorcode></term>
+        <listitem>
+          <para>The device is busy and therefore can not change the preset.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+    <table pgwide="1" frame="none" id="v4l2-dv-preset">
+      <title>struct <structname>v4l2_dv_preset</structname></title>
+      <tgroup cols="3">
+        &cs-str;
+        <tbody valign="top">
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>preset</structfield></entry>
+            <entry>Preset value to represent the digital video timings</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>reserved[4]</structfield></entry>
+            <entry>Reserved fields for future use</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-dv-timings.xml b/Documentation/DocBook/v4l/vidioc-g-dv-timings.xml
new file mode 100644
index 000000000000..ecc19576bb8f
--- /dev/null
+++ b/Documentation/DocBook/v4l/vidioc-g-dv-timings.xml
@@ -0,0 +1,224 @@
+<refentry id="vidioc-g-dv-timings">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_G_DV_TIMINGS, VIDIOC_S_DV_TIMINGS</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_G_DV_TIMINGS</refname>
+    <refname>VIDIOC_S_DV_TIMINGS</refname>
+    <refpurpose>Get or set custom DV timings for input or output</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+        <funcdef>int <function>ioctl</function></funcdef>
+        <paramdef>int <parameter>fd</parameter></paramdef>
+        <paramdef>int <parameter>request</parameter></paramdef>
+        <paramdef>&v4l2-dv-timings;
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><parameter>fd</parameter></term>
+        <listitem>
+          <para>&fd;</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>request</parameter></term>
+        <listitem>
+          <para>VIDIOC_G_DV_TIMINGS, VIDIOC_S_DV_TIMINGS</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>argp</parameter></term>
+        <listitem>
+          <para></para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+    <para>To set custom DV timings for the input or output, applications use the
+<constant>VIDIOC_S_DV_TIMINGS</constant> ioctl and to get the current custom timings,
+applications use the <constant>VIDIOC_G_DV_TIMINGS</constant> ioctl. The detailed timing
+information is filled in using the structure &v4l2-dv-timings;. These ioctls take
+a pointer to the &v4l2-dv-timings; structure as argument. If the ioctl is not supported
+or the timing values are not correct, the driver returns &EINVAL;.</para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+
+    <variablelist>
+      <varlistentry>
+        <term><errorcode>EINVAL</errorcode></term>
+        <listitem>
+          <para>This ioctl is not supported, or the
+<constant>VIDIOC_S_DV_TIMINGS</constant> parameter was unsuitable.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><errorcode>EBUSY</errorcode></term>
+        <listitem>
+          <para>The device is busy and therefore can not change the timings.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+    <table pgwide="1" frame="none" id="v4l2-bt-timings">
+      <title>struct <structname>v4l2_bt_timings</structname></title>
+      <tgroup cols="3">
+        &cs-str;
+        <tbody valign="top">
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>width</structfield></entry>
+            <entry>Width of the active video in pixels</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>height</structfield></entry>
+            <entry>Height of the active video in lines</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>interlaced</structfield></entry>
+            <entry>Progressive (0) or interlaced (1)</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>polarities</structfield></entry>
+            <entry>This is a bit mask that defines polarities of sync signals.
+bit 0 (V4L2_DV_VSYNC_POS_POL) is for vertical sync polarity and bit 1 (V4L2_DV_HSYNC_POS_POL) is for horizontal sync polarity. If the bit is set
+(1) it is positive polarity and if is cleared (0), it is negative polarity.</entry>
+          </row>
+          <row>
+            <entry>__u64</entry>
+            <entry><structfield>pixelclock</structfield></entry>
+            <entry>Pixel clock in Hz. Ex. 74.25MHz->74250000</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>hfrontporch</structfield></entry>
+            <entry>Horizontal front porch in pixels</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>hsync</structfield></entry>
+            <entry>Horizontal sync length in pixels</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>hbackporch</structfield></entry>
+            <entry>Horizontal back porch in pixels</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>vfrontporch</structfield></entry>
+            <entry>Vertical front porch in lines</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>vsync</structfield></entry>
+            <entry>Vertical sync length in lines</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>vbackporch</structfield></entry>
+            <entry>Vertical back porch in lines</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>il_vfrontporch</structfield></entry>
+            <entry>Vertical front porch in lines for bottom field of interlaced field formats</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>il_vsync</structfield></entry>
+            <entry>Vertical sync length in lines for bottom field of interlaced field formats</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>il_vbackporch</structfield></entry>
+            <entry>Vertical back porch in lines for bottom field of interlaced field formats</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="v4l2-dv-timings">
+      <title>struct <structname>v4l2_dv_timings</structname></title>
+      <tgroup cols="4">
+        &cs-str;
+        <tbody valign="top">
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>type</structfield></entry>
+            <entry></entry>
+            <entry>Type of DV timings as listed in <xref linkend="dv-timing-types"/>.</entry>
+          </row>
+          <row>
+            <entry>union</entry>
+            <entry><structfield></structfield></entry>
+            <entry></entry>
+          </row>
+          <row>
+            <entry></entry>
+            <entry>&v4l2-bt-timings;</entry>
+            <entry><structfield>bt</structfield></entry>
+            <entry>Timings defined by BT.656/1120 specifications</entry>
+          </row>
+          <row>
+            <entry></entry>
+            <entry>__u32</entry>
+            <entry><structfield>reserved</structfield>[32]</entry>
+            <entry></entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
+    <table pgwide="1" frame="none" id="dv-timing-types">
+      <title>DV Timing types</title>
+      <tgroup cols="3">
+        &cs-str;
+        <tbody valign="top">
+          <row>
+            <entry>Timing type</entry>
+            <entry>value</entry>
+            <entry>Description</entry>
+          </row>
+          <row>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+          </row>
+          <row>
+            <entry>V4L2_DV_BT_656_1120</entry>
+            <entry>0</entry>
+            <entry>BT.656/1120 timings</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-g-std.xml b/Documentation/DocBook/v4l/vidioc-g-std.xml
index b6f5d267e856..912f8513e5da 100644
--- a/Documentation/DocBook/v4l/vidioc-g-std.xml
+++ b/Documentation/DocBook/v4l/vidioc-g-std.xml
@@ -86,6 +86,12 @@ standards.</para>
 <constant>VIDIOC_S_STD</constant> parameter was unsuitable.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><errorcode>EBUSY</errorcode></term>
+        <listitem>
+          <para>The device is busy and therefore can not change the standard</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 </refentry>
diff --git a/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml b/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
new file mode 100644
index 000000000000..87e4f0f6151c
--- /dev/null
+++ b/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
@@ -0,0 +1,85 @@
+<refentry id="vidioc-query-dv-preset">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_QUERY_DV_PRESET</refentrytitle>
+    &manvol;
+  </refmeta>
+
+  <refnamediv>
+    <refname>VIDIOC_QUERY_DV_PRESET</refname>
+    <refpurpose>Sense the DV preset received by the current
+input</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+        <funcdef>int <function>ioctl</function></funcdef>
+        <paramdef>int <parameter>fd</parameter></paramdef>
+        <paramdef>int <parameter>request</parameter></paramdef>
+        <paramdef>&v4l2-dv-preset; *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Arguments</title>
+
+    <variablelist>
+        <varlistentry>
+        <term><parameter>fd</parameter></term>
+        <listitem>
+          <para>&fd;</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>request</parameter></term>
+        <listitem>
+          <para>VIDIOC_QUERY_DV_PRESET</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>argp</parameter></term>
+        <listitem>
+          <para></para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>The hardware may be able to detect the current DV preset
+automatically, similar to sensing the video standard. To do so, applications
+call <constant> VIDIOC_QUERY_DV_PRESET</constant> with a pointer to a
+&v4l2-dv-preset; type. Once the hardware detects a preset, that preset is
+returned in the preset field of &v4l2-dv-preset;. When detection is not
+possible or fails, the value V4L2_DV_INVALID is returned.</para>
+  </refsect1>
+
+  <refsect1>
+    &return-value;
+    <variablelist>
+      <varlistentry>
+        <term><errorcode>EINVAL</errorcode></term>
+        <listitem>
+          <para>This ioctl is not supported.</para>
+        </listitem>
+    </varlistentry>
+      <varlistentry>
+        <term><errorcode>EBUSY</errorcode></term>
+        <listitem>
+          <para>The device is busy and therefore can not sense the preset</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "v4l2.sgml"
+indent-tabs-mode: nil
+End:
+-->
diff --git a/Documentation/DocBook/v4l/vidioc-querystd.xml b/Documentation/DocBook/v4l/vidioc-querystd.xml
index b5a7ff934486..1a9e60393091 100644
--- a/Documentation/DocBook/v4l/vidioc-querystd.xml
+++ b/Documentation/DocBook/v4l/vidioc-querystd.xml
@@ -70,6 +70,12 @@ current video input or output.</para>
           <para>This ioctl is not supported.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><errorcode>EBUSY</errorcode></term>
+        <listitem>
+          <para>The device is busy and therefore can not detect the standard</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 </refentry>
diff --git a/Documentation/SubmitChecklist b/Documentation/SubmitChecklist
index 78a9168ff377..1053a56be3b1 100644
--- a/Documentation/SubmitChecklist
+++ b/Documentation/SubmitChecklist
@@ -15,7 +15,7 @@ kernel patches.
 2: Passes allnoconfig, allmodconfig
 
 3: Builds on multiple CPU architectures by using local cross-compile tools
-   or something like PLM at OSDL.
+   or some other build farm.
 
 4: ppc64 is a good architecture for cross-compilation checking because it
    tends to use `unsigned long' for 64-bit quantities.
@@ -88,3 +88,6 @@ kernel patches.
 
 24: All memory barriers {e.g., barrier(), rmb(), wmb()} need a comment in the
     source code that explains the logic of what they are doing and why.
+
+25: If any ioctl's are added by the patch, then also update
+    Documentation/ioctl/ioctl-number.txt.
diff --git a/Documentation/device-mapper/snapshot.txt b/Documentation/device-mapper/snapshot.txt
index a5009c8300f3..e3a77b215135 100644
--- a/Documentation/device-mapper/snapshot.txt
+++ b/Documentation/device-mapper/snapshot.txt
@@ -8,13 +8,19 @@ the block device which are also writable without interfering with the
 original content;
 *) To create device "forks", i.e. multiple different versions of the
 same data stream.
+*) To merge a snapshot of a block device back into the snapshot's origin
+device.
 
+In the first two cases, dm copies only the chunks of data that get
+changed and uses a separate copy-on-write (COW) block device for
+storage.
 
-In both cases, dm copies only the chunks of data that get changed and
-uses a separate copy-on-write (COW) block device for storage.
+For snapshot merge the contents of the COW storage are merged back into
+the origin device.
 
 
-There are two dm targets available: snapshot and snapshot-origin.
+There are three dm targets available:
+snapshot, snapshot-origin, and snapshot-merge.
 
 *) snapshot-origin <origin>
 
@@ -40,8 +46,25 @@ The difference is that for transient snapshots less metadata must be
 saved on disk - they can be kept in memory by the kernel.
 
 
-How this is used by LVM2
-========================
+* snapshot-merge <origin> <COW device> <persistent> <chunksize>
+
+takes the same table arguments as the snapshot target except it only
+works with persistent snapshots.  This target assumes the role of the
+"snapshot-origin" target and must not be loaded if the "snapshot-origin"
+is still present for <origin>.
+
+Creates a merging snapshot that takes control of the changed chunks
+stored in the <COW device> of an existing snapshot, through a handover
+procedure, and merges these chunks back into the <origin>.  Once merging
+has started (in the background) the <origin> may be opened and the merge
+will continue while I/O is flowing to it.  Changes to the <origin> are
+deferred until the merging snapshot's corresponding chunk(s) have been
+merged.  Once merging has started the snapshot device, associated with
+the "snapshot" target, will return -EIO when accessed.
+
+
+How snapshot is used by LVM2
+============================
 When you create the first LVM2 snapshot of a volume, four dm devices are used:
 
 1) a device containing the original mapping table of the source volume;
@@ -72,3 +95,30 @@ brw-------  1 root root 254, 12 29 ago 18:15 /dev/mapper/volumeGroup-snap-cow
 brw-------  1 root root 254, 13 29 ago 18:15 /dev/mapper/volumeGroup-snap
 brw-------  1 root root 254, 10 29 ago 18:14 /dev/mapper/volumeGroup-base
 
+
+How snapshot-merge is used by LVM2
+==================================
+A merging snapshot assumes the role of the "snapshot-origin" while
+merging.  As such the "snapshot-origin" is replaced with
+"snapshot-merge".  The "-real" device is not changed and the "-cow"
+device is renamed to <origin name>-cow to aid LVM2's cleanup of the
+merging snapshot after it completes.  The "snapshot" that hands over its
+COW device to the "snapshot-merge" is deactivated (unless using lvchange
+--refresh); but if it is left active it will simply return I/O errors.
+
+A snapshot will merge into its origin with the following command:
+
+lvconvert --merge volumeGroup/snap
+
+we'll now have this situation:
+
+# dmsetup table|grep volumeGroup
+
+volumeGroup-base-real: 0 2097152 linear 8:19 384
+volumeGroup-base-cow: 0 204800 linear 8:19 2097536
+volumeGroup-base: 0 2097152 snapshot-merge 254:11 254:12 P 16
+
+# ls -lL /dev/mapper/volumeGroup-*
+brw-------  1 root root 254, 11 29 ago 18:15 /dev/mapper/volumeGroup-base-real
+brw-------  1 root root 254, 12 29 ago 18:16 /dev/mapper/volumeGroup-base-cow
+brw-------  1 root root 254, 10 29 ago 18:16 /dev/mapper/volumeGroup-base
diff --git a/Documentation/fb/viafb.txt b/Documentation/fb/viafb.txt
index 67dbf442b0b6..f3e046a6a987 100644
--- a/Documentation/fb/viafb.txt
+++ b/Documentation/fb/viafb.txt
@@ -7,7 +7,7 @@
     VIA UniChrome Family(CLE266, PM800 / CN400 / CN300,
                         P4M800CE / P4M800Pro / CN700 / VN800,
                         CX700 / VX700, K8M890, P4M890,
-                        CN896 / P4M900, VX800)
+                        CN896 / P4M900, VX800, VX855)
 
 [Driver features]
 ------------------------
@@ -154,13 +154,6 @@
         0 : No Dual Edge Panel (default)
         1 : Dual Edge Panel
 
-    viafb_video_dev:
-        This option is used to specify video output devices(CRT, DVI, LCD) for
-        duoview case.
-        For example:
-        To output video on DVI, we should use:
-            modprobe viafb viafb_video_dev=DVI...
-
     viafb_lcd_port:
         This option is used to specify LCD output port,
         available values are "DVP0" "DVP1" "DFP_HIGHLOW" "DFP_HIGH" "DFP_LOW".
@@ -181,9 +174,6 @@ Notes:
        and bpp, need to call VIAFB specified ioctl interface VIAFB_SET_DEVICE
        instead of calling common ioctl function FBIOPUT_VSCREENINFO since
        viafb doesn't support multi-head well, or it will cause screen crush.
-    4. VX800 2D accelerator hasn't been supported in this driver yet. When
-       using driver on VX800, the driver will disable the acceleration
-       function as default.
 
 
 [Configure viafb with "fbset" tool]
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index eb2c138c277c..21ab9357326d 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -291,15 +291,6 @@ Who:	Michael Buesch <mb@bu3sch.de>
 
 ---------------------------
 
-What: print_fn_descriptor_symbol()
-When: October 2009
-Why:  The %pF vsprintf format provides the same functionality in a
-      simpler way.  print_fn_descriptor_symbol() is deprecated but
-      still present to give out-of-tree modules time to change.
-Who:  Bjorn Helgaas <bjorn.helgaas@hp.com>
-
----------------------------
-
 What:   /sys/o2cb symlink
 When:   January 2010
 Why:    /sys/fs/o2cb is the proper location for this information - /sys/o2cb
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX
index 7001782ab932..875d49696b6e 100644
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@ -1,7 +1,5 @@
 00-INDEX
         - this file (info on some of the filesystems supported by linux).
-Exporting
-        - explanation of how to make filesystems exportable.
 Locking
         - info on locking rules as they pertain to Linux VFS.
 9p.txt
@@ -68,12 +66,8 @@ mandatory-locking.txt
         - info on the Linux implementation of Sys V mandatory file locking.
 ncpfs.txt
         - info on Novell Netware(tm) filesystem using NCP protocol.
-nfs41-server.txt
-        - info on the Linux server implementation of NFSv4 minor version 1.
-nfs-rdma.txt
-        - how to install and setup the Linux NFS/RDMA client and server software.
-nfsroot.txt
-        - short guide on setting up a diskless box with NFS root filesystem.
+nfs/
+        - nfs-related documentation.
 nilfs2.txt
         - info and mount options for the NILFS2 filesystem.
 ntfs.txt
@@ -92,8 +86,6 @@ relay.txt
         - info on relay, for efficient streaming from kernel to user space.
 romfs.txt
         - description of the ROMFS filesystem.
-rpc-cache.txt
-        - introduction to the caching mechanisms in the sunrpc layer.
 seq_file.txt
         - how to use the seq_file API
 sharedsubtree.txt
diff --git a/Documentation/filesystems/nfs/00-INDEX b/Documentation/filesystems/nfs/00-INDEX
new file mode 100644
index 000000000000..2f68cd688769
--- /dev/null
+++ b/Documentation/filesystems/nfs/00-INDEX
@@ -0,0 +1,16 @@
+00-INDEX
+        - this file (nfs-related documentation).
+Exporting
+        - explanation of how to make filesystems exportable.
+knfsd-stats.txt
+        - statistics which the NFS server makes available to user space.
+nfs.txt
+        - nfs client, and DNS resolution for fs_locations.
+nfs41-server.txt
+        - info on the Linux server implementation of NFSv4 minor version 1.
+nfs-rdma.txt
+        - how to install and setup the Linux NFS/RDMA client and server software
+nfsroot.txt
+        - short guide on setting up a diskless box with NFS root filesystem.
+rpc-cache.txt
+        - introduction to the caching mechanisms in the sunrpc layer.
diff --git a/Documentation/filesystems/Exporting b/Documentation/filesystems/nfs/Exporting
index 87019d2b5981..87019d2b5981 100644
--- a/Documentation/filesystems/Exporting
+++ b/Documentation/filesystems/nfs/Exporting
diff --git a/Documentation/filesystems/knfsd-stats.txt b/Documentation/filesystems/nfs/knfsd-stats.txt
index 64ced5149d37..64ced5149d37 100644
--- a/Documentation/filesystems/knfsd-stats.txt
+++ b/Documentation/filesystems/nfs/knfsd-stats.txt
diff --git a/Documentation/filesystems/nfs-rdma.txt b/Documentation/filesystems/nfs/nfs-rdma.txt
index e386f7e4bcee..e386f7e4bcee 100644
--- a/Documentation/filesystems/nfs-rdma.txt
+++ b/Documentation/filesystems/nfs/nfs-rdma.txt
diff --git a/Documentation/filesystems/nfs.txt b/Documentation/filesystems/nfs/nfs.txt
index f50f26ce6cd0..f50f26ce6cd0 100644
--- a/Documentation/filesystems/nfs.txt
+++ b/Documentation/filesystems/nfs/nfs.txt
diff --git a/Documentation/filesystems/nfs41-server.txt b/Documentation/filesystems/nfs/nfs41-server.txt
index 5920fe26e6ff..1bd0d0c05171 100644
--- a/Documentation/filesystems/nfs41-server.txt
+++ b/Documentation/filesystems/nfs/nfs41-server.txt
@@ -41,7 +41,7 @@ interoperability problems with future clients.  Known issues:
           conformant with the spec (for example, we don't use kerberos
           on the backchannel correctly).
         - no trunking support: no clients currently take advantage of
-          trunking, but this is a mandatory failure, and its use is
+          trunking, but this is a mandatory feature, and its use is
           recommended to clients in a number of places.  (E.g. to ensure
           timely renewal in case an existing connection's retry timeouts
           have gotten too long; see section 8.3 of the draft.)
@@ -213,3 +213,10 @@ The following cases aren't supported yet:
   DESTROY_CLIENTID, DESTROY_SESSION, EXCHANGE_ID.
 * DESTROY_SESSION MUST be the final operation in the COMPOUND request.
 
+Nonstandard compound limitations:
+* No support for a sessions fore channel RPC compound that requires both a
+  ca_maxrequestsize request and a ca_maxresponsesize reply, so we may
+  fail to live up to the promise we made in CREATE_SESSION fore channel
+  negotiation.
+* No more than one IO operation (read, write, readdir) allowed per
+  compound.
diff --git a/Documentation/filesystems/nfsroot.txt b/Documentation/filesystems/nfs/nfsroot.txt
index 3ba0b945aaf8..3ba0b945aaf8 100644
--- a/Documentation/filesystems/nfsroot.txt
+++ b/Documentation/filesystems/nfs/nfsroot.txt
diff --git a/Documentation/filesystems/rpc-cache.txt b/Documentation/filesystems/nfs/rpc-cache.txt
index 8a382bea6808..8a382bea6808 100644
--- a/Documentation/filesystems/rpc-cache.txt
+++ b/Documentation/filesystems/nfs/rpc-cache.txt
diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting
index 92b888d540a6..a7e9746ee7ea 100644
--- a/Documentation/filesystems/porting
+++ b/Documentation/filesystems/porting
@@ -140,7 +140,7 @@ Callers of notify_change() need ->i_mutex now.
 New super_block field "struct export_operations *s_export_op" for
 explicit support for exporting, e.g. via NFS.  The structure is fully
 documented at its declaration in include/linux/fs.h, and in
-Documentation/filesystems/Exporting.
+Documentation/filesystems/nfs/Exporting.
 
 Briefly it allows for the definition of decode_fh and encode_fh operations
 to encode and decode filehandles, and allows the filesystem to use
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 94b9f2056f4c..220cc6376ef8 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -38,6 +38,7 @@ Table of Contents
   3.3   /proc/<pid>/io - Display the IO accounting fields
   3.4   /proc/<pid>/coredump_filter - Core dump filtering settings
   3.5   /proc/<pid>/mountinfo - Information about mounts
+  3.6   /proc/<pid>/comm  & /proc/<pid>/task/<tid>/comm
 
 
 ------------------------------------------------------------------------------
@@ -1409,3 +1410,11 @@ For more information on mount propagation see:
 
   Documentation/filesystems/sharedsubtree.txt
 
+
+3.6     /proc/<pid>/comm  & /proc/<pid>/task/<tid>/comm
+--------------------------------------------------------
+These files provide a method to access a tasks comm value. It also allows for
+a task to set its own or one of its thread siblings comm value. The comm value
+is limited in size compared to the cmdline value, so writing anything longer
+then the kernel's TASK_COMM_LEN (currently 16 chars) will result in a truncated
+comm value.
diff --git a/Documentation/filesystems/seq_file.txt b/Documentation/filesystems/seq_file.txt
index 0d15ebccf5b0..a1e2e0dda907 100644
--- a/Documentation/filesystems/seq_file.txt
+++ b/Documentation/filesystems/seq_file.txt
@@ -248,9 +248,7 @@ code, that is done in the initialization code in the usual way:
         {
                 struct proc_dir_entry *entry;
 
-                entry = create_proc_entry("sequence", 0, NULL);
-                if (entry)
-                        entry->proc_fops = &ct_file_ops;
+                proc_create("sequence", 0, NULL, &ct_file_ops);
                 return 0;
         }
 
diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt
index e4e7daed2ba8..1866c27eec69 100644
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
@@ -531,6 +531,13 @@ and have the following read/write attributes:
                 This file exists only if the pin can be configured as an
                 interrupt generating input pin.
 
+        "active_low" ... reads as either 0 (false) or 1 (true).  Write
+                any nonzero value to invert the value attribute both
+                for reading and writing.  Existing and subsequent
+                poll(2) support configuration via the edge attribute
+                for "rising" and "falling" edges will follow this
+                setting.
+
 GPIO controllers have paths like /sys/class/gpio/gpiochip42/ (for the
 controller implementing GPIOs starting at #42) and have the following
 read-only attributes:
@@ -566,6 +573,8 @@ requested using gpio_request():
         int gpio_export_link(struct device *dev, const char *name,
                 unsigned gpio)
 
+        /* change the polarity of a GPIO node in sysfs */
+        int gpio_sysfs_set_active_low(unsigned gpio, int value);
 
 After a kernel driver requests a GPIO, it may only be made available in
 the sysfs interface by gpio_export().  The driver can control whether the
@@ -580,3 +589,9 @@ After the GPIO has been exported, gpio_export_link() allows creating
 symlinks from elsewhere in sysfs to the GPIO sysfs node.  Drivers can
 use this to provide the interface under their own device in sysfs with
 a descriptive name.
+
+Drivers can use gpio_sysfs_set_active_low() to hide GPIO line polarity
+differences between boards from user space.  This only affects the
+sysfs interface.  Polarity change can be done both before and after
+gpio_export(), and previously enabled poll(2) support for either
+rising or falling edge will be reconfigured to follow this setting.
diff --git a/Documentation/hwmon/lis3lv02d b/Documentation/hwmon/lis3lv02d
index effe949a7282..06534f25e643 100644
--- a/Documentation/hwmon/lis3lv02d
+++ b/Documentation/hwmon/lis3lv02d
@@ -3,7 +3,8 @@ Kernel driver lis3lv02d
 
 Supported chips:
 
-  * STMicroelectronics LIS3LV02DL and LIS3LV02DQ
+  * STMicroelectronics LIS3LV02DL, LIS3LV02DQ (12 bits precision)
+  * STMicroelectronics LIS302DL, LIS3L02DQ, LIS331DL (8 bits)
 
 Authors:
         Yan Burman <burman.yan@gmail.com>
@@ -13,32 +14,52 @@ Authors:
 Description
 -----------
 
-This driver provides support for the accelerometer found in various HP
-laptops sporting the feature officially called "HP Mobile Data
-Protection System 3D" or "HP 3D DriveGuard". It detects automatically
-laptops with this sensor. Known models (for now the HP 2133, nc6420,
-nc2510, nc8510, nc84x0, nw9440 and nx9420) will have their axis
-automatically oriented on standard way (eg: you can directly play
-neverball).  The accelerometer data is readable via
-/sys/devices/platform/lis3lv02d.
+This driver provides support for the accelerometer found in various HP laptops
+sporting the feature officially called "HP Mobile Data Protection System 3D" or
+"HP 3D DriveGuard". It detects automatically laptops with this sensor. Known
+models (full list can be found in drivers/hwmon/hp_accel.c) will have their
+axis automatically oriented on standard way (eg: you can directly play
+neverball). The accelerometer data is readable via
+/sys/devices/platform/lis3lv02d. Reported values are scaled
+to mg values (1/1000th of earth gravity).
 
 Sysfs attributes under /sys/devices/platform/lis3lv02d/:
 position - 3D position that the accelerometer reports. Format: "(x,y,z)"
-calibrate - read: values (x, y, z) that are used as the base for input
-                  class device operation.
-            write: forces the base to be recalibrated with the current
-                   position.
-rate - reports the sampling rate of the accelerometer device in HZ
+rate - read reports the sampling rate of the accelerometer device in HZ.
+        write changes sampling rate of the accelerometer device.
+        Only values which are supported by HW are accepted.
+selftest - performs selftest for the chip as specified by chip manufacturer.
 
 This driver also provides an absolute input class device, allowing
-the laptop to act as a pinball machine-esque joystick.
+the laptop to act as a pinball machine-esque joystick. Joystick device can be
+calibrated. Joystick device can be in two different modes.
+By default output values are scaled between -32768 .. 32767. In joystick raw
+mode, joystick and sysfs position entry have the same scale. There can be
+small difference due to input system fuzziness feature.
+Events are also available as input event device.
+
+Selftest is meant only for hardware diagnostic purposes. It is not meant to be
+used during normal operations. Position data is not corrupted during selftest
+but interrupt behaviour is not guaranteed to work reliably. In test mode, the
+sensing element is internally moved little bit. Selftest measures difference
+between normal mode and test mode. Chip specifications tell the acceptance
+limit for each type of the chip. Limits are provided via platform data
+to allow adjustment of the limits without a change to the actual driver.
+Seltest returns either "OK x y z" or "FAIL x y z" where x, y and z are
+measured difference between modes. Axes are not remapped in selftest mode.
+Measurement values are provided to help HW diagnostic applications to make
+final decision.
+
+On HP laptops, if the led infrastructure is activated, support for a led
+indicating disk protection will be provided as /sys/class/leds/hp::hddprotect.
 
 Another feature of the driver is misc device called "freefall" that
 acts similar to /dev/rtc and reacts on free-fall interrupts received
 from the device. It supports blocking operations, poll/select and
 fasync operation modes. You must read 1 bytes from the device.  The
 result is number of free-fall interrupts since the last successful
-read (or 255 if number of interrupts would not fit).
+read (or 255 if number of interrupts would not fit). See the hpfall.c
+file for an example on using the device.
 
 
 Axes orientation
@@ -55,7 +76,7 @@ the accelerometer are converted into a "standard" organisation of the axes
  * If the laptop is put upside-down, Z becomes negative
 
 If your laptop model is not recognized (cf "dmesg"), you can send an
-email to the authors to add it to the database.  When reporting a new
+email to the maintainer to add it to the database.  When reporting a new
 laptop, please include the output of "dmidecode" plus the value of
 /sys/devices/platform/lis3lv02d/position in these four cases.
 
diff --git a/Documentation/hwmon/w83627ehf b/Documentation/hwmon/w83627ehf
index 02b74899edaf..b7e42ec4b26b 100644
--- a/Documentation/hwmon/w83627ehf
+++ b/Documentation/hwmon/w83627ehf
@@ -81,8 +81,14 @@ pwm[1-4] - this file stores PWM duty cycle or DC value (fan speed) in range:
            0 (stop) to 255 (full)
 
 pwm[1-4]_enable - this file controls mode of fan/temperature control:
-        * 1 Manual Mode, write to pwm file any value 0-255 (full speed)
-        * 2 Thermal Cruise
+        * 1 Manual mode, write to pwm file any value 0-255 (full speed)
+        * 2 "Thermal Cruise" mode
+        * 3 "Fan Speed Cruise" mode
+        * 4 "Smart Fan III" mode
+
+pwm[1-4]_mode - controls if output is PWM or DC level
+        * 0 DC output (0 - 12v)
+        * 1 PWM output
 
 Thermal Cruise mode
 -------------------
diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients
index 7860aafb483d..0a74603eb671 100644
--- a/Documentation/i2c/writing-clients
+++ b/Documentation/i2c/writing-clients
@@ -44,7 +44,7 @@ static struct i2c_driver foo_driver = {
         /* if device autodetection is needed: */
         .class          = I2C_CLASS_SOMETHING,
         .detect         = foo_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 
         .shutdown       = foo_shutdown, /* optional */
         .suspend        = foo_suspend,  /* optional */
diff --git a/Documentation/infiniband/ipoib.txt b/Documentation/infiniband/ipoib.txt
index 6d40f00b358c..64eeb55d0c09 100644
--- a/Documentation/infiniband/ipoib.txt
+++ b/Documentation/infiniband/ipoib.txt
@@ -36,11 +36,11 @@ Datagram vs Connected modes
   fabric with a 2K MTU, the IPoIB MTU will be 2048 - 4 = 2044 bytes.
 
   In connected mode, the IB RC (Reliable Connected) transport is used.
-  Connected mode is to takes advantage of the connected nature of the
-  IB transport and allows an MTU up to the maximal IP packet size of
-  64K, which reduces the number of IP packets needed for handling
-  large UDP datagrams, TCP segments, etc and increases the performance
-  for large messages.
+  Connected mode takes advantage of the connected nature of the IB
+  transport and allows an MTU up to the maximal IP packet size of 64K,
+  which reduces the number of IP packets needed for handling large UDP
+  datagrams, TCP segments, etc and increases the performance for large
+  messages.
 
   In connected mode, the interface's UD QP is still used for multicast
   and communication with peers that don't support connected mode. In
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ab95d3ada5c7..5ba4d9dff113 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1032,7 +1032,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         No delay
 
         ip=             [IP_PNP]
-                        See Documentation/filesystems/nfsroot.txt.
+                        See Documentation/filesystems/nfs/nfsroot.txt.
 
         ip2=            [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards
                         See comment before ip2_setup() in
@@ -1553,10 +1553,10 @@ and is between 256 and 4096 characters. It is defined in the file
                         going to be removed in 2.6.29.
 
         nfsaddrs=       [NFS]
-                        See Documentation/filesystems/nfsroot.txt.
+                        See Documentation/filesystems/nfs/nfsroot.txt.
 
         nfsroot=        [NFS] nfs root filesystem for disk-less boxes.
-                        See Documentation/filesystems/nfsroot.txt.
+                        See Documentation/filesystems/nfs/nfsroot.txt.
 
         nfs.callback_tcpport=
                         [NFS] set the TCP port on which the NFSv4 callback
@@ -2729,6 +2729,11 @@ and is between 256 and 4096 characters. It is defined in the file
         vmpoff=         [KNL,S390] Perform z/VM CP command after power off.
                         Format: <command>
 
+        vt.cur_default= [VT] Default cursor shape.
+                        Format: 0xCCBBAA, where AA, BB, and CC are the same as
+                        the parameters of the <Esc>[?A;B;Cc escape sequence;
+                        see VGA-softcursor.txt. Default: 2 = underline.
+
         vt.default_blu= [VT]
                         Format: <blue0>,<blue1>,<blue2>,...,<blue15>
                         Change the default blue palette of the console.
diff --git a/Documentation/memory-hotplug.txt b/Documentation/memory-hotplug.txt
index bbc8a6a36921..57e7e9cc1870 100644
--- a/Documentation/memory-hotplug.txt
+++ b/Documentation/memory-hotplug.txt
@@ -160,12 +160,15 @@ Under each section, you can see 4 files.
 NOTE:
   These directories/files appear after physical memory hotplug phase.
 
-If CONFIG_NUMA is enabled the
-/sys/devices/system/memory/memoryXXX memory section
-directories can also be accessed via symbolic links located in
-the /sys/devices/system/node/node* directories.  For example:
+If CONFIG_NUMA is enabled the memoryXXX/ directories can also be accessed
+via symbolic links located in the /sys/devices/system/node/node* directories.
+
+For example:
 /sys/devices/system/node/node0/memory9 -> ../../memory/memory9
 
+A backlink will also be created:
+/sys/devices/system/memory/memory9/node0 -> ../../node/node0
+
 --------------------------------
 4. Physical memory hot-add phase
 --------------------------------
diff --git a/Documentation/misc-devices/ad525x_dpot.txt b/Documentation/misc-devices/ad525x_dpot.txt
new file mode 100644
index 000000000000..0c9413b1cbf3
--- /dev/null
+++ b/Documentation/misc-devices/ad525x_dpot.txt
@@ -0,0 +1,57 @@
+---------------------------------
+  AD525x Digital Potentiometers
+---------------------------------
+
+The ad525x_dpot driver exports a simple sysfs interface.  This allows you to
+work with the immediate resistance settings as well as update the saved startup
+settings.  Access to the factory programmed tolerance is also provided, but
+interpretation of this settings is required by the end application according to
+the specific part in use.
+
+---------
+  Files
+---------
+
+Each dpot device will have a set of eeprom, rdac, and tolerance files.  How
+many depends on the actual part you have, as will the range of allowed values.
+
+The eeprom files are used to program the startup value of the device.
+
+The rdac files are used to program the immediate value of the device.
+
+The tolerance files are the read-only factory programmed tolerance settings
+and may vary greatly on a part-by-part basis.  For exact interpretation of
+this field, please consult the datasheet for your part.  This is presented
+as a hex file for easier parsing.
+
+-----------
+  Example
+-----------
+
+Locate the device in your sysfs tree.  This is probably easiest by going into
+the common i2c directory and locating the device by the i2c slave address.
+
+        # ls /sys/bus/i2c/devices/
+        0-0022  0-0027  0-002f
+
+So assuming the device in question is on the first i2c bus and has the slave
+address of 0x2f, we descend (unrelated sysfs entries have been trimmed).
+
+        # ls /sys/bus/i2c/devices/0-002f/
+        eeprom0 rdac0 tolerance0
+
+You can use simple reads/writes to access these files:
+
+        # cd /sys/bus/i2c/devices/0-002f/
+
+        # cat eeprom0
+        0
+        # echo 10 > eeprom0
+        # cat eeprom0
+        10
+
+        # cat rdac0
+        5
+        # echo 3 > rdac0
+        # cat rdac0
+        3
diff --git a/Documentation/nommu-mmap.txt b/Documentation/nommu-mmap.txt
index b565e8279d13..8e1ddec2c78a 100644
--- a/Documentation/nommu-mmap.txt
+++ b/Documentation/nommu-mmap.txt
@@ -119,6 +119,32 @@ FURTHER NOTES ON NO-MMU MMAP
      granule but will only discard the excess if appropriately configured as
      this has an effect on fragmentation.
 
+ (*) The memory allocated by a request for an anonymous mapping will normally
+     be cleared by the kernel before being returned in accordance with the
+     Linux man pages (ver 2.22 or later).
+
+     In the MMU case this can be achieved with reasonable performance as
+     regions are backed by virtual pages, with the contents only being mapped
+     to cleared physical pages when a write happens on that specific page
+     (prior to which, the pages are effectively mapped to the global zero page
+     from which reads can take place).  This spreads out the time it takes to
+     initialize the contents of a page - depending on the write-usage of the
+     mapping.
+
+     In the no-MMU case, however, anonymous mappings are backed by physical
+     pages, and the entire map is cleared at allocation time.  This can cause
+     significant delays during a userspace malloc() as the C library does an
+     anonymous mapping and the kernel then does a memset for the entire map.
+
+     However, for memory that isn't required to be precleared - such as that
+     returned by malloc() - mmap() can take a MAP_UNINITIALIZED flag to
+     indicate to the kernel that it shouldn't bother clearing the memory before
+     returning it.  Note that CONFIG_MMAP_ALLOW_UNINITIALIZED must be enabled
+     to permit this, otherwise the flag will be ignored.
+
+     uClibc uses this to speed up malloc(), and the ELF-FDPIC binfmt uses this
+     to allocate the brk and stack region.
+
  (*) A list of all the private copy and anonymous mappings on the system is
      visible through /proc/maps in no-MMU mode.
 
diff --git a/Documentation/powerpc/dts-bindings/4xx/ppc440spe-adma.txt b/Documentation/powerpc/dts-bindings/4xx/ppc440spe-adma.txt
new file mode 100644
index 000000000000..515ebcf1b97d
--- /dev/null
+++ b/Documentation/powerpc/dts-bindings/4xx/ppc440spe-adma.txt
@@ -0,0 +1,93 @@
+PPC440SPe DMA/XOR (DMA Controller and XOR Accelerator)
+
+Device nodes needed for operation of the ppc440spe-adma driver
+are specified hereby. These are I2O/DMA, DMA and XOR nodes
+for DMA engines and Memory Queue Module node. The latter is used
+by ADMA driver for configuration of RAID-6 H/W capabilities of
+the PPC440SPe. In addition to the nodes and properties described
+below, the ranges property of PLB node must specify ranges for
+DMA devices.
+
+ i) The I2O node
+
+ Required properties:
+
+ - compatible           : "ibm,i2o-440spe";
+ - reg                  : <registers mapping>
+ - dcr-reg              : <DCR registers range>
+
+ Example:
+
+        I2O: i2o@400100000 {
+                compatible = "ibm,i2o-440spe";
+                reg = <0x00000004 0x00100000 0x100>;
+                dcr-reg = <0x060 0x020>;
+        };
+
+
+ ii) The DMA node
+
+ Required properties:
+
+ - compatible           : "ibm,dma-440spe";
+ - cell-index           : 1 cell, hardware index of the DMA engine
+                          (typically 0x0 and 0x1 for DMA0 and DMA1)
+ - reg                  : <registers mapping>
+ - dcr-reg              : <DCR registers range>
+ - interrupts           : <interrupt mapping for DMA0/1 interrupts sources:
+                           2 sources: DMAx CS FIFO Needs Service IRQ (on UIC0)
+                           and DMA Error IRQ (on UIC1). The latter is common
+                           for both DMA engines>.
+ - interrupt-parent     : needed for interrupt mapping
+
+ Example:
+
+        DMA0: dma0@400100100 {
+                compatible = "ibm,dma-440spe";
+                cell-index = <0>;
+                reg = <0x00000004 0x00100100 0x100>;
+                dcr-reg = <0x060 0x020>;
+                interrupt-parent = <&DMA0>;
+                interrupts = <0 1>;
+                #interrupt-cells = <1>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                interrupt-map = <
+                        0 &UIC0 0x14 4
+                        1 &UIC1 0x16 4>;
+        };
+
+
+ iii) XOR Accelerator node
+
+ Required properties:
+
+ - compatible           : "amcc,xor-accelerator";
+ - reg                  : <registers mapping>
+ - interrupts           : <interrupt mapping for XOR interrupt source>
+ - interrupt-parent     : for interrupt mapping
+
+ Example:
+
+        xor-accel@400200000 {
+                compatible = "amcc,xor-accelerator";
+                reg = <0x00000004 0x00200000 0x400>;
+                interrupt-parent = <&UIC1>;
+                interrupts = <0x1f 4>;
+        };
+
+
+ iv) Memory Queue Module node
+
+ Required properties:
+
+ - compatible           : "ibm,mq-440spe";
+ - dcr-reg              : <DCR registers range>
+
+ Example:
+
+        MQ0: mq {
+                compatible = "ibm,mq-440spe";
+                dcr-reg = <0x040 0x020>;
+        };
+
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index 319d9838e87e..1800a62cf135 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -12,6 +12,7 @@ m5602		0402:5602	ALi Video Camera Controller
 spca501         040a:0002       Kodak DVC-325
 spca500         040a:0300       Kodak EZ200
 zc3xx           041e:041e       Creative WebCam Live!
+ov519           041e:4003       Video Blaster WebCam Go Plus
 spca500         041e:400a       Creative PC-CAM 300
 sunplus         041e:400b       Creative PC-CAM 600
 sunplus         041e:4012       PC-Cam350
@@ -168,10 +169,14 @@ sunplus		055f:c650	Mustek MDC5500Z
 zc3xx           055f:d003       Mustek WCam300A
 zc3xx           055f:d004       Mustek WCam300 AN
 conex           0572:0041       Creative Notebook cx11646
+ov519           05a9:0511       Video Blaster WebCam 3/WebCam Plus, D-Link USB Digital Video Camera
+ov519           05a9:0518       Creative WebCam
 ov519           05a9:0519       OV519 Microphone
 ov519           05a9:0530       OmniVision
+ov519           05a9:2800       OmniVision SuperCAM
 ov519           05a9:4519       Webcam Classic
 ov519           05a9:8519       OmniVision
+ov519           05a9:a511       D-Link USB Digital Video Camera
 ov519           05a9:a518       D-Link DSB-C310 Webcam
 sunplus         05da:1018       Digital Dream Enigma 1.3
 stk014          05e1:0893       Syntek DV4000
@@ -187,7 +192,7 @@ ov534		06f8:3002	Hercules Blog Webcam
 ov534           06f8:3003       Hercules Dualpix HD Weblog
 sonixj          06f8:3004       Hercules Classic Silver
 sonixj          06f8:3008       Hercules Deluxe Optical Glass
-pac7311         06f8:3009       Hercules Classic Link
+pac7302         06f8:3009       Hercules Classic Link
 spca508         0733:0110       ViewQuest VQ110
 spca501         0733:0401       Intel Create and Share
 spca501         0733:0402       ViewQuest M318B
@@ -199,6 +204,7 @@ sunplus		0733:2221	Mercury Digital Pro 3.1p
 sunplus         0733:3261       Concord 3045 spca536a
 sunplus         0733:3281       Cyberpix S550V
 spca506         0734:043b       3DeMon USB Capture aka
+ov519           0813:0002       Dual Mode USB Camera Plus
 spca500         084d:0003       D-Link DSC-350
 spca500         08ca:0103       Aiptek PocketDV
 sunplus         08ca:0104       Aiptek PocketDVII 1.3
@@ -236,15 +242,15 @@ pac7311		093a:2603	Philips SPC 500 NC
 pac7311         093a:2608       Trust WB-3300p
 pac7311         093a:260e       Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350
 pac7311         093a:260f       SnakeCam
-pac7311         093a:2620       Apollo AC-905
-pac7311         093a:2621       PAC731x
-pac7311         093a:2622       Genius Eye 312
-pac7311         093a:2624       PAC7302
-pac7311         093a:2626       Labtec 2200
-pac7311         093a:2628       Genius iLook 300
-pac7311         093a:2629       Genious iSlim 300
-pac7311         093a:262a       Webcam 300k
-pac7311         093a:262c       Philips SPC 230 NC
+pac7302         093a:2620       Apollo AC-905
+pac7302         093a:2621       PAC731x
+pac7302         093a:2622       Genius Eye 312
+pac7302         093a:2624       PAC7302
+pac7302         093a:2626       Labtec 2200
+pac7302         093a:2628       Genius iLook 300
+pac7302         093a:2629       Genious iSlim 300
+pac7302         093a:262a       Webcam 300k
+pac7302         093a:262c       Philips SPC 230 NC
 jeilinj         0979:0280       Sakar 57379
 zc3xx           0ac8:0302       Z-star Vimicro zc0302
 vc032x          0ac8:0321       Vimicro generic vc0321
@@ -259,6 +265,7 @@ vc032x		0ac8:c002	Sony embedded vimicro
 vc032x          0ac8:c301       Samsung Q1 Ultra Premium
 spca508         0af9:0010       Hama USB Sightcam 100
 spca508         0af9:0011       Hama USB Sightcam 100
+ov519           0b62:0059       iBOT2 Webcam
 sonixb          0c45:6001       Genius VideoCAM NB
 sonixb          0c45:6005       Microdia Sweex Mini Webcam
 sonixb          0c45:6007       Sonix sn9c101 + Tas5110D
@@ -318,8 +325,10 @@ sn9c20x		0c45:62b3	PC Camera (SN9C202 + OV9655)
 sn9c20x         0c45:62bb       PC Camera (SN9C202 + OV7660)
 sn9c20x         0c45:62bc       PC Camera (SN9C202 + HV7131R)
 sunplus         0d64:0303       Sunplus FashionCam DXG
+ov519           0e96:c001       TRUST 380 USB2 SPACEC@M
 etoms           102c:6151       Qcam Sangha CIF
 etoms           102c:6251       Qcam xxxxxx VGA
+ov519           1046:9967       W9967CF/W9968CF WebCam IC, Video Blaster WebCam Go
 zc3xx           10fd:0128       Typhoon Webshot II USB 300k 0x0128
 spca561         10fd:7e50       FlyCam Usb 100
 zc3xx           10fd:8050       Typhoon Webshot II USB 300k
@@ -332,7 +341,12 @@ spca501		1776:501c	Arowana 300K CMOS Camera
 t613            17a1:0128       TASCORP JPEG Webcam, NGS Cyclops
 vc032x          17ef:4802       Lenovo Vc0323+MI1310_SOC
 pac207          2001:f115       D-Link DSB-C120
+sq905c          2770:9050       sq905c
+sq905c          2770:905c       DualCamera
+sq905           2770:9120       Argus Digital Camera DC1512
+sq905c          2770:913d       sq905c
 spca500         2899:012c       Toptro Industrial
+ov519           8020:ef04       ov519
 spca508         8086:0110       Intel Easy PC Camera
 spca500         8086:0630       Intel Pocket PC Camera
 spca506         99fa:8988       Grandtec V.cap
diff --git a/Documentation/video4linux/sh_mobile_ceu_camera.txt b/Documentation/video4linux/sh_mobile_ceu_camera.txt
new file mode 100644
index 000000000000..2ae16349a78d
--- /dev/null
+++ b/Documentation/video4linux/sh_mobile_ceu_camera.txt
@@ -0,0 +1,157 @@
+        Cropping and Scaling algorithm, used in the sh_mobile_ceu_camera driver
+        =======================================================================
+
+Terminology
+-----------
+
+sensor scales: horizontal and vertical scales, configured by the sensor driver
+host scales: -"- host driver
+combined scales: sensor_scale * host_scale
+
+
+Generic scaling / cropping scheme
+---------------------------------
+
+-1--
+|
+-2-- -\
+|      --\
+|         --\
++-5-- -\     -- -3--
+|       ---\
+|           --- -4-- -\
+|                      -\
+|                        - -6--
+|
+|                        - -6'-
+|                      -/
+|           --- -4'- -/
+|       ---/
++-5'- -/
+|            -- -3'-
+|         --/
+|      --/
+-2'- -/
+|
+|
+-1'-
+
+Produced by user requests:
+
+S_CROP(left / top = (5) - (1), width / height = (5') - (5))
+S_FMT(width / height = (6') - (6))
+
+Here:
+
+(1) to (1') - whole max width or height
+(1) to (2)  - sensor cropped left or top
+(2) to (2') - sensor cropped width or height
+(3) to (3') - sensor scale
+(3) to (4)  - CEU cropped left or top
+(4) to (4') - CEU cropped width or height
+(5) to (5') - reverse sensor scale applied to CEU cropped width or height
+(2) to (5)  - reverse sensor scale applied to CEU cropped left or top
+(6) to (6') - CEU scale - user window
+
+
+S_FMT
+-----
+
+Do not touch input rectangle - it is already optimal.
+
+1. Calculate current sensor scales:
+
+        scale_s = ((3') - (3)) / ((2') - (2))
+
+2. Calculate "effective" input crop (sensor subwindow) - CEU crop scaled back at
+current sensor scales onto input window - this is user S_CROP:
+
+        width_u = (5') - (5) = ((4') - (4)) * scale_s
+
+3. Calculate new combined scales from "effective" input window to requested user
+window:
+
+        scale_comb = width_u / ((6') - (6))
+
+4. Calculate sensor output window by applying combined scales to real input
+window:
+
+        width_s_out = ((2') - (2)) / scale_comb
+
+5. Apply iterative sensor S_FMT for sensor output window.
+
+        subdev->video_ops->s_fmt(.width = width_s_out)
+
+6. Retrieve sensor output window (g_fmt)
+
+7. Calculate new sensor scales:
+
+        scale_s_new = ((3')_new - (3)_new) / ((2') - (2))
+
+8. Calculate new CEU crop - apply sensor scales to previously calculated
+"effective" crop:
+
+        width_ceu = (4')_new - (4)_new = width_u / scale_s_new
+        left_ceu = (4)_new - (3)_new = ((5) - (2)) / scale_s_new
+
+9. Use CEU cropping to crop to the new window:
+
+        ceu_crop(.width = width_ceu, .left = left_ceu)
+
+10. Use CEU scaling to scale to the requested user window:
+
+        scale_ceu = width_ceu / width
+
+
+S_CROP
+------
+
+If old scale applied to new crop is invalid produce nearest new scale possible
+
+1. Calculate current combined scales.
+
+        scale_comb = (((4') - (4)) / ((6') - (6))) * (((2') - (2)) / ((3') - (3)))
+
+2. Apply iterative sensor S_CROP for new input window.
+
+3. If old combined scales applied to new crop produce an impossible user window,
+adjust scales to produce nearest possible window.
+
+        width_u_out = ((5') - (5)) / scale_comb
+
+        if (width_u_out > max)
+                scale_comb = ((5') - (5)) / max;
+        else if (width_u_out < min)
+                scale_comb = ((5') - (5)) / min;
+
+4. Issue G_CROP to retrieve actual input window.
+
+5. Using actual input window and calculated combined scales calculate sensor
+target output window.
+
+        width_s_out = ((3') - (3)) = ((2') - (2)) / scale_comb
+
+6. Apply iterative S_FMT for new sensor target output window.
+
+7. Issue G_FMT to retrieve the actual sensor output window.
+
+8. Calculate sensor scales.
+
+        scale_s = ((3') - (3)) / ((2') - (2))
+
+9. Calculate sensor output subwindow to be cropped on CEU by applying sensor
+scales to the requested window.
+
+        width_ceu = ((5') - (5)) / scale_s
+
+10. Use CEU cropping for above calculated window.
+
+11. Calculate CEU scales from sensor scales from results of (10) and user window
+from (3)
+
+        scale_ceu = calc_scale(((5') - (5)), &width_u_out)
+
+12. Apply CEU scales.
+
+--
+Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt
index b806edaf3e75..74d677c8b036 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -561,6 +561,8 @@ video_device helper functions
 
 There are a few useful helper functions:
 
+- file/video_device private data
+
 You can set/get driver private data in the video_device struct using:
 
 void *video_get_drvdata(struct video_device *vdev);
@@ -575,8 +577,7 @@ struct video_device *video_devdata(struct file *file);
 
 returns the video_device belonging to the file struct.
 
-The final helper function combines video_get_drvdata with
-video_devdata:
+The video_drvdata function combines video_get_drvdata with video_devdata:
 
 void *video_drvdata(struct file *file);
 
@@ -584,6 +585,17 @@ You can go from a video_device struct to the v4l2_device struct using:
 
 struct v4l2_device *v4l2_dev = vdev->v4l2_dev;
 
+- Device node name
+
+The video_device node kernel name can be retrieved using
+
+const char *video_device_node_name(struct video_device *vdev);
+
+The name is used as a hint by userspace tools such as udev. The function
+should be used where possible instead of accessing the video_device::num and
+video_device::minor fields.
+
+
 video buffer helper functions
 -----------------------------
 
diff --git a/Documentation/vm/hugetlbpage.txt b/Documentation/vm/hugetlbpage.txt
index 82a7bd1800b2..bc31636973e3 100644
--- a/Documentation/vm/hugetlbpage.txt
+++ b/Documentation/vm/hugetlbpage.txt
@@ -11,23 +11,21 @@ This optimization is more critical now as bigger and bigger physical memories
 (several GBs) are more readily available.
 
 Users can use the huge page support in Linux kernel by either using the mmap
-system call or standard SYSv shared memory system calls (shmget, shmat).
+system call or standard SYSV shared memory system calls (shmget, shmat).
 
 First the Linux kernel needs to be built with the CONFIG_HUGETLBFS
 (present under "File systems") and CONFIG_HUGETLB_PAGE (selected
 automatically when CONFIG_HUGETLBFS is selected) configuration
 options.
 
-The kernel built with huge page support should show the number of configured
-huge pages in the system by running the "cat /proc/meminfo" command.
+The /proc/meminfo file provides information about the total number of
+persistent hugetlb pages in the kernel's huge page pool.  It also displays
+information about the number of free, reserved and surplus huge pages and the
+default huge page size.  The huge page size is needed for generating the
+proper alignment and size of the arguments to system calls that map huge page
+regions.
 
-/proc/meminfo also provides information about the total number of hugetlb
-pages configured in the kernel.  It also displays information about the
-number of free hugetlb pages at any time.  It also displays information about
-the configured huge page size - this is needed for generating the proper
-alignment and size of the arguments to the above system calls.
-
-The output of "cat /proc/meminfo" will have lines like:
+The output of "cat /proc/meminfo" will include lines like:
 
 .....
 HugePages_Total: vvv
@@ -53,59 +51,63 @@ HugePages_Surp  is short for "surplus," and is the number of huge pages in
 /proc/filesystems should also show a filesystem of type "hugetlbfs" configured
 in the kernel.
 
-/proc/sys/vm/nr_hugepages indicates the current number of configured hugetlb
-pages in the kernel.  Super user can dynamically request more (or free some
-pre-configured) huge pages.
-The allocation (or deallocation) of hugetlb pages is possible only if there are
-enough physically contiguous free pages in system (freeing of huge pages is
-possible only if there are enough hugetlb pages free that can be transferred
-back to regular memory pool).
+/proc/sys/vm/nr_hugepages indicates the current number of "persistent" huge
+pages in the kernel's huge page pool.  "Persistent" huge pages will be
+returned to the huge page pool when freed by a task.  A user with root
+privileges can dynamically allocate more or free some persistent huge pages
+by increasing or decreasing the value of 'nr_hugepages'.
 
-Pages that are used as hugetlb pages are reserved inside the kernel and cannot
-be used for other purposes.
+Pages that are used as huge pages are reserved inside the kernel and cannot
+be used for other purposes.  Huge pages cannot be swapped out under
+memory pressure.
 
-Once the kernel with Hugetlb page support is built and running, a user can
-use either the mmap system call or shared memory system calls to start using
-the huge pages.  It is required that the system administrator preallocate
-enough memory for huge page purposes.
+Once a number of huge pages have been pre-allocated to the kernel huge page
+pool, a user with appropriate privilege can use either the mmap system call
+or shared memory system calls to use the huge pages.  See the discussion of
+Using Huge Pages, below.
 
-The administrator can preallocate huge pages on the kernel boot command line by
-specifying the "hugepages=N" parameter, where 'N' = the number of huge pages
-requested.  This is the most reliable method for preallocating huge pages as
-memory has not yet become fragmented.
+The administrator can allocate persistent huge pages on the kernel boot
+command line by specifying the "hugepages=N" parameter, where 'N' = the
+number of huge pages requested.  This is the most reliable method of
+allocating huge pages as memory has not yet become fragmented.
 
-Some platforms support multiple huge page sizes.  To preallocate huge pages
+Some platforms support multiple huge page sizes.  To allocate huge pages
 of a specific size, one must preceed the huge pages boot command parameters
 with a huge page size selection parameter "hugepagesz=<size>".  <size> must
 be specified in bytes with optional scale suffix [kKmMgG].  The default huge
 page size may be selected with the "default_hugepagesz=<size>" boot parameter.
 
-/proc/sys/vm/nr_hugepages indicates the current number of configured [default
-size] hugetlb pages in the kernel.  Super user can dynamically request more
-(or free some pre-configured) huge pages.
-
-Use the following command to dynamically allocate/deallocate default sized
-huge pages:
+When multiple huge page sizes are supported, /proc/sys/vm/nr_hugepages
+indicates the current number of pre-allocated huge pages of the default size.
+Thus, one can use the following command to dynamically allocate/deallocate
+default sized persistent huge pages:
 
         echo 20 > /proc/sys/vm/nr_hugepages
 
-This command will try to configure 20 default sized huge pages in the system.
+This command will try to adjust the number of default sized huge pages in the
+huge page pool to 20, allocating or freeing huge pages, as required.
+
 On a NUMA platform, the kernel will attempt to distribute the huge page pool
-over the all on-line nodes.  These huge pages, allocated when nr_hugepages
-is increased, are called "persistent huge pages".
+over all the set of allowed nodes specified by the NUMA memory policy of the
+task that modifies nr_hugepages.  The default for the allowed nodes--when the
+task has default memory policy--is all on-line nodes with memory.  Allowed
+nodes with insufficient available, contiguous memory for a huge page will be
+silently skipped when allocating persistent huge pages.  See the discussion
+below of the interaction of task memory policy, cpusets and per node attributes
+with the allocation and freeing of persistent huge pages.
 
 The success or failure of huge page allocation depends on the amount of
-physically contiguous memory that is preset in system at the time of the
+physically contiguous memory that is present in system at the time of the
 allocation attempt.  If the kernel is unable to allocate huge pages from
 some nodes in a NUMA system, it will attempt to make up the difference by
 allocating extra pages on other nodes with sufficient available contiguous
 memory, if any.
 
-System administrators may want to put this command in one of the local rc init
-files.  This will enable the kernel to request huge pages early in the boot
-process when the possibility of getting physical contiguous pages is still
-very high.  Administrators can verify the number of huge pages actually
-allocated by checking the sysctl or meminfo.  To check the per node
+System administrators may want to put this command in one of the local rc
+init files.  This will enable the kernel to allocate huge pages early in
+the boot process when the possibility of getting physical contiguous pages
+is still very high.  Administrators can verify the number of huge pages
+actually allocated by checking the sysctl or meminfo.  To check the per node
 distribution of huge pages in a NUMA system, use:
 
         cat /sys/devices/system/node/node*/meminfo | fgrep Huge
@@ -113,45 +115,47 @@ distribution of huge pages in a NUMA system, use:
 /proc/sys/vm/nr_overcommit_hugepages specifies how large the pool of
 huge pages can grow, if more huge pages than /proc/sys/vm/nr_hugepages are
 requested by applications.  Writing any non-zero value into this file
-indicates that the hugetlb subsystem is allowed to try to obtain "surplus"
-huge pages from the buddy allocator, when the normal pool is exhausted. As
-these surplus huge pages go out of use, they are freed back to the buddy
-allocator.
+indicates that the hugetlb subsystem is allowed to try to obtain that
+number of "surplus" huge pages from the kernel's normal page pool, when the
+persistent huge page pool is exhausted. As these surplus huge pages become
+unused, they are freed back to the kernel's normal page pool.
 
-When increasing the huge page pool size via nr_hugepages, any surplus
+When increasing the huge page pool size via nr_hugepages, any existing surplus
 pages will first be promoted to persistent huge pages.  Then, additional
 huge pages will be allocated, if necessary and if possible, to fulfill
-the new huge page pool size.
+the new persistent huge page pool size.
 
-The administrator may shrink the pool of preallocated huge pages for
+The administrator may shrink the pool of persistent huge pages for
 the default huge page size by setting the nr_hugepages sysctl to a
 smaller value.  The kernel will attempt to balance the freeing of huge pages
-across all on-line nodes.  Any free huge pages on the selected nodes will
-be freed back to the buddy allocator.
-
-Caveat: Shrinking the pool via nr_hugepages such that it becomes less
-than the number of huge pages in use will convert the balance to surplus
-huge pages even if it would exceed the overcommit value.  As long as
-this condition holds, however, no more surplus huge pages will be
-allowed on the system until one of the two sysctls are increased
-sufficiently, or the surplus huge pages go out of use and are freed.
+across all nodes in the memory policy of the task modifying nr_hugepages.
+Any free huge pages on the selected nodes will be freed back to the kernel's
+normal page pool.
+
+Caveat: Shrinking the persistent huge page pool via nr_hugepages such that
+it becomes less than the number of huge pages in use will convert the balance
+of the in-use huge pages to surplus huge pages.  This will occur even if
+the number of surplus pages it would exceed the overcommit value.  As long as
+this condition holds--that is, until nr_hugepages+nr_overcommit_hugepages is
+increased sufficiently, or the surplus huge pages go out of use and are freed--
+no more surplus huge pages will be allowed to be allocated.
 
 With support for multiple huge page pools at run-time available, much of
-the huge page userspace interface has been duplicated in sysfs. The above
-information applies to the default huge page size which will be
-controlled by the /proc interfaces for backwards compatibility. The root
-huge page control directory in sysfs is:
+the huge page userspace interface in /proc/sys/vm has been duplicated in sysfs.
+The /proc interfaces discussed above have been retained for backwards
+compatibility. The root huge page control directory in sysfs is:
 
         /sys/kernel/mm/hugepages
 
 For each huge page size supported by the running kernel, a subdirectory
-will exist, of the form
+will exist, of the form:
 
         hugepages-${size}kB
 
 Inside each of these directories, the same set of files will exist:
 
         nr_hugepages
+        nr_hugepages_mempolicy
         nr_overcommit_hugepages
         free_hugepages
         resv_hugepages
@@ -159,6 +163,102 @@ Inside each of these directories, the same set of files will exist:
 
 which function as described above for the default huge page-sized case.
 
+
+Interaction of Task Memory Policy with Huge Page Allocation/Freeing
+
+Whether huge pages are allocated and freed via the /proc interface or
+the /sysfs interface using the nr_hugepages_mempolicy attribute, the NUMA
+nodes from which huge pages are allocated or freed are controlled by the
+NUMA memory policy of the task that modifies the nr_hugepages_mempolicy
+sysctl or attribute.  When the nr_hugepages attribute is used, mempolicy
+is ignored.
+
+The recommended method to allocate or free huge pages to/from the kernel
+huge page pool, using the nr_hugepages example above, is:
+
+    numactl --interleave <node-list> echo 20 \
+                                >/proc/sys/vm/nr_hugepages_mempolicy
+
+or, more succinctly:
+
+    numactl -m <node-list> echo 20 >/proc/sys/vm/nr_hugepages_mempolicy
+
+This will allocate or free abs(20 - nr_hugepages) to or from the nodes
+specified in <node-list>, depending on whether number of persistent huge pages
+is initially less than or greater than 20, respectively.  No huge pages will be
+allocated nor freed on any node not included in the specified <node-list>.
+
+When adjusting the persistent hugepage count via nr_hugepages_mempolicy, any
+memory policy mode--bind, preferred, local or interleave--may be used.  The
+resulting effect on persistent huge page allocation is as follows:
+
+1) Regardless of mempolicy mode [see Documentation/vm/numa_memory_policy.txt],
+   persistent huge pages will be distributed across the node or nodes
+   specified in the mempolicy as if "interleave" had been specified.
+   However, if a node in the policy does not contain sufficient contiguous
+   memory for a huge page, the allocation will not "fallback" to the nearest
+   neighbor node with sufficient contiguous memory.  To do this would cause
+   undesirable imbalance in the distribution of the huge page pool, or
+   possibly, allocation of persistent huge pages on nodes not allowed by
+   the task's memory policy.
+
+2) One or more nodes may be specified with the bind or interleave policy.
+   If more than one node is specified with the preferred policy, only the
+   lowest numeric id will be used.  Local policy will select the node where
+   the task is running at the time the nodes_allowed mask is constructed.
+   For local policy to be deterministic, the task must be bound to a cpu or
+   cpus in a single node.  Otherwise, the task could be migrated to some
+   other node at any time after launch and the resulting node will be
+   indeterminate.  Thus, local policy is not very useful for this purpose.
+   Any of the other mempolicy modes may be used to specify a single node.
+
+3) The nodes allowed mask will be derived from any non-default task mempolicy,
+   whether this policy was set explicitly by the task itself or one of its
+   ancestors, such as numactl.  This means that if the task is invoked from a
+   shell with non-default policy, that policy will be used.  One can specify a
+   node list of "all" with numactl --interleave or --membind [-m] to achieve
+   interleaving over all nodes in the system or cpuset.
+
+4) Any task mempolicy specifed--e.g., using numactl--will be constrained by
+   the resource limits of any cpuset in which the task runs.  Thus, there will
+   be no way for a task with non-default policy running in a cpuset with a
+   subset of the system nodes to allocate huge pages outside the cpuset
+   without first moving to a cpuset that contains all of the desired nodes.
+
+5) Boot-time huge page allocation attempts to distribute the requested number
+   of huge pages over all on-lines nodes with memory.
+
+Per Node Hugepages Attributes
+
+A subset of the contents of the root huge page control directory in sysfs,
+described above, will be replicated under each the system device of each
+NUMA node with memory in:
+
+        /sys/devices/system/node/node[0-9]*/hugepages/
+
+Under this directory, the subdirectory for each supported huge page size
+contains the following attribute files:
+
+        nr_hugepages
+        free_hugepages
+        surplus_hugepages
+
+The free_' and surplus_' attribute files are read-only.  They return the number
+of free and surplus [overcommitted] huge pages, respectively, on the parent
+node.
+
+The nr_hugepages attribute returns the total number of huge pages on the
+specified node.  When this attribute is written, the number of persistent huge
+pages on the parent node will be adjusted to the specified value, if sufficient
+resources exist, regardless of the task's mempolicy or cpuset constraints.
+
+Note that the number of overcommit and reserve pages remain global quantities,
+as we don't know until fault time, when the faulting task's mempolicy is
+applied, from which node the huge page allocation will be attempted.
+
+
+Using Huge Pages
+
 If the user applications are going to request huge pages using mmap system
 call, then it is required that system administrator mount a file system of
 type hugetlbfs:
@@ -206,9 +306,11 @@ map_hugetlb.c.
  * requesting huge pages.
  *
  * For the ia64 architecture, the Linux kernel reserves Region number 4 for
- * huge pages.  That means the addresses starting with 0x800000... will need
- * to be specified.  Specifying a fixed address is not required on ppc64,
- * i386 or x86_64.
+ * huge pages.  That means that if one requires a fixed address, a huge page
+ * aligned address starting with 0x800000... will be required.  If a fixed
+ * address is not required, the kernel will select an address in the proper
+ * range.
+ * Other architectures, such as ppc64, i386 or x86_64 are not so constrained.
  *
  * Note: The default shared memory limit is quite low on many kernels,
  * you may need to increase it via:
@@ -237,14 +339,8 @@ map_hugetlb.c.
 
 #define dprintf(x)  printf(x)
 
-/* Only ia64 requires this */
-#ifdef __ia64__
-#define ADDR (void *)(0x8000000000000000UL)
-#define SHMAT_FLAGS (SHM_RND)
-#else
-#define ADDR (void *)(0x0UL)
+#define ADDR (void *)(0x0UL)    /* let kernel choose address */
 #define SHMAT_FLAGS (0)
-#endif
 
 int main(void)
 {
@@ -302,10 +398,12 @@ int main(void)
  * example, the app is requesting memory of size 256MB that is backed by
  * huge pages.
  *
- * For ia64 architecture, Linux kernel reserves Region number 4 for huge pages.
- * That means the addresses starting with 0x800000... will need to be
- * specified.  Specifying a fixed address is not required on ppc64, i386
- * or x86_64.
+ * For the ia64 architecture, the Linux kernel reserves Region number 4 for
+ * huge pages.  That means that if one requires a fixed address, a huge page
+ * aligned address starting with 0x800000... will be required.  If a fixed
+ * address is not required, the kernel will select an address in the proper
+ * range.
+ * Other architectures, such as ppc64, i386 or x86_64 are not so constrained.
  */
 #include <stdlib.h>
 #include <stdio.h>
@@ -317,14 +415,8 @@ int main(void)
 #define LENGTH (256UL*1024*1024)
 #define PROTECTION (PROT_READ | PROT_WRITE)
 
-/* Only ia64 requires this */
-#ifdef __ia64__
-#define ADDR (void *)(0x8000000000000000UL)
-#define FLAGS (MAP_SHARED | MAP_FIXED)
-#else
-#define ADDR (void *)(0x0UL)
+#define ADDR (void *)(0x0UL)    /* let kernel choose address */
 #define FLAGS (MAP_SHARED)
-#endif
 
 void check_bytes(char *addr)
 {
diff --git a/Documentation/vm/ksm.txt b/Documentation/vm/ksm.txt
index 262d8e6793a3..b392e496f816 100644
--- a/Documentation/vm/ksm.txt
+++ b/Documentation/vm/ksm.txt
@@ -16,9 +16,9 @@ by sharing the data common between them.  But it can be useful to any
 application which generates many instances of the same data.
 
 KSM only merges anonymous (private) pages, never pagecache (file) pages.
-KSM's merged pages are at present locked into kernel memory for as long
-as they are shared: so cannot be swapped out like the user pages they
-replace (but swapping KSM pages should follow soon in a later release).
+KSM's merged pages were originally locked into kernel memory, but can now
+be swapped out just like other user pages (but sharing is broken when they
+are swapped back in: ksmd must rediscover their identity and merge again).
 
 KSM only operates on those areas of address space which an application
 has advised to be likely candidates for merging, by using the madvise(2)
@@ -44,20 +44,12 @@ includes unmapped gaps (though working on the intervening mapped areas),
 and might fail with EAGAIN if not enough memory for internal structures.
 
 Applications should be considerate in their use of MADV_MERGEABLE,
-restricting its use to areas likely to benefit.  KSM's scans may use
-a lot of processing power, and its kernel-resident pages are a limited
-resource.  Some installations will disable KSM for these reasons.
+restricting its use to areas likely to benefit.  KSM's scans may use a lot
+of processing power: some installations will disable KSM for that reason.
 
 The KSM daemon is controlled by sysfs files in /sys/kernel/mm/ksm/,
 readable by all but writable only by root:
 
-max_kernel_pages - set to maximum number of kernel pages that KSM may use
-                   e.g. "echo 100000 > /sys/kernel/mm/ksm/max_kernel_pages"
-                   Value 0 imposes no limit on the kernel pages KSM may use;
-                   but note that any process using MADV_MERGEABLE can cause
-                   KSM to allocate these pages, unswappable until it exits.
-                   Default: quarter of memory (chosen to not pin too much)
-
 pages_to_scan    - how many present pages to scan before ksmd goes to sleep
                    e.g. "echo 100 > /sys/kernel/mm/ksm/pages_to_scan"
                    Default: 100 (chosen for demonstration purposes)
@@ -75,7 +67,7 @@ run              - set 0 to stop ksmd from running but keep merged pages,
 
 The effectiveness of KSM and MADV_MERGEABLE is shown in /sys/kernel/mm/ksm/:
 
-pages_shared     - how many shared unswappable kernel pages KSM is using
+pages_shared     - how many shared pages are being used
 pages_sharing    - how many more sites are sharing them i.e. how much saved
 pages_unshared   - how many pages unique but repeatedly checked for merging
 pages_volatile   - how many pages changing too fast to be placed in a tree
@@ -87,4 +79,4 @@ pages_volatile embraces several different kinds of activity, but a high
 proportion there would also indicate poor use of madvise MADV_MERGEABLE.
 
 Izik Eidus,
-Hugh Dickins, 24 Sept 2009
+Hugh Dickins, 17 Nov 2009
diff --git a/Documentation/vm/page-types.c b/Documentation/vm/page-types.c
index ea44ea502da1..7a7d9bab32ef 100644
--- a/Documentation/vm/page-types.c
+++ b/Documentation/vm/page-types.c
@@ -100,7 +100,7 @@
 #define BIT(name)               (1ULL << KPF_##name)
 #define BITS_COMPOUND           (BIT(COMPOUND_HEAD) | BIT(COMPOUND_TAIL))
 
-static char *page_flag_names[] = {
+static const char *page_flag_names[] = {
         [KPF_LOCKED]            = "L:locked",
         [KPF_ERROR]             = "E:error",
         [KPF_REFERENCED]        = "R:referenced",
@@ -173,7 +173,7 @@ static int		kpageflags_fd;
 static int              opt_hwpoison;
 static int              opt_unpoison;
 
-static char             *hwpoison_debug_fs = "/debug/hwpoison";
+static const char       hwpoison_debug_fs[] = "/debug/hwpoison";
 static int              hwpoison_inject_fd;
 static int              hwpoison_forget_fd;
 
@@ -560,7 +560,7 @@ static void walk_pfn(unsigned long voffset,
 {
         uint64_t buf[KPAGEFLAGS_BATCH];
         unsigned long batch;
-        unsigned long pages;
+        long pages;
         unsigned long i;
 
         while (count) {
@@ -673,30 +673,35 @@ static void usage(void)
 
         printf(
 "page-types [options]\n"
-"            -r|--raw                  Raw mode, for kernel developers\n"
-"            -a|--addr    addr-spec    Walk a range of pages\n"
-"            -b|--bits    bits-spec    Walk pages with specified bits\n"
-"            -p|--pid     pid          Walk process address space\n"
+"            -r|--raw                   Raw mode, for kernel developers\n"
+"            -d|--describe flags        Describe flags\n"
+"            -a|--addr    addr-spec     Walk a range of pages\n"
+"            -b|--bits    bits-spec     Walk pages with specified bits\n"
+"            -p|--pid     pid           Walk process address space\n"
 #if 0 /* planned features */
-"            -f|--file    filename     Walk file address space\n"
+"            -f|--file    filename      Walk file address space\n"
 #endif
-"            -l|--list                 Show page details in ranges\n"
-"            -L|--list-each            Show page details one by one\n"
-"            -N|--no-summary           Don't show summay info\n"
-"            -X|--hwpoison             hwpoison pages\n"
-"            -x|--unpoison             unpoison pages\n"
-"            -h|--help                 Show this usage message\n"
+"            -l|--list                  Show page details in ranges\n"
+"            -L|--list-each             Show page details one by one\n"
+"            -N|--no-summary            Don't show summay info\n"
+"            -X|--hwpoison              hwpoison pages\n"
+"            -x|--unpoison              unpoison pages\n"
+"            -h|--help                  Show this usage message\n"
+"flags:\n"
+"            0x10                       bitfield format, e.g.\n"
+"            anon                       bit-name, e.g.\n"
+"            0x10,anon                  comma-separated list, e.g.\n"
 "addr-spec:\n"
-"            N                         one page at offset N (unit: pages)\n"
-"            N+M                       pages range from N to N+M-1\n"
-"            N,M                       pages range from N to M-1\n"
-"            N,                        pages range from N to end\n"
-"            ,M                        pages range from 0 to M-1\n"
+"            N                          one page at offset N (unit: pages)\n"
+"            N+M                        pages range from N to N+M-1\n"
+"            N,M                        pages range from N to M-1\n"
+"            N,                         pages range from N to end\n"
+"            ,M                         pages range from 0 to M-1\n"
 "bits-spec:\n"
-"            bit1,bit2                 (flags & (bit1|bit2)) != 0\n"
-"            bit1,bit2=bit1            (flags & (bit1|bit2)) == bit1\n"
-"            bit1,~bit2                (flags & (bit1|bit2)) == bit1\n"
-"            =bit1,bit2                flags == (bit1|bit2)\n"
+"            bit1,bit2                  (flags & (bit1|bit2)) != 0\n"
+"            bit1,bit2=bit1             (flags & (bit1|bit2)) == bit1\n"
+"            bit1,~bit2                 (flags & (bit1|bit2)) == bit1\n"
+"            =bit1,bit2                 flags == (bit1|bit2)\n"
 "bit-names:\n"
         );
 
@@ -884,13 +889,23 @@ static void parse_bits_mask(const char *optarg)
         add_bits_filter(mask, bits);
 }
 
+static void describe_flags(const char *optarg)
+{
+        uint64_t flags = parse_flag_names(optarg, 0);
 
-static struct option opts[] = {
+        printf("0x%016llx\t%s\t%s\n",
+                (unsigned long long)flags,
+                page_flag_name(flags),
+                page_flag_longname(flags));
+}
+
+static const struct option opts[] = {
         { "raw"       , 0, NULL, 'r' },
         { "pid"       , 1, NULL, 'p' },
         { "file"      , 1, NULL, 'f' },
         { "addr"      , 1, NULL, 'a' },
         { "bits"      , 1, NULL, 'b' },
+        { "describe"  , 1, NULL, 'd' },
         { "list"      , 0, NULL, 'l' },
         { "list-each" , 0, NULL, 'L' },
         { "no-summary", 0, NULL, 'N' },
@@ -907,7 +922,7 @@ int main(int argc, char *argv[])
         page_size = getpagesize();
 
         while ((c = getopt_long(argc, argv,
-                                "rp:f:a:b:lLNXxh", opts, NULL)) != -1) {
+                                "rp:f:a:b:d:lLNXxh", opts, NULL)) != -1) {
                 switch (c) {
                 case 'r':
                         opt_raw = 1;
@@ -924,6 +939,9 @@ int main(int argc, char *argv[])
                 case 'b':
                         parse_bits_mask(optarg);
                         break;
+                case 'd':
+                        describe_flags(optarg);
+                        exit(0);
                 case 'l':
                         opt_list = 1;
                         break;
diff --git a/MAINTAINERS b/MAINTAINERS
index 1f21c34124db..d6a27110a747 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -835,13 +835,13 @@ F:	arch/arm/mach-pxa/palmte2.c
 F:      arch/arm/mach-pxa/include/mach/palmtc.h
 F:      arch/arm/mach-pxa/palmtc.c
 
-ARM/PALM TREO 680 SUPPORT
+ARM/PALM TREO SUPPORT
 M:      Tomas Cech <sleep_walker@suse.cz>
 L:      linux-arm-kernel@lists.infradead.org
 W:      http://hackndev.com
 S:      Maintained
-F:      arch/arm/mach-pxa/include/mach/treo680.h
-F:      arch/arm/mach-pxa/treo680.c
+F:      arch/arm/mach-pxa/include/mach/palmtreo.h
+F:      arch/arm/mach-pxa/palmtreo.c
 
 ARM/PALMZ72 SUPPORT
 M:      Sergey Lapin <slapin@ossfans.org>
@@ -1482,8 +1482,8 @@ F:	include/linux/coda*.h
 
 COMMON INTERNET FILE SYSTEM (CIFS)
 M:      Steve French <sfrench@samba.org>
-L:      linux-cifs-client@lists.samba.org
-L:      samba-technical@lists.samba.org
+L:      linux-cifs-client@lists.samba.org (moderated for non-subscribers)
+L:      samba-technical@lists.samba.org (moderated for non-subscribers)
 W:      http://linux-cifs.samba.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
 S:      Supported
@@ -3081,8 +3081,11 @@ S:	Maintained
 F:      fs/autofs4/
 
 KERNEL BUILD
+M:      Michal Marek <mmarek@suse.cz>
+T:      git git://repo.or.cz/linux-kbuild.git for-next
+T:      git git://repo.or.cz/linux-kbuild.git for-linus
 L:      linux-kbuild@vger.kernel.org
-S:      Orphan
+S:      Maintained
 F:      Documentation/kbuild/
 F:      Makefile
 F:      scripts/Makefile.*
@@ -3124,7 +3127,6 @@ L:	kvm@vger.kernel.org
 W:      http://kvm.qumranet.com
 S:      Supported
 F:      arch/x86/include/asm/svm.h
-F:      arch/x86/kvm/kvm_svm.h
 F:      arch/x86/kvm/svm.c
 
 KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
@@ -5974,6 +5976,7 @@ M:	Mark Brown <broonie@opensource.wolfsonmicro.com>
 T:      git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
 W:      http://opensource.wolfsonmicro.com/node/8
 S:      Supported
+F:      Documentation/hwmon/wm83??
 F:      drivers/leds/leds-wm83*.c
 F:      drivers/mfd/wm8*.c
 F:      drivers/power/wm83*.c
@@ -5983,14 +5986,14 @@ F:	drivers/video/backlight/wm83*_bl.c
 F:      drivers/watchdog/wm83*_wdt.c
 F:      include/linux/mfd/wm831x/
 F:      include/linux/mfd/wm8350/
-F:      include/linux/mfd/wm8400/
-F:      sound/soc/codecs/wm8350.c
-F:      sound/soc/codecs/wm8400.c
+F:      include/linux/mfd/wm8400*
+F:      sound/soc/codecs/wm8350.*
+F:      sound/soc/codecs/wm8400.*
 
 X.25 NETWORK LAYER
-M:      Henner Eisen <eis@baty.hanse.de>
+M:      Andrew Hendry <andrew.hendry@gmail.com>
 L:      linux-x25@vger.kernel.org
-S:      Maintained
+S:      Odd Fixes
 F:      Documentation/networking/x25*
 F:      include/net/x25*
 F:      net/x25/
diff --git a/arch/alpha/include/asm/core_t2.h b/arch/alpha/include/asm/core_t2.h
index 46bfff58f670..471c07292e0b 100644
--- a/arch/alpha/include/asm/core_t2.h
+++ b/arch/alpha/include/asm/core_t2.h
@@ -435,7 +435,7 @@ extern inline void t2_outl(u32 b, unsigned long addr)
         set_hae(msb); \
 }
 
-extern spinlock_t t2_hae_lock;
+extern raw_spinlock_t t2_hae_lock;
 
 /*
  * NOTE: take T2_DENSE_MEM off in each readX/writeX routine, since
@@ -448,12 +448,12 @@ __EXTERN_INLINE u8 t2_readb(const volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long result, msb;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         result = *(vip) ((addr << 5) + T2_SPARSE_MEM + 0x00);
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
         return __kernel_extbl(result, addr & 3);
 }
 
@@ -462,12 +462,12 @@ __EXTERN_INLINE u16 t2_readw(const volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long result, msb;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         result = *(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x08);
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
         return __kernel_extwl(result, addr & 3);
 }
 
@@ -480,12 +480,12 @@ __EXTERN_INLINE u32 t2_readl(const volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long result, msb;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         result = *(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x18);
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
         return result & 0xffffffffUL;
 }
 
@@ -494,14 +494,14 @@ __EXTERN_INLINE u64 t2_readq(const volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long r0, r1, work, msb;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         work = (addr << 5) + T2_SPARSE_MEM + 0x18;
         r0 = *(vuip)(work);
         r1 = *(vuip)(work + (4 << 5));
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
         return r1 << 32 | r0;
 }
 
@@ -510,13 +510,13 @@ __EXTERN_INLINE void t2_writeb(u8 b, volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long msb, w;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         w = __kernel_insbl(b, addr & 3);
         *(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x00) = w;
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
 }
 
 __EXTERN_INLINE void t2_writew(u16 b, volatile void __iomem *xaddr)
@@ -524,13 +524,13 @@ __EXTERN_INLINE void t2_writew(u16 b, volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long msb, w;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         w = __kernel_inswl(b, addr & 3);
         *(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x08) = w;
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
 }
 
 /*
@@ -542,12 +542,12 @@ __EXTERN_INLINE void t2_writel(u32 b, volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long msb;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         *(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x18) = b;
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
 }
 
 __EXTERN_INLINE void t2_writeq(u64 b, volatile void __iomem *xaddr)
@@ -555,14 +555,14 @@ __EXTERN_INLINE void t2_writeq(u64 b, volatile void __iomem *xaddr)
         unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;
         unsigned long msb, work;
         unsigned long flags;
-        spin_lock_irqsave(&t2_hae_lock, flags);
+        raw_spin_lock_irqsave(&t2_hae_lock, flags);
 
         t2_set_hae;
 
         work = (addr << 5) + T2_SPARSE_MEM + 0x18;
         *(vuip)work = b;
         *(vuip)(work + (4 << 5)) = b >> 32;
-        spin_unlock_irqrestore(&t2_hae_lock, flags);
+        raw_spin_unlock_irqrestore(&t2_hae_lock, flags);
 }
 
 __EXTERN_INLINE void __iomem *t2_ioportmap(unsigned long addr)
diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
index 5c75c1b2352a..9baae8afe8a3 100644
--- a/arch/alpha/include/asm/elf.h
+++ b/arch/alpha/include/asm/elf.h
@@ -81,7 +81,6 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 #define ELF_DATA        ELFDATA2LSB
 #define ELF_ARCH        EM_ALPHA
 
-#define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE       8192
 
 /* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
diff --git a/arch/alpha/include/asm/spinlock.h b/arch/alpha/include/asm/spinlock.h
index e38fb95cb335..d0faca1e992d 100644
--- a/arch/alpha/include/asm/spinlock.h
+++ b/arch/alpha/include/asm/spinlock.h
@@ -12,18 +12,18 @@
  * We make no fairness assumptions. They have a cost.
  */
 
-#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
-#define __raw_spin_is_locked(x) ((x)->lock != 0)
-#define __raw_spin_unlock_wait(x) \
+#define arch_spin_lock_flags(lock, flags) arch_spin_lock(lock)
+#define arch_spin_is_locked(x)  ((x)->lock != 0)
+#define arch_spin_unlock_wait(x) \
                 do { cpu_relax(); } while ((x)->lock)
 
-static inline void __raw_spin_unlock(raw_spinlock_t * lock)
+static inline void arch_spin_unlock(arch_spinlock_t * lock)
 {
         mb();
         lock->lock = 0;
 }
 
-static inline void __raw_spin_lock(raw_spinlock_t * lock)
+static inline void arch_spin_lock(arch_spinlock_t * lock)
 {
         long tmp;
 
@@ -43,24 +43,24 @@ static inline void __raw_spin_lock(raw_spinlock_t * lock)
         : "m"(lock->lock) : "memory");
 }
 
-static inline int __raw_spin_trylock(raw_spinlock_t *lock)
+static inline int arch_spin_trylock(arch_spinlock_t *lock)
 {
         return !test_and_set_bit(0, &lock->lock);
 }
 
 /***********************************************************/
 
-static inline int __raw_read_can_lock(raw_rwlock_t *lock)
+static inline int arch_read_can_lock(arch_rwlock_t *lock)
 {
         return (lock->lock & 1) == 0;
 }
 
-static inline int __raw_write_can_lock(raw_rwlock_t *lock)
+static inline int arch_write_can_lock(arch_rwlock_t *lock)
 {
         return lock->lock == 0;
 }
 
-static inline void __raw_read_lock(raw_rwlock_t *lock)
+static inline void arch_read_lock(arch_rwlock_t *lock)
 {
         long regx;
 
@@ -80,7 +80,7 @@ static inline void __raw_read_lock(raw_rwlock_t *lock)
         : "m" (*lock) : "memory");
 }
 
-static inline void __raw_write_lock(raw_rwlock_t *lock)
+static inline void arch_write_lock(arch_rwlock_t *lock)
 {
         long regx;
 
@@ -100,7 +100,7 @@ static inline void __raw_write_lock(raw_rwlock_t *lock)
         : "m" (*lock) : "memory");
 }
 
-static inline int __raw_read_trylock(raw_rwlock_t * lock)
+static inline int arch_read_trylock(arch_rwlock_t * lock)
 {
         long regx;
         int success;
@@ -122,7 +122,7 @@ static inline int __raw_read_trylock(raw_rwlock_t * lock)
         return success;
 }
 
-static inline int __raw_write_trylock(raw_rwlock_t * lock)
+static inline int arch_write_trylock(arch_rwlock_t * lock)
 {
         long regx;
         int success;
@@ -144,7 +144,7 @@ static inline int __raw_write_trylock(raw_rwlock_t * lock)
         return success;
 }
 
-static inline void __raw_read_unlock(raw_rwlock_t * lock)
+static inline void arch_read_unlock(arch_rwlock_t * lock)
 {
         long regx;
         __asm__ __volatile__(
@@ -160,17 +160,17 @@ static inline void __raw_read_unlock(raw_rwlock_t * lock)
         : "m" (*lock) : "memory");
 }
 
-static inline void __raw_write_unlock(raw_rwlock_t * lock)
+static inline void arch_write_unlock(arch_rwlock_t * lock)
 {
         mb();
         lock->lock = 0;
 }
 
-#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
-#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+#define arch_read_lock_flags(lock, flags) arch_read_lock(lock)
+#define arch_write_lock_flags(lock, flags) arch_write_lock(lock)
 
-#define _raw_spin_relax(lock)   cpu_relax()
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
+#define arch_spin_relax(lock)   cpu_relax()
+#define arch_read_relax(lock)   cpu_relax()
+#define arch_write_relax(lock)  cpu_relax()
 
 #endif /* _ALPHA_SPINLOCK_H */
diff --git a/arch/alpha/include/asm/spinlock_types.h b/arch/alpha/include/asm/spinlock_types.h
index 8141eb5ebf0d..54c2afce0a1d 100644
--- a/arch/alpha/include/asm/spinlock_types.h
+++ b/arch/alpha/include/asm/spinlock_types.h
@@ -7,14 +7,14 @@
 
 typedef struct {
         volatile unsigned int lock;
-} raw_spinlock_t;
+} arch_spinlock_t;
 
-#define __RAW_SPIN_LOCK_UNLOCKED        { 0 }
+#define __ARCH_SPIN_LOCK_UNLOCKED       { 0 }
 
 typedef struct {
         volatile unsigned int lock;
-} raw_rwlock_t;
+} arch_rwlock_t;
 
-#define __RAW_RW_LOCK_UNLOCKED          { 0 }
+#define __ARCH_RW_LOCK_UNLOCKED         { 0 }
 
 #endif
diff --git a/arch/alpha/kernel/core_t2.c b/arch/alpha/kernel/core_t2.c
index d9980d47ab81..e6d90568b65d 100644
--- a/arch/alpha/kernel/core_t2.c
+++ b/arch/alpha/kernel/core_t2.c
@@ -74,7 +74,7 @@
 # define DBG(args)
 #endif
 
-DEFINE_SPINLOCK(t2_hae_lock);
+DEFINE_RAW_SPINLOCK(t2_hae_lock);
 
 static volatile unsigned int t2_mcheck_any_expected;
 static volatile unsigned int t2_mcheck_last_taken;
diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index c0de072b8305..5f2cf23c4648 100644
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -81,7 +81,7 @@ show_interrupts(struct seq_file *p, void *v)
 #endif
 
         if (irq < ACTUAL_NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[irq].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[irq].lock, flags);
                 action = irq_desc[irq].action;
                 if (!action) 
                         goto unlock;
@@ -105,7 +105,7 @@ show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
 unlock:
-                spin_unlock_irqrestore(&irq_desc[irq].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[irq].lock, flags);
         } else if (irq == ACTUAL_NR_IRQS) {
 #ifdef CONFIG_SMP
                 seq_puts(p, "IPI: ");
diff --git a/arch/alpha/kernel/srm_env.c b/arch/alpha/kernel/srm_env.c
index d12af472e1c0..dbbf04f9230e 100644
--- a/arch/alpha/kernel/srm_env.c
+++ b/arch/alpha/kernel/srm_env.c
@@ -33,6 +33,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <asm/console.h>
 #include <asm/uaccess.h>
 #include <asm/machvec.h>
@@ -79,42 +80,41 @@ static srm_env_t	srm_named_entries[] = {
 static srm_env_t        srm_numbered_entries[256];
 
 
-static int
-srm_env_read(char *page, char **start, off_t off, int count, int *eof,
-                void *data)
+static int srm_env_proc_show(struct seq_file *m, void *v)
 {
-        int             nbytes;
         unsigned long   ret;
         srm_env_t       *entry;
+        char            *page;
 
-        if (off != 0) {
-                *eof = 1;
-                return 0;
-        }
+        entry = (srm_env_t *)m->private;
+        page = (char *)__get_free_page(GFP_USER);
+        if (!page)
+                return -ENOMEM;
 
-        entry   = (srm_env_t *) data;
-        ret     = callback_getenv(entry->id, page, count);
+        ret = callback_getenv(entry->id, page, PAGE_SIZE);
 
         if ((ret >> 61) == 0) {
-                nbytes = (int) ret;
-                *eof = 1;
+                seq_write(m, page, ret);
+                ret = 0;
         } else
-                nbytes = -EFAULT;
+                ret = -EFAULT;
+        free_page((unsigned long)page);
+        return ret;
+}
 
-        return nbytes;
+static int srm_env_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, srm_env_proc_show, PDE(inode)->data);
 }
 
-static int
-srm_env_write(struct file *file, const char __user *buffer, unsigned long count,
-                void *data)
+static ssize_t srm_env_proc_write(struct file *file, const char __user *buffer,
+                                  size_t count, loff_t *pos)
 {
         int res;
-        srm_env_t       *entry;
+        srm_env_t       *entry = PDE(file->f_path.dentry->d_inode)->data;
         char            *buf = (char *) __get_free_page(GFP_USER);
         unsigned long   ret1, ret2;
 
-        entry = (srm_env_t *) data;
-
         if (!buf)
                 return -ENOMEM;
 
@@ -140,6 +140,15 @@ srm_env_write(struct file *file, const char __user *buffer, unsigned long count,
         return res;
 }
 
+static const struct file_operations srm_env_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = srm_env_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = srm_env_proc_write,
+};
+
 static void
 srm_env_cleanup(void)
 {
@@ -245,15 +254,10 @@ srm_env_init(void)
          */
         entry = srm_named_entries;
         while (entry->name && entry->id) {
-                entry->proc_entry = create_proc_entry(entry->name,
-                                0644, named_dir);
+                entry->proc_entry = proc_create_data(entry->name, 0644, named_dir,
+                                                     &srm_env_proc_fops, entry);
                 if (!entry->proc_entry)
                         goto cleanup;
-
-                entry->proc_entry->data         = (void *) entry;
-                entry->proc_entry->read_proc    = srm_env_read;
-                entry->proc_entry->write_proc   = srm_env_write;
-
                 entry++;
         }
 
@@ -264,15 +268,12 @@ srm_env_init(void)
                 entry = &srm_numbered_entries[var_num];
                 entry->name = number[var_num];
 
-                entry->proc_entry = create_proc_entry(entry->name,
-                                0644, numbered_dir);
+                entry->proc_entry = proc_create_data(entry->name, 0644, numbered_dir,
+                                                     &srm_env_proc_fops, entry);
                 if (!entry->proc_entry)
                         goto cleanup;
 
                 entry->id                       = var_num;
-                entry->proc_entry->data         = (void *) entry;
-                entry->proc_entry->read_proc    = srm_env_read;
-                entry->proc_entry->write_proc   = srm_env_write;
         }
 
         printk(KERN_INFO "%s: version %s loaded successfully\n", NAME,
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
index 6aac3f5bb2f3..a399bb5730f1 100644
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
@@ -101,7 +101,6 @@ extern int arm_elf_read_implies_exec(const struct elf32_hdr *, int);
 int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
 #define ELF_CORE_COPY_TASK_REGS dump_task_regs
 
-#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
diff --git a/arch/arm/include/asm/mach/irq.h b/arch/arm/include/asm/mach/irq.h
index acac5302e4ea..8920b2d6e3b8 100644
--- a/arch/arm/include/asm/mach/irq.h
+++ b/arch/arm/include/asm/mach/irq.h
@@ -26,9 +26,9 @@ extern int show_fiq_list(struct seq_file *, void *);
  */
 #define do_bad_IRQ(irq,desc)                            \
 do {                                                    \
-        spin_lock(&desc->lock);                         \
+        raw_spin_lock(&desc->lock);                     \
         handle_bad_irq(irq, desc);                      \
-        spin_unlock(&desc->lock);                       \
+        raw_spin_unlock(&desc->lock);                   \
 } while(0)
 
 #endif
diff --git a/arch/arm/include/asm/spinlock.h b/arch/arm/include/asm/spinlock.h
index c13681ac1ede..c91c64cab922 100644
--- a/arch/arm/include/asm/spinlock.h
+++ b/arch/arm/include/asm/spinlock.h
@@ -17,13 +17,13 @@
  * Locked value: 1
  */
 
-#define __raw_spin_is_locked(x)         ((x)->lock != 0)
-#define __raw_spin_unlock_wait(lock) \
-        do { while (__raw_spin_is_locked(lock)) cpu_relax(); } while (0)
+#define arch_spin_is_locked(x)          ((x)->lock != 0)
+#define arch_spin_unlock_wait(lock) \
+        do { while (arch_spin_is_locked(lock)) cpu_relax(); } while (0)
 
-#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
+#define arch_spin_lock_flags(lock, flags) arch_spin_lock(lock)
 
-static inline void __raw_spin_lock(raw_spinlock_t *lock)
+static inline void arch_spin_lock(arch_spinlock_t *lock)
 {
         unsigned long tmp;
 
@@ -43,7 +43,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
         smp_mb();
 }
 
-static inline int __raw_spin_trylock(raw_spinlock_t *lock)
+static inline int arch_spin_trylock(arch_spinlock_t *lock)
 {
         unsigned long tmp;
 
@@ -63,7 +63,7 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock)
         }
 }
 
-static inline void __raw_spin_unlock(raw_spinlock_t *lock)
+static inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
         smp_mb();
 
@@ -86,7 +86,7 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
  * just write zero since the lock is exclusively held.
  */
 
-static inline void __raw_write_lock(raw_rwlock_t *rw)
+static inline void arch_write_lock(arch_rwlock_t *rw)
 {
         unsigned long tmp;
 
@@ -106,7 +106,7 @@ static inline void __raw_write_lock(raw_rwlock_t *rw)
         smp_mb();
 }
 
-static inline int __raw_write_trylock(raw_rwlock_t *rw)
+static inline int arch_write_trylock(arch_rwlock_t *rw)
 {
         unsigned long tmp;
 
@@ -126,7 +126,7 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)
         }
 }
 
-static inline void __raw_write_unlock(raw_rwlock_t *rw)
+static inline void arch_write_unlock(arch_rwlock_t *rw)
 {
         smp_mb();
 
@@ -142,7 +142,7 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
 }
 
 /* write_can_lock - would write_trylock() succeed? */
-#define __raw_write_can_lock(x)         ((x)->lock == 0)
+#define arch_write_can_lock(x)          ((x)->lock == 0)
 
 /*
  * Read locks are a bit more hairy:
@@ -156,7 +156,7 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
  * currently active.  However, we know we won't have any write
  * locks.
  */
-static inline void __raw_read_lock(raw_rwlock_t *rw)
+static inline void arch_read_lock(arch_rwlock_t *rw)
 {
         unsigned long tmp, tmp2;
 
@@ -176,7 +176,7 @@ static inline void __raw_read_lock(raw_rwlock_t *rw)
         smp_mb();
 }
 
-static inline void __raw_read_unlock(raw_rwlock_t *rw)
+static inline void arch_read_unlock(arch_rwlock_t *rw)
 {
         unsigned long tmp, tmp2;
 
@@ -198,7 +198,7 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw)
         : "cc");
 }
 
-static inline int __raw_read_trylock(raw_rwlock_t *rw)
+static inline int arch_read_trylock(arch_rwlock_t *rw)
 {
         unsigned long tmp, tmp2 = 1;
 
@@ -215,13 +215,13 @@ static inline int __raw_read_trylock(raw_rwlock_t *rw)
 }
 
 /* read_can_lock - would read_trylock() succeed? */
-#define __raw_read_can_lock(x)          ((x)->lock < 0x80000000)
+#define arch_read_can_lock(x)           ((x)->lock < 0x80000000)
 
-#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
-#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+#define arch_read_lock_flags(lock, flags) arch_read_lock(lock)
+#define arch_write_lock_flags(lock, flags) arch_write_lock(lock)
 
-#define _raw_spin_relax(lock)   cpu_relax()
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
+#define arch_spin_relax(lock)   cpu_relax()
+#define arch_read_relax(lock)   cpu_relax()
+#define arch_write_relax(lock)  cpu_relax()
 
 #endif /* __ASM_SPINLOCK_H */
diff --git a/arch/arm/include/asm/spinlock_types.h b/arch/arm/include/asm/spinlock_types.h
index 43e83f6d2ee5..d14d197ae04a 100644
--- a/arch/arm/include/asm/spinlock_types.h
+++ b/arch/arm/include/asm/spinlock_types.h
@@ -7,14 +7,14 @@
 
 typedef struct {
         volatile unsigned int lock;
-} raw_spinlock_t;
+} arch_spinlock_t;
 
-#define __RAW_SPIN_LOCK_UNLOCKED        { 0 }
+#define __ARCH_SPIN_LOCK_UNLOCKED       { 0 }
 
 typedef struct {
         volatile unsigned int lock;
-} raw_rwlock_t;
+} arch_rwlock_t;
 
-#define __RAW_RW_LOCK_UNLOCKED          { 0 }
+#define __ARCH_RW_LOCK_UNLOCKED         { 0 }
 
 #endif
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index c9a8619f3856..b7cb45bb91e8 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -69,7 +69,7 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                 action = irq_desc[i].action;
                 if (!action)
                         goto unlock;
@@ -84,7 +84,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
 unlock:
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         } else if (i == NR_IRQS) {
 #ifdef CONFIG_FIQ
                 show_fiq_list(p, v);
@@ -139,7 +139,7 @@ void set_irq_flags(unsigned int irq, unsigned int iflags)
         }
 
         desc = irq_desc + irq;
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         desc->status |= IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
         if (iflags & IRQF_VALID)
                 desc->status &= ~IRQ_NOREQUEST;
@@ -147,7 +147,7 @@ void set_irq_flags(unsigned int irq, unsigned int iflags)
                 desc->status &= ~IRQ_NOPROBE;
         if (!(iflags & IRQF_NOAUTOEN))
                 desc->status &= ~IRQ_NOAUTOEN;
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 }
 
 void __init init_IRQ(void)
@@ -166,9 +166,9 @@ static void route_irq(struct irq_desc *desc, unsigned int irq, unsigned int cpu)
 {
         pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc->node, cpu);
 
-        spin_lock_irq(&desc->lock);
+        raw_spin_lock_irq(&desc->lock);
         desc->chip->set_affinity(irq, cpumask_of(cpu));
-        spin_unlock_irq(&desc->lock);
+        raw_spin_unlock_irq(&desc->lock);
 }
 
 /*
diff --git a/arch/arm/mach-at91/include/mach/atmel-mci.h b/arch/arm/mach-at91/include/mach/atmel-mci.h
new file mode 100644
index 000000000000..998cb0c07135
--- /dev/null
+++ b/arch/arm/mach-at91/include/mach/atmel-mci.h
@@ -0,0 +1,24 @@
+#ifndef __MACH_ATMEL_MCI_H
+#define __MACH_ATMEL_MCI_H
+
+#include <mach/at_hdmac.h>
+
+/**
+ * struct mci_dma_data - DMA data for MCI interface
+ */
+struct mci_dma_data {
+        struct at_dma_slave     sdata;
+};
+
+/* accessor macros */
+#define slave_data_ptr(s)       (&(s)->sdata)
+#define find_slave_dev(s)       ((s)->sdata.dma_dev)
+
+#define setup_dma_addr(s, t, r) do {            \
+        if (s) {                                \
+                (s)->sdata.tx_reg = (t);        \
+                (s)->sdata.rx_reg = (r);        \
+        }                                       \
+} while (0)
+
+#endif /* __MACH_ATMEL_MCI_H */
diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c
index fbe6fa02c882..53dd2a9eecf9 100644
--- a/arch/arm/mach-bcmring/arch.c
+++ b/arch/arm/mach-bcmring/arch.c
@@ -70,9 +70,19 @@ static struct ctl_table bcmring_sysctl_reboot[] = {
         {}
 };
 
+static struct resource nand_resource[] = {
+        [0] = {
+                .start = MM_ADDR_IO_NAND,
+                .end = MM_ADDR_IO_NAND + 0x1000 - 1,
+                .flags = IORESOURCE_MEM,
+        },
+};
+
 static struct platform_device nand_device = {
         .name = "bcm-nand",
         .id = -1,
+        .resource = nand_resource,
+        .num_resources  = ARRAY_SIZE(nand_resource),
 };
 
 static struct platform_device *devices[] __initdata = {
diff --git a/arch/arm/mach-bcmring/include/mach/reg_nand.h b/arch/arm/mach-bcmring/include/mach/reg_nand.h
new file mode 100644
index 000000000000..387376ffb56b
--- /dev/null
+++ b/arch/arm/mach-bcmring/include/mach/reg_nand.h
@@ -0,0 +1,66 @@
+/*****************************************************************************
+* Copyright 2001 - 2008 Broadcom Corporation.  All rights reserved.
+*
+* Unless you and Broadcom execute a separate written software license
+* agreement governing use of this software, this software is licensed to you
+* under the terms of the GNU General Public License version 2, available at
+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
+*
+* Notwithstanding the above, under no circumstances may you combine this
+* software in any way with any other Broadcom software provided under a
+* license other than the GPL, without Broadcom's express prior written
+* consent.
+*****************************************************************************/
+
+/*
+*
+*****************************************************************************
+*
+*  REG_NAND.h
+*
+*  PURPOSE:
+*
+*     This file contains definitions for the nand registers:
+*
+*  NOTES:
+*
+*****************************************************************************/
+
+#if !defined(__ASM_ARCH_REG_NAND_H)
+#define __ASM_ARCH_REG_NAND_H
+
+/* ---- Include Files ---------------------------------------------------- */
+#include <csp/reg.h>
+#include <mach/reg_umi.h>
+
+/* ---- Constants and Types ---------------------------------------------- */
+
+#define HW_NAND_BASE       MM_IO_BASE_NAND      /* NAND Flash */
+
+/* DMA accesses by the bootstrap need hard nonvirtual addresses */
+#define REG_NAND_CMD            __REG16(HW_NAND_BASE + 0)
+#define REG_NAND_ADDR           __REG16(HW_NAND_BASE + 4)
+
+#define REG_NAND_PHYS_DATA16   (HW_NAND_BASE + 8)
+#define REG_NAND_PHYS_DATA8    (HW_NAND_BASE + 8)
+#define REG_NAND_DATA16         __REG16(REG_NAND_PHYS_DATA16)
+#define REG_NAND_DATA8          __REG8(REG_NAND_PHYS_DATA8)
+
+/* use appropriate offset to make sure it start at the 1K boundary */
+#define REG_NAND_PHYS_DATA_DMA   (HW_NAND_BASE + 0x400)
+#define REG_NAND_DATA_DMA         __REG32(REG_NAND_PHYS_DATA_DMA)
+
+/* Linux DMA requires physical address of the data register */
+#define REG_NAND_DATA16_PADDR    HW_IO_VIRT_TO_PHYS(REG_NAND_PHYS_DATA16)
+#define REG_NAND_DATA8_PADDR     HW_IO_VIRT_TO_PHYS(REG_NAND_PHYS_DATA8)
+#define REG_NAND_DATA_PADDR      HW_IO_VIRT_TO_PHYS(REG_NAND_PHYS_DATA_DMA)
+
+#define NAND_BUS_16BIT()        (0)
+#define NAND_BUS_8BIT()         (!NAND_BUS_16BIT())
+
+/* Register offsets */
+#define REG_NAND_CMD_OFFSET     (0)
+#define REG_NAND_ADDR_OFFSET    (4)
+#define REG_NAND_DATA8_OFFSET   (8)
+
+#endif
diff --git a/arch/arm/mach-bcmring/include/mach/reg_umi.h b/arch/arm/mach-bcmring/include/mach/reg_umi.h
new file mode 100644
index 000000000000..06a355481ea6
--- /dev/null
+++ b/arch/arm/mach-bcmring/include/mach/reg_umi.h
@@ -0,0 +1,237 @@
+/*****************************************************************************
+* Copyright 2005 - 2008 Broadcom Corporation.  All rights reserved.
+*
+* Unless you and Broadcom execute a separate written software license
+* agreement governing use of this software, this software is licensed to you
+* under the terms of the GNU General Public License version 2, available at
+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
+*
+* Notwithstanding the above, under no circumstances may you combine this
+* software in any way with any other Broadcom software provided under a
+* license other than the GPL, without Broadcom's express prior written
+* consent.
+*****************************************************************************/
+
+/*
+*
+*****************************************************************************
+*
+*  REG_UMI.h
+*
+*  PURPOSE:
+*
+*     This file contains definitions for the nand registers:
+*
+*  NOTES:
+*
+*****************************************************************************/
+
+#if !defined(__ASM_ARCH_REG_UMI_H)
+#define __ASM_ARCH_REG_UMI_H
+
+/* ---- Include Files ---------------------------------------------------- */
+#include <csp/reg.h>
+#include <mach/csp/mm_io.h>
+
+/* ---- Constants and Types ---------------------------------------------- */
+
+/* Unified Memory Interface Ctrl Register */
+#define HW_UMI_BASE       MM_IO_BASE_UMI
+
+/* Flash bank 0 timing and control register */
+#define REG_UMI_FLASH0_TCR         __REG32(HW_UMI_BASE  + 0x00)
+/* Flash bank 1 timing and control register */
+#define REG_UMI_FLASH1_TCR         __REG32(HW_UMI_BASE  + 0x04)
+/* Flash bank 2 timing and control register */
+#define REG_UMI_FLASH2_TCR         __REG32(HW_UMI_BASE  + 0x08)
+/* MMD interface and control register */
+#define REG_UMI_MMD_ICR            __REG32(HW_UMI_BASE  + 0x0c)
+/* NAND timing and control register */
+#define REG_UMI_NAND_TCR           __REG32(HW_UMI_BASE  + 0x18)
+/* NAND ready/chip select register */
+#define REG_UMI_NAND_RCSR          __REG32(HW_UMI_BASE  + 0x1c)
+/* NAND ECC control & status register */
+#define REG_UMI_NAND_ECC_CSR       __REG32(HW_UMI_BASE  + 0x20)
+/* NAND ECC data register XXB2B1B0 */
+#define REG_UMI_NAND_ECC_DATA      __REG32(HW_UMI_BASE  + 0x24)
+/* BCH ECC Parameter N */
+#define REG_UMI_BCH_N              __REG32(HW_UMI_BASE  + 0x40)
+/* BCH ECC Parameter T */
+#define REG_UMI_BCH_K              __REG32(HW_UMI_BASE  + 0x44)
+/* BCH ECC Parameter K */
+#define REG_UMI_BCH_T              __REG32(HW_UMI_BASE  + 0x48)
+/* BCH ECC Contro Status */
+#define REG_UMI_BCH_CTRL_STATUS    __REG32(HW_UMI_BASE  + 0x4C)
+/* BCH WR ECC 31:0 */
+#define REG_UMI_BCH_WR_ECC_0       __REG32(HW_UMI_BASE  + 0x50)
+/* BCH WR ECC 63:32 */
+#define REG_UMI_BCH_WR_ECC_1       __REG32(HW_UMI_BASE  + 0x54)
+/* BCH WR ECC 95:64 */
+#define REG_UMI_BCH_WR_ECC_2       __REG32(HW_UMI_BASE  + 0x58)
+/* BCH WR ECC 127:96 */
+#define REG_UMI_BCH_WR_ECC_3       __REG32(HW_UMI_BASE  + 0x5c)
+/* BCH WR ECC 155:128 */
+#define REG_UMI_BCH_WR_ECC_4       __REG32(HW_UMI_BASE  + 0x60)
+/* BCH Read Error Location 1,0 */
+#define REG_UMI_BCH_RD_ERR_LOC_1_0 __REG32(HW_UMI_BASE  + 0x64)
+/* BCH Read Error Location 3,2 */
+#define REG_UMI_BCH_RD_ERR_LOC_3_2 __REG32(HW_UMI_BASE  + 0x68)
+/* BCH Read Error Location 5,4 */
+#define REG_UMI_BCH_RD_ERR_LOC_5_4 __REG32(HW_UMI_BASE  + 0x6c)
+/* BCH Read Error Location 7,6 */
+#define REG_UMI_BCH_RD_ERR_LOC_7_6 __REG32(HW_UMI_BASE  + 0x70)
+/* BCH Read Error Location 9,8 */
+#define REG_UMI_BCH_RD_ERR_LOC_9_8 __REG32(HW_UMI_BASE  + 0x74)
+/* BCH Read Error Location 11,10 */
+#define REG_UMI_BCH_RD_ERR_LOC_B_A __REG32(HW_UMI_BASE  + 0x78)
+
+/* REG_UMI_FLASH0/1/2_TCR, REG_UMI_SRAM0/1_TCR bits */
+/* Enable wait pin during burst write or read */
+#define REG_UMI_TCR_WAITEN              0x80000000
+/* Enable mem ctrlr to work iwth ext mem of lower freq than AHB clk */
+#define REG_UMI_TCR_LOWFREQ             0x40000000
+/* 1=synch write, 0=async write */
+#define REG_UMI_TCR_MEMTYPE_SYNCWRITE   0x20000000
+/* 1=synch read, 0=async read */
+#define REG_UMI_TCR_MEMTYPE_SYNCREAD    0x10000000
+/* 1=page mode read, 0=normal mode read */
+#define REG_UMI_TCR_MEMTYPE_PAGEREAD    0x08000000
+/* page size/burst size (wrap only) */
+#define REG_UMI_TCR_MEMTYPE_PGSZ_MASK   0x07000000
+/* 4 word */
+#define REG_UMI_TCR_MEMTYPE_PGSZ_4      0x00000000
+/* 8 word */
+#define REG_UMI_TCR_MEMTYPE_PGSZ_8      0x01000000
+/* 16 word */
+#define REG_UMI_TCR_MEMTYPE_PGSZ_16     0x02000000
+/* 32 word */
+#define REG_UMI_TCR_MEMTYPE_PGSZ_32     0x03000000
+/* 64 word */
+#define REG_UMI_TCR_MEMTYPE_PGSZ_64     0x04000000
+/* 128 word */
+#define REG_UMI_TCR_MEMTYPE_PGSZ_128    0x05000000
+/* 256 word */
+#define REG_UMI_TCR_MEMTYPE_PGSZ_256    0x06000000
+/* 512 word */
+#define REG_UMI_TCR_MEMTYPE_PGSZ_512    0x07000000
+/* Page read access cycle / Burst write latency (n+2 / n+1) */
+#define REG_UMI_TCR_TPRC_TWLC_MASK      0x00f80000
+/* Bus turnaround cycle (n) */
+#define REG_UMI_TCR_TBTA_MASK           0x00070000
+/* Write pulse width cycle (n+1) */
+#define REG_UMI_TCR_TWP_MASK            0x0000f800
+/* Write recovery cycle (n+1) */
+#define REG_UMI_TCR_TWR_MASK            0x00000600
+/* Write address setup cycle (n+1) */
+#define REG_UMI_TCR_TAS_MASK            0x00000180
+/* Output enable delay cycle (n) */
+#define REG_UMI_TCR_TOE_MASK            0x00000060
+/* Read access cycle / Burst read latency (n+2 / n+1) */
+#define REG_UMI_TCR_TRC_TLC_MASK        0x0000001f
+
+/* REG_UMI_MMD_ICR bits */
+/* Flash write protection pin control */
+#define REG_UMI_MMD_ICR_FLASH_WP            0x8000
+/* Extend hold time for sram0, sram1 csn (39 MHz operation) */
+#define REG_UMI_MMD_ICR_XHCS                0x4000
+/* Enable SDRAM 2 interface control */
+#define REG_UMI_MMD_ICR_SDRAM2EN            0x2000
+/* Enable merge of flash banks 0/1 to 512 MBit bank */
+#define REG_UMI_MMD_ICR_INST512             0x1000
+/* Enable merge of flash banks 1/2 to 512 MBit bank */
+#define REG_UMI_MMD_ICR_DATA512             0x0800
+/* Enable SDRAM interface control */
+#define REG_UMI_MMD_ICR_SDRAMEN             0x0400
+/* Polarity of busy state of Burst Wait Signal */
+#define REG_UMI_MMD_ICR_WAITPOL             0x0200
+/* Enable burst clock stopped when not accessing external burst flash/sram */
+#define REG_UMI_MMD_ICR_BCLKSTOP            0x0100
+/* Enable the peri1_csn to replace flash1_csn in 512 Mb flash mode */
+#define REG_UMI_MMD_ICR_PERI1EN             0x0080
+/* Enable the peri2_csn to replace sdram_csn */
+#define REG_UMI_MMD_ICR_PERI2EN             0x0040
+/* Enable the peri3_csn to replace sdram2_csn */
+#define REG_UMI_MMD_ICR_PERI3EN             0x0020
+/* Enable sram bank1 for H/W controlled MRS */
+#define REG_UMI_MMD_ICR_MRSB1               0x0010
+/* Enable sram bank0 for H/W controlled MRS */
+#define REG_UMI_MMD_ICR_MRSB0               0x0008
+/* Polarity for assert3ed state of H/W controlled MRS */
+#define REG_UMI_MMD_ICR_MRSPOL              0x0004
+/* 0: S/W controllable ZZ/MRS/CRE/P-Mode pin */
+/* 1: H/W controlled ZZ/MRS/CRE/P-Mode, same timing as CS */
+#define REG_UMI_MMD_ICR_MRSMODE             0x0002
+/* MRS state for S/W controlled mode */
+#define REG_UMI_MMD_ICR_MRSSTATE            0x0001
+
+/* REG_UMI_NAND_TCR bits */
+/* Enable software to control CS */
+#define REG_UMI_NAND_TCR_CS_SWCTRL          0x80000000
+/* 16-bit nand wordsize if set */
+#define REG_UMI_NAND_TCR_WORD16             0x40000000
+/* Bus turnaround cycle (n) */
+#define REG_UMI_NAND_TCR_TBTA_MASK          0x00070000
+/* Write pulse width cycle (n+1) */
+#define REG_UMI_NAND_TCR_TWP_MASK           0x0000f800
+/* Write recovery cycle (n+1) */
+#define REG_UMI_NAND_TCR_TWR_MASK           0x00000600
+/* Write address setup cycle (n+1) */
+#define REG_UMI_NAND_TCR_TAS_MASK           0x00000180
+/* Output enable delay cycle (n) */
+#define REG_UMI_NAND_TCR_TOE_MASK           0x00000060
+/* Read access cycle (n+2) */
+#define REG_UMI_NAND_TCR_TRC_TLC_MASK       0x0000001f
+
+/* REG_UMI_NAND_RCSR bits */
+/* Status: Ready=1, Busy=0 */
+#define REG_UMI_NAND_RCSR_RDY               0x02
+/* Keep CS asserted during operation */
+#define REG_UMI_NAND_RCSR_CS_ASSERTED       0x01
+
+/* REG_UMI_NAND_ECC_CSR bits */
+/* Interrupt status - read-only */
+#define REG_UMI_NAND_ECC_CSR_NANDINT        0x80000000
+/* Read: Status of ECC done, Write: clear ECC interrupt */
+#define REG_UMI_NAND_ECC_CSR_ECCINT_RAW     0x00800000
+/* Read: Status of R/B, Write: clear R/B interrupt */
+#define REG_UMI_NAND_ECC_CSR_RBINT_RAW      0x00400000
+/* 1 = Enable ECC Interrupt */
+#define REG_UMI_NAND_ECC_CSR_ECCINT_ENABLE  0x00008000
+/* 1 = Assert interrupt at rising edge of R/B_ */
+#define REG_UMI_NAND_ECC_CSR_RBINT_ENABLE   0x00004000
+/* Calculate ECC by 0=512 bytes, 1=256 bytes */
+#define REG_UMI_NAND_ECC_CSR_256BYTE        0x00000080
+/* Enable ECC in hardware */
+#define REG_UMI_NAND_ECC_CSR_ECC_ENABLE     0x00000001
+
+/* REG_UMI_BCH_CTRL_STATUS bits */
+/* Shift to Indicate Number of correctable errors detected */
+#define REG_UMI_BCH_CTRL_STATUS_NB_CORR_ERROR_SHIFT 20
+/* Indicate Number of correctable errors detected */
+#define REG_UMI_BCH_CTRL_STATUS_NB_CORR_ERROR 0x00F00000
+/* Indicate Errors detected during read but uncorrectable */
+#define REG_UMI_BCH_CTRL_STATUS_UNCORR_ERR    0x00080000
+/* Indicate Errors detected during read and are correctable */
+#define REG_UMI_BCH_CTRL_STATUS_CORR_ERR      0x00040000
+/* Flag indicates BCH's ECC status of read process are valid */
+#define REG_UMI_BCH_CTRL_STATUS_RD_ECC_VALID  0x00020000
+/* Flag indicates BCH's ECC status of write process are valid */
+#define REG_UMI_BCH_CTRL_STATUS_WR_ECC_VALID  0x00010000
+/* Pause ECC calculation */
+#define REG_UMI_BCH_CTRL_STATUS_PAUSE_ECC_DEC 0x00000010
+/* Enable Interrupt */
+#define REG_UMI_BCH_CTRL_STATUS_INT_EN        0x00000004
+/* Enable ECC during read */
+#define REG_UMI_BCH_CTRL_STATUS_ECC_RD_EN     0x00000002
+/* Enable ECC during write */
+#define REG_UMI_BCH_CTRL_STATUS_ECC_WR_EN     0x00000001
+/* Mask for location */
+#define REG_UMI_BCH_ERR_LOC_MASK              0x00001FFF
+/* location within a byte */
+#define REG_UMI_BCH_ERR_LOC_BYTE              0x00000007
+/* location within a word */
+#define REG_UMI_BCH_ERR_LOC_WORD              0x00000018
+/* location within a page (512 byte) */
+#define REG_UMI_BCH_ERR_LOC_PAGE              0x00001FE0
+#define REG_UMI_BCH_ERR_LOC_ADDR(index)     (__REG32(HW_UMI_BASE + 0x64 + (index / 2)*4) >> ((index % 2) * 16))
+#endif
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 62b98bffc158..07de8db14581 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -339,6 +339,15 @@ static struct davinci_mmc_config da850_mmc_config = {
         .version        = MMC_CTLR_VERSION_2,
 };
 
+static void da850_panel_power_ctrl(int val)
+{
+        /* lcd backlight */
+        gpio_set_value(DA850_LCD_BL_PIN, val);
+
+        /* lcd power */
+        gpio_set_value(DA850_LCD_PWR_PIN, val);
+}
+
 static int da850_lcd_hw_init(void)
 {
         int status;
@@ -356,17 +365,11 @@ static int da850_lcd_hw_init(void)
         gpio_direction_output(DA850_LCD_BL_PIN, 0);
         gpio_direction_output(DA850_LCD_PWR_PIN, 0);
 
-        /* disable lcd backlight */
-        gpio_set_value(DA850_LCD_BL_PIN, 0);
-
-        /* disable lcd power */
-        gpio_set_value(DA850_LCD_PWR_PIN, 0);
-
-        /* enable lcd power */
-        gpio_set_value(DA850_LCD_PWR_PIN, 1);
+        /* Switch off panel power and backlight */
+        da850_panel_power_ctrl(0);
 
-        /* enable lcd backlight */
-        gpio_set_value(DA850_LCD_BL_PIN, 1);
+        /* Switch on panel power and backlight */
+        da850_panel_power_ctrl(1);
 
         return 0;
 }
@@ -674,6 +677,7 @@ static __init void da850_evm_init(void)
                 pr_warning("da850_evm_init: lcd initialization failed: %d\n",
                                 ret);
 
+        sharp_lk043t1dg01_pdata.panel_power_ctrl = da850_panel_power_ctrl,
         ret = da8xx_register_lcdc(&sharp_lk043t1dg01_pdata);
         if (ret)
                 pr_warning("da850_evm_init: lcdc registration failed: %d\n",
diff --git a/arch/arm/mach-davinci/include/mach/nand.h b/arch/arm/mach-davinci/include/mach/nand.h
index b520c4b5678a..b2ad8090bd10 100644
--- a/arch/arm/mach-davinci/include/mach/nand.h
+++ b/arch/arm/mach-davinci/include/mach/nand.h
@@ -79,6 +79,10 @@ struct davinci_nand_pdata {		/* platform_data */
 
         /* e.g. NAND_BUSWIDTH_16 or NAND_USE_FLASH_BBT */
         unsigned                options;
+
+        /* Main and mirror bbt descriptor overrides */
+        struct nand_bbt_descr   *bbt_td;
+        struct nand_bbt_descr   *bbt_md;
 };
 
 #endif  /* __ARCH_ARM_DAVINCI_NAND_H */
diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h b/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
index 83f31cd0a274..62d17421e48c 100644
--- a/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
+++ b/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
@@ -5,9 +5,6 @@
 #ifndef __ASM_ARCH_EP93XX_KEYPAD_H
 #define __ASM_ARCH_EP93XX_KEYPAD_H
 
-#define MAX_MATRIX_KEY_ROWS             (8)
-#define MAX_MATRIX_KEY_COLS             (8)
-
 /* flags for the ep93xx_keypad driver */
 #define EP93XX_KEYPAD_DISABLE_3_KEY     (1<<0)  /* disable 3-key reset */
 #define EP93XX_KEYPAD_DIAG_MODE         (1<<1)  /* diagnostic mode */
@@ -18,8 +15,6 @@
 
 /**
  * struct ep93xx_keypad_platform_data - platform specific device structure
- * @matrix_key_rows:            number of rows in the keypad matrix
- * @matrix_key_cols:            number of columns in the keypad matrix
  * @matrix_key_map:             array of keycodes defining the keypad matrix
  * @matrix_key_map_size:        ARRAY_SIZE(matrix_key_map)
  * @debounce:                   debounce start count; terminal count is 0xff
@@ -27,8 +22,6 @@
  * @flags:                      see above
  */
 struct ep93xx_keypad_platform_data {
-        unsigned int    matrix_key_rows;
-        unsigned int    matrix_key_cols;
         unsigned int    *matrix_key_map;
         int             matrix_key_map_size;
         unsigned int    debounce;
@@ -36,7 +29,7 @@ struct ep93xx_keypad_platform_data {
         unsigned int    flags;
 };
 
-/* macro for creating the matrix_key_map table */
-#define KEY(row, col, val)      (((row) << 28) | ((col) << 24) | (val))
+#define EP93XX_MATRIX_ROWS              (8)
+#define EP93XX_MATRIX_COLS              (8)
 
 #endif  /* __ASM_ARCH_EP93XX_KEYPAD_H */
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c
index 116394484e71..9438bf6613a3 100644
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@ -18,6 +18,7 @@
 #include <linux/gpio.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
+#include <linux/mtd/onenand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
 #include <asm/sizes.h>
@@ -149,7 +150,7 @@ static struct mtd_partition nhk8815_onenand_partitions[] = {
         }
 };
 
-static struct flash_platform_data nhk8815_onenand_data = {
+static struct onenand_platform_data nhk8815_onenand_data = {
         .parts          = nhk8815_onenand_partitions,
         .nr_parts       = ARRAY_SIZE(nhk8815_onenand_partitions),
 };
@@ -163,7 +164,7 @@ static struct resource nhk8815_onenand_resource[] = {
 };
 
 static struct platform_device nhk8815_onenand_device = {
-        .name           = "onenand",
+        .name           = "onenand-flash",
         .id             = -1,
         .dev            = {
                 .platform_data  = &nhk8815_onenand_data,
@@ -174,10 +175,10 @@ static struct platform_device nhk8815_onenand_device = {
 
 static void __init nhk8815_onenand_init(void)
 {
-#ifdef CONFIG_ONENAND
+#ifdef CONFIG_MTD_ONENAND
        /* Set up SMCS0 for OneNand */
-       writel(0x000030db, FSMC_BCR0);
-       writel(0x02100551, FSMC_BTR0);
+        writel(0x000030db, FSMC_BCR(0));
+        writel(0x02100551, FSMC_BTR(0));
 #endif
 }
 
diff --git a/arch/arm/mach-ns9xxx/irq.c b/arch/arm/mach-ns9xxx/irq.c
index feb0e54a91de..038f24d47023 100644
--- a/arch/arm/mach-ns9xxx/irq.c
+++ b/arch/arm/mach-ns9xxx/irq.c
@@ -66,7 +66,7 @@ static void handle_prio_irq(unsigned int irq, struct irq_desc *desc)
         struct irqaction *action;
         irqreturn_t action_ret;
 
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
 
         BUG_ON(desc->status & IRQ_INPROGRESS);
 
@@ -78,7 +78,7 @@ static void handle_prio_irq(unsigned int irq, struct irq_desc *desc)
                 goto out_mask;
 
         desc->status |= IRQ_INPROGRESS;
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 
         action_ret = handle_IRQ_event(irq, action);
 
@@ -87,7 +87,7 @@ static void handle_prio_irq(unsigned int irq, struct irq_desc *desc)
          * Maybe this function should go to kernel/irq/chip.c? */
         note_interrupt(irq, desc, action_ret);
 
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
         desc->status &= ~IRQ_INPROGRESS;
 
         if (desc->status & IRQ_DISABLED)
@@ -97,7 +97,7 @@ out_mask:
         /* ack unconditionally to unmask lower prio irqs */
         desc->chip->ack(irq);
 
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 }
 #define handle_irq handle_prio_irq
 #endif
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index f76d6ff4aeb9..0b4a3a03071f 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -268,6 +268,9 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
 
         .batteries = gta02_batteries,
         .num_batteries = ARRAY_SIZE(gta02_batteries),
+
+        .charger_reference_current_ma = 1000,
+
         .reg_init_data = {
                 [PCF50633_REGULATOR_AUTO] = {
                         .constraints = {
diff --git a/arch/arm/mach-u300/include/mach/coh901318.h b/arch/arm/mach-u300/include/mach/coh901318.h
new file mode 100644
index 000000000000..f4cfee9c7d28
--- /dev/null
+++ b/arch/arm/mach-u300/include/mach/coh901318.h
@@ -0,0 +1,281 @@
+/*
+ *
+ * include/linux/coh901318.h
+ *
+ *
+ * Copyright (C) 2007-2009 ST-Ericsson
+ * License terms: GNU General Public License (GPL) version 2
+ * DMA driver for COH 901 318
+ * Author: Per Friden <per.friden@stericsson.com>
+ */
+
+#ifndef COH901318_H
+#define COH901318_H
+
+#include <linux/device.h>
+#include <linux/dmaengine.h>
+
+#define MAX_DMA_PACKET_SIZE_SHIFT 11
+#define MAX_DMA_PACKET_SIZE (1 << MAX_DMA_PACKET_SIZE_SHIFT)
+
+/**
+ * struct coh901318_lli - linked list item for DMAC
+ * @control: control settings for DMAC
+ * @src_addr: transfer source address
+ * @dst_addr: transfer destination address
+ * @link_addr:  physical address to next lli
+ * @virt_link_addr: virtual addres of next lli (only used by pool_free)
+ * @phy_this: physical address of current lli (only used by pool_free)
+ */
+struct coh901318_lli {
+        u32 control;
+        dma_addr_t src_addr;
+        dma_addr_t dst_addr;
+        dma_addr_t link_addr;
+
+        void *virt_link_addr;
+        dma_addr_t phy_this;
+};
+/**
+ * struct coh901318_params - parameters for DMAC configuration
+ * @config: DMA config register
+ * @ctrl_lli_last: DMA control register for the last lli in the list
+ * @ctrl_lli: DMA control register for an lli
+ * @ctrl_lli_chained: DMA control register for a chained lli
+ */
+struct coh901318_params {
+        u32 config;
+        u32 ctrl_lli_last;
+        u32 ctrl_lli;
+        u32 ctrl_lli_chained;
+};
+/**
+ * struct coh_dma_channel - dma channel base
+ * @name: ascii name of dma channel
+ * @number: channel id number
+ * @desc_nbr_max: number of preallocated descriptortors
+ * @priority_high: prio of channel, 0 low otherwise high.
+ * @param: configuration parameters
+ * @dev_addr: physical address of periphal connected to channel
+ */
+struct coh_dma_channel {
+        const char name[32];
+        const int number;
+        const int desc_nbr_max;
+        const int priority_high;
+        const struct coh901318_params param;
+        const dma_addr_t dev_addr;
+};
+
+/**
+ * dma_access_memory_state_t - register dma for memory access
+ *
+ * @dev: The dma device
+ * @active:  1 means dma intends to access memory
+ *           0 means dma wont access memory
+ */
+typedef void (*dma_access_memory_state_t)(struct device *dev,
+                                          bool active);
+
+/**
+ * struct powersave - DMA power save structure
+ * @lock: lock protecting data in this struct
+ * @started_channels: bit mask indicating active dma channels
+ */
+struct powersave {
+        spinlock_t lock;
+        u64 started_channels;
+};
+/**
+ * struct coh901318_platform - platform arch structure
+ * @chans_slave: specifying dma slave channels
+ * @chans_memcpy: specifying dma memcpy channels
+ * @access_memory_state: requesting DMA memeory access (on / off)
+ * @chan_conf: dma channel configurations
+ * @max_channels: max number of dma chanenls
+ */
+struct coh901318_platform {
+        const int *chans_slave;
+        const int *chans_memcpy;
+        const dma_access_memory_state_t access_memory_state;
+        const struct coh_dma_channel *chan_conf;
+        const int max_channels;
+};
+
+/**
+ * coh901318_get_bytes_left() - Get number of bytes left on a current transfer
+ * @chan: dma channel handle
+ * return number of bytes left, or negative on error
+ */
+u32 coh901318_get_bytes_left(struct dma_chan *chan);
+
+/**
+ * coh901318_stop() - Stops dma transfer
+ * @chan: dma channel handle
+ * return 0 on success otherwise negative value
+ */
+void coh901318_stop(struct dma_chan *chan);
+
+/**
+ * coh901318_continue() - Resumes a stopped dma transfer
+ * @chan: dma channel handle
+ * return 0 on success otherwise negative value
+ */
+void coh901318_continue(struct dma_chan *chan);
+
+/**
+ * coh901318_filter_id() - DMA channel filter function
+ * @chan: dma channel handle
+ * @chan_id: id of dma channel to be filter out
+ *
+ * In dma_request_channel() it specifies what channel id to be requested
+ */
+bool coh901318_filter_id(struct dma_chan *chan, void *chan_id);
+
+/*
+ * DMA Controller - this access the static mappings of the coh901318 dma.
+ *
+ */
+
+#define COH901318_MOD32_MASK                                    (0x1F)
+#define COH901318_WORD_MASK                                     (0xFFFFFFFF)
+/* INT_STATUS - Interrupt Status Registers 32bit (R/-) */
+#define COH901318_INT_STATUS1                                   (0x0000)
+#define COH901318_INT_STATUS2                                   (0x0004)
+/* TC_INT_STATUS - Terminal Count Interrupt Status Registers 32bit (R/-) */
+#define COH901318_TC_INT_STATUS1                                (0x0008)
+#define COH901318_TC_INT_STATUS2                                (0x000C)
+/* TC_INT_CLEAR - Terminal Count Interrupt Clear Registers 32bit (-/W) */
+#define COH901318_TC_INT_CLEAR1                                 (0x0010)
+#define COH901318_TC_INT_CLEAR2                                 (0x0014)
+/* RAW_TC_INT_STATUS - Raw Term Count Interrupt Status Registers 32bit (R/-) */
+#define COH901318_RAW_TC_INT_STATUS1                            (0x0018)
+#define COH901318_RAW_TC_INT_STATUS2                            (0x001C)
+/* BE_INT_STATUS - Bus Error Interrupt Status Registers 32bit (R/-) */
+#define COH901318_BE_INT_STATUS1                                (0x0020)
+#define COH901318_BE_INT_STATUS2                                (0x0024)
+/* BE_INT_CLEAR - Bus Error Interrupt Clear Registers 32bit (-/W) */
+#define COH901318_BE_INT_CLEAR1                                 (0x0028)
+#define COH901318_BE_INT_CLEAR2                                 (0x002C)
+/* RAW_BE_INT_STATUS - Raw Term Count Interrupt Status Registers 32bit (R/-) */
+#define COH901318_RAW_BE_INT_STATUS1                            (0x0030)
+#define COH901318_RAW_BE_INT_STATUS2                            (0x0034)
+
+/*
+ * CX_CFG - Channel Configuration Registers 32bit (R/W)
+ */
+#define COH901318_CX_CFG                                        (0x0100)
+#define COH901318_CX_CFG_SPACING                                (0x04)
+/* Channel enable activates tha dma job */
+#define COH901318_CX_CFG_CH_ENABLE                              (0x00000001)
+#define COH901318_CX_CFG_CH_DISABLE                             (0x00000000)
+/* Request Mode */
+#define COH901318_CX_CFG_RM_MASK                                (0x00000006)
+#define COH901318_CX_CFG_RM_MEMORY_TO_MEMORY                    (0x0 << 1)
+#define COH901318_CX_CFG_RM_PRIMARY_TO_MEMORY                   (0x1 << 1)
+#define COH901318_CX_CFG_RM_MEMORY_TO_PRIMARY                   (0x1 << 1)
+#define COH901318_CX_CFG_RM_PRIMARY_TO_SECONDARY                (0x3 << 1)
+#define COH901318_CX_CFG_RM_SECONDARY_TO_PRIMARY                (0x3 << 1)
+/* Linked channel request field. RM must == 11 */
+#define COH901318_CX_CFG_LCRF_SHIFT                             3
+#define COH901318_CX_CFG_LCRF_MASK                              (0x000001F8)
+#define COH901318_CX_CFG_LCR_DISABLE                            (0x00000000)
+/* Terminal Counter Interrupt Request Mask */
+#define COH901318_CX_CFG_TC_IRQ_ENABLE                          (0x00000200)
+#define COH901318_CX_CFG_TC_IRQ_DISABLE                         (0x00000000)
+/* Bus Error interrupt Mask */
+#define COH901318_CX_CFG_BE_IRQ_ENABLE                          (0x00000400)
+#define COH901318_CX_CFG_BE_IRQ_DISABLE                         (0x00000000)
+
+/*
+ * CX_STAT - Channel Status Registers 32bit (R/-)
+ */
+#define COH901318_CX_STAT                                       (0x0200)
+#define COH901318_CX_STAT_SPACING                               (0x04)
+#define COH901318_CX_STAT_RBE_IRQ_IND                           (0x00000008)
+#define COH901318_CX_STAT_RTC_IRQ_IND                           (0x00000004)
+#define COH901318_CX_STAT_ACTIVE                                (0x00000002)
+#define COH901318_CX_STAT_ENABLED                               (0x00000001)
+
+/*
+ * CX_CTRL - Channel Control Registers 32bit (R/W)
+ */
+#define COH901318_CX_CTRL                                       (0x0400)
+#define COH901318_CX_CTRL_SPACING                               (0x10)
+/* Transfer Count Enable */
+#define COH901318_CX_CTRL_TC_ENABLE                             (0x00001000)
+#define COH901318_CX_CTRL_TC_DISABLE                            (0x00000000)
+/* Transfer Count Value 0 - 4095 */
+#define COH901318_CX_CTRL_TC_VALUE_MASK                         (0x00000FFF)
+/* Burst count */
+#define COH901318_CX_CTRL_BURST_COUNT_MASK                      (0x0000E000)
+#define COH901318_CX_CTRL_BURST_COUNT_64_BYTES                  (0x7 << 13)
+#define COH901318_CX_CTRL_BURST_COUNT_48_BYTES                  (0x6 << 13)
+#define COH901318_CX_CTRL_BURST_COUNT_32_BYTES                  (0x5 << 13)
+#define COH901318_CX_CTRL_BURST_COUNT_16_BYTES                  (0x4 << 13)
+#define COH901318_CX_CTRL_BURST_COUNT_8_BYTES                   (0x3 << 13)
+#define COH901318_CX_CTRL_BURST_COUNT_4_BYTES                   (0x2 << 13)
+#define COH901318_CX_CTRL_BURST_COUNT_2_BYTES                   (0x1 << 13)
+#define COH901318_CX_CTRL_BURST_COUNT_1_BYTE                    (0x0 << 13)
+/* Source bus size  */
+#define COH901318_CX_CTRL_SRC_BUS_SIZE_MASK                     (0x00030000)
+#define COH901318_CX_CTRL_SRC_BUS_SIZE_32_BITS                  (0x2 << 16)
+#define COH901318_CX_CTRL_SRC_BUS_SIZE_16_BITS                  (0x1 << 16)
+#define COH901318_CX_CTRL_SRC_BUS_SIZE_8_BITS                   (0x0 << 16)
+/* Source address increment */
+#define COH901318_CX_CTRL_SRC_ADDR_INC_ENABLE                   (0x00040000)
+#define COH901318_CX_CTRL_SRC_ADDR_INC_DISABLE                  (0x00000000)
+/* Destination Bus Size */
+#define COH901318_CX_CTRL_DST_BUS_SIZE_MASK                     (0x00180000)
+#define COH901318_CX_CTRL_DST_BUS_SIZE_32_BITS                  (0x2 << 19)
+#define COH901318_CX_CTRL_DST_BUS_SIZE_16_BITS                  (0x1 << 19)
+#define COH901318_CX_CTRL_DST_BUS_SIZE_8_BITS                   (0x0 << 19)
+/* Destination address increment */
+#define COH901318_CX_CTRL_DST_ADDR_INC_ENABLE                   (0x00200000)
+#define COH901318_CX_CTRL_DST_ADDR_INC_DISABLE                  (0x00000000)
+/* Master Mode (Master2 is only connected to MSL) */
+#define COH901318_CX_CTRL_MASTER_MODE_MASK                      (0x00C00000)
+#define COH901318_CX_CTRL_MASTER_MODE_M2R_M1W                   (0x3 << 22)
+#define COH901318_CX_CTRL_MASTER_MODE_M1R_M2W                   (0x2 << 22)
+#define COH901318_CX_CTRL_MASTER_MODE_M2RW                      (0x1 << 22)
+#define COH901318_CX_CTRL_MASTER_MODE_M1RW                      (0x0 << 22)
+/* Terminal Count flag to PER enable */
+#define COH901318_CX_CTRL_TCP_ENABLE                            (0x01000000)
+#define COH901318_CX_CTRL_TCP_DISABLE                           (0x00000000)
+/* Terminal Count flags to CPU enable */
+#define COH901318_CX_CTRL_TC_IRQ_ENABLE                         (0x02000000)
+#define COH901318_CX_CTRL_TC_IRQ_DISABLE                        (0x00000000)
+/* Hand shake to peripheral */
+#define COH901318_CX_CTRL_HSP_ENABLE                            (0x04000000)
+#define COH901318_CX_CTRL_HSP_DISABLE                           (0x00000000)
+#define COH901318_CX_CTRL_HSS_ENABLE                            (0x08000000)
+#define COH901318_CX_CTRL_HSS_DISABLE                           (0x00000000)
+/* DMA mode */
+#define COH901318_CX_CTRL_DDMA_MASK                             (0x30000000)
+#define COH901318_CX_CTRL_DDMA_LEGACY                           (0x0 << 28)
+#define COH901318_CX_CTRL_DDMA_DEMAND_DMA1                      (0x1 << 28)
+#define COH901318_CX_CTRL_DDMA_DEMAND_DMA2                      (0x2 << 28)
+/* Primary Request Data Destination */
+#define COH901318_CX_CTRL_PRDD_MASK                             (0x40000000)
+#define COH901318_CX_CTRL_PRDD_DEST                             (0x1 << 30)
+#define COH901318_CX_CTRL_PRDD_SOURCE                           (0x0 << 30)
+
+/*
+ * CX_SRC_ADDR - Channel Source Address Registers 32bit (R/W)
+ */
+#define COH901318_CX_SRC_ADDR                                   (0x0404)
+#define COH901318_CX_SRC_ADDR_SPACING                           (0x10)
+
+/*
+ * CX_DST_ADDR - Channel Destination Address Registers 32bit R/W
+ */
+#define COH901318_CX_DST_ADDR                                   (0x0408)
+#define COH901318_CX_DST_ADDR_SPACING                           (0x10)
+
+/*
+ * CX_LNK_ADDR - Channel Link Address Registers 32bit (R/W)
+ */
+#define COH901318_CX_LNK_ADDR                                   (0x040C)
+#define COH901318_CX_LNK_ADDR_SPACING                           (0x10)
+#define COH901318_CX_LNK_LINK_IMMEDIATE                         (0x00000001)
+#endif /* COH901318_H */
diff --git a/arch/arm/plat-mxc/include/mach/mxc_nand.h b/arch/arm/plat-mxc/include/mach/mxc_nand.h
index 2b972df22d12..5d2d21d414e0 100644
--- a/arch/arm/plat-mxc/include/mach/mxc_nand.h
+++ b/arch/arm/plat-mxc/include/mach/mxc_nand.h
@@ -22,6 +22,7 @@
 
 struct mxc_nand_platform_data {
         int width;      /* data bus width in bytes */
-        int hw_ecc;     /* 0 if supress hardware ECC */
+        int hw_ecc:1;   /* 0 if supress hardware ECC */
+        int flash_bbt:1; /* set to 1 to use a flash based bbt */
 };
 #endif /* __ASM_ARCH_NAND_H */
diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c
index 6c768b71ad64..53fcef7c5201 100644
--- a/arch/arm/plat-omap/debug-leds.c
+++ b/arch/arm/plat-omap/debug-leds.c
@@ -293,7 +293,7 @@ static int fpga_resume_noirq(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops fpga_dev_pm_ops = {
+static const struct dev_pm_ops fpga_dev_pm_ops = {
         .suspend_noirq = fpga_suspend_noirq,
         .resume_noirq = fpga_resume_noirq,
 };
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 055160e0620e..04846811d0aa 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -1431,7 +1431,7 @@ static int omap_mpuio_resume_noirq(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops omap_mpuio_dev_pm_ops = {
+static const struct dev_pm_ops omap_mpuio_dev_pm_ops = {
         .suspend_noirq = omap_mpuio_suspend_noirq,
         .resume_noirq = omap_mpuio_resume_noirq,
 };
diff --git a/arch/arm/plat-s3c/include/plat/nand.h b/arch/arm/plat-s3c/include/plat/nand.h
index 065985978413..226147b7e026 100644
--- a/arch/arm/plat-s3c/include/plat/nand.h
+++ b/arch/arm/plat-s3c/include/plat/nand.h
@@ -17,6 +17,7 @@
  *                      Setting this flag will allow the kernel to
  *                      look for it at boot time and also skip the NAND
  *                      scan.
+ * @options:            Default value to set into 'struct nand_chip' options.
  * @nr_chips:           Number of chips in this set
  * @nr_partitions:      Number of partitions pointed to by @partitions
  * @name:               Name of set (optional)
@@ -31,6 +32,7 @@ struct s3c2410_nand_set {
         unsigned int            disable_ecc:1;
         unsigned int            flash_bbt:1;
 
+        unsigned int            options;
         int                     nr_chips;
         int                     nr_partitions;
         char                    *name;
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index d856354f4272..f2b319333184 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -112,6 +112,11 @@ config CPU_AT32AP7002
         bool
         select CPU_AT32AP700X
 
+# AP700X boards
+config BOARD_ATNGW100_COMMON
+        bool
+        select CPU_AT32AP7000
+
 choice
         prompt "AVR32 board type"
         default BOARD_ATSTK1000
@@ -119,9 +124,13 @@ choice
 config BOARD_ATSTK1000
         bool "ATSTK1000 evaluation board"
 
-config BOARD_ATNGW100
+config BOARD_ATNGW100_MKI
         bool "ATNGW100 Network Gateway"
-        select CPU_AT32AP7000
+        select BOARD_ATNGW100_COMMON
+
+config BOARD_ATNGW100_MKII
+        bool "ATNGW100 mkII Network Gateway"
+        select BOARD_ATNGW100_COMMON
 
 config BOARD_HAMMERHEAD
         bool "Hammerhead board"
diff --git a/arch/avr32/Makefile b/arch/avr32/Makefile
index c21a3290d542..ead8a75203a9 100644
--- a/arch/avr32/Makefile
+++ b/arch/avr32/Makefile
@@ -32,7 +32,7 @@ head-$(CONFIG_LOADER_U_BOOT)		+= arch/avr32/boot/u-boot/head.o
 head-y                                  += arch/avr32/kernel/head.o
 core-y                                  += $(machdirs)
 core-$(CONFIG_BOARD_ATSTK1000)          += arch/avr32/boards/atstk1000/
-core-$(CONFIG_BOARD_ATNGW100)           += arch/avr32/boards/atngw100/
+core-$(CONFIG_BOARD_ATNGW100_COMMON)    += arch/avr32/boards/atngw100/
 core-$(CONFIG_BOARD_HAMMERHEAD)         += arch/avr32/boards/hammerhead/
 core-$(CONFIG_BOARD_FAVR_32)            += arch/avr32/boards/favr-32/
 core-$(CONFIG_BOARD_MERISC)             += arch/avr32/boards/merisc/
diff --git a/arch/avr32/boards/atngw100/Kconfig b/arch/avr32/boards/atngw100/Kconfig
index be27a0218ab4..4e55617ade2d 100644
--- a/arch/avr32/boards/atngw100/Kconfig
+++ b/arch/avr32/boards/atngw100/Kconfig
@@ -1,6 +1,17 @@
 # NGW100 customization
 
-if BOARD_ATNGW100
+if BOARD_ATNGW100_COMMON
+
+config BOARD_ATNGW100_MKII_LCD
+        bool "Enable ATNGW100 mkII LCD interface"
+        depends on BOARD_ATNGW100_MKII
+        help
+          This enables the LCD controller (LCDC) in the AT32AP7000. Since the
+          LCDC is multiplexed with MACB1 (LAN) Ethernet port, only one can be
+          enabled at a time.
+
+          This choice enables the LCDC and disables the MACB1 interface marked
+          LAN on the PCB.
 
 choice
         prompt "Select an NGW100 add-on board to support"
@@ -11,15 +22,11 @@ config BOARD_ATNGW100_ADDON_NONE
 
 config BOARD_ATNGW100_EVKLCD10X
         bool "EVKLCD10X addon board"
+        depends on BOARD_ATNGW100_MKI || BOARD_ATNGW100_MKII_LCD
         help
           This enables support for the EVKLCD100 (QVGA) or EVKLCD101 (VGA)
-          addon board for the NGW100. By enabling this the LCD controller and
-          AC97 controller is added as platform devices.
-
-          This choice disables the detect pin and the write-protect pin for the
-          MCI platform device, since it conflicts with the LCD platform device.
-          The MCI pins can be reenabled by editing the "add device function" but
-          this may break the setup for other displays that use these pins.
+          addon board for the NGW100 and NGW100 mkII. By enabling this the LCD
+          controller and AC97 controller is added as platform devices.
 
 config BOARD_ATNGW100_MRMT
         bool "Mediama RMT1/2 add-on board"
@@ -55,4 +62,4 @@ if BOARD_ATNGW100_MRMT
 source  "arch/avr32/boards/atngw100/Kconfig_mrmt"
 endif
 
-endif   # BOARD_ATNGW100
+endif   # BOARD_ATNGW100_COMMON
diff --git a/arch/avr32/boards/atngw100/evklcd10x.c b/arch/avr32/boards/atngw100/evklcd10x.c
index 00337112c5ac..20388750d564 100644
--- a/arch/avr32/boards/atngw100/evklcd10x.c
+++ b/arch/avr32/boards/atngw100/evklcd10x.c
@@ -164,7 +164,12 @@ static int __init atevklcd10x_init(void)
 
         at32_add_device_lcdc(0, &atevklcd10x_lcdc_data,
                         fbmem_start, fbmem_size,
-                        ATMEL_LCDC_ALT_18BIT | ATMEL_LCDC_PE_DVAL);
+#ifdef CONFIG_BOARD_ATNGW100_MKII
+                        ATMEL_LCDC_PRI_18BIT | ATMEL_LCDC_PC_DVAL
+#else
+                        ATMEL_LCDC_ALT_18BIT | ATMEL_LCDC_PE_DVAL
+#endif
+                        );
 
         at32_add_device_ac97c(0, &ac97c0_data, AC97C_BOTH);
 
diff --git a/arch/avr32/boards/atngw100/mrmt.c b/arch/avr32/boards/atngw100/mrmt.c
index bf78e516a85f..7919be311f4a 100644
--- a/arch/avr32/boards/atngw100/mrmt.c
+++ b/arch/avr32/boards/atngw100/mrmt.c
@@ -302,6 +302,7 @@ static int __init mrmt1_init(void)
         at32_select_periph( GPIO_PIOB_BASE, 1 << (PB_EXTINT_BASE+TS_IRQ),
                         GPIO_PERIPH_A, AT32_GPIOF_DEGLITCH);
         set_irq_type( AT32_EXTINT(TS_IRQ), IRQ_TYPE_EDGE_FALLING );
+        at32_spi_setup_slaves(0,spi01_board_info,ARRAY_SIZE(spi01_board_info));
         spi_register_board_info(spi01_board_info,ARRAY_SIZE(spi01_board_info));
 #endif
 
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index bc299fbbeb4e..8c6a2440e345 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -20,6 +20,7 @@
 #include <linux/leds.h>
 #include <linux/spi/spi.h>
 #include <linux/atmel-mci.h>
+#include <linux/usb/atmel_usba_udc.h>
 
 #include <asm/io.h>
 #include <asm/setup.h>
@@ -36,6 +37,75 @@ unsigned long at32_board_osc_rates[3] = {
         [2] = 12000000, /* 12 MHz on osc1 */
 };
 
+/*
+ * The ATNGW100 mkII is very similar to the ATNGW100. Both have the AT32AP7000
+ * chip on board; the difference is that the ATNGW100 mkII has 128 MB 32-bit
+ * SDRAM (the ATNGW100 has 32 MB 16-bit SDRAM) and 256 MB 16-bit NAND flash
+ * (the ATNGW100 has none.)
+ *
+ * The RAM difference is handled by the boot loader, so the only difference we
+ * end up handling here is the NAND flash, EBI pin reservation and if LCDC or
+ * MACB1 should be enabled.
+ */
+#ifdef CONFIG_BOARD_ATNGW100_MKII
+#include <linux/mtd/partitions.h>
+#include <mach/smc.h>
+
+static struct smc_timing nand_timing __initdata = {
+        .ncs_read_setup         = 0,
+        .nrd_setup              = 10,
+        .ncs_write_setup        = 0,
+        .nwe_setup              = 10,
+
+        .ncs_read_pulse         = 30,
+        .nrd_pulse              = 15,
+        .ncs_write_pulse        = 30,
+        .nwe_pulse              = 15,
+
+        .read_cycle             = 30,
+        .write_cycle            = 30,
+
+        .ncs_read_recover       = 0,
+        .nrd_recover            = 15,
+        .ncs_write_recover      = 0,
+        /* WE# high -> RE# low min 60 ns */
+        .nwe_recover            = 50,
+};
+
+static struct smc_config nand_config __initdata = {
+        .bus_width              = 2,
+        .nrd_controlled         = 1,
+        .nwe_controlled         = 1,
+        .nwait_mode             = 0,
+        .byte_write             = 0,
+        .tdf_cycles             = 2,
+        .tdf_mode               = 0,
+};
+
+static struct mtd_partition nand_partitions[] = {
+        {
+                .name           = "main",
+                .offset         = 0x00000000,
+                .size           = MTDPART_SIZ_FULL,
+        },
+};
+
+static struct mtd_partition *nand_part_info(int size, int *num_partitions)
+{
+        *num_partitions = ARRAY_SIZE(nand_partitions);
+        return nand_partitions;
+}
+
+static struct atmel_nand_data atngw100mkii_nand_data __initdata = {
+        .cle            = 21,
+        .ale            = 22,
+        .rdy_pin        = GPIO_PIN_PB(28),
+        .enable_pin     = GPIO_PIN_PE(23),
+        .bus_width_16   = true,
+        .partition_info = nand_part_info,
+};
+#endif
+
 /* Initialized by bootloader-specific startup code. */
 struct tag *bootloader_tags __initdata;
 
@@ -56,9 +126,9 @@ static struct spi_board_info spi0_board_info[] __initdata = {
 static struct mci_platform_data __initdata mci0_data = {
         .slot[0] = {
                 .bus_width      = 4,
-#if defined(CONFIG_BOARD_ATNGW100_EVKLCD10X) || defined(CONFIG_BOARD_ATNGW100_MRMT1)
-                .detect_pin     = GPIO_PIN_NONE,
-                .wp_pin         = GPIO_PIN_NONE,
+#if defined(CONFIG_BOARD_ATNGW100_MKII)
+                .detect_pin     = GPIO_PIN_PC(25),
+                .wp_pin         = GPIO_PIN_PE(22),
 #else
                 .detect_pin     = GPIO_PIN_PC(25),
                 .wp_pin         = GPIO_PIN_PE(0),
@@ -66,6 +136,14 @@ static struct mci_platform_data __initdata mci0_data = {
         },
 };
 
+static struct usba_platform_data atngw100_usba_data __initdata = {
+#if defined(CONFIG_BOARD_ATNGW100_MKII)
+        .vbus_pin       = GPIO_PIN_PE(26),
+#else
+        .vbus_pin       = -ENODEV,
+#endif
+};
+
 /*
  * The next two functions should go away as the boot loader is
  * supposed to initialize the macb address registers with a valid
@@ -173,18 +251,27 @@ static int __init atngw100_init(void)
         unsigned        i;
 
         /*
-         * ATNGW100 uses 16-bit SDRAM interface, so we don't need to
-         * reserve any pins for it.
+         * ATNGW100 mkII uses 32-bit SDRAM interface. Reserve the
+         * SDRAM-specific pins so that nobody messes with them.
          */
+#ifdef CONFIG_BOARD_ATNGW100_MKII
+        at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL);
+
+        smc_set_timing(&nand_config, &nand_timing);
+        smc_set_configuration(3, &nand_config);
+        at32_add_device_nand(0, &atngw100mkii_nand_data);
+#endif
 
         at32_add_device_usart(0);
 
         set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
+#ifndef CONFIG_BOARD_ATNGW100_MKII_LCD
         set_hw_addr(at32_add_device_eth(1, &eth_data[1]));
+#endif
 
         at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
         at32_add_device_mci(0, &mci0_data);
-        at32_add_device_usba(0, NULL);
+        at32_add_device_usba(0, &atngw100_usba_data);
 
         for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) {
                 at32_select_gpio(ngw_leds[i].gpio,
@@ -194,10 +281,14 @@ static int __init atngw100_init(void)
 
         /* all these i2c/smbus pins should have external pullups for
          * open-drain sharing among all I2C devices.  SDA and SCL do;
-         * PB28/EXTINT3 doesn't; it should be SMBALERT# (for PMBus),
-         * but it's not available off-board.
+         * PB28/EXTINT3 (ATNGW100) and PE21 (ATNGW100 mkII) doesn't; it should
+         * be SMBALERT# (for PMBus), but it's not available off-board.
          */
+#ifdef CONFIG_BOARD_ATNGW100_MKII
+        at32_select_periph(GPIO_PIOE_BASE, 1 << 21, 0, AT32_GPIOF_PULLUP);
+#else
         at32_select_periph(GPIO_PIOB_BASE, 1 << 28, 0, AT32_GPIOF_PULLUP);
+#endif
         at32_select_gpio(i2c_gpio_data.sda_pin,
                 AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
         at32_select_gpio(i2c_gpio_data.scl_pin,
@@ -211,14 +302,22 @@ postcore_initcall(atngw100_init);
 
 static int __init atngw100_arch_init(void)
 {
-        /* PB30 is the otherwise unused jumper on the mainboard, with an
-         * external pullup; the jumper grounds it.  Use it however you
-         * like, including letting U-Boot or Linux tweak boot sequences.
+        /* PB30 (ATNGW100) and PE30 (ATNGW100 mkII) is the otherwise unused
+         * jumper on the mainboard, with an external pullup; the jumper grounds
+         * it. Use it however you like, including letting U-Boot or Linux tweak
+         * boot sequences.
          */
+#ifdef CONFIG_BOARD_ATNGW100_MKII
+        at32_select_gpio(GPIO_PIN_PE(30), 0);
+        gpio_request(GPIO_PIN_PE(30), "j15");
+        gpio_direction_input(GPIO_PIN_PE(30));
+        gpio_export(GPIO_PIN_PE(30), false);
+#else
         at32_select_gpio(GPIO_PIN_PB(30), 0);
         gpio_request(GPIO_PIN_PB(30), "j15");
         gpio_direction_input(GPIO_PIN_PB(30));
         gpio_export(GPIO_PIN_PB(30), false);
+#endif
 
         /* set_irq_type() after the arch_initcall for EIC has run, and
          * before the I2C subsystem could try using this IRQ.
diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig
index 574aca975334..32205c9d37d4 100644
--- a/arch/avr32/configs/atngw100_defconfig
+++ b/arch/avr32/configs/atngw100_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc1
-# Tue Aug  5 16:00:47 2008
+# Linux kernel version: 2.6.32-rc5
+# Thu Oct 29 09:39:22 2009
 #
 CONFIG_AVR32=y
 CONFIG_GENERIC_GPIO=y
@@ -21,6 +21,7 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
 
 #
 # General setup
@@ -34,22 +35,37 @@ CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CGROUPS is not set
 # CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
 CONFIG_EMBEDDED=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
@@ -59,38 +75,40 @@ CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-# CONFIG_COMPAT_BRK is not set
 # CONFIG_BASE_FULL is not set
 CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
+CONFIG_AIO=y
+
+#
+# Kernel Performance Events And Counters
+#
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_PROFILING=y
-# CONFIG_MARKERS is not set
+CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 CONFIG_HAVE_OPROFILE=y
 CONFIG_KPROBES=y
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
 CONFIG_HAVE_KPROBES=y
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
 CONFIG_HAVE_CLK=y
-CONFIG_PROC_PAGE_MONITOR=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_SLOW_WORK=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=1
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
@@ -98,11 +116,8 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
 CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
+CONFIG_LBDAF=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
@@ -118,7 +133,7 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_CLASSIC_RCU=y
+CONFIG_FREEZER=y
 
 #
 # System Type and features
@@ -133,8 +148,23 @@ CONFIG_PERFORMANCE_COUNTERS=y
 CONFIG_PLATFORM_AT32AP=y
 CONFIG_CPU_AT32AP700X=y
 CONFIG_CPU_AT32AP7000=y
+CONFIG_BOARD_ATNGW100_COMMON=y
 # CONFIG_BOARD_ATSTK1000 is not set
-CONFIG_BOARD_ATNGW100=y
+CONFIG_BOARD_ATNGW100_MKI=y
+# CONFIG_BOARD_ATNGW100_MKII is not set
+# CONFIG_BOARD_HAMMERHEAD is not set
+# CONFIG_BOARD_FAVR_32 is not set
+# CONFIG_BOARD_MERISC is not set
+# CONFIG_BOARD_MIMC200 is not set
+# CONFIG_BOARD_ATSTK1002 is not set
+# CONFIG_BOARD_ATSTK1003 is not set
+# CONFIG_BOARD_ATSTK1004 is not set
+# CONFIG_BOARD_ATSTK1006 is not set
+# CONFIG_BOARD_ATSTK1000_J2_LED8 is not set
+# CONFIG_BOARD_ATSTK1000_J2_RGB is not set
+CONFIG_BOARD_ATNGW100_ADDON_NONE=y
+# CONFIG_BOARD_ATNGW100_EVKLCD10X is not set
+# CONFIG_BOARD_ATNGW100_MRMT is not set
 CONFIG_LOADER_U_BOOT=y
 
 #
@@ -150,7 +180,7 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 CONFIG_QUICKLIST=y
-# CONFIG_HAVE_ARCH_BOOTMEM_NODE is not set
+# CONFIG_HAVE_ARCH_BOOTMEM is not set
 # CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set
 # CONFIG_NEED_NODE_MEMMAP_SIZE is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -162,14 +192,16 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_NR_QUICK=2
 CONFIG_VIRT_TO_BUS=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_OWNERSHIP_TRACE is not set
 CONFIG_NMI_DEBUGGING=y
 # CONFIG_HZ_100 is not set
@@ -177,7 +209,7 @@ CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
-# CONFIG_SCHED_HRTICK is not set
+CONFIG_SCHED_HRTICK=y
 CONFIG_CMDLINE=""
 
 #
@@ -188,6 +220,7 @@ CONFIG_PM=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_PM_RUNTIME is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 
 #
@@ -219,6 +252,8 @@ CONFIG_CPU_FREQ_AT32AP=y
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
 CONFIG_NET=y
 
@@ -271,7 +306,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
@@ -314,10 +348,12 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
+# CONFIG_IP_VS is not set
 
 #
 # IP: Netfilter Configuration
 #
+CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_IPTABLES=m
@@ -343,16 +379,18 @@ CONFIG_IP_NF_MANGLE=m
 CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_MANGLE=m
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 CONFIG_STP=m
 CONFIG_BRIDGE=m
+# CONFIG_NET_DSA is not set
 CONFIG_VLAN_8021Q=m
 # CONFIG_VLAN_8021Q_GVRP is not set
 # CONFIG_DECNET is not set
@@ -364,26 +402,33 @@ CONFIG_LLC=m
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
 # CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
 
 #
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_TCPPROBE is not set
+# CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
+# CONFIG_WIRELESS_OLD_REGULATORY is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_LIB80211 is not set
 
 #
-# Wireless
+# CFG80211 needs to be enabled for MAC80211
 #
-# CONFIG_CFG80211 is not set
-# CONFIG_WIRELESS_EXT is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_IEEE80211 is not set
+# CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
 
@@ -395,6 +440,7 @@ CONFIG_LLC=m
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
 CONFIG_STANDALONE=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
@@ -404,6 +450,7 @@ CONFIG_STANDALONE=y
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_TESTS is not set
 # CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -453,16 +500,17 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0x80000000
-CONFIG_MTD_PHYSMAP_LEN=0x0
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
 # CONFIG_MTD_PLATRAM is not set
 
 #
 # Self-contained MTD device drivers
 #
 CONFIG_MTD_DATAFLASH=y
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
 # CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
@@ -478,9 +526,22 @@ CONFIG_MTD_DATAFLASH=y
 # CONFIG_MTD_ONENAND is not set
 
 #
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
 # UBI - Unsorted block images
 #
-# CONFIG_MTD_UBI is not set
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_GLUEBI is not set
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
@@ -498,10 +559,20 @@ CONFIG_MISC_DEVICES=y
 CONFIG_ATMEL_TCLIB=y
 CONFIG_ATMEL_TCB_CLKSRC=y
 CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
-# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_ICS932S401 is not set
 # CONFIG_ATMEL_SSC is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HAVE_IDE is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
 
 #
 # SCSI device support
@@ -534,26 +605,37 @@ CONFIG_PHYLIB=y
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_FIXED_PHY is not set
 # CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
 CONFIG_MACB=y
 # CONFIG_ENC28J60 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
 # CONFIG_B44 is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
+CONFIG_WLAN=y
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
-# Wireless LAN
+# Enable WiMAX (Networking options) to see the WiMAX drivers
 #
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
-# CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_WAN is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
@@ -603,9 +685,11 @@ CONFIG_SERIAL_ATMEL=y
 CONFIG_SERIAL_ATMEL_CONSOLE=y
 CONFIG_SERIAL_ATMEL_PDC=y
 # CONFIG_SERIAL_ATMEL_TTYAT is not set
+# CONFIG_SERIAL_MAX3100 is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
@@ -614,7 +698,9 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_TCG_TPM is not set
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_ALGOBIT=m
 
 #
@@ -624,6 +710,7 @@ CONFIG_I2C_ALGOBIT=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+# CONFIG_I2C_DESIGNWARE is not set
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_SIMTEC is not set
@@ -644,14 +731,6 @@ CONFIG_I2C_GPIO=m
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-CONFIG_EEPROM_AT24=m
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
@@ -666,19 +745,28 @@ CONFIG_SPI_MASTER=y
 #
 CONFIG_SPI_ATMEL=y
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_GPIO is not set
 
 #
 # SPI Protocol Masters
 #
-# CONFIG_EEPROM_AT25 is not set
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
 
 #
+# Memory mapped GPIO expanders:
+#
+
+#
 # I2C GPIO expanders:
 #
 # CONFIG_GPIO_MAX732X is not set
@@ -694,11 +782,15 @@ CONFIG_GPIO_SYSFS=y
 #
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+
+#
+# AC97 GPIO expanders:
+#
 # CONFIG_W1 is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
-# CONFIG_THERMAL_HWMON is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
@@ -707,11 +799,11 @@ CONFIG_WATCHDOG=y
 #
 # CONFIG_SOFT_WATCHDOG is not set
 CONFIG_AT32AP700X_WDT=y
+CONFIG_SSB_POSSIBLE=y
 
 #
 # Sonics Silicon Backplane
 #
-CONFIG_SSB_POSSIBLE=y
 # CONFIG_SSB is not set
 
 #
@@ -720,22 +812,17 @@ CONFIG_SSB_POSSIBLE=y
 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_HTC_PASIC3 is not set
-
-#
-# Multimedia devices
-#
-
-#
-# Multimedia core support
-#
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_VIDEO_MEDIA is not set
-
-#
-# Multimedia drivers
-#
-# CONFIG_DAB is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
 
 #
 # Graphics support
@@ -756,32 +843,43 @@ CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
 
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
 #
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_AT91 is not set
 CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_USB_ATMEL_USBA=y
 # CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_PXA25X is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_PXA27X is not set
-# CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
 # CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_S3C_HSOTG is not set
+# CONFIG_USB_GADGET_IMX is not set
 # CONFIG_USB_GADGET_S3C2410 is not set
-# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_ZERO=m
+# CONFIG_USB_AUDIO is not set
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
@@ -789,12 +887,18 @@ CONFIG_USB_G_SERIAL=m
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_PRINTER is not set
 CONFIG_USB_CDC_COMPOSITE=m
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_NOP_USB_XCEIV is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 
 #
-# MMC/SD Card Drivers
+# MMC/SD/SDIO Card Drivers
 #
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
@@ -802,10 +906,12 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_TEST=m
 
 #
-# MMC/SD Host Controller Drivers
+# MMC/SD/SDIO Host Controller Drivers
 #
 # CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_AT91 is not set
 CONFIG_MMC_ATMELMCI=y
+# CONFIG_MMC_ATMELMCI_DMA is not set
 CONFIG_MMC_SPI=m
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
@@ -815,7 +921,11 @@ CONFIG_LEDS_CLASS=y
 # LED drivers
 #
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_BD2802 is not set
 
 #
 # LED Triggers
@@ -823,7 +933,13 @@ CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
@@ -855,25 +971,33 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_M41T80 is not set
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
 
 #
 # SPI RTC drivers
 #
 # CONFIG_RTC_DRV_M41T94 is not set
 # CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
 
 #
 # Platform RTC drivers
 #
+# CONFIG_RTC_DRV_DS1286 is not set
 # CONFIG_RTC_DRV_DS1511 is not set
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
 # CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
@@ -892,24 +1016,38 @@ CONFIG_DMA_ENGINE=y
 # DMA Clients
 #
 # CONFIG_NET_DMA is not set
+# CONFIG_ASYNC_TX_DMA is not set
 # CONFIG_DMATEST is not set
+# CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 
 #
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+
+#
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=m
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -917,6 +1055,12 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 CONFIG_FUSE_FS=m
+# CONFIG_CUSE is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -940,15 +1084,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_PROC_FS=y
 # CONFIG_PROC_KCORE is not set
 CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_CONFIGFS_FS=m
-
-#
-# Miscellaneous filesystems
-#
+CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
@@ -967,7 +1109,9 @@ CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFFS2_LZO is not set
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
+# CONFIG_UBIFS_FS is not set
 # CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_OMFS_FS is not set
@@ -975,7 +1119,9 @@ CONFIG_JFFS2_RTIME=y
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
+CONFIG_UFS_FS=y
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
@@ -1060,14 +1206,18 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
@@ -1083,6 +1233,7 @@ CONFIG_SCHED_DEBUG=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
@@ -1091,13 +1242,39 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_LKDTM is not set
 # CONFIG_FAULT_INJECTION is not set
+# CONFIG_PAGE_POISONING is not set
+CONFIG_NOP_TRACER=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
+# CONFIG_BOOT_TRACER is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_SAMPLES is not set
 
 #
@@ -1105,19 +1282,30 @@ CONFIG_FRAME_POINTER=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
 
 #
 # Crypto core or helper
 #
+# CONFIG_CRYPTO_FIPS is not set
 CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
 CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_TEST is not set
@@ -1145,11 +1333,13 @@ CONFIG_CRYPTO_PCBC=m
 #
 CONFIG_CRYPTO_HMAC=y
 # CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
 
 #
 # Digest
 #
 # CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_GHASH is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1166,7 +1356,7 @@ CONFIG_CRYPTO_SHA1=y
 #
 # Ciphers
 #
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_BLOWFISH is not set
@@ -1186,15 +1376,21 @@ CONFIG_CRYPTO_DES=y
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_HW=y
+CONFIG_BINARY_PRINTF=y
 
 #
 # Library routines
 #
 CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
+CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_T10DIF is not set
@@ -1204,8 +1400,9 @@ CONFIG_CRC7=m
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_DECOMPRESS_GZIP=y
 CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
diff --git a/arch/avr32/configs/atngw100_evklcd100_defconfig b/arch/avr32/configs/atngw100_evklcd100_defconfig
index 86a45b5c9d0d..c732cc397ad0 100644
--- a/arch/avr32/configs/atngw100_evklcd100_defconfig
+++ b/arch/avr32/configs/atngw100_evklcd100_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.25.6
-# Wed Jun 18 16:06:32 2008
+# Linux kernel version: 2.6.32-rc5
+# Thu Oct 29 09:36:39 2009
 #
 CONFIG_AVR32=y
 CONFIG_GENERIC_GPIO=y
@@ -21,6 +21,7 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
 
 #
 # General setup
@@ -34,22 +35,37 @@ CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CGROUPS is not set
 # CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
 CONFIG_EMBEDDED=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
@@ -59,43 +75,51 @@ CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-# CONFIG_COMPAT_BRK is not set
 # CONFIG_BASE_FULL is not set
 CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
+CONFIG_AIO=y
+
+#
+# Kernel Performance Events And Counters
+#
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_PROFILING=y
-# CONFIG_MARKERS is not set
+CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 CONFIG_HAVE_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_HAVE_KPROBES=y
-# CONFIG_HAVE_KRETPROBES is not set
-CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_HAVE_CLK=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_SLOW_WORK=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=1
 CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
 CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
+CONFIG_LBDAF=y
 # CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
 
 #
 # IO Schedulers
@@ -109,7 +133,7 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_CLASSIC_RCU=y
+CONFIG_FREEZER=y
 
 #
 # System Type and features
@@ -124,13 +148,26 @@ CONFIG_PERFORMANCE_COUNTERS=y
 CONFIG_PLATFORM_AT32AP=y
 CONFIG_CPU_AT32AP700X=y
 CONFIG_CPU_AT32AP7000=y
+CONFIG_BOARD_ATNGW100_COMMON=y
 # CONFIG_BOARD_ATSTK1000 is not set
-CONFIG_BOARD_ATNGW100=y
+CONFIG_BOARD_ATNGW100_MKI=y
+# CONFIG_BOARD_ATNGW100_MKII is not set
+# CONFIG_BOARD_HAMMERHEAD is not set
+# CONFIG_BOARD_FAVR_32 is not set
+# CONFIG_BOARD_MERISC is not set
+# CONFIG_BOARD_MIMC200 is not set
+# CONFIG_BOARD_ATSTK1002 is not set
+# CONFIG_BOARD_ATSTK1003 is not set
+# CONFIG_BOARD_ATSTK1004 is not set
+# CONFIG_BOARD_ATSTK1006 is not set
+# CONFIG_BOARD_ATSTK1000_J2_LED8 is not set
+# CONFIG_BOARD_ATSTK1000_J2_RGB is not set
+# CONFIG_BOARD_ATNGW100_ADDON_NONE is not set
 CONFIG_BOARD_ATNGW100_EVKLCD10X=y
+# CONFIG_BOARD_ATNGW100_MRMT is not set
 CONFIG_BOARD_ATNGW100_EVKLCD10X_QVGA=y
 # CONFIG_BOARD_ATNGW100_EVKLCD10X_VGA is not set
 # CONFIG_BOARD_ATNGW100_EVKLCD10X_POW_QVGA is not set
-CONFIG_BOARD_ATNGW100_I2C_GPIO=y
 CONFIG_LOADER_U_BOOT=y
 
 #
@@ -139,14 +176,14 @@ CONFIG_LOADER_U_BOOT=y
 # CONFIG_AP700X_32_BIT_SMC is not set
 CONFIG_AP700X_16_BIT_SMC=y
 # CONFIG_AP700X_8_BIT_SMC is not set
-CONFIG_GPIO_DEV=y
 CONFIG_LOAD_ADDRESS=0x10000000
 CONFIG_ENTRY_ADDRESS=0x90000000
 CONFIG_PHYS_OFFSET=0x10000000
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_HAVE_ARCH_BOOTMEM_NODE is not set
+CONFIG_QUICKLIST=y
+# CONFIG_HAVE_ARCH_BOOTMEM is not set
 # CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set
 # CONFIG_NEED_NODE_MEMMAP_SIZE is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -158,33 +195,36 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
 CONFIG_VIRT_TO_BUS=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_OWNERSHIP_TRACE is not set
 CONFIG_NMI_DEBUGGING=y
-CONFIG_DW_DMAC=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
-# CONFIG_SCHED_HRTICK is not set
+CONFIG_SCHED_HRTICK=y
 CONFIG_CMDLINE=""
 
 #
 # Power management options
 #
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_PM_RUNTIME is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
 
 #
 # CPU Frequency scaling
@@ -194,6 +234,7 @@ CONFIG_CPU_FREQ_TABLE=y
 # CONFIG_CPU_FREQ_DEBUG is not set
 # CONFIG_CPU_FREQ_STAT is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
@@ -214,11 +255,9 @@ CONFIG_CPU_FREQ_AT32AP=y
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
-
-#
-# Networking
-#
 CONFIG_NET=y
 
 #
@@ -232,6 +271,7 @@ CONFIG_XFRM_USER=y
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
 # CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=y
 CONFIG_NET_KEY=y
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
@@ -269,7 +309,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
@@ -285,8 +324,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
 CONFIG_INET6_XFRM_MODE_BEET=y
 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
 CONFIG_IPV6_SIT=y
+CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_TUNNEL is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
@@ -310,10 +351,12 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
+# CONFIG_IP_VS is not set
 
 #
 # IP: Netfilter Configuration
 #
+CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_IPTABLES=m
@@ -339,16 +382,20 @@ CONFIG_IP_NF_MANGLE=m
 CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_MANGLE=m
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
+CONFIG_STP=m
 CONFIG_BRIDGE=m
+# CONFIG_NET_DSA is not set
 CONFIG_VLAN_8021Q=m
+# CONFIG_VLAN_8021Q_GVRP is not set
 # CONFIG_DECNET is not set
 CONFIG_LLC=m
 # CONFIG_LLC2 is not set
@@ -358,26 +405,33 @@ CONFIG_LLC=m
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
 # CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
 
 #
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_TCPPROBE is not set
+# CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
+# CONFIG_WIRELESS_OLD_REGULATORY is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_LIB80211 is not set
 
 #
-# Wireless
+# CFG80211 needs to be enabled for MAC80211
 #
-# CONFIG_CFG80211 is not set
-# CONFIG_WIRELESS_EXT is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_IEEE80211 is not set
+# CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
 
@@ -389,6 +443,7 @@ CONFIG_LLC=m
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
 CONFIG_STANDALONE=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
@@ -398,10 +453,12 @@ CONFIG_STANDALONE=y
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_TESTS is not set
 # CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AR7_PARTS is not set
 
 #
 # User Modules And Translation Layers
@@ -446,16 +503,17 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0x80000000
-CONFIG_MTD_PHYSMAP_LEN=0x0
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
 # CONFIG_MTD_PLATRAM is not set
 
 #
 # Self-contained MTD device drivers
 #
 CONFIG_MTD_DATAFLASH=y
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
 # CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
@@ -471,6 +529,11 @@ CONFIG_MTD_DATAFLASH=y
 # CONFIG_MTD_ONENAND is not set
 
 #
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
 # UBI - Unsorted block images
 #
 CONFIG_MTD_UBI=y
@@ -499,10 +562,20 @@ CONFIG_MISC_DEVICES=y
 CONFIG_ATMEL_TCLIB=y
 CONFIG_ATMEL_TCB_CLKSRC=y
 CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
-# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_ICS932S401 is not set
 # CONFIG_ATMEL_SSC is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HAVE_IDE is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
 
 #
 # SCSI device support
@@ -514,7 +587,6 @@ CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
 # CONFIG_ATA is not set
 # CONFIG_MD is not set
 CONFIG_NETDEVICES=y
-# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
@@ -536,25 +608,37 @@ CONFIG_PHYLIB=y
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_FIXED_PHY is not set
 # CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
 CONFIG_MACB=y
 # CONFIG_ENC28J60 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
 # CONFIG_B44 is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
+CONFIG_WLAN=y
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
-# Wireless LAN
+# Enable WiMAX (Networking options) to see the WiMAX drivers
 #
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
@@ -598,15 +682,30 @@ CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
 # CONFIG_TOUCHSCREEN_PENMOUNT is not set
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_UCB1400 is not set
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+# CONFIG_TOUCHSCREEN_WM97XX_ATMEL is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
 # CONFIG_INPUT_MISC is not set
 
 #
@@ -619,9 +718,11 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # Character devices
 #
 CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -636,9 +737,11 @@ CONFIG_SERIAL_ATMEL=y
 CONFIG_SERIAL_ATMEL_CONSOLE=y
 CONFIG_SERIAL_ATMEL_PDC=y
 # CONFIG_SERIAL_ATMEL_TTYAT is not set
+# CONFIG_SERIAL_MAX3100 is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
@@ -647,45 +750,44 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_TCG_TPM is not set
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=m
 
 #
-# I2C Algorithms
+# I2C Hardware Bus support
 #
-CONFIG_I2C_ALGOBIT=m
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALGOPCA is not set
 
 #
-# I2C Hardware Bus support
+# I2C system bus drivers (mostly embedded / system-on-chip)
 #
-CONFIG_I2C_ATMELTWI=m
+# CONFIG_I2C_DESIGNWARE is not set
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_SIMTEC is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_TAOS_EVM is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_STUB is not set
 
 #
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# SPI support
-#
 CONFIG_SPI=y
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_MASTER=y
@@ -695,30 +797,48 @@ CONFIG_SPI_MASTER=y
 #
 CONFIG_SPI_ATMEL=y
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_GPIO is not set
 
 #
 # SPI Protocol Masters
 #
-# CONFIG_EEPROM_AT25 is not set
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
-CONFIG_HAVE_GPIO_LIB=y
 
 #
-# GPIO Support
+# PPS support
 #
+# CONFIG_PPS is not set
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
+# CONFIG_GPIO_SYSFS is not set
+
+#
+# Memory mapped GPIO expanders:
+#
 
 #
 # I2C GPIO expanders:
 #
+# CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 
 #
+# PCI GPIO expanders:
+#
+
+#
 # SPI GPIO expanders:
 #
+# CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+
+#
+# AC97 GPIO expanders:
+#
 # CONFIG_W1 is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
@@ -731,24 +851,31 @@ CONFIG_WATCHDOG=y
 #
 # CONFIG_SOFT_WATCHDOG is not set
 CONFIG_AT32AP700X_WDT=y
+CONFIG_SSB_POSSIBLE=y
 
 #
 # Sonics Silicon Backplane
 #
-CONFIG_SSB_POSSIBLE=y
 # CONFIG_SSB is not set
 
 #
 # Multifunction device drivers
 #
+# CONFIG_MFD_CORE is not set
 # CONFIG_MFD_SM501 is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DAB is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
 
 #
 # Graphics support
@@ -758,6 +885,7 @@ CONFIG_SSB_POSSIBLE=y
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
@@ -765,8 +893,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SYS_FILLRECT is not set
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -779,6 +907,9 @@ CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_ATMEL=y
 # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
@@ -792,119 +923,124 @@ CONFIG_FB_ATMEL=y
 CONFIG_DUMMY_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE is not set
 # CONFIG_LOGO is not set
-
-#
-# Sound
-#
 CONFIG_SOUND=y
-
-#
-# Advanced Linux Sound Architecture
-#
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=m
 # CONFIG_SND_SEQUENCER is not set
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_HRTIMER=y
 # CONFIG_SND_DYNAMIC_MINORS is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
+CONFIG_SND_VMASTER=y
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
 CONFIG_SND_AC97_CODEC=m
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_DRIVERS is not set
 
 #
-# AVR32 devices
-#
-CONFIG_SND_ATMEL_AC97=m
-
-#
-# SPI devices
-#
-
-#
-# System on Chip audio support
+# Atmel devices (AVR32 and AT91)
 #
+# CONFIG_SND_ATMEL_ABDAC is not set
+CONFIG_SND_ATMEL_AC97C=m
+# CONFIG_SND_SPI is not set
 # CONFIG_SND_SOC is not set
-
-#
-# SoC Audio support for SuperH
-#
-
-#
-# ALSA SoC audio for Freescale SOCs
-#
-
-#
-# Open Sound System
-#
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
 # CONFIG_HIDRAW is not set
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
 
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
 #
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=350
 CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_AT91 is not set
 CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_USB_ATMEL_USBA=y
 # CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_PXA2XX is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
 # CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_S3C_HSOTG is not set
+# CONFIG_USB_GADGET_IMX is not set
 # CONFIG_USB_GADGET_S3C2410 is not set
-# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_ZERO=m
+# CONFIG_USB_AUDIO is not set
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
 CONFIG_USB_G_SERIAL=m
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_PRINTER is not set
+CONFIG_USB_CDC_COMPOSITE=m
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_NOP_USB_XCEIV is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 
 #
-# MMC/SD Card Drivers
+# MMC/SD/SDIO Card Drivers
 #
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
 
 #
-# MMC/SD Host Controller Drivers
+# MMC/SD/SDIO Host Controller Drivers
 #
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_AT91 is not set
 CONFIG_MMC_ATMELMCI=y
+# CONFIG_MMC_ATMELMCI_DMA is not set
 # CONFIG_MMC_SPI is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
@@ -913,7 +1049,13 @@ CONFIG_LEDS_CLASS=y
 #
 # LED drivers
 #
+# CONFIG_LEDS_PCA9532 is not set
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_BD2802 is not set
 
 #
 # LED Triggers
@@ -921,6 +1063,14 @@ CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_ACCESSIBILITY is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -950,51 +1100,84 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
 # CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
 
 #
 # SPI RTC drivers
 #
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
 
 #
 # Platform RTC drivers
 #
+# CONFIG_RTC_DRV_DS1286 is not set
 # CONFIG_RTC_DRV_DS1511 is not set
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
 # CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
 # on-CPU RTC drivers
 #
 CONFIG_RTC_DRV_AT32AP700X=y
+CONFIG_DMADEVICES=y
 
 #
-# Userspace I/O
+# DMA Devices
 #
+CONFIG_DW_DMAC=y
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+# CONFIG_NET_DMA is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_DMATEST is not set
+# CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 
 #
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
 CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -1002,6 +1185,12 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 CONFIG_FUSE_FS=m
+# CONFIG_CUSE is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -1025,15 +1214,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_PROC_FS=y
 # CONFIG_PROC_KCORE is not set
 CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_CONFIGFS_FS=y
-
-#
-# Miscellaneous filesystems
-#
+CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
@@ -1059,8 +1246,10 @@ CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 # CONFIG_UBIFS_FS_DEBUG is not set
 # CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -1071,19 +1260,16 @@ CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
+CONFIG_ROOT_NFS=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V3_ACL is not set
 # CONFIG_NFSD_V4 is not set
-CONFIG_NFSD_TCP=y
-CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -1151,16 +1337,24 @@ CONFIG_NLS_UTF8=m
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
@@ -1172,19 +1366,48 @@ CONFIG_SCHED_DEBUG=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_LKDTM is not set
 # CONFIG_FAULT_INJECTION is not set
+# CONFIG_PAGE_POISONING is not set
+CONFIG_NOP_TRACER=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
+# CONFIG_BOOT_TRACER is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_SAMPLES is not set
 
 #
@@ -1192,63 +1415,118 @@ CONFIG_FRAME_POINTER=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_FIPS is not set
 CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_BLKCIPHER=y
-# CONFIG_CRYPTO_SEQIV is not set
+CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
 CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=y
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
 CONFIG_CRYPTO_HMAC=y
 # CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_GHASH is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
 CONFIG_CRYPTO_SHA1=y
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_XTS is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_TEA is not set
-CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
 CONFIG_CRYPTO_DEFLATE=y
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_AUTHENC=y
+# CONFIG_CRYPTO_ZLIB is not set
 CONFIG_CRYPTO_LZO=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_HW=y
+CONFIG_BINARY_PRINTF=y
 
 #
 # Library routines
 #
 CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=y
+# CONFIG_CRC_T10DIF is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_CRC7 is not set
@@ -1257,8 +1535,9 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
 CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
diff --git a/arch/avr32/configs/atngw100_evklcd101_defconfig b/arch/avr32/configs/atngw100_evklcd101_defconfig
index a96b68ea5e83..5ef67da343bc 100644
--- a/arch/avr32/configs/atngw100_evklcd101_defconfig
+++ b/arch/avr32/configs/atngw100_evklcd101_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.25.6
-# Wed Jun 18 16:09:32 2008
+# Linux kernel version: 2.6.32-rc5
+# Thu Oct 29 09:37:19 2009
 #
 CONFIG_AVR32=y
 CONFIG_GENERIC_GPIO=y
@@ -21,6 +21,7 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
 
 #
 # General setup
@@ -34,22 +35,37 @@ CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CGROUPS is not set
 # CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
 CONFIG_EMBEDDED=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
@@ -59,43 +75,51 @@ CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-# CONFIG_COMPAT_BRK is not set
 # CONFIG_BASE_FULL is not set
 CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
+CONFIG_AIO=y
+
+#
+# Kernel Performance Events And Counters
+#
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_PROFILING=y
-# CONFIG_MARKERS is not set
+CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 CONFIG_HAVE_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_HAVE_KPROBES=y
-# CONFIG_HAVE_KRETPROBES is not set
-CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_HAVE_CLK=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_SLOW_WORK=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=1
 CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
 CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
+CONFIG_LBDAF=y
 # CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
 
 #
 # IO Schedulers
@@ -109,7 +133,7 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_CLASSIC_RCU=y
+CONFIG_FREEZER=y
 
 #
 # System Type and features
@@ -124,13 +148,20 @@ CONFIG_PERFORMANCE_COUNTERS=y
 CONFIG_PLATFORM_AT32AP=y
 CONFIG_CPU_AT32AP700X=y
 CONFIG_CPU_AT32AP7000=y
+CONFIG_BOARD_ATNGW100_COMMON=y
 # CONFIG_BOARD_ATSTK1000 is not set
-CONFIG_BOARD_ATNGW100=y
+CONFIG_BOARD_ATNGW100_MKI=y
+# CONFIG_BOARD_ATNGW100_MKII is not set
+# CONFIG_BOARD_HAMMERHEAD is not set
+# CONFIG_BOARD_FAVR_32 is not set
+# CONFIG_BOARD_MERISC is not set
+# CONFIG_BOARD_MIMC200 is not set
+# CONFIG_BOARD_ATNGW100_ADDON_NONE is not set
 CONFIG_BOARD_ATNGW100_EVKLCD10X=y
+# CONFIG_BOARD_ATNGW100_MRMT is not set
 # CONFIG_BOARD_ATNGW100_EVKLCD10X_QVGA is not set
 CONFIG_BOARD_ATNGW100_EVKLCD10X_VGA=y
 # CONFIG_BOARD_ATNGW100_EVKLCD10X_POW_QVGA is not set
-CONFIG_BOARD_ATNGW100_I2C_GPIO=y
 CONFIG_LOADER_U_BOOT=y
 
 #
@@ -139,14 +170,14 @@ CONFIG_LOADER_U_BOOT=y
 # CONFIG_AP700X_32_BIT_SMC is not set
 CONFIG_AP700X_16_BIT_SMC=y
 # CONFIG_AP700X_8_BIT_SMC is not set
-CONFIG_GPIO_DEV=y
 CONFIG_LOAD_ADDRESS=0x10000000
 CONFIG_ENTRY_ADDRESS=0x90000000
 CONFIG_PHYS_OFFSET=0x10000000
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_HAVE_ARCH_BOOTMEM_NODE is not set
+CONFIG_QUICKLIST=y
+# CONFIG_HAVE_ARCH_BOOTMEM is not set
 # CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set
 # CONFIG_NEED_NODE_MEMMAP_SIZE is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -158,33 +189,36 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
 CONFIG_VIRT_TO_BUS=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_OWNERSHIP_TRACE is not set
 CONFIG_NMI_DEBUGGING=y
-CONFIG_DW_DMAC=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
-# CONFIG_SCHED_HRTICK is not set
+CONFIG_SCHED_HRTICK=y
 CONFIG_CMDLINE=""
 
 #
 # Power management options
 #
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_PM_RUNTIME is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
 
 #
 # CPU Frequency scaling
@@ -194,6 +228,7 @@ CONFIG_CPU_FREQ_TABLE=y
 # CONFIG_CPU_FREQ_DEBUG is not set
 # CONFIG_CPU_FREQ_STAT is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
@@ -214,11 +249,9 @@ CONFIG_CPU_FREQ_AT32AP=y
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
-
-#
-# Networking
-#
 CONFIG_NET=y
 
 #
@@ -232,6 +265,7 @@ CONFIG_XFRM_USER=y
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
 # CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=y
 CONFIG_NET_KEY=y
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
@@ -269,7 +303,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
@@ -285,8 +318,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
 CONFIG_INET6_XFRM_MODE_BEET=y
 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
 CONFIG_IPV6_SIT=y
+CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_TUNNEL is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
@@ -310,10 +345,12 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
+# CONFIG_IP_VS is not set
 
 #
 # IP: Netfilter Configuration
 #
+CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_IPTABLES=m
@@ -339,16 +376,20 @@ CONFIG_IP_NF_MANGLE=m
 CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_MANGLE=m
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
+CONFIG_STP=m
 CONFIG_BRIDGE=m
+# CONFIG_NET_DSA is not set
 CONFIG_VLAN_8021Q=m
+# CONFIG_VLAN_8021Q_GVRP is not set
 # CONFIG_DECNET is not set
 CONFIG_LLC=m
 # CONFIG_LLC2 is not set
@@ -358,26 +399,33 @@ CONFIG_LLC=m
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
 # CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
 
 #
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_TCPPROBE is not set
+# CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
+# CONFIG_WIRELESS_OLD_REGULATORY is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_LIB80211 is not set
 
 #
-# Wireless
+# CFG80211 needs to be enabled for MAC80211
 #
-# CONFIG_CFG80211 is not set
-# CONFIG_WIRELESS_EXT is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_IEEE80211 is not set
+# CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
 
@@ -389,6 +437,7 @@ CONFIG_LLC=m
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
 CONFIG_STANDALONE=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
@@ -398,10 +447,12 @@ CONFIG_STANDALONE=y
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_TESTS is not set
 # CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AR7_PARTS is not set
 
 #
 # User Modules And Translation Layers
@@ -446,16 +497,17 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0x80000000
-CONFIG_MTD_PHYSMAP_LEN=0x0
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
 # CONFIG_MTD_PLATRAM is not set
 
 #
 # Self-contained MTD device drivers
 #
 CONFIG_MTD_DATAFLASH=y
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
 # CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
@@ -471,6 +523,11 @@ CONFIG_MTD_DATAFLASH=y
 # CONFIG_MTD_ONENAND is not set
 
 #
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
 # UBI - Unsorted block images
 #
 CONFIG_MTD_UBI=y
@@ -499,10 +556,20 @@ CONFIG_MISC_DEVICES=y
 CONFIG_ATMEL_TCLIB=y
 CONFIG_ATMEL_TCB_CLKSRC=y
 CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
-# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_ICS932S401 is not set
 # CONFIG_ATMEL_SSC is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HAVE_IDE is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
 
 #
 # SCSI device support
@@ -514,7 +581,6 @@ CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
 # CONFIG_ATA is not set
 # CONFIG_MD is not set
 CONFIG_NETDEVICES=y
-# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
@@ -536,25 +602,37 @@ CONFIG_PHYLIB=y
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_FIXED_PHY is not set
 # CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
 CONFIG_MACB=y
 # CONFIG_ENC28J60 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
 # CONFIG_B44 is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
+CONFIG_WLAN=y
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
-# Wireless LAN
+# Enable WiMAX (Networking options) to see the WiMAX drivers
 #
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
@@ -598,15 +676,30 @@ CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
 # CONFIG_TOUCHSCREEN_PENMOUNT is not set
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_UCB1400 is not set
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+# CONFIG_TOUCHSCREEN_WM97XX_ATMEL is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
 # CONFIG_INPUT_MISC is not set
 
 #
@@ -619,9 +712,11 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # Character devices
 #
 CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -636,9 +731,11 @@ CONFIG_SERIAL_ATMEL=y
 CONFIG_SERIAL_ATMEL_CONSOLE=y
 CONFIG_SERIAL_ATMEL_PDC=y
 # CONFIG_SERIAL_ATMEL_TTYAT is not set
+# CONFIG_SERIAL_MAX3100 is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
@@ -647,45 +744,44 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_TCG_TPM is not set
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=m
 
 #
-# I2C Algorithms
+# I2C Hardware Bus support
 #
-CONFIG_I2C_ALGOBIT=m
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALGOPCA is not set
 
 #
-# I2C Hardware Bus support
+# I2C system bus drivers (mostly embedded / system-on-chip)
 #
-CONFIG_I2C_ATMELTWI=m
+# CONFIG_I2C_DESIGNWARE is not set
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_SIMTEC is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_TAOS_EVM is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_STUB is not set
 
 #
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# SPI support
-#
 CONFIG_SPI=y
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_MASTER=y
@@ -695,30 +791,48 @@ CONFIG_SPI_MASTER=y
 #
 CONFIG_SPI_ATMEL=y
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_GPIO is not set
 
 #
 # SPI Protocol Masters
 #
-# CONFIG_EEPROM_AT25 is not set
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
-CONFIG_HAVE_GPIO_LIB=y
 
 #
-# GPIO Support
+# PPS support
 #
+# CONFIG_PPS is not set
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
+# CONFIG_GPIO_SYSFS is not set
+
+#
+# Memory mapped GPIO expanders:
+#
 
 #
 # I2C GPIO expanders:
 #
+# CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 
 #
+# PCI GPIO expanders:
+#
+
+#
 # SPI GPIO expanders:
 #
+# CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+
+#
+# AC97 GPIO expanders:
+#
 # CONFIG_W1 is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
@@ -731,24 +845,31 @@ CONFIG_WATCHDOG=y
 #
 # CONFIG_SOFT_WATCHDOG is not set
 CONFIG_AT32AP700X_WDT=y
+CONFIG_SSB_POSSIBLE=y
 
 #
 # Sonics Silicon Backplane
 #
-CONFIG_SSB_POSSIBLE=y
 # CONFIG_SSB is not set
 
 #
 # Multifunction device drivers
 #
+# CONFIG_MFD_CORE is not set
 # CONFIG_MFD_SM501 is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DAB is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
 
 #
 # Graphics support
@@ -758,6 +879,7 @@ CONFIG_SSB_POSSIBLE=y
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
@@ -765,8 +887,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SYS_FILLRECT is not set
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -779,6 +901,9 @@ CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_ATMEL=y
 # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
@@ -792,119 +917,124 @@ CONFIG_FB_ATMEL=y
 CONFIG_DUMMY_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE is not set
 # CONFIG_LOGO is not set
-
-#
-# Sound
-#
 CONFIG_SOUND=y
-
-#
-# Advanced Linux Sound Architecture
-#
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=m
 # CONFIG_SND_SEQUENCER is not set
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_HRTIMER=y
 # CONFIG_SND_DYNAMIC_MINORS is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
+CONFIG_SND_VMASTER=y
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
 CONFIG_SND_AC97_CODEC=m
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_DRIVERS is not set
 
 #
-# AVR32 devices
-#
-CONFIG_SND_ATMEL_AC97=m
-
-#
-# SPI devices
-#
-
-#
-# System on Chip audio support
+# Atmel devices (AVR32 and AT91)
 #
+# CONFIG_SND_ATMEL_ABDAC is not set
+CONFIG_SND_ATMEL_AC97C=m
+# CONFIG_SND_SPI is not set
 # CONFIG_SND_SOC is not set
-
-#
-# SoC Audio support for SuperH
-#
-
-#
-# ALSA SoC audio for Freescale SOCs
-#
-
-#
-# Open Sound System
-#
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
 # CONFIG_HIDRAW is not set
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
 
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
 #
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=350
 CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_AT91 is not set
 CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_USB_ATMEL_USBA=y
 # CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_PXA2XX is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
 # CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_S3C_HSOTG is not set
+# CONFIG_USB_GADGET_IMX is not set
 # CONFIG_USB_GADGET_S3C2410 is not set
-# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_ZERO=m
+# CONFIG_USB_AUDIO is not set
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
 CONFIG_USB_G_SERIAL=m
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_PRINTER is not set
+CONFIG_USB_CDC_COMPOSITE=m
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_NOP_USB_XCEIV is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 
 #
-# MMC/SD Card Drivers
+# MMC/SD/SDIO Card Drivers
 #
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
 
 #
-# MMC/SD Host Controller Drivers
+# MMC/SD/SDIO Host Controller Drivers
 #
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_AT91 is not set
 CONFIG_MMC_ATMELMCI=y
+# CONFIG_MMC_ATMELMCI_DMA is not set
 # CONFIG_MMC_SPI is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
@@ -913,7 +1043,13 @@ CONFIG_LEDS_CLASS=y
 #
 # LED drivers
 #
+# CONFIG_LEDS_PCA9532 is not set
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_BD2802 is not set
 
 #
 # LED Triggers
@@ -921,6 +1057,14 @@ CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_ACCESSIBILITY is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -950,51 +1094,84 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
 # CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
 
 #
 # SPI RTC drivers
 #
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
 
 #
 # Platform RTC drivers
 #
+# CONFIG_RTC_DRV_DS1286 is not set
 # CONFIG_RTC_DRV_DS1511 is not set
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
 # CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
 # on-CPU RTC drivers
 #
 CONFIG_RTC_DRV_AT32AP700X=y
+CONFIG_DMADEVICES=y
 
 #
-# Userspace I/O
+# DMA Devices
 #
+CONFIG_DW_DMAC=y
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+# CONFIG_NET_DMA is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_DMATEST is not set
+# CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 
 #
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
 CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -1002,6 +1179,12 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 CONFIG_FUSE_FS=m
+# CONFIG_CUSE is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -1025,15 +1208,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_PROC_FS=y
 # CONFIG_PROC_KCORE is not set
 CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_CONFIGFS_FS=y
-
-#
-# Miscellaneous filesystems
-#
+CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
@@ -1059,8 +1240,10 @@ CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 # CONFIG_UBIFS_FS_DEBUG is not set
 # CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -1071,19 +1254,16 @@ CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
+CONFIG_ROOT_NFS=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V3_ACL is not set
 # CONFIG_NFSD_V4 is not set
-CONFIG_NFSD_TCP=y
-CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -1151,16 +1331,24 @@ CONFIG_NLS_UTF8=m
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
@@ -1172,19 +1360,48 @@ CONFIG_SCHED_DEBUG=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_LKDTM is not set
 # CONFIG_FAULT_INJECTION is not set
+# CONFIG_PAGE_POISONING is not set
+CONFIG_NOP_TRACER=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
+# CONFIG_BOOT_TRACER is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_SAMPLES is not set
 
 #
@@ -1192,63 +1409,118 @@ CONFIG_FRAME_POINTER=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_FIPS is not set
 CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_BLKCIPHER=y
-# CONFIG_CRYPTO_SEQIV is not set
+CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
 CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=y
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
 CONFIG_CRYPTO_HMAC=y
 # CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_GHASH is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
 CONFIG_CRYPTO_SHA1=y
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_XTS is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_TEA is not set
-CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
 CONFIG_CRYPTO_DEFLATE=y
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_AUTHENC=y
+# CONFIG_CRYPTO_ZLIB is not set
 CONFIG_CRYPTO_LZO=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_HW=y
+CONFIG_BINARY_PRINTF=y
 
 #
 # Library routines
 #
 CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=y
+# CONFIG_CRC_T10DIF is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_CRC7 is not set
@@ -1257,8 +1529,9 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
 CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
diff --git a/arch/avr32/configs/atngw100mkii_defconfig b/arch/avr32/configs/atngw100mkii_defconfig
new file mode 100644
index 000000000000..9b8b5b3b9c71
--- /dev/null
+++ b/arch/avr32/configs/atngw100mkii_defconfig
@@ -0,0 +1,1414 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.32-rc5
+# Thu Nov  5 15:32:26 2009
+#
+CONFIG_AVR32=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+# CONFIG_BASE_FULL is not set
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+CONFIG_KPROBES=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_CLK=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_SLOW_WORK=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=1
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_FREEZER=y
+
+#
+# System Type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SUBARCH_AVR32B=y
+CONFIG_MMU=y
+CONFIG_PERFORMANCE_COUNTERS=y
+CONFIG_PLATFORM_AT32AP=y
+CONFIG_CPU_AT32AP700X=y
+CONFIG_CPU_AT32AP7000=y
+CONFIG_BOARD_ATNGW100_COMMON=y
+# CONFIG_BOARD_ATSTK1000 is not set
+# CONFIG_BOARD_ATNGW100_MKI is not set
+CONFIG_BOARD_ATNGW100_MKII=y
+# CONFIG_BOARD_HAMMERHEAD is not set
+# CONFIG_BOARD_FAVR_32 is not set
+# CONFIG_BOARD_MERISC is not set
+# CONFIG_BOARD_MIMC200 is not set
+# CONFIG_BOARD_ATNGW100_MKII_LCD is not set
+CONFIG_BOARD_ATNGW100_ADDON_NONE=y
+# CONFIG_BOARD_ATNGW100_EVKLCD10X is not set
+# CONFIG_BOARD_ATNGW100_MRMT is not set
+CONFIG_LOADER_U_BOOT=y
+
+#
+# Atmel AVR32 AP options
+#
+# CONFIG_AP700X_32_BIT_SMC is not set
+CONFIG_AP700X_16_BIT_SMC=y
+# CONFIG_AP700X_8_BIT_SMC is not set
+CONFIG_LOAD_ADDRESS=0x10000000
+CONFIG_ENTRY_ADDRESS=0x90000000
+CONFIG_PHYS_OFFSET=0x10000000
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_QUICKLIST=y
+# CONFIG_HAVE_ARCH_BOOTMEM is not set
+# CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set
+# CONFIG_NEED_NODE_MEMMAP_SIZE is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+# CONFIG_ARCH_SPARSEMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
+CONFIG_VIRT_TO_BUS=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_OWNERSHIP_TRACE is not set
+CONFIG_NMI_DEBUGGING=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_CMDLINE=""
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_PM_RUNTIME is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+# CONFIG_CPU_FREQ_STAT is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_AT32AP=y
+
+#
+# Bus options
+#
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCCARD is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=y
+CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_MULTIPLE_TABLES is not set
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+# CONFIG_IP_PIMSM_V2 is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_XFRM_TUNNEL=y
+CONFIG_INET_TUNNEL=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=y
+CONFIG_INET6_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+# CONFIG_IP_NF_TARGET_ULOG is not set
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_H323 is not set
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+CONFIG_STP=m
+CONFIG_BRIDGE=m
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_TCPPROBE is not set
+# CONFIG_NET_DROP_MONITOR is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
+# CONFIG_WIRELESS_OLD_REGULATORY is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_LIB80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
+CONFIG_STANDALONE=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_DATAFLASH=y
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_NAND_ATMEL_ECC_HW=y
+# CONFIG_MTD_NAND_ATMEL_ECC_SOFT is not set
+# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
+# UBI - Unsorted block images
+#
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_GLUEBI is not set
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_ATMEL_PWM is not set
+CONFIG_ATMEL_TCLIB=y
+CONFIG_ATMEL_TCB_CLKSRC=y
+CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
+# CONFIG_ICS932S401 is not set
+# CONFIG_ATMEL_SSC is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+# CONFIG_VETH is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_MII is not set
+CONFIG_MACB=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_B44 is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+CONFIG_WLAN=y
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_WAN is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+# CONFIG_PPPOL2TP is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=m
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+# CONFIG_INPUT is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_DEVKMEM is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+CONFIG_SERIAL_ATMEL_PDC=y
+# CONFIG_SERIAL_ATMEL_TTYAT is not set
+# CONFIG_SERIAL_MAX3100 is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_DESIGNWARE is not set
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_SIMTEC is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_STUB is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ATMEL=y
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_GPIO is not set
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+# CONFIG_SPI_TLE62X0 is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+
+#
+# Memory mapped GPIO expanders:
+#
+
+#
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+
+#
+# PCI GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_AT32AP700X_WDT=y
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_SOUND is not set
+CONFIG_USB_SUPPORT=y
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AT91 is not set
+CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_USB_ATMEL_USBA=y
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_S3C_HSOTG is not set
+# CONFIG_USB_GADGET_IMX is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_ZERO=m
+# CONFIG_USB_AUDIO is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+CONFIG_USB_CDC_COMPOSITE=m
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_NOP_USB_XCEIV is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+CONFIG_MMC_TEST=m
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_AT91 is not set
+CONFIG_MMC_ATMELMCI=y
+# CONFIG_MMC_ATMELMCI_DMA is not set
+CONFIG_MMC_SPI=m
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_BD2802 is not set
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_AT32AP700X=y
+CONFIG_DMADEVICES=y
+
+#
+# DMA Devices
+#
+CONFIG_DW_DMAC=y
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+# CONFIG_NET_DMA is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_DMATEST is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+
+#
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+# CONFIG_DNOTIFY is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+CONFIG_FUSE_FS=m
+# CONFIG_CUSE is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=850
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=m
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_UBIFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+CONFIG_UFS_FS=y
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+CONFIG_ROOT_NFS=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=m
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=m
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=m
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_LKDTM is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_PAGE_POISONING is not set
+CONFIG_NOP_TRACER=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
+# CONFIG_BOOT_TRACER is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_SAMPLES is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_FIPS is not set
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=y
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_GHASH is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_SHA1=y
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_HW=y
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=m
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+CONFIG_CRC7=m
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
diff --git a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig
new file mode 100644
index 000000000000..01e913d66be4
--- /dev/null
+++ b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig
@@ -0,0 +1,1549 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.32-rc5
+# Thu Nov  5 15:33:09 2009
+#
+CONFIG_AVR32=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+# CONFIG_BASE_FULL is not set
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+CONFIG_KPROBES=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_CLK=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_SLOW_WORK=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=1
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_FREEZER=y
+
+#
+# System Type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SUBARCH_AVR32B=y
+CONFIG_MMU=y
+CONFIG_PERFORMANCE_COUNTERS=y
+CONFIG_PLATFORM_AT32AP=y
+CONFIG_CPU_AT32AP700X=y
+CONFIG_CPU_AT32AP7000=y
+CONFIG_BOARD_ATNGW100_COMMON=y
+# CONFIG_BOARD_ATSTK1000 is not set
+# CONFIG_BOARD_ATNGW100_MKI is not set
+CONFIG_BOARD_ATNGW100_MKII=y
+# CONFIG_BOARD_HAMMERHEAD is not set
+# CONFIG_BOARD_FAVR_32 is not set
+# CONFIG_BOARD_MERISC is not set
+# CONFIG_BOARD_MIMC200 is not set
+CONFIG_BOARD_ATNGW100_MKII_LCD=y
+# CONFIG_BOARD_ATNGW100_ADDON_NONE is not set
+CONFIG_BOARD_ATNGW100_EVKLCD10X=y
+# CONFIG_BOARD_ATNGW100_MRMT is not set
+CONFIG_BOARD_ATNGW100_EVKLCD10X_QVGA=y
+# CONFIG_BOARD_ATNGW100_EVKLCD10X_VGA is not set
+# CONFIG_BOARD_ATNGW100_EVKLCD10X_POW_QVGA is not set
+CONFIG_LOADER_U_BOOT=y
+
+#
+# Atmel AVR32 AP options
+#
+# CONFIG_AP700X_32_BIT_SMC is not set
+CONFIG_AP700X_16_BIT_SMC=y
+# CONFIG_AP700X_8_BIT_SMC is not set
+CONFIG_LOAD_ADDRESS=0x10000000
+CONFIG_ENTRY_ADDRESS=0x90000000
+CONFIG_PHYS_OFFSET=0x10000000
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_QUICKLIST=y
+# CONFIG_HAVE_ARCH_BOOTMEM is not set
+# CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set
+# CONFIG_NEED_NODE_MEMMAP_SIZE is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+# CONFIG_ARCH_SPARSEMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
+CONFIG_VIRT_TO_BUS=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_OWNERSHIP_TRACE is not set
+CONFIG_NMI_DEBUGGING=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_CMDLINE=""
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_PM_RUNTIME is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+# CONFIG_CPU_FREQ_STAT is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_AT32AP=y
+
+#
+# Bus options
+#
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCCARD is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=y
+CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_MULTIPLE_TABLES is not set
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+# CONFIG_IP_PIMSM_V2 is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_XFRM_TUNNEL=y
+CONFIG_INET_TUNNEL=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=y
+CONFIG_INET6_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+# CONFIG_IP_NF_TARGET_ULOG is not set
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_H323 is not set
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+CONFIG_STP=m
+CONFIG_BRIDGE=m
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_TCPPROBE is not set
+# CONFIG_NET_DROP_MONITOR is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
+# CONFIG_WIRELESS_OLD_REGULATORY is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_LIB80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
+CONFIG_STANDALONE=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_DATAFLASH=y
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_NAND_ATMEL_ECC_HW=y
+# CONFIG_MTD_NAND_ATMEL_ECC_SOFT is not set
+# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
+# UBI - Unsorted block images
+#
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_GLUEBI is not set
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_ATMEL_PWM is not set
+CONFIG_ATMEL_TCLIB=y
+CONFIG_ATMEL_TCB_CLKSRC=y
+CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
+# CONFIG_ICS932S401 is not set
+# CONFIG_ATMEL_SSC is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_MII is not set
+CONFIG_MACB=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_B44 is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+CONFIG_WLAN=y
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_WAN is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+# CONFIG_PPPOL2TP is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=m
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+# CONFIG_TOUCHSCREEN_WM97XX_ATMEL is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+CONFIG_SERIAL_ATMEL_PDC=y
+# CONFIG_SERIAL_ATMEL_TTYAT is not set
+# CONFIG_SERIAL_MAX3100 is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_DESIGNWARE is not set
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_SIMTEC is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_STUB is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ATMEL=y
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_GPIO is not set
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+# CONFIG_SPI_TLE62X0 is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_GPIO_SYSFS is not set
+
+#
+# Memory mapped GPIO expanders:
+#
+
+#
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+
+#
+# PCI GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_AT32AP700X_WDT=y
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_ATMEL=y
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+# CONFIG_LOGO is not set
+CONFIG_SOUND=y
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=m
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_HRTIMER=y
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_DRIVERS is not set
+
+#
+# Atmel devices (AVR32 and AT91)
+#
+# CONFIG_SND_ATMEL_ABDAC is not set
+CONFIG_SND_ATMEL_AC97C=m
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_USB_SUPPORT=y
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=350
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AT91 is not set
+CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_USB_ATMEL_USBA=y
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_S3C_HSOTG is not set
+# CONFIG_USB_GADGET_IMX is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_ZERO=m
+# CONFIG_USB_AUDIO is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+CONFIG_USB_CDC_COMPOSITE=m
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_NOP_USB_XCEIV is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_AT91 is not set
+CONFIG_MMC_ATMELMCI=y
+# CONFIG_MMC_ATMELMCI_DMA is not set
+# CONFIG_MMC_SPI is not set
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_BD2802 is not set
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_AT32AP700X=y
+CONFIG_DMADEVICES=y
+
+#
+# DMA Devices
+#
+CONFIG_DW_DMAC=y
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+# CONFIG_NET_DMA is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_DMATEST is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+
+#
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+# CONFIG_DNOTIFY is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+CONFIG_FUSE_FS=m
+# CONFIG_CUSE is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=850
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=y
+# CONFIG_UBIFS_FS_XATTR is not set
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+CONFIG_ROOT_NFS=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=m
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=m
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=m
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_LKDTM is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_PAGE_POISONING is not set
+CONFIG_NOP_TRACER=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
+# CONFIG_BOOT_TRACER is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_SAMPLES is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_FIPS is not set
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=y
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_GHASH is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_SHA1=y
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_ZLIB is not set
+CONFIG_CRYPTO_LZO=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_HW=y
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
diff --git a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig
new file mode 100644
index 000000000000..bbf6bc316ecf
--- /dev/null
+++ b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig
@@ -0,0 +1,1549 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.32-rc5
+# Thu Nov  5 15:33:32 2009
+#
+CONFIG_AVR32=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+# CONFIG_BASE_FULL is not set
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+CONFIG_KPROBES=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_CLK=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_SLOW_WORK=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=1
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_FREEZER=y
+
+#
+# System Type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SUBARCH_AVR32B=y
+CONFIG_MMU=y
+CONFIG_PERFORMANCE_COUNTERS=y
+CONFIG_PLATFORM_AT32AP=y
+CONFIG_CPU_AT32AP700X=y
+CONFIG_CPU_AT32AP7000=y
+CONFIG_BOARD_ATNGW100_COMMON=y
+# CONFIG_BOARD_ATSTK1000 is not set
+# CONFIG_BOARD_ATNGW100_MKI is not set
+CONFIG_BOARD_ATNGW100_MKII=y
+# CONFIG_BOARD_HAMMERHEAD is not set
+# CONFIG_BOARD_FAVR_32 is not set
+# CONFIG_BOARD_MERISC is not set
+# CONFIG_BOARD_MIMC200 is not set
+CONFIG_BOARD_ATNGW100_MKII_LCD=y
+# CONFIG_BOARD_ATNGW100_ADDON_NONE is not set
+CONFIG_BOARD_ATNGW100_EVKLCD10X=y
+# CONFIG_BOARD_ATNGW100_MRMT is not set
+# CONFIG_BOARD_ATNGW100_EVKLCD10X_QVGA is not set
+CONFIG_BOARD_ATNGW100_EVKLCD10X_VGA=y
+# CONFIG_BOARD_ATNGW100_EVKLCD10X_POW_QVGA is not set
+CONFIG_LOADER_U_BOOT=y
+
+#
+# Atmel AVR32 AP options
+#
+# CONFIG_AP700X_32_BIT_SMC is not set
+CONFIG_AP700X_16_BIT_SMC=y
+# CONFIG_AP700X_8_BIT_SMC is not set
+CONFIG_LOAD_ADDRESS=0x10000000
+CONFIG_ENTRY_ADDRESS=0x90000000
+CONFIG_PHYS_OFFSET=0x10000000
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_QUICKLIST=y
+# CONFIG_HAVE_ARCH_BOOTMEM is not set
+# CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set
+# CONFIG_NEED_NODE_MEMMAP_SIZE is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+# CONFIG_ARCH_SPARSEMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=2
+CONFIG_VIRT_TO_BUS=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_OWNERSHIP_TRACE is not set
+CONFIG_NMI_DEBUGGING=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_CMDLINE=""
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_PM_RUNTIME is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+# CONFIG_CPU_FREQ_STAT is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_AT32AP=y
+
+#
+# Bus options
+#
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCCARD is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=y
+CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_MULTIPLE_TABLES is not set
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+# CONFIG_IP_PIMSM_V2 is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_XFRM_TUNNEL=y
+CONFIG_INET_TUNNEL=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=y
+CONFIG_INET6_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_NETFILTER_ADVANCED is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+# CONFIG_IP_NF_TARGET_ULOG is not set
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_H323 is not set
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+CONFIG_STP=m
+CONFIG_BRIDGE=m
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_TCPPROBE is not set
+# CONFIG_NET_DROP_MONITOR is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
+# CONFIG_WIRELESS_OLD_REGULATORY is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_LIB80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
+CONFIG_STANDALONE=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_DATAFLASH=y
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_NAND_ATMEL_ECC_HW=y
+# CONFIG_MTD_NAND_ATMEL_ECC_SOFT is not set
+# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
+# UBI - Unsorted block images
+#
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_GLUEBI is not set
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_ATMEL_PWM is not set
+CONFIG_ATMEL_TCLIB=y
+CONFIG_ATMEL_TCB_CLKSRC=y
+CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
+# CONFIG_ICS932S401 is not set
+# CONFIG_ATMEL_SSC is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_MII is not set
+CONFIG_MACB=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_B44 is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+CONFIG_WLAN=y
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_WAN is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+# CONFIG_PPPOL2TP is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=m
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+# CONFIG_TOUCHSCREEN_WM97XX_ATMEL is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+CONFIG_SERIAL_ATMEL_PDC=y
+# CONFIG_SERIAL_ATMEL_TTYAT is not set
+# CONFIG_SERIAL_MAX3100 is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_DESIGNWARE is not set
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_SIMTEC is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_STUB is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ATMEL=y
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_GPIO is not set
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+# CONFIG_SPI_TLE62X0 is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_GPIO_SYSFS is not set
+
+#
+# Memory mapped GPIO expanders:
+#
+
+#
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+
+#
+# PCI GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_AT32AP700X_WDT=y
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_ATMEL=y
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+# CONFIG_LOGO is not set
+CONFIG_SOUND=y
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=m
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_HRTIMER=y
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_DRIVERS is not set
+
+#
+# Atmel devices (AVR32 and AT91)
+#
+# CONFIG_SND_ATMEL_ABDAC is not set
+CONFIG_SND_ATMEL_AC97C=m
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_USB_SUPPORT=y
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=350
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AT91 is not set
+CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_USB_ATMEL_USBA=y
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_S3C_HSOTG is not set
+# CONFIG_USB_GADGET_IMX is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_ZERO=m
+# CONFIG_USB_AUDIO is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+CONFIG_USB_CDC_COMPOSITE=m
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_NOP_USB_XCEIV is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_AT91 is not set
+CONFIG_MMC_ATMELMCI=y
+# CONFIG_MMC_ATMELMCI_DMA is not set
+# CONFIG_MMC_SPI is not set
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_BD2802 is not set
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_AT32AP700X=y
+CONFIG_DMADEVICES=y
+
+#
+# DMA Devices
+#
+CONFIG_DW_DMAC=y
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+# CONFIG_NET_DMA is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_DMATEST is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+
+#
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+# CONFIG_DNOTIFY is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+CONFIG_FUSE_FS=m
+# CONFIG_CUSE is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=850
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=y
+# CONFIG_UBIFS_FS_XATTR is not set
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+CONFIG_ROOT_NFS=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=m
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=m
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=m
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_LKDTM is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_PAGE_POISONING is not set
+CONFIG_NOP_TRACER=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
+# CONFIG_BOOT_TRACER is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_SAMPLES is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_FIPS is not set
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=y
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_GHASH is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_SHA1=y
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_ZLIB is not set
+CONFIG_CRYPTO_LZO=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_HW=y
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig
index 0abe90adb1a4..42dafce02389 100644
--- a/arch/avr32/configs/atstk1002_defconfig
+++ b/arch/avr32/configs/atstk1002_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc1
-# Mon Aug  4 16:02:27 2008
+# Linux kernel version: 2.6.32-rc5
+# Thu Oct 29 13:00:55 2009
 #
 CONFIG_AVR32=y
 CONFIG_GENERIC_GPIO=y
@@ -21,6 +21,7 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
 
 #
 # General setup
@@ -34,21 +35,36 @@ CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CGROUPS is not set
 # CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_RELAY=y
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
 CONFIG_EMBEDDED=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
@@ -58,38 +74,40 @@ CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-# CONFIG_COMPAT_BRK is not set
 # CONFIG_BASE_FULL is not set
 CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
+CONFIG_AIO=y
+
+#
+# Kernel Performance Events And Counters
+#
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_PROFILING=y
-# CONFIG_MARKERS is not set
+CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 CONFIG_HAVE_OPROFILE=y
 CONFIG_KPROBES=y
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
 CONFIG_HAVE_KPROBES=y
-# CONFIG_HAVE_KRETPROBES is not set
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
 CONFIG_HAVE_CLK=y
-CONFIG_PROC_PAGE_MONITOR=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_SLOW_WORK is not set
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=1
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
@@ -97,11 +115,8 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
 CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
+CONFIG_LBDAF=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
@@ -117,7 +132,7 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_CLASSIC_RCU=y
+CONFIG_FREEZER=y
 
 #
 # System Type and features
@@ -133,7 +148,12 @@ CONFIG_PLATFORM_AT32AP=y
 CONFIG_CPU_AT32AP700X=y
 CONFIG_CPU_AT32AP7000=y
 CONFIG_BOARD_ATSTK1000=y
-# CONFIG_BOARD_ATNGW100 is not set
+# CONFIG_BOARD_ATNGW100_MKI is not set
+# CONFIG_BOARD_ATNGW100_MKII is not set
+# CONFIG_BOARD_HAMMERHEAD is not set
+# CONFIG_BOARD_FAVR_32 is not set
+# CONFIG_BOARD_MERISC is not set
+# CONFIG_BOARD_MIMC200 is not set
 CONFIG_BOARD_ATSTK1002=y
 # CONFIG_BOARD_ATSTK1003 is not set
 # CONFIG_BOARD_ATSTK1004 is not set
@@ -159,7 +179,7 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 CONFIG_QUICKLIST=y
-# CONFIG_HAVE_ARCH_BOOTMEM_NODE is not set
+# CONFIG_HAVE_ARCH_BOOTMEM is not set
 # CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set
 # CONFIG_NEED_NODE_MEMMAP_SIZE is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -171,14 +191,16 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_NR_QUICK=2
 CONFIG_VIRT_TO_BUS=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_OWNERSHIP_TRACE is not set
 CONFIG_NMI_DEBUGGING=y
 # CONFIG_HZ_100 is not set
@@ -186,7 +208,7 @@ CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
-# CONFIG_SCHED_HRTICK is not set
+CONFIG_SCHED_HRTICK=y
 CONFIG_CMDLINE=""
 
 #
@@ -197,6 +219,7 @@ CONFIG_PM=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_PM_RUNTIME is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 
 #
@@ -228,6 +251,8 @@ CONFIG_CPU_FREQ_AT32AP=y
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
 CONFIG_NET=y
 
@@ -295,10 +320,12 @@ CONFIG_IPV6_TUNNEL=m
 # CONFIG_NETFILTER is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 CONFIG_STP=m
 CONFIG_BRIDGE=m
+# CONFIG_NET_DSA is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
 CONFIG_LLC=m
@@ -309,26 +336,33 @@ CONFIG_LLC=m
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
 # CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
 
 #
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_TCPPROBE is not set
+# CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
+# CONFIG_WIRELESS_OLD_REGULATORY is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_LIB80211 is not set
 
 #
-# Wireless
+# CFG80211 needs to be enabled for MAC80211
 #
-# CONFIG_CFG80211 is not set
-# CONFIG_WIRELESS_EXT is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_IEEE80211 is not set
+# CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
 
@@ -340,6 +374,7 @@ CONFIG_LLC=m
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
 CONFIG_STANDALONE=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
@@ -349,6 +384,7 @@ CONFIG_STANDALONE=y
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_TESTS is not set
 # CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -398,17 +434,18 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0x8000000
-CONFIG_MTD_PHYSMAP_LEN=0x0
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
 # CONFIG_MTD_PLATRAM is not set
 
 #
 # Self-contained MTD device drivers
 #
 CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
 CONFIG_MTD_M25P80=m
 CONFIG_M25PXX_USE_FAST_READ=y
+# CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
@@ -424,9 +461,22 @@ CONFIG_M25PXX_USE_FAST_READ=y
 # CONFIG_MTD_ONENAND is not set
 
 #
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
 # UBI - Unsorted block images
 #
-# CONFIG_MTD_UBI is not set
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_GLUEBI is not set
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
@@ -444,10 +494,20 @@ CONFIG_ATMEL_PWM=m
 CONFIG_ATMEL_TCLIB=y
 CONFIG_ATMEL_TCB_CLKSRC=y
 CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
-# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_ICS932S401 is not set
 CONFIG_ATMEL_SSC=m
 # CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HAVE_IDE is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
 
 #
 # SCSI device support
@@ -469,10 +529,6 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 # CONFIG_CHR_DEV_SG is not set
 # CONFIG_CHR_DEV_SCH is not set
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
@@ -489,8 +545,10 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SRP_ATTRS is not set
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
 # CONFIG_SATA_PMP is not set
 CONFIG_ATA_SFF=y
 # CONFIG_SATA_MV is not set
@@ -519,26 +577,37 @@ CONFIG_PHYLIB=y
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_FIXED_PHY is not set
 # CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
 CONFIG_MACB=y
 # CONFIG_ENC28J60 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
 # CONFIG_B44 is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
+CONFIG_WLAN=y
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
-# Wireless LAN
+# Enable WiMAX (Networking options) to see the WiMAX drivers
 #
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
-# CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_WAN is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
@@ -580,18 +649,25 @@ CONFIG_INPUT_EVDEV=m
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADP5588 is not set
 # CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_QT2160 is not set
 # CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
-CONFIG_KEYBOARD_GPIO=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_INPUT_MOUSE=y
 # CONFIG_MOUSE_PS2 is not set
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 CONFIG_MOUSE_GPIO=m
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
@@ -622,9 +698,11 @@ CONFIG_SERIAL_ATMEL=y
 CONFIG_SERIAL_ATMEL_CONSOLE=y
 CONFIG_SERIAL_ATMEL_PDC=y
 # CONFIG_SERIAL_ATMEL_TTYAT is not set
+# CONFIG_SERIAL_MAX3100 is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
@@ -633,7 +711,9 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_TCG_TPM is not set
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_ALGOBIT=m
 
 #
@@ -643,6 +723,7 @@ CONFIG_I2C_ALGOBIT=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+# CONFIG_I2C_DESIGNWARE is not set
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_SIMTEC is not set
@@ -663,14 +744,6 @@ CONFIG_I2C_GPIO=m
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-CONFIG_EEPROM_AT24=m
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
@@ -685,19 +758,28 @@ CONFIG_SPI_MASTER=y
 #
 CONFIG_SPI_ATMEL=y
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_GPIO is not set
 
 #
 # SPI Protocol Masters
 #
-# CONFIG_EEPROM_AT25 is not set
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
 
 #
+# Memory mapped GPIO expanders:
+#
+
+#
 # I2C GPIO expanders:
 #
 # CONFIG_GPIO_MAX732X is not set
@@ -713,11 +795,15 @@ CONFIG_GPIO_SYSFS=y
 #
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+
+#
+# AC97 GPIO expanders:
+#
 # CONFIG_W1 is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
-# CONFIG_THERMAL_HWMON is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
@@ -726,11 +812,11 @@ CONFIG_WATCHDOG=y
 #
 # CONFIG_SOFT_WATCHDOG is not set
 CONFIG_AT32AP700X_WDT=y
+CONFIG_SSB_POSSIBLE=y
 
 #
 # Sonics Silicon Backplane
 #
-CONFIG_SSB_POSSIBLE=y
 # CONFIG_SSB is not set
 
 #
@@ -739,22 +825,17 @@ CONFIG_SSB_POSSIBLE=y
 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_HTC_PASIC3 is not set
-
-#
-# Multimedia devices
-#
-
-#
-# Multimedia core support
-#
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_VIDEO_MEDIA is not set
-
-#
-# Multimedia drivers
-#
-# CONFIG_DAB is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
 
 #
 # Graphics support
@@ -764,6 +845,7 @@ CONFIG_SSB_POSSIBLE=y
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
@@ -785,10 +867,15 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_ATMEL=y
 # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
+# CONFIG_LCD_LMS283GF05 is not set
 CONFIG_LCD_LTV350QV=y
 # CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
 # CONFIG_LCD_PLATFORM is not set
 # CONFIG_BACKLIGHT_CLASS_DEVICE is not set
@@ -799,6 +886,8 @@ CONFIG_LCD_LTV350QV=y
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_LOGO is not set
 CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
@@ -807,12 +896,24 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_HRTIMER is not set
 # CONFIG_SND_DYNAMIC_MINORS is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
 # CONFIG_SND_DRIVERS is not set
+
+#
+# Atmel devices (AVR32 and AT91)
+#
+# CONFIG_SND_ATMEL_ABDAC is not set
+# CONFIG_SND_ATMEL_AC97C is not set
 CONFIG_SND_SPI=y
 CONFIG_SND_AT73C213=m
 CONFIG_SND_AT73C213_TARGET_BITRATE=48000
@@ -825,33 +926,43 @@ CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
 
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
 #
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_AT91 is not set
 CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_USB_ATMEL_USBA=y
 # CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_PXA25X is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_PXA27X is not set
-# CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
 # CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_S3C_HSOTG is not set
+# CONFIG_USB_GADGET_IMX is not set
 # CONFIG_USB_GADGET_S3C2410 is not set
-# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_ZERO=m
+# CONFIG_USB_AUDIO is not set
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
@@ -859,12 +970,18 @@ CONFIG_USB_G_SERIAL=m
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_PRINTER is not set
 CONFIG_USB_CDC_COMPOSITE=m
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_NOP_USB_XCEIV is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 
 #
-# MMC/SD Card Drivers
+# MMC/SD/SDIO Card Drivers
 #
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
@@ -872,10 +989,12 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_MMC_TEST is not set
 
 #
-# MMC/SD Host Controller Drivers
+# MMC/SD/SDIO Host Controller Drivers
 #
 # CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_AT91 is not set
 CONFIG_MMC_ATMELMCI=y
+# CONFIG_MMC_ATMELMCI_DMA is not set
 CONFIG_MMC_SPI=m
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
@@ -887,7 +1006,11 @@ CONFIG_LEDS_CLASS=m
 CONFIG_LEDS_ATMEL_PWM=m
 # CONFIG_LEDS_PCA9532 is not set
 CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_BD2802 is not set
 
 #
 # LED Triggers
@@ -895,7 +1018,13 @@ CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
@@ -927,25 +1056,33 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_M41T80 is not set
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
 
 #
 # SPI RTC drivers
 #
 # CONFIG_RTC_DRV_M41T94 is not set
 # CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
 
 #
 # Platform RTC drivers
 #
+# CONFIG_RTC_DRV_DS1286 is not set
 # CONFIG_RTC_DRV_DS1511 is not set
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
 # CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
@@ -964,25 +1101,45 @@ CONFIG_DMA_ENGINE=y
 # DMA Clients
 #
 # CONFIG_NET_DMA is not set
+# CONFIG_ASYNC_TX_DMA is not set
 # CONFIG_DMATEST is not set
+# CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 
 #
+# TI VLYNQ
+#
+# CONFIG_STAGING is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_XATTR=y
+# CONFIG_EXT4_FS_POSIX_ACL is not set
+# CONFIG_EXT4_FS_SECURITY is not set
+# CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -990,6 +1147,12 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 CONFIG_FUSE_FS=m
+# CONFIG_CUSE is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -1013,15 +1176,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
 CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_CONFIGFS_FS is not set
-
-#
-# Miscellaneous filesystems
-#
+CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
@@ -1039,7 +1200,14 @@ CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFFS2_LZO is not set
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=y
+# CONFIG_UBIFS_FS_XATTR is not set
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
 # CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
 # CONFIG_VXFS_FS is not set
 CONFIG_MINIX_FS=m
 # CONFIG_OMFS_FS is not set
@@ -1122,6 +1290,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
@@ -1130,6 +1299,9 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
@@ -1145,6 +1317,7 @@ CONFIG_SCHED_DEBUG=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
@@ -1153,13 +1326,39 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_LKDTM is not set
 # CONFIG_FAULT_INJECTION is not set
+# CONFIG_PAGE_POISONING is not set
+CONFIG_NOP_TRACER=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
+# CONFIG_BOOT_TRACER is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_SAMPLES is not set
 
 #
@@ -1167,19 +1366,30 @@ CONFIG_FRAME_POINTER=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
 
 #
 # Crypto core or helper
 #
-CONFIG_CRYPTO_ALGAPI=m
+# CONFIG_CRYPTO_FIPS is not set
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
 CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=m
 # CONFIG_CRYPTO_TEST is not set
@@ -1207,11 +1417,13 @@ CONFIG_CRYPTO_CBC=m
 #
 CONFIG_CRYPTO_HMAC=m
 # CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
 
 #
 # Digest
 #
 # CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_GHASH is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=m
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1228,7 +1440,7 @@ CONFIG_CRYPTO_SHA1=m
 #
 # Ciphers
 #
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
@@ -1247,18 +1459,24 @@ CONFIG_CRYPTO_DES=m
 #
 # Compression
 #
-CONFIG_CRYPTO_DEFLATE=m
-# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_ZLIB is not set
+CONFIG_CRYPTO_LZO=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_HW is not set
+CONFIG_BINARY_PRINTF=y
 
 #
 # Library routines
 #
 CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
+CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=m
-# CONFIG_CRC16 is not set
+CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=m
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
@@ -1266,8 +1484,11 @@ CONFIG_CRC7=m
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
 CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig
index c1603c4860e0..363e2381f32a 100644
--- a/arch/avr32/configs/atstk1006_defconfig
+++ b/arch/avr32/configs/atstk1006_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.28-rc8
-# Thu Dec 18 11:22:23 2008
+# Linux kernel version: 2.6.32-rc5
+# Thu Oct 29 13:00:25 2009
 #
 CONFIG_AVR32=y
 CONFIG_GENERIC_GPIO=y
@@ -21,6 +21,7 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
 
 #
 # General setup
@@ -34,21 +35,36 @@ CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CGROUPS is not set
 # CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_RELAY=y
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
 CONFIG_EMBEDDED=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
@@ -58,32 +74,40 @@ CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-# CONFIG_COMPAT_BRK is not set
 # CONFIG_BASE_FULL is not set
 CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+
+#
+# Kernel Performance Events And Counters
+#
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_PROFILING=y
-# CONFIG_MARKERS is not set
+CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 CONFIG_HAVE_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_CLK=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_SLOW_WORK is not set
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=1
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
@@ -91,11 +115,8 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
 CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
+CONFIG_LBDAF=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
@@ -111,7 +132,6 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_CLASSIC_RCU=y
 CONFIG_FREEZER=y
 
 #
@@ -128,8 +148,11 @@ CONFIG_PLATFORM_AT32AP=y
 CONFIG_CPU_AT32AP700X=y
 CONFIG_CPU_AT32AP7000=y
 CONFIG_BOARD_ATSTK1000=y
-# CONFIG_BOARD_ATNGW100 is not set
+# CONFIG_BOARD_ATNGW100_MKI is not set
+# CONFIG_BOARD_ATNGW100_MKII is not set
+# CONFIG_BOARD_HAMMERHEAD is not set
 # CONFIG_BOARD_FAVR_32 is not set
+# CONFIG_BOARD_MERISC is not set
 # CONFIG_BOARD_MIMC200 is not set
 # CONFIG_BOARD_ATSTK1002 is not set
 # CONFIG_BOARD_ATSTK1003 is not set
@@ -156,7 +179,7 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 CONFIG_QUICKLIST=y
-# CONFIG_HAVE_ARCH_BOOTMEM_NODE is not set
+# CONFIG_HAVE_ARCH_BOOTMEM is not set
 # CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set
 # CONFIG_NEED_NODE_MEMMAP_SIZE is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -170,12 +193,14 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_NR_QUICK=2
 CONFIG_VIRT_TO_BUS=y
-CONFIG_UNEVICTABLE_LRU=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_OWNERSHIP_TRACE is not set
 CONFIG_NMI_DEBUGGING=y
 # CONFIG_HZ_100 is not set
@@ -194,6 +219,7 @@ CONFIG_PM=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_PM_RUNTIME is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 
 #
@@ -294,6 +320,7 @@ CONFIG_IPV6_TUNNEL=m
 # CONFIG_NETFILTER is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 CONFIG_STP=m
@@ -309,20 +336,24 @@ CONFIG_LLC=m
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
 # CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
 
 #
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_TCPPROBE is not set
+# CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
-# CONFIG_PHONET is not set
 # CONFIG_WIRELESS is not set
+# CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
 
@@ -334,6 +365,7 @@ CONFIG_LLC=m
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
 CONFIG_STANDALONE=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
@@ -343,6 +375,7 @@ CONFIG_STANDALONE=y
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_TESTS is not set
 # CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -393,9 +426,7 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0x8000000
-CONFIG_MTD_PHYSMAP_LEN=0x0
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
 # CONFIG_MTD_PLATRAM is not set
 
 #
@@ -406,6 +437,7 @@ CONFIG_MTD_DATAFLASH=m
 CONFIG_MTD_DATAFLASH_OTP=y
 CONFIG_MTD_M25P80=m
 CONFIG_M25PXX_USE_FAST_READ=y
+# CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
@@ -432,6 +464,11 @@ CONFIG_MTD_NAND_ATMEL_ECC_HW=y
 # CONFIG_MTD_ONENAND is not set
 
 #
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
 # UBI - Unsorted block images
 #
 CONFIG_MTD_UBI=y
@@ -460,13 +497,22 @@ CONFIG_ATMEL_PWM=m
 CONFIG_ATMEL_TCLIB=y
 CONFIG_ATMEL_TCB_CLKSRC=y
 CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
-# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_ICS932S401 is not set
 CONFIG_ATMEL_SSC=m
 # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ISL29003 is not set
 # CONFIG_C2PORT is not set
 
 #
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
+
+#
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
@@ -486,10 +532,6 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 # CONFIG_CHR_DEV_SG is not set
 # CONFIG_CHR_DEV_SCH is not set
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
@@ -506,8 +548,10 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SRP_ATTRS is not set
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
 # CONFIG_SATA_PMP is not set
 CONFIG_ATA_SFF=y
 # CONFIG_SATA_MV is not set
@@ -536,12 +580,17 @@ CONFIG_PHYLIB=y
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_FIXED_PHY is not set
 # CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
 CONFIG_MACB=y
 # CONFIG_ENC28J60 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -550,15 +599,18 @@ CONFIG_MACB=y
 # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
 # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
 # CONFIG_B44 is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
+CONFIG_WLAN=y
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
-# Wireless LAN
+# Enable WiMAX (Networking options) to see the WiMAX drivers
 #
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
-# CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_WAN is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
@@ -600,18 +652,25 @@ CONFIG_INPUT_EVDEV=m
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADP5588 is not set
 # CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_QT2160 is not set
 # CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
-CONFIG_KEYBOARD_GPIO=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_INPUT_MOUSE=y
 # CONFIG_MOUSE_PS2 is not set
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 CONFIG_MOUSE_GPIO=m
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
@@ -642,9 +701,11 @@ CONFIG_SERIAL_ATMEL=y
 CONFIG_SERIAL_ATMEL_CONSOLE=y
 CONFIG_SERIAL_ATMEL_PDC=y
 # CONFIG_SERIAL_ATMEL_TTYAT is not set
+# CONFIG_SERIAL_MAX3100 is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
@@ -653,6 +714,7 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_TCG_TPM is not set
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_ALGOBIT=m
@@ -664,6 +726,7 @@ CONFIG_I2C_ALGOBIT=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+# CONFIG_I2C_DESIGNWARE is not set
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_SIMTEC is not set
@@ -684,14 +747,6 @@ CONFIG_I2C_GPIO=m
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
@@ -706,13 +761,18 @@ CONFIG_SPI_MASTER=y
 #
 CONFIG_SPI_ATMEL=y
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_GPIO is not set
 
 #
 # SPI Protocol Masters
 #
-# CONFIG_EEPROM_AT25 is not set
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
@@ -738,11 +798,15 @@ CONFIG_GPIO_SYSFS=y
 #
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+
+#
+# AC97 GPIO expanders:
+#
 # CONFIG_W1 is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
-# CONFIG_THERMAL_HWMON is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
@@ -764,26 +828,17 @@ CONFIG_SSB_POSSIBLE=y
 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_HTC_PASIC3 is not set
+# CONFIG_TPS65010 is not set
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X is not set
 # CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13783 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_EZX_PCAP is not set
 # CONFIG_REGULATOR is not set
-
-#
-# Multimedia devices
-#
-
-#
-# Multimedia core support
-#
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_VIDEO_MEDIA is not set
-
-#
-# Multimedia drivers
-#
-# CONFIG_DAB is not set
+# CONFIG_MEDIA_SUPPORT is not set
 
 #
 # Graphics support
@@ -817,8 +872,10 @@ CONFIG_FB_ATMEL=y
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
+# CONFIG_LCD_LMS283GF05 is not set
 CONFIG_LCD_LTV350QV=y
 # CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_TDO24M is not set
@@ -833,6 +890,7 @@ CONFIG_LCD_LTV350QV=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
@@ -841,16 +899,28 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_HRTIMER is not set
 # CONFIG_SND_DYNAMIC_MINORS is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
+
+#
+# Atmel devices (AVR32 and AT91)
+#
+# CONFIG_SND_ATMEL_ABDAC is not set
+# CONFIG_SND_ATMEL_AC97C is not set
 CONFIG_SND_SPI=y
 CONFIG_SND_AT73C213=m
 CONFIG_SND_AT73C213_TARGET_BITRATE=48000
@@ -863,11 +933,10 @@ CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_MUSB_HDRC is not set
 # CONFIG_USB_GADGET_MUSB_HDRC is not set
 
 #
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
 #
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
@@ -882,18 +951,25 @@ CONFIG_USB_ATMEL_USBA=y
 # CONFIG_USB_GADGET_LH7A40X is not set
 # CONFIG_USB_GADGET_OMAP is not set
 # CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_R8A66597 is not set
 # CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_S3C_HSOTG is not set
+# CONFIG_USB_GADGET_IMX is not set
 # CONFIG_USB_GADGET_S3C2410 is not set
 # CONFIG_USB_GADGET_M66592 is not set
 # CONFIG_USB_GADGET_AMD5536UDC is not set
 # CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
 # CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LANGWELL is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_ZERO=m
+# CONFIG_USB_AUDIO is not set
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
@@ -901,6 +977,12 @@ CONFIG_USB_G_SERIAL=m
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_PRINTER is not set
 # CONFIG_USB_CDC_COMPOSITE is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_NOP_USB_XCEIV is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
@@ -917,6 +999,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 # MMC/SD/SDIO Host Controller Drivers
 #
 # CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_AT91 is not set
 CONFIG_MMC_ATMELMCI=y
 # CONFIG_MMC_ATMELMCI_DMA is not set
 CONFIG_MMC_SPI=m
@@ -930,7 +1013,11 @@ CONFIG_LEDS_CLASS=m
 CONFIG_LEDS_ATMEL_PWM=m
 # CONFIG_LEDS_PCA9532 is not set
 CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_BD2802 is not set
 
 #
 # LED Triggers
@@ -939,7 +1026,12 @@ CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
@@ -972,6 +1064,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
 
 #
 # SPI RTC drivers
@@ -983,6 +1076,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
 
 #
 # Platform RTC drivers
@@ -1014,32 +1108,42 @@ CONFIG_DMA_ENGINE=y
 # DMA Clients
 #
 # CONFIG_NET_DMA is not set
+# CONFIG_ASYNC_TX_DMA is not set
 # CONFIG_DMATEST is not set
+# CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
+
+#
+# TI VLYNQ
+#
 # CONFIG_STAGING is not set
-CONFIG_STAGING_EXCLUDE_BUILD=y
 
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 # CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=m
-CONFIG_EXT4DEV_COMPAT=y
+CONFIG_EXT4_FS=y
 # CONFIG_EXT4_FS_XATTR is not set
-CONFIG_JBD=m
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
-CONFIG_JBD2=m
+CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
-CONFIG_FILE_LOCKING=y
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -1047,6 +1151,12 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 CONFIG_FUSE_FS=m
+# CONFIG_CUSE is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -1076,10 +1186,7 @@ CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_CONFIGFS_FS is not set
-
-#
-# Miscellaneous filesystems
-#
+CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
@@ -1099,12 +1206,13 @@ CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_XATTR=y
+# CONFIG_UBIFS_FS_XATTR is not set
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 # CONFIG_UBIFS_FS_DEBUG is not set
 # CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
 # CONFIG_VXFS_FS is not set
 CONFIG_MINIX_FS=m
 # CONFIG_OMFS_FS is not set
@@ -1124,7 +1232,6 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_REGISTER_V4 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1188,6 +1295,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
@@ -1196,6 +1304,9 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
@@ -1211,6 +1322,7 @@ CONFIG_SCHED_DEBUG=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
@@ -1219,6 +1331,8 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
@@ -1226,17 +1340,30 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_LKDTM is not set
 # CONFIG_FAULT_INJECTION is not set
-
-#
-# Tracers
-#
+# CONFIG_PAGE_POISONING is not set
+CONFIG_NOP_TRACER=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
 # CONFIG_BOOT_TRACER is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_SAMPLES is not set
 
 #
@@ -1262,10 +1389,12 @@ CONFIG_CRYPTO_HASH=m
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=m
 CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
 CONFIG_CRYPTO_MANAGER=m
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=m
 # CONFIG_CRYPTO_TEST is not set
@@ -1293,11 +1422,13 @@ CONFIG_CRYPTO_CBC=m
 #
 CONFIG_CRYPTO_HMAC=m
 # CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
 
 #
 # Digest
 #
 # CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_GHASH is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=m
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1334,6 +1465,7 @@ CONFIG_CRYPTO_DES=m
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_ZLIB is not set
 CONFIG_CRYPTO_LZO=y
 
 #
@@ -1341,11 +1473,13 @@ CONFIG_CRYPTO_LZO=y
 #
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_HW is not set
+CONFIG_BINARY_PRINTF=y
 
 #
 # Library routines
 #
 CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=m
@@ -1357,8 +1491,9 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
 CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
index d5d1d41c600a..3b3159b710d4 100644
--- a/arch/avr32/include/asm/elf.h
+++ b/arch/avr32/include/asm/elf.h
@@ -77,7 +77,6 @@ typedef struct user_fpu_struct elf_fpregset_t;
 #endif
 #define ELF_ARCH        EM_AVR32
 
-#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
diff --git a/arch/avr32/include/asm/hardirq.h b/arch/avr32/include/asm/hardirq.h
index 015bc75ea798..9e36e3ff77d2 100644
--- a/arch/avr32/include/asm/hardirq.h
+++ b/arch/avr32/include/asm/hardirq.h
@@ -1,23 +1,6 @@
 #ifndef __ASM_AVR32_HARDIRQ_H
 #define __ASM_AVR32_HARDIRQ_H
-
-#include <linux/threads.h>
-#include <asm/irq.h>
-
 #ifndef __ASSEMBLY__
-
-#include <linux/cache.h>
-
-/* entry.S is sensitive to the offsets of these fields */
-typedef struct {
-        unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-void ack_bad_irq(unsigned int irq);
-
-/* Standard mappings for irq_cpustat_t above */
-#include <linux/irq_cpustat.h>
-
+#include <asm-generic/hardirq.h>
 #endif /* __ASSEMBLY__ */
-
 #endif /* __ASM_AVR32_HARDIRQ_H */
diff --git a/arch/avr32/kernel/irq.c b/arch/avr32/kernel/irq.c
index 9f572229d318..9604f7758f9a 100644
--- a/arch/avr32/kernel/irq.c
+++ b/arch/avr32/kernel/irq.c
@@ -16,15 +16,6 @@
 #include <linux/seq_file.h>
 #include <linux/sysdev.h>
 
-/*
- * 'what should we do if we get a hw irq event on an illegal vector'.
- * each architecture has to answer this themselves.
- */
-void ack_bad_irq(unsigned int irq)
-{
-        printk("unexpected IRQ %u\n", irq);
-}
-
 /* May be overridden by platform code */
 int __weak nmi_enable(void)
 {
@@ -51,7 +42,7 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                 action = irq_desc[i].action;
                 if (!action)
                         goto unlock;
@@ -66,7 +57,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
         unlock:
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         }
 
         return 0;
diff --git a/arch/avr32/kernel/vmlinux.lds.S b/arch/avr32/kernel/vmlinux.lds.S
index c4b56654349a..9cd2bd91d64a 100644
--- a/arch/avr32/kernel/vmlinux.lds.S
+++ b/arch/avr32/kernel/vmlinux.lds.S
@@ -39,30 +39,10 @@ SECTIONS
                 __tagtable_begin = .;
                         *(.taglist.init)
                 __tagtable_end = .;
-                        INIT_DATA
-                . = ALIGN(16);
-                __setup_start = .;
-                        *(.init.setup)
-                __setup_end = .;
-                . = ALIGN(4);
-                __initcall_start = .;
-                        INITCALLS
-                __initcall_end = .;
-                __con_initcall_start = .;
-                        *(.con_initcall.init)
-                __con_initcall_end = .;
-                __security_initcall_start = .;
-                        *(.security_initcall.init)
-                __security_initcall_end = .;
-#ifdef CONFIG_BLK_DEV_INITRD
-                . = ALIGN(32);
-                __initramfs_start = .;
-                        *(.init.ramfs)
-                __initramfs_end = .;
-#endif
-                . = ALIGN(PAGE_SIZE);
-                __init_end = .;
         }
+        INIT_DATA_SECTION(16)
+        . = ALIGN(PAGE_SIZE);
+        __init_end = .;
 
         .text           : AT(ADDR(.text) - LOAD_OFFSET) {
                 _evba = .;
@@ -78,34 +58,16 @@ SECTIONS
                 _etext = .;
         } = 0xd703d703
 
-        . = ALIGN(4);
-        __ex_table      : AT(ADDR(__ex_table) - LOAD_OFFSET) {
-                __start___ex_table = .;
-                *(__ex_table)
-                __stop___ex_table = .;
-        }
-
+        EXCEPTION_TABLE(4)
         RODATA
 
-        . = ALIGN(THREAD_SIZE);
-
         .data           : AT(ADDR(.data) - LOAD_OFFSET) {
                 _data = .;
                 _sdata = .;
-                /*
-                 * First, the init task union, aligned to an 8K boundary.
-                 */
-                *(.data.init_task)
 
-                /* Then, the page-aligned data */
-                . = ALIGN(PAGE_SIZE);
-                *(.data.page_aligned)
-
-                /* Then, the cacheline aligned data */
-                . = ALIGN(L1_CACHE_BYTES);
-                *(.data.cacheline_aligned)
-
-                /* And the rest... */
+                INIT_TASK_DATA(THREAD_SIZE)
+                PAGE_ALIGNED_DATA(PAGE_SIZE);
+                CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
                 *(.data.rel*)
                 DATA_DATA
                 CONSTRUCTORS
@@ -113,16 +75,8 @@ SECTIONS
                 _edata = .;
         }
 
-
-        . = ALIGN(8);
-        .bss            : AT(ADDR(.bss) - LOAD_OFFSET) {
-                __bss_start = .;
-                *(.bss)
-                *(COMMON)
-                . = ALIGN(8);
-                __bss_stop = .;
-                _end = .;
-        }
+        BSS_SECTION(0, 8, 8)
+        _end = .;
 
         DWARF_DEBUG
 
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index eb9d4dc2e86d..1aa1ea5e9212 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -15,6 +15,8 @@
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/usb/atmel_usba_udc.h>
+
+#include <mach/atmel-mci.h>
 #include <linux/atmel-mci.h>
 
 #include <asm/io.h>
@@ -1181,19 +1183,32 @@ static struct resource atmel_spi1_resource[] = {
 DEFINE_DEV(atmel_spi, 1);
 DEV_CLK(spi_clk, atmel_spi1, pba, 1);
 
-static void __init
-at32_spi_setup_slaves(unsigned int bus_num, struct spi_board_info *b,
-                      unsigned int n, const u8 *pins)
+void __init
+at32_spi_setup_slaves(unsigned int bus_num, struct spi_board_info *b, unsigned int n)
 {
+        /*
+         * Manage the chipselects as GPIOs, normally using the same pins
+         * the SPI controller expects; but boards can use other pins.
+         */
+        static u8 __initdata spi_pins[][4] = {
+                { GPIO_PIN_PA(3), GPIO_PIN_PA(4),
+                  GPIO_PIN_PA(5), GPIO_PIN_PA(20) },
+                { GPIO_PIN_PB(2), GPIO_PIN_PB(3),
+                  GPIO_PIN_PB(4), GPIO_PIN_PA(27) },
+        };
         unsigned int pin, mode;
 
+        /* There are only 2 SPI controllers */
+        if (bus_num > 1)
+                return;
+
         for (; n; n--, b++) {
                 b->bus_num = bus_num;
                 if (b->chip_select >= 4)
                         continue;
                 pin = (unsigned)b->controller_data;
                 if (!pin) {
-                        pin = pins[b->chip_select];
+                        pin = spi_pins[bus_num][b->chip_select];
                         b->controller_data = (void *)pin;
                 }
                 mode = AT32_GPIOF_OUTPUT;
@@ -1206,16 +1221,6 @@ at32_spi_setup_slaves(unsigned int bus_num, struct spi_board_info *b,
 struct platform_device *__init
 at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n)
 {
-        /*
-         * Manage the chipselects as GPIOs, normally using the same pins
-         * the SPI controller expects; but boards can use other pins.
-         */
-        static u8 __initdata spi0_pins[] =
-                { GPIO_PIN_PA(3), GPIO_PIN_PA(4),
-                  GPIO_PIN_PA(5), GPIO_PIN_PA(20), };
-        static u8 __initdata spi1_pins[] =
-                { GPIO_PIN_PB(2), GPIO_PIN_PB(3),
-                  GPIO_PIN_PB(4), GPIO_PIN_PA(27), };
         struct platform_device *pdev;
         u32 pin_mask;
 
@@ -1228,7 +1233,7 @@ at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n)
                 select_peripheral(PIOA, (1 << 0), PERIPH_A, AT32_GPIOF_PULLUP);
                 select_peripheral(PIOA, pin_mask, PERIPH_A, 0);
 
-                at32_spi_setup_slaves(0, b, n, spi0_pins);
+                at32_spi_setup_slaves(0, b, n);
                 break;
 
         case 1:
@@ -1239,7 +1244,7 @@ at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n)
                 select_peripheral(PIOB, (1 << 0), PERIPH_B, AT32_GPIOF_PULLUP);
                 select_peripheral(PIOB, pin_mask, PERIPH_B, 0);
 
-                at32_spi_setup_slaves(1, b, n, spi1_pins);
+                at32_spi_setup_slaves(1, b, n);
                 break;
 
         default:
@@ -1320,7 +1325,7 @@ struct platform_device *__init
 at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 {
         struct platform_device          *pdev;
-        struct dw_dma_slave             *dws = &data->dma_slave;
+        struct mci_dma_slave            *slave;
         u32                             pioa_mask;
         u32                             piob_mask;
 
@@ -1339,13 +1344,17 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
                                 ARRAY_SIZE(atmel_mci0_resource)))
                 goto fail;
 
-        dws->dma_dev = &dw_dmac0_device.dev;
-        dws->reg_width = DW_DMA_SLAVE_WIDTH_32BIT;
-        dws->cfg_hi = (DWC_CFGH_SRC_PER(0)
+        slave = kzalloc(sizeof(struct mci_dma_slave), GFP_KERNEL);
+
+        slave->sdata.dma_dev = &dw_dmac0_device.dev;
+        slave->sdata.reg_width = DW_DMA_SLAVE_WIDTH_32BIT;
+        slave->sdata.cfg_hi = (DWC_CFGH_SRC_PER(0)
                                 | DWC_CFGH_DST_PER(1));
-        dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL
+        slave->sdata.cfg_lo &= ~(DWC_CFGL_HS_DST_POL
                                 | DWC_CFGL_HS_SRC_POL);
 
+        data->dma_slave = slave;
+
         if (platform_device_add_data(pdev, data,
                                 sizeof(struct mci_platform_data)))
                 goto fail;
@@ -1411,6 +1420,8 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
         return pdev;
 
 fail:
+        data->dma_slave = NULL;
+        kfree(slave);
         platform_device_put(pdev);
         return NULL;
 }
diff --git a/arch/avr32/mach-at32ap/include/mach/atmel-mci.h b/arch/avr32/mach-at32ap/include/mach/atmel-mci.h
new file mode 100644
index 000000000000..a9b38967f703
--- /dev/null
+++ b/arch/avr32/mach-at32ap/include/mach/atmel-mci.h
@@ -0,0 +1,24 @@
+#ifndef __MACH_ATMEL_MCI_H
+#define __MACH_ATMEL_MCI_H
+
+#include <linux/dw_dmac.h>
+
+/**
+ * struct mci_dma_data - DMA data for MCI interface
+ */
+struct mci_dma_data {
+        struct dw_dma_slave     sdata;
+};
+
+/* accessor macros */
+#define slave_data_ptr(s)       (&(s)->sdata)
+#define find_slave_dev(s)       ((s)->sdata.dma_dev)
+
+#define setup_dma_addr(s, t, r) do {            \
+        if (s) {                                \
+                (s)->sdata.tx_reg = (t);        \
+                (s)->sdata.rx_reg = (r);        \
+        }                                       \
+} while (0)
+
+#endif /* __MACH_ATMEL_MCI_H */
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
index ddedb471f33e..c7f25bb1d068 100644
--- a/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -49,6 +49,7 @@ at32_add_device_eth(unsigned int id, struct eth_platform_data *data);
 struct spi_board_info;
 struct platform_device *
 at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n);
+void at32_spi_setup_slaves(unsigned int bus_num, struct spi_board_info *b, unsigned int n);
 
 struct atmel_lcdfb_info;
 struct platform_device *
diff --git a/arch/blackfin/include/asm/bfin-lq035q1.h b/arch/blackfin/include/asm/bfin-lq035q1.h
new file mode 100644
index 000000000000..57bc21ac2296
--- /dev/null
+++ b/arch/blackfin/include/asm/bfin-lq035q1.h
@@ -0,0 +1,28 @@
+/*
+ * Blackfin LCD Framebuffer driver SHARP LQ035Q1DH02
+ *
+ * Copyright 2008-2009 Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef BFIN_LQ035Q1_H
+#define BFIN_LQ035Q1_H
+
+#define LQ035_RL        (0 << 8)        /* Right -> Left Scan */
+#define LQ035_LR        (1 << 8)        /* Left -> Right Scan */
+#define LQ035_TB        (1 << 9)        /* Top -> Botton Scan */
+#define LQ035_BT        (0 << 9)        /* Botton -> Top Scan */
+#define LQ035_BGR       (1 << 11)       /* Use BGR format */
+#define LQ035_RGB       (0 << 11)       /* Use RGB format */
+#define LQ035_NORM      (1 << 13)       /* Reversal */
+#define LQ035_REV       (0 << 13)       /* Reversal */
+
+struct bfin_lq035q1fb_disp_info {
+
+        unsigned        mode;
+        /* GPIOs */
+        int             use_bl;
+        unsigned        gpio_bl;
+};
+
+#endif /* BFIN_LQ035Q1_H */
diff --git a/arch/blackfin/include/asm/elf.h b/arch/blackfin/include/asm/elf.h
index 8e0764c81eaf..5b50f0ecacf8 100644
--- a/arch/blackfin/include/asm/elf.h
+++ b/arch/blackfin/include/asm/elf.h
@@ -55,7 +55,6 @@ do {											\
         _regs->p2       = _dynamic_addr;                                \
 } while(0)
 
-#define USE_ELF_CORE_DUMP
 #define ELF_FDPIC_CORE_EFLAGS   EF_BFIN_FDPIC
 #define ELF_EXEC_PAGESIZE       4096
 
diff --git a/arch/blackfin/include/asm/spinlock.h b/arch/blackfin/include/asm/spinlock.h
index b0c7f0ee4b03..1942ccfedbe0 100644
--- a/arch/blackfin/include/asm/spinlock.h
+++ b/arch/blackfin/include/asm/spinlock.h
@@ -17,84 +17,84 @@ asmlinkage int __raw_spin_is_locked_asm(volatile int *ptr);
 asmlinkage void __raw_spin_lock_asm(volatile int *ptr);
 asmlinkage int __raw_spin_trylock_asm(volatile int *ptr);
 asmlinkage void __raw_spin_unlock_asm(volatile int *ptr);
-asmlinkage void __raw_read_lock_asm(volatile int *ptr);
-asmlinkage int __raw_read_trylock_asm(volatile int *ptr);
-asmlinkage void __raw_read_unlock_asm(volatile int *ptr);
-asmlinkage void __raw_write_lock_asm(volatile int *ptr);
-asmlinkage int __raw_write_trylock_asm(volatile int *ptr);
-asmlinkage void __raw_write_unlock_asm(volatile int *ptr);
-
-static inline int __raw_spin_is_locked(raw_spinlock_t *lock)
+asmlinkage void arch_read_lock_asm(volatile int *ptr);
+asmlinkage int arch_read_trylock_asm(volatile int *ptr);
+asmlinkage void arch_read_unlock_asm(volatile int *ptr);
+asmlinkage void arch_write_lock_asm(volatile int *ptr);
+asmlinkage int arch_write_trylock_asm(volatile int *ptr);
+asmlinkage void arch_write_unlock_asm(volatile int *ptr);
+
+static inline int arch_spin_is_locked(arch_spinlock_t *lock)
 {
         return __raw_spin_is_locked_asm(&lock->lock);
 }
 
-static inline void __raw_spin_lock(raw_spinlock_t *lock)
+static inline void arch_spin_lock(arch_spinlock_t *lock)
 {
         __raw_spin_lock_asm(&lock->lock);
 }
 
-#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
+#define arch_spin_lock_flags(lock, flags) arch_spin_lock(lock)
 
-static inline int __raw_spin_trylock(raw_spinlock_t *lock)
+static inline int arch_spin_trylock(arch_spinlock_t *lock)
 {
         return __raw_spin_trylock_asm(&lock->lock);
 }
 
-static inline void __raw_spin_unlock(raw_spinlock_t *lock)
+static inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
         __raw_spin_unlock_asm(&lock->lock);
 }
 
-static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)
+static inline void arch_spin_unlock_wait(arch_spinlock_t *lock)
 {
-        while (__raw_spin_is_locked(lock))
+        while (arch_spin_is_locked(lock))
                 cpu_relax();
 }
 
-static inline int __raw_read_can_lock(raw_rwlock_t *rw)
+static inline int arch_read_can_lock(arch_rwlock_t *rw)
 {
         return __raw_uncached_fetch_asm(&rw->lock) > 0;
 }
 
-static inline int __raw_write_can_lock(raw_rwlock_t *rw)
+static inline int arch_write_can_lock(arch_rwlock_t *rw)
 {
         return __raw_uncached_fetch_asm(&rw->lock) == RW_LOCK_BIAS;
 }
 
-static inline void __raw_read_lock(raw_rwlock_t *rw)
+static inline void arch_read_lock(arch_rwlock_t *rw)
 {
-        __raw_read_lock_asm(&rw->lock);
+        arch_read_lock_asm(&rw->lock);
 }
 
-static inline int __raw_read_trylock(raw_rwlock_t *rw)
+static inline int arch_read_trylock(arch_rwlock_t *rw)
 {
-        return __raw_read_trylock_asm(&rw->lock);
+        return arch_read_trylock_asm(&rw->lock);
 }
 
-static inline void __raw_read_unlock(raw_rwlock_t *rw)
+static inline void arch_read_unlock(arch_rwlock_t *rw)
 {
-        __raw_read_unlock_asm(&rw->lock);
+        arch_read_unlock_asm(&rw->lock);
 }
 
-static inline void __raw_write_lock(raw_rwlock_t *rw)
+static inline void arch_write_lock(arch_rwlock_t *rw)
 {
-        __raw_write_lock_asm(&rw->lock);
+        arch_write_lock_asm(&rw->lock);
 }
 
-static inline int __raw_write_trylock(raw_rwlock_t *rw)
+static inline int arch_write_trylock(arch_rwlock_t *rw)
 {
-        return __raw_write_trylock_asm(&rw->lock);
+        return arch_write_trylock_asm(&rw->lock);
 }
 
-static inline void __raw_write_unlock(raw_rwlock_t *rw)
+static inline void arch_write_unlock(arch_rwlock_t *rw)
 {
-        __raw_write_unlock_asm(&rw->lock);
+        arch_write_unlock_asm(&rw->lock);
 }
 
-#define _raw_spin_relax(lock)   cpu_relax()
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
+#define arch_spin_relax(lock)   cpu_relax()
+#define arch_read_relax(lock)   cpu_relax()
+#define arch_write_relax(lock)  cpu_relax()
 
 #endif
 
diff --git a/arch/blackfin/include/asm/spinlock_types.h b/arch/blackfin/include/asm/spinlock_types.h
index be75762c0610..1a33608c958b 100644
--- a/arch/blackfin/include/asm/spinlock_types.h
+++ b/arch/blackfin/include/asm/spinlock_types.h
@@ -15,14 +15,14 @@
 
 typedef struct {
         volatile unsigned int lock;
-} raw_spinlock_t;
+} arch_spinlock_t;
 
-#define __RAW_SPIN_LOCK_UNLOCKED        { 0 }
+#define __ARCH_SPIN_LOCK_UNLOCKED       { 0 }
 
 typedef struct {
         volatile unsigned int lock;
-} raw_rwlock_t;
+} arch_rwlock_t;
 
-#define __RAW_RW_LOCK_UNLOCKED          { RW_LOCK_BIAS }
+#define __ARCH_RW_LOCK_UNLOCKED         { RW_LOCK_BIAS }
 
 #endif
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c
index db9f9c91f11f..64cff54a8a58 100644
--- a/arch/blackfin/kernel/irqchip.c
+++ b/arch/blackfin/kernel/irqchip.c
@@ -23,7 +23,7 @@ void ack_bad_irq(unsigned int irq)
 
 static struct irq_desc bad_irq_desc = {
         .handle_irq = handle_bad_irq,
-        .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock),
+        .lock = __RAW_SPIN_LOCK_UNLOCKED(bad_irq_desc.lock),
 };
 
 #ifdef CONFIG_CPUMASK_OFFSTACK
@@ -39,7 +39,7 @@ int show_interrupts(struct seq_file *p, void *v)
         unsigned long flags;
 
         if (i < NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                 action = irq_desc[i].action;
                 if (!action)
                         goto skip;
@@ -53,7 +53,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
  skip:
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         } else if (i == NR_IRQS) {
                 seq_printf(p, "NMI: ");
                 for_each_online_cpu(j)
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 78cb3d38f899..9636bace00e8 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -1140,7 +1140,7 @@ void show_regs(struct pt_regs *fp)
         if (fp->ipend & ~0x3F) {
                 for (i = 0; i < (NR_IRQS - 1); i++) {
                         if (!in_atomic)
-                                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
 
                         action = irq_desc[i].action;
                         if (!action)
@@ -1155,7 +1155,7 @@ void show_regs(struct pt_regs *fp)
                         verbose_printk("\n");
 unlock:
                         if (!in_atomic)
-                                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
                 }
         }
 
diff --git a/arch/cris/include/arch-v32/arch/spinlock.h b/arch/cris/include/arch-v32/arch/spinlock.h
index 367a53ea10c5..f171a6600fbc 100644
--- a/arch/cris/include/arch-v32/arch/spinlock.h
+++ b/arch/cris/include/arch-v32/arch/spinlock.h
@@ -9,12 +9,12 @@ extern void cris_spin_unlock(void *l, int val);
 extern void cris_spin_lock(void *l);
 extern int cris_spin_trylock(void *l);
 
-static inline int __raw_spin_is_locked(raw_spinlock_t *x)
+static inline int arch_spin_is_locked(arch_spinlock_t *x)
 {
         return *(volatile signed char *)(&(x)->slock) <= 0;
 }
 
-static inline void __raw_spin_unlock(raw_spinlock_t *lock)
+static inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
         __asm__ volatile ("move.d %1,%0" \
                           : "=m" (lock->slock) \
@@ -22,26 +22,26 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
                           : "memory");
 }
 
-static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)
+static inline void arch_spin_unlock_wait(arch_spinlock_t *lock)
 {
-        while (__raw_spin_is_locked(lock))
+        while (arch_spin_is_locked(lock))
                 cpu_relax();
 }
 
-static inline int __raw_spin_trylock(raw_spinlock_t *lock)
+static inline int arch_spin_trylock(arch_spinlock_t *lock)
 {
         return cris_spin_trylock((void *)&lock->slock);
 }
 
-static inline void __raw_spin_lock(raw_spinlock_t *lock)
+static inline void arch_spin_lock(arch_spinlock_t *lock)
 {
         cris_spin_lock((void *)&lock->slock);
 }
 
 static inline void
-__raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
+arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
 {
-        __raw_spin_lock(lock);
+        arch_spin_lock(lock);
 }
 
 /*
@@ -56,76 +56,76 @@ __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
  *
  */
 
-static inline int __raw_read_can_lock(raw_rwlock_t *x)
+static inline int arch_read_can_lock(arch_rwlock_t *x)
 {
         return (int)(x)->lock > 0;
 }
 
-static inline int __raw_write_can_lock(raw_rwlock_t *x)
+static inline int arch_write_can_lock(arch_rwlock_t *x)
 {
         return (x)->lock == RW_LOCK_BIAS;
 }
 
-static  inline void __raw_read_lock(raw_rwlock_t *rw)
+static  inline void arch_read_lock(arch_rwlock_t *rw)
 {
-        __raw_spin_lock(&rw->slock);
+        arch_spin_lock(&rw->slock);
         while (rw->lock == 0);
         rw->lock--;
-        __raw_spin_unlock(&rw->slock);
+        arch_spin_unlock(&rw->slock);
 }
 
-static  inline void __raw_write_lock(raw_rwlock_t *rw)
+static  inline void arch_write_lock(arch_rwlock_t *rw)
 {
-        __raw_spin_lock(&rw->slock);
+        arch_spin_lock(&rw->slock);
         while (rw->lock != RW_LOCK_BIAS);
         rw->lock = 0;
-        __raw_spin_unlock(&rw->slock);
+        arch_spin_unlock(&rw->slock);
 }
 
-static  inline void __raw_read_unlock(raw_rwlock_t *rw)
+static  inline void arch_read_unlock(arch_rwlock_t *rw)
 {
-        __raw_spin_lock(&rw->slock);
+        arch_spin_lock(&rw->slock);
         rw->lock++;
-        __raw_spin_unlock(&rw->slock);
+        arch_spin_unlock(&rw->slock);
 }
 
-static  inline void __raw_write_unlock(raw_rwlock_t *rw)
+static  inline void arch_write_unlock(arch_rwlock_t *rw)
 {
-        __raw_spin_lock(&rw->slock);
+        arch_spin_lock(&rw->slock);
         while (rw->lock != RW_LOCK_BIAS);
         rw->lock = RW_LOCK_BIAS;
-        __raw_spin_unlock(&rw->slock);
+        arch_spin_unlock(&rw->slock);
 }
 
-static  inline int __raw_read_trylock(raw_rwlock_t *rw)
+static  inline int arch_read_trylock(arch_rwlock_t *rw)
 {
         int ret = 0;
-        __raw_spin_lock(&rw->slock);
+        arch_spin_lock(&rw->slock);
         if (rw->lock != 0) {
                 rw->lock--;
                 ret = 1;
         }
-        __raw_spin_unlock(&rw->slock);
+        arch_spin_unlock(&rw->slock);
         return ret;
 }
 
-static  inline int __raw_write_trylock(raw_rwlock_t *rw)
+static  inline int arch_write_trylock(arch_rwlock_t *rw)
 {
         int ret = 0;
-        __raw_spin_lock(&rw->slock);
+        arch_spin_lock(&rw->slock);
         if (rw->lock == RW_LOCK_BIAS) {
                 rw->lock = 0;
                 ret = 1;
         }
-        __raw_spin_unlock(&rw->slock);
+        arch_spin_unlock(&rw->slock);
         return 1;
 }
 
 #define _raw_read_lock_flags(lock, flags) _raw_read_lock(lock)
 #define _raw_write_lock_flags(lock, flags) _raw_write_lock(lock)
 
-#define _raw_spin_relax(lock)   cpu_relax()
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
+#define arch_spin_relax(lock)   cpu_relax()
+#define arch_read_relax(lock)   cpu_relax()
+#define arch_write_relax(lock)  cpu_relax()
 
 #endif /* __ASM_ARCH_SPINLOCK_H */
diff --git a/arch/cris/include/asm/elf.h b/arch/cris/include/asm/elf.h
index 0f51b10b9f4f..8a3d8e2b33c1 100644
--- a/arch/cris/include/asm/elf.h
+++ b/arch/cris/include/asm/elf.h
@@ -64,8 +64,6 @@ typedef unsigned long elf_fpregset_t;
 #define EF_CRIS_VARIANT_COMMON_V10_V32  0x00000004
 /* End of excerpt from {binutils}/include/elf/cris.h.  */
 
-#define USE_ELF_CORE_DUMP
-
 #define ELF_EXEC_PAGESIZE       8192
 
 /* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c
index 0ca7d9892cc6..b5ce0724a88f 100644
--- a/arch/cris/kernel/irq.c
+++ b/arch/cris/kernel/irq.c
@@ -52,7 +52,7 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                 action = irq_desc[i].action;
                 if (!action)
                         goto skip;
@@ -71,7 +71,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
 skip:
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         }
         return 0;
 }
diff --git a/arch/frv/include/asm/elf.h b/arch/frv/include/asm/elf.h
index 7bbf6e47f8c8..c3819804a74b 100644
--- a/arch/frv/include/asm/elf.h
+++ b/arch/frv/include/asm/elf.h
@@ -115,7 +115,6 @@ do {											\
         __kernel_frame0_ptr->gr29       = 0;                                            \
 } while(0)
 
-#define USE_ELF_CORE_DUMP
 #define CORE_DUMP_USE_REGSET
 #define ELF_FDPIC_CORE_EFLAGS   EF_FRV_FDPIC
 #define ELF_EXEC_PAGESIZE       16384
diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c
index af3e824b91b3..62d1aba615dc 100644
--- a/arch/frv/kernel/irq.c
+++ b/arch/frv/kernel/irq.c
@@ -69,7 +69,7 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                 action = irq_desc[i].action;
                 if (action) {
                         seq_printf(p, "%3d: ", i);
@@ -85,7 +85,7 @@ int show_interrupts(struct seq_file *p, void *v)
                         seq_putc(p, '\n');
                 }
 
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         } else if (i == NR_IRQS) {
                 seq_printf(p, "Err: %10u\n", atomic_read(&irq_err_count));
         }
diff --git a/arch/h8300/include/asm/elf.h b/arch/h8300/include/asm/elf.h
index 94e2284c8816..c24fa250d653 100644
--- a/arch/h8300/include/asm/elf.h
+++ b/arch/h8300/include/asm/elf.h
@@ -34,7 +34,6 @@ typedef unsigned long elf_fpregset_t;
 
 #define ELF_PLAT_INIT(_r)       _r->er1 = 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
diff --git a/arch/h8300/kernel/irq.c b/arch/h8300/kernel/irq.c
index 5c913d472119..c25dc2c2b1da 100644
--- a/arch/h8300/kernel/irq.c
+++ b/arch/h8300/kernel/irq.c
@@ -186,7 +186,7 @@ int show_interrupts(struct seq_file *p, void *v)
                 seq_puts(p, "           CPU0");
 
         if (i < NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                 action = irq_desc[i].action;
                 if (!action)
                         goto unlock;
@@ -200,7 +200,7 @@ int show_interrupts(struct seq_file *p, void *v)
                         seq_printf(p, ", %s", action->name);
                 seq_putc(p, '\n');
 unlock:
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         }
         return 0;
 }
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index f332e3fe4237..e14c492a8a93 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -677,12 +677,19 @@ sba_alloc_range(struct ioc *ioc, struct device *dev, size_t size)
                         spin_unlock_irqrestore(&ioc->saved_lock, flags);
 
                         pide = sba_search_bitmap(ioc, dev, pages_needed, 0);
-                        if (unlikely(pide >= (ioc->res_size << 3)))
-                                panic(__FILE__ ": I/O MMU @ %p is out of mapping resources\n",
-                                      ioc->ioc_hpa);
+                        if (unlikely(pide >= (ioc->res_size << 3))) {
+                                printk(KERN_WARNING "%s: I/O MMU @ %p is"
+                                       "out of mapping resources, %u %u %lx\n",
+                                       __func__, ioc->ioc_hpa, ioc->res_size,
+                                       pages_needed, dma_get_seg_boundary(dev));
+                                return -1;
+                        }
 #else
-                        panic(__FILE__ ": I/O MMU @ %p is out of mapping resources\n",
-                              ioc->ioc_hpa);
+                        printk(KERN_WARNING "%s: I/O MMU @ %p is"
+                               "out of mapping resources, %u %u %lx\n",
+                               __func__, ioc->ioc_hpa, ioc->res_size,
+                               pages_needed, dma_get_seg_boundary(dev));
+                        return -1;
 #endif
                 }
         }
@@ -965,6 +972,8 @@ static dma_addr_t sba_map_page(struct device *dev, struct page *page,
 #endif
 
         pide = sba_alloc_range(ioc, dev, size);
+        if (pide < 0)
+                return 0;
 
         iovp = (dma_addr_t) pide << iovp_shift;
 
@@ -1320,6 +1329,7 @@ sba_coalesce_chunks(struct ioc *ioc, struct device *dev,
         unsigned long dma_offset, dma_len; /* start/len of DMA stream */
         int n_mappings = 0;
         unsigned int max_seg_size = dma_get_max_seg_size(dev);
+        int idx;
 
         while (nents > 0) {
                 unsigned long vaddr = (unsigned long) sba_sg_address(startsg);
@@ -1418,16 +1428,22 @@ sba_coalesce_chunks(struct ioc *ioc, struct device *dev,
                 vcontig_sg->dma_length = vcontig_len;
                 dma_len = (dma_len + dma_offset + ~iovp_mask) & iovp_mask;
                 ASSERT(dma_len <= DMA_CHUNK_SIZE);
-                dma_sg->dma_address = (dma_addr_t) (PIDE_FLAG
-                        | (sba_alloc_range(ioc, dev, dma_len) << iovp_shift)
-                        | dma_offset);
+                idx = sba_alloc_range(ioc, dev, dma_len);
+                if (idx < 0) {
+                        dma_sg->dma_length = 0;
+                        return -1;
+                }
+                dma_sg->dma_address = (dma_addr_t)(PIDE_FLAG | (idx << iovp_shift)
+                                                   | dma_offset);
                 n_mappings++;
         }
 
         return n_mappings;
 }
 
-
+static void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist,
+                               int nents, enum dma_data_direction dir,
+                               struct dma_attrs *attrs);
 /**
  * sba_map_sg - map Scatter/Gather list
  * @dev: instance of PCI owned by the driver that's asking.
@@ -1493,6 +1509,10 @@ static int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist,
         ** Access to the virtual address is what forces a two pass algorithm.
         */
         coalesced = sba_coalesce_chunks(ioc, dev, sglist, nents);
+        if (coalesced < 0) {
+                sba_unmap_sg_attrs(dev, sglist, nents, dir, attrs);
+                return 0;
+        }
 
         /*
         ** Program the I/O Pdir
diff --git a/arch/ia64/ia32/elfcore32.h b/arch/ia64/ia32/elfcore32.h
index 9a3abf58cea3..657725742617 100644
--- a/arch/ia64/ia32/elfcore32.h
+++ b/arch/ia64/ia32/elfcore32.h
@@ -11,8 +11,6 @@
 #include <asm/intrinsics.h>
 #include <asm/uaccess.h>
 
-#define USE_ELF_CORE_DUMP 1
-
 /* Override elfcore.h */
 #define _LINUX_ELFCORE_H 1
 typedef unsigned int elf_greg_t;
diff --git a/arch/ia64/include/asm/bitops.h b/arch/ia64/include/asm/bitops.h
index 57a2787bc9fb..6ebc229a1c51 100644
--- a/arch/ia64/include/asm/bitops.h
+++ b/arch/ia64/include/asm/bitops.h
@@ -127,7 +127,7 @@ clear_bit_unlock (int nr, volatile void *addr)
  * @addr: Address to start counting from
  *
  * Similarly to clear_bit_unlock, the implementation uses a store
- * with release semantics. See also __raw_spin_unlock().
+ * with release semantics. See also arch_spin_unlock().
  */
 static __inline__ void
 __clear_bit_unlock(int nr, void *addr)
diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h
index 8d3c79cd81e7..7d09a09cdaad 100644
--- a/arch/ia64/include/asm/dma-mapping.h
+++ b/arch/ia64/include/asm/dma-mapping.h
@@ -73,7 +73,7 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
         if (!dev->dma_mask)
                 return 0;
 
-        return addr + size <= *dev->dma_mask;
+        return addr + size - 1 <= *dev->dma_mask;
 }
 
 static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
index 86eddee029cb..e14108b19c09 100644
--- a/arch/ia64/include/asm/elf.h
+++ b/arch/ia64/include/asm/elf.h
@@ -25,7 +25,6 @@
 #define ELF_DATA        ELFDATA2LSB
 #define ELF_ARCH        EM_IA_64
 
-#define USE_ELF_CORE_DUMP
 #define CORE_DUMP_USE_REGSET
 
 /* Least-significant four bits of ELF header's e_flags are OS-specific.  The bits are
diff --git a/arch/ia64/include/asm/hw_irq.h b/arch/ia64/include/asm/hw_irq.h
index 91619b31dbf5..bf2e37493e04 100644
--- a/arch/ia64/include/asm/hw_irq.h
+++ b/arch/ia64/include/asm/hw_irq.h
@@ -59,7 +59,13 @@ typedef u16 ia64_vector;
 extern int ia64_first_device_vector;
 extern int ia64_last_device_vector;
 
+#if defined(CONFIG_SMP) && (defined(CONFIG_IA64_GENERIC) || defined (CONFIG_IA64_DIG))
+/* Reserve the lower priority vector than device vectors for "move IRQ" IPI */
+#define IA64_IRQ_MOVE_VECTOR            0x30    /* "move IRQ" IPI */
+#define IA64_DEF_FIRST_DEVICE_VECTOR    0x31
+#else
 #define IA64_DEF_FIRST_DEVICE_VECTOR    0x30
+#endif
 #define IA64_DEF_LAST_DEVICE_VECTOR     0xe7
 #define IA64_FIRST_DEVICE_VECTOR        ia64_first_device_vector
 #define IA64_LAST_DEVICE_VECTOR         ia64_last_device_vector
diff --git a/arch/ia64/include/asm/io.h b/arch/ia64/include/asm/io.h
index 0d9d16e2d949..cc8335eb3110 100644
--- a/arch/ia64/include/asm/io.h
+++ b/arch/ia64/include/asm/io.h
@@ -424,6 +424,8 @@ __writeq (unsigned long val, volatile void __iomem *addr)
 extern void __iomem * ioremap(unsigned long offset, unsigned long size);
 extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);
 extern void iounmap (volatile void __iomem *addr);
+extern void __iomem * early_ioremap (unsigned long phys_addr, unsigned long size);
+extern void early_iounmap (volatile void __iomem *addr, unsigned long size);
 
 /*
  * String version of IO memory access ops:
diff --git a/arch/ia64/include/asm/mca.h b/arch/ia64/include/asm/mca.h
index c171cdf0a789..43f96ab18fa0 100644
--- a/arch/ia64/include/asm/mca.h
+++ b/arch/ia64/include/asm/mca.h
@@ -106,6 +106,11 @@ struct ia64_sal_os_state {
         unsigned long           os_status;              /* OS status to SAL, enum below */
         unsigned long           context;                /* 0 if return to same context
                                                            1 if return to new context */
+
+        /* I-resources */
+        unsigned long           iip;
+        unsigned long           ipsr;
+        unsigned long           ifs;
 };
 
 enum {
diff --git a/arch/ia64/include/asm/numa.h b/arch/ia64/include/asm/numa.h
index 3499ff57bf42..6a8a27cfae3e 100644
--- a/arch/ia64/include/asm/numa.h
+++ b/arch/ia64/include/asm/numa.h
@@ -22,8 +22,6 @@
 
 #include <asm/mmzone.h>
 
-#define NUMA_NO_NODE    -1
-
 extern u16 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
 extern cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
 extern pg_data_t *pgdat_list[MAX_NUMNODES];
diff --git a/arch/ia64/include/asm/rwsem.h b/arch/ia64/include/asm/rwsem.h
index fbee74b15782..e8762688e8e3 100644
--- a/arch/ia64/include/asm/rwsem.h
+++ b/arch/ia64/include/asm/rwsem.h
@@ -47,7 +47,7 @@ struct rw_semaphore {
 #define RWSEM_ACTIVE_WRITE_BIAS         (RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)
 
 #define __RWSEM_INITIALIZER(name) \
-        { RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \
+        { RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \
           LIST_HEAD_INIT((name).wait_list) }
 
 #define DECLARE_RWSEM(name) \
diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
index 239ecdc9516d..1a91c9121d17 100644
--- a/arch/ia64/include/asm/spinlock.h
+++ b/arch/ia64/include/asm/spinlock.h
@@ -17,7 +17,7 @@
 #include <asm/intrinsics.h>
 #include <asm/system.h>
 
-#define __raw_spin_lock_init(x)                 ((x)->lock = 0)
+#define arch_spin_lock_init(x)                  ((x)->lock = 0)
 
 /*
  * Ticket locks are conceptually two parts, one indicating the current head of
@@ -38,7 +38,7 @@
 #define TICKET_BITS     15
 #define TICKET_MASK     ((1 << TICKET_BITS) - 1)
 
-static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock)
+static __always_inline void __ticket_spin_lock(arch_spinlock_t *lock)
 {
         int     *p = (int *)&lock->lock, ticket, serve;
 
@@ -58,7 +58,7 @@ static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock)
         }
 }
 
-static __always_inline int __ticket_spin_trylock(raw_spinlock_t *lock)
+static __always_inline int __ticket_spin_trylock(arch_spinlock_t *lock)
 {
         int tmp = ACCESS_ONCE(lock->lock);
 
@@ -67,7 +67,7 @@ static __always_inline int __ticket_spin_trylock(raw_spinlock_t *lock)
         return 0;
 }
 
-static __always_inline void __ticket_spin_unlock(raw_spinlock_t *lock)
+static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
 {
         unsigned short  *p = (unsigned short *)&lock->lock + 1, tmp;
 
@@ -75,7 +75,7 @@ static __always_inline void __ticket_spin_unlock(raw_spinlock_t *lock)
         ACCESS_ONCE(*p) = (tmp + 2) & ~1;
 }
 
-static __always_inline void __ticket_spin_unlock_wait(raw_spinlock_t *lock)
+static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
 {
         int     *p = (int *)&lock->lock, ticket;
 
@@ -89,64 +89,64 @@ static __always_inline void __ticket_spin_unlock_wait(raw_spinlock_t *lock)
         }
 }
 
-static inline int __ticket_spin_is_locked(raw_spinlock_t *lock)
+static inline int __ticket_spin_is_locked(arch_spinlock_t *lock)
 {
         long tmp = ACCESS_ONCE(lock->lock);
 
         return !!(((tmp >> TICKET_SHIFT) ^ tmp) & TICKET_MASK);
 }
 
-static inline int __ticket_spin_is_contended(raw_spinlock_t *lock)
+static inline int __ticket_spin_is_contended(arch_spinlock_t *lock)
 {
         long tmp = ACCESS_ONCE(lock->lock);
 
         return ((tmp - (tmp >> TICKET_SHIFT)) & TICKET_MASK) > 1;
 }
 
-static inline int __raw_spin_is_locked(raw_spinlock_t *lock)
+static inline int arch_spin_is_locked(arch_spinlock_t *lock)
 {
         return __ticket_spin_is_locked(lock);
 }
 
-static inline int __raw_spin_is_contended(raw_spinlock_t *lock)
+static inline int arch_spin_is_contended(arch_spinlock_t *lock)
 {
         return __ticket_spin_is_contended(lock);
 }
-#define __raw_spin_is_contended __raw_spin_is_contended
+#define arch_spin_is_contended  arch_spin_is_contended
 
-static __always_inline void __raw_spin_lock(raw_spinlock_t *lock)
+static __always_inline void arch_spin_lock(arch_spinlock_t *lock)
 {
         __ticket_spin_lock(lock);
 }
 
-static __always_inline int __raw_spin_trylock(raw_spinlock_t *lock)
+static __always_inline int arch_spin_trylock(arch_spinlock_t *lock)
 {
         return __ticket_spin_trylock(lock);
 }
 
-static __always_inline void __raw_spin_unlock(raw_spinlock_t *lock)
+static __always_inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
         __ticket_spin_unlock(lock);
 }
 
-static __always_inline void __raw_spin_lock_flags(raw_spinlock_t *lock,
+static __always_inline void arch_spin_lock_flags(arch_spinlock_t *lock,
                                                   unsigned long flags)
 {
-        __raw_spin_lock(lock);
+        arch_spin_lock(lock);
 }
 
-static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)
+static inline void arch_spin_unlock_wait(arch_spinlock_t *lock)
 {
         __ticket_spin_unlock_wait(lock);
 }
 
-#define __raw_read_can_lock(rw)         (*(volatile int *)(rw) >= 0)
-#define __raw_write_can_lock(rw)        (*(volatile int *)(rw) == 0)
+#define arch_read_can_lock(rw)          (*(volatile int *)(rw) >= 0)
+#define arch_write_can_lock(rw) (*(volatile int *)(rw) == 0)
 
 #ifdef ASM_SUPPORTED
 
 static __always_inline void
-__raw_read_lock_flags(raw_rwlock_t *lock, unsigned long flags)
+arch_read_lock_flags(arch_rwlock_t *lock, unsigned long flags)
 {
         __asm__ __volatile__ (
                 "tbit.nz p6, p0 = %1,%2\n"
@@ -169,15 +169,15 @@ __raw_read_lock_flags(raw_rwlock_t *lock, unsigned long flags)
                 : "p6", "p7", "r2", "memory");
 }
 
-#define __raw_read_lock(lock) __raw_read_lock_flags(lock, 0)
+#define arch_read_lock(lock) arch_read_lock_flags(lock, 0)
 
 #else /* !ASM_SUPPORTED */
 
-#define __raw_read_lock_flags(rw, flags) __raw_read_lock(rw)
+#define arch_read_lock_flags(rw, flags) arch_read_lock(rw)
 
-#define __raw_read_lock(rw)                                                             \
+#define arch_read_lock(rw)                                                              \
 do {                                                                                    \
-        raw_rwlock_t *__read_lock_ptr = (rw);                                           \
+        arch_rwlock_t *__read_lock_ptr = (rw);                                          \
                                                                                         \
         while (unlikely(ia64_fetchadd(1, (int *) __read_lock_ptr, acq) < 0)) {          \
                 ia64_fetchadd(-1, (int *) __read_lock_ptr, rel);                        \
@@ -188,16 +188,16 @@ do {											\
 
 #endif /* !ASM_SUPPORTED */
 
-#define __raw_read_unlock(rw)                                   \
+#define arch_read_unlock(rw)                                    \
 do {                                                            \
-        raw_rwlock_t *__read_lock_ptr = (rw);                   \
+        arch_rwlock_t *__read_lock_ptr = (rw);                  \
         ia64_fetchadd(-1, (int *) __read_lock_ptr, rel);        \
 } while (0)
 
 #ifdef ASM_SUPPORTED
 
 static __always_inline void
-__raw_write_lock_flags(raw_rwlock_t *lock, unsigned long flags)
+arch_write_lock_flags(arch_rwlock_t *lock, unsigned long flags)
 {
         __asm__ __volatile__ (
                 "tbit.nz p6, p0 = %1, %2\n"
@@ -221,9 +221,9 @@ __raw_write_lock_flags(raw_rwlock_t *lock, unsigned long flags)
                 : "ar.ccv", "p6", "p7", "r2", "r29", "memory");
 }
 
-#define __raw_write_lock(rw) __raw_write_lock_flags(rw, 0)
+#define arch_write_lock(rw) arch_write_lock_flags(rw, 0)
 
-#define __raw_write_trylock(rw)                                                 \
+#define arch_write_trylock(rw)                                                  \
 ({                                                                              \
         register long result;                                                   \
                                                                                 \
@@ -235,7 +235,7 @@ __raw_write_lock_flags(raw_rwlock_t *lock, unsigned long flags)
         (result == 0);                                                          \
 })
 
-static inline void __raw_write_unlock(raw_rwlock_t *x)
+static inline void arch_write_unlock(arch_rwlock_t *x)
 {
         u8 *y = (u8 *)x;
         barrier();
@@ -244,9 +244,9 @@ static inline void __raw_write_unlock(raw_rwlock_t *x)
 
 #else /* !ASM_SUPPORTED */
 
-#define __raw_write_lock_flags(l, flags) __raw_write_lock(l)
+#define arch_write_lock_flags(l, flags) arch_write_lock(l)
 
-#define __raw_write_lock(l)                                                             \
+#define arch_write_lock(l)                                                              \
 ({                                                                                      \
         __u64 ia64_val, ia64_set_val = ia64_dep_mi(-1, 0, 31, 1);                       \
         __u32 *ia64_write_lock_ptr = (__u32 *) (l);                                     \
@@ -257,7 +257,7 @@ static inline void __raw_write_unlock(raw_rwlock_t *x)
         } while (ia64_val);                                                             \
 })
 
-#define __raw_write_trylock(rw)                                         \
+#define arch_write_trylock(rw)                                          \
 ({                                                                      \
         __u64 ia64_val;                                                 \
         __u64 ia64_set_val = ia64_dep_mi(-1, 0, 31,1);                  \
@@ -265,7 +265,7 @@ static inline void __raw_write_unlock(raw_rwlock_t *x)
         (ia64_val == 0);                                                \
 })
 
-static inline void __raw_write_unlock(raw_rwlock_t *x)
+static inline void arch_write_unlock(arch_rwlock_t *x)
 {
         barrier();
         x->write_lock = 0;
@@ -273,10 +273,10 @@ static inline void __raw_write_unlock(raw_rwlock_t *x)
 
 #endif /* !ASM_SUPPORTED */
 
-static inline int __raw_read_trylock(raw_rwlock_t *x)
+static inline int arch_read_trylock(arch_rwlock_t *x)
 {
         union {
-                raw_rwlock_t lock;
+                arch_rwlock_t lock;
                 __u32 word;
         } old, new;
         old.lock = new.lock = *x;
@@ -285,8 +285,8 @@ static inline int __raw_read_trylock(raw_rwlock_t *x)
         return (u32)ia64_cmpxchg4_acq((__u32 *)(x), new.word, old.word) == old.word;
 }
 
-#define _raw_spin_relax(lock)   cpu_relax()
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
+#define arch_spin_relax(lock)   cpu_relax()
+#define arch_read_relax(lock)   cpu_relax()
+#define arch_write_relax(lock)  cpu_relax()
 
 #endif /*  _ASM_IA64_SPINLOCK_H */
diff --git a/arch/ia64/include/asm/spinlock_types.h b/arch/ia64/include/asm/spinlock_types.h
index 474e46f1ab4a..e2b42a52a6d3 100644
--- a/arch/ia64/include/asm/spinlock_types.h
+++ b/arch/ia64/include/asm/spinlock_types.h
@@ -7,15 +7,15 @@
 
 typedef struct {
         volatile unsigned int lock;
-} raw_spinlock_t;
+} arch_spinlock_t;
 
-#define __RAW_SPIN_LOCK_UNLOCKED        { 0 }
+#define __ARCH_SPIN_LOCK_UNLOCKED       { 0 }
 
 typedef struct {
         volatile unsigned int read_counter      : 31;
         volatile unsigned int write_lock        :  1;
-} raw_rwlock_t;
+} arch_rwlock_t;
 
-#define __RAW_RW_LOCK_UNLOCKED          { 0, 0 }
+#define __ARCH_RW_LOCK_UNLOCKED         { 0, 0 }
 
 #endif
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index dab4d393908c..95ac77aeae9b 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -793,12 +793,12 @@ iosapic_register_intr (unsigned int gsi,
                         goto unlock_iosapic_lock;
         }
 
-        spin_lock(&irq_desc[irq].lock);
+        raw_spin_lock(&irq_desc[irq].lock);
         dest = get_target_cpu(gsi, irq);
         dmode = choose_dmode();
         err = register_intr(gsi, irq, dmode, polarity, trigger);
         if (err < 0) {
-                spin_unlock(&irq_desc[irq].lock);
+                raw_spin_unlock(&irq_desc[irq].lock);
                 irq = err;
                 goto unlock_iosapic_lock;
         }
@@ -817,7 +817,7 @@ iosapic_register_intr (unsigned int gsi,
                (polarity == IOSAPIC_POL_HIGH ? "high" : "low"),
                cpu_logical_id(dest), dest, irq_to_vector(irq));
 
-        spin_unlock(&irq_desc[irq].lock);
+        raw_spin_unlock(&irq_desc[irq].lock);
  unlock_iosapic_lock:
         spin_unlock_irqrestore(&iosapic_lock, flags);
         return irq;
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
index 7d8951229e7c..94ee9d067cbd 100644
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
@@ -71,7 +71,7 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                 action = irq_desc[i].action;
                 if (!action)
                         goto skip;
@@ -91,7 +91,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
 skip:
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         } else if (i == NR_IRQS)
                 seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
         return 0;
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index dd9d7b54f1a1..d4093a173a3e 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -260,7 +260,6 @@ void __setup_vector_irq(int cpu)
 }
 
 #if defined(CONFIG_SMP) && (defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_DIG))
-#define IA64_IRQ_MOVE_VECTOR    IA64_DEF_FIRST_DEVICE_VECTOR
 
 static enum vector_domain_type {
         VECTOR_DOMAIN_NONE,
@@ -345,7 +344,7 @@ static irqreturn_t smp_irq_move_cleanup_interrupt(int irq, void *dev_id)
 
                 desc = irq_desc + irq;
                 cfg = irq_cfg + irq;
-                spin_lock(&desc->lock);
+                raw_spin_lock(&desc->lock);
                 if (!cfg->move_cleanup_count)
                         goto unlock;
 
@@ -358,7 +357,7 @@ static irqreturn_t smp_irq_move_cleanup_interrupt(int irq, void *dev_id)
                 spin_unlock_irqrestore(&vector_lock, flags);
                 cfg->move_cleanup_count--;
         unlock:
-                spin_unlock(&desc->lock);
+                raw_spin_unlock(&desc->lock);
         }
         return IRQ_HANDLED;
 }
@@ -659,11 +658,8 @@ init_IRQ (void)
         register_percpu_irq(IA64_SPURIOUS_INT_VECTOR, NULL);
 #ifdef CONFIG_SMP
 #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_DIG)
-        if (vector_domain_type != VECTOR_DOMAIN_NONE) {
-                BUG_ON(IA64_FIRST_DEVICE_VECTOR != IA64_IRQ_MOVE_VECTOR);
-                IA64_FIRST_DEVICE_VECTOR++;
+        if (vector_domain_type != VECTOR_DOMAIN_NONE)
                 register_percpu_irq(IA64_IRQ_MOVE_VECTOR, &irq_move_irqaction);
-        }
 #endif
 #endif
 #ifdef CONFIG_PERFMON
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 496ac7a99488..32f2639e9b0a 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -888,9 +888,10 @@ ia64_mca_modify_comm(const struct task_struct *previous_current)
 }
 
 static void
-finish_pt_regs(struct pt_regs *regs, const pal_min_state_area_t *ms,
+finish_pt_regs(struct pt_regs *regs, struct ia64_sal_os_state *sos,
                 unsigned long *nat)
 {
+        const pal_min_state_area_t *ms = sos->pal_min_state;
         const u64 *bank;
 
         /* If ipsr.ic then use pmsa_{iip,ipsr,ifs}, else use
@@ -904,6 +905,10 @@ finish_pt_regs(struct pt_regs *regs, const pal_min_state_area_t *ms,
                 regs->cr_iip = ms->pmsa_xip;
                 regs->cr_ipsr = ms->pmsa_xpsr;
                 regs->cr_ifs = ms->pmsa_xfs;
+
+                sos->iip = ms->pmsa_iip;
+                sos->ipsr = ms->pmsa_ipsr;
+                sos->ifs = ms->pmsa_ifs;
         }
         regs->pr = ms->pmsa_pr;
         regs->b0 = ms->pmsa_br0;
@@ -1079,7 +1084,7 @@ ia64_mca_modify_original_stack(struct pt_regs *regs,
         memcpy(old_regs, regs, sizeof(*regs));
         old_regs->loadrs = loadrs;
         old_unat = old_regs->ar_unat;
-        finish_pt_regs(old_regs, ms, &old_unat);
+        finish_pt_regs(old_regs, sos, &old_unat);
 
         /* Next stack a struct switch_stack.  mca_asm.S built a partial
          * switch_stack, copy it and fill in the blanks using pt_regs and
@@ -1150,7 +1155,7 @@ no_mod:
         mprintk(KERN_INFO "cpu %d, %s %s, original stack not modified\n",
                         smp_processor_id(), type, msg);
         old_unat = regs->ar_unat;
-        finish_pt_regs(regs, ms, &old_unat);
+        finish_pt_regs(regs, sos, &old_unat);
         return previous_current;
 }
 
diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c
index 2a140627dfd6..3dccdd8eb275 100644
--- a/arch/ia64/mm/ioremap.c
+++ b/arch/ia64/mm/ioremap.c
@@ -22,6 +22,12 @@ __ioremap (unsigned long phys_addr)
 }
 
 void __iomem *
+early_ioremap (unsigned long phys_addr, unsigned long size)
+{
+        return __ioremap(phys_addr);
+}
+
+void __iomem *
 ioremap (unsigned long phys_addr, unsigned long size)
 {
         void __iomem *addr;
@@ -102,6 +108,11 @@ ioremap_nocache (unsigned long phys_addr, unsigned long size)
 EXPORT_SYMBOL(ioremap_nocache);
 
 void
+early_iounmap (volatile void __iomem *addr, unsigned long size)
+{
+}
+
+void
 iounmap (volatile void __iomem *addr)
 {
         if (REGION_NUMBER(addr) == RGN_GATE)
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index 35b2a27d2e77..efb454534e52 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -9,6 +9,7 @@
 #include <linux/types.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
+#include <linux/bitmap.h>
 #include <asm/sn/sn_sal.h>
 #include <asm/sn/addrs.h>
 #include <asm/sn/io.h>
@@ -369,7 +370,7 @@ tioca_dma_d48(struct pci_dev *pdev, u64 paddr)
 static dma_addr_t
 tioca_dma_mapped(struct pci_dev *pdev, unsigned long paddr, size_t req_size)
 {
-        int i, ps, ps_shift, entry, entries, mapsize, last_entry;
+        int ps, ps_shift, entry, entries, mapsize;
         u64 xio_addr, end_xio_addr;
         struct tioca_common *tioca_common;
         struct tioca_kernel *tioca_kern;
@@ -410,23 +411,13 @@ tioca_dma_mapped(struct pci_dev *pdev, unsigned long paddr, size_t req_size)
         map = tioca_kern->ca_pcigart_pagemap;
         mapsize = tioca_kern->ca_pcigart_entries;
 
-        entry = find_first_zero_bit(map, mapsize);
-        while (entry < mapsize) {
-                last_entry = find_next_bit(map, mapsize, entry);
-
-                if (last_entry - entry >= entries)
-                        break;
-
-                entry = find_next_zero_bit(map, mapsize, last_entry);
-        }
-
-        if (entry > mapsize) {
+        entry = bitmap_find_next_zero_area(map, mapsize, 0, entries, 0);
+        if (entry >= mapsize) {
                 kfree(ca_dmamap);
                 goto map_return;
         }
 
-        for (i = 0; i < entries; i++)
-                set_bit(entry + i, map);
+        bitmap_set(map, entry, entries);
 
         bus_addr = tioca_kern->ca_pciap_base + (entry * ps);
 
diff --git a/arch/m32r/include/asm/elf.h b/arch/m32r/include/asm/elf.h
index 0cc34c94bf2b..2f85412ef730 100644
--- a/arch/m32r/include/asm/elf.h
+++ b/arch/m32r/include/asm/elf.h
@@ -102,7 +102,6 @@ typedef elf_fpreg_t elf_fpregset_t;
  */
 #define ELF_PLAT_INIT(_r, load_addr)    (_r)->r0 = 0
 
-#define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE       PAGE_SIZE
 
 /*
diff --git a/arch/m32r/include/asm/spinlock.h b/arch/m32r/include/asm/spinlock.h
index dded923883b2..179a06489b10 100644
--- a/arch/m32r/include/asm/spinlock.h
+++ b/arch/m32r/include/asm/spinlock.h
@@ -24,19 +24,19 @@
  * 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))
+#define arch_spin_is_locked(x)          (*(volatile int *)(&(x)->slock) <= 0)
+#define arch_spin_lock_flags(lock, flags) arch_spin_lock(lock)
+#define arch_spin_unlock_wait(x) \
+                do { cpu_relax(); } while (arch_spin_is_locked(x))
 
 /**
- * __raw_spin_trylock - Try spin lock and return a result
+ * arch_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.
+ * arch_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)
+static inline int arch_spin_trylock(arch_spinlock_t *lock)
 {
         int oldval;
         unsigned long tmp1, tmp2;
@@ -50,7 +50,7 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock)
          * }
          */
         __asm__ __volatile__ (
-                "# __raw_spin_trylock           \n\t"
+                "# arch_spin_trylock            \n\t"
                 "ldi    %1, #0;                 \n\t"
                 "mvfc   %2, psw;                \n\t"
                 "clrpsw #0x40 -> nop;           \n\t"
@@ -69,7 +69,7 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock)
         return (oldval > 0);
 }
 
-static inline void __raw_spin_lock(raw_spinlock_t *lock)
+static inline void arch_spin_lock(arch_spinlock_t *lock)
 {
         unsigned long tmp0, tmp1;
 
@@ -84,7 +84,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
          * }
          */
         __asm__ __volatile__ (
-                "# __raw_spin_lock              \n\t"
+                "# arch_spin_lock               \n\t"
                 ".fillinsn                      \n"
                 "1:                             \n\t"
                 "mvfc   %1, psw;                \n\t"
@@ -111,7 +111,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
         );
 }
 
-static inline void __raw_spin_unlock(raw_spinlock_t *lock)
+static inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
         mb();
         lock->slock = 1;
@@ -140,15 +140,15 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
  * read_can_lock - would read_trylock() succeed?
  * @lock: the rwlock in question.
  */
-#define __raw_read_can_lock(x) ((int)(x)->lock > 0)
+#define arch_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)
+#define arch_write_can_lock(x) ((x)->lock == RW_LOCK_BIAS)
 
-static inline void __raw_read_lock(raw_rwlock_t *rw)
+static inline void arch_read_lock(arch_rwlock_t *rw)
 {
         unsigned long tmp0, tmp1;
 
@@ -199,7 +199,7 @@ static inline void __raw_read_lock(raw_rwlock_t *rw)
         );
 }
 
-static inline void __raw_write_lock(raw_rwlock_t *rw)
+static inline void arch_write_lock(arch_rwlock_t *rw)
 {
         unsigned long tmp0, tmp1, tmp2;
 
@@ -252,7 +252,7 @@ static inline void __raw_write_lock(raw_rwlock_t *rw)
         );
 }
 
-static inline void __raw_read_unlock(raw_rwlock_t *rw)
+static inline void arch_read_unlock(arch_rwlock_t *rw)
 {
         unsigned long tmp0, tmp1;
 
@@ -274,7 +274,7 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw)
         );
 }
 
-static inline void __raw_write_unlock(raw_rwlock_t *rw)
+static inline void arch_write_unlock(arch_rwlock_t *rw)
 {
         unsigned long tmp0, tmp1, tmp2;
 
@@ -298,7 +298,7 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
         );
 }
 
-static inline int __raw_read_trylock(raw_rwlock_t *lock)
+static inline int arch_read_trylock(arch_rwlock_t *lock)
 {
         atomic_t *count = (atomic_t*)lock;
         if (atomic_dec_return(count) >= 0)
@@ -307,7 +307,7 @@ static inline int __raw_read_trylock(raw_rwlock_t *lock)
         return 0;
 }
 
-static inline int __raw_write_trylock(raw_rwlock_t *lock)
+static inline int arch_write_trylock(arch_rwlock_t *lock)
 {
         atomic_t *count = (atomic_t *)lock;
         if (atomic_sub_and_test(RW_LOCK_BIAS, count))
@@ -316,11 +316,11 @@ static inline int __raw_write_trylock(raw_rwlock_t *lock)
         return 0;
 }
 
-#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
-#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+#define arch_read_lock_flags(lock, flags) arch_read_lock(lock)
+#define arch_write_lock_flags(lock, flags) arch_write_lock(lock)
 
-#define _raw_spin_relax(lock)   cpu_relax()
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
+#define arch_spin_relax(lock)   cpu_relax()
+#define arch_read_relax(lock)   cpu_relax()
+#define arch_write_relax(lock)  cpu_relax()
 
 #endif  /* _ASM_M32R_SPINLOCK_H */
diff --git a/arch/m32r/include/asm/spinlock_types.h b/arch/m32r/include/asm/spinlock_types.h
index 83f52105c0e4..92e27672661f 100644
--- a/arch/m32r/include/asm/spinlock_types.h
+++ b/arch/m32r/include/asm/spinlock_types.h
@@ -7,17 +7,17 @@
 
 typedef struct {
         volatile int slock;
-} raw_spinlock_t;
+} arch_spinlock_t;
 
-#define __RAW_SPIN_LOCK_UNLOCKED        { 1 }
+#define __ARCH_SPIN_LOCK_UNLOCKED       { 1 }
 
 typedef struct {
         volatile int lock;
-} raw_rwlock_t;
+} arch_rwlock_t;
 
 #define RW_LOCK_BIAS                    0x01000000
 #define RW_LOCK_BIAS_STR                "0x01000000"
 
-#define __RAW_RW_LOCK_UNLOCKED          { RW_LOCK_BIAS }
+#define __ARCH_RW_LOCK_UNLOCKED         { RW_LOCK_BIAS }
 
 #endif /* _ASM_M32R_SPINLOCK_TYPES_H */
diff --git a/arch/m32r/kernel/irq.c b/arch/m32r/kernel/irq.c
index 8dfd31e87c4c..3c71f776872c 100644
--- a/arch/m32r/kernel/irq.c
+++ b/arch/m32r/kernel/irq.c
@@ -40,7 +40,7 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                 action = irq_desc[i].action;
                 if (!action)
                         goto skip;
@@ -59,7 +59,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
 skip:
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         }
         return 0;
 }
diff --git a/arch/m68k/include/asm/elf.h b/arch/m68k/include/asm/elf.h
index 0b0f49eb876b..01c193d91412 100644
--- a/arch/m68k/include/asm/elf.h
+++ b/arch/m68k/include/asm/elf.h
@@ -59,7 +59,6 @@ typedef struct user_m68kfp_struct elf_fpregset_t;
    is actually used on ASV.  */
 #define ELF_PLAT_INIT(_r, load_addr)    _r->a1 = 0
 
-#define USE_ELF_CORE_DUMP
 #ifndef CONFIG_SUN3
 #define ELF_EXEC_PAGESIZE       4096
 #else
diff --git a/arch/microblaze/include/asm/elf.h b/arch/microblaze/include/asm/elf.h
index f92fc0dda006..7d4acf2b278e 100644
--- a/arch/microblaze/include/asm/elf.h
+++ b/arch/microblaze/include/asm/elf.h
@@ -77,7 +77,6 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 #define ELF_DATA        ELFDATA2MSB
 #endif
 
-#define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE       4096
 
 
diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c
index 7d5ddd62d4d2..0f06034d1fe0 100644
--- a/arch/microblaze/kernel/irq.c
+++ b/arch/microblaze/kernel/irq.c
@@ -68,7 +68,7 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < nr_irq) {
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                 action = irq_desc[i].action;
                 if (!action)
                         goto skip;
@@ -89,7 +89,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
 skip:
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         }
         return 0;
 }
diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
index 7990694cda22..7a6a35dbe529 100644
--- a/arch/mips/include/asm/elf.h
+++ b/arch/mips/include/asm/elf.h
@@ -326,7 +326,6 @@ extern int dump_task_fpu(struct task_struct *, elf_fpregset_t *);
 #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs)                   \
         dump_task_fpu(tsk, elf_fpregs)
 
-#define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE       PAGE_SIZE
 
 /* This yields a mask that user programs can use to figure out what
diff --git a/arch/mips/include/asm/spinlock.h b/arch/mips/include/asm/spinlock.h
index 5b60a09a0f08..21ef9efbde43 100644
--- a/arch/mips/include/asm/spinlock.h
+++ b/arch/mips/include/asm/spinlock.h
@@ -34,33 +34,33 @@
  * becomes equal to the the initial value of the tail.
  */
 
-static inline int __raw_spin_is_locked(raw_spinlock_t *lock)
+static inline int arch_spin_is_locked(arch_spinlock_t *lock)
 {
         unsigned int counters = ACCESS_ONCE(lock->lock);
 
         return ((counters >> 14) ^ counters) & 0x1fff;
 }
 
-#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
-#define __raw_spin_unlock_wait(x) \
-        while (__raw_spin_is_locked(x)) { cpu_relax(); }
+#define arch_spin_lock_flags(lock, flags) arch_spin_lock(lock)
+#define arch_spin_unlock_wait(x) \
+        while (arch_spin_is_locked(x)) { cpu_relax(); }
 
-static inline int __raw_spin_is_contended(raw_spinlock_t *lock)
+static inline int arch_spin_is_contended(arch_spinlock_t *lock)
 {
         unsigned int counters = ACCESS_ONCE(lock->lock);
 
         return (((counters >> 14) - counters) & 0x1fff) > 1;
 }
-#define __raw_spin_is_contended __raw_spin_is_contended
+#define arch_spin_is_contended  arch_spin_is_contended
 
-static inline void __raw_spin_lock(raw_spinlock_t *lock)
+static inline void arch_spin_lock(arch_spinlock_t *lock)
 {
         int my_ticket;
         int tmp;
 
         if (R10000_LLSC_WAR) {
                 __asm__ __volatile__ (
-                "       .set push               # __raw_spin_lock       \n"
+                "       .set push               # arch_spin_lock        \n"
                 "       .set noreorder                                  \n"
                 "                                                       \n"
                 "1:     ll      %[ticket], %[ticket_ptr]                \n"
@@ -94,7 +94,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
                   [my_ticket] "=&r" (my_ticket));
         } else {
                 __asm__ __volatile__ (
-                "       .set push               # __raw_spin_lock       \n"
+                "       .set push               # arch_spin_lock        \n"
                 "       .set noreorder                                  \n"
                 "                                                       \n"
                 "       ll      %[ticket], %[ticket_ptr]                \n"
@@ -134,7 +134,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
         smp_llsc_mb();
 }
 
-static inline void __raw_spin_unlock(raw_spinlock_t *lock)
+static inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
         int tmp;
 
@@ -142,7 +142,7 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
 
         if (R10000_LLSC_WAR) {
                 __asm__ __volatile__ (
-                "                               # __raw_spin_unlock     \n"
+                "                               # arch_spin_unlock      \n"
                 "1:     ll      %[ticket], %[ticket_ptr]                \n"
                 "       addiu   %[ticket], %[ticket], 1                 \n"
                 "       ori     %[ticket], %[ticket], 0x2000            \n"
@@ -153,7 +153,7 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
                   [ticket] "=&r" (tmp));
         } else {
                 __asm__ __volatile__ (
-                "       .set push               # __raw_spin_unlock     \n"
+                "       .set push               # arch_spin_unlock      \n"
                 "       .set noreorder                                  \n"
                 "                                                       \n"
                 "       ll      %[ticket], %[ticket_ptr]                \n"
@@ -174,13 +174,13 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
         }
 }
 
-static inline unsigned int __raw_spin_trylock(raw_spinlock_t *lock)
+static inline unsigned int arch_spin_trylock(arch_spinlock_t *lock)
 {
         int tmp, tmp2, tmp3;
 
         if (R10000_LLSC_WAR) {
                 __asm__ __volatile__ (
-                "       .set push               # __raw_spin_trylock    \n"
+                "       .set push               # arch_spin_trylock     \n"
                 "       .set noreorder                                  \n"
                 "                                                       \n"
                 "1:     ll      %[ticket], %[ticket_ptr]                \n"
@@ -204,7 +204,7 @@ static inline unsigned int __raw_spin_trylock(raw_spinlock_t *lock)
                   [now_serving] "=&r" (tmp3));
         } else {
                 __asm__ __volatile__ (
-                "       .set push               # __raw_spin_trylock    \n"
+                "       .set push               # arch_spin_trylock     \n"
                 "       .set noreorder                                  \n"
                 "                                                       \n"
                 "       ll      %[ticket], %[ticket_ptr]                \n"
@@ -248,21 +248,21 @@ static inline unsigned int __raw_spin_trylock(raw_spinlock_t *lock)
  * read_can_lock - would read_trylock() succeed?
  * @lock: the rwlock in question.
  */
-#define __raw_read_can_lock(rw) ((rw)->lock >= 0)
+#define arch_read_can_lock(rw)  ((rw)->lock >= 0)
 
 /*
  * write_can_lock - would write_trylock() succeed?
  * @lock: the rwlock in question.
  */
-#define __raw_write_can_lock(rw)        (!(rw)->lock)
+#define arch_write_can_lock(rw) (!(rw)->lock)
 
-static inline void __raw_read_lock(raw_rwlock_t *rw)
+static inline void arch_read_lock(arch_rwlock_t *rw)
 {
         unsigned int tmp;
 
         if (R10000_LLSC_WAR) {
                 __asm__ __volatile__(
-                "       .set    noreorder       # __raw_read_lock       \n"
+                "       .set    noreorder       # arch_read_lock        \n"
                 "1:     ll      %1, %2                                  \n"
                 "       bltz    %1, 1b                                  \n"
                 "        addu   %1, 1                                   \n"
@@ -275,7 +275,7 @@ static inline void __raw_read_lock(raw_rwlock_t *rw)
                 : "memory");
         } else {
                 __asm__ __volatile__(
-                "       .set    noreorder       # __raw_read_lock       \n"
+                "       .set    noreorder       # arch_read_lock        \n"
                 "1:     ll      %1, %2                                  \n"
                 "       bltz    %1, 2f                                  \n"
                 "        addu   %1, 1                                   \n"
@@ -301,7 +301,7 @@ static inline void __raw_read_lock(raw_rwlock_t *rw)
 /* Note the use of sub, not subu which will make the kernel die with an
    overflow exception if we ever try to unlock an rwlock that is already
    unlocked or is being held by a writer.  */
-static inline void __raw_read_unlock(raw_rwlock_t *rw)
+static inline void arch_read_unlock(arch_rwlock_t *rw)
 {
         unsigned int tmp;
 
@@ -309,7 +309,7 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw)
 
         if (R10000_LLSC_WAR) {
                 __asm__ __volatile__(
-                "1:     ll      %1, %2          # __raw_read_unlock     \n"
+                "1:     ll      %1, %2          # arch_read_unlock      \n"
                 "       sub     %1, 1                                   \n"
                 "       sc      %1, %0                                  \n"
                 "       beqzl   %1, 1b                                  \n"
@@ -318,7 +318,7 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw)
                 : "memory");
         } else {
                 __asm__ __volatile__(
-                "       .set    noreorder       # __raw_read_unlock     \n"
+                "       .set    noreorder       # arch_read_unlock      \n"
                 "1:     ll      %1, %2                                  \n"
                 "       sub     %1, 1                                   \n"
                 "       sc      %1, %0                                  \n"
@@ -335,13 +335,13 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw)
         }
 }
 
-static inline void __raw_write_lock(raw_rwlock_t *rw)
+static inline void arch_write_lock(arch_rwlock_t *rw)
 {
         unsigned int tmp;
 
         if (R10000_LLSC_WAR) {
                 __asm__ __volatile__(
-                "       .set    noreorder       # __raw_write_lock      \n"
+                "       .set    noreorder       # arch_write_lock       \n"
                 "1:     ll      %1, %2                                  \n"
                 "       bnez    %1, 1b                                  \n"
                 "        lui    %1, 0x8000                              \n"
@@ -354,7 +354,7 @@ static inline void __raw_write_lock(raw_rwlock_t *rw)
                 : "memory");
         } else {
                 __asm__ __volatile__(
-                "       .set    noreorder       # __raw_write_lock      \n"
+                "       .set    noreorder       # arch_write_lock       \n"
                 "1:     ll      %1, %2                                  \n"
                 "       bnez    %1, 2f                                  \n"
                 "        lui    %1, 0x8000                              \n"
@@ -377,26 +377,26 @@ static inline void __raw_write_lock(raw_rwlock_t *rw)
         smp_llsc_mb();
 }
 
-static inline void __raw_write_unlock(raw_rwlock_t *rw)
+static inline void arch_write_unlock(arch_rwlock_t *rw)
 {
         smp_mb();
 
         __asm__ __volatile__(
-        "                               # __raw_write_unlock    \n"
+        "                               # arch_write_unlock     \n"
         "       sw      $0, %0                                  \n"
         : "=m" (rw->lock)
         : "m" (rw->lock)
         : "memory");
 }
 
-static inline int __raw_read_trylock(raw_rwlock_t *rw)
+static inline int arch_read_trylock(arch_rwlock_t *rw)
 {
         unsigned int tmp;
         int ret;
 
         if (R10000_LLSC_WAR) {
                 __asm__ __volatile__(
-                "       .set    noreorder       # __raw_read_trylock    \n"
+                "       .set    noreorder       # arch_read_trylock     \n"
                 "       li      %2, 0                                   \n"
                 "1:     ll      %1, %3                                  \n"
                 "       bltz    %1, 2f                                  \n"
@@ -413,7 +413,7 @@ static inline int __raw_read_trylock(raw_rwlock_t *rw)
                 : "memory");
         } else {
                 __asm__ __volatile__(
-                "       .set    noreorder       # __raw_read_trylock    \n"
+                "       .set    noreorder       # arch_read_trylock     \n"
                 "       li      %2, 0                                   \n"
                 "1:     ll      %1, %3                                  \n"
                 "       bltz    %1, 2f                                  \n"
@@ -433,14 +433,14 @@ static inline int __raw_read_trylock(raw_rwlock_t *rw)
         return ret;
 }
 
-static inline int __raw_write_trylock(raw_rwlock_t *rw)
+static inline int arch_write_trylock(arch_rwlock_t *rw)
 {
         unsigned int tmp;
         int ret;
 
         if (R10000_LLSC_WAR) {
                 __asm__ __volatile__(
-                "       .set    noreorder       # __raw_write_trylock   \n"
+                "       .set    noreorder       # arch_write_trylock    \n"
                 "       li      %2, 0                                   \n"
                 "1:     ll      %1, %3                                  \n"
                 "       bnez    %1, 2f                                  \n"
@@ -457,7 +457,7 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)
                 : "memory");
         } else {
                 __asm__ __volatile__(
-                "       .set    noreorder       # __raw_write_trylock   \n"
+                "       .set    noreorder       # arch_write_trylock    \n"
                 "       li      %2, 0                                   \n"
                 "1:     ll      %1, %3                                  \n"
                 "       bnez    %1, 2f                                  \n"
@@ -480,11 +480,11 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)
         return ret;
 }
 
-#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
-#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+#define arch_read_lock_flags(lock, flags) arch_read_lock(lock)
+#define arch_write_lock_flags(lock, flags) arch_write_lock(lock)
 
-#define _raw_spin_relax(lock)   cpu_relax()
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
+#define arch_spin_relax(lock)   cpu_relax()
+#define arch_read_relax(lock)   cpu_relax()
+#define arch_write_relax(lock)  cpu_relax()
 
 #endif /* _ASM_SPINLOCK_H */
diff --git a/arch/mips/include/asm/spinlock_types.h b/arch/mips/include/asm/spinlock_types.h
index adeedaa116c1..ee197c2f9c98 100644
--- a/arch/mips/include/asm/spinlock_types.h
+++ b/arch/mips/include/asm/spinlock_types.h
@@ -12,14 +12,14 @@ typedef struct {
          * bits 15..28: ticket
          */
         unsigned int lock;
-} raw_spinlock_t;
+} arch_spinlock_t;
 
-#define __RAW_SPIN_LOCK_UNLOCKED        { 0 }
+#define __ARCH_SPIN_LOCK_UNLOCKED       { 0 }
 
 typedef struct {
         volatile unsigned int lock;
-} raw_rwlock_t;
+} arch_rwlock_t;
 
-#define __RAW_RW_LOCK_UNLOCKED          { 0 }
+#define __ARCH_RW_LOCK_UNLOCKED         { 0 }
 
 #endif
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index 7b845ba9dff4..8b0b4181219f 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -99,7 +99,7 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                 action = irq_desc[i].action;
                 if (!action)
                         goto skip;
@@ -118,7 +118,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
 skip:
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         } else if (i == NR_IRQS) {
                 seq_putc(p, '\n');
                 seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
index 6d39e222b170..6153b6a05ccf 100644
--- a/arch/mips/vr41xx/common/icu.c
+++ b/arch/mips/vr41xx/common/icu.c
@@ -159,9 +159,9 @@ void vr41xx_enable_piuint(uint16_t mask)
 
         if (current_cpu_type() == CPU_VR4111 ||
             current_cpu_type() == CPU_VR4121) {
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 icu1_set(MPIUINTREG, mask);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 
@@ -174,9 +174,9 @@ void vr41xx_disable_piuint(uint16_t mask)
 
         if (current_cpu_type() == CPU_VR4111 ||
             current_cpu_type() == CPU_VR4121) {
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 icu1_clear(MPIUINTREG, mask);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 
@@ -189,9 +189,9 @@ void vr41xx_enable_aiuint(uint16_t mask)
 
         if (current_cpu_type() == CPU_VR4111 ||
             current_cpu_type() == CPU_VR4121) {
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 icu1_set(MAIUINTREG, mask);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 
@@ -204,9 +204,9 @@ void vr41xx_disable_aiuint(uint16_t mask)
 
         if (current_cpu_type() == CPU_VR4111 ||
             current_cpu_type() == CPU_VR4121) {
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 icu1_clear(MAIUINTREG, mask);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 
@@ -219,9 +219,9 @@ void vr41xx_enable_kiuint(uint16_t mask)
 
         if (current_cpu_type() == CPU_VR4111 ||
             current_cpu_type() == CPU_VR4121) {
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 icu1_set(MKIUINTREG, mask);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 
@@ -234,9 +234,9 @@ void vr41xx_disable_kiuint(uint16_t mask)
 
         if (current_cpu_type() == CPU_VR4111 ||
             current_cpu_type() == CPU_VR4121) {
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 icu1_clear(MKIUINTREG, mask);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 
@@ -247,9 +247,9 @@ void vr41xx_enable_macint(uint16_t mask)
         struct irq_desc *desc = irq_desc + ETHERNET_IRQ;
         unsigned long flags;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         icu1_set(MMACINTREG, mask);
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 }
 
 EXPORT_SYMBOL(vr41xx_enable_macint);
@@ -259,9 +259,9 @@ void vr41xx_disable_macint(uint16_t mask)
         struct irq_desc *desc = irq_desc + ETHERNET_IRQ;
         unsigned long flags;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         icu1_clear(MMACINTREG, mask);
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 }
 
 EXPORT_SYMBOL(vr41xx_disable_macint);
@@ -271,9 +271,9 @@ void vr41xx_enable_dsiuint(uint16_t mask)
         struct irq_desc *desc = irq_desc + DSIU_IRQ;
         unsigned long flags;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         icu1_set(MDSIUINTREG, mask);
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 }
 
 EXPORT_SYMBOL(vr41xx_enable_dsiuint);
@@ -283,9 +283,9 @@ void vr41xx_disable_dsiuint(uint16_t mask)
         struct irq_desc *desc = irq_desc + DSIU_IRQ;
         unsigned long flags;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         icu1_clear(MDSIUINTREG, mask);
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 }
 
 EXPORT_SYMBOL(vr41xx_disable_dsiuint);
@@ -295,9 +295,9 @@ void vr41xx_enable_firint(uint16_t mask)
         struct irq_desc *desc = irq_desc + FIR_IRQ;
         unsigned long flags;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         icu2_set(MFIRINTREG, mask);
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 }
 
 EXPORT_SYMBOL(vr41xx_enable_firint);
@@ -307,9 +307,9 @@ void vr41xx_disable_firint(uint16_t mask)
         struct irq_desc *desc = irq_desc + FIR_IRQ;
         unsigned long flags;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         icu2_clear(MFIRINTREG, mask);
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 }
 
 EXPORT_SYMBOL(vr41xx_disable_firint);
@@ -322,9 +322,9 @@ void vr41xx_enable_pciint(void)
         if (current_cpu_type() == CPU_VR4122 ||
             current_cpu_type() == CPU_VR4131 ||
             current_cpu_type() == CPU_VR4133) {
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MPCIINTREG, PCIINT0);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 
@@ -338,9 +338,9 @@ void vr41xx_disable_pciint(void)
         if (current_cpu_type() == CPU_VR4122 ||
             current_cpu_type() == CPU_VR4131 ||
             current_cpu_type() == CPU_VR4133) {
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MPCIINTREG, 0);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 
@@ -354,9 +354,9 @@ void vr41xx_enable_scuint(void)
         if (current_cpu_type() == CPU_VR4122 ||
             current_cpu_type() == CPU_VR4131 ||
             current_cpu_type() == CPU_VR4133) {
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MSCUINTREG, SCUINT0);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 
@@ -370,9 +370,9 @@ void vr41xx_disable_scuint(void)
         if (current_cpu_type() == CPU_VR4122 ||
             current_cpu_type() == CPU_VR4131 ||
             current_cpu_type() == CPU_VR4133) {
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MSCUINTREG, 0);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 
@@ -386,9 +386,9 @@ void vr41xx_enable_csiint(uint16_t mask)
         if (current_cpu_type() == CPU_VR4122 ||
             current_cpu_type() == CPU_VR4131 ||
             current_cpu_type() == CPU_VR4133) {
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 icu2_set(MCSIINTREG, mask);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 
@@ -402,9 +402,9 @@ void vr41xx_disable_csiint(uint16_t mask)
         if (current_cpu_type() == CPU_VR4122 ||
             current_cpu_type() == CPU_VR4131 ||
             current_cpu_type() == CPU_VR4133) {
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 icu2_clear(MCSIINTREG, mask);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 
@@ -418,9 +418,9 @@ void vr41xx_enable_bcuint(void)
         if (current_cpu_type() == CPU_VR4122 ||
             current_cpu_type() == CPU_VR4131 ||
             current_cpu_type() == CPU_VR4133) {
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MBCUINTREG, BCUINTR);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 
@@ -434,9 +434,9 @@ void vr41xx_disable_bcuint(void)
         if (current_cpu_type() == CPU_VR4122 ||
             current_cpu_type() == CPU_VR4131 ||
             current_cpu_type() == CPU_VR4133) {
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MBCUINTREG, 0);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 
@@ -486,7 +486,7 @@ static inline int set_sysint1_assign(unsigned int irq, unsigned char assign)
 
         pin = SYSINT1_IRQ_TO_PIN(irq);
 
-        spin_lock_irq(&desc->lock);
+        raw_spin_lock_irq(&desc->lock);
 
         intassign0 = icu1_read(INTASSIGN0);
         intassign1 = icu1_read(INTASSIGN1);
@@ -525,7 +525,7 @@ static inline int set_sysint1_assign(unsigned int irq, unsigned char assign)
                 intassign1 |= (uint16_t)assign << 9;
                 break;
         default:
-                spin_unlock_irq(&desc->lock);
+                raw_spin_unlock_irq(&desc->lock);
                 return -EINVAL;
         }
 
@@ -533,7 +533,7 @@ static inline int set_sysint1_assign(unsigned int irq, unsigned char assign)
         icu1_write(INTASSIGN0, intassign0);
         icu1_write(INTASSIGN1, intassign1);
 
-        spin_unlock_irq(&desc->lock);
+        raw_spin_unlock_irq(&desc->lock);
 
         return 0;
 }
@@ -546,7 +546,7 @@ static inline int set_sysint2_assign(unsigned int irq, unsigned char assign)
 
         pin = SYSINT2_IRQ_TO_PIN(irq);
 
-        spin_lock_irq(&desc->lock);
+        raw_spin_lock_irq(&desc->lock);
 
         intassign2 = icu1_read(INTASSIGN2);
         intassign3 = icu1_read(INTASSIGN3);
@@ -593,7 +593,7 @@ static inline int set_sysint2_assign(unsigned int irq, unsigned char assign)
                 intassign3 |= (uint16_t)assign << 12;
                 break;
         default:
-                spin_unlock_irq(&desc->lock);
+                raw_spin_unlock_irq(&desc->lock);
                 return -EINVAL;
         }
 
@@ -601,7 +601,7 @@ static inline int set_sysint2_assign(unsigned int irq, unsigned char assign)
         icu1_write(INTASSIGN2, intassign2);
         icu1_write(INTASSIGN3, intassign3);
 
-        spin_unlock_irq(&desc->lock);
+        raw_spin_unlock_irq(&desc->lock);
 
         return 0;
 }
diff --git a/arch/mn10300/include/asm/elf.h b/arch/mn10300/include/asm/elf.h
index 75a70aa9fd6f..e5fa97cd9a14 100644
--- a/arch/mn10300/include/asm/elf.h
+++ b/arch/mn10300/include/asm/elf.h
@@ -77,7 +77,6 @@ do {									\
         _ur->a1   = 0;  _ur->a0   = 0;  _ur->d1   = 0;  _ur->d0   = 0;  \
 } while (0)
 
-#define USE_ELF_CORE_DUMP
 #define CORE_DUMP_USE_REGSET
 #define ELF_EXEC_PAGESIZE       4096
 
diff --git a/arch/mn10300/kernel/irq.c b/arch/mn10300/kernel/irq.c
index 4c3c58ef5cda..e2d5ed891f37 100644
--- a/arch/mn10300/kernel/irq.c
+++ b/arch/mn10300/kernel/irq.c
@@ -215,7 +215,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 /* display information rows, one per active CPU */
         case 1 ... NR_IRQS - 1:
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
 
                 action = irq_desc[i].action;
                 if (action) {
@@ -235,7 +235,7 @@ int show_interrupts(struct seq_file *p, void *v)
                         seq_putc(p, '\n');
                 }
 
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
                 break;
 
                 /* polish off with NMI and error counters */
diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
index 8bc9e96699b2..716634d1f546 100644
--- a/arch/parisc/include/asm/atomic.h
+++ b/arch/parisc/include/asm/atomic.h
@@ -27,19 +27,19 @@
 #  define ATOMIC_HASH_SIZE 4
 #  define ATOMIC_HASH(a) (&(__atomic_hash[ (((unsigned long) (a))/L1_CACHE_BYTES) & (ATOMIC_HASH_SIZE-1) ]))
 
-extern raw_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned;
+extern arch_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned;
 
 /* Can't use raw_spin_lock_irq because of #include problems, so
  * this is the substitute */
 #define _atomic_spin_lock_irqsave(l,f) do {     \
-        raw_spinlock_t *s = ATOMIC_HASH(l);             \
+        arch_spinlock_t *s = ATOMIC_HASH(l);            \
         local_irq_save(f);                      \
-        __raw_spin_lock(s);                     \
+        arch_spin_lock(s);                      \
 } while(0)
 
 #define _atomic_spin_unlock_irqrestore(l,f) do {        \
-        raw_spinlock_t *s = ATOMIC_HASH(l);                     \
-        __raw_spin_unlock(s);                           \
+        arch_spinlock_t *s = ATOMIC_HASH(l);                    \
+        arch_spin_unlock(s);                            \
         local_irq_restore(f);                           \
 } while(0)
 
diff --git a/arch/parisc/include/asm/bug.h b/arch/parisc/include/asm/bug.h
index 8cfc553fc837..75e46c557a16 100644
--- a/arch/parisc/include/asm/bug.h
+++ b/arch/parisc/include/asm/bug.h
@@ -32,14 +32,14 @@
                              "\t.popsection"                            \
                              : : "i" (__FILE__), "i" (__LINE__),        \
                              "i" (0), "i" (sizeof(struct bug_entry)) ); \
-                for(;;) ;                                               \
+                unreachable();                                          \
         } while(0)
 
 #else
 #define BUG()                                                           \
         do {                                                            \
                 asm volatile(PARISC_BUG_BREAK_ASM : : );                \
-                for(;;) ;                                               \
+                unreachable();                                          \
         } while(0)
 #endif
 
diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
index 9c802eb4be84..19f6cb1a4a1c 100644
--- a/arch/parisc/include/asm/elf.h
+++ b/arch/parisc/include/asm/elf.h
@@ -328,7 +328,6 @@ struct pt_regs;	/* forward declaration... */
    such function.  */
 #define ELF_PLAT_INIT(_r, load_addr)       _r->gr[23] = 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
diff --git a/arch/parisc/include/asm/ftrace.h b/arch/parisc/include/asm/ftrace.h
index 2fa05dd6aeee..72c0fafaa039 100644
--- a/arch/parisc/include/asm/ftrace.h
+++ b/arch/parisc/include/asm/ftrace.h
@@ -20,6 +20,20 @@ struct ftrace_ret_stack {
  * Defined in entry.S
  */
 extern void return_to_handler(void);
+
+
+extern unsigned long return_address(unsigned int);
+
+#define HAVE_ARCH_CALLER_ADDR
+
+#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
+#define CALLER_ADDR1 return_address(1)
+#define CALLER_ADDR2 return_address(2)
+#define CALLER_ADDR3 return_address(3)
+#define CALLER_ADDR4 return_address(4)
+#define CALLER_ADDR5 return_address(5)
+#define CALLER_ADDR6 return_address(6)
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* _ASM_PARISC_FTRACE_H */
diff --git a/arch/parisc/include/asm/spinlock.h b/arch/parisc/include/asm/spinlock.h
index fae03e136fa8..74036f436a3b 100644
--- a/arch/parisc/include/asm/spinlock.h
+++ b/arch/parisc/include/asm/spinlock.h
@@ -5,17 +5,17 @@
 #include <asm/processor.h>
 #include <asm/spinlock_types.h>
 
-static inline int __raw_spin_is_locked(raw_spinlock_t *x)
+static inline int arch_spin_is_locked(arch_spinlock_t *x)
 {
         volatile unsigned int *a = __ldcw_align(x);
         return *a == 0;
 }
 
-#define __raw_spin_lock(lock) __raw_spin_lock_flags(lock, 0)
-#define __raw_spin_unlock_wait(x) \
-                do { cpu_relax(); } while (__raw_spin_is_locked(x))
+#define arch_spin_lock(lock) arch_spin_lock_flags(lock, 0)
+#define arch_spin_unlock_wait(x) \
+                do { cpu_relax(); } while (arch_spin_is_locked(x))
 
-static inline void __raw_spin_lock_flags(raw_spinlock_t *x,
+static inline void arch_spin_lock_flags(arch_spinlock_t *x,
                                          unsigned long flags)
 {
         volatile unsigned int *a;
@@ -33,7 +33,7 @@ static inline void __raw_spin_lock_flags(raw_spinlock_t *x,
         mb();
 }
 
-static inline void __raw_spin_unlock(raw_spinlock_t *x)
+static inline void arch_spin_unlock(arch_spinlock_t *x)
 {
         volatile unsigned int *a;
         mb();
@@ -42,7 +42,7 @@ static inline void __raw_spin_unlock(raw_spinlock_t *x)
         mb();
 }
 
-static inline int __raw_spin_trylock(raw_spinlock_t *x)
+static inline int arch_spin_trylock(arch_spinlock_t *x)
 {
         volatile unsigned int *a;
         int ret;
@@ -69,38 +69,38 @@ static inline int __raw_spin_trylock(raw_spinlock_t *x)
 
 /* Note that we have to ensure interrupts are disabled in case we're
  * interrupted by some other code that wants to grab the same read lock */
-static  __inline__ void __raw_read_lock(raw_rwlock_t *rw)
+static  __inline__ void arch_read_lock(arch_rwlock_t *rw)
 {
         unsigned long flags;
         local_irq_save(flags);
-        __raw_spin_lock_flags(&rw->lock, flags);
+        arch_spin_lock_flags(&rw->lock, flags);
         rw->counter++;
-        __raw_spin_unlock(&rw->lock);
+        arch_spin_unlock(&rw->lock);
         local_irq_restore(flags);
 }
 
 /* Note that we have to ensure interrupts are disabled in case we're
  * interrupted by some other code that wants to grab the same read lock */
-static  __inline__ void __raw_read_unlock(raw_rwlock_t *rw)
+static  __inline__ void arch_read_unlock(arch_rwlock_t *rw)
 {
         unsigned long flags;
         local_irq_save(flags);
-        __raw_spin_lock_flags(&rw->lock, flags);
+        arch_spin_lock_flags(&rw->lock, flags);
         rw->counter--;
-        __raw_spin_unlock(&rw->lock);
+        arch_spin_unlock(&rw->lock);
         local_irq_restore(flags);
 }
 
 /* Note that we have to ensure interrupts are disabled in case we're
  * interrupted by some other code that wants to grab the same read lock */
-static __inline__ int __raw_read_trylock(raw_rwlock_t *rw)
+static __inline__ int arch_read_trylock(arch_rwlock_t *rw)
 {
         unsigned long flags;
  retry:
         local_irq_save(flags);
-        if (__raw_spin_trylock(&rw->lock)) {
+        if (arch_spin_trylock(&rw->lock)) {
                 rw->counter++;
-                __raw_spin_unlock(&rw->lock);
+                arch_spin_unlock(&rw->lock);
                 local_irq_restore(flags);
                 return 1;
         }
@@ -111,7 +111,7 @@ static __inline__ int __raw_read_trylock(raw_rwlock_t *rw)
                 return 0;
 
         /* Wait until we have a realistic chance at the lock */
-        while (__raw_spin_is_locked(&rw->lock) && rw->counter >= 0)
+        while (arch_spin_is_locked(&rw->lock) && rw->counter >= 0)
                 cpu_relax();
 
         goto retry;
@@ -119,15 +119,15 @@ static __inline__ int __raw_read_trylock(raw_rwlock_t *rw)
 
 /* Note that we have to ensure interrupts are disabled in case we're
  * interrupted by some other code that wants to read_trylock() this lock */
-static __inline__ void __raw_write_lock(raw_rwlock_t *rw)
+static __inline__ void arch_write_lock(arch_rwlock_t *rw)
 {
         unsigned long flags;
 retry:
         local_irq_save(flags);
-        __raw_spin_lock_flags(&rw->lock, flags);
+        arch_spin_lock_flags(&rw->lock, flags);
 
         if (rw->counter != 0) {
-                __raw_spin_unlock(&rw->lock);
+                arch_spin_unlock(&rw->lock);
                 local_irq_restore(flags);
 
                 while (rw->counter != 0)
@@ -141,27 +141,27 @@ retry:
         local_irq_restore(flags);
 }
 
-static __inline__ void __raw_write_unlock(raw_rwlock_t *rw)
+static __inline__ void arch_write_unlock(arch_rwlock_t *rw)
 {
         rw->counter = 0;
-        __raw_spin_unlock(&rw->lock);
+        arch_spin_unlock(&rw->lock);
 }
 
 /* Note that we have to ensure interrupts are disabled in case we're
  * interrupted by some other code that wants to read_trylock() this lock */
-static __inline__ int __raw_write_trylock(raw_rwlock_t *rw)
+static __inline__ int arch_write_trylock(arch_rwlock_t *rw)
 {
         unsigned long flags;
         int result = 0;
 
         local_irq_save(flags);
-        if (__raw_spin_trylock(&rw->lock)) {
+        if (arch_spin_trylock(&rw->lock)) {
                 if (rw->counter == 0) {
                         rw->counter = -1;
                         result = 1;
                 } else {
                         /* Read-locked.  Oh well. */
-                        __raw_spin_unlock(&rw->lock);
+                        arch_spin_unlock(&rw->lock);
                 }
         }
         local_irq_restore(flags);
@@ -173,7 +173,7 @@ static __inline__ int __raw_write_trylock(raw_rwlock_t *rw)
  * read_can_lock - would read_trylock() succeed?
  * @lock: the rwlock in question.
  */
-static __inline__ int __raw_read_can_lock(raw_rwlock_t *rw)
+static __inline__ int arch_read_can_lock(arch_rwlock_t *rw)
 {
         return rw->counter >= 0;
 }
@@ -182,16 +182,16 @@ static __inline__ int __raw_read_can_lock(raw_rwlock_t *rw)
  * write_can_lock - would write_trylock() succeed?
  * @lock: the rwlock in question.
  */
-static __inline__ int __raw_write_can_lock(raw_rwlock_t *rw)
+static __inline__ int arch_write_can_lock(arch_rwlock_t *rw)
 {
         return !rw->counter;
 }
 
-#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
-#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+#define arch_read_lock_flags(lock, flags) arch_read_lock(lock)
+#define arch_write_lock_flags(lock, flags) arch_write_lock(lock)
 
-#define _raw_spin_relax(lock)   cpu_relax()
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
+#define arch_spin_relax(lock)   cpu_relax()
+#define arch_read_relax(lock)   cpu_relax()
+#define arch_write_relax(lock)  cpu_relax()
 
 #endif /* __ASM_SPINLOCK_H */
diff --git a/arch/parisc/include/asm/spinlock_types.h b/arch/parisc/include/asm/spinlock_types.h
index 3f72f47cf4b2..8c373aa28a86 100644
--- a/arch/parisc/include/asm/spinlock_types.h
+++ b/arch/parisc/include/asm/spinlock_types.h
@@ -4,18 +4,18 @@
 typedef struct {
 #ifdef CONFIG_PA20
         volatile unsigned int slock;
-# define __RAW_SPIN_LOCK_UNLOCKED { 1 }
+# define __ARCH_SPIN_LOCK_UNLOCKED { 1 }
 #else
         volatile unsigned int lock[4];
-# define __RAW_SPIN_LOCK_UNLOCKED       { { 1, 1, 1, 1 } }
+# define __ARCH_SPIN_LOCK_UNLOCKED      { { 1, 1, 1, 1 } }
 #endif
-} raw_spinlock_t;
+} arch_spinlock_t;
 
 typedef struct {
-        raw_spinlock_t lock;
+        arch_spinlock_t lock;
         volatile int counter;
-} raw_rwlock_t;
+} arch_rwlock_t;
 
-#define __RAW_RW_LOCK_UNLOCKED          { __RAW_SPIN_LOCK_UNLOCKED, 0 }
+#define __ARCH_RW_LOCK_UNLOCKED         { __ARCH_SPIN_LOCK_UNLOCKED, 0 }
 
 #endif
diff --git a/arch/parisc/kernel/asm-offsets.c b/arch/parisc/kernel/asm-offsets.c
index fcd3c707bf12..ec787b411e9a 100644
--- a/arch/parisc/kernel/asm-offsets.c
+++ b/arch/parisc/kernel/asm-offsets.c
@@ -244,9 +244,6 @@ int main(void)
         DEFINE(THREAD_SZ, sizeof(struct thread_info));
         DEFINE(THREAD_SZ_ALGN, align(sizeof(struct thread_info), 64));
         BLANK();
-        DEFINE(IRQSTAT_SIRQ_PEND, offsetof(irq_cpustat_t, __softirq_pending));
-        DEFINE(IRQSTAT_SZ, sizeof(irq_cpustat_t));
-        BLANK();
         DEFINE(ICACHE_BASE, offsetof(struct pdc_cache_info, ic_base));
         DEFINE(ICACHE_STRIDE, offsetof(struct pdc_cache_info, ic_stride));
         DEFINE(ICACHE_COUNT, offsetof(struct pdc_cache_info, ic_count));
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 2e7610cb33d5..efbcee5d2220 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -145,7 +145,7 @@ static int cpu_set_affinity_irq(unsigned int irq, const struct cpumask *dest)
 #endif
 
 static struct irq_chip cpu_interrupt_type = {
-        .typename       = "CPU",
+        .name           = "CPU",
         .startup        = cpu_startup_irq,
         .shutdown       = cpu_disable_irq,
         .enable         = cpu_enable_irq,
@@ -180,7 +180,7 @@ int show_interrupts(struct seq_file *p, void *v)
         if (i < NR_IRQS) {
                 struct irqaction *action;
 
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                 action = irq_desc[i].action;
                 if (!action)
                         goto skip;
@@ -192,7 +192,7 @@ int show_interrupts(struct seq_file *p, void *v)
                 seq_printf(p, "%10u ", kstat_irqs(i));
 #endif
 
-                seq_printf(p, " %14s", irq_desc[i].chip->typename);
+                seq_printf(p, " %14s", irq_desc[i].chip->name);
 #ifndef PARISC_IRQ_CR16_COUNTS
                 seq_printf(p, "  %s", action->name);
 
@@ -224,7 +224,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
  skip:
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         }
 
         return 0;
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index e8467e4aa8d1..fb37ac52e46c 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -26,7 +26,6 @@
 #include <linux/stddef.h>
 #include <linux/compat.h>
 #include <linux/elf.h>
-#include <linux/tracehook.h>
 #include <asm/ucontext.h>
 #include <asm/rt_sigframe.h>
 #include <asm/uaccess.h>
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index 1fd0f0cec037..3f2fce8ce6b6 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -60,8 +60,6 @@ static int smp_debug_lvl = 0;
 #define smp_debug(lvl, ...)     do { } while(0)
 #endif /* DEBUG_SMP */
 
-DEFINE_SPINLOCK(smp_lock);
-
 volatile struct task_struct *smp_init_current_idle_task;
 
 /* track which CPU is booting */
@@ -69,7 +67,7 @@ static volatile int cpu_now_booting __cpuinitdata;
 
 static int parisc_max_cpus __cpuinitdata = 1;
 
-DEFINE_PER_CPU(spinlock_t, ipi_lock) = SPIN_LOCK_UNLOCKED;
+static DEFINE_PER_CPU(spinlock_t, ipi_lock);
 
 enum ipi_message_type {
         IPI_NOP=0,
@@ -438,6 +436,11 @@ void __init smp_prepare_boot_cpu(void)
 */
 void __init smp_prepare_cpus(unsigned int max_cpus)
 {
+        int cpu;
+
+        for_each_possible_cpu(cpu)
+                spin_lock_init(&per_cpu(ipi_lock, cpu));
+
         init_cpu_present(cpumask_of(0));
 
         parisc_max_cpus = max_cpus;
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index 76d23ec8dfaa..9779ece2b070 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -26,13 +26,7 @@
 #include <linux/shm.h>
 #include <linux/slab.h>
 #include <linux/uio.h>
-#include <linux/nfs_fs.h>
 #include <linux/ncp_fs.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr.h>
-#include <linux/nfsd/syscall.h>
 #include <linux/poll.h>
 #include <linux/personality.h>
 #include <linux/stat.h>
diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c
index a36799e85693..d58eac1a8288 100644
--- a/arch/parisc/kernel/unwind.c
+++ b/arch/parisc/kernel/unwind.c
@@ -13,6 +13,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/kallsyms.h>
+#include <linux/sort.h>
 
 #include <asm/uaccess.h>
 #include <asm/assembly.h>
@@ -115,24 +116,18 @@ unwind_table_init(struct unwind_table *table, const char *name,
         }
 }
 
+static int cmp_unwind_table_entry(const void *a, const void *b)
+{
+        return ((const struct unwind_table_entry *)a)->region_start
+             - ((const struct unwind_table_entry *)b)->region_start;
+}
+
 static void
 unwind_table_sort(struct unwind_table_entry *start,
                   struct unwind_table_entry *finish)
 {
-        struct unwind_table_entry el, *p, *q;
-
-        for (p = start + 1; p < finish; ++p) {
-                if (p[0].region_start < p[-1].region_start) {
-                        el = *p;
-                        q = p;
-                        do {
-                                q[0] = q[-1];
-                                --q;
-                        } while (q > start && 
-                                 el.region_start < q[-1].region_start);
-                        *q = el;
-                }
-        }
+        sort(start, finish - start, sizeof(struct unwind_table_entry),
+             cmp_unwind_table_entry, NULL);
 }
 
 struct unwind_table *
@@ -417,3 +412,30 @@ int unwind_to_user(struct unwind_frame_info *info)
 
         return ret;
 }
+
+unsigned long return_address(unsigned int level)
+{
+        struct unwind_frame_info info;
+        struct pt_regs r;
+        unsigned long sp;
+
+        /* initialize unwind info */
+        asm volatile ("copy %%r30, %0" : "=r"(sp));
+        memset(&r, 0, sizeof(struct pt_regs));
+        r.iaoq[0] = (unsigned long) current_text_addr();
+        r.gr[2] = (unsigned long) __builtin_return_address(0);
+        r.gr[30] = sp;
+        unwind_frame_init(&info, current, &r);
+
+        /* unwind stack */
+        ++level;
+        do {
+                if (unwind_once(&info) < 0 || info.ip == 0)
+                        return 0;
+                if (!__kernel_text_address(info.ip)) {
+                        return 0;
+                }
+        } while (info.ip && level--);
+
+        return info.ip;
+}
diff --git a/arch/parisc/lib/bitops.c b/arch/parisc/lib/bitops.c
index e3eb739fab19..353963d42059 100644
--- a/arch/parisc/lib/bitops.c
+++ b/arch/parisc/lib/bitops.c
@@ -12,8 +12,8 @@
 #include <asm/atomic.h>
 
 #ifdef CONFIG_SMP
-raw_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned = {
-        [0 ... (ATOMIC_HASH_SIZE-1)]  = __RAW_SPIN_LOCK_UNLOCKED
+arch_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned = {
+        [0 ... (ATOMIC_HASH_SIZE-1)]  = __ARCH_SPIN_LOCK_UNLOCKED
 };
 #endif
 
diff --git a/arch/powerpc/include/asm/async_tx.h b/arch/powerpc/include/asm/async_tx.h
new file mode 100644
index 000000000000..8b2dc55d01ab
--- /dev/null
+++ b/arch/powerpc/include/asm/async_tx.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2008-2009 DENX Software Engineering.
+ *
+ * Author: Yuri Tikhonov <yur@emcraft.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called COPYING.
+ */
+#ifndef _ASM_POWERPC_ASYNC_TX_H_
+#define _ASM_POWERPC_ASYNC_TX_H_
+
+#if defined(CONFIG_440SPe) || defined(CONFIG_440SP)
+extern struct dma_chan *
+ppc440spe_async_tx_find_best_channel(enum dma_transaction_type cap,
+        struct page **dst_lst, int dst_cnt, struct page **src_lst,
+        int src_cnt, size_t src_sz);
+
+#define async_tx_find_channel(dep, cap, dst_lst, dst_cnt, src_lst, \
+                              src_cnt, src_sz) \
+        ppc440spe_async_tx_find_best_channel(cap, dst_lst, dst_cnt, src_lst, \
+                                             src_cnt, src_sz)
+#else
+
+#define async_tx_find_channel(dep, type, dst, dst_count, src, src_count, len) \
+        __async_tx_find_channel(dep, type)
+
+struct dma_chan *
+__async_tx_find_channel(struct async_submit_ctl *submit,
+                        enum dma_transaction_type tx_type);
+
+#endif
+
+#endif
diff --git a/arch/powerpc/include/asm/dcr-regs.h b/arch/powerpc/include/asm/dcr-regs.h
index 828e3aa1f2fc..380274de429f 100644
--- a/arch/powerpc/include/asm/dcr-regs.h
+++ b/arch/powerpc/include/asm/dcr-regs.h
@@ -157,4 +157,27 @@
 #define  L2C_SNP_SSR_32G        0x0000f000
 #define  L2C_SNP_ESR            0x00000800
 
+/*
+ * DCR register offsets for 440SP/440SPe I2O/DMA controller.
+ * The base address is configured in the device tree.
+ */
+#define DCRN_I2O0_IBAL          0x006
+#define DCRN_I2O0_IBAH          0x007
+#define I2O_REG_ENABLE          0x00000001      /* Enable I2O/DMA access */
+
+/* 440SP/440SPe Software Reset DCR */
+#define DCRN_SDR0_SRST          0x0200
+#define DCRN_SDR0_SRST_I2ODMA   (0x80000000 >> 15)      /* Reset I2O/DMA */
+
+/* 440SP/440SPe Memory Queue DCR offsets */
+#define DCRN_MQ0_XORBA          0x04
+#define DCRN_MQ0_CF2H           0x06
+#define DCRN_MQ0_CFBHL          0x0f
+#define DCRN_MQ0_BAUH           0x10
+
+/* HB/LL Paths Configuration Register */
+#define MQ0_CFBHL_TPLM          28
+#define MQ0_CFBHL_HBCL          23
+#define MQ0_CFBHL_POLY          15
+
 #endif /* __DCR_REGS_H__ */
diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h
index e281daebddca..80a973bb9e71 100644
--- a/arch/powerpc/include/asm/dma-mapping.h
+++ b/arch/powerpc/include/asm/dma-mapping.h
@@ -197,7 +197,7 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
         if (!dev->dma_mask)
                 return 0;
 
-        return addr + size <= *dev->dma_mask;
+        return addr + size - 1 <= *dev->dma_mask;
 }
 
 static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
index 014a624f4c8e..17828ad411eb 100644
--- a/arch/powerpc/include/asm/elf.h
+++ b/arch/powerpc/include/asm/elf.h
@@ -170,7 +170,6 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
 #define elf_check_arch(x) ((x)->e_machine == ELF_ARCH)
 #define compat_elf_check_arch(x)        ((x)->e_machine == EM_PPC)
 
-#define USE_ELF_CORE_DUMP
 #define CORE_DUMP_USE_REGSET
 #define ELF_EXEC_PAGESIZE       PAGE_SIZE
 
diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index 8c341490cfc5..cbd759e3cd78 100644
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -140,6 +140,8 @@ extern void user_enable_single_step(struct task_struct *);
 extern void user_enable_block_step(struct task_struct *);
 extern void user_disable_single_step(struct task_struct *);
 
+#define ARCH_HAS_USER_SINGLE_STEP_INFO
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index 168fce726201..20de73c36682 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -58,7 +58,7 @@ struct rtas_t {
         unsigned long entry;            /* physical address pointer */
         unsigned long base;             /* physical address pointer */
         unsigned long size;
-        raw_spinlock_t lock;
+        arch_spinlock_t lock;
         struct rtas_args args;
         struct device_node *dev;        /* virtual address pointer */
 };
diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
index 198266cf9e2d..764094cff681 100644
--- a/arch/powerpc/include/asm/spinlock.h
+++ b/arch/powerpc/include/asm/spinlock.h
@@ -28,7 +28,7 @@
 #include <asm/asm-compat.h>
 #include <asm/synch.h>
 
-#define __raw_spin_is_locked(x)         ((x)->slock != 0)
+#define arch_spin_is_locked(x)          ((x)->slock != 0)
 
 #ifdef CONFIG_PPC64
 /* use 0x800000yy when locked, where yy == CPU number */
@@ -54,7 +54,7 @@
  * This returns the old value in the lock, so we succeeded
  * in getting the lock if the return value is 0.
  */
-static inline unsigned long arch_spin_trylock(raw_spinlock_t *lock)
+static inline unsigned long __arch_spin_trylock(arch_spinlock_t *lock)
 {
         unsigned long tmp, token;
 
@@ -73,10 +73,10 @@ static inline unsigned long arch_spin_trylock(raw_spinlock_t *lock)
         return tmp;
 }
 
-static inline int __raw_spin_trylock(raw_spinlock_t *lock)
+static inline int arch_spin_trylock(arch_spinlock_t *lock)
 {
         CLEAR_IO_SYNC;
-        return arch_spin_trylock(lock) == 0;
+        return __arch_spin_trylock(lock) == 0;
 }
 
 /*
@@ -96,19 +96,19 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock)
 #if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES)
 /* We only yield to the hypervisor if we are in shared processor mode */
 #define SHARED_PROCESSOR (get_lppaca()->shared_proc)
-extern void __spin_yield(raw_spinlock_t *lock);
-extern void __rw_yield(raw_rwlock_t *lock);
+extern void __spin_yield(arch_spinlock_t *lock);
+extern void __rw_yield(arch_rwlock_t *lock);
 #else /* SPLPAR || ISERIES */
 #define __spin_yield(x) barrier()
 #define __rw_yield(x)   barrier()
 #define SHARED_PROCESSOR        0
 #endif
 
-static inline void __raw_spin_lock(raw_spinlock_t *lock)
+static inline void arch_spin_lock(arch_spinlock_t *lock)
 {
         CLEAR_IO_SYNC;
         while (1) {
-                if (likely(arch_spin_trylock(lock) == 0))
+                if (likely(__arch_spin_trylock(lock) == 0))
                         break;
                 do {
                         HMT_low();
@@ -120,13 +120,13 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
 }
 
 static inline
-void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
+void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
 {
         unsigned long flags_dis;
 
         CLEAR_IO_SYNC;
         while (1) {
-                if (likely(arch_spin_trylock(lock) == 0))
+                if (likely(__arch_spin_trylock(lock) == 0))
                         break;
                 local_save_flags(flags_dis);
                 local_irq_restore(flags);
@@ -140,19 +140,19 @@ void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
         }
 }
 
-static inline void __raw_spin_unlock(raw_spinlock_t *lock)
+static inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
         SYNC_IO;
-        __asm__ __volatile__("# __raw_spin_unlock\n\t"
+        __asm__ __volatile__("# arch_spin_unlock\n\t"
                                 LWSYNC_ON_SMP: : :"memory");
         lock->slock = 0;
 }
 
 #ifdef CONFIG_PPC64
-extern void __raw_spin_unlock_wait(raw_spinlock_t *lock);
+extern void arch_spin_unlock_wait(arch_spinlock_t *lock);
 #else
-#define __raw_spin_unlock_wait(lock) \
-        do { while (__raw_spin_is_locked(lock)) cpu_relax(); } while (0)
+#define arch_spin_unlock_wait(lock) \
+        do { while (arch_spin_is_locked(lock)) cpu_relax(); } while (0)
 #endif
 
 /*
@@ -166,8 +166,8 @@ extern void __raw_spin_unlock_wait(raw_spinlock_t *lock);
  * read-locks.
  */
 
-#define __raw_read_can_lock(rw)         ((rw)->lock >= 0)
-#define __raw_write_can_lock(rw)        (!(rw)->lock)
+#define arch_read_can_lock(rw)          ((rw)->lock >= 0)
+#define arch_write_can_lock(rw) (!(rw)->lock)
 
 #ifdef CONFIG_PPC64
 #define __DO_SIGN_EXTEND        "extsw  %0,%0\n"
@@ -181,7 +181,7 @@ extern void __raw_spin_unlock_wait(raw_spinlock_t *lock);
  * This returns the old value in the lock + 1,
  * so we got a read lock if the return value is > 0.
  */
-static inline long arch_read_trylock(raw_rwlock_t *rw)
+static inline long __arch_read_trylock(arch_rwlock_t *rw)
 {
         long tmp;
 
@@ -205,7 +205,7 @@ static inline long arch_read_trylock(raw_rwlock_t *rw)
  * This returns the old value in the lock,
  * so we got the write lock if the return value is 0.
  */
-static inline long arch_write_trylock(raw_rwlock_t *rw)
+static inline long __arch_write_trylock(arch_rwlock_t *rw)
 {
         long tmp, token;
 
@@ -225,10 +225,10 @@ static inline long arch_write_trylock(raw_rwlock_t *rw)
         return tmp;
 }
 
-static inline void __raw_read_lock(raw_rwlock_t *rw)
+static inline void arch_read_lock(arch_rwlock_t *rw)
 {
         while (1) {
-                if (likely(arch_read_trylock(rw) > 0))
+                if (likely(__arch_read_trylock(rw) > 0))
                         break;
                 do {
                         HMT_low();
@@ -239,10 +239,10 @@ static inline void __raw_read_lock(raw_rwlock_t *rw)
         }
 }
 
-static inline void __raw_write_lock(raw_rwlock_t *rw)
+static inline void arch_write_lock(arch_rwlock_t *rw)
 {
         while (1) {
-                if (likely(arch_write_trylock(rw) == 0))
+                if (likely(__arch_write_trylock(rw) == 0))
                         break;
                 do {
                         HMT_low();
@@ -253,17 +253,17 @@ static inline void __raw_write_lock(raw_rwlock_t *rw)
         }
 }
 
-static inline int __raw_read_trylock(raw_rwlock_t *rw)
+static inline int arch_read_trylock(arch_rwlock_t *rw)
 {
-        return arch_read_trylock(rw) > 0;
+        return __arch_read_trylock(rw) > 0;
 }
 
-static inline int __raw_write_trylock(raw_rwlock_t *rw)
+static inline int arch_write_trylock(arch_rwlock_t *rw)
 {
-        return arch_write_trylock(rw) == 0;
+        return __arch_write_trylock(rw) == 0;
 }
 
-static inline void __raw_read_unlock(raw_rwlock_t *rw)
+static inline void arch_read_unlock(arch_rwlock_t *rw)
 {
         long tmp;
 
@@ -280,19 +280,19 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw)
         : "cr0", "xer", "memory");
 }
 
-static inline void __raw_write_unlock(raw_rwlock_t *rw)
+static inline void arch_write_unlock(arch_rwlock_t *rw)
 {
         __asm__ __volatile__("# write_unlock\n\t"
                                 LWSYNC_ON_SMP: : :"memory");
         rw->lock = 0;
 }
 
-#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
-#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+#define arch_read_lock_flags(lock, flags) arch_read_lock(lock)
+#define arch_write_lock_flags(lock, flags) arch_write_lock(lock)
 
-#define _raw_spin_relax(lock)   __spin_yield(lock)
-#define _raw_read_relax(lock)   __rw_yield(lock)
-#define _raw_write_relax(lock)  __rw_yield(lock)
+#define arch_spin_relax(lock)   __spin_yield(lock)
+#define arch_read_relax(lock)   __rw_yield(lock)
+#define arch_write_relax(lock)  __rw_yield(lock)
 
 #endif /* __KERNEL__ */
 #endif /* __ASM_SPINLOCK_H */
diff --git a/arch/powerpc/include/asm/spinlock_types.h b/arch/powerpc/include/asm/spinlock_types.h
index 74236c9f05b1..2351adc4fdc4 100644
--- a/arch/powerpc/include/asm/spinlock_types.h
+++ b/arch/powerpc/include/asm/spinlock_types.h
@@ -7,14 +7,14 @@
 
 typedef struct {
         volatile unsigned int slock;
-} raw_spinlock_t;
+} arch_spinlock_t;
 
-#define __RAW_SPIN_LOCK_UNLOCKED        { 0 }
+#define __ARCH_SPIN_LOCK_UNLOCKED       { 0 }
 
 typedef struct {
         volatile signed int lock;
-} raw_rwlock_t;
+} arch_rwlock_t;
 
-#define __RAW_RW_LOCK_UNLOCKED          { 0 }
+#define __ARCH_RW_LOCK_UNLOCKED         { 0 }
 
 #endif
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index fd51578e29dd..5547ae6e6b0b 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -30,7 +30,7 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/dma-mapping.h>
-#include <linux/bitops.h>
+#include <linux/bitmap.h>
 #include <linux/iommu-helper.h>
 #include <linux/crash_dump.h>
 #include <asm/io.h>
@@ -251,7 +251,7 @@ static void __iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr,
         }
 
         ppc_md.tce_free(tbl, entry, npages);
-        iommu_area_free(tbl->it_map, free_entry, npages);
+        bitmap_clear(tbl->it_map, free_entry, npages);
 }
 
 static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr,
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index f6dca4f4b295..9040330b0530 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -210,7 +210,7 @@ int show_interrupts(struct seq_file *p, void *v)
         if (!desc)
                 return 0;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
 
         action = desc->action;
         if (!action || !action->handler)
@@ -237,7 +237,7 @@ int show_interrupts(struct seq_file *p, void *v)
         seq_putc(p, '\n');
 
 skip:
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 
         return 0;
 }
@@ -1112,7 +1112,7 @@ static int virq_debug_show(struct seq_file *m, void *private)
                 if (!desc)
                         continue;
 
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
 
                 if (desc->action && desc->action->handler) {
                         seq_printf(m, "%5d  ", i);
@@ -1131,7 +1131,7 @@ static int virq_debug_show(struct seq_file *m, void *private)
                         seq_printf(m, "%s\n", p);
                 }
 
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 
         return 0;
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index bf90361bb70f..fd0d29493fd6 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -42,7 +42,7 @@
 #include <asm/mmu.h>
 
 struct rtas_t rtas = {
-        .lock = __RAW_SPIN_LOCK_UNLOCKED
+        .lock = __ARCH_SPIN_LOCK_UNLOCKED
 };
 EXPORT_SYMBOL(rtas);
 
@@ -80,13 +80,13 @@ static unsigned long lock_rtas(void)
 
         local_irq_save(flags);
         preempt_disable();
-        __raw_spin_lock_flags(&rtas.lock, flags);
+        arch_spin_lock_flags(&rtas.lock, flags);
         return flags;
 }
 
 static void unlock_rtas(unsigned long flags)
 {
-        __raw_spin_unlock(&rtas.lock);
+        arch_spin_unlock(&rtas.lock);
         local_irq_restore(flags);
         preempt_enable();
 }
@@ -978,7 +978,7 @@ int __init early_init_dt_scan_rtas(unsigned long node,
         return 1;
 }
 
-static raw_spinlock_t timebase_lock;
+static arch_spinlock_t timebase_lock;
 static u64 timebase = 0;
 
 void __cpuinit rtas_give_timebase(void)
@@ -987,10 +987,10 @@ void __cpuinit rtas_give_timebase(void)
 
         local_irq_save(flags);
         hard_irq_disable();
-        __raw_spin_lock(&timebase_lock);
+        arch_spin_lock(&timebase_lock);
         rtas_call(rtas_token("freeze-time-base"), 0, 1, NULL);
         timebase = get_tb();
-        __raw_spin_unlock(&timebase_lock);
+        arch_spin_unlock(&timebase_lock);
 
         while (timebase)
                 barrier();
@@ -1002,8 +1002,8 @@ void __cpuinit rtas_take_timebase(void)
 {
         while (!timebase)
                 barrier();
-        __raw_spin_lock(&timebase_lock);
+        arch_spin_lock(&timebase_lock);
         set_tb(timebase >> 32, timebase & 0xffffffff);
         timebase = 0;
-        __raw_spin_unlock(&timebase_lock);
+        arch_spin_unlock(&timebase_lock);
 }
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 804f0f30f227..d069ff8a7e03 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -174,6 +174,15 @@ int die(const char *str, struct pt_regs *regs, long err)
         return 0;
 }
 
+void user_single_step_siginfo(struct task_struct *tsk,
+                                struct pt_regs *regs, siginfo_t *info)
+{
+        memset(info, 0, sizeof(*info));
+        info->si_signo = SIGTRAP;
+        info->si_code = TRAP_TRACE;
+        info->si_addr = (void __user *)regs->nip;
+}
+
 void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
 {
         siginfo_t info;
diff --git a/arch/powerpc/lib/locks.c b/arch/powerpc/lib/locks.c
index 79d0fa3a470d..58e14fba11b1 100644
--- a/arch/powerpc/lib/locks.c
+++ b/arch/powerpc/lib/locks.c
@@ -25,7 +25,7 @@
 #include <asm/smp.h>
 #include <asm/firmware.h>
 
-void __spin_yield(raw_spinlock_t *lock)
+void __spin_yield(arch_spinlock_t *lock)
 {
         unsigned int lock_value, holder_cpu, yield_count;
 
@@ -55,7 +55,7 @@ void __spin_yield(raw_spinlock_t *lock)
  * This turns out to be the same for read and write locks, since
  * we only know the holder if it is write-locked.
  */
-void __rw_yield(raw_rwlock_t *rw)
+void __rw_yield(arch_rwlock_t *rw)
 {
         int lock_value;
         unsigned int holder_cpu, yield_count;
@@ -82,7 +82,7 @@ void __rw_yield(raw_rwlock_t *rw)
 }
 #endif
 
-void __raw_spin_unlock_wait(raw_spinlock_t *lock)
+void arch_spin_unlock_wait(arch_spinlock_t *lock)
 {
         while (lock->slock) {
                 HMT_low();
@@ -92,4 +92,4 @@ void __raw_spin_unlock_wait(raw_spinlock_t *lock)
         HMT_medium();
 }
 
-EXPORT_SYMBOL(__raw_spin_unlock_wait);
+EXPORT_SYMBOL(arch_spin_unlock_wait);
diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
index cc0c854291d7..0bac3a3dbecf 100644
--- a/arch/powerpc/platforms/52xx/media5200.c
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -86,9 +86,9 @@ void media5200_irq_cascade(unsigned int virq, struct irq_desc *desc)
         u32 status, enable;
 
         /* Mask off the cascaded IRQ */
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
         desc->chip->mask(virq);
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 
         /* Ask the FPGA for IRQ status.  If 'val' is 0, then no irqs
          * are pending.  'ffs()' is 1 based */
@@ -104,11 +104,11 @@ void media5200_irq_cascade(unsigned int virq, struct irq_desc *desc)
         }
 
         /* Processing done; can reenable the cascade now */
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
         desc->chip->ack(virq);
         if (!(desc->status & IRQ_DISABLED))
                 desc->chip->unmask(virq);
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 }
 
 static int media5200_irq_map(struct irq_host *h, unsigned int virq,
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 7267effc8078..6829cf7e2bda 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -237,7 +237,7 @@ extern int noirqdebug;
 
 static void handle_iic_irq(unsigned int irq, struct irq_desc *desc)
 {
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
 
         desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
 
@@ -265,18 +265,18 @@ static void handle_iic_irq(unsigned int irq, struct irq_desc *desc)
                         goto out_eoi;
 
                 desc->status &= ~IRQ_PENDING;
-                spin_unlock(&desc->lock);
+                raw_spin_unlock(&desc->lock);
                 action_ret = handle_IRQ_event(irq, action);
                 if (!noirqdebug)
                         note_interrupt(irq, desc, action_ret);
-                spin_lock(&desc->lock);
+                raw_spin_lock(&desc->lock);
 
         } while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);
 
         desc->status &= ~IRQ_INPROGRESS;
 out_eoi:
         desc->chip->eoi(irq);
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 }
 
 static int iic_host_map(struct irq_host *h, unsigned int virq,
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index 07762259c60a..86c4b29eea89 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -217,9 +217,9 @@ void __init iSeries_activate_IRQs()
                 struct irq_desc *desc = irq_to_desc(irq);
 
                 if (desc && desc->chip && desc->chip->startup) {
-                        spin_lock_irqsave(&desc->lock, flags);
+                        raw_spin_lock_irqsave(&desc->lock, flags);
                         desc->chip->startup(irq);
-                        spin_unlock_irqrestore(&desc->lock, flags);
+                        raw_spin_unlock_irqrestore(&desc->lock, flags);
                 }
         }
 }
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index a4619347aa7e..242f8095c2df 100644
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -71,7 +71,7 @@ static void pas_restart(char *cmd)
 }
 
 #ifdef CONFIG_SMP
-static raw_spinlock_t timebase_lock;
+static arch_spinlock_t timebase_lock;
 static unsigned long timebase;
 
 static void __devinit pas_give_timebase(void)
@@ -80,11 +80,11 @@ static void __devinit pas_give_timebase(void)
 
         local_irq_save(flags);
         hard_irq_disable();
-        __raw_spin_lock(&timebase_lock);
+        arch_spin_lock(&timebase_lock);
         mtspr(SPRN_TBCTL, TBCTL_FREEZE);
         isync();
         timebase = get_tb();
-        __raw_spin_unlock(&timebase_lock);
+        arch_spin_unlock(&timebase_lock);
 
         while (timebase)
                 barrier();
@@ -97,10 +97,10 @@ static void __devinit pas_take_timebase(void)
         while (!timebase)
                 smp_rmb();
 
-        __raw_spin_lock(&timebase_lock);
+        arch_spin_lock(&timebase_lock);
         set_tb(timebase >> 32, timebase & 0xffffffff);
         timebase = 0;
-        __raw_spin_unlock(&timebase_lock);
+        arch_spin_unlock(&timebase_lock);
 }
 
 struct smp_ops_t pas_smp_ops = {
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index 7d01b58f3989..b9b9e11609ec 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -906,7 +906,7 @@ void xics_migrate_irqs_away(void)
                     || desc->chip->set_affinity == NULL)
                         continue;
 
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
 
                 status = rtas_call(ibm_get_xive, 1, 3, xics_status, irq);
                 if (status) {
@@ -930,7 +930,7 @@ void xics_migrate_irqs_away(void)
                 cpumask_setall(irq_to_desc(virq)->affinity);
                 desc->chip->set_affinity(virq, cpu_all_mask);
 unlock:
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 #endif
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 62e50258cdef..c6e11b077108 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -173,7 +173,7 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
         u32 intr_index;
         u32 have_shift = 0;
 
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
         if ((msi_data->feature &  FSL_PIC_IP_MASK) == FSL_PIC_IP_IPIC) {
                 if (desc->chip->mask_ack)
                         desc->chip->mask_ack(irq);
@@ -225,7 +225,7 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
                 break;
         }
 unlock:
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 }
 
 static int __devinit fsl_of_msi_probe(struct of_device *dev,
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
index 7d10074b3304..6f220a913e42 100644
--- a/arch/powerpc/sysdev/uic.c
+++ b/arch/powerpc/sysdev/uic.c
@@ -225,12 +225,12 @@ void uic_irq_cascade(unsigned int virq, struct irq_desc *desc)
         int src;
         int subvirq;
 
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
         if (desc->status & IRQ_LEVEL)
                 desc->chip->mask(virq);
         else
                 desc->chip->mask_ack(virq);
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 
         msr = mfdcr(uic->dcrbase + UIC_MSR);
         if (!msr) /* spurious interrupt */
@@ -242,12 +242,12 @@ void uic_irq_cascade(unsigned int virq, struct irq_desc *desc)
         generic_handle_irq(subvirq);
 
 uic_irq_ret:
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
         if (desc->status & IRQ_LEVEL)
                 desc->chip->ack(virq);
         if (!(desc->status & IRQ_DISABLED) && desc->chip->unmask)
                 desc->chip->unmask(virq);
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 }
 
 static struct uic * __init uic_init_one(struct device_node *node)
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 495589950dc7..5c91995b74e4 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -551,7 +551,7 @@ static int appldata_thaw(struct device *dev)
         return appldata_restore(dev);
 }
 
-static struct dev_pm_ops appldata_pm_ops = {
+static const struct dev_pm_ops appldata_pm_ops = {
         .freeze         = appldata_freeze,
         .thaw           = appldata_thaw,
         .restore        = appldata_restore,
diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
index e885442c1dfe..354d42616c7e 100644
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
@@ -155,7 +155,6 @@ extern unsigned int vdso_enabled;
         } while (0)
 
 #define CORE_DUMP_USE_REGSET
-#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
diff --git a/arch/s390/include/asm/spinlock.h b/arch/s390/include/asm/spinlock.h
index c9af0d19c7ab..a587907d77f3 100644
--- a/arch/s390/include/asm/spinlock.h
+++ b/arch/s390/include/asm/spinlock.h
@@ -52,27 +52,27 @@ _raw_compare_and_swap(volatile unsigned int *lock,
  * (the type definitions are in asm/spinlock_types.h)
  */
 
-#define __raw_spin_is_locked(x) ((x)->owner_cpu != 0)
-#define __raw_spin_unlock_wait(lock) \
-        do { while (__raw_spin_is_locked(lock)) \
-                 _raw_spin_relax(lock); } while (0)
+#define arch_spin_is_locked(x) ((x)->owner_cpu != 0)
+#define arch_spin_unlock_wait(lock) \
+        do { while (arch_spin_is_locked(lock)) \
+                 arch_spin_relax(lock); } while (0)
 
-extern void _raw_spin_lock_wait(raw_spinlock_t *);
-extern void _raw_spin_lock_wait_flags(raw_spinlock_t *, unsigned long flags);
-extern int _raw_spin_trylock_retry(raw_spinlock_t *);
-extern void _raw_spin_relax(raw_spinlock_t *lock);
+extern void arch_spin_lock_wait(arch_spinlock_t *);
+extern void arch_spin_lock_wait_flags(arch_spinlock_t *, unsigned long flags);
+extern int arch_spin_trylock_retry(arch_spinlock_t *);
+extern void arch_spin_relax(arch_spinlock_t *lock);
 
-static inline void __raw_spin_lock(raw_spinlock_t *lp)
+static inline void arch_spin_lock(arch_spinlock_t *lp)
 {
         int old;
 
         old = _raw_compare_and_swap(&lp->owner_cpu, 0, ~smp_processor_id());
         if (likely(old == 0))
                 return;
-        _raw_spin_lock_wait(lp);
+        arch_spin_lock_wait(lp);
 }
 
-static inline void __raw_spin_lock_flags(raw_spinlock_t *lp,
+static inline void arch_spin_lock_flags(arch_spinlock_t *lp,
                                          unsigned long flags)
 {
         int old;
@@ -80,20 +80,20 @@ static inline void __raw_spin_lock_flags(raw_spinlock_t *lp,
         old = _raw_compare_and_swap(&lp->owner_cpu, 0, ~smp_processor_id());
         if (likely(old == 0))
                 return;
-        _raw_spin_lock_wait_flags(lp, flags);
+        arch_spin_lock_wait_flags(lp, flags);
 }
 
-static inline int __raw_spin_trylock(raw_spinlock_t *lp)
+static inline int arch_spin_trylock(arch_spinlock_t *lp)
 {
         int old;
 
         old = _raw_compare_and_swap(&lp->owner_cpu, 0, ~smp_processor_id());
         if (likely(old == 0))
                 return 1;
-        return _raw_spin_trylock_retry(lp);
+        return arch_spin_trylock_retry(lp);
 }
 
-static inline void __raw_spin_unlock(raw_spinlock_t *lp)
+static inline void arch_spin_unlock(arch_spinlock_t *lp)
 {
         _raw_compare_and_swap(&lp->owner_cpu, lp->owner_cpu, 0);
 }
@@ -113,22 +113,22 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lp)
  * read_can_lock - would read_trylock() succeed?
  * @lock: the rwlock in question.
  */
-#define __raw_read_can_lock(x) ((int)(x)->lock >= 0)
+#define arch_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 == 0)
+#define arch_write_can_lock(x) ((x)->lock == 0)
 
-extern void _raw_read_lock_wait(raw_rwlock_t *lp);
-extern void _raw_read_lock_wait_flags(raw_rwlock_t *lp, unsigned long flags);
-extern int _raw_read_trylock_retry(raw_rwlock_t *lp);
-extern void _raw_write_lock_wait(raw_rwlock_t *lp);
-extern void _raw_write_lock_wait_flags(raw_rwlock_t *lp, unsigned long flags);
-extern int _raw_write_trylock_retry(raw_rwlock_t *lp);
+extern void _raw_read_lock_wait(arch_rwlock_t *lp);
+extern void _raw_read_lock_wait_flags(arch_rwlock_t *lp, unsigned long flags);
+extern int _raw_read_trylock_retry(arch_rwlock_t *lp);
+extern void _raw_write_lock_wait(arch_rwlock_t *lp);
+extern void _raw_write_lock_wait_flags(arch_rwlock_t *lp, unsigned long flags);
+extern int _raw_write_trylock_retry(arch_rwlock_t *lp);
 
-static inline void __raw_read_lock(raw_rwlock_t *rw)
+static inline void arch_read_lock(arch_rwlock_t *rw)
 {
         unsigned int old;
         old = rw->lock & 0x7fffffffU;
@@ -136,7 +136,7 @@ static inline void __raw_read_lock(raw_rwlock_t *rw)
                 _raw_read_lock_wait(rw);
 }
 
-static inline void __raw_read_lock_flags(raw_rwlock_t *rw, unsigned long flags)
+static inline void arch_read_lock_flags(arch_rwlock_t *rw, unsigned long flags)
 {
         unsigned int old;
         old = rw->lock & 0x7fffffffU;
@@ -144,7 +144,7 @@ static inline void __raw_read_lock_flags(raw_rwlock_t *rw, unsigned long flags)
                 _raw_read_lock_wait_flags(rw, flags);
 }
 
-static inline void __raw_read_unlock(raw_rwlock_t *rw)
+static inline void arch_read_unlock(arch_rwlock_t *rw)
 {
         unsigned int old, cmp;
 
@@ -155,24 +155,24 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw)
         } while (cmp != old);
 }
 
-static inline void __raw_write_lock(raw_rwlock_t *rw)
+static inline void arch_write_lock(arch_rwlock_t *rw)
 {
         if (unlikely(_raw_compare_and_swap(&rw->lock, 0, 0x80000000) != 0))
                 _raw_write_lock_wait(rw);
 }
 
-static inline void __raw_write_lock_flags(raw_rwlock_t *rw, unsigned long flags)
+static inline void arch_write_lock_flags(arch_rwlock_t *rw, unsigned long flags)
 {
         if (unlikely(_raw_compare_and_swap(&rw->lock, 0, 0x80000000) != 0))
                 _raw_write_lock_wait_flags(rw, flags);
 }
 
-static inline void __raw_write_unlock(raw_rwlock_t *rw)
+static inline void arch_write_unlock(arch_rwlock_t *rw)
 {
         _raw_compare_and_swap(&rw->lock, 0x80000000, 0);
 }
 
-static inline int __raw_read_trylock(raw_rwlock_t *rw)
+static inline int arch_read_trylock(arch_rwlock_t *rw)
 {
         unsigned int old;
         old = rw->lock & 0x7fffffffU;
@@ -181,14 +181,14 @@ static inline int __raw_read_trylock(raw_rwlock_t *rw)
         return _raw_read_trylock_retry(rw);
 }
 
-static inline int __raw_write_trylock(raw_rwlock_t *rw)
+static inline int arch_write_trylock(arch_rwlock_t *rw)
 {
         if (likely(_raw_compare_and_swap(&rw->lock, 0, 0x80000000) == 0))
                 return 1;
         return _raw_write_trylock_retry(rw);
 }
 
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
+#define arch_read_relax(lock)   cpu_relax()
+#define arch_write_relax(lock)  cpu_relax()
 
 #endif /* __ASM_SPINLOCK_H */
diff --git a/arch/s390/include/asm/spinlock_types.h b/arch/s390/include/asm/spinlock_types.h
index 654abc40de04..9c76656a0af0 100644
--- a/arch/s390/include/asm/spinlock_types.h
+++ b/arch/s390/include/asm/spinlock_types.h
@@ -7,14 +7,14 @@
 
 typedef struct {
         volatile unsigned int owner_cpu;
-} __attribute__ ((aligned (4))) raw_spinlock_t;
+} __attribute__ ((aligned (4))) arch_spinlock_t;
 
-#define __RAW_SPIN_LOCK_UNLOCKED        { 0 }
+#define __ARCH_SPIN_LOCK_UNLOCKED       { 0 }
 
 typedef struct {
         volatile unsigned int lock;
-} raw_rwlock_t;
+} arch_rwlock_t;
 
-#define __RAW_RW_LOCK_UNLOCKED          { 0 }
+#define __ARCH_RW_LOCK_UNLOCKED         { 0 }
 
 #endif
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index 071c81f179ef..0168472b2fdf 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/sysctl.h>
 #include <asm/uaccess.h>
 #include <linux/module.h>
@@ -1178,7 +1179,7 @@ debug_get_uint(char *buf)
 {
         int rc;
 
-        for(; isspace(*buf); buf++);
+        buf = skip_spaces(buf);
         rc = simple_strtoul(buf, &buf, 10);
         if(*buf){
                 rc = -EINVAL;
diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c
index f7e0d30250b7..10754a375668 100644
--- a/arch/s390/lib/spinlock.c
+++ b/arch/s390/lib/spinlock.c
@@ -39,7 +39,7 @@ static inline void _raw_yield_cpu(int cpu)
                 _raw_yield();
 }
 
-void _raw_spin_lock_wait(raw_spinlock_t *lp)
+void arch_spin_lock_wait(arch_spinlock_t *lp)
 {
         int count = spin_retry;
         unsigned int cpu = ~smp_processor_id();
@@ -51,15 +51,15 @@ void _raw_spin_lock_wait(raw_spinlock_t *lp)
                                 _raw_yield_cpu(~owner);
                         count = spin_retry;
                 }
-                if (__raw_spin_is_locked(lp))
+                if (arch_spin_is_locked(lp))
                         continue;
                 if (_raw_compare_and_swap(&lp->owner_cpu, 0, cpu) == 0)
                         return;
         }
 }
-EXPORT_SYMBOL(_raw_spin_lock_wait);
+EXPORT_SYMBOL(arch_spin_lock_wait);
 
-void _raw_spin_lock_wait_flags(raw_spinlock_t *lp, unsigned long flags)
+void arch_spin_lock_wait_flags(arch_spinlock_t *lp, unsigned long flags)
 {
         int count = spin_retry;
         unsigned int cpu = ~smp_processor_id();
@@ -72,7 +72,7 @@ void _raw_spin_lock_wait_flags(raw_spinlock_t *lp, unsigned long flags)
                                 _raw_yield_cpu(~owner);
                         count = spin_retry;
                 }
-                if (__raw_spin_is_locked(lp))
+                if (arch_spin_is_locked(lp))
                         continue;
                 local_irq_disable();
                 if (_raw_compare_and_swap(&lp->owner_cpu, 0, cpu) == 0)
@@ -80,32 +80,32 @@ void _raw_spin_lock_wait_flags(raw_spinlock_t *lp, unsigned long flags)
                 local_irq_restore(flags);
         }
 }
-EXPORT_SYMBOL(_raw_spin_lock_wait_flags);
+EXPORT_SYMBOL(arch_spin_lock_wait_flags);
 
-int _raw_spin_trylock_retry(raw_spinlock_t *lp)
+int arch_spin_trylock_retry(arch_spinlock_t *lp)
 {
         unsigned int cpu = ~smp_processor_id();
         int count;
 
         for (count = spin_retry; count > 0; count--) {
-                if (__raw_spin_is_locked(lp))
+                if (arch_spin_is_locked(lp))
                         continue;
                 if (_raw_compare_and_swap(&lp->owner_cpu, 0, cpu) == 0)
                         return 1;
         }
         return 0;
 }
-EXPORT_SYMBOL(_raw_spin_trylock_retry);
+EXPORT_SYMBOL(arch_spin_trylock_retry);
 
-void _raw_spin_relax(raw_spinlock_t *lock)
+void arch_spin_relax(arch_spinlock_t *lock)
 {
         unsigned int cpu = lock->owner_cpu;
         if (cpu != 0)
                 _raw_yield_cpu(~cpu);
 }
-EXPORT_SYMBOL(_raw_spin_relax);
+EXPORT_SYMBOL(arch_spin_relax);
 
-void _raw_read_lock_wait(raw_rwlock_t *rw)
+void _raw_read_lock_wait(arch_rwlock_t *rw)
 {
         unsigned int old;
         int count = spin_retry;
@@ -115,7 +115,7 @@ void _raw_read_lock_wait(raw_rwlock_t *rw)
                         _raw_yield();
                         count = spin_retry;
                 }
-                if (!__raw_read_can_lock(rw))
+                if (!arch_read_can_lock(rw))
                         continue;
                 old = rw->lock & 0x7fffffffU;
                 if (_raw_compare_and_swap(&rw->lock, old, old + 1) == old)
@@ -124,7 +124,7 @@ void _raw_read_lock_wait(raw_rwlock_t *rw)
 }
 EXPORT_SYMBOL(_raw_read_lock_wait);
 
-void _raw_read_lock_wait_flags(raw_rwlock_t *rw, unsigned long flags)
+void _raw_read_lock_wait_flags(arch_rwlock_t *rw, unsigned long flags)
 {
         unsigned int old;
         int count = spin_retry;
@@ -135,7 +135,7 @@ void _raw_read_lock_wait_flags(raw_rwlock_t *rw, unsigned long flags)
                         _raw_yield();
                         count = spin_retry;
                 }
-                if (!__raw_read_can_lock(rw))
+                if (!arch_read_can_lock(rw))
                         continue;
                 old = rw->lock & 0x7fffffffU;
                 local_irq_disable();
@@ -145,13 +145,13 @@ void _raw_read_lock_wait_flags(raw_rwlock_t *rw, unsigned long flags)
 }
 EXPORT_SYMBOL(_raw_read_lock_wait_flags);
 
-int _raw_read_trylock_retry(raw_rwlock_t *rw)
+int _raw_read_trylock_retry(arch_rwlock_t *rw)
 {
         unsigned int old;
         int count = spin_retry;
 
         while (count-- > 0) {
-                if (!__raw_read_can_lock(rw))
+                if (!arch_read_can_lock(rw))
                         continue;
                 old = rw->lock & 0x7fffffffU;
                 if (_raw_compare_and_swap(&rw->lock, old, old + 1) == old)
@@ -161,7 +161,7 @@ int _raw_read_trylock_retry(raw_rwlock_t *rw)
 }
 EXPORT_SYMBOL(_raw_read_trylock_retry);
 
-void _raw_write_lock_wait(raw_rwlock_t *rw)
+void _raw_write_lock_wait(arch_rwlock_t *rw)
 {
         int count = spin_retry;
 
@@ -170,7 +170,7 @@ void _raw_write_lock_wait(raw_rwlock_t *rw)
                         _raw_yield();
                         count = spin_retry;
                 }
-                if (!__raw_write_can_lock(rw))
+                if (!arch_write_can_lock(rw))
                         continue;
                 if (_raw_compare_and_swap(&rw->lock, 0, 0x80000000) == 0)
                         return;
@@ -178,7 +178,7 @@ void _raw_write_lock_wait(raw_rwlock_t *rw)
 }
 EXPORT_SYMBOL(_raw_write_lock_wait);
 
-void _raw_write_lock_wait_flags(raw_rwlock_t *rw, unsigned long flags)
+void _raw_write_lock_wait_flags(arch_rwlock_t *rw, unsigned long flags)
 {
         int count = spin_retry;
 
@@ -188,7 +188,7 @@ void _raw_write_lock_wait_flags(raw_rwlock_t *rw, unsigned long flags)
                         _raw_yield();
                         count = spin_retry;
                 }
-                if (!__raw_write_can_lock(rw))
+                if (!arch_write_can_lock(rw))
                         continue;
                 local_irq_disable();
                 if (_raw_compare_and_swap(&rw->lock, 0, 0x80000000) == 0)
@@ -197,12 +197,12 @@ void _raw_write_lock_wait_flags(raw_rwlock_t *rw, unsigned long flags)
 }
 EXPORT_SYMBOL(_raw_write_lock_wait_flags);
 
-int _raw_write_trylock_retry(raw_rwlock_t *rw)
+int _raw_write_trylock_retry(arch_rwlock_t *rw)
 {
         int count = spin_retry;
 
         while (count-- > 0) {
-                if (!__raw_write_can_lock(rw))
+                if (!arch_write_can_lock(rw))
                         continue;
                 if (_raw_compare_and_swap(&rw->lock, 0, 0x80000000) == 0)
                         return 1;
diff --git a/arch/score/include/asm/elf.h b/arch/score/include/asm/elf.h
index 43526d9fda93..f478ce94181f 100644
--- a/arch/score/include/asm/elf.h
+++ b/arch/score/include/asm/elf.h
@@ -61,7 +61,6 @@ struct task_struct;
 struct pt_regs;
 
 #define CORE_DUMP_USE_REGSET
-#define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE       PAGE_SIZE
 
 /* This yields a mask that user programs can use to figure out what
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index 55907af1dc25..12fec72fec5f 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -19,50 +19,6 @@ config SH_STANDARD_BIOS
           mask ROM and no flash (WindowsCE machines fall in this category).
           If unsure, say N.
 
-config EARLY_SCIF_CONSOLE
-        bool "Use early SCIF console"
-        help
-          This enables an early console using a fixed SCIF port. This can
-          be used by platforms that are either not running the SH
-          standard BIOS, or do not wish to use the BIOS callbacks for the
-          serial I/O.
-
-config EARLY_SCIF_CONSOLE_PORT
-        hex
-        depends on EARLY_SCIF_CONSOLE
-        default "0xa4400000" if CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7705
-        default "0xa4430000" if CPU_SUBTYPE_SH7720 || CPU_SUBTYPE_SH7721
-        default "0xf8420000" if CPU_SUBTYPE_SH7619
-        default "0xff804000" if CPU_SUBTYPE_MXG
-        default "0xffc30000" if CPU_SUBTYPE_SHX3
-        default "0xffe00000" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7763 || \
-                                CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366 || \
-                                CPU_SUBTYPE_SH7343
-        default "0xfe4c0000" if CPU_SUBTYPE_SH7757
-        default "0xffeb0000" if CPU_SUBTYPE_SH7785
-        default "0xffeb0000" if CPU_SUBTYPE_SH7786
-        default "0xfffe8000" if CPU_SUBTYPE_SH7203
-        default "0xfffe9800" if CPU_SUBTYPE_SH7206 || CPU_SUBTYPE_SH7263
-        default "0xffe80000" if CPU_SH4
-        default "0xa4000150" if CPU_SH3
-        default "0x00000000"
-
-config EARLY_PRINTK
-        bool "Early printk support"
-        depends on SH_STANDARD_BIOS || EARLY_SCIF_CONSOLE
-        help
-          Say Y here to redirect kernel printk messages to the serial port
-          used by the SH-IPL bootloader, starting very early in the boot
-          process and ending when the kernel's serial console is initialised.
-          This option is only useful porting the kernel to a new machine,
-          when the kernel may crash or hang before the serial console is
-          initialised. If unsure, say N.
-
-          On devices that are running SH-IPL and want to keep the port
-          initialization consistent while not using the BIOS callbacks,
-          select both the EARLY_SCIF_CONSOLE and SH_STANDARD_BIOS, using
-          the kernel command line option to toggle back and forth.
-
 config STACK_DEBUG
         bool "Check for stack overflows"
         depends on DEBUG_KERNEL && SUPERH32
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index cf9dc12dfeb1..1f5fa5c44f6d 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -316,20 +316,24 @@ static struct soc_camera_platform_info camera_info = {
         .format_name = "UYVY",
         .format_depth = 16,
         .format = {
-                .pixelformat = V4L2_PIX_FMT_UYVY,
+                .code = V4L2_MBUS_FMT_YUYV8_2X8_BE,
                 .colorspace = V4L2_COLORSPACE_SMPTE170M,
+                .field = V4L2_FIELD_NONE,
                 .width = 640,
                 .height = 480,
         },
         .bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
-        SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
+        SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8 |
+        SOCAM_DATA_ACTIVE_HIGH,
         .set_capture = camera_set_capture,
-        .link = {
-                .bus_id         = 0,
-                .add_device     = ap325rxa_camera_add,
-                .del_device     = ap325rxa_camera_del,
-                .module_name    = "soc_camera_platform",
-        },
+};
+
+struct soc_camera_link camera_link = {
+        .bus_id         = 0,
+        .add_device     = ap325rxa_camera_add,
+        .del_device     = ap325rxa_camera_del,
+        .module_name    = "soc_camera_platform",
+        .priv           = &camera_info,
 };
 
 static void dummy_release(struct device *dev)
@@ -347,7 +351,7 @@ static struct platform_device camera_device = {
 static int ap325rxa_camera_add(struct soc_camera_link *icl,
                                struct device *dev)
 {
-        if (icl != &camera_info.link || camera_probe() <= 0)
+        if (icl != &camera_link || camera_probe() <= 0)
                 return -ENODEV;
 
         camera_info.dev = dev;
@@ -357,7 +361,7 @@ static int ap325rxa_camera_add(struct soc_camera_link *icl,
 
 static void ap325rxa_camera_del(struct soc_camera_link *icl)
 {
-        if (icl != &camera_info.link)
+        if (icl != &camera_link)
                 return;
 
         platform_device_unregister(&camera_device);
@@ -470,13 +474,15 @@ static struct ov772x_camera_info ov7725_info = {
         .buswidth       = SOCAM_DATAWIDTH_8,
         .flags          = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,
         .edgectrl       = OV772X_AUTO_EDGECTRL(0xf, 0),
-        .link = {
-                .bus_id         = 0,
-                .power          = ov7725_power,
-                .board_info     = &ap325rxa_i2c_camera[0],
-                .i2c_adapter_id = 0,
-                .module_name    = "ov772x",
-        },
+};
+
+static struct soc_camera_link ov7725_link = {
+        .bus_id         = 0,
+        .power          = ov7725_power,
+        .board_info     = &ap325rxa_i2c_camera[0],
+        .i2c_adapter_id = 0,
+        .module_name    = "ov772x",
+        .priv           = &ov7725_info,
 };
 
 static struct platform_device ap325rxa_camera[] = {
@@ -484,13 +490,13 @@ static struct platform_device ap325rxa_camera[] = {
                 .name   = "soc-camera-pdrv",
                 .id     = 0,
                 .dev    = {
-                        .platform_data = &ov7725_info.link,
+                        .platform_data = &ov7725_link,
                 },
         }, {
                 .name   = "soc-camera-pdrv",
                 .id     = 1,
                 .dev    = {
-                        .platform_data = &camera_info.link,
+                        .platform_data = &camera_link,
                 },
         },
 };
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 826e62326d51..194aaca22d47 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -19,11 +19,18 @@
 #include <linux/usb/r8a66597.h>
 #include <linux/i2c.h>
 #include <linux/i2c/tsc2007.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/sh_msiof.h>
+#include <linux/spi/mmc_spi.h>
+#include <linux/mmc/host.h>
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
 #include <linux/mfd/sh_mobile_sdhi.h>
 #include <video/sh_mobile_lcdc.h>
+#include <sound/sh_fsi.h>
 #include <media/sh_mobile_ceu.h>
+#include <media/tw9910.h>
+#include <media/mt9t112.h>
 #include <asm/heartbeat.h>
 #include <asm/sh_eth.h>
 #include <asm/clock.h>
@@ -338,6 +345,12 @@ static struct platform_device ceu1_device = {
 };
 
 /* I2C device */
+static struct i2c_board_info i2c0_devices[] = {
+        {
+                I2C_BOARD_INFO("da7210", 0x1a),
+        },
+};
+
 static struct i2c_board_info i2c1_devices[] = {
         {
                 I2C_BOARD_INFO("r2025sd", 0x32),
@@ -421,6 +434,7 @@ static struct i2c_board_info ts_i2c_clients = {
         .irq            = IRQ0,
 };
 
+#ifdef CONFIG_MFD_SH_MOBILE_SDHI
 /* SHDI0 */
 static void sdhi0_set_pwr(struct platform_device *pdev, int state)
 {
@@ -493,6 +507,248 @@ static struct platform_device sdhi1_device = {
         },
 };
 
+#else
+
+static int mmc_spi_get_ro(struct device *dev)
+{
+        return gpio_get_value(GPIO_PTY6);
+}
+
+static int mmc_spi_get_cd(struct device *dev)
+{
+        return !gpio_get_value(GPIO_PTY7);
+}
+
+static void mmc_spi_setpower(struct device *dev, unsigned int maskval)
+{
+        gpio_set_value(GPIO_PTB6, maskval ? 1 : 0);
+}
+
+static struct mmc_spi_platform_data mmc_spi_info = {
+        .get_ro = mmc_spi_get_ro,
+        .get_cd = mmc_spi_get_cd,
+        .caps = MMC_CAP_NEEDS_POLL,
+        .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, /* 3.3V only */
+        .setpower = mmc_spi_setpower,
+};
+
+static struct spi_board_info spi_bus[] = {
+        {
+                .modalias       = "mmc_spi",
+                .platform_data  = &mmc_spi_info,
+                .max_speed_hz   = 5000000,
+                .mode           = SPI_MODE_0,
+                .controller_data = (void *) GPIO_PTM4,
+        },
+};
+
+static struct sh_msiof_spi_info msiof0_data = {
+        .num_chipselect = 1,
+};
+
+static struct resource msiof0_resources[] = {
+        [0] = {
+                .name   = "MSIOF0",
+                .start  = 0xa4c40000,
+                .end    = 0xa4c40063,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 84,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device msiof0_device = {
+        .name           = "spi_sh_msiof",
+        .id             = 0, /* MSIOF0 */
+        .dev = {
+                .platform_data = &msiof0_data,
+        },
+        .num_resources  = ARRAY_SIZE(msiof0_resources),
+        .resource       = msiof0_resources,
+        .archdata = {
+                .hwblk_id = HWBLK_MSIOF0,
+        },
+};
+
+#endif
+
+/* I2C Video/Camera */
+static struct i2c_board_info i2c_camera[] = {
+        {
+                I2C_BOARD_INFO("tw9910", 0x45),
+        },
+        {
+                /* 1st camera */
+                I2C_BOARD_INFO("mt9t112", 0x3c),
+        },
+        {
+                /* 2nd camera */
+                I2C_BOARD_INFO("mt9t112", 0x3c),
+        },
+};
+
+/* tw9910 */
+static int tw9910_power(struct device *dev, int mode)
+{
+        int val = mode ? 0 : 1;
+
+        gpio_set_value(GPIO_PTU2, val);
+        if (mode)
+                mdelay(100);
+
+        return 0;
+}
+
+static struct tw9910_video_info tw9910_info = {
+        .buswidth       = SOCAM_DATAWIDTH_8,
+        .mpout          = TW9910_MPO_FIELD,
+};
+
+static struct soc_camera_link tw9910_link = {
+        .i2c_adapter_id = 0,
+        .bus_id         = 1,
+        .power          = tw9910_power,
+        .board_info     = &i2c_camera[0],
+        .module_name    = "tw9910",
+        .priv           = &tw9910_info,
+};
+
+/* mt9t112 */
+static int mt9t112_power1(struct device *dev, int mode)
+{
+        gpio_set_value(GPIO_PTA3, mode);
+        if (mode)
+                mdelay(100);
+
+        return 0;
+}
+
+static struct mt9t112_camera_info mt9t112_info1 = {
+        .flags = MT9T112_FLAG_PCLK_RISING_EDGE | MT9T112_FLAG_DATAWIDTH_8,
+        .divider = { 0x49, 0x6, 0, 6, 0, 9, 9, 6, 0 }, /* for 24MHz */
+};
+
+static struct soc_camera_link mt9t112_link1 = {
+        .i2c_adapter_id = 0,
+        .power          = mt9t112_power1,
+        .bus_id         = 0,
+        .board_info     = &i2c_camera[1],
+        .module_name    = "mt9t112",
+        .priv           = &mt9t112_info1,
+};
+
+static int mt9t112_power2(struct device *dev, int mode)
+{
+        gpio_set_value(GPIO_PTA4, mode);
+        if (mode)
+                mdelay(100);
+
+        return 0;
+}
+
+static struct mt9t112_camera_info mt9t112_info2 = {
+        .flags = MT9T112_FLAG_PCLK_RISING_EDGE | MT9T112_FLAG_DATAWIDTH_8,
+        .divider = { 0x49, 0x6, 0, 6, 0, 9, 9, 6, 0 }, /* for 24MHz */
+};
+
+static struct soc_camera_link mt9t112_link2 = {
+        .i2c_adapter_id = 1,
+        .power          = mt9t112_power2,
+        .bus_id         = 1,
+        .board_info     = &i2c_camera[2],
+        .module_name    = "mt9t112",
+        .priv           = &mt9t112_info2,
+};
+
+static struct platform_device camera_devices[] = {
+        {
+                .name   = "soc-camera-pdrv",
+                .id     = 0,
+                .dev    = {
+                        .platform_data = &tw9910_link,
+                },
+        },
+        {
+                .name   = "soc-camera-pdrv",
+                .id     = 1,
+                .dev    = {
+                        .platform_data = &mt9t112_link1,
+                },
+        },
+        {
+                .name   = "soc-camera-pdrv",
+                .id     = 2,
+                .dev    = {
+                        .platform_data = &mt9t112_link2,
+                },
+        },
+};
+
+/* FSI */
+/*
+ * FSI-B use external clock which came from da7210.
+ * So, we should change parent of fsi
+ */
+#define FCLKBCR         0xa415000c
+static void fsimck_init(struct clk *clk)
+{
+        u32 status = ctrl_inl(clk->enable_reg);
+
+        /* use external clock */
+        status &= ~0x000000ff;
+        status |= 0x00000080;
+
+        ctrl_outl(status, clk->enable_reg);
+}
+
+static struct clk_ops fsimck_clk_ops = {
+        .init = fsimck_init,
+};
+
+static struct clk fsimckb_clk = {
+        .name           = "fsimckb_clk",
+        .id             = -1,
+        .ops            = &fsimck_clk_ops,
+        .enable_reg     = (void __iomem *)FCLKBCR,
+        .rate           = 0, /* unknown */
+};
+
+struct sh_fsi_platform_info fsi_info = {
+        .portb_flags = SH_FSI_BRS_INV |
+                       SH_FSI_OUT_SLAVE_MODE |
+                       SH_FSI_IN_SLAVE_MODE |
+                       SH_FSI_OFMT(I2S) |
+                       SH_FSI_IFMT(I2S),
+};
+
+static struct resource fsi_resources[] = {
+        [0] = {
+                .name   = "FSI",
+                .start  = 0xFE3C0000,
+                .end    = 0xFE3C021d,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 108,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device fsi_device = {
+        .name           = "sh_fsi",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(fsi_resources),
+        .resource       = fsi_resources,
+        .dev    = {
+                .platform_data  = &fsi_info,
+        },
+        .archdata = {
+                .hwblk_id = HWBLK_SPU, /* FSI needs SPU hwblk */
+        },
+};
+
 static struct platform_device *ecovec_devices[] __initdata = {
         &heartbeat_device,
         &nor_flash_device,
@@ -503,8 +759,16 @@ static struct platform_device *ecovec_devices[] __initdata = {
         &ceu0_device,
         &ceu1_device,
         &keysc_device,
+#ifdef CONFIG_MFD_SH_MOBILE_SDHI
         &sdhi0_device,
         &sdhi1_device,
+#else
+        &msiof0_device,
+#endif
+        &camera_devices[0],
+        &camera_devices[1],
+        &camera_devices[2],
+        &fsi_device,
 };
 
 #define EEPROM_ADDR 0x50
@@ -560,6 +824,8 @@ extern char ecovec24_sdram_leave_end;
 
 static int __init arch_setup(void)
 {
+        struct clk *clk;
+
         /* register board specific self-refresh code */
         sh_mobile_register_self_refresh(SUSP_SH_STANDBY | SUSP_SH_SF,
                                         &ecovec24_sdram_enter_start,
@@ -773,7 +1039,8 @@ static int __init arch_setup(void)
         gpio_direction_input(GPIO_PTR5);
         gpio_direction_input(GPIO_PTR6);
 
-        /* enable SDHI0 (needs DS2.4 set to ON) */
+#ifdef CONFIG_MFD_SH_MOBILE_SDHI
+        /* enable SDHI0 on CN11 (needs DS2.4 set to ON) */
         gpio_request(GPIO_FN_SDHI0CD,  NULL);
         gpio_request(GPIO_FN_SDHI0WP,  NULL);
         gpio_request(GPIO_FN_SDHI0CMD, NULL);
@@ -785,7 +1052,7 @@ static int __init arch_setup(void)
         gpio_request(GPIO_PTB6, NULL);
         gpio_direction_output(GPIO_PTB6, 0);
 
-        /* enable SDHI1 (needs DS2.6,7 set to ON,OFF) */
+        /* enable SDHI1 on CN12 (needs DS2.6,7 set to ON,OFF) */
         gpio_request(GPIO_FN_SDHI1CD,  NULL);
         gpio_request(GPIO_FN_SDHI1WP,  NULL);
         gpio_request(GPIO_FN_SDHI1CMD, NULL);
@@ -799,8 +1066,59 @@ static int __init arch_setup(void)
 
         /* I/O buffer drive ability is high for SDHI1 */
         ctrl_outw((ctrl_inw(IODRIVEA) & ~0x3000) | 0x2000 , IODRIVEA);
+#else
+        /* enable MSIOF0 on CN11 (needs DS2.4 set to OFF) */
+        gpio_request(GPIO_FN_MSIOF0_TXD, NULL);
+        gpio_request(GPIO_FN_MSIOF0_RXD, NULL);
+        gpio_request(GPIO_FN_MSIOF0_TSCK, NULL);
+        gpio_request(GPIO_PTM4, NULL); /* software CS control of TSYNC pin */
+        gpio_direction_output(GPIO_PTM4, 1); /* active low CS */
+        gpio_request(GPIO_PTB6, NULL); /* 3.3V power control */
+        gpio_direction_output(GPIO_PTB6, 0); /* disable power by default */
+        gpio_request(GPIO_PTY6, NULL); /* write protect */
+        gpio_direction_input(GPIO_PTY6);
+        gpio_request(GPIO_PTY7, NULL); /* card detect */
+        gpio_direction_input(GPIO_PTY7);
+
+        spi_register_board_info(spi_bus, ARRAY_SIZE(spi_bus));
+#endif
+
+        /* enable Video */
+        gpio_request(GPIO_PTU2, NULL);
+        gpio_direction_output(GPIO_PTU2, 1);
+
+        /* enable Camera */
+        gpio_request(GPIO_PTA3, NULL);
+        gpio_request(GPIO_PTA4, NULL);
+        gpio_direction_output(GPIO_PTA3, 0);
+        gpio_direction_output(GPIO_PTA4, 0);
+
+        /* enable FSI */
+        gpio_request(GPIO_FN_FSIMCKB,    NULL);
+        gpio_request(GPIO_FN_FSIIBSD,    NULL);
+        gpio_request(GPIO_FN_FSIOBSD,    NULL);
+        gpio_request(GPIO_FN_FSIIBBCK,   NULL);
+        gpio_request(GPIO_FN_FSIIBLRCK,  NULL);
+        gpio_request(GPIO_FN_FSIOBBCK,   NULL);
+        gpio_request(GPIO_FN_FSIOBLRCK,  NULL);
+        gpio_request(GPIO_FN_CLKAUDIOBO, NULL);
+
+        /* change parent of FSI B */
+        clk = clk_get(NULL, "fsib_clk");
+        clk_register(&fsimckb_clk);
+        clk_set_parent(clk, &fsimckb_clk);
+        clk_set_rate(clk, 11000);
+        clk_set_rate(&fsimckb_clk, 11000);
+        clk_put(clk);
+
+        gpio_request(GPIO_PTU0, NULL);
+        gpio_direction_output(GPIO_PTU0, 0);
+        mdelay(20);
 
         /* enable I2C device */
+        i2c_register_board_info(0, i2c0_devices,
+                                ARRAY_SIZE(i2c0_devices));
+
         i2c_register_board_info(1, i2c1_devices,
                                 ARRAY_SIZE(i2c1_devices));
 
diff --git a/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c b/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c
index 8ccb1cc8b589..e9b970846c41 100644
--- a/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c
+++ b/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c
@@ -273,6 +273,12 @@ int kfr2r09_lcd_setup(void *board_data, void *sohandle,
         return 0;
 }
 
+void kfr2r09_lcd_start(void *board_data, void *sohandle,
+                       struct sh_mobile_lcdc_sys_bus_ops *so)
+{
+        write_memory_start(sohandle, so);
+}
+
 #define CTRL_CKSW       0x10
 #define CTRL_C10        0x20
 #define CTRL_CPSW       0x80
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index 87438d6603d6..5d7b5d92475e 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -19,6 +19,7 @@
 #include <linux/input/sh_keysc.h>
 #include <linux/i2c.h>
 #include <linux/usb/r8a66597.h>
+#include <media/rj54n1cb0c.h>
 #include <media/soc_camera.h>
 #include <media/sh_mobile_ceu.h>
 #include <video/sh_mobile_lcdc.h>
@@ -149,6 +150,7 @@ static struct sh_mobile_lcdc_info kfr2r09_sh_lcdc_info = {
                 },
                 .board_cfg = {
                         .setup_sys = kfr2r09_lcd_setup,
+                        .start_transfer = kfr2r09_lcd_start,
                         .display_on = kfr2r09_lcd_on,
                         .display_off = kfr2r09_lcd_off,
                 },
@@ -255,6 +257,9 @@ static struct i2c_board_info kfr2r09_i2c_camera = {
 
 static struct clk *camera_clk;
 
+/* set VIO_CKO clock to 25MHz */
+#define CEU_MCLK_FREQ 25000000
+
 #define DRVCRB 0xA405018C
 static int camera_power(struct device *dev, int mode)
 {
@@ -267,8 +272,7 @@ static int camera_power(struct device *dev, int mode)
                 if (IS_ERR(camera_clk))
                         return PTR_ERR(camera_clk);
 
-                /* set VIO_CKO clock to 25MHz */
-                rate = clk_round_rate(camera_clk, 25000000);
+                rate = clk_round_rate(camera_clk, CEU_MCLK_FREQ);
                 ret = clk_set_rate(camera_clk, rate);
                 if (ret < 0)
                         goto eclkrate;
@@ -318,11 +322,17 @@ eclkrate:
         return ret;
 }
 
+static struct rj54n1_pdata rj54n1_priv = {
+        .mclk_freq      = CEU_MCLK_FREQ,
+        .ioctl_high     = false,
+};
+
 static struct soc_camera_link rj54n1_link = {
         .power          = camera_power,
         .board_info     = &kfr2r09_i2c_camera,
         .i2c_adapter_id = 1,
         .module_name    = "rj54n1cb0c",
+        .priv           = &rj54n1_priv,
 };
 
 static struct platform_device kfr2r09_camera = {
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 9099b6da9957..507c77be476d 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -432,23 +432,27 @@ static struct i2c_board_info migor_i2c_camera[] = {
 
 static struct ov772x_camera_info ov7725_info = {
         .buswidth       = SOCAM_DATAWIDTH_8,
-        .link = {
-                .power          = ov7725_power,
-                .board_info     = &migor_i2c_camera[0],
-                .i2c_adapter_id = 0,
-                .module_name    = "ov772x",
-        },
+};
+
+static struct soc_camera_link ov7725_link = {
+        .power          = ov7725_power,
+        .board_info     = &migor_i2c_camera[0],
+        .i2c_adapter_id = 0,
+        .module_name    = "ov772x",
+        .priv           = &ov7725_info,
 };
 
 static struct tw9910_video_info tw9910_info = {
         .buswidth       = SOCAM_DATAWIDTH_8,
         .mpout          = TW9910_MPO_FIELD,
-        .link = {
-                .power          = tw9910_power,
-                .board_info     = &migor_i2c_camera[1],
-                .i2c_adapter_id = 0,
-                .module_name    = "tw9910",
-        }
+};
+
+static struct soc_camera_link tw9910_link = {
+        .power          = tw9910_power,
+        .board_info     = &migor_i2c_camera[1],
+        .i2c_adapter_id = 0,
+        .module_name    = "tw9910",
+        .priv           = &tw9910_info,
 };
 
 static struct platform_device migor_camera[] = {
@@ -456,13 +460,13 @@ static struct platform_device migor_camera[] = {
                 .name   = "soc-camera-pdrv",
                 .id     = 0,
                 .dev    = {
-                        .platform_data = &ov7725_info.link,
+                        .platform_data = &ov7725_link,
                 },
         }, {
                 .name   = "soc-camera-pdrv",
                 .id     = 1,
                 .dev    = {
-                        .platform_data = &tw9910_info.link,
+                        .platform_data = &tw9910_link,
                 },
         },
 };
diff --git a/arch/sh/boards/mach-se/7722/irq.c b/arch/sh/boards/mach-se/7722/irq.c
index 4eb31acfafef..b221b6842b0d 100644
--- a/arch/sh/boards/mach-se/7722/irq.c
+++ b/arch/sh/boards/mach-se/7722/irq.c
@@ -57,15 +57,16 @@ static void se7722_irq_demux(unsigned int irq, struct irq_desc *desc)
  */
 void __init init_se7722_IRQ(void)
 {
-        int i;
+        int i, irq;
 
         ctrl_outw(0, IRQ01_MASK);       /* disable all irqs */
         ctrl_outw(0x2000, 0xb03fffec);  /* mrshpc irq enable */
 
         for (i = 0; i < SE7722_FPGA_IRQ_NR; i++) {
-                se7722_fpga_irq[i] = create_irq();
-                if (se7722_fpga_irq[i] < 0)
+                irq = create_irq();
+                if (irq < 0)
                         return;
+                se7722_fpga_irq[i] = irq;
 
                 set_irq_chip_and_handler_name(se7722_fpga_irq[i],
                                               &se7722_irq_chip,
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 4b0f0c0dc2b8..5d0f70b46c97 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -514,6 +514,13 @@ static struct platform_device *ms7724se_devices[] __initdata = {
         &sdhi1_cn8_device,
 };
 
+/* I2C device */
+static struct i2c_board_info i2c0_devices[] = {
+        {
+                I2C_BOARD_INFO("ak4642", 0x12),
+        },
+};
+
 #define EEPROM_OP   0xBA206000
 #define EEPROM_ADR  0xBA206004
 #define EEPROM_DATA 0xBA20600C
@@ -575,6 +582,16 @@ extern char ms7724se_sdram_enter_end;
 extern char ms7724se_sdram_leave_start;
 extern char ms7724se_sdram_leave_end;
 
+
+static int __init arch_setup(void)
+{
+        /* enable I2C device */
+        i2c_register_board_info(0, i2c0_devices,
+                                ARRAY_SIZE(i2c0_devices));
+        return 0;
+}
+arch_initcall(arch_setup);
+
 static int __init devices_setup(void)
 {
         u16 sw = ctrl_inw(SW4140); /* select camera, monitor */
diff --git a/arch/sh/configs/ecovec24-romimage_defconfig b/arch/sh/configs/ecovec24-romimage_defconfig
index 0774924623cc..46874704e4e7 100644
--- a/arch/sh/configs/ecovec24-romimage_defconfig
+++ b/arch/sh/configs/ecovec24-romimage_defconfig
@@ -203,7 +203,7 @@ CONFIG_MMU=y
 CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_MEMORY_START=0x08000000
-CONFIG_MEMORY_SIZE=0x08000000
+CONFIG_MEMORY_SIZE=0x10000000
 CONFIG_29BIT=y
 # CONFIG_X2TLB is not set
 CONFIG_VSYSCALL=y
diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig
index ac6469718a2c..cad918437ca7 100644
--- a/arch/sh/configs/ecovec24_defconfig
+++ b/arch/sh/configs/ecovec24_defconfig
@@ -204,7 +204,7 @@ CONFIG_MMU=y
 CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_MEMORY_START=0x08000000
-CONFIG_MEMORY_SIZE=0x08000000
+CONFIG_MEMORY_SIZE=0x10000000
 CONFIG_29BIT=y
 # CONFIG_X2TLB is not set
 CONFIG_VSYSCALL=y
diff --git a/arch/sh/configs/rts7751r2d1_defconfig b/arch/sh/configs/rts7751r2d1_defconfig
index f521e82cc19e..6f1126b3e487 100644
--- a/arch/sh/configs/rts7751r2d1_defconfig
+++ b/arch/sh/configs/rts7751r2d1_defconfig
@@ -324,7 +324,7 @@ CONFIG_ENTRY_OFFSET=0x00001000
 # CONFIG_UBC_WAKEUP is not set
 CONFIG_CMDLINE_OVERWRITE=y
 # CONFIG_CMDLINE_EXTEND is not set
-CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=serial"
+CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 root=/dev/sda1"
 
 #
 # Bus options
diff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts7751r2dplus_defconfig
index a156cd1e0617..9215bbb13d6f 100644
--- a/arch/sh/configs/rts7751r2dplus_defconfig
+++ b/arch/sh/configs/rts7751r2dplus_defconfig
@@ -324,7 +324,7 @@ CONFIG_ENTRY_OFFSET=0x00001000
 # CONFIG_UBC_WAKEUP is not set
 CONFIG_CMDLINE_OVERWRITE=y
 # CONFIG_CMDLINE_EXTEND is not set
-CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=serial"
+CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 root=/dev/sda1"
 
 #
 # Bus options
diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h
index ccb1d93bb043..ac04255022b6 100644
--- a/arch/sh/include/asm/elf.h
+++ b/arch/sh/include/asm/elf.h
@@ -114,7 +114,6 @@ typedef struct user_fpu_struct elf_fpregset_t;
  */
 #define CORE_DUMP_USE_REGSET
 
-#define USE_ELF_CORE_DUMP
 #define ELF_FDPIC_CORE_EFLAGS   EF_SH_FDPIC
 #define ELF_EXEC_PAGESIZE       PAGE_SIZE
 
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index 512cd3e9d0ca..026dd659a640 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -233,11 +233,17 @@ unsigned long long poke_real_address_q(unsigned long long addr,
  * doesn't exist, so everything must go through page tables.
  */
 #ifdef CONFIG_MMU
-void __iomem *__ioremap(unsigned long offset, unsigned long size,
-                        unsigned long flags);
+void __iomem *__ioremap_caller(unsigned long offset, unsigned long size,
+                               unsigned long flags, void *caller);
 void __iounmap(void __iomem *addr);
 
 static inline void __iomem *
+__ioremap(unsigned long offset, unsigned long size, unsigned long flags)
+{
+        return __ioremap_caller(offset, size, flags, __builtin_return_address(0));
+}
+
+static inline void __iomem *
 __ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags)
 {
 #if defined(CONFIG_SUPERH32) && !defined(CONFIG_PMB_FIXED) && !defined(CONFIG_PMB)
@@ -271,6 +277,7 @@ __ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags)
         return __ioremap(offset, size, flags);
 }
 #else
+#define __ioremap(offset, size, flags)          ((void __iomem *)(offset))
 #define __ioremap_mode(offset, size, flags)     ((void __iomem *)(offset))
 #define __iounmap(addr)                         do { } while (0)
 #endif /* CONFIG_MMU */
diff --git a/arch/sh/include/asm/pgtable_32.h b/arch/sh/include/asm/pgtable_32.h
index b35435516203..5003ee86f67b 100644
--- a/arch/sh/include/asm/pgtable_32.h
+++ b/arch/sh/include/asm/pgtable_32.h
@@ -344,7 +344,8 @@ static inline void set_pte(pte_t *ptep, pte_t pte)
 #define pte_special(pte)        ((pte).pte_low & _PAGE_SPECIAL)
 
 #ifdef CONFIG_X2TLB
-#define pte_write(pte)          ((pte).pte_high & _PAGE_EXT_USER_WRITE)
+#define pte_write(pte) \
+        ((pte).pte_high & (_PAGE_EXT_USER_WRITE | _PAGE_EXT_KERN_WRITE))
 #else
 #define pte_write(pte)          ((pte).pte_low & _PAGE_RW)
 #endif
@@ -358,7 +359,7 @@ static inline pte_t pte_##fn(pte_t pte) { pte.pte_##h op; return pte; }
  * individually toggled (and user permissions are entirely decoupled from
  * kernel permissions), we attempt to couple them a bit more sanely here.
  */
-PTE_BIT_FUNC(high, wrprotect, &= ~_PAGE_EXT_USER_WRITE);
+PTE_BIT_FUNC(high, wrprotect, &= ~(_PAGE_EXT_USER_WRITE | _PAGE_EXT_KERN_WRITE));
 PTE_BIT_FUNC(high, mkwrite, |= _PAGE_EXT_USER_WRITE | _PAGE_EXT_KERN_WRITE);
 PTE_BIT_FUNC(high, mkhuge, |= _PAGE_SZHUGE);
 #else
diff --git a/arch/sh/include/asm/spinlock.h b/arch/sh/include/asm/spinlock.h
index a28c9f0053fd..bdc0f3b6c56a 100644
--- a/arch/sh/include/asm/spinlock.h
+++ b/arch/sh/include/asm/spinlock.h
@@ -23,10 +23,10 @@
  * Your basic SMP spinlocks, allowing only a single CPU anywhere
  */
 
-#define __raw_spin_is_locked(x)         ((x)->lock <= 0)
-#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
-#define __raw_spin_unlock_wait(x) \
-        do { while (__raw_spin_is_locked(x)) cpu_relax(); } while (0)
+#define arch_spin_is_locked(x)          ((x)->lock <= 0)
+#define arch_spin_lock_flags(lock, flags) arch_spin_lock(lock)
+#define arch_spin_unlock_wait(x) \
+        do { while (arch_spin_is_locked(x)) cpu_relax(); } while (0)
 
 /*
  * Simple spin lock operations.  There are two variants, one clears IRQ's
@@ -34,14 +34,14 @@
  *
  * We make no fairness assumptions.  They have a cost.
  */
-static inline void __raw_spin_lock(raw_spinlock_t *lock)
+static inline void arch_spin_lock(arch_spinlock_t *lock)
 {
         unsigned long tmp;
         unsigned long oldval;
 
         __asm__ __volatile__ (
                 "1:                                             \n\t"
-                "movli.l        @%2, %0 ! __raw_spin_lock       \n\t"
+                "movli.l        @%2, %0 ! arch_spin_lock        \n\t"
                 "mov            %0, %1                          \n\t"
                 "mov            #0, %0                          \n\t"
                 "movco.l        %0, @%2                         \n\t"
@@ -54,12 +54,12 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
         );
 }
 
-static inline void __raw_spin_unlock(raw_spinlock_t *lock)
+static inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
         unsigned long tmp;
 
         __asm__ __volatile__ (
-                "mov            #1, %0 ! __raw_spin_unlock      \n\t"
+                "mov            #1, %0 ! arch_spin_unlock       \n\t"
                 "mov.l          %0, @%1                         \n\t"
                 : "=&z" (tmp)
                 : "r" (&lock->lock)
@@ -67,13 +67,13 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
         );
 }
 
-static inline int __raw_spin_trylock(raw_spinlock_t *lock)
+static inline int arch_spin_trylock(arch_spinlock_t *lock)
 {
         unsigned long tmp, oldval;
 
         __asm__ __volatile__ (
                 "1:                                             \n\t"
-                "movli.l        @%2, %0 ! __raw_spin_trylock    \n\t"
+                "movli.l        @%2, %0 ! arch_spin_trylock     \n\t"
                 "mov            %0, %1                          \n\t"
                 "mov            #0, %0                          \n\t"
                 "movco.l        %0, @%2                         \n\t"
@@ -100,21 +100,21 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock)
  * read_can_lock - would read_trylock() succeed?
  * @lock: the rwlock in question.
  */
-#define __raw_read_can_lock(x)  ((x)->lock > 0)
+#define arch_read_can_lock(x)   ((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)
+#define arch_write_can_lock(x)  ((x)->lock == RW_LOCK_BIAS)
 
-static inline void __raw_read_lock(raw_rwlock_t *rw)
+static inline void arch_read_lock(arch_rwlock_t *rw)
 {
         unsigned long tmp;
 
         __asm__ __volatile__ (
                 "1:                                             \n\t"
-                "movli.l        @%1, %0 ! __raw_read_lock       \n\t"
+                "movli.l        @%1, %0 ! arch_read_lock        \n\t"
                 "cmp/pl         %0                              \n\t"
                 "bf             1b                              \n\t"
                 "add            #-1, %0                         \n\t"
@@ -126,13 +126,13 @@ static inline void __raw_read_lock(raw_rwlock_t *rw)
         );
 }
 
-static inline void __raw_read_unlock(raw_rwlock_t *rw)
+static inline void arch_read_unlock(arch_rwlock_t *rw)
 {
         unsigned long tmp;
 
         __asm__ __volatile__ (
                 "1:                                             \n\t"
-                "movli.l        @%1, %0 ! __raw_read_unlock     \n\t"
+                "movli.l        @%1, %0 ! arch_read_unlock      \n\t"
                 "add            #1, %0                          \n\t"
                 "movco.l        %0, @%1                         \n\t"
                 "bf             1b                              \n\t"
@@ -142,13 +142,13 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw)
         );
 }
 
-static inline void __raw_write_lock(raw_rwlock_t *rw)
+static inline void arch_write_lock(arch_rwlock_t *rw)
 {
         unsigned long tmp;
 
         __asm__ __volatile__ (
                 "1:                                             \n\t"
-                "movli.l        @%1, %0 ! __raw_write_lock      \n\t"
+                "movli.l        @%1, %0 ! arch_write_lock       \n\t"
                 "cmp/hs         %2, %0                          \n\t"
                 "bf             1b                              \n\t"
                 "sub            %2, %0                          \n\t"
@@ -160,23 +160,23 @@ static inline void __raw_write_lock(raw_rwlock_t *rw)
         );
 }
 
-static inline void __raw_write_unlock(raw_rwlock_t *rw)
+static inline void arch_write_unlock(arch_rwlock_t *rw)
 {
         __asm__ __volatile__ (
-                "mov.l          %1, @%0 ! __raw_write_unlock    \n\t"
+                "mov.l          %1, @%0 ! arch_write_unlock     \n\t"
                 :
                 : "r" (&rw->lock), "r" (RW_LOCK_BIAS)
                 : "t", "memory"
         );
 }
 
-static inline int __raw_read_trylock(raw_rwlock_t *rw)
+static inline int arch_read_trylock(arch_rwlock_t *rw)
 {
         unsigned long tmp, oldval;
 
         __asm__ __volatile__ (
                 "1:                                             \n\t"
-                "movli.l        @%2, %0 ! __raw_read_trylock    \n\t"
+                "movli.l        @%2, %0 ! arch_read_trylock     \n\t"
                 "mov            %0, %1                          \n\t"
                 "cmp/pl         %0                              \n\t"
                 "bf             2f                              \n\t"
@@ -193,13 +193,13 @@ static inline int __raw_read_trylock(raw_rwlock_t *rw)
         return (oldval > 0);
 }
 
-static inline int __raw_write_trylock(raw_rwlock_t *rw)
+static inline int arch_write_trylock(arch_rwlock_t *rw)
 {
         unsigned long tmp, oldval;
 
         __asm__ __volatile__ (
                 "1:                                             \n\t"
-                "movli.l        @%2, %0 ! __raw_write_trylock   \n\t"
+                "movli.l        @%2, %0 ! arch_write_trylock    \n\t"
                 "mov            %0, %1                          \n\t"
                 "cmp/hs         %3, %0                          \n\t"
                 "bf             2f                              \n\t"
@@ -216,11 +216,11 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)
         return (oldval > (RW_LOCK_BIAS - 1));
 }
 
-#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
-#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+#define arch_read_lock_flags(lock, flags) arch_read_lock(lock)
+#define arch_write_lock_flags(lock, flags) arch_write_lock(lock)
 
-#define _raw_spin_relax(lock)   cpu_relax()
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
+#define arch_spin_relax(lock)   cpu_relax()
+#define arch_read_relax(lock)   cpu_relax()
+#define arch_write_relax(lock)  cpu_relax()
 
 #endif /* __ASM_SH_SPINLOCK_H */
diff --git a/arch/sh/include/asm/spinlock_types.h b/arch/sh/include/asm/spinlock_types.h
index b4d244e7b60c..9b7560db06ca 100644
--- a/arch/sh/include/asm/spinlock_types.h
+++ b/arch/sh/include/asm/spinlock_types.h
@@ -7,15 +7,15 @@
 
 typedef struct {
         volatile unsigned int lock;
-} raw_spinlock_t;
+} arch_spinlock_t;
 
-#define __RAW_SPIN_LOCK_UNLOCKED                { 1 }
+#define __ARCH_SPIN_LOCK_UNLOCKED               { 1 }
 
 typedef struct {
         volatile unsigned int lock;
-} raw_rwlock_t;
+} arch_rwlock_t;
 
 #define RW_LOCK_BIAS                    0x01000000
-#define __RAW_RW_LOCK_UNLOCKED          { RW_LOCK_BIAS }
+#define __ARCH_RW_LOCK_UNLOCKED         { RW_LOCK_BIAS }
 
 #endif
diff --git a/arch/sh/include/asm/unistd_32.h b/arch/sh/include/asm/unistd_32.h
index f3fd1b9eb6b1..f18c4f9baf27 100644
--- a/arch/sh/include/asm/unistd_32.h
+++ b/arch/sh/include/asm/unistd_32.h
@@ -345,8 +345,9 @@
 #define __NR_pwritev            334
 #define __NR_rt_tgsigqueueinfo  335
 #define __NR_perf_event_open    336
+#define __NR_recvmmsg           337
 
-#define NR_syscalls 337
+#define NR_syscalls 338
 
 #ifdef __KERNEL__
 
diff --git a/arch/sh/include/asm/unistd_64.h b/arch/sh/include/asm/unistd_64.h
index 343ce8f073ea..3e7645d11130 100644
--- a/arch/sh/include/asm/unistd_64.h
+++ b/arch/sh/include/asm/unistd_64.h
@@ -385,10 +385,11 @@
 #define __NR_pwritev            362
 #define __NR_rt_tgsigqueueinfo  363
 #define __NR_perf_event_open    364
+#define __NR_recvmmsg           365
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 365
+#define NR_syscalls 366
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h b/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h
index 174374e19547..484ef42c2fb5 100644
--- a/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h
+++ b/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h
@@ -8,6 +8,8 @@ void kfr2r09_lcd_on(void *board_data);
 void kfr2r09_lcd_off(void *board_data);
 int kfr2r09_lcd_setup(void *board_data, void *sys_ops_handle,
                       struct sh_mobile_lcdc_sys_bus_ops *sys_ops);
+void kfr2r09_lcd_start(void *board_data, void *sys_ops_handle,
+                       struct sh_mobile_lcdc_sys_bus_ops *sys_ops);
 #else
 static inline void kfr2r09_lcd_on(void *board_data) {}
 static inline void kfr2r09_lcd_off(void *board_data) {}
@@ -16,6 +18,10 @@ static inline int kfr2r09_lcd_setup(void *board_data, void *sys_ops_handle,
 {
         return -ENODEV;
 }
+static inline void kfr2r09_lcd_start(void *board_data, void *sys_ops_handle,
+                                     struct sh_mobile_lcdc_sys_bus_ops *sys_ops)
+{
+}
 #endif
 
 #endif /* __ASM_SH_KFR2R09_H */
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile
index 0471a3eb25ed..0d587da1ef12 100644
--- a/arch/sh/kernel/Makefile
+++ b/arch/sh/kernel/Makefile
@@ -22,11 +22,10 @@ obj-y	:= debugtraps.o dma-nommu.o dumpstack.o 			\
 obj-y                           += cpu/
 obj-$(CONFIG_VSYSCALL)          += vsyscall/
 obj-$(CONFIG_SMP)               += smp.o
-obj-$(CONFIG_SH_STANDARD_BIOS)  += sh_bios.o
+obj-$(CONFIG_SH_STANDARD_BIOS)  += sh_bios.o early_printk.o
 obj-$(CONFIG_KGDB)              += kgdb.o
 obj-$(CONFIG_SH_CPU_FREQ)       += cpufreq.o
 obj-$(CONFIG_MODULES)           += sh_ksyms_$(BITS).o module.o
-obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
 obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
 obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
 obj-$(CONFIG_STACKTRACE)        += stacktrace.o
diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c
index c1508a90fc6a..9282d965a1b6 100644
--- a/arch/sh/kernel/cpu/irq/ipr.c
+++ b/arch/sh/kernel/cpu/irq/ipr.c
@@ -17,16 +17,17 @@
  * for more details.
  */
 #include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/irq.h>
+#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/io.h>
-#include <linux/interrupt.h>
 #include <linux/topology.h>
 
 static inline struct ipr_desc *get_ipr_desc(unsigned int irq)
 {
         struct irq_chip *chip = get_irq_chip(irq);
-        return (void *)((char *)chip - offsetof(struct ipr_desc, chip));
+        return container_of(chip, struct ipr_desc, chip);
 }
 
 static void disable_ipr_irq(unsigned int irq)
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
index 8555c05e8667..114c7cee7184 100644
--- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c
+++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
@@ -59,32 +59,48 @@ static struct intc_prio_reg prio_registers[] __initdata = {
 static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL,
                          NULL, prio_registers, NULL);
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xf8400000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 88, 88, 88, 88 },
-        }, {
-                .mapbase        = 0xf8410000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 92, 92, 92, 92 },
-        }, {
-                .mapbase        = 0xf8420000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 96, 96, 96, 96 },
-        }, {
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xf8400000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 88, 88, 88, 88 },
+};
+
+static struct platform_device scif0_device = {
+        .name           = "sh-sci",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xf8410000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 92, 92, 92, 92 },
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xf8420000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 96, 96, 96, 96 },
+};
+
+static struct platform_device scif2_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 2,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif2_platform_data,
         },
 };
 
@@ -176,7 +192,9 @@ static struct platform_device cmt1_device = {
 };
 
 static struct platform_device *sh7619_devices[] __initdata = {
-        &sci_device,
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
         &eth_device,
         &cmt0_device,
         &cmt1_device,
@@ -195,6 +213,9 @@ void __init plat_irq_setup(void)
 }
 
 static struct platform_device *sh7619_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
         &cmt0_device,
         &cmt1_device,
 };
diff --git a/arch/sh/kernel/cpu/sh2a/setup-mxg.c b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
index b67376445315..8f669dc9b0da 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-mxg.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
@@ -207,27 +207,23 @@ static struct platform_device mtu2_2_device = {
         .num_resources  = ARRAY_SIZE(mtu2_2_resources),
 };
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xff804000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 220, 220, 220, 220 },
-        }, {
-                .flags = 0,
-        }
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xff804000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 220, 220, 220, 220 },
 };
 
-static struct platform_device sci_device = {
+static struct platform_device scif0_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 0,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif0_platform_data,
         },
 };
 
 static struct platform_device *mxg_devices[] __initdata = {
-        &sci_device,
+        &scif0_device,
         &mtu2_0_device,
         &mtu2_1_device,
         &mtu2_2_device,
@@ -246,6 +242,7 @@ void __init plat_irq_setup(void)
 }
 
 static struct platform_device *mxg_early_devices[] __initdata = {
+        &scif0_device,
         &mtu2_0_device,
         &mtu2_1_device,
         &mtu2_2_device,
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
index fbde5b75deb9..4ccfeb59eb1a 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
@@ -177,57 +177,123 @@ static struct intc_mask_reg mask_registers[] __initdata = {
 static DECLARE_INTC_DESC(intc_desc, "sh7201", vectors, groups,
                          mask_registers, prio_registers, NULL);
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xfffe8000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 180, 180, 180, 180 }
-        }, {
-                .mapbase        = 0xfffe8800,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 184, 184, 184, 184 }
-        }, {
-                .mapbase        = 0xfffe9000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 188, 188, 188, 188 }
-        }, {
-                .mapbase        = 0xfffe9800,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 192, 192, 192, 192 }
-        }, {
-                .mapbase        = 0xfffea000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 196, 196, 196, 196 }
-        }, {
-                .mapbase        = 0xfffea800,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 200, 200, 200, 200 }
-        }, {
-                .mapbase        = 0xfffeb000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 204, 204, 204, 204 }
-        }, {
-                .mapbase        = 0xfffeb800,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 208, 208, 208, 208 }
-        }, {
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xfffe8000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 180, 180, 180, 180 }
+};
+
+static struct platform_device scif0_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xfffe8800,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 184, 184, 184, 184 }
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xfffe9000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 188, 188, 188, 188 }
+};
+
+static struct platform_device scif2_device = {
+        .name           = "sh-sci",
+        .id             = 2,
+        .dev            = {
+                .platform_data  = &scif2_platform_data,
+        },
+};
+
+static struct plat_sci_port scif3_platform_data = {
+        .mapbase        = 0xfffe9800,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 192, 192, 192, 192 }
+};
+
+static struct platform_device scif3_device = {
+        .name           = "sh-sci",
+        .id             = 3,
+        .dev            = {
+                .platform_data  = &scif3_platform_data,
+        },
+};
+
+static struct plat_sci_port scif4_platform_data = {
+        .mapbase        = 0xfffea000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 196, 196, 196, 196 }
+};
+
+static struct platform_device scif4_device = {
+        .name           = "sh-sci",
+        .id             = 4,
+        .dev            = {
+                .platform_data  = &scif4_platform_data,
+        },
+};
+
+static struct plat_sci_port scif5_platform_data = {
+        .mapbase        = 0xfffea800,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 200, 200, 200, 200 }
+};
+
+static struct platform_device scif5_device = {
+        .name           = "sh-sci",
+        .id             = 5,
+        .dev            = {
+                .platform_data  = &scif5_platform_data,
+        },
+};
+
+static struct plat_sci_port scif6_platform_data = {
+        .mapbase        = 0xfffeb000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 204, 204, 204, 204 }
+};
+
+static struct platform_device scif6_device = {
+        .name           = "sh-sci",
+        .id             = 6,
+        .dev            = {
+                .platform_data  = &scif6_platform_data,
+        },
+};
+
+static struct plat_sci_port scif7_platform_data = {
+        .mapbase        = 0xfffeb800,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 208, 208, 208, 208 }
+};
+
+static struct platform_device scif7_device = {
+        .name           = "sh-sci",
+        .id             = 7,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif7_platform_data,
         },
 };
 
@@ -345,7 +411,14 @@ static struct platform_device mtu2_2_device = {
 };
 
 static struct platform_device *sh7201_devices[] __initdata = {
-        &sci_device,
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
+        &scif4_device,
+        &scif5_device,
+        &scif6_device,
+        &scif7_device,
         &rtc_device,
         &mtu2_0_device,
         &mtu2_1_device,
@@ -365,6 +438,14 @@ void __init plat_irq_setup(void)
 }
 
 static struct platform_device *sh7201_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
+        &scif4_device,
+        &scif5_device,
+        &scif6_device,
+        &scif7_device,
         &mtu2_0_device,
         &mtu2_1_device,
         &mtu2_2_device,
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
index d3fd536c9a84..3136966cc9b3 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
@@ -173,37 +173,63 @@ static struct intc_mask_reg mask_registers[] __initdata = {
 static DECLARE_INTC_DESC(intc_desc, "sh7203", vectors, groups,
                          mask_registers, prio_registers, NULL);
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xfffe8000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           =  { 192, 192, 192, 192 },
-        }, {
-                .mapbase        = 0xfffe8800,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           =  { 196, 196, 196, 196 },
-        }, {
-                .mapbase        = 0xfffe9000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           =  { 200, 200, 200, 200 },
-        }, {
-                .mapbase        = 0xfffe9800,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           =  { 204, 204, 204, 204 },
-        }, {
-                .flags = 0,
-        }
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xfffe8000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           =  { 192, 192, 192, 192 },
 };
 
-static struct platform_device sci_device = {
+static struct platform_device scif0_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xfffe8800,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           =  { 196, 196, 196, 196 },
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xfffe9000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           =  { 200, 200, 200, 200 },
+};
+
+static struct platform_device scif2_device = {
+        .name           = "sh-sci",
+        .id             = 2,
+        .dev            = {
+                .platform_data  = &scif2_platform_data,
+        },
+};
+
+static struct plat_sci_port scif3_platform_data = {
+        .mapbase        = 0xfffe9800,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           =  { 204, 204, 204, 204 },
+};
+
+static struct platform_device scif3_device = {
+        .name           = "sh-sci",
+        .id             = 3,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif3_platform_data,
         },
 };
 
@@ -354,7 +380,10 @@ static struct platform_device rtc_device = {
 };
 
 static struct platform_device *sh7203_devices[] __initdata = {
-        &sci_device,
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
         &cmt0_device,
         &cmt1_device,
         &mtu2_0_device,
@@ -375,6 +404,10 @@ void __init plat_irq_setup(void)
 }
 
 static struct platform_device *sh7203_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
         &cmt0_device,
         &cmt1_device,
         &mtu2_0_device,
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
index a9ccc5e8d9e9..064873585a8b 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
@@ -133,37 +133,63 @@ static struct intc_mask_reg mask_registers[] __initdata = {
 static DECLARE_INTC_DESC(intc_desc, "sh7206", vectors, groups,
                          mask_registers, prio_registers, NULL);
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xfffe8000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 240, 240, 240, 240 },
-        }, {
-                .mapbase        = 0xfffe8800,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 244, 244, 244, 244 },
-        }, {
-                .mapbase        = 0xfffe9000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 248, 248, 248, 248 },
-        }, {
-                .mapbase        = 0xfffe9800,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 252, 252, 252, 252 },
-        }, {
-                .flags = 0,
-        }
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xfffe8000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 240, 240, 240, 240 },
 };
 
-static struct platform_device sci_device = {
+static struct platform_device scif0_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xfffe8800,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 244, 244, 244, 244 },
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xfffe9000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 248, 248, 248, 248 },
+};
+
+static struct platform_device scif2_device = {
+        .name           = "sh-sci",
+        .id             = 2,
+        .dev            = {
+                .platform_data  = &scif2_platform_data,
+        },
+};
+
+static struct plat_sci_port scif3_platform_data = {
+        .mapbase        = 0xfffe9800,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 252, 252, 252, 252 },
+};
+
+static struct platform_device scif3_device = {
+        .name           = "sh-sci",
+        .id             = 3,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif3_platform_data,
         },
 };
 
@@ -325,7 +351,10 @@ static struct platform_device mtu2_2_device = {
 };
 
 static struct platform_device *sh7206_devices[] __initdata = {
-        &sci_device,
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
         &cmt0_device,
         &cmt1_device,
         &mtu2_0_device,
@@ -346,6 +375,10 @@ void __init plat_irq_setup(void)
 }
 
 static struct platform_device *sh7206_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
         &cmt0_device,
         &cmt1_device,
         &mtu2_0_device,
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
index c23105983878..7b892d60e3a0 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
@@ -67,27 +67,33 @@ static struct intc_prio_reg prio_registers[] __initdata = {
 static DECLARE_INTC_DESC(intc_desc, "sh7705", vectors, NULL,
                          NULL, prio_registers, NULL);
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xa4410000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 56, 56, 56 },
-        }, {
-                .mapbase        = 0xa4400000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 52, 52, 52 },
-        }, {
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xa4410000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 56, 56, 56 },
+};
+
+static struct platform_device scif0_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xa4400000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 52, 52, 52 },
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif1_platform_data,
         },
 };
 
@@ -210,10 +216,11 @@ static struct platform_device tmu2_device = {
 };
 
 static struct platform_device *sh7705_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
-        &sci_device,
         &rtc_device,
 };
 
@@ -225,6 +232,8 @@ static int __init sh7705_devices_setup(void)
 arch_initcall(sh7705_devices_setup);
 
 static struct platform_device *sh7705_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh770x.c b/arch/sh/kernel/cpu/sh3/setup-sh770x.c
index 347ab35d0697..bc0c4f68c7c7 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh770x.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh770x.c
@@ -106,44 +106,55 @@ static struct platform_device rtc_device = {
         .resource       = rtc_resources,
 };
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xfffffe80,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCI,
-                .irqs           = { 23, 23, 23, 0 },
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xfffffe80,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCI,
+        .irqs           = { 23, 23, 23, 0 },
+};
+
+static struct platform_device scif0_device = {
+        .name           = "sh-sci",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
         },
+};
 #if defined(CONFIG_CPU_SUBTYPE_SH7706) || \
     defined(CONFIG_CPU_SUBTYPE_SH7707) || \
     defined(CONFIG_CPU_SUBTYPE_SH7709)
-        {
-                .mapbase        = 0xa4000150,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 56, 56, 56, 56 },
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xa4000150,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 56, 56, 56, 56 },
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
         },
+};
 #endif
 #if defined(CONFIG_CPU_SUBTYPE_SH7707) || \
     defined(CONFIG_CPU_SUBTYPE_SH7709)
-        {
-                .mapbase        = 0xa4000140,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_IRDA,
-                .irqs           = { 52, 52, 52, 52 },
-        },
-#endif
-        {
-                .flags = 0,
-        }
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xa4000140,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_IRDA,
+        .irqs           = { 52, 52, 52, 52 },
 };
 
-static struct platform_device sci_device = {
+static struct platform_device scif2_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 2,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif2_platform_data,
         },
 };
+#endif
 
 static struct sh_timer_config tmu0_platform_data = {
         .name = "TMU0",
@@ -238,10 +249,19 @@ static struct platform_device tmu2_device = {
 };
 
 static struct platform_device *sh770x_devices[] __initdata = {
+        &scif0_device,
+#if defined(CONFIG_CPU_SUBTYPE_SH7706) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7707) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7709)
+        &scif1_device,
+#endif
+#if defined(CONFIG_CPU_SUBTYPE_SH7707) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7709)
+        &scif2_device,
+#endif
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
-        &sci_device,
         &rtc_device,
 };
 
@@ -253,6 +273,16 @@ static int __init sh770x_devices_setup(void)
 arch_initcall(sh770x_devices_setup);
 
 static struct platform_device *sh770x_early_devices[] __initdata = {
+        &scif0_device,
+#if defined(CONFIG_CPU_SUBTYPE_SH7706) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7707) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7709)
+        &scif1_device,
+#endif
+#if defined(CONFIG_CPU_SUBTYPE_SH7707) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7709)
+        &scif2_device,
+#endif
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
index 717e90ae1097..0845a3ad006d 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
@@ -96,28 +96,33 @@ static struct platform_device rtc_device = {
         },
 };
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xa4400000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 52, 52, 52, 52 },
-        }, {
-                .mapbase        = 0xa4410000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 56, 56, 56, 56 },
-        }, {
-
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xa4400000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 52, 52, 52, 52 },
+};
+
+static struct platform_device scif0_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xa4410000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 56, 56, 56, 56 },
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif1_platform_data,
         },
 };
 
@@ -214,10 +219,11 @@ static struct platform_device tmu2_device = {
 };
 
 static struct platform_device *sh7710_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
-        &sci_device,
         &rtc_device,
 };
 
@@ -229,6 +235,8 @@ static int __init sh7710_devices_setup(void)
 arch_initcall(sh7710_devices_setup);
 
 static struct platform_device *sh7710_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7720.c b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
index 74d8baaf8e96..a718a6231091 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7720.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
@@ -48,28 +48,33 @@ static struct platform_device rtc_device = {
         },
 };
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xa4430000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 80, 80, 80, 80 },
-        }, {
-                .mapbase        = 0xa4438000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 81, 81, 81, 81 },
-        }, {
-
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xa4430000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 80, 80, 80, 80 },
+};
+
+static struct platform_device scif0_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xa4438000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 81, 81, 81, 81 },
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif1_platform_data,
         },
 };
 
@@ -369,6 +374,8 @@ static struct platform_device tmu2_device = {
 };
 
 static struct platform_device *sh7720_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
         &cmt0_device,
         &cmt1_device,
         &cmt2_device,
@@ -378,7 +385,6 @@ static struct platform_device *sh7720_devices[] __initdata = {
         &tmu1_device,
         &tmu2_device,
         &rtc_device,
-        &sci_device,
         &usb_ohci_device,
         &usbf_device,
 };
@@ -391,6 +397,8 @@ static int __init sh7720_devices_setup(void)
 arch_initcall(sh7720_devices_setup);
 
 static struct platform_device *sh7720_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
         &cmt0_device,
         &cmt1_device,
         &cmt2_device,
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
index de4827df19aa..4b733715cdb5 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
@@ -15,22 +15,18 @@
 #include <linux/sh_timer.h>
 #include <linux/io.h>
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xffe80000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 40, 41, 43, 42 },
-        }, {
-                .flags = 0,
-        }
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xffe80000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 40, 41, 43, 42 },
 };
 
-static struct platform_device sci_device = {
+static struct platform_device scif0_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 0,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif0_platform_data,
         },
 };
 
@@ -127,7 +123,7 @@ static struct platform_device tmu2_device = {
 };
 
 static struct platform_device *sh4202_devices[] __initdata = {
-        &sci_device,
+        &scif0_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
@@ -141,6 +137,7 @@ static int __init sh4202_devices_setup(void)
 arch_initcall(sh4202_devices_setup);
 
 static struct platform_device *sh4202_early_devices[] __initdata = {
+        &scif0_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
index 1b8b122e8f3d..b2a9df1af64c 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
@@ -35,29 +35,33 @@ static struct platform_device rtc_device = {
         .resource       = rtc_resources,
 };
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-#ifndef CONFIG_SH_RTS7751R2D
-                .mapbase        = 0xffe00000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCI,
-                .irqs           = { 23, 23, 23, 0 },
-        }, {
-#endif
-                .mapbase        = 0xffe80000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 40, 40, 40, 40 },
-        }, {
-                .flags = 0,
-        }
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xffe00000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCI,
+        .irqs           = { 23, 23, 23, 0 },
 };
 
-static struct platform_device sci_device = {
+static struct platform_device scif0_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xffe80000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 40, 40, 40, 40 },
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif1_platform_data,
         },
 };
 
@@ -221,8 +225,9 @@ static struct platform_device tmu4_device = {
 #endif
 
 static struct platform_device *sh7750_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
         &rtc_device,
-        &sci_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
@@ -242,6 +247,8 @@ static int __init sh7750_devices_setup(void)
 arch_initcall(sh7750_devices_setup);
 
 static struct platform_device *sh7750_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
index 7fbb7be9284c..5b74cc0b43da 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
@@ -126,37 +126,63 @@ static struct intc_vect vectors_irq[] __initdata = {
 static DECLARE_INTC_DESC(intc_desc_irq, "sh7760-irq", vectors_irq, groups,
                          mask_registers, prio_registers, NULL);
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xfe600000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 52, 53, 55, 54 },
-        }, {
-                .mapbase        = 0xfe610000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 72, 73, 75, 74 },
-        }, {
-                .mapbase        = 0xfe620000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 76, 77, 79, 78 },
-        }, {
-                .mapbase        = 0xfe480000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCI,
-                .irqs           = { 80, 81, 82, 0 },
-        }, {
-                .flags = 0,
-        }
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xfe600000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 52, 53, 55, 54 },
+};
+
+static struct platform_device scif0_device = {
+        .name           = "sh-sci",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xfe610000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 72, 73, 75, 74 },
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xfe620000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 76, 77, 79, 78 },
+};
+
+static struct platform_device scif2_device = {
+        .name           = "sh-sci",
+        .id             = 2,
+        .dev            = {
+                .platform_data  = &scif2_platform_data,
+        },
+};
+
+static struct plat_sci_port scif3_platform_data = {
+        .mapbase        = 0xfe480000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCI,
+        .irqs           = { 80, 81, 82, 0 },
 };
 
-static struct platform_device sci_device = {
+static struct platform_device scif3_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 3,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif3_platform_data,
         },
 };
 
@@ -254,7 +280,10 @@ static struct platform_device tmu2_device = {
 
 
 static struct platform_device *sh7760_devices[] __initdata = {
-        &sci_device,
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
@@ -268,6 +297,10 @@ static int __init sh7760_devices_setup(void)
 arch_initcall(sh7760_devices_setup);
 
 static struct platform_device *sh7760_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
index ac4d5672ec1a..45eb1bfd42c9 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
@@ -15,6 +15,71 @@
 #include <linux/sh_timer.h>
 #include <asm/clock.h>
 
+/* Serial */
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xffe00000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 80, 80, 80, 80 },
+        .clk            = "scif0",
+};
+
+static struct platform_device scif0_device = {
+        .name           = "sh-sci",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xffe10000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 81, 81, 81, 81 },
+        .clk            = "scif1",
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xffe20000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 82, 82, 82, 82 },
+        .clk            = "scif2",
+};
+
+static struct platform_device scif2_device = {
+        .name           = "sh-sci",
+        .id             = 2,
+        .dev            = {
+                .platform_data  = &scif2_platform_data,
+        },
+};
+
+static struct plat_sci_port scif3_platform_data = {
+        .mapbase        = 0xffe30000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 83, 83, 83, 83 },
+        .clk            = "scif3",
+};
+
+static struct platform_device scif3_device = {
+        .name           = "sh-sci",
+        .id             = 3,
+        .dev            = {
+                .platform_data  = &scif3_platform_data,
+        },
+};
+
 static struct resource iic0_resources[] = {
         [0] = {
                 .name   = "IIC0",
@@ -265,52 +330,17 @@ static struct platform_device tmu2_device = {
         .num_resources  = ARRAY_SIZE(tmu2_resources),
 };
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xffe00000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 80, 80, 80, 80 },
-                .clk            = "scif0",
-        }, {
-                .mapbase        = 0xffe10000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 81, 81, 81, 81 },
-                .clk            = "scif1",
-        }, {
-                .mapbase        = 0xffe20000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 82, 82, 82, 82 },
-                .clk            = "scif2",
-        }, {
-                .mapbase        = 0xffe30000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 83, 83, 83, 83 },
-                .clk            = "scif3",
-        }, {
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
-        .name           = "sh-sci",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = sci_platform_data,
-        },
-};
-
 static struct platform_device *sh7343_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
         &cmt_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
         &iic0_device,
         &iic1_device,
-        &sci_device,
         &vpu_device,
         &veu_device,
         &jpu_device,
@@ -328,6 +358,10 @@ static int __init sh7343_devices_setup(void)
 arch_initcall(sh7343_devices_setup);
 
 static struct platform_device *sh7343_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
         &cmt_device,
         &tmu0_device,
         &tmu1_device,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
index 4a9010bf4fd3..c494c193e3b6 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
@@ -18,6 +18,22 @@
 #include <linux/usb/r8a66597.h>
 #include <asm/clock.h>
 
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xffe00000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 80, 80, 80, 80 },
+        .clk            = "scif0",
+};
+
+static struct platform_device scif0_device = {
+        .name           = "sh-sci",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
 static struct resource iic_resources[] = {
         [0] = {
                 .name   = "IIC",
@@ -276,33 +292,13 @@ static struct platform_device tmu2_device = {
         .num_resources  = ARRAY_SIZE(tmu2_resources),
 };
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xffe00000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 80, 80, 80, 80 },
-                .clk            = "scif0",
-        }, {
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
-        .name           = "sh-sci",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = sci_platform_data,
-        },
-};
-
 static struct platform_device *sh7366_devices[] __initdata = {
+        &scif0_device,
         &cmt_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
         &iic_device,
-        &sci_device,
         &usb_host_device,
         &vpu_device,
         &veu0_device,
@@ -321,6 +317,7 @@ static int __init sh7366_devices_setup(void)
 arch_initcall(sh7366_devices_setup);
 
 static struct platform_device *sh7366_early_devices[] __initdata = {
+        &scif0_device,
         &cmt_device,
         &tmu0_device,
         &tmu1_device,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 5491b094cf05..b5335b5e309c 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -20,6 +20,55 @@
 #include <asm/dma-sh.h>
 #include <cpu/sh7722.h>
 
+/* Serial */
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xffe00000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 80, 80, 80, 80 },
+        .clk            = "scif0",
+};
+
+static struct platform_device scif0_device = {
+        .name           = "sh-sci",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xffe10000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 81, 81, 81, 81 },
+        .clk            = "scif1",
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xffe20000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 82, 82, 82, 82 },
+        .clk            = "scif2",
+};
+
+static struct platform_device scif2_device = {
+        .name           = "sh-sci",
+        .id             = 2,
+        .dev            = {
+                .platform_data  = &scif2_platform_data,
+        },
+};
+
 static struct resource rtc_resources[] = {
         [0] = {
                 .start  = 0xa465fec0,
@@ -339,41 +388,6 @@ static struct platform_device tmu2_device = {
         },
 };
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xffe00000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 80, 80, 80, 80 },
-                .clk            = "scif0",
-        },
-        {
-                .mapbase        = 0xffe10000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 81, 81, 81, 81 },
-                .clk            = "scif1",
-        },
-        {
-                .mapbase        = 0xffe20000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 82, 82, 82, 82 },
-                .clk            = "scif2",
-        },
-        {
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
-        .name           = "sh-sci",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = sci_platform_data,
-        },
-};
-
 static struct sh_dmae_pdata dma_platform_data = {
         .mode = 0,
 };
@@ -387,6 +401,9 @@ static struct platform_device dma_device = {
 };
 
 static struct platform_device *sh7722_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
         &cmt_device,
         &tmu0_device,
         &tmu1_device,
@@ -394,7 +411,6 @@ static struct platform_device *sh7722_devices[] __initdata = {
         &rtc_device,
         &usbf_device,
         &iic_device,
-        &sci_device,
         &vpu_device,
         &veu_device,
         &jpu_device,
@@ -413,6 +429,9 @@ static int __init sh7722_devices_setup(void)
 arch_initcall(sh7722_devices_setup);
 
 static struct platform_device *sh7722_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
         &cmt_device,
         &tmu0_device,
         &tmu1_device,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
index 4caa5a7ca86e..772b9265d0e4 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
@@ -20,6 +20,103 @@
 #include <asm/mmzone.h>
 #include <cpu/sh7723.h>
 
+/* Serial */
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xffe00000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 80, 80, 80, 80 },
+        .clk            = "scif0",
+};
+
+static struct platform_device scif0_device = {
+        .name           = "sh-sci",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xffe10000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 81, 81, 81, 81 },
+        .clk            = "scif1",
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xffe20000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 82, 82, 82, 82 },
+        .clk            = "scif2",
+};
+
+static struct platform_device scif2_device = {
+        .name           = "sh-sci",
+        .id             = 2,
+        .dev            = {
+                .platform_data  = &scif2_platform_data,
+        },
+};
+
+static struct plat_sci_port scif3_platform_data = {
+        .mapbase        = 0xa4e30000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIFA,
+        .irqs           = { 56, 56, 56, 56 },
+        .clk            = "scif3",
+};
+
+static struct platform_device scif3_device = {
+        .name           = "sh-sci",
+        .id             = 3,
+        .dev            = {
+                .platform_data  = &scif3_platform_data,
+        },
+};
+
+static struct plat_sci_port scif4_platform_data = {
+        .mapbase        = 0xa4e40000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIFA,
+        .irqs           = { 88, 88, 88, 88 },
+        .clk            = "scif4",
+};
+
+static struct platform_device scif4_device = {
+        .name           = "sh-sci",
+        .id             = 4,
+        .dev            = {
+                .platform_data  = &scif4_platform_data,
+        },
+};
+
+static struct plat_sci_port scif5_platform_data = {
+        .mapbase        = 0xa4e50000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIFA,
+        .irqs           = { 109, 109, 109, 109 },
+        .clk            = "scif5",
+};
+
+static struct platform_device scif5_device = {
+        .name           = "sh-sci",
+        .id             = 5,
+        .dev            = {
+                .platform_data  = &scif5_platform_data,
+        },
+};
+
 static struct uio_info vpu_platform_data = {
         .name = "VPU5",
         .version = "0",
@@ -348,56 +445,6 @@ static struct platform_device tmu5_device = {
         },
 };
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xffe00000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 80, 80, 80, 80 },
-                .clk            = "scif0",
-        },{
-                .mapbase        = 0xffe10000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 81, 81, 81, 81 },
-                .clk            = "scif1",
-        },{
-                .mapbase        = 0xffe20000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 82, 82, 82, 82 },
-                .clk            = "scif2",
-        },{
-                .mapbase        = 0xa4e30000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIFA,
-                .irqs           = { 56, 56, 56, 56 },
-                .clk            = "scif3",
-        },{
-                .mapbase        = 0xa4e40000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIFA,
-                .irqs           = { 88, 88, 88, 88 },
-                .clk            = "scif4",
-        },{
-                .mapbase        = 0xa4e50000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIFA,
-                .irqs           = { 109, 109, 109, 109 },
-                .clk            = "scif5",
-        }, {
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
-        .name           = "sh-sci",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = sci_platform_data,
-        },
-};
-
 static struct resource rtc_resources[] = {
         [0] = {
                 .start  = 0xa465fec0,
@@ -488,6 +535,12 @@ static struct platform_device iic_device = {
 };
 
 static struct platform_device *sh7723_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
+        &scif4_device,
+        &scif5_device,
         &cmt_device,
         &tmu0_device,
         &tmu1_device,
@@ -495,7 +548,6 @@ static struct platform_device *sh7723_devices[] __initdata = {
         &tmu3_device,
         &tmu4_device,
         &tmu5_device,
-        &sci_device,
         &rtc_device,
         &iic_device,
         &sh7723_usb_host_device,
@@ -516,6 +568,12 @@ static int __init sh7723_devices_setup(void)
 arch_initcall(sh7723_devices_setup);
 
 static struct platform_device *sh7723_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
+        &scif4_device,
+        &scif5_device,
         &cmt_device,
         &tmu0_device,
         &tmu1_device,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
index 845e89c936e7..a52f35117e82 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
@@ -27,53 +27,99 @@
 #include <cpu/sh7724.h>
 
 /* Serial */
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xffe00000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 80, 80, 80, 80 },
-                .clk            = "scif0",
-        }, {
-                .mapbase        = 0xffe10000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 81, 81, 81, 81 },
-                .clk            = "scif1",
-        }, {
-                .mapbase        = 0xffe20000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 82, 82, 82, 82 },
-                .clk            = "scif2",
-        }, {
-                .mapbase        = 0xa4e30000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIFA,
-                .irqs           = { 56, 56, 56, 56 },
-                .clk            = "scif3",
-        }, {
-                .mapbase        = 0xa4e40000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIFA,
-                .irqs           = { 88, 88, 88, 88 },
-                .clk            = "scif4",
-        }, {
-                .mapbase        = 0xa4e50000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIFA,
-                .irqs           = { 109, 109, 109, 109 },
-                .clk            = "scif5",
-        }, {
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xffe00000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 80, 80, 80, 80 },
+        .clk            = "scif0",
+};
+
+static struct platform_device scif0_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xffe10000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 81, 81, 81, 81 },
+        .clk            = "scif1",
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xffe20000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 82, 82, 82, 82 },
+        .clk            = "scif2",
+};
+
+static struct platform_device scif2_device = {
+        .name           = "sh-sci",
+        .id             = 2,
+        .dev            = {
+                .platform_data  = &scif2_platform_data,
+        },
+};
+
+static struct plat_sci_port scif3_platform_data = {
+        .mapbase        = 0xa4e30000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIFA,
+        .irqs           = { 56, 56, 56, 56 },
+        .clk            = "scif3",
+};
+
+static struct platform_device scif3_device = {
+        .name           = "sh-sci",
+        .id             = 3,
+        .dev            = {
+                .platform_data  = &scif3_platform_data,
+        },
+};
+
+static struct plat_sci_port scif4_platform_data = {
+        .mapbase        = 0xa4e40000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIFA,
+        .irqs           = { 88, 88, 88, 88 },
+        .clk            = "scif4",
+};
+
+static struct platform_device scif4_device = {
+        .name           = "sh-sci",
+        .id             = 4,
+        .dev            = {
+                .platform_data  = &scif4_platform_data,
+        },
+};
+
+static struct plat_sci_port scif5_platform_data = {
+        .mapbase        = 0xa4e50000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIFA,
+        .irqs           = { 109, 109, 109, 109 },
+        .clk            = "scif5",
+};
+
+static struct platform_device scif5_device = {
+        .name           = "sh-sci",
+        .id             = 5,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif5_platform_data,
         },
 };
 
@@ -590,6 +636,12 @@ static struct platform_device spu1_device = {
 };
 
 static struct platform_device *sh7724_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
+        &scif4_device,
+        &scif5_device,
         &cmt_device,
         &tmu0_device,
         &tmu1_device,
@@ -597,7 +649,6 @@ static struct platform_device *sh7724_devices[] __initdata = {
         &tmu3_device,
         &tmu4_device,
         &tmu5_device,
-        &sci_device,
         &rtc_device,
         &iic0_device,
         &iic1_device,
@@ -624,6 +675,12 @@ static int __init sh7724_devices_setup(void)
 arch_initcall(sh7724_devices_setup);
 
 static struct platform_device *sh7724_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
+        &scif4_device,
+        &scif5_device,
         &cmt_device,
         &tmu0_device,
         &tmu1_device,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
index c470e15f2e03..37e32efbbaa7 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
@@ -17,6 +17,51 @@
 #include <linux/mm.h>
 #include <linux/sh_timer.h>
 
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xfe4b0000,           /* SCIF2 */
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 40, 40, 40, 40 },
+};
+
+static struct platform_device scif2_device = {
+        .name           = "sh-sci",
+        .id             = 2,
+        .dev            = {
+                .platform_data  = &scif2_platform_data,
+        },
+};
+
+static struct plat_sci_port scif3_platform_data = {
+        .mapbase        = 0xfe4c0000,           /* SCIF3 */
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 76, 76, 76, 76 },
+};
+
+static struct platform_device scif3_device = {
+        .name           = "sh-sci",
+        .id             = 3,
+        .dev            = {
+                .platform_data  = &scif3_platform_data,
+        },
+};
+
+static struct plat_sci_port scif4_platform_data = {
+        .mapbase        = 0xfe4d0000,           /* SCIF4 */
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 104, 104, 104, 104 },
+};
+
+static struct platform_device scif4_device = {
+        .name           = "sh-sci",
+        .id             = 4,
+        .dev            = {
+                .platform_data  = &scif4_platform_data,
+        },
+};
+
 static struct sh_timer_config tmu0_platform_data = {
         .name = "TMU0",
         .channel_offset = 0x04,
@@ -79,39 +124,12 @@ static struct platform_device tmu1_device = {
         .num_resources  = ARRAY_SIZE(tmu1_resources),
 };
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xfe4b0000,           /* SCIF2 */
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 40, 40, 40, 40 },
-        }, {
-                .mapbase        = 0xfe4c0000,           /* SCIF3 */
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 76, 76, 76, 76 },
-        }, {
-                .mapbase        = 0xfe4d0000,           /* SCIF4 */
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 104, 104, 104, 104 },
-        }, {
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
-        .name           = "sh-sci",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = sci_platform_data,
-        },
-};
-
 static struct platform_device *sh7757_devices[] __initdata = {
+        &scif2_device,
+        &scif3_device,
+        &scif4_device,
         &tmu0_device,
         &tmu1_device,
-        &sci_device,
 };
 
 static int __init sh7757_devices_setup(void)
@@ -121,6 +139,20 @@ static int __init sh7757_devices_setup(void)
 }
 arch_initcall(sh7757_devices_setup);
 
+static struct platform_device *sh7757_early_devices[] __initdata = {
+        &scif2_device,
+        &scif3_device,
+        &scif4_device,
+        &tmu0_device,
+        &tmu1_device,
+};
+
+void __init plat_early_device_setup(void)
+{
+        early_platform_add_devices(sh7757_early_devices,
+                                   ARRAY_SIZE(sh7757_early_devices));
+}
+
 enum {
         UNUSED = 0,
 
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
index 4659fff6b842..6aba26fec416 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
@@ -16,6 +16,51 @@
 #include <linux/io.h>
 #include <linux/serial_sci.h>
 
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xffe00000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 40, 40, 40, 40 },
+};
+
+static struct platform_device scif0_device = {
+        .name           = "sh-sci",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xffe08000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 76, 76, 76, 76 },
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xffe10000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 104, 104, 104, 104 },
+};
+
+static struct platform_device scif2_device = {
+        .name           = "sh-sci",
+        .id             = 2,
+        .dev            = {
+                .platform_data  = &scif2_platform_data,
+        },
+};
+
 static struct resource rtc_resources[] = {
         [0] = {
                 .start  = 0xffe80000,
@@ -36,35 +81,6 @@ static struct platform_device rtc_device = {
         .resource       = rtc_resources,
 };
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xffe00000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 40, 40, 40, 40 },
-        }, {
-                .mapbase        = 0xffe08000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 76, 76, 76, 76 },
-        }, {
-                .mapbase        = 0xffe10000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 104, 104, 104, 104 },
-        }, {
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
-        .name           = "sh-sci",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = sci_platform_data,
-        },
-};
-
 static struct resource usb_ohci_resources[] = {
         [0] = {
                 .start  = 0xffec8000,
@@ -297,6 +313,9 @@ static struct platform_device tmu5_device = {
 };
 
 static struct platform_device *sh7763_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
@@ -304,7 +323,6 @@ static struct platform_device *sh7763_devices[] __initdata = {
         &tmu4_device,
         &tmu5_device,
         &rtc_device,
-        &sci_device,
         &usb_ohci_device,
         &usbf_device,
 };
@@ -317,6 +335,9 @@ static int __init sh7763_devices_setup(void)
 arch_initcall(sh7763_devices_setup);
 
 static struct platform_device *sh7763_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
index eead08d89d32..c1643bc9590d 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
@@ -14,67 +14,153 @@
 #include <linux/sh_timer.h>
 #include <linux/io.h>
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xff923000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 61, 61, 61, 61 },
-        }, {
-                .mapbase        = 0xff924000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 62, 62, 62, 62 },
-        }, {
-                .mapbase        = 0xff925000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 63, 63, 63, 63 },
-        }, {
-                .mapbase        = 0xff926000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 64, 64, 64, 64 },
-        }, {
-                .mapbase        = 0xff927000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 65, 65, 65, 65 },
-        }, {
-                .mapbase        = 0xff928000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 66, 66, 66, 66 },
-        }, {
-                .mapbase        = 0xff929000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 67, 67, 67, 67 },
-        }, {
-                .mapbase        = 0xff92a000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 68, 68, 68, 68 },
-        }, {
-                .mapbase        = 0xff92b000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 69, 69, 69, 69 },
-        }, {
-                .mapbase        = 0xff92c000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 70, 70, 70, 70 },
-        }, {
-                .flags = 0,
-        }
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xff923000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 61, 61, 61, 61 },
+};
+
+static struct platform_device scif0_device = {
+        .name           = "sh-sci",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xff924000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 62, 62, 62, 62 },
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xff925000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 63, 63, 63, 63 },
+};
+
+static struct platform_device scif2_device = {
+        .name           = "sh-sci",
+        .id             = 2,
+        .dev            = {
+                .platform_data  = &scif2_platform_data,
+        },
+};
+
+static struct plat_sci_port scif3_platform_data = {
+        .mapbase        = 0xff926000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 64, 64, 64, 64 },
+};
+
+static struct platform_device scif3_device = {
+        .name           = "sh-sci",
+        .id             = 3,
+        .dev            = {
+                .platform_data  = &scif3_platform_data,
+        },
+};
+
+static struct plat_sci_port scif4_platform_data = {
+        .mapbase        = 0xff927000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 65, 65, 65, 65 },
+};
+
+static struct platform_device scif4_device = {
+        .name           = "sh-sci",
+        .id             = 4,
+        .dev            = {
+                .platform_data  = &scif4_platform_data,
+        },
+};
+
+static struct plat_sci_port scif5_platform_data = {
+        .mapbase        = 0xff928000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 66, 66, 66, 66 },
+};
+
+static struct platform_device scif5_device = {
+        .name           = "sh-sci",
+        .id             = 5,
+        .dev            = {
+                .platform_data  = &scif5_platform_data,
+        },
+};
+
+static struct plat_sci_port scif6_platform_data = {
+        .mapbase        = 0xff929000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 67, 67, 67, 67 },
+};
+
+static struct platform_device scif6_device = {
+        .name           = "sh-sci",
+        .id             = 6,
+        .dev            = {
+                .platform_data  = &scif6_platform_data,
+        },
+};
+
+static struct plat_sci_port scif7_platform_data = {
+        .mapbase        = 0xff92a000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 68, 68, 68, 68 },
+};
+
+static struct platform_device scif7_device = {
+        .name           = "sh-sci",
+        .id             = 7,
+        .dev            = {
+                .platform_data  = &scif7_platform_data,
+        },
+};
+
+static struct plat_sci_port scif8_platform_data = {
+        .mapbase        = 0xff92b000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 69, 69, 69, 69 },
+};
+
+static struct platform_device scif8_device = {
+        .name           = "sh-sci",
+        .id             = 8,
+        .dev            = {
+                .platform_data  = &scif8_platform_data,
+        },
+};
+
+static struct plat_sci_port scif9_platform_data = {
+        .mapbase        = 0xff92c000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 70, 70, 70, 70 },
 };
 
-static struct platform_device sci_device = {
+static struct platform_device scif9_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 9,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif9_platform_data,
         },
 };
 
@@ -351,6 +437,16 @@ static struct platform_device tmu8_device = {
 };
 
 static struct platform_device *sh7770_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
+        &scif4_device,
+        &scif5_device,
+        &scif6_device,
+        &scif7_device,
+        &scif8_device,
+        &scif9_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
@@ -360,7 +456,6 @@ static struct platform_device *sh7770_devices[] __initdata = {
         &tmu6_device,
         &tmu7_device,
         &tmu8_device,
-        &sci_device,
 };
 
 static int __init sh7770_devices_setup(void)
@@ -371,6 +466,16 @@ static int __init sh7770_devices_setup(void)
 arch_initcall(sh7770_devices_setup);
 
 static struct platform_device *sh7770_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
+        &scif4_device,
+        &scif5_device,
+        &scif6_device,
+        &scif7_device,
+        &scif8_device,
+        &scif9_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index 12ff56f19c5c..c310558490d5 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@ -15,6 +15,36 @@
 #include <linux/sh_timer.h>
 #include <asm/dma-sh.h>
 
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xffe00000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 40, 40, 40, 40 },
+};
+
+static struct platform_device scif0_device = {
+        .name           = "sh-sci",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xffe10000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 76, 76, 76, 76 },
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
 static struct sh_timer_config tmu0_platform_data = {
         .name = "TMU0",
         .channel_offset = 0x04,
@@ -217,30 +247,6 @@ static struct platform_device rtc_device = {
         .resource       = rtc_resources,
 };
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xffe00000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 40, 40, 40, 40 },
-        }, {
-                .mapbase        = 0xffe10000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 76, 76, 76, 76 },
-        }, {
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
-        .name           = "sh-sci",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = sci_platform_data,
-        },
-};
-
 static struct sh_dmae_pdata dma_platform_data = {
         .mode = (SHDMA_MIX_IRQ | SHDMA_DMAOR1),
 };
@@ -254,6 +260,8 @@ static struct platform_device dma_device = {
 };
 
 static struct platform_device *sh7780_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
@@ -261,7 +269,6 @@ static struct platform_device *sh7780_devices[] __initdata = {
         &tmu4_device,
         &tmu5_device,
         &rtc_device,
-        &sci_device,
         &dma_device,
 };
 
@@ -271,8 +278,9 @@ static int __init sh7780_devices_setup(void)
                                     ARRAY_SIZE(sh7780_devices));
 }
 arch_initcall(sh7780_devices_setup);
-
 static struct platform_device *sh7780_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
index 7f6c718b6c36..ef26ebda6e8b 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
@@ -16,6 +16,102 @@
 #include <linux/sh_timer.h>
 #include <asm/mmzone.h>
 
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xffea0000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 40, 40, 40, 40 },
+        .clk            = "scif_fck",
+};
+
+static struct platform_device scif0_device = {
+        .name           = "sh-sci",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xffeb0000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 44, 44, 44, 44 },
+        .clk            = "scif_fck",
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xffec0000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 60, 60, 60, 60 },
+        .clk            = "scif_fck",
+};
+
+static struct platform_device scif2_device = {
+        .name           = "sh-sci",
+        .id             = 2,
+        .dev            = {
+                .platform_data  = &scif2_platform_data,
+        },
+};
+
+static struct plat_sci_port scif3_platform_data = {
+        .mapbase        = 0xffed0000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 61, 61, 61, 61 },
+        .clk            = "scif_fck",
+};
+
+static struct platform_device scif3_device = {
+        .name           = "sh-sci",
+        .id             = 3,
+        .dev            = {
+                .platform_data  = &scif3_platform_data,
+        },
+};
+
+static struct plat_sci_port scif4_platform_data = {
+        .mapbase        = 0xffee0000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 62, 62, 62, 62 },
+        .clk            = "scif_fck",
+};
+
+static struct platform_device scif4_device = {
+        .name           = "sh-sci",
+        .id             = 4,
+        .dev            = {
+                .platform_data  = &scif4_platform_data,
+        },
+};
+
+static struct plat_sci_port scif5_platform_data = {
+        .mapbase        = 0xffef0000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 63, 63, 63, 63 },
+        .clk            = "scif_fck",
+};
+
+static struct platform_device scif5_device = {
+        .name           = "sh-sci",
+        .id             = 5,
+        .dev            = {
+                .platform_data  = &scif5_platform_data,
+        },
+};
+
 static struct sh_timer_config tmu0_platform_data = {
         .name = "TMU0",
         .channel_offset = 0x04,
@@ -198,64 +294,19 @@ static struct platform_device tmu5_device = {
         .num_resources  = ARRAY_SIZE(tmu5_resources),
 };
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xffea0000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 40, 40, 40, 40 },
-                .clk            = "scif_fck",
-        }, {
-                .mapbase        = 0xffeb0000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 44, 44, 44, 44 },
-                .clk            = "scif_fck",
-        }, {
-                .mapbase        = 0xffec0000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 60, 60, 60, 60 },
-                .clk            = "scif_fck",
-        }, {
-                .mapbase        = 0xffed0000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 61, 61, 61, 61 },
-                .clk            = "scif_fck",
-        }, {
-                .mapbase        = 0xffee0000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 62, 62, 62, 62 },
-                .clk            = "scif_fck",
-        }, {
-                .mapbase        = 0xffef0000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 63, 63, 63, 63 },
-                .clk            = "scif_fck",
-        }, {
-                .flags = 0,
-        }
-};
-
-static struct platform_device sci_device = {
-        .name           = "sh-sci",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = sci_platform_data,
-        },
-};
-
 static struct platform_device *sh7785_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
+        &scif4_device,
+        &scif5_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
         &tmu3_device,
         &tmu4_device,
         &tmu5_device,
-        &sci_device,
 };
 
 static int __init sh7785_devices_setup(void)
@@ -266,6 +317,12 @@ static int __init sh7785_devices_setup(void)
 arch_initcall(sh7785_devices_setup);
 
 static struct platform_device *sh7785_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
+        &scif4_device,
+        &scif5_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
index 0104a8ec5369..71673487ace0 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
@@ -23,51 +23,96 @@
 #include <linux/sh_timer.h>
 #include <asm/mmzone.h>
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xffea0000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 40, 41, 43, 42 },
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xffea0000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 40, 41, 43, 42 },
+};
+
+static struct platform_device scif0_device = {
+        .name           = "sh-sci",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
         },
-        /*
-         * The rest of these all have multiplexed IRQs
-         */
-        {
-                .mapbase        = 0xffeb0000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 44, 44, 44, 44 },
-        }, {
-                .mapbase        = 0xffec0000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 50, 50, 50, 50 },
-        }, {
-                .mapbase        = 0xffed0000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 51, 51, 51, 51 },
-        }, {
-                .mapbase        = 0xffee0000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 52, 52, 52, 52 },
-        }, {
-                .mapbase        = 0xffef0000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 53, 53, 53, 53 },
-        }, {
-                .flags = 0,
-        }
 };
 
-static struct platform_device sci_device = {
+/*
+ * The rest of these all have multiplexed IRQs
+ */
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xffeb0000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 44, 44, 44, 44 },
+};
+
+static struct platform_device scif1_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xffec0000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 50, 50, 50, 50 },
+};
+
+static struct platform_device scif2_device = {
+        .name           = "sh-sci",
+        .id             = 2,
+        .dev            = {
+                .platform_data  = &scif2_platform_data,
+        },
+};
+
+static struct plat_sci_port scif3_platform_data = {
+        .mapbase        = 0xffed0000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 51, 51, 51, 51 },
+};
+
+static struct platform_device scif3_device = {
+        .name           = "sh-sci",
+        .id             = 3,
+        .dev            = {
+                .platform_data  = &scif3_platform_data,
+        },
+};
+
+static struct plat_sci_port scif4_platform_data = {
+        .mapbase        = 0xffee0000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 52, 52, 52, 52 },
+};
+
+static struct platform_device scif4_device = {
+        .name           = "sh-sci",
+        .id             = 4,
+        .dev            = {
+                .platform_data  = &scif4_platform_data,
+        },
+};
+
+static struct plat_sci_port scif5_platform_data = {
+        .mapbase        = 0xffef0000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 53, 53, 53, 53 },
+};
+
+static struct platform_device scif5_device = {
+        .name           = "sh-sci",
+        .id             = 5,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif5_platform_data,
         },
 };
 
@@ -459,6 +504,12 @@ static struct platform_device usb_ohci_device = {
 };
 
 static struct platform_device *sh7786_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
+        &scif3_device,
+        &scif4_device,
+        &scif5_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
@@ -474,7 +525,6 @@ static struct platform_device *sh7786_early_devices[] __initdata = {
 };
 
 static struct platform_device *sh7786_devices[] __initdata = {
-        &sci_device,
         &usb_ohci_device,
 };
 
diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
index c7ba9166e18a..780ba17a5599 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -24,32 +24,48 @@
  * silicon in the first place, we just refuse to deal with the port at
  * all rather than adding infrastructure to hack around it.
  */
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = 0xffc30000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 40, 41, 43, 42 },
-        }, {
-                .mapbase        = 0xffc40000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 44, 45, 47, 46 },
-        }, {
-                .mapbase        = 0xffc60000,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .type           = PORT_SCIF,
-                .irqs           = { 52, 53, 55, 54 },
-        }, {
-                .flags = 0,
-        }
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = 0xffc30000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 40, 41, 43, 42 },
+};
+
+static struct platform_device scif0_device = {
+        .name           = "sh-sci",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &scif0_platform_data,
+        },
+};
+
+static struct plat_sci_port scif1_platform_data = {
+        .mapbase        = 0xffc40000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 44, 45, 47, 46 },
+};
+
+static struct platform_device scif1_device = {
+        .name           = "sh-sci",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &scif1_platform_data,
+        },
+};
+
+static struct plat_sci_port scif2_platform_data = {
+        .mapbase        = 0xffc60000,
+        .flags          = UPF_BOOT_AUTOCONF,
+        .type           = PORT_SCIF,
+        .irqs           = { 52, 53, 55, 54 },
 };
 
-static struct platform_device sci_device = {
+static struct platform_device scif2_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 2,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif2_platform_data,
         },
 };
 
@@ -236,6 +252,9 @@ static struct platform_device tmu5_device = {
 };
 
 static struct platform_device *shx3_early_devices[] __initdata = {
+        &scif0_device,
+        &scif1_device,
+        &scif2_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
@@ -244,21 +263,10 @@ static struct platform_device *shx3_early_devices[] __initdata = {
         &tmu5_device,
 };
 
-static struct platform_device *shx3_devices[] __initdata = {
-        &sci_device,
-};
-
 static int __init shx3_devices_setup(void)
 {
-        int ret;
-
-        ret = platform_add_devices(shx3_early_devices,
+        return platform_add_devices(shx3_early_devices,
                                    ARRAY_SIZE(shx3_early_devices));
-        if (unlikely(ret != 0))
-                return ret;
-
-        return platform_add_devices(shx3_devices,
-                                    ARRAY_SIZE(shx3_devices));
 }
 arch_initcall(shx3_devices_setup);
 
diff --git a/arch/sh/kernel/cpu/sh5/fpu.c b/arch/sh/kernel/cpu/sh5/fpu.c
index dd4f51ffb50e..4648ccee6c4d 100644
--- a/arch/sh/kernel/cpu/sh5/fpu.c
+++ b/arch/sh/kernel/cpu/sh5/fpu.c
@@ -34,7 +34,7 @@ static union sh_fpu_union init_fpuregs = {
         }
 };
 
-void save_fpu(struct task_struct *tsk, struct pt_regs *regs)
+void save_fpu(struct task_struct *tsk)
 {
         asm volatile("fst.p     %0, (0*8), fp0\n\t"
                      "fst.p     %0, (1*8), fp2\n\t"
@@ -153,7 +153,7 @@ do_fpu_state_restore(unsigned long ex, struct pt_regs *regs)
         enable_fpu();
         if (last_task_used_math != NULL)
                 /* Other processes fpu state, save away */
-                save_fpu(last_task_used_math, regs);
+                save_fpu(last_task_used_math);
 
         last_task_used_math = current;
         if (used_math()) {
diff --git a/arch/sh/kernel/cpu/sh5/setup-sh5.c b/arch/sh/kernel/cpu/sh5/setup-sh5.c
index 6a0f82f70032..e7a3c1e4b604 100644
--- a/arch/sh/kernel/cpu/sh5/setup-sh5.c
+++ b/arch/sh/kernel/cpu/sh5/setup-sh5.c
@@ -16,22 +16,18 @@
 #include <linux/sh_timer.h>
 #include <asm/addrspace.h>
 
-static struct plat_sci_port sci_platform_data[] = {
-        {
-                .mapbase        = PHYS_PERIPHERAL_BLOCK + 0x01030000,
-                .flags          = UPF_BOOT_AUTOCONF | UPF_IOREMAP,
-                .type           = PORT_SCIF,
-                .irqs           = { 39, 40, 42, 0 },
-        }, {
-                .flags = 0,
-        }
+static struct plat_sci_port scif0_platform_data = {
+        .mapbase        = PHYS_PERIPHERAL_BLOCK + 0x01030000,
+        .flags          = UPF_BOOT_AUTOCONF | UPF_IOREMAP,
+        .type           = PORT_SCIF,
+        .irqs           = { 39, 40, 42, 0 },
 };
 
-static struct platform_device sci_device = {
+static struct platform_device scif0_device = {
         .name           = "sh-sci",
-        .id             = -1,
+        .id             = 0,
         .dev            = {
-                .platform_data  = sci_platform_data,
+                .platform_data  = &scif0_platform_data,
         },
 };
 
@@ -164,13 +160,13 @@ static struct platform_device tmu2_device = {
 };
 
 static struct platform_device *sh5_early_devices[] __initdata = {
+        &scif0_device,
         &tmu0_device,
         &tmu1_device,
         &tmu2_device,
 };
 
 static struct platform_device *sh5_devices[] __initdata = {
-        &sci_device,
         &rtc_device,
 };
 
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c
index 81a46145ffa5..f8bb50c6e050 100644
--- a/arch/sh/kernel/early_printk.c
+++ b/arch/sh/kernel/early_printk.c
@@ -15,7 +15,6 @@
 #include <linux/io.h>
 #include <linux/delay.h>
 
-#ifdef CONFIG_SH_STANDARD_BIOS
 #include <asm/sh_bios.h>
 
 /*
@@ -57,149 +56,8 @@ static struct console bios_console = {
         .flags          = CON_PRINTBUFFER,
         .index          = -1,
 };
-#endif
 
-#ifdef CONFIG_EARLY_SCIF_CONSOLE
-#include <linux/serial_core.h>
-#include "../../../drivers/serial/sh-sci.h"
-
-#if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7721)
-#define EPK_SCSMR_VALUE 0x000
-#define EPK_SCBRR_VALUE 0x00C
-#define EPK_FIFO_SIZE 64
-#define EPK_FIFO_BITS (0x7f00 >> 8)
-#else
-#define EPK_FIFO_SIZE 16
-#define EPK_FIFO_BITS (0x1f00 >> 8)
-#endif
-
-static struct uart_port scif_port = {
-        .type           = PORT_SCIF,
-        .mapbase        = CONFIG_EARLY_SCIF_CONSOLE_PORT,
-        .membase        = (char __iomem *)CONFIG_EARLY_SCIF_CONSOLE_PORT,
-};
-
-static void scif_sercon_putc(int c)
-{
-        while (((sci_in(&scif_port, SCFDR) & EPK_FIFO_BITS) >= EPK_FIFO_SIZE))
-                ;
-
-        sci_in(&scif_port, SCxSR);
-        sci_out(&scif_port, SCxSR, 0xf3 & ~(0x20 | 0x40));
-        sci_out(&scif_port, SCxTDR, c);
-
-        while ((sci_in(&scif_port, SCxSR) & 0x40) == 0)
-                ;
-
-        if (c == '\n')
-                scif_sercon_putc('\r');
-}
-
-static void scif_sercon_write(struct console *con, const char *s,
-                              unsigned count)
-{
-        while (count-- > 0)
-                scif_sercon_putc(*s++);
-}
-
-static int __init scif_sercon_setup(struct console *con, char *options)
-{
-        con->cflag = CREAD | HUPCL | CLOCAL | B115200 | CS8;
-
-        return 0;
-}
-
-static struct console scif_console = {
-        .name           = "sercon",
-        .write          = scif_sercon_write,
-        .setup          = scif_sercon_setup,
-        .flags          = CON_PRINTBUFFER,
-        .index          = -1,
-};
-
-#if !defined(CONFIG_SH_STANDARD_BIOS)
-#if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7721)
-static void scif_sercon_init(char *s)
-{
-        sci_out(&scif_port, SCSCR, 0x0000);     /* clear TE and RE */
-        sci_out(&scif_port, SCFCR, 0x4006);     /* reset */
-        sci_out(&scif_port, SCSCR, 0x0000);     /* select internal clock */
-        sci_out(&scif_port, SCSMR, EPK_SCSMR_VALUE);
-        sci_out(&scif_port, SCBRR, EPK_SCBRR_VALUE);
-
-        mdelay(1);      /* wait 1-bit time */
-
-        sci_out(&scif_port, SCFCR, 0x0030);     /* TTRG=b'11 */
-        sci_out(&scif_port, SCSCR, 0x0030);     /* TE, RE */
-}
-#elif defined(CONFIG_CPU_SH4) || defined(CONFIG_CPU_SH3)
-#define DEFAULT_BAUD 115200
-/*
- * Simple SCIF init, primarily aimed at SH7750 and other similar SH-4
- * devices that aren't using sh-ipl+g.
- */
-static void scif_sercon_init(char *s)
-{
-        struct uart_port *port = &scif_port;
-        unsigned baud = DEFAULT_BAUD;
-        unsigned int status;
-        char *e;
-
-        if (*s == ',')
-                ++s;
-
-        if (*s) {
-                /* ignore ioport/device name */
-                s += strcspn(s, ",");
-                if (*s == ',')
-                        s++;
-        }
-
-        if (*s) {
-                baud = simple_strtoul(s, &e, 0);
-                if (baud == 0 || s == e)
-                        baud = DEFAULT_BAUD;
-        }
-
-        do {
-                status = sci_in(port, SCxSR);
-        } while (!(status & SCxSR_TEND(port)));
-
-        sci_out(port, SCSCR, 0);         /* TE=0, RE=0 */
-        sci_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST);
-        sci_out(port, SCSMR, 0);
-
-        /* Set baud rate */
-        sci_out(port, SCBRR, (CONFIG_SH_PCLK_FREQ + 16 * baud) /
-                (32 * baud) - 1);
-        udelay((1000000+(baud-1)) / baud); /* Wait one bit interval */
-
-        sci_out(port, SCSPTR, 0);
-        sci_out(port, SCxSR, 0x60);
-        sci_out(port, SCLSR, 0);
-
-        sci_out(port, SCFCR, 0);
-        sci_out(port, SCSCR, 0x30);      /* TE=1, RE=1 */
-}
-#endif /* defined(CONFIG_CPU_SUBTYPE_SH7720) */
-#endif /* !defined(CONFIG_SH_STANDARD_BIOS) */
-#endif /* CONFIG_EARLY_SCIF_CONSOLE */
-
-/*
- * Setup a default console, if more than one is compiled in, rely on the
- * earlyprintk= parsing to give priority.
- */
-static struct console *early_console =
-#ifdef CONFIG_SH_STANDARD_BIOS
-        &bios_console
-#elif defined(CONFIG_EARLY_SCIF_CONSOLE)
-        &scif_console
-#else
-        NULL
-#endif
-        ;
+static struct console *early_console;
 
 static int __init setup_early_printk(char *buf)
 {
@@ -211,21 +69,8 @@ static int __init setup_early_printk(char *buf)
         if (strstr(buf, "keep"))
                 keep_early = 1;
 
-#ifdef CONFIG_SH_STANDARD_BIOS
         if (!strncmp(buf, "bios", 4))
                 early_console = &bios_console;
-#endif
-#if defined(CONFIG_EARLY_SCIF_CONSOLE)
-        if (!strncmp(buf, "serial", 6)) {
-                early_console = &scif_console;
-
-#if !defined(CONFIG_SH_STANDARD_BIOS)
-#if defined(CONFIG_CPU_SH4) || defined(CONFIG_CPU_SH3)
-                scif_sercon_init(buf + 6);
-#endif
-#endif
-        }
-#endif
 
         if (likely(early_console)) {
                 if (keep_early)
diff --git a/arch/sh/kernel/ftrace.c b/arch/sh/kernel/ftrace.c
index b6f41c109beb..a48cdedc73b5 100644
--- a/arch/sh/kernel/ftrace.c
+++ b/arch/sh/kernel/ftrace.c
@@ -401,82 +401,10 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
 #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
 
 #ifdef CONFIG_FTRACE_SYSCALLS
-
-extern unsigned long __start_syscalls_metadata[];
-extern unsigned long __stop_syscalls_metadata[];
 extern unsigned long *sys_call_table;
 
-static struct syscall_metadata **syscalls_metadata;
-
-static struct syscall_metadata *find_syscall_meta(unsigned long *syscall)
-{
-        struct syscall_metadata *start;
-        struct syscall_metadata *stop;
-        char str[KSYM_SYMBOL_LEN];
-
-
-        start = (struct syscall_metadata *)__start_syscalls_metadata;
-        stop = (struct syscall_metadata *)__stop_syscalls_metadata;
-        kallsyms_lookup((unsigned long) syscall, NULL, NULL, NULL, str);
-
-        for ( ; start < stop; start++) {
-                if (start->name && !strcmp(start->name, str))
-                        return start;
-        }
-
-        return NULL;
-}
-
-struct syscall_metadata *syscall_nr_to_meta(int nr)
-{
-        if (!syscalls_metadata || nr >= FTRACE_SYSCALL_MAX || nr < 0)
-                return NULL;
-
-        return syscalls_metadata[nr];
-}
-
-int syscall_name_to_nr(char *name)
-{
-        int i;
-
-        if (!syscalls_metadata)
-                return -1;
-        for (i = 0; i < NR_syscalls; i++)
-                if (syscalls_metadata[i])
-                        if (!strcmp(syscalls_metadata[i]->name, name))
-                                return i;
-        return -1;
-}
-
-void set_syscall_enter_id(int num, int id)
-{
-        syscalls_metadata[num]->enter_id = id;
-}
-
-void set_syscall_exit_id(int num, int id)
-{
-        syscalls_metadata[num]->exit_id = id;
-}
-
-static int __init arch_init_ftrace_syscalls(void)
+unsigned long __init arch_syscall_addr(int nr)
 {
-        int i;
-        struct syscall_metadata *meta;
-        unsigned long **psys_syscall_table = &sys_call_table;
-
-        syscalls_metadata = kzalloc(sizeof(*syscalls_metadata) *
-                                        FTRACE_SYSCALL_MAX, GFP_KERNEL);
-        if (!syscalls_metadata) {
-                WARN_ON(1);
-                return -ENOMEM;
-        }
-
-        for (i = 0; i < FTRACE_SYSCALL_MAX; i++) {
-                meta = find_syscall_meta(psys_syscall_table[i]);
-                syscalls_metadata[i] = meta;
-        }
-
-        return 0;
+        return (unsigned long)sys_call_table[nr];
 }
-arch_initcall(arch_init_ftrace_syscalls);
 #endif /* CONFIG_FTRACE_SYSCALLS */
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index e1913f28f418..d2d41d046657 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -76,7 +76,7 @@ int show_interrupts(struct seq_file *p, void *v)
         if (!desc)
                 return 0;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         for_each_online_cpu(j)
                 any_count |= kstat_irqs_cpu(i, j);
         action = desc->action;
@@ -97,7 +97,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
         seq_putc(p, '\n');
 out:
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
         return 0;
 }
 #endif
diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c
index 359b8a2f4d2e..31f80c61b031 100644
--- a/arch/sh/kernel/process_64.c
+++ b/arch/sh/kernel/process_64.c
@@ -404,7 +404,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
         if (fpvalid) {
                 if (current == last_task_used_math) {
                         enable_fpu();
-                        save_fpu(tsk, regs);
+                        save_fpu(tsk);
                         disable_fpu();
                         last_task_used_math = 0;
                         regs->sr |= SR_FD;
@@ -431,7 +431,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
 #ifdef CONFIG_SH_FPU
         if(last_task_used_math == current) {
                 enable_fpu();
-                save_fpu(current, regs);
+                save_fpu(current);
                 disable_fpu();
                 last_task_used_math = NULL;
                 regs->sr |= SR_FD;
diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c
index 952da83903da..873ebdc4f98e 100644
--- a/arch/sh/kernel/ptrace_64.c
+++ b/arch/sh/kernel/ptrace_64.c
@@ -82,7 +82,7 @@ get_fpu_long(struct task_struct *task, unsigned long addr)
 
         if (last_task_used_math == task) {
                 enable_fpu();
-                save_fpu(task, regs);
+                save_fpu(task);
                 disable_fpu();
                 last_task_used_math = 0;
                 regs->sr |= SR_FD;
@@ -118,7 +118,7 @@ put_fpu_long(struct task_struct *task, unsigned long addr, unsigned long data)
                 set_stopped_child_used_math(task);
         } else if (last_task_used_math == task) {
                 enable_fpu();
-                save_fpu(task, regs);
+                save_fpu(task);
                 disable_fpu();
                 last_task_used_math = 0;
                 regs->sr |= SR_FD;
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 5a947a2567e4..8b0e69792cf4 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -423,6 +423,9 @@ void __init setup_arch(char **cmdline_p)
 
         plat_early_device_setup();
 
+        /* Let earlyprintk output early console messages */
+        early_platform_driver_probe("earlyprintk", 1, 1);
+
         sh_mv_setup();
 
         /*
diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c
index feb3dddd3192..ce76dbdef294 100644
--- a/arch/sh/kernel/signal_64.c
+++ b/arch/sh/kernel/signal_64.c
@@ -314,7 +314,7 @@ setup_sigcontext_fpu(struct pt_regs *regs, struct sigcontext __user *sc)
 
         if (current == last_task_used_math) {
                 enable_fpu();
-                save_fpu(current, regs);
+                save_fpu(current);
                 disable_fpu();
                 last_task_used_math = NULL;
                 regs->sr |= SR_FD;
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S
index 19fd11dd9871..4bd5a1146956 100644
--- a/arch/sh/kernel/syscalls_32.S
+++ b/arch/sh/kernel/syscalls_32.S
@@ -353,3 +353,4 @@ ENTRY(sys_call_table)
         .long sys_pwritev
         .long sys_rt_tgsigqueueinfo     /* 335 */
         .long sys_perf_event_open
+        .long sys_recvmmsg
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c
index 3da5a125d884..86639beac3a2 100644
--- a/arch/sh/kernel/traps_32.c
+++ b/arch/sh/kernel/traps_32.c
@@ -452,12 +452,18 @@ int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs,
         rm = regs->regs[index];
 
         /* shout about fixups */
-        if (!expected && printk_ratelimit())
-                printk(KERN_NOTICE "Fixing up unaligned %s access "
-                       "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
-                       user_mode(regs) ? "userspace" : "kernel",
-                       current->comm, task_pid_nr(current),
-                       (void *)regs->pc, instruction);
+        if (!expected) {
+                if (user_mode(regs) && (se_usermode & 1) && printk_ratelimit())
+                        pr_notice("Fixing up unaligned userspace access "
+                                  "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
+                                  current->comm, task_pid_nr(current),
+                                  (void *)regs->pc, instruction);
+                else if (se_kernmode_warn && printk_ratelimit())
+                        pr_notice("Fixing up unaligned kernel access "
+                                  "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
+                                  current->comm, task_pid_nr(current),
+                                  (void *)regs->pc, instruction);
+        }
 
         ret = -EFAULT;
         switch (instruction&0xF000) {
diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c
index 75c0cbe2eda0..d86f5315a0c1 100644
--- a/arch/sh/kernel/traps_64.c
+++ b/arch/sh/kernel/traps_64.c
@@ -600,7 +600,7 @@ static int misaligned_fpu_load(struct pt_regs *regs,
                    indexed by register number. */
                 if (last_task_used_math == current) {
                         enable_fpu();
-                        save_fpu(current, regs);
+                        save_fpu(current);
                         disable_fpu();
                         last_task_used_math = NULL;
                         regs->sr |= SR_FD;
@@ -673,7 +673,7 @@ static int misaligned_fpu_store(struct pt_regs *regs,
                    indexed by register number. */
                 if (last_task_used_math == current) {
                         enable_fpu();
-                        save_fpu(current, regs);
+                        save_fpu(current);
                         disable_fpu();
                         last_task_used_math = NULL;
                         regs->sr |= SR_FD;
diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
index f36a08bf3d5c..560ddb6bc8a7 100644
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
@@ -256,8 +256,7 @@ static void sh4_flush_cache_page(void *args)
                 address = (unsigned long)vaddr;
         }
 
-        if (pages_do_alias(address, phys))
-                flush_cache_one(CACHE_OC_ADDRESS_ARRAY |
+        flush_cache_one(CACHE_OC_ADDRESS_ARRAY |
                         (address & shm_align_mask), phys);
 
         if (vma->vm_flags & VM_EXEC)
diff --git a/arch/sh/mm/ioremap_32.c b/arch/sh/mm/ioremap_32.c
index a86eaa9d75a5..2141befb4f91 100644
--- a/arch/sh/mm/ioremap_32.c
+++ b/arch/sh/mm/ioremap_32.c
@@ -33,10 +33,10 @@
  * have to convert them into an offset in a page-aligned mapping, but the
  * caller shouldn't need to know that small detail.
  */
-void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
-                        unsigned long flags)
+void __iomem *__ioremap_caller(unsigned long phys_addr, unsigned long size,
+                               unsigned long flags, void *caller)
 {
-        struct vm_struct * area;
+        struct vm_struct *area;
         unsigned long offset, last_addr, addr, orig_addr;
         pgprot_t pgprot;
 
@@ -67,7 +67,7 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
         /*
          * Ok, go for it..
          */
-        area = get_vm_area(size, VM_IOREMAP);
+        area = get_vm_area_caller(size, VM_IOREMAP, caller);
         if (!area)
                 return NULL;
         area->phys_addr = phys_addr;
@@ -103,7 +103,7 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
 
         return (void __iomem *)(offset + (char *)orig_addr);
 }
-EXPORT_SYMBOL(__ioremap);
+EXPORT_SYMBOL(__ioremap_caller);
 
 void __iounmap(void __iomem *addr)
 {
diff --git a/arch/sh/mm/ioremap_64.c b/arch/sh/mm/ioremap_64.c
index b16843d02b76..ef434657d428 100644
--- a/arch/sh/mm/ioremap_64.c
+++ b/arch/sh/mm/ioremap_64.c
@@ -258,15 +258,15 @@ static void shmedia_unmapioaddr(unsigned long vaddr)
         pte_clear(&init_mm, vaddr, ptep);
 }
 
-void __iomem *__ioremap(unsigned long offset, unsigned long size,
-                        unsigned long flags)
+void __iomem *__ioremap_caller(unsigned long offset, unsigned long size,
+                               unsigned long flags, void *caller)
 {
         char name[14];
 
         sprintf(name, "phys_%08x", (u32)offset);
         return shmedia_alloc_io(offset, size, name, flags);
 }
-EXPORT_SYMBOL(__ioremap);
+EXPORT_SYMBOL(__ioremap_caller);
 
 void __iounmap(void __iomem *virtual)
 {
diff --git a/arch/sh/mm/numa.c b/arch/sh/mm/numa.c
index 6c524446c0f6..422e92721878 100644
--- a/arch/sh/mm/numa.c
+++ b/arch/sh/mm/numa.c
@@ -28,7 +28,7 @@ void __init setup_memory(void)
 {
         unsigned long free_pfn = PFN_UP(__pa(_end));
         u64 base = min_low_pfn << PAGE_SHIFT;
-        u64 size = (max_low_pfn << PAGE_SHIFT) - min_low_pfn;
+        u64 size = (max_low_pfn << PAGE_SHIFT) - base;
 
         lmb_add(base, size);
 
@@ -38,6 +38,15 @@ void __init setup_memory(void)
                     (__MEMORY_START + CONFIG_ZERO_PAGE_OFFSET));
 
         /*
+         * Reserve physical pages below CONFIG_ZERO_PAGE_OFFSET.
+         */
+        if (CONFIG_ZERO_PAGE_OFFSET != 0)
+                lmb_reserve(__MEMORY_START, CONFIG_ZERO_PAGE_OFFSET);
+
+        lmb_analyze();
+        lmb_dump_all();
+
+        /*
          * Node 0 sets up its pgdat at the first available pfn,
          * and bumps it up before setting up the bootmem allocator.
          */
@@ -71,7 +80,7 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)
 
         /* Node-local pgdat */
         NODE_DATA(nid) = __va(lmb_alloc_base(sizeof(struct pglist_data),
-                                             SMP_CACHE_BYTES, end_pfn));
+                                             SMP_CACHE_BYTES, end));
         memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
 
         NODE_DATA(nid)->bdata = &bootmem_node_data[nid];
@@ -81,7 +90,7 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)
         /* Node-local bootmap */
         bootmap_pages = bootmem_bootmap_pages(end_pfn - start_pfn);
         bootmem_paddr = lmb_alloc_base(bootmap_pages << PAGE_SHIFT,
-                                       PAGE_SIZE, end_pfn);
+                                       PAGE_SIZE, end);
         init_bootmem_node(NODE_DATA(nid), bootmem_paddr >> PAGE_SHIFT,
                           start_pfn, end_pfn);
 
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 33ac1a9ac881..108197ac0d56 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -43,6 +43,7 @@ config SPARC64
         select HAVE_SYSCALL_WRAPPERS
         select HAVE_DYNAMIC_FTRACE
         select HAVE_FTRACE_MCOUNT_RECORD
+        select HAVE_SYSCALL_TRACEPOINTS
         select USE_GENERIC_SMP_HELPERS if SMP
         select RTC_DRV_CMOS
         select RTC_DRV_BQ4802
diff --git a/arch/sparc/Kconfig.debug b/arch/sparc/Kconfig.debug
index 90d5fe223a74..9d3c889718ac 100644
--- a/arch/sparc/Kconfig.debug
+++ b/arch/sparc/Kconfig.debug
@@ -33,4 +33,18 @@ config FRAME_POINTER
         depends on MCOUNT
         default y
 
+config DEBUG_STRICT_USER_COPY_CHECKS
+        bool "Strict copy size checks"
+        depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
+        ---help---
+          Enabling this option turns a certain set of sanity checks for user
+          copy operations into compile time failures.
+
+          The copy_from_user() etc checks are there to help test if there
+          are sufficient security checks on the length argument of
+          the copy operation, by having gcc prove that the argument is
+          within bounds.
+
+          If unsure, or if you run an older (pre 4.4) gcc, say N.
+
 endmenu
diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
index 381a1b5256d6..4269ca6ad18a 100644
--- a/arch/sparc/include/asm/elf_32.h
+++ b/arch/sparc/include/asm/elf_32.h
@@ -104,8 +104,6 @@ typedef struct {
 #define ELF_CLASS       ELFCLASS32
 #define ELF_DATA        ELFDATA2MSB
 
-#define USE_ELF_CORE_DUMP
-
 #define ELF_EXEC_PAGESIZE       4096
 
 
diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
index d42e393078c4..ff66bb88537b 100644
--- a/arch/sparc/include/asm/elf_64.h
+++ b/arch/sparc/include/asm/elf_64.h
@@ -152,7 +152,6 @@ typedef struct {
                                          (x)->e_machine == EM_SPARC32PLUS)
 #define compat_start_thread             start_thread32
 
-#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
diff --git a/arch/sparc/include/asm/spinlock_32.h b/arch/sparc/include/asm/spinlock_32.h
index 857630cff636..7f9b9dba38a6 100644
--- a/arch/sparc/include/asm/spinlock_32.h
+++ b/arch/sparc/include/asm/spinlock_32.h
@@ -10,12 +10,12 @@
 
 #include <asm/psr.h>
 
-#define __raw_spin_is_locked(lock) (*((volatile unsigned char *)(lock)) != 0)
+#define arch_spin_is_locked(lock) (*((volatile unsigned char *)(lock)) != 0)
 
-#define __raw_spin_unlock_wait(lock) \
-        do { while (__raw_spin_is_locked(lock)) cpu_relax(); } while (0)
+#define arch_spin_unlock_wait(lock) \
+        do { while (arch_spin_is_locked(lock)) cpu_relax(); } while (0)
 
-static inline void __raw_spin_lock(raw_spinlock_t *lock)
+static inline void arch_spin_lock(arch_spinlock_t *lock)
 {
         __asm__ __volatile__(
         "\n1:\n\t"
@@ -35,7 +35,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
         : "g2", "memory", "cc");
 }
 
-static inline int __raw_spin_trylock(raw_spinlock_t *lock)
+static inline int arch_spin_trylock(arch_spinlock_t *lock)
 {
         unsigned int result;
         __asm__ __volatile__("ldstub [%1], %0"
@@ -45,7 +45,7 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock)
         return (result == 0);
 }
 
-static inline void __raw_spin_unlock(raw_spinlock_t *lock)
+static inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
         __asm__ __volatile__("stb %%g0, [%0]" : : "r" (lock) : "memory");
 }
@@ -65,7 +65,7 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
  * Sort of like atomic_t's on Sparc, but even more clever.
  *
  *      ------------------------------------
- *      | 24-bit counter           | wlock |  raw_rwlock_t
+ *      | 24-bit counter           | wlock |  arch_rwlock_t
  *      ------------------------------------
  *       31                       8 7     0
  *
@@ -76,9 +76,9 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
  *
  * Unfortunately this scheme limits us to ~16,000,000 cpus.
  */
-static inline void arch_read_lock(raw_rwlock_t *rw)
+static inline void __arch_read_lock(arch_rwlock_t *rw)
 {
-        register raw_rwlock_t *lp asm("g1");
+        register arch_rwlock_t *lp asm("g1");
         lp = rw;
         __asm__ __volatile__(
         "mov    %%o7, %%g4\n\t"
@@ -89,16 +89,16 @@ static inline void arch_read_lock(raw_rwlock_t *rw)
         : "g2", "g4", "memory", "cc");
 }
 
-#define __raw_read_lock(lock) \
+#define arch_read_lock(lock) \
 do {    unsigned long flags; \
         local_irq_save(flags); \
-        arch_read_lock(lock); \
+        __arch_read_lock(lock); \
         local_irq_restore(flags); \
 } while(0)
 
-static inline void arch_read_unlock(raw_rwlock_t *rw)
+static inline void __arch_read_unlock(arch_rwlock_t *rw)
 {
-        register raw_rwlock_t *lp asm("g1");
+        register arch_rwlock_t *lp asm("g1");
         lp = rw;
         __asm__ __volatile__(
         "mov    %%o7, %%g4\n\t"
@@ -109,16 +109,16 @@ static inline void arch_read_unlock(raw_rwlock_t *rw)
         : "g2", "g4", "memory", "cc");
 }
 
-#define __raw_read_unlock(lock) \
+#define arch_read_unlock(lock) \
 do {    unsigned long flags; \
         local_irq_save(flags); \
-        arch_read_unlock(lock); \
+        __arch_read_unlock(lock); \
         local_irq_restore(flags); \
 } while(0)
 
-static inline void __raw_write_lock(raw_rwlock_t *rw)
+static inline void arch_write_lock(arch_rwlock_t *rw)
 {
-        register raw_rwlock_t *lp asm("g1");
+        register arch_rwlock_t *lp asm("g1");
         lp = rw;
         __asm__ __volatile__(
         "mov    %%o7, %%g4\n\t"
@@ -130,7 +130,7 @@ static inline void __raw_write_lock(raw_rwlock_t *rw)
         *(volatile __u32 *)&lp->lock = ~0U;
 }
 
-static inline int __raw_write_trylock(raw_rwlock_t *rw)
+static inline int arch_write_trylock(arch_rwlock_t *rw)
 {
         unsigned int val;
 
@@ -150,9 +150,9 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)
         return (val == 0);
 }
 
-static inline int arch_read_trylock(raw_rwlock_t *rw)
+static inline int __arch_read_trylock(arch_rwlock_t *rw)
 {
-        register raw_rwlock_t *lp asm("g1");
+        register arch_rwlock_t *lp asm("g1");
         register int res asm("o0");
         lp = rw;
         __asm__ __volatile__(
@@ -165,27 +165,27 @@ static inline int arch_read_trylock(raw_rwlock_t *rw)
         return res;
 }
 
-#define __raw_read_trylock(lock) \
+#define arch_read_trylock(lock) \
 ({      unsigned long flags; \
         int res; \
         local_irq_save(flags); \
-        res = arch_read_trylock(lock); \
+        res = __arch_read_trylock(lock); \
         local_irq_restore(flags); \
         res; \
 })
 
-#define __raw_write_unlock(rw)  do { (rw)->lock = 0; } while(0)
+#define arch_write_unlock(rw)   do { (rw)->lock = 0; } while(0)
 
-#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
-#define __raw_read_lock_flags(rw, flags)   __raw_read_lock(rw)
-#define __raw_write_lock_flags(rw, flags)  __raw_write_lock(rw)
+#define arch_spin_lock_flags(lock, flags) arch_spin_lock(lock)
+#define arch_read_lock_flags(rw, flags)   arch_read_lock(rw)
+#define arch_write_lock_flags(rw, flags)  arch_write_lock(rw)
 
-#define _raw_spin_relax(lock)   cpu_relax()
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
+#define arch_spin_relax(lock)   cpu_relax()
+#define arch_read_relax(lock)   cpu_relax()
+#define arch_write_relax(lock)  cpu_relax()
 
-#define __raw_read_can_lock(rw) (!((rw)->lock & 0xff))
-#define __raw_write_can_lock(rw) (!(rw)->lock)
+#define arch_read_can_lock(rw) (!((rw)->lock & 0xff))
+#define arch_write_can_lock(rw) (!(rw)->lock)
 
 #endif /* !(__ASSEMBLY__) */
 
diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
index 43e514783582..073936a8b275 100644
--- a/arch/sparc/include/asm/spinlock_64.h
+++ b/arch/sparc/include/asm/spinlock_64.h
@@ -21,13 +21,13 @@
  * the spinner sections must be pre-V9 branches.
  */
 
-#define __raw_spin_is_locked(lp)        ((lp)->lock != 0)
+#define arch_spin_is_locked(lp) ((lp)->lock != 0)
 
-#define __raw_spin_unlock_wait(lp)      \
+#define arch_spin_unlock_wait(lp)       \
         do {    rmb();                  \
         } while((lp)->lock)
 
-static inline void __raw_spin_lock(raw_spinlock_t *lock)
+static inline void arch_spin_lock(arch_spinlock_t *lock)
 {
         unsigned long tmp;
 
@@ -46,7 +46,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
         : "memory");
 }
 
-static inline int __raw_spin_trylock(raw_spinlock_t *lock)
+static inline int arch_spin_trylock(arch_spinlock_t *lock)
 {
         unsigned long result;
 
@@ -59,7 +59,7 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock)
         return (result == 0UL);
 }
 
-static inline void __raw_spin_unlock(raw_spinlock_t *lock)
+static inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
         __asm__ __volatile__(
 "       stb             %%g0, [%0]"
@@ -68,7 +68,7 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
         : "memory");
 }
 
-static inline void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
+static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
 {
         unsigned long tmp1, tmp2;
 
@@ -92,7 +92,7 @@ static inline void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long fla
 
 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
 
-static void inline arch_read_lock(raw_rwlock_t *lock)
+static void inline arch_read_lock(arch_rwlock_t *lock)
 {
         unsigned long tmp1, tmp2;
 
@@ -115,7 +115,7 @@ static void inline arch_read_lock(raw_rwlock_t *lock)
         : "memory");
 }
 
-static int inline arch_read_trylock(raw_rwlock_t *lock)
+static int inline arch_read_trylock(arch_rwlock_t *lock)
 {
         int tmp1, tmp2;
 
@@ -136,7 +136,7 @@ static int inline arch_read_trylock(raw_rwlock_t *lock)
         return tmp1;
 }
 
-static void inline arch_read_unlock(raw_rwlock_t *lock)
+static void inline arch_read_unlock(arch_rwlock_t *lock)
 {
         unsigned long tmp1, tmp2;
 
@@ -152,7 +152,7 @@ static void inline arch_read_unlock(raw_rwlock_t *lock)
         : "memory");
 }
 
-static void inline arch_write_lock(raw_rwlock_t *lock)
+static void inline arch_write_lock(arch_rwlock_t *lock)
 {
         unsigned long mask, tmp1, tmp2;
 
@@ -177,7 +177,7 @@ static void inline arch_write_lock(raw_rwlock_t *lock)
         : "memory");
 }
 
-static void inline arch_write_unlock(raw_rwlock_t *lock)
+static void inline arch_write_unlock(arch_rwlock_t *lock)
 {
         __asm__ __volatile__(
 "       stw             %%g0, [%0]"
@@ -186,7 +186,7 @@ static void inline arch_write_unlock(raw_rwlock_t *lock)
         : "memory");
 }
 
-static int inline arch_write_trylock(raw_rwlock_t *lock)
+static int inline arch_write_trylock(arch_rwlock_t *lock)
 {
         unsigned long mask, tmp1, tmp2, result;
 
@@ -210,21 +210,21 @@ static int inline arch_write_trylock(raw_rwlock_t *lock)
         return result;
 }
 
-#define __raw_read_lock(p)      arch_read_lock(p)
-#define __raw_read_lock_flags(p, f) arch_read_lock(p)
-#define __raw_read_trylock(p)   arch_read_trylock(p)
-#define __raw_read_unlock(p)    arch_read_unlock(p)
-#define __raw_write_lock(p)     arch_write_lock(p)
-#define __raw_write_lock_flags(p, f) arch_write_lock(p)
-#define __raw_write_unlock(p)   arch_write_unlock(p)
-#define __raw_write_trylock(p)  arch_write_trylock(p)
-
-#define __raw_read_can_lock(rw)         (!((rw)->lock & 0x80000000UL))
-#define __raw_write_can_lock(rw)        (!(rw)->lock)
-
-#define _raw_spin_relax(lock)   cpu_relax()
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
+#define arch_read_lock(p)       arch_read_lock(p)
+#define arch_read_lock_flags(p, f) arch_read_lock(p)
+#define arch_read_trylock(p)    arch_read_trylock(p)
+#define arch_read_unlock(p)     arch_read_unlock(p)
+#define arch_write_lock(p)      arch_write_lock(p)
+#define arch_write_lock_flags(p, f) arch_write_lock(p)
+#define arch_write_unlock(p)    arch_write_unlock(p)
+#define arch_write_trylock(p)   arch_write_trylock(p)
+
+#define arch_read_can_lock(rw)          (!((rw)->lock & 0x80000000UL))
+#define arch_write_can_lock(rw) (!(rw)->lock)
+
+#define arch_spin_relax(lock)   cpu_relax()
+#define arch_read_relax(lock)   cpu_relax()
+#define arch_write_relax(lock)  cpu_relax()
 
 #endif /* !(__ASSEMBLY__) */
 
diff --git a/arch/sparc/include/asm/spinlock_types.h b/arch/sparc/include/asm/spinlock_types.h
index 37cbe01c585b..9c454fdeaad8 100644
--- a/arch/sparc/include/asm/spinlock_types.h
+++ b/arch/sparc/include/asm/spinlock_types.h
@@ -7,14 +7,14 @@
 
 typedef struct {
         volatile unsigned char lock;
-} raw_spinlock_t;
+} arch_spinlock_t;
 
-#define __RAW_SPIN_LOCK_UNLOCKED        { 0 }
+#define __ARCH_SPIN_LOCK_UNLOCKED       { 0 }
 
 typedef struct {
         volatile unsigned int lock;
-} raw_rwlock_t;
+} arch_rwlock_t;
 
-#define __RAW_RW_LOCK_UNLOCKED          { 0 }
+#define __ARCH_RW_LOCK_UNLOCKED         { 0 }
 
 #endif
diff --git a/arch/sparc/include/asm/string_32.h b/arch/sparc/include/asm/string_32.h
index 6c5fddb7e6b5..edf196ee4ef8 100644
--- a/arch/sparc/include/asm/string_32.h
+++ b/arch/sparc/include/asm/string_32.h
@@ -16,8 +16,6 @@
 #ifdef __KERNEL__
 
 extern void __memmove(void *,const void *,__kernel_size_t);
-extern __kernel_size_t __memcpy(void *,const void *,__kernel_size_t);
-extern __kernel_size_t __memset(void *,int,__kernel_size_t);
 
 #ifndef EXPORT_SYMTAB_STROPS
 
@@ -32,82 +30,10 @@ extern __kernel_size_t __memset(void *,int,__kernel_size_t);
 })
 
 #define __HAVE_ARCH_MEMCPY
-
-static inline void *__constant_memcpy(void *to, const void *from, __kernel_size_t n)
-{
-        extern void __copy_1page(void *, const void *);
-
-        if(n <= 32) {
-                __builtin_memcpy(to, from, n);
-        } else if (((unsigned int) to & 7) != 0) {
-                /* Destination is not aligned on the double-word boundary */
-                __memcpy(to, from, n);
-        } else {
-                switch(n) {
-                case PAGE_SIZE:
-                        __copy_1page(to, from);
-                        break;
-                default:
-                        __memcpy(to, from, n);
-                        break;
-                }
-        }
-        return to;
-}
-
-static inline void *__nonconstant_memcpy(void *to, const void *from, __kernel_size_t n)
-{
-        __memcpy(to, from, n);
-        return to;
-}
-
-#undef memcpy
-#define memcpy(t, f, n) \
-(__builtin_constant_p(n) ? \
- __constant_memcpy((t),(f),(n)) : \
- __nonconstant_memcpy((t),(f),(n)))
+#define memcpy(t, f, n) __builtin_memcpy(t, f, n)
 
 #define __HAVE_ARCH_MEMSET
-
-static inline void *__constant_c_and_count_memset(void *s, char c, __kernel_size_t count)
-{
-        extern void bzero_1page(void *);
-        extern __kernel_size_t __bzero(void *, __kernel_size_t);
-
-        if(!c) {
-                if(count == PAGE_SIZE)
-                        bzero_1page(s);
-                else
-                        __bzero(s, count);
-        } else {
-                __memset(s, c, count);
-        }
-        return s;
-}
-
-static inline void *__constant_c_memset(void *s, char c, __kernel_size_t count)
-{
-        extern __kernel_size_t __bzero(void *, __kernel_size_t);
-
-        if(!c)
-                __bzero(s, count);
-        else
-                __memset(s, c, count);
-        return s;
-}
-
-static inline void *__nonconstant_memset(void *s, char c, __kernel_size_t count)
-{
-        __memset(s, c, count);
-        return s;
-}
-
-#undef memset
-#define memset(s, c, count) \
-(__builtin_constant_p(c) ? (__builtin_constant_p(count) ? \
-                            __constant_c_and_count_memset((s), (c), (count)) : \
-                            __constant_c_memset((s), (c), (count))) \
-                          : __nonconstant_memset((s), (c), (count)))
+#define memset(s, c, count) __builtin_memset(s, c, count)
 
 #define __HAVE_ARCH_MEMSCAN
 
diff --git a/arch/sparc/include/asm/string_64.h b/arch/sparc/include/asm/string_64.h
index 43161f2d17eb..9623bc213158 100644
--- a/arch/sparc/include/asm/string_64.h
+++ b/arch/sparc/include/asm/string_64.h
@@ -15,8 +15,6 @@
 
 #include <asm/asi.h>
 
-extern void *__memset(void *,int,__kernel_size_t);
-
 #ifndef EXPORT_SYMTAB_STROPS
 
 /* First the mem*() things. */
@@ -24,29 +22,10 @@ extern void *__memset(void *,int,__kernel_size_t);
 extern void *memmove(void *, const void *, __kernel_size_t);
 
 #define __HAVE_ARCH_MEMCPY
-extern void *memcpy(void *, const void *, __kernel_size_t);
+#define memcpy(t, f, n) __builtin_memcpy(t, f, n)
 
 #define __HAVE_ARCH_MEMSET
-extern void *__builtin_memset(void *,int,__kernel_size_t);
-
-static inline void *__constant_memset(void *s, int c, __kernel_size_t count)
-{
-        extern __kernel_size_t __bzero(void *, __kernel_size_t);
-
-        if (!c) {
-                __bzero(s, count);
-                return s;
-        } else
-                return __memset(s, c, count);
-}
-
-#undef memset
-#define memset(s, c, count) \
-((__builtin_constant_p(count) && (count) <= 32) ? \
- __builtin_memset((s), (c), (count)) : \
- (__builtin_constant_p(c) ? \
-  __constant_memset((s), (c), (count)) : \
-  __memset((s), (c), (count))))
+#define memset(s, c, count) __builtin_memset(s, c, count)
 
 #define __HAVE_ARCH_MEMSCAN
 
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
index 1b45a7bbe407..7257ebb8f394 100644
--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@@ -227,6 +227,7 @@ register struct thread_info *current_thread_info_reg asm("g6");
 /* flag bit 8 is available */
 #define TIF_SECCOMP             9       /* secure computing */
 #define TIF_SYSCALL_AUDIT       10      /* syscall auditing active */
+#define TIF_SYSCALL_TRACEPOINT  11      /* syscall tracepoint instrumentation */
 /* flag bit 11 is available */
 /* NOTE: Thread flags >= 12 should be ones we have no interest
  *       in using in assembly, else we can't use the mask as
@@ -246,6 +247,7 @@ register struct thread_info *current_thread_info_reg asm("g6");
 #define _TIF_32BIT              (1<<TIF_32BIT)
 #define _TIF_SECCOMP            (1<<TIF_SECCOMP)
 #define _TIF_SYSCALL_AUDIT      (1<<TIF_SYSCALL_AUDIT)
+#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
 #define _TIF_ABI_PENDING        (1<<TIF_ABI_PENDING)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
 #define _TIF_FREEZE             (1<<TIF_FREEZE)
diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
index 8303ac481034..489d2ba92bcb 100644
--- a/arch/sparc/include/asm/uaccess_32.h
+++ b/arch/sparc/include/asm/uaccess_32.h
@@ -260,8 +260,23 @@ static inline unsigned long __copy_to_user(void __user *to, const void *from, un
         return __copy_user(to, (__force void __user *) from, n);
 }
 
+extern void copy_from_user_overflow(void)
+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
+        __compiletime_error("copy_from_user() buffer size is not provably correct")
+#else
+        __compiletime_warning("copy_from_user() buffer size is not provably correct")
+#endif
+;
+
 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
 {
+        int sz = __compiletime_object_size(to);
+
+        if (unlikely(sz != -1 && sz < n)) {
+                copy_from_user_overflow();
+                return -EFAULT;
+        }
+
         if (n && __access_ok((unsigned long) from, n))
                 return __copy_user((__force void __user *) to, from, n);
         else
diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
index 9ea271e19c70..dbc141660994 100644
--- a/arch/sparc/include/asm/uaccess_64.h
+++ b/arch/sparc/include/asm/uaccess_64.h
@@ -6,6 +6,7 @@
  */
 
 #ifdef __KERNEL__
+#include <linux/errno.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
 #include <linux/thread_info.h>
@@ -204,6 +205,14 @@ __asm__ __volatile__(							\
 
 extern int __get_user_bad(void);
 
+extern void copy_from_user_overflow(void)
+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
+        __compiletime_error("copy_from_user() buffer size is not provably correct")
+#else
+        __compiletime_warning("copy_from_user() buffer size is not provably correct")
+#endif
+;
+
 extern unsigned long __must_check ___copy_from_user(void *to,
                                                     const void __user *from,
                                                     unsigned long size);
@@ -212,10 +221,16 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
 static inline unsigned long __must_check
 copy_from_user(void *to, const void __user *from, unsigned long size)
 {
-        unsigned long ret = ___copy_from_user(to, from, size);
-
-        if (unlikely(ret))
-                ret = copy_from_user_fixup(to, from, size);
+        unsigned long ret = (unsigned long) -EFAULT;
+        int sz = __compiletime_object_size(to);
+
+        if (likely(sz == -1 || sz >= size)) {
+                ret = ___copy_from_user(to, from, size);
+                if (unlikely(ret))
+                        ret = copy_from_user_fixup(to, from, size);
+        } else {
+                copy_from_user_overflow();
+        }
         return ret;
 }
 #define __copy_from_user copy_from_user
diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h
index d8d25bd97121..cb4b9bfd0d87 100644
--- a/arch/sparc/include/asm/unistd.h
+++ b/arch/sparc/include/asm/unistd.h
@@ -398,7 +398,7 @@
 #define __NR_perf_event_open    327
 #define __NR_recvmmsg           328
 
-#define NR_SYSCALLS             329
+#define NR_syscalls             329
 
 #ifdef __32bit_syscall_numbers__
 /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants,
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index ec9c7bc67d21..1504df8ddf70 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -1294,7 +1294,7 @@ linux_sparc_syscall:
         sethi   %hi(PSR_SYSCALL), %l4
         or      %l0, %l4, %l0
         /* Direct access to user regs, must faster. */
-        cmp     %g1, NR_SYSCALLS
+        cmp     %g1, NR_syscalls
         bgeu    linux_sparc_ni_syscall
          sll    %g1, 2, %l4
         ld      [%l7 + %l4], %l7
diff --git a/arch/sparc/kernel/ftrace.c b/arch/sparc/kernel/ftrace.c
index d3b1a3076569..29973daa9930 100644
--- a/arch/sparc/kernel/ftrace.c
+++ b/arch/sparc/kernel/ftrace.c
@@ -4,6 +4,7 @@
 #include <linux/percpu.h>
 #include <linux/init.h>
 #include <linux/list.h>
+#include <trace/syscall.h>
 
 #include <asm/ftrace.h>
 
@@ -91,3 +92,13 @@ int __init ftrace_dyn_arch_init(void *data)
 }
 #endif
 
+#ifdef CONFIG_FTRACE_SYSCALLS
+
+extern unsigned int sys_call_table[];
+
+unsigned long __init arch_syscall_addr(int nr)
+{
+        return (unsigned long)sys_call_table[nr];
+}
+
+#endif
diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
index 7690cc219ecc..5fad94950e76 100644
--- a/arch/sparc/kernel/iommu.c
+++ b/arch/sparc/kernel/iommu.c
@@ -11,6 +11,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/errno.h>
 #include <linux/iommu-helper.h>
+#include <linux/bitmap.h>
 
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
@@ -169,7 +170,7 @@ void iommu_range_free(struct iommu *iommu, dma_addr_t dma_addr, unsigned long np
 
         entry = (dma_addr - iommu->page_table_map_base) >> IO_PAGE_SHIFT;
 
-        iommu_area_free(arena->map, entry, npages);
+        bitmap_clear(arena->map, entry, npages);
 }
 
 int iommu_table_init(struct iommu *iommu, int tsbsize,
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
index ce996f97855f..8d6882bb480a 100644
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -176,7 +176,7 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                 action = irq_desc[i].action;
                 if (!action)
                         goto skip;
@@ -195,7 +195,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
 skip:
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         } else if (i == NR_IRQS) {
                 seq_printf(p, "NMI: ");
                 for_each_online_cpu(j)
@@ -785,14 +785,14 @@ void fixup_irqs(void)
         for (irq = 0; irq < NR_IRQS; irq++) {
                 unsigned long flags;
 
-                spin_lock_irqsave(&irq_desc[irq].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[irq].lock, flags);
                 if (irq_desc[irq].action &&
                     !(irq_desc[irq].status & IRQ_PER_CPU)) {
                         if (irq_desc[irq].chip->set_affinity)
                                 irq_desc[irq].chip->set_affinity(irq,
                                         irq_desc[irq].affinity);
                 }
-                spin_unlock_irqrestore(&irq_desc[irq].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[irq].lock, flags);
         }
 
         tick_ops->disable_irq();
diff --git a/arch/sparc/kernel/kprobes.c b/arch/sparc/kernel/kprobes.c
index 3bc6527c95af..6716584e48ab 100644
--- a/arch/sparc/kernel/kprobes.c
+++ b/arch/sparc/kernel/kprobes.c
@@ -46,6 +46,9 @@ struct kretprobe_blackpoint kretprobe_blacklist[] = {{NULL, NULL}};
 
 int __kprobes arch_prepare_kprobe(struct kprobe *p)
 {
+        if ((unsigned long) p->addr & 0x3UL)
+                return -EILSEQ;
+
         p->ainsn.insn[0] = *p->addr;
         flushi(&p->ainsn.insn[0]);
 
diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
index cb3c72c45aab..df39a0f0d27a 100644
--- a/arch/sparc/kernel/ldc.c
+++ b/arch/sparc/kernel/ldc.c
@@ -14,6 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/list.h>
 #include <linux/init.h>
+#include <linux/bitmap.h>
 
 #include <asm/hypervisor.h>
 #include <asm/iommu.h>
@@ -1242,13 +1243,13 @@ int ldc_bind(struct ldc_channel *lp, const char *name)
         snprintf(lp->tx_irq_name, LDC_IRQ_NAME_MAX, "%s TX", name);
 
         err = request_irq(lp->cfg.rx_irq, ldc_rx,
-                          IRQF_SAMPLE_RANDOM | IRQF_DISABLED | IRQF_SHARED,
+                          IRQF_SAMPLE_RANDOM | IRQF_DISABLED,
                           lp->rx_irq_name, lp);
         if (err)
                 return err;
 
         err = request_irq(lp->cfg.tx_irq, ldc_tx,
-                          IRQF_SAMPLE_RANDOM | IRQF_DISABLED | IRQF_SHARED,
+                          IRQF_SAMPLE_RANDOM | IRQF_DISABLED,
                           lp->tx_irq_name, lp);
         if (err) {
                 free_irq(lp->cfg.rx_irq, lp);
@@ -1875,7 +1876,7 @@ EXPORT_SYMBOL(ldc_read);
 static long arena_alloc(struct ldc_iommu *iommu, unsigned long npages)
 {
         struct iommu_arena *arena = &iommu->arena;
-        unsigned long n, i, start, end, limit;
+        unsigned long n, start, end, limit;
         int pass;
 
         limit = arena->limit;
@@ -1883,7 +1884,7 @@ static long arena_alloc(struct ldc_iommu *iommu, unsigned long npages)
         pass = 0;
 
 again:
-        n = find_next_zero_bit(arena->map, limit, start);
+        n = bitmap_find_next_zero_area(arena->map, limit, start, npages, 0);
         end = n + npages;
         if (unlikely(end >= limit)) {
                 if (likely(pass < 1)) {
@@ -1896,16 +1897,7 @@ again:
                         return -1;
                 }
         }
-
-        for (i = n; i < end; i++) {
-                if (test_bit(i, arena->map)) {
-                        start = i + 1;
-                        goto again;
-                }
-        }
-
-        for (i = n; i < end; i++)
-                __set_bit(i, arena->map);
+        bitmap_set(arena->map, n, npages);
 
         arena->hint = end;
 
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index 938da19dc065..cdc91d919e93 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -10,6 +10,7 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/miscdevice.h>
+#include <linux/bootmem.h>
 
 #include <asm/cpudata.h>
 #include <asm/hypervisor.h>
@@ -108,25 +109,15 @@ static struct mdesc_handle * __init mdesc_lmb_alloc(unsigned int mdesc_size)
 
 static void mdesc_lmb_free(struct mdesc_handle *hp)
 {
-        unsigned int alloc_size, handle_size = hp->handle_size;
-        unsigned long start, end;
+        unsigned int alloc_size;
+        unsigned long start;
 
         BUG_ON(atomic_read(&hp->refcnt) != 0);
         BUG_ON(!list_empty(&hp->list));
 
-        alloc_size = PAGE_ALIGN(handle_size);
-
-        start = (unsigned long) hp;
-        end = start + alloc_size;
-
-        while (start < end) {
-                struct page *p;
-
-                p = virt_to_page(start);
-                ClearPageReserved(p);
-                __free_page(p);
-                start += PAGE_SIZE;
-        }
+        alloc_size = PAGE_ALIGN(hp->handle_size);
+        start = __pa(hp);
+        free_bootmem_late(start, alloc_size);
 }
 
 static struct mdesc_mem_ops lmb_mdesc_ops = {
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 881947e59e95..0a6f2d1798d1 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -104,9 +104,19 @@ static int of_bus_pci_map(u32 *addr, const u32 *range,
         int i;
 
         /* Check address type match */
-        if ((addr[0] ^ range[0]) & 0x03000000)
-                return -EINVAL;
+        if (!((addr[0] ^ range[0]) & 0x03000000))
+                goto type_match;
+
+        /* Special exception, we can map a 64-bit address into
+         * a 32-bit range.
+         */
+        if ((addr[0] & 0x03000000) == 0x03000000 &&
+            (range[0] & 0x03000000) == 0x02000000)
+                goto type_match;
+
+        return -EINVAL;
 
+type_match:
         if (of_out_of_range(addr + 1, range + 1, range + na + pna,
                             na - 1, ns))
                 return -EINVAL;
diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
index 4ae91dc2feb9..2f6524d1a817 100644
--- a/arch/sparc/kernel/ptrace_64.c
+++ b/arch/sparc/kernel/ptrace_64.c
@@ -23,6 +23,7 @@
 #include <linux/signal.h>
 #include <linux/regset.h>
 #include <linux/tracehook.h>
+#include <trace/syscall.h>
 #include <linux/compat.h>
 #include <linux/elf.h>
 
@@ -37,6 +38,9 @@
 #include <asm/cpudata.h>
 #include <asm/cacheflush.h>
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/syscalls.h>
+
 #include "entry.h"
 
 /* #define ALLOW_INIT_TRACING */
@@ -1059,6 +1063,9 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
         if (test_thread_flag(TIF_SYSCALL_TRACE))
                 ret = tracehook_report_syscall_entry(regs);
 
+        if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
+                trace_sys_enter(regs, regs->u_regs[UREG_G1]);
+
         if (unlikely(current->audit_context) && !ret)
                 audit_syscall_entry((test_thread_flag(TIF_32BIT) ?
                                      AUDIT_ARCH_SPARC :
@@ -1084,6 +1091,9 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
                 audit_syscall_exit(result, regs->u_regs[UREG_I0]);
         }
 
+        if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
+                trace_sys_exit(regs, regs->u_regs[UREG_G1]);
+
         if (test_thread_flag(TIF_SYSCALL_TRACE))
                 tracehook_report_syscall_exit(regs, 0);
 }
diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
index d150c2aa98d2..dc4a458f74dc 100644
--- a/arch/sparc/kernel/syscalls.S
+++ b/arch/sparc/kernel/syscalls.S
@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
 #endif
         .align  32
 1:      ldx     [%g6 + TI_FLAGS], %l5
-        andcc   %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %g0
+        andcc   %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
         be,pt   %icc, rtrap
          nop
         call    syscall_trace_leave
@@ -187,7 +187,7 @@ linux_syscall_trace:
         .globl  linux_sparc_syscall32
 linux_sparc_syscall32:
         /* Direct access to user regs, much faster. */
-        cmp     %g1, NR_SYSCALLS                        ! IEU1  Group
+        cmp     %g1, NR_syscalls                        ! IEU1  Group
         bgeu,pn %xcc, linux_sparc_ni_syscall            ! CTI
          srl    %i0, 0, %o0                             ! IEU0
         sll     %g1, 2, %l4                             ! IEU0  Group
@@ -198,7 +198,7 @@ linux_sparc_syscall32:
 
         srl     %i5, 0, %o5                             ! IEU1
         srl     %i2, 0, %o2                             ! IEU0  Group
-        andcc   %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %g0
+        andcc   %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
         bne,pn  %icc, linux_syscall_trace32             ! CTI
          mov    %i0, %l5                                ! IEU1
         call    %l7                                     ! CTI   Group brk forced
@@ -210,7 +210,7 @@ linux_sparc_syscall32:
         .globl  linux_sparc_syscall
 linux_sparc_syscall:
         /* Direct access to user regs, much faster. */
-        cmp     %g1, NR_SYSCALLS                        ! IEU1  Group
+        cmp     %g1, NR_syscalls                        ! IEU1  Group
         bgeu,pn %xcc, linux_sparc_ni_syscall            ! CTI
          mov    %i0, %o0                                ! IEU0
         sll     %g1, 2, %l4                             ! IEU0  Group
@@ -221,7 +221,7 @@ linux_sparc_syscall:
 
         mov     %i3, %o3                                ! IEU1
         mov     %i4, %o4                                ! IEU0  Group
-        andcc   %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %g0
+        andcc   %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
         bne,pn  %icc, linux_syscall_trace               ! CTI   Group
          mov    %i0, %l5                                ! IEU0
 2:      call    %l7                                     ! CTI   Group brk forced
@@ -245,7 +245,7 @@ ret_sys_call:
 
         cmp     %o0, -ERESTART_RESTARTBLOCK
         bgeu,pn %xcc, 1f
-         andcc  %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %l6
+         andcc  %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %l6
 80:
         /* System call success, clear Carry condition code. */
         andn    %g3, %g2, %g3
@@ -260,7 +260,7 @@ ret_sys_call:
         /* System call failure, set Carry condition code.
          * Also, get abs(errno) to return to the process.
          */
-        andcc   %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %l6  
+        andcc   %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %l6  
         sub     %g0, %o0, %o0
         or      %g3, %g2, %g3
         stx     %o0, [%sp + PTREGS_OFF + PT_V9_I0]
diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index 63f73ae8a892..67e165102885 100644
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@ -774,26 +774,9 @@ void __devinit setup_sparc64_timer(void)
 static struct clocksource clocksource_tick = {
         .rating         = 100,
         .mask           = CLOCKSOURCE_MASK(64),
-        .shift          = 16,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
-static void __init setup_clockevent_multiplier(unsigned long hz)
-{
-        unsigned long mult, shift = 32;
-
-        while (1) {
-                mult = div_sc(hz, NSEC_PER_SEC, shift);
-                if (mult && (mult >> 32UL) == 0UL)
-                        break;
-
-                shift--;
-        }
-
-        sparc64_clockevent.shift = shift;
-        sparc64_clockevent.mult = mult;
-}
-
 static unsigned long tb_ticks_per_usec __read_mostly;
 
 void __delay(unsigned long loops)
@@ -828,9 +811,7 @@ void __init time_init(void)
                 clocksource_hz2mult(freq, SPARC64_NSEC_PER_CYC_SHIFT);
 
         clocksource_tick.name = tick_ops->name;
-        clocksource_tick.mult =
-                clocksource_hz2mult(freq,
-                                    clocksource_tick.shift);
+        clocksource_calc_mult_shift(&clocksource_tick, freq, 4);
         clocksource_tick.read = clocksource_tick_read;
 
         printk("clocksource: mult[%x] shift[%d]\n",
@@ -839,15 +820,14 @@ void __init time_init(void)
         clocksource_register(&clocksource_tick);
 
         sparc64_clockevent.name = tick_ops->name;
-
-        setup_clockevent_multiplier(freq);
+        clockevents_calc_mult_shift(&sparc64_clockevent, freq, 4);
 
         sparc64_clockevent.max_delta_ns =
                 clockevent_delta2ns(0x7fffffffffffffffUL, &sparc64_clockevent);
         sparc64_clockevent.min_delta_ns =
                 clockevent_delta2ns(0xF, &sparc64_clockevent);
 
-        printk("clockevent: mult[%ux] shift[%d]\n",
+        printk("clockevent: mult[%x] shift[%d]\n",
                sparc64_clockevent.mult, sparc64_clockevent.shift);
 
         setup_sparc64_timer();
diff --git a/arch/sparc/kernel/unaligned_32.c b/arch/sparc/kernel/unaligned_32.c
index 6b1e6cde6fff..f8514e291e15 100644
--- a/arch/sparc/kernel/unaligned_32.c
+++ b/arch/sparc/kernel/unaligned_32.c
@@ -17,8 +17,7 @@
 #include <asm/uaccess.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
-
-/* #define DEBUG_MNA */
+#include <linux/perf_event.h>
 
 enum direction {
         load,    /* ld, ldd, ldh, ldsh */
@@ -29,12 +28,6 @@ enum direction {
         invalid,
 };
 
-#ifdef DEBUG_MNA
-static char *dirstrings[] = {
-  "load", "store", "both", "fpload", "fpstore", "invalid"
-};
-#endif
-
 static inline enum direction decode_direction(unsigned int insn)
 {
         unsigned long tmp = (insn >> 21) & 1;
@@ -255,10 +248,7 @@ asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn)
                 unsigned long addr = compute_effective_address(regs, insn);
                 int err;
 
-#ifdef DEBUG_MNA
-                printk("KMNA: pc=%08lx [dir=%s addr=%08lx size=%d] retpc[%08lx]\n",
-                       regs->pc, dirstrings[dir], addr, size, regs->u_regs[UREG_RETPC]);
-#endif
+                perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, 0, regs, addr);
                 switch (dir) {
                 case load:
                         err = do_int_load(fetch_reg_addr(((insn>>25)&0x1f),
@@ -350,6 +340,7 @@ asmlinkage void user_unaligned_trap(struct pt_regs *regs, unsigned int insn)
                 }
 
                 addr = compute_effective_address(regs, insn);
+                perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, 0, regs, addr);
                 switch(dir) {
                 case load:
                         err = do_int_load(fetch_reg_addr(((insn>>25)&0x1f),
diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
index 379209982a07..378ca82b9ccc 100644
--- a/arch/sparc/kernel/unaligned_64.c
+++ b/arch/sparc/kernel/unaligned_64.c
@@ -20,10 +20,9 @@
 #include <asm/uaccess.h>
 #include <linux/smp.h>
 #include <linux/bitops.h>
+#include <linux/perf_event.h>
 #include <asm/fpumacro.h>
 
-/* #define DEBUG_MNA */
-
 enum direction {
         load,    /* ld, ldd, ldh, ldsh */
         store,   /* st, std, sth, stsh */
@@ -33,12 +32,6 @@ enum direction {
         invalid,
 };
 
-#ifdef DEBUG_MNA
-static char *dirstrings[] = {
-  "load", "store", "both", "fpload", "fpstore", "invalid"
-};
-#endif
-
 static inline enum direction decode_direction(unsigned int insn)
 {
         unsigned long tmp = (insn >> 21) & 1;
@@ -327,12 +320,7 @@ asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn)
 
                 addr = compute_effective_address(regs, insn,
                                                  ((insn >> 25) & 0x1f));
-#ifdef DEBUG_MNA
-                printk("KMNA: pc=%016lx [dir=%s addr=%016lx size=%d] "
-                       "retpc[%016lx]\n",
-                       regs->tpc, dirstrings[dir], addr, size,
-                       regs->u_regs[UREG_RETPC]);
-#endif
+                perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, 0, regs, addr);
                 switch (asi) {
                 case ASI_NL:
                 case ASI_AIUPL:
@@ -399,6 +387,7 @@ int handle_popc(u32 insn, struct pt_regs *regs)
         int ret, i, rd = ((insn >> 25) & 0x1f);
         int from_kernel = (regs->tstate & TSTATE_PRIV) != 0;
                                 
+        perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0, regs, 0);
         if (insn & 0x2000) {
                 maybe_flush_windows(0, 0, rd, from_kernel);
                 value = sign_extend_imm13(insn);
@@ -445,6 +434,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs)
         int asi = decode_asi(insn, regs);
         int flag = (freg < 32) ? FPRS_DL : FPRS_DU;
 
+        perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0, regs, 0);
+
         save_and_clear_fpu();
         current_thread_info()->xfsr[0] &= ~0x1c000;
         if (freg & 3) {
@@ -566,6 +557,8 @@ void handle_ld_nf(u32 insn, struct pt_regs *regs)
         int from_kernel = (regs->tstate & TSTATE_PRIV) != 0;
         unsigned long *reg;
                                 
+        perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0, regs, 0);
+
         maybe_flush_windows(0, 0, rd, from_kernel);
         reg = fetch_reg_addr(rd, regs);
         if (from_kernel || rd < 16) {
@@ -596,6 +589,7 @@ void handle_lddfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr
 
         if (tstate & TSTATE_PRIV)
                 die_if_kernel("lddfmna from kernel", regs);
+        perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, 0, regs, sfar);
         if (test_thread_flag(TIF_32BIT))
                 pc = (u32)pc;
         if (get_user(insn, (u32 __user *) pc) != -EFAULT) {
@@ -657,6 +651,7 @@ void handle_stdfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr
 
         if (tstate & TSTATE_PRIV)
                 die_if_kernel("stdfmna from kernel", regs);
+        perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, 0, regs, sfar);
         if (test_thread_flag(TIF_32BIT))
                 pc = (u32)pc;
         if (get_user(insn, (u32 __user *) pc) != -EFAULT) {
diff --git a/arch/sparc/kernel/visemul.c b/arch/sparc/kernel/visemul.c
index d231cbd5c526..9dfd2ebcb157 100644
--- a/arch/sparc/kernel/visemul.c
+++ b/arch/sparc/kernel/visemul.c
@@ -5,6 +5,7 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/thread_info.h>
+#include <linux/perf_event.h>
 
 #include <asm/ptrace.h>
 #include <asm/pstate.h>
@@ -801,6 +802,8 @@ int vis_emul(struct pt_regs *regs, unsigned int insn)
 
         BUG_ON(regs->tstate & TSTATE_PRIV);
 
+        perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0, regs, 0);
+
         if (test_thread_flag(TIF_32BIT))
                 pc = (u32)pc;
 
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
index e75faf0e59ae..c4b5e03af115 100644
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -44,3 +44,4 @@ obj-y                 += iomap.o
 obj-$(CONFIG_SPARC32) += atomic32.o
 obj-y                 += ksyms.o
 obj-$(CONFIG_SPARC64) += PeeCeeI.o
+obj-y                 += usercopy.o
diff --git a/arch/sparc/lib/bzero.S b/arch/sparc/lib/bzero.S
index b6557297440f..615f401edf69 100644
--- a/arch/sparc/lib/bzero.S
+++ b/arch/sparc/lib/bzero.S
@@ -6,10 +6,6 @@
 
         .text
 
-        .globl  __memset
-        .type   __memset, #function
-__memset:               /* %o0=buf, %o1=pat, %o2=len */
-
         .globl  memset
         .type   memset, #function
 memset:                 /* %o0=buf, %o1=pat, %o2=len */
@@ -83,7 +79,6 @@ __bzero_done:
         retl
          mov            %o3, %o0
         .size           __bzero, .-__bzero
-        .size           __memset, .-__memset
         .size           memset, .-memset
 
 #define EX_ST(x,y)              \
diff --git a/arch/sparc/lib/checksum_32.S b/arch/sparc/lib/checksum_32.S
index 77f228533d47..3632cb34e914 100644
--- a/arch/sparc/lib/checksum_32.S
+++ b/arch/sparc/lib/checksum_32.S
@@ -560,7 +560,7 @@ __csum_partial_copy_end:
          mov    %i0, %o1
         mov     %i1, %o0
 5:
-        call    __memcpy
+        call    memcpy
          mov    %i2, %o2
         tst     %o0
         bne,a   2f
diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
index 704b12668388..1b30bb3bfdb1 100644
--- a/arch/sparc/lib/ksyms.c
+++ b/arch/sparc/lib/ksyms.c
@@ -30,7 +30,6 @@ EXPORT_SYMBOL(__memscan_generic);
 EXPORT_SYMBOL(memcmp);
 EXPORT_SYMBOL(memcpy);
 EXPORT_SYMBOL(memset);
-EXPORT_SYMBOL(__memset);
 EXPORT_SYMBOL(memmove);
 EXPORT_SYMBOL(__bzero);
 
@@ -81,7 +80,6 @@ EXPORT_SYMBOL(__csum_partial_copy_sparc_generic);
 
 /* Special internal versions of library functions. */
 EXPORT_SYMBOL(__copy_1page);
-EXPORT_SYMBOL(__memcpy);
 EXPORT_SYMBOL(__memmove);
 EXPORT_SYMBOL(bzero_1page);
 
diff --git a/arch/sparc/lib/mcount.S b/arch/sparc/lib/mcount.S
index 7ce9c65f3592..24b8b12deed2 100644
--- a/arch/sparc/lib/mcount.S
+++ b/arch/sparc/lib/mcount.S
@@ -64,8 +64,9 @@ mcount:
 2:       sethi          %hi(softirq_stack), %g3
         or              %g3, %lo(softirq_stack), %g3
         ldx             [%g3 + %g1], %g7
+        sub             %g7, STACK_BIAS, %g7
         cmp             %sp, %g7
-        bleu,pt         %xcc, 2f
+        bleu,pt         %xcc, 3f
          sethi          %hi(THREAD_SIZE), %g3
         add             %g7, %g3, %g7
         cmp             %sp, %g7
@@ -75,7 +76,7 @@ mcount:
          * again, we are already trying to output the stack overflow
          * message.
          */
-        sethi           %hi(ovstack), %g7               ! cant move to panic stack fast enough
+3:      sethi           %hi(ovstack), %g7               ! cant move to panic stack fast enough
          or             %g7, %lo(ovstack), %g7
         add             %g7, OVSTACKSIZE, %g3
         sub             %g3, STACK_BIAS + 192, %g3
diff --git a/arch/sparc/lib/memcpy.S b/arch/sparc/lib/memcpy.S
index ce10bc869af9..34fe65751737 100644
--- a/arch/sparc/lib/memcpy.S
+++ b/arch/sparc/lib/memcpy.S
@@ -543,9 +543,6 @@ FUNC(memmove)
         b               3f
          add            %o0, 2, %o0
 
-#ifdef __KERNEL__
-FUNC(__memcpy)
-#endif
 FUNC(memcpy)    /* %o0=dst %o1=src %o2=len */
 
         sub             %o0, %o1, %o4
diff --git a/arch/sparc/lib/memset.S b/arch/sparc/lib/memset.S
index 1c37ea892deb..99c017be8719 100644
--- a/arch/sparc/lib/memset.S
+++ b/arch/sparc/lib/memset.S
@@ -60,11 +60,10 @@
         .globl  __bzero_begin
 __bzero_begin:
 
-        .globl  __bzero, __memset, 
+        .globl  __bzero
         .globl  memset
         .globl  __memset_start, __memset_end
 __memset_start:
-__memset:
 memset:
         and     %o1, 0xff, %g3
         sll     %g3, 8, %g2
diff --git a/arch/sparc/lib/usercopy.c b/arch/sparc/lib/usercopy.c
new file mode 100644
index 000000000000..14b363fec8a2
--- /dev/null
+++ b/arch/sparc/lib/usercopy.c
@@ -0,0 +1,8 @@
+#include <linux/module.h>
+#include <linux/bug.h>
+
+void copy_from_user_overflow(void)
+{
+        WARN(1, "Buffer overflow detected!\n");
+}
+EXPORT_SYMBOL(copy_from_user_overflow);
diff --git a/arch/sparc/math-emu/math_32.c b/arch/sparc/math-emu/math_32.c
index e13f65da17df..a3fccde894ec 100644
--- a/arch/sparc/math-emu/math_32.c
+++ b/arch/sparc/math-emu/math_32.c
@@ -67,6 +67,7 @@
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
+#include <linux/perf_event.h>
 #include <asm/uaccess.h>
 
 #include "sfp-util_32.h"
@@ -163,6 +164,8 @@ int do_mathemu(struct pt_regs *regs, struct task_struct *fpt)
         int retcode = 0;                               /* assume all succeed */
         unsigned long insn;
 
+        perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0, regs, 0);
+
 #ifdef DEBUG_MATHEMU
         printk("In do_mathemu()... pc is %08lx\n", regs->pc);
         printk("fpqdepth is %ld\n", fpt->thread.fpqdepth);
diff --git a/arch/sparc/math-emu/math_64.c b/arch/sparc/math-emu/math_64.c
index 6863c9bde25c..56d2c44747b8 100644
--- a/arch/sparc/math-emu/math_64.c
+++ b/arch/sparc/math-emu/math_64.c
@@ -11,6 +11,7 @@
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/errno.h>
+#include <linux/perf_event.h>
 
 #include <asm/fpumacro.h>
 #include <asm/ptrace.h>
@@ -183,6 +184,7 @@ int do_mathemu(struct pt_regs *regs, struct fpustate *f)
 
         if (tstate & TSTATE_PRIV)
                 die_if_kernel("unfinished/unimplemented FPop from kernel", regs);
+        perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0, regs, 0);
         if (test_thread_flag(TIF_32BIT))
                 pc = (u32)pc;
         if (get_user(insn, (u32 __user *) pc) != -EFAULT) {
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
index 43b0da96a4fb..6081936bf03b 100644
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -31,13 +31,12 @@
 #include <asm/sections.h>
 #include <asm/mmu_context.h>
 
-#ifdef CONFIG_KPROBES
-static inline int notify_page_fault(struct pt_regs *regs)
+static inline __kprobes int notify_page_fault(struct pt_regs *regs)
 {
         int ret = 0;
 
         /* kprobe_running() needs smp_processor_id() */
-        if (!user_mode(regs)) {
+        if (kprobes_built_in() && !user_mode(regs)) {
                 preempt_disable();
                 if (kprobe_running() && kprobe_fault_handler(regs, 0))
                         ret = 1;
@@ -45,12 +44,6 @@ static inline int notify_page_fault(struct pt_regs *regs)
         }
         return ret;
 }
-#else
-static inline int notify_page_fault(struct pt_regs *regs)
-{
-        return 0;
-}
-#endif
 
 static void __kprobes unhandled_fault(unsigned long address,
                                       struct task_struct *tsk,
@@ -73,7 +66,7 @@ static void __kprobes unhandled_fault(unsigned long address,
         die_if_kernel("Oops", regs);
 }
 
-static void bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
+static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
 {
         printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
                regs->tpc);
@@ -170,8 +163,9 @@ static unsigned int get_fault_insn(struct pt_regs *regs, unsigned int insn)
         return insn;
 }
 
-static void do_kernel_fault(struct pt_regs *regs, int si_code, int fault_code,
-                            unsigned int insn, unsigned long address)
+static void __kprobes do_kernel_fault(struct pt_regs *regs, int si_code,
+                                      int fault_code, unsigned int insn,
+                                      unsigned long address)
 {
         unsigned char asi = ASI_P;
  
@@ -225,7 +219,7 @@ cannot_handle:
         unhandled_fault (address, current, regs);
 }
 
-static void noinline bogus_32bit_fault_tpc(struct pt_regs *regs)
+static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
 {
         static int times;
 
@@ -237,8 +231,8 @@ static void noinline bogus_32bit_fault_tpc(struct pt_regs *regs)
         show_regs(regs);
 }
 
-static void noinline bogus_32bit_fault_address(struct pt_regs *regs,
-                                               unsigned long addr)
+static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
+                                                         unsigned long addr)
 {
         static int times;
 
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index 2ffacd67c424..a89baf0d875a 100644
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@@ -17,6 +17,7 @@
 #include <linux/fs.h>
 #include <linux/seq_file.h>
 #include <linux/scatterlist.h>
+#include <linux/bitmap.h>
 
 #include <asm/sections.h>
 #include <asm/page.h>
@@ -1021,20 +1022,12 @@ static char *sun4c_lockarea(char *vaddr, unsigned long size)
         npages = (((unsigned long)vaddr & ~PAGE_MASK) +
                   size + (PAGE_SIZE-1)) >> PAGE_SHIFT;
 
-        scan = 0;
         local_irq_save(flags);
-        for (;;) {
-                scan = find_next_zero_bit(sun4c_iobuffer_map,
-                                          iobuffer_map_size, scan);
-                if ((base = scan) + npages > iobuffer_map_size) goto abend;
-                for (;;) {
-                        if (scan >= base + npages) goto found;
-                        if (test_bit(scan, sun4c_iobuffer_map)) break;
-                        scan++;
-                }
-        }
+        base = bitmap_find_next_zero_area(sun4c_iobuffer_map, iobuffer_map_size,
+                                                0, npages, 0);
+        if (base >= iobuffer_map_size)
+                goto abend;
 
-found:
         high = ((base + npages) << PAGE_SHIFT) + sun4c_iobuffer_start;
         high = SUN4C_REAL_PGDIR_ALIGN(high);
         while (high > sun4c_iobuffer_high) {
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index e14629c87de4..51069245b79a 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -6,6 +6,7 @@
 
 #include <linux/console.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/list.h>
 #include <linux/mm.h>
@@ -131,7 +132,7 @@ void mconsole_proc(struct mc_request *req)
         char *ptr = req->request.data, *buf;
 
         ptr += strlen("proc");
-        while (isspace(*ptr)) ptr++;
+        ptr = skip_spaces(ptr);
 
         proc = get_fs_type("proc");
         if (proc == NULL) {
@@ -212,8 +213,7 @@ void mconsole_proc(struct mc_request *req)
         char *ptr = req->request.data;
 
         ptr += strlen("proc");
-        while (isspace(*ptr))
-                ptr++;
+        ptr = skip_spaces(ptr);
         snprintf(path, sizeof(path), "/proc/%s", ptr);
 
         fd = sys_open(path, 0, 0);
@@ -560,8 +560,7 @@ void mconsole_config(struct mc_request *req)
         int err;
 
         ptr += strlen("config");
-        while (isspace(*ptr))
-                ptr++;
+        ptr = skip_spaces(ptr);
         dev = mconsole_find_dev(ptr);
         if (dev == NULL) {
                 mconsole_reply(req, "Bad configuration option", 1, 0);
@@ -588,7 +587,7 @@ void mconsole_remove(struct mc_request *req)
         int err, start, end, n;
 
         ptr += strlen("remove");
-        while (isspace(*ptr)) ptr++;
+        ptr = skip_spaces(ptr);
         dev = mconsole_find_dev(ptr);
         if (dev == NULL) {
                 mconsole_reply(req, "Bad remove option", 1, 0);
@@ -712,7 +711,7 @@ void mconsole_sysrq(struct mc_request *req)
         char *ptr = req->request.data;
 
         ptr += strlen("sysrq");
-        while (isspace(*ptr)) ptr++;
+        ptr = skip_spaces(ptr);
 
         /*
          * With 'b', the system will shut down without a chance to reply,
@@ -757,8 +756,7 @@ void mconsole_stack(struct mc_request *req)
          */
 
         ptr += strlen("stack");
-        while (isspace(*ptr))
-                ptr++;
+        ptr = skip_spaces(ptr);
 
         /*
          * Should really check for multiple pids or reject bad args here
@@ -833,8 +831,8 @@ static int __init mconsole_init(void)
 
 __initcall(mconsole_init);
 
-static int write_proc_mconsole(struct file *file, const char __user *buffer,
-                               unsigned long count, void *data)
+static ssize_t mconsole_proc_write(struct file *file,
+                const char __user *buffer, size_t count, loff_t *pos)
 {
         char *buf;
 
@@ -855,6 +853,11 @@ static int write_proc_mconsole(struct file *file, const char __user *buffer,
         return count;
 }
 
+static const struct file_operations mconsole_proc_fops = {
+        .owner          = THIS_MODULE,
+        .write          = mconsole_proc_write,
+};
+
 static int create_proc_mconsole(void)
 {
         struct proc_dir_entry *ent;
@@ -862,15 +865,12 @@ static int create_proc_mconsole(void)
         if (notify_socket == NULL)
                 return 0;
 
-        ent = create_proc_entry("mconsole", S_IFREG | 0200, NULL);
+        ent = proc_create("mconsole", 0200, NULL, &mconsole_proc_fops);
         if (ent == NULL) {
                 printk(KERN_INFO "create_proc_mconsole : create_proc_entry "
                        "failed\n");
                 return 0;
         }
-
-        ent->read_proc = NULL;
-        ent->write_proc = write_proc_mconsole;
         return 0;
 }
 
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 635d16d90a80..5ff554677f40 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -27,6 +27,7 @@
 #include "linux/init.h"
 #include "linux/cdrom.h"
 #include "linux/proc_fs.h"
+#include "linux/seq_file.h"
 #include "linux/ctype.h"
 #include "linux/capability.h"
 #include "linux/mm.h"
@@ -200,23 +201,25 @@ static void make_proc_ide(void)
         proc_ide = proc_mkdir("ide0", proc_ide_root);
 }
 
-static int proc_ide_read_media(char *page, char **start, off_t off, int count,
-                               int *eof, void *data)
+static int fake_ide_media_proc_show(struct seq_file *m, void *v)
 {
-        int len;
-
-        strcpy(page, "disk\n");
-        len = strlen("disk\n");
-        len -= off;
-        if (len < count){
-                *eof = 1;
-                if (len <= 0) return 0;
-        }
-        else len = count;
-        *start = page + off;
-        return len;
+        seq_puts(m, "disk\n");
+        return 0;
+}
+
+static int fake_ide_media_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, fake_ide_media_proc_show, NULL);
 }
 
+static const struct file_operations fake_ide_media_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = fake_ide_media_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 static void make_ide_entries(const char *dev_name)
 {
         struct proc_dir_entry *dir, *ent;
@@ -227,11 +230,8 @@ static void make_ide_entries(const char *dev_name)
         dir = proc_mkdir(dev_name, proc_ide);
         if(!dir) return;
 
-        ent = create_proc_entry("media", S_IFREG|S_IRUGO, dir);
+        ent = proc_create("media", S_IRUGO, dir, &fake_ide_media_proc_fops);
         if(!ent) return;
-        ent->data = NULL;
-        ent->read_proc = proc_ide_read_media;
-        ent->write_proc = NULL;
         snprintf(name, sizeof(name), "ide0/%s", dev_name);
         proc_symlink(dev_name, proc_ide_root, name);
 }
diff --git a/arch/um/kernel/exitcode.c b/arch/um/kernel/exitcode.c
index 6540d2c9fbb7..829df49dee99 100644
--- a/arch/um/kernel/exitcode.c
+++ b/arch/um/kernel/exitcode.c
@@ -6,7 +6,9 @@
 #include <linux/ctype.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/types.h>
 #include <asm/uaccess.h>
 
@@ -16,30 +18,26 @@
  */
 int uml_exitcode = 0;
 
-static int read_proc_exitcode(char *page, char **start, off_t off,
-                              int count, int *eof, void *data)
+static int exitcode_proc_show(struct seq_file *m, void *v)
 {
-        int len, val;
+        int val;
 
         /*
          * Save uml_exitcode in a local so that we don't need to guarantee
          * that sprintf accesses it atomically.
          */
         val = uml_exitcode;
-        len = sprintf(page, "%d\n", val);
-        len -= off;
-        if (len <= off+count)
-                *eof = 1;
-        *start = page + off;
-        if (len > count)
-                len = count;
-        if (len < 0)
-                len = 0;
-        return len;
+        seq_printf(m, "%d\n", val);
+        return 0;
+}
+
+static int exitcode_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, exitcode_proc_show, NULL);
 }
 
-static int write_proc_exitcode(struct file *file, const char __user *buffer,
-                               unsigned long count, void *data)
+static ssize_t exitcode_proc_write(struct file *file,
+                const char __user *buffer, size_t count, loff_t *pos)
 {
         char *end, buf[sizeof("nnnnn\0")];
         int tmp;
@@ -55,20 +53,25 @@ static int write_proc_exitcode(struct file *file, const char __user *buffer,
         return count;
 }
 
+static const struct file_operations exitcode_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = exitcode_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = exitcode_proc_write,
+};
+
 static int make_proc_exitcode(void)
 {
         struct proc_dir_entry *ent;
 
-        ent = create_proc_entry("exitcode", 0600, NULL);
+        ent = proc_create("exitcode", 0600, NULL, &exitcode_proc_fops);
         if (ent == NULL) {
                 printk(KERN_WARNING "make_proc_exitcode : Failed to register "
                        "/proc/exitcode\n");
                 return 0;
         }
-
-        ent->read_proc = read_proc_exitcode;
-        ent->write_proc = write_proc_exitcode;
-
         return 0;
 }
 
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 039270b9b73b..89474ba0741e 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -34,7 +34,7 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                 action = irq_desc[i].action;
                 if (!action)
                         goto skip;
@@ -53,7 +53,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
 skip:
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         } else if (i == NR_IRQS)
                 seq_putc(p, '\n');
 
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 4a28a1568d85..2f910a1b7454 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -9,11 +9,13 @@
 #include <linux/hardirq.h>
 #include <linux/gfp.h>
 #include <linux/mm.h>
+#include <linux/module.h>
 #include <linux/personality.h>
 #include <linux/proc_fs.h>
 #include <linux/ptrace.h>
 #include <linux/random.h>
 #include <linux/sched.h>
+#include <linux/seq_file.h>
 #include <linux/tick.h>
 #include <linux/threads.h>
 #include <asm/current.h>
@@ -336,16 +338,19 @@ int get_using_sysemu(void)
         return atomic_read(&using_sysemu);
 }
 
-static int proc_read_sysemu(char *buf, char **start, off_t offset, int size,int *eof, void *data)
+static int sysemu_proc_show(struct seq_file *m, void *v)
 {
-        if (snprintf(buf, size, "%d\n", get_using_sysemu()) < size)
-                /* No overflow */
-                *eof = 1;
+        seq_printf(m, "%d\n", get_using_sysemu());
+        return 0;
+}
 
-        return strlen(buf);
+static int sysemu_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, sysemu_proc_show, NULL);
 }
 
-static int proc_write_sysemu(struct file *file,const char __user *buf, unsigned long count,void *data)
+static ssize_t sysemu_proc_write(struct file *file, const char __user *buf,
+                                 size_t count, loff_t *pos)
 {
         char tmp[2];
 
@@ -358,13 +363,22 @@ static int proc_write_sysemu(struct file *file,const char __user *buf, unsigned
         return count;
 }
 
+static const struct file_operations sysemu_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = sysemu_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = sysemu_proc_write,
+};
+
 int __init make_proc_sysemu(void)
 {
         struct proc_dir_entry *ent;
         if (!sysemu_supported)
                 return 0;
 
-        ent = create_proc_entry("sysemu", 0600, NULL);
+        ent = proc_create("sysemu", 0600, NULL, &sysemu_proc_fops);
 
         if (ent == NULL)
         {
@@ -372,9 +386,6 @@ int __init make_proc_sysemu(void)
                 return 0;
         }
 
-        ent->read_proc  = proc_read_sysemu;
-        ent->write_proc = proc_write_sysemu;
-
         return 0;
 }
 
diff --git a/arch/um/sys-i386/asm/elf.h b/arch/um/sys-i386/asm/elf.h
index d0da9d7c5371..770885472ed4 100644
--- a/arch/um/sys-i386/asm/elf.h
+++ b/arch/um/sys-i386/asm/elf.h
@@ -48,7 +48,6 @@ typedef struct user_i387_struct elf_fpregset_t;
         PT_REGS_EAX(regs) = 0; \
 } while (0)
 
-#define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE 4096
 
 #define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
diff --git a/arch/um/sys-ppc/asm/elf.h b/arch/um/sys-ppc/asm/elf.h
index af9463cd8ce5..8aacaf56508d 100644
--- a/arch/um/sys-ppc/asm/elf.h
+++ b/arch/um/sys-ppc/asm/elf.h
@@ -17,8 +17,6 @@ extern long elf_aux_hwcap;
 #define ELF_CLASS ELFCLASS32
 #endif
 
-#define USE_ELF_CORE_DUMP
-
 #define R_386_NONE      0
 #define R_386_32        1
 #define R_386_PC32      2
diff --git a/arch/um/sys-x86_64/asm/elf.h b/arch/um/sys-x86_64/asm/elf.h
index 04b9e87c8dad..49655c83efd2 100644
--- a/arch/um/sys-x86_64/asm/elf.h
+++ b/arch/um/sys-x86_64/asm/elf.h
@@ -104,7 +104,6 @@ extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu);
         clear_thread_flag(TIF_IA32);
 #endif
 
-#define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE 4096
 
 #define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 32a1918e1b88..3b2a5aca4edb 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2012,18 +2012,9 @@ config SCx200HR_TIMER
           processor goes idle (as is done by the scheduler).  The
           other workaround is idle=poll boot option.
 
-config GEODE_MFGPT_TIMER
-        def_bool y
-        prompt "Geode Multi-Function General Purpose Timer (MFGPT) events"
-        depends on MGEODE_LX && GENERIC_TIME && GENERIC_CLOCKEVENTS
-        ---help---
-          This driver provides a clock event source based on the MFGPT
-          timer(s) in the CS5535 and CS5536 companion chip for the geode.
-          MFGPTs have a better resolution and max interval than the
-          generic PIT, and are suitable for use as high-res timers.
-
 config OLPC
         bool "One Laptop Per Child support"
+        select GPIOLIB
         default n
         ---help---
           Add support for detecting the unique features of the OLPC
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
index 0f6c02f3b7d4..ac91eed21061 100644
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@ -67,7 +67,7 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
         if (!dev->dma_mask)
                 return 0;
 
-        return addr + size <= *dev->dma_mask;
+        return addr + size - 1 <= *dev->dma_mask;
 }
 
 static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
index 8a024babe5e6..b4501ee223ad 100644
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
@@ -239,7 +239,6 @@ extern int force_personality32;
 #endif /* !CONFIG_X86_32 */
 
 #define CORE_DUMP_USE_REGSET
-#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
diff --git a/arch/x86/include/asm/geode.h b/arch/x86/include/asm/geode.h
index ad3c2ed75481..7cd73552a4e8 100644
--- a/arch/x86/include/asm/geode.h
+++ b/arch/x86/include/asm/geode.h
@@ -12,160 +12,7 @@
 
 #include <asm/processor.h>
 #include <linux/io.h>
-
-/* Generic southbridge functions */
-
-#define GEODE_DEV_PMS 0
-#define GEODE_DEV_ACPI 1
-#define GEODE_DEV_GPIO 2
-#define GEODE_DEV_MFGPT 3
-
-extern int geode_get_dev_base(unsigned int dev);
-
-/* Useful macros */
-#define geode_pms_base()        geode_get_dev_base(GEODE_DEV_PMS)
-#define geode_acpi_base()       geode_get_dev_base(GEODE_DEV_ACPI)
-#define geode_gpio_base()       geode_get_dev_base(GEODE_DEV_GPIO)
-#define geode_mfgpt_base()      geode_get_dev_base(GEODE_DEV_MFGPT)
-
-/* MSRS */
-
-#define MSR_GLIU_P2D_RO0        0x10000029
-
-#define MSR_LX_GLD_MSR_CONFIG   0x48002001
-#define MSR_LX_MSR_PADSEL       0x48002011      /* NOT 0x48000011; the data
-                                                 * sheet has the wrong value */
-#define MSR_GLCP_SYS_RSTPLL     0x4C000014
-#define MSR_GLCP_DOTPLL         0x4C000015
-
-#define MSR_LBAR_SMB            0x5140000B
-#define MSR_LBAR_GPIO           0x5140000C
-#define MSR_LBAR_MFGPT          0x5140000D
-#define MSR_LBAR_ACPI           0x5140000E
-#define MSR_LBAR_PMS            0x5140000F
-
-#define MSR_DIVIL_SOFT_RESET    0x51400017
-
-#define MSR_PIC_YSEL_LOW        0x51400020
-#define MSR_PIC_YSEL_HIGH       0x51400021
-#define MSR_PIC_ZSEL_LOW        0x51400022
-#define MSR_PIC_ZSEL_HIGH       0x51400023
-#define MSR_PIC_IRQM_LPC        0x51400025
-
-#define MSR_MFGPT_IRQ           0x51400028
-#define MSR_MFGPT_NR            0x51400029
-#define MSR_MFGPT_SETUP         0x5140002B
-
-#define MSR_LX_SPARE_MSR        0x80000011      /* DC-specific */
-
-#define MSR_GX_GLD_MSR_CONFIG   0xC0002001
-#define MSR_GX_MSR_PADSEL       0xC0002011
-
-/* Resource Sizes */
-
-#define LBAR_GPIO_SIZE          0xFF
-#define LBAR_MFGPT_SIZE         0x40
-#define LBAR_ACPI_SIZE          0x40
-#define LBAR_PMS_SIZE           0x80
-
-/* ACPI registers (PMS block) */
-
-/*
- * PM1_EN is only valid when VSA is enabled for 16 bit reads.
- * When VSA is not enabled, *always* read both PM1_STS and PM1_EN
- * with a 32 bit read at offset 0x0
- */
-
-#define PM1_STS                 0x00
-#define PM1_EN                  0x02
-#define PM1_CNT                 0x08
-#define PM2_CNT                 0x0C
-#define PM_TMR                  0x10
-#define PM_GPE0_STS             0x18
-#define PM_GPE0_EN              0x1C
-
-/* PMC registers (PMS block) */
-
-#define PM_SSD                  0x00
-#define PM_SCXA                 0x04
-#define PM_SCYA                 0x08
-#define PM_OUT_SLPCTL           0x0C
-#define PM_SCLK                 0x10
-#define PM_SED                  0x1
-#define PM_SCXD                 0x18
-#define PM_SCYD                 0x1C
-#define PM_IN_SLPCTL            0x20
-#define PM_WKD                  0x30
-#define PM_WKXD                 0x34
-#define PM_RD                   0x38
-#define PM_WKXA                 0x3C
-#define PM_FSD                  0x40
-#define PM_TSD                  0x44
-#define PM_PSD                  0x48
-#define PM_NWKD                 0x4C
-#define PM_AWKD                 0x50
-#define PM_SSC                  0x54
-
-/* VSA2 magic values */
-
-#define VSA_VRC_INDEX           0xAC1C
-#define VSA_VRC_DATA            0xAC1E
-#define VSA_VR_UNLOCK           0xFC53  /* unlock virtual register */
-#define VSA_VR_SIGNATURE        0x0003
-#define VSA_VR_MEM_SIZE         0x0200
-#define AMD_VSA_SIG             0x4132  /* signature is ascii 'VSA2' */
-#define GSW_VSA_SIG             0x534d  /* General Software signature */
-/* GPIO */
-
-#define GPIO_OUTPUT_VAL         0x00
-#define GPIO_OUTPUT_ENABLE      0x04
-#define GPIO_OUTPUT_OPEN_DRAIN  0x08
-#define GPIO_OUTPUT_INVERT      0x0C
-#define GPIO_OUTPUT_AUX1        0x10
-#define GPIO_OUTPUT_AUX2        0x14
-#define GPIO_PULL_UP            0x18
-#define GPIO_PULL_DOWN          0x1C
-#define GPIO_INPUT_ENABLE       0x20
-#define GPIO_INPUT_INVERT       0x24
-#define GPIO_INPUT_FILTER       0x28
-#define GPIO_INPUT_EVENT_COUNT  0x2C
-#define GPIO_READ_BACK          0x30
-#define GPIO_INPUT_AUX1         0x34
-#define GPIO_EVENTS_ENABLE      0x38
-#define GPIO_LOCK_ENABLE        0x3C
-#define GPIO_POSITIVE_EDGE_EN   0x40
-#define GPIO_NEGATIVE_EDGE_EN   0x44
-#define GPIO_POSITIVE_EDGE_STS  0x48
-#define GPIO_NEGATIVE_EDGE_STS  0x4C
-
-#define GPIO_MAP_X              0xE0
-#define GPIO_MAP_Y              0xE4
-#define GPIO_MAP_Z              0xE8
-#define GPIO_MAP_W              0xEC
-
-static inline u32 geode_gpio(unsigned int nr)
-{
-        BUG_ON(nr > 28);
-        return 1 << nr;
-}
-
-extern void geode_gpio_set(u32, unsigned int);
-extern void geode_gpio_clear(u32, unsigned int);
-extern int geode_gpio_isset(u32, unsigned int);
-extern void geode_gpio_setup_event(unsigned int, int, int);
-extern void geode_gpio_set_irq(unsigned int, unsigned int);
-
-static inline void geode_gpio_event_irq(unsigned int gpio, int pair)
-{
-        geode_gpio_setup_event(gpio, pair, 0);
-}
-
-static inline void geode_gpio_event_pme(unsigned int gpio, int pair)
-{
-        geode_gpio_setup_event(gpio, pair, 1);
-}
-
-/* Specific geode tests */
+#include <linux/cs5535.h>
 
 static inline int is_geode_gx(void)
 {
@@ -186,68 +33,4 @@ static inline int is_geode(void)
         return (is_geode_gx() || is_geode_lx());
 }
 
-#ifdef CONFIG_MGEODE_LX
-extern int geode_has_vsa2(void);
-#else
-static inline int geode_has_vsa2(void)
-{
-        return 0;
-}
-#endif
-
-/* MFGPTs */
-
-#define MFGPT_MAX_TIMERS        8
-#define MFGPT_TIMER_ANY         (-1)
-
-#define MFGPT_DOMAIN_WORKING    1
-#define MFGPT_DOMAIN_STANDBY    2
-#define MFGPT_DOMAIN_ANY        (MFGPT_DOMAIN_WORKING | MFGPT_DOMAIN_STANDBY)
-
-#define MFGPT_CMP1              0
-#define MFGPT_CMP2              1
-
-#define MFGPT_EVENT_IRQ         0
-#define MFGPT_EVENT_NMI         1
-#define MFGPT_EVENT_RESET       3
-
-#define MFGPT_REG_CMP1          0
-#define MFGPT_REG_CMP2          2
-#define MFGPT_REG_COUNTER       4
-#define MFGPT_REG_SETUP         6
-
-#define MFGPT_SETUP_CNTEN       (1 << 15)
-#define MFGPT_SETUP_CMP2        (1 << 14)
-#define MFGPT_SETUP_CMP1        (1 << 13)
-#define MFGPT_SETUP_SETUP       (1 << 12)
-#define MFGPT_SETUP_STOPEN      (1 << 11)
-#define MFGPT_SETUP_EXTEN       (1 << 10)
-#define MFGPT_SETUP_REVEN       (1 << 5)
-#define MFGPT_SETUP_CLKSEL      (1 << 4)
-
-static inline void geode_mfgpt_write(int timer, u16 reg, u16 value)
-{
-        u32 base = geode_get_dev_base(GEODE_DEV_MFGPT);
-        outw(value, base + reg + (timer * 8));
-}
-
-static inline u16 geode_mfgpt_read(int timer, u16 reg)
-{
-        u32 base = geode_get_dev_base(GEODE_DEV_MFGPT);
-        return inw(base + reg + (timer * 8));
-}
-
-extern int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable);
-extern int geode_mfgpt_set_irq(int timer, int cmp, int *irq, int enable);
-extern int geode_mfgpt_alloc_timer(int timer, int domain);
-
-#define geode_mfgpt_setup_irq(t, c, i) geode_mfgpt_set_irq((t), (c), (i), 1)
-#define geode_mfgpt_release_irq(t, c, i) geode_mfgpt_set_irq((t), (c), (i), 0)
-
-#ifdef CONFIG_GEODE_MFGPT_TIMER
-extern int __init mfgpt_timer_setup(void);
-#else
-static inline int mfgpt_timer_setup(void) { return 0; }
-#endif
-
 #endif /* _ASM_X86_GEODE_H */
diff --git a/arch/x86/include/asm/olpc.h b/arch/x86/include/asm/olpc.h
index 834a30295fab..3a57385d9fa7 100644
--- a/arch/x86/include/asm/olpc.h
+++ b/arch/x86/include/asm/olpc.h
@@ -120,7 +120,7 @@ extern int olpc_ec_mask_unset(uint8_t bits);
 
 /* GPIO assignments */
 
-#define OLPC_GPIO_MIC_AC        geode_gpio(1)
+#define OLPC_GPIO_MIC_AC        1
 #define OLPC_GPIO_DCON_IRQ      geode_gpio(7)
 #define OLPC_GPIO_THRM_ALRM     geode_gpio(10)
 #define OLPC_GPIO_SMB_CLK       geode_gpio(14)
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index efb38994859c..dd59a85a918f 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -731,34 +731,34 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
 
 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
 
-static inline int __raw_spin_is_locked(struct raw_spinlock *lock)
+static inline int arch_spin_is_locked(struct arch_spinlock *lock)
 {
         return PVOP_CALL1(int, pv_lock_ops.spin_is_locked, lock);
 }
 
-static inline int __raw_spin_is_contended(struct raw_spinlock *lock)
+static inline int arch_spin_is_contended(struct arch_spinlock *lock)
 {
         return PVOP_CALL1(int, pv_lock_ops.spin_is_contended, lock);
 }
-#define __raw_spin_is_contended __raw_spin_is_contended
+#define arch_spin_is_contended  arch_spin_is_contended
 
-static __always_inline void __raw_spin_lock(struct raw_spinlock *lock)
+static __always_inline void arch_spin_lock(struct arch_spinlock *lock)
 {
         PVOP_VCALL1(pv_lock_ops.spin_lock, lock);
 }
 
-static __always_inline void __raw_spin_lock_flags(struct raw_spinlock *lock,
+static __always_inline void arch_spin_lock_flags(struct arch_spinlock *lock,
                                                   unsigned long flags)
 {
         PVOP_VCALL2(pv_lock_ops.spin_lock_flags, lock, flags);
 }
 
-static __always_inline int __raw_spin_trylock(struct raw_spinlock *lock)
+static __always_inline int arch_spin_trylock(struct arch_spinlock *lock)
 {
         return PVOP_CALL1(int, pv_lock_ops.spin_trylock, lock);
 }
 
-static __always_inline void __raw_spin_unlock(struct raw_spinlock *lock)
+static __always_inline void arch_spin_unlock(struct arch_spinlock *lock)
 {
         PVOP_VCALL1(pv_lock_ops.spin_unlock, lock);
 }
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
index 9357473c8da0..b1e70d51e40c 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -318,14 +318,14 @@ struct pv_mmu_ops {
                            phys_addr_t phys, pgprot_t flags);
 };
 
-struct raw_spinlock;
+struct arch_spinlock;
 struct pv_lock_ops {
-        int (*spin_is_locked)(struct raw_spinlock *lock);
-        int (*spin_is_contended)(struct raw_spinlock *lock);
-        void (*spin_lock)(struct raw_spinlock *lock);
-        void (*spin_lock_flags)(struct raw_spinlock *lock, unsigned long flags);
-        int (*spin_trylock)(struct raw_spinlock *lock);
-        void (*spin_unlock)(struct raw_spinlock *lock);
+        int (*spin_is_locked)(struct arch_spinlock *lock);
+        int (*spin_is_contended)(struct arch_spinlock *lock);
+        void (*spin_lock)(struct arch_spinlock *lock);
+        void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
+        int (*spin_trylock)(struct arch_spinlock *lock);
+        void (*spin_unlock)(struct arch_spinlock *lock);
 };
 
 /* This contains all the paravirt structures: we get a convenient
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 3d11fd0f44c5..9d369f680321 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -292,6 +292,8 @@ extern void user_enable_block_step(struct task_struct *);
 #define arch_has_block_step()   (boot_cpu_data.x86 >= 6)
 #endif
 
+#define ARCH_HAS_USER_SINGLE_STEP_INFO
+
 struct user_desc;
 extern int do_get_thread_area(struct task_struct *p, int idx,
                               struct user_desc __user *info);
diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
index 4e77853321db..3089f70c0c52 100644
--- a/arch/x86/include/asm/spinlock.h
+++ b/arch/x86/include/asm/spinlock.h
@@ -58,7 +58,7 @@
 #if (NR_CPUS < 256)
 #define TICKET_SHIFT 8
 
-static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock)
+static __always_inline void __ticket_spin_lock(arch_spinlock_t *lock)
 {
         short inc = 0x0100;
 
@@ -77,7 +77,7 @@ static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock)
                 : "memory", "cc");
 }
 
-static __always_inline int __ticket_spin_trylock(raw_spinlock_t *lock)
+static __always_inline int __ticket_spin_trylock(arch_spinlock_t *lock)
 {
         int tmp, new;
 
@@ -96,7 +96,7 @@ static __always_inline int __ticket_spin_trylock(raw_spinlock_t *lock)
         return tmp;
 }
 
-static __always_inline void __ticket_spin_unlock(raw_spinlock_t *lock)
+static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
 {
         asm volatile(UNLOCK_LOCK_PREFIX "incb %0"
                      : "+m" (lock->slock)
@@ -106,7 +106,7 @@ static __always_inline void __ticket_spin_unlock(raw_spinlock_t *lock)
 #else
 #define TICKET_SHIFT 16
 
-static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock)
+static __always_inline void __ticket_spin_lock(arch_spinlock_t *lock)
 {
         int inc = 0x00010000;
         int tmp;
@@ -127,7 +127,7 @@ static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock)
                      : "memory", "cc");
 }
 
-static __always_inline int __ticket_spin_trylock(raw_spinlock_t *lock)
+static __always_inline int __ticket_spin_trylock(arch_spinlock_t *lock)
 {
         int tmp;
         int new;
@@ -149,7 +149,7 @@ static __always_inline int __ticket_spin_trylock(raw_spinlock_t *lock)
         return tmp;
 }
 
-static __always_inline void __ticket_spin_unlock(raw_spinlock_t *lock)
+static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
 {
         asm volatile(UNLOCK_LOCK_PREFIX "incw %0"
                      : "+m" (lock->slock)
@@ -158,14 +158,14 @@ static __always_inline void __ticket_spin_unlock(raw_spinlock_t *lock)
 }
 #endif
 
-static inline int __ticket_spin_is_locked(raw_spinlock_t *lock)
+static inline int __ticket_spin_is_locked(arch_spinlock_t *lock)
 {
         int tmp = ACCESS_ONCE(lock->slock);
 
         return !!(((tmp >> TICKET_SHIFT) ^ tmp) & ((1 << TICKET_SHIFT) - 1));
 }
 
-static inline int __ticket_spin_is_contended(raw_spinlock_t *lock)
+static inline int __ticket_spin_is_contended(arch_spinlock_t *lock)
 {
         int tmp = ACCESS_ONCE(lock->slock);
 
@@ -174,43 +174,43 @@ static inline int __ticket_spin_is_contended(raw_spinlock_t *lock)
 
 #ifndef CONFIG_PARAVIRT_SPINLOCKS
 
-static inline int __raw_spin_is_locked(raw_spinlock_t *lock)
+static inline int arch_spin_is_locked(arch_spinlock_t *lock)
 {
         return __ticket_spin_is_locked(lock);
 }
 
-static inline int __raw_spin_is_contended(raw_spinlock_t *lock)
+static inline int arch_spin_is_contended(arch_spinlock_t *lock)
 {
         return __ticket_spin_is_contended(lock);
 }
-#define __raw_spin_is_contended __raw_spin_is_contended
+#define arch_spin_is_contended  arch_spin_is_contended
 
-static __always_inline void __raw_spin_lock(raw_spinlock_t *lock)
+static __always_inline void arch_spin_lock(arch_spinlock_t *lock)
 {
         __ticket_spin_lock(lock);
 }
 
-static __always_inline int __raw_spin_trylock(raw_spinlock_t *lock)
+static __always_inline int arch_spin_trylock(arch_spinlock_t *lock)
 {
         return __ticket_spin_trylock(lock);
 }
 
-static __always_inline void __raw_spin_unlock(raw_spinlock_t *lock)
+static __always_inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
         __ticket_spin_unlock(lock);
 }
 
-static __always_inline void __raw_spin_lock_flags(raw_spinlock_t *lock,
+static __always_inline void arch_spin_lock_flags(arch_spinlock_t *lock,
                                                   unsigned long flags)
 {
-        __raw_spin_lock(lock);
+        arch_spin_lock(lock);
 }
 
 #endif  /* CONFIG_PARAVIRT_SPINLOCKS */
 
-static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)
+static inline void arch_spin_unlock_wait(arch_spinlock_t *lock)
 {
-        while (__raw_spin_is_locked(lock))
+        while (arch_spin_is_locked(lock))
                 cpu_relax();
 }
 
@@ -232,7 +232,7 @@ static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)
  * read_can_lock - would read_trylock() succeed?
  * @lock: the rwlock in question.
  */
-static inline int __raw_read_can_lock(raw_rwlock_t *lock)
+static inline int arch_read_can_lock(arch_rwlock_t *lock)
 {
         return (int)(lock)->lock > 0;
 }
@@ -241,12 +241,12 @@ static inline int __raw_read_can_lock(raw_rwlock_t *lock)
  * write_can_lock - would write_trylock() succeed?
  * @lock: the rwlock in question.
  */
-static inline int __raw_write_can_lock(raw_rwlock_t *lock)
+static inline int arch_write_can_lock(arch_rwlock_t *lock)
 {
         return (lock)->lock == RW_LOCK_BIAS;
 }
 
-static inline void __raw_read_lock(raw_rwlock_t *rw)
+static inline void arch_read_lock(arch_rwlock_t *rw)
 {
         asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t"
                      "jns 1f\n"
@@ -255,7 +255,7 @@ static inline void __raw_read_lock(raw_rwlock_t *rw)
                      ::LOCK_PTR_REG (rw) : "memory");
 }
 
-static inline void __raw_write_lock(raw_rwlock_t *rw)
+static inline void arch_write_lock(arch_rwlock_t *rw)
 {
         asm volatile(LOCK_PREFIX " subl %1,(%0)\n\t"
                      "jz 1f\n"
@@ -264,7 +264,7 @@ static inline void __raw_write_lock(raw_rwlock_t *rw)
                      ::LOCK_PTR_REG (rw), "i" (RW_LOCK_BIAS) : "memory");
 }
 
-static inline int __raw_read_trylock(raw_rwlock_t *lock)
+static inline int arch_read_trylock(arch_rwlock_t *lock)
 {
         atomic_t *count = (atomic_t *)lock;
 
@@ -274,7 +274,7 @@ static inline int __raw_read_trylock(raw_rwlock_t *lock)
         return 0;
 }
 
-static inline int __raw_write_trylock(raw_rwlock_t *lock)
+static inline int arch_write_trylock(arch_rwlock_t *lock)
 {
         atomic_t *count = (atomic_t *)lock;
 
@@ -284,23 +284,23 @@ static inline int __raw_write_trylock(raw_rwlock_t *lock)
         return 0;
 }
 
-static inline void __raw_read_unlock(raw_rwlock_t *rw)
+static inline void arch_read_unlock(arch_rwlock_t *rw)
 {
         asm volatile(LOCK_PREFIX "incl %0" :"+m" (rw->lock) : : "memory");
 }
 
-static inline void __raw_write_unlock(raw_rwlock_t *rw)
+static inline void arch_write_unlock(arch_rwlock_t *rw)
 {
         asm volatile(LOCK_PREFIX "addl %1, %0"
                      : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
 }
 
-#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
-#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+#define arch_read_lock_flags(lock, flags) arch_read_lock(lock)
+#define arch_write_lock_flags(lock, flags) arch_write_lock(lock)
 
-#define _raw_spin_relax(lock)   cpu_relax()
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
+#define arch_spin_relax(lock)   cpu_relax()
+#define arch_read_relax(lock)   cpu_relax()
+#define arch_write_relax(lock)  cpu_relax()
 
 /* The {read|write|spin}_lock() on x86 are full memory barriers. */
 static inline void smp_mb__after_lock(void) { }
diff --git a/arch/x86/include/asm/spinlock_types.h b/arch/x86/include/asm/spinlock_types.h
index 845f81c87091..dcb48b2edc11 100644
--- a/arch/x86/include/asm/spinlock_types.h
+++ b/arch/x86/include/asm/spinlock_types.h
@@ -5,16 +5,16 @@
 # error "please don't include this file directly"
 #endif
 
-typedef struct raw_spinlock {
+typedef struct arch_spinlock {
         unsigned int slock;
-} raw_spinlock_t;
+} arch_spinlock_t;
 
-#define __RAW_SPIN_LOCK_UNLOCKED        { 0 }
+#define __ARCH_SPIN_LOCK_UNLOCKED       { 0 }
 
 typedef struct {
         unsigned int lock;
-} raw_rwlock_t;
+} arch_rwlock_t;
 
-#define __RAW_RW_LOCK_UNLOCKED          { RW_LOCK_BIAS }
+#define __ARCH_RW_LOCK_UNLOCKED         { RW_LOCK_BIAS }
 
 #endif /* _ASM_X86_SPINLOCK_TYPES_H */
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index 40e37b10c6c0..c5087d796587 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -35,11 +35,16 @@
 # endif
 #endif
 
-/* Node not present */
-#define NUMA_NO_NODE    (-1)
+/*
+ * to preserve the visibility of NUMA_NO_NODE definition,
+ * moved to there from here.  May be used independent of
+ * CONFIG_NUMA.
+ */
+#include <linux/numa.h>
 
 #ifdef CONFIG_NUMA
 #include <linux/cpumask.h>
+
 #include <asm/mpspec.h>
 
 #ifdef CONFIG_X86_32
diff --git a/arch/x86/include/asm/uv/bios.h b/arch/x86/include/asm/uv/bios.h
index 7ed17ff502b9..2751f3075d8b 100644
--- a/arch/x86/include/asm/uv/bios.h
+++ b/arch/x86/include/asm/uv/bios.h
@@ -76,15 +76,6 @@ union partition_info_u {
         };
 };
 
-union uv_watchlist_u {
-        u64     val;
-        struct {
-                u64     blade   : 16,
-                        size    : 32,
-                        filler  : 16;
-        };
-};
-
 enum uv_memprotect {
         UV_MEMPROT_RESTRICT_ACCESS,
         UV_MEMPROT_ALLOW_AMO,
@@ -100,7 +91,7 @@ extern s64 uv_bios_call_reentrant(enum uv_bios_cmd, u64, u64, u64, u64, u64);
 
 extern s64 uv_bios_get_sn_info(int, int *, long *, long *, long *);
 extern s64 uv_bios_freq_base(u64, u64 *);
-extern int uv_bios_mq_watchlist_alloc(int, unsigned long, unsigned int,
+extern int uv_bios_mq_watchlist_alloc(unsigned long, unsigned int,
                                         unsigned long *);
 extern int uv_bios_mq_watchlist_free(int, int);
 extern s64 uv_bios_change_memprotect(u64, u64, enum uv_memprotect);
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index d1414af98559..811bfabc80b7 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -172,6 +172,8 @@ DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);
 #define UV_LOCAL_MMR_SIZE               (64UL * 1024 * 1024)
 #define UV_GLOBAL_MMR32_SIZE            (64UL * 1024 * 1024)
 
+#define UV_GLOBAL_GRU_MMR_BASE          0x4000000
+
 #define UV_GLOBAL_MMR32_PNODE_SHIFT     15
 #define UV_GLOBAL_MMR64_PNODE_SHIFT     26
 
@@ -232,6 +234,26 @@ static inline unsigned long uv_gpa(void *v)
         return uv_soc_phys_ram_to_gpa(__pa(v));
 }
 
+/* Top two bits indicate the requested address is in MMR space.  */
+static inline int
+uv_gpa_in_mmr_space(unsigned long gpa)
+{
+        return (gpa >> 62) == 0x3UL;
+}
+
+/* UV global physical address --> socket phys RAM */
+static inline unsigned long uv_gpa_to_soc_phys_ram(unsigned long gpa)
+{
+        unsigned long paddr = gpa & uv_hub_info->gpa_mask;
+        unsigned long remap_base = uv_hub_info->lowmem_remap_base;
+        unsigned long remap_top =  uv_hub_info->lowmem_remap_top;
+
+        if (paddr >= remap_base && paddr < remap_base + remap_top)
+                paddr -= remap_base;
+        return paddr;
+}
+
+
 /* gnode -> pnode */
 static inline unsigned long uv_gpa_to_gnode(unsigned long gpa)
 {
@@ -308,6 +330,15 @@ static inline unsigned long uv_read_global_mmr64(int pnode,
 }
 
 /*
+ * Global MMR space addresses when referenced by the GRU. (GRU does
+ * NOT use socket addressing).
+ */
+static inline unsigned long uv_global_gru_mmr_address(int pnode, unsigned long offset)
+{
+        return UV_GLOBAL_GRU_MMR_BASE | offset | (pnode << uv_hub_info->m_val);
+}
+
+/*
  * Access hub local MMRs. Faster than using global space but only local MMRs
  * are accessible.
  */
@@ -434,6 +465,14 @@ static inline void uv_set_cpu_scir_bits(int cpu, unsigned char value)
         }
 }
 
+static unsigned long uv_hub_ipi_value(int apicid, int vector, int mode)
+{
+        return (1UL << UVH_IPI_INT_SEND_SHFT) |
+                        ((apicid) << UVH_IPI_INT_APIC_ID_SHFT) |
+                        (mode << UVH_IPI_INT_DELIVERY_MODE_SHFT) |
+                        (vector << UVH_IPI_INT_VECTOR_SHFT);
+}
+
 static inline void uv_hub_send_ipi(int pnode, int apicid, int vector)
 {
         unsigned long val;
@@ -442,10 +481,7 @@ static inline void uv_hub_send_ipi(int pnode, int apicid, int vector)
         if (vector == NMI_VECTOR)
                 dmode = dest_NMI;
 
-        val = (1UL << UVH_IPI_INT_SEND_SHFT) |
-                        ((apicid) << UVH_IPI_INT_APIC_ID_SHFT) |
-                        (dmode << UVH_IPI_INT_DELIVERY_MODE_SHFT) |
-                        (vector << UVH_IPI_INT_VECTOR_SHFT);
+        val = uv_hub_ipi_value(apicid, vector, dmode);
         uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
 }
 
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 4f2e66e29ecc..d87f09bc5a52 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -89,7 +89,6 @@ obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 obj-$(CONFIG_HPET_TIMER)        += hpet.o
 
 obj-$(CONFIG_K8_NB)             += k8.o
-obj-$(CONFIG_MGEODE_LX)         += geode_32.o mfgpt_32.o
 obj-$(CONFIG_DEBUG_RODATA_TEST) += test_rodata.o
 obj-$(CONFIG_DEBUG_NX_TEST)     += test_nx.o
 
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index b990b5cc9541..23824fef789c 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -19,7 +19,7 @@
 
 #include <linux/pci.h>
 #include <linux/gfp.h>
-#include <linux/bitops.h>
+#include <linux/bitmap.h>
 #include <linux/debugfs.h>
 #include <linux/scatterlist.h>
 #include <linux/dma-mapping.h>
@@ -1162,7 +1162,7 @@ static void dma_ops_free_addresses(struct dma_ops_domain *dom,
 
         address = (address % APERTURE_RANGE_SIZE) >> PAGE_SHIFT;
 
-        iommu_area_free(range->bitmap, address, pages);
+        bitmap_clear(range->bitmap, address, pages);
 
 }
 
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index d5d498fbee4b..11a5851f1f50 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2431,7 +2431,7 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void)
                         continue;
 
                 cfg = irq_cfg(irq);
-                spin_lock(&desc->lock);
+                raw_spin_lock(&desc->lock);
 
                 if (vector == cfg->vector && cpumask_test_cpu(me, cfg->domain))
                         goto unlock;
@@ -2450,7 +2450,7 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void)
                 }
                 __get_cpu_var(vector_irq)[vector] = -1;
 unlock:
-                spin_unlock(&desc->lock);
+                raw_spin_unlock(&desc->lock);
         }
 
         irq_exit();
diff --git a/arch/x86/kernel/bios_uv.c b/arch/x86/kernel/bios_uv.c
index 63a88e1f987d..b0206a211b09 100644
--- a/arch/x86/kernel/bios_uv.c
+++ b/arch/x86/kernel/bios_uv.c
@@ -101,21 +101,17 @@ s64 uv_bios_get_sn_info(int fc, int *uvtype, long *partid, long *coher,
 }
 
 int
-uv_bios_mq_watchlist_alloc(int blade, unsigned long addr, unsigned int mq_size,
+uv_bios_mq_watchlist_alloc(unsigned long addr, unsigned int mq_size,
                            unsigned long *intr_mmr_offset)
 {
-        union uv_watchlist_u size_blade;
         u64 watchlist;
         s64 ret;
 
-        size_blade.size = mq_size;
-        size_blade.blade = blade;
-
         /*
          * bios returns watchlist number or negative error number.
          */
         ret = (int)uv_bios_call_irqsave(UV_BIOS_WATCHLIST_ALLOC, addr,
-                        size_blade.val, (u64)intr_mmr_offset,
+                        mq_size, (u64)intr_mmr_offset,
                         (u64)&watchlist, 0);
         if (ret < BIOS_STATUS_SUCCESS)
                 return ret;
diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
index 3c1b12d461d1..e006e56f699c 100644
--- a/arch/x86/kernel/cpu/mtrr/if.c
+++ b/arch/x86/kernel/cpu/mtrr/if.c
@@ -4,6 +4,7 @@
 #include <linux/proc_fs.h>
 #include <linux/module.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/init.h>
 
 #define LINE_SIZE 80
@@ -133,8 +134,7 @@ mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos)
                 return -EINVAL;
 
         base = simple_strtoull(line + 5, &ptr, 0);
-        while (isspace(*ptr))
-                ptr++;
+        ptr = skip_spaces(ptr);
 
         if (strncmp(ptr, "size=", 5))
                 return -EINVAL;
@@ -142,14 +142,11 @@ mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos)
         size = simple_strtoull(ptr + 5, &ptr, 0);
         if ((base & 0xfff) || (size & 0xfff))
                 return -EINVAL;
-        while (isspace(*ptr))
-                ptr++;
+        ptr = skip_spaces(ptr);
 
         if (strncmp(ptr, "type=", 5))
                 return -EINVAL;
-        ptr += 5;
-        while (isspace(*ptr))
-                ptr++;
+        ptr = skip_spaces(ptr + 5);
 
         for (i = 0; i < MTRR_NUM_TYPES; ++i) {
                 if (strcmp(ptr, mtrr_strings[i]))
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index b8ce165dde5d..0a0aa1cec8f1 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -188,7 +188,7 @@ void dump_stack(void)
 }
 EXPORT_SYMBOL(dump_stack);
 
-static raw_spinlock_t die_lock = __RAW_SPIN_LOCK_UNLOCKED;
+static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
 static int die_owner = -1;
 static unsigned int die_nest_count;
 
@@ -207,11 +207,11 @@ unsigned __kprobes long oops_begin(void)
         /* racy, but better than risking deadlock. */
         raw_local_irq_save(flags);
         cpu = smp_processor_id();
-        if (!__raw_spin_trylock(&die_lock)) {
+        if (!arch_spin_trylock(&die_lock)) {
                 if (cpu == die_owner)
                         /* nested oops. should stop eventually */;
                 else
-                        __raw_spin_lock(&die_lock);
+                        arch_spin_lock(&die_lock);
         }
         die_nest_count++;
         die_owner = cpu;
@@ -231,7 +231,7 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
         die_nest_count--;
         if (!die_nest_count)
                 /* Nest count reaches zero, release the lock. */
-                __raw_spin_unlock(&die_lock);
+                arch_spin_unlock(&die_lock);
         raw_local_irq_restore(flags);
         oops_exit();
 
diff --git a/arch/x86/kernel/geode_32.c b/arch/x86/kernel/geode_32.c
deleted file mode 100644
index 9b08e852fd1a..000000000000
--- a/arch/x86/kernel/geode_32.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * AMD Geode southbridge support code
- * Copyright (C) 2006, Advanced Micro Devices, Inc.
- * Copyright (C) 2007, Andres Salomon <dilinger@debian.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/io.h>
-#include <asm/msr.h>
-#include <asm/geode.h>
-
-static struct {
-        char *name;
-        u32 msr;
-        int size;
-        u32 base;
-} lbars[] = {
-        { "geode-pms",   MSR_LBAR_PMS, LBAR_PMS_SIZE, 0 },
-        { "geode-acpi",  MSR_LBAR_ACPI, LBAR_ACPI_SIZE, 0 },
-        { "geode-gpio",  MSR_LBAR_GPIO, LBAR_GPIO_SIZE, 0 },
-        { "geode-mfgpt", MSR_LBAR_MFGPT, LBAR_MFGPT_SIZE, 0 }
-};
-
-static void __init init_lbars(void)
-{
-        u32 lo, hi;
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(lbars); i++) {
-                rdmsr(lbars[i].msr, lo, hi);
-                if (hi & 0x01)
-                        lbars[i].base = lo & 0x0000ffff;
-
-                if (lbars[i].base == 0)
-                        printk(KERN_ERR "geode:  Couldn't initialize '%s'\n",
-                                        lbars[i].name);
-        }
-}
-
-int geode_get_dev_base(unsigned int dev)
-{
-        BUG_ON(dev >= ARRAY_SIZE(lbars));
-        return lbars[dev].base;
-}
-EXPORT_SYMBOL_GPL(geode_get_dev_base);
-
-/* === GPIO API === */
-
-void geode_gpio_set(u32 gpio, unsigned int reg)
-{
-        u32 base = geode_get_dev_base(GEODE_DEV_GPIO);
-
-        if (!base)
-                return;
-
-        /* low bank register */
-        if (gpio & 0xFFFF)
-                outl(gpio & 0xFFFF, base + reg);
-        /* high bank register */
-        gpio >>= 16;
-        if (gpio)
-                outl(gpio, base + 0x80 + reg);
-}
-EXPORT_SYMBOL_GPL(geode_gpio_set);
-
-void geode_gpio_clear(u32 gpio, unsigned int reg)
-{
-        u32 base = geode_get_dev_base(GEODE_DEV_GPIO);
-
-        if (!base)
-                return;
-
-        /* low bank register */
-        if (gpio & 0xFFFF)
-                outl((gpio & 0xFFFF) << 16, base + reg);
-        /* high bank register */
-        gpio &= (0xFFFF << 16);
-        if (gpio)
-                outl(gpio, base + 0x80 + reg);
-}
-EXPORT_SYMBOL_GPL(geode_gpio_clear);
-
-int geode_gpio_isset(u32 gpio, unsigned int reg)
-{
-        u32 base = geode_get_dev_base(GEODE_DEV_GPIO);
-        u32 val;
-
-        if (!base)
-                return 0;
-
-        /* low bank register */
-        if (gpio & 0xFFFF) {
-                val = inl(base + reg) & (gpio & 0xFFFF);
-                if ((gpio & 0xFFFF) == val)
-                        return 1;
-        }
-        /* high bank register */
-        gpio >>= 16;
-        if (gpio) {
-                val = inl(base + 0x80 + reg) & gpio;
-                if (gpio == val)
-                        return 1;
-        }
-        return 0;
-}
-EXPORT_SYMBOL_GPL(geode_gpio_isset);
-
-void geode_gpio_set_irq(unsigned int group, unsigned int irq)
-{
-        u32 lo, hi;
-
-        if (group > 7 || irq > 15)
-                return;
-
-        rdmsr(MSR_PIC_ZSEL_HIGH, lo, hi);
-
-        lo &= ~(0xF << (group * 4));
-        lo |= (irq & 0xF) << (group * 4);
-
-        wrmsr(MSR_PIC_ZSEL_HIGH, lo, hi);
-}
-EXPORT_SYMBOL_GPL(geode_gpio_set_irq);
-
-void geode_gpio_setup_event(unsigned int gpio, int pair, int pme)
-{
-        u32 base = geode_get_dev_base(GEODE_DEV_GPIO);
-        u32 offset, shift, val;
-
-        if (gpio >= 24)
-                offset = GPIO_MAP_W;
-        else if (gpio >= 16)
-                offset = GPIO_MAP_Z;
-        else if (gpio >= 8)
-                offset = GPIO_MAP_Y;
-        else
-                offset = GPIO_MAP_X;
-
-        shift = (gpio % 8) * 4;
-
-        val = inl(base + offset);
-
-        /* Clear whatever was there before */
-        val &= ~(0xF << shift);
-
-        /* And set the new value */
-
-        val |= ((pair & 7) << shift);
-
-        /* Set the PME bit if this is a PME event */
-
-        if (pme)
-                val |= (1 << (shift + 3));
-
-        outl(val, base + offset);
-}
-EXPORT_SYMBOL_GPL(geode_gpio_setup_event);
-
-int geode_has_vsa2(void)
-{
-        static int has_vsa2 = -1;
-
-        if (has_vsa2 == -1) {
-                u16 val;
-
-                /*
-                 * The VSA has virtual registers that we can query for a
-                 * signature.
-                 */
-                outw(VSA_VR_UNLOCK, VSA_VRC_INDEX);
-                outw(VSA_VR_SIGNATURE, VSA_VRC_INDEX);
-
-                val = inw(VSA_VRC_DATA);
-                has_vsa2 = (val == AMD_VSA_SIG || val == GSW_VSA_SIG);
-        }
-
-        return has_vsa2;
-}
-EXPORT_SYMBOL_GPL(geode_has_vsa2);
-
-static int __init geode_southbridge_init(void)
-{
-        if (!is_geode())
-                return -ENODEV;
-
-        init_lbars();
-        (void) mfgpt_timer_setup();
-        return 0;
-}
-
-postcore_initcall(geode_southbridge_init);
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 664bcb7384ac..91fd0c70a18a 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -149,7 +149,7 @@ int show_interrupts(struct seq_file *p, void *v)
         if (!desc)
                 return 0;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         for_each_online_cpu(j)
                 any_count |= kstat_irqs_cpu(i, j);
         action = desc->action;
@@ -170,7 +170,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
         seq_putc(p, '\n');
 out:
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
         return 0;
 }
 
@@ -294,12 +294,12 @@ void fixup_irqs(void)
                         continue;
 
                 /* interrupt's are disabled at this point */
-                spin_lock(&desc->lock);
+                raw_spin_lock(&desc->lock);
 
                 affinity = desc->affinity;
                 if (!irq_has_action(irq) ||
                     cpumask_equal(affinity, cpu_online_mask)) {
-                        spin_unlock(&desc->lock);
+                        raw_spin_unlock(&desc->lock);
                         continue;
                 }
 
@@ -326,7 +326,7 @@ void fixup_irqs(void)
                 if (!(desc->status & IRQ_MOVE_PCNTXT) && desc->chip->unmask)
                         desc->chip->unmask(irq);
 
-                spin_unlock(&desc->lock);
+                raw_spin_unlock(&desc->lock);
 
                 if (break_affinity && set_affinity)
                         printk("Broke affinity for irq %i\n", irq);
@@ -356,10 +356,10 @@ void fixup_irqs(void)
                         irq = __get_cpu_var(vector_irq)[vector];
 
                         desc = irq_to_desc(irq);
-                        spin_lock(&desc->lock);
+                        raw_spin_lock(&desc->lock);
                         if (desc->chip->retrigger)
                                 desc->chip->retrigger(irq);
-                        spin_unlock(&desc->lock);
+                        raw_spin_unlock(&desc->lock);
                 }
         }
 }
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c
deleted file mode 100644
index 2a62d843f015..000000000000
--- a/arch/x86/kernel/mfgpt_32.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * Driver/API for AMD Geode Multi-Function General Purpose Timers (MFGPT)
- *
- * Copyright (C) 2006, Advanced Micro Devices, Inc.
- * Copyright (C) 2007, Andres Salomon <dilinger@debian.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
- *
- * The MFGPTs are documented in AMD Geode CS5536 Companion Device Data Book.
- */
-
-/*
- * We are using the 32.768kHz input clock - it's the only one that has the
- * ranges we find desirable.  The following table lists the suitable
- * divisors and the associated Hz, minimum interval and the maximum interval:
- *
- *  Divisor   Hz      Min Delta (s)  Max Delta (s)
- *   1        32768   .00048828125      2.000
- *   2        16384   .0009765625       4.000
- *   4         8192   .001953125        8.000
- *   8         4096   .00390625        16.000
- *   16        2048   .0078125         32.000
- *   32        1024   .015625          64.000
- *   64         512   .03125          128.000
- *  128         256   .0625           256.000
- *  256         128   .125            512.000
- */
-
-#include <linux/kernel.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <asm/geode.h>
-
-#define MFGPT_DEFAULT_IRQ       7
-
-static struct mfgpt_timer_t {
-        unsigned int avail:1;
-} mfgpt_timers[MFGPT_MAX_TIMERS];
-
-/* Selected from the table above */
-
-#define MFGPT_DIVISOR 16
-#define MFGPT_SCALE  4     /* divisor = 2^(scale) */
-#define MFGPT_HZ  (32768 / MFGPT_DIVISOR)
-#define MFGPT_PERIODIC (MFGPT_HZ / HZ)
-
-/* Allow for disabling of MFGPTs */
-static int disable;
-static int __init mfgpt_disable(char *s)
-{
-        disable = 1;
-        return 1;
-}
-__setup("nomfgpt", mfgpt_disable);
-
-/* Reset the MFGPT timers. This is required by some broken BIOSes which already
- * do the same and leave the system in an unstable state. TinyBIOS 0.98 is
- * affected at least (0.99 is OK with MFGPT workaround left to off).
- */
-static int __init mfgpt_fix(char *s)
-{
-        u32 val, dummy;
-
-        /* The following udocumented bit resets the MFGPT timers */
-        val = 0xFF; dummy = 0;
-        wrmsr(MSR_MFGPT_SETUP, val, dummy);
-        return 1;
-}
-__setup("mfgptfix", mfgpt_fix);
-
-/*
- * Check whether any MFGPTs are available for the kernel to use.  In most
- * cases, firmware that uses AMD's VSA code will claim all timers during
- * bootup; we certainly don't want to take them if they're already in use.
- * In other cases (such as with VSAless OpenFirmware), the system firmware
- * leaves timers available for us to use.
- */
-
-
-static int timers = -1;
-
-static void geode_mfgpt_detect(void)
-{
-        int i;
-        u16 val;
-
-        timers = 0;
-
-        if (disable) {
-                printk(KERN_INFO "geode-mfgpt:  MFGPT support is disabled\n");
-                goto done;
-        }
-
-        if (!geode_get_dev_base(GEODE_DEV_MFGPT)) {
-                printk(KERN_INFO "geode-mfgpt:  MFGPT LBAR is not set up\n");
-                goto done;
-        }
-
-        for (i = 0; i < MFGPT_MAX_TIMERS; i++) {
-                val = geode_mfgpt_read(i, MFGPT_REG_SETUP);
-                if (!(val & MFGPT_SETUP_SETUP)) {
-                        mfgpt_timers[i].avail = 1;
-                        timers++;
-                }
-        }
-
-done:
-        printk(KERN_INFO "geode-mfgpt:  %d MFGPT timers available.\n", timers);
-}
-
-int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable)
-{
-        u32 msr, mask, value, dummy;
-        int shift = (cmp == MFGPT_CMP1) ? 0 : 8;
-
-        if (timer < 0 || timer >= MFGPT_MAX_TIMERS)
-                return -EIO;
-
-        /*
-         * The register maps for these are described in sections 6.17.1.x of
-         * the AMD Geode CS5536 Companion Device Data Book.
-         */
-        switch (event) {
-        case MFGPT_EVENT_RESET:
-                /*
-                 * XXX: According to the docs, we cannot reset timers above
-                 * 6; that is, resets for 7 and 8 will be ignored.  Is this
-                 * a problem?   -dilinger
-                 */
-                msr = MSR_MFGPT_NR;
-                mask = 1 << (timer + 24);
-                break;
-
-        case MFGPT_EVENT_NMI:
-                msr = MSR_MFGPT_NR;
-                mask = 1 << (timer + shift);
-                break;
-
-        case MFGPT_EVENT_IRQ:
-                msr = MSR_MFGPT_IRQ;
-                mask = 1 << (timer + shift);
-                break;
-
-        default:
-                return -EIO;
-        }
-
-        rdmsr(msr, value, dummy);
-
-        if (enable)
-                value |= mask;
-        else
-                value &= ~mask;
-
-        wrmsr(msr, value, dummy);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(geode_mfgpt_toggle_event);
-
-int geode_mfgpt_set_irq(int timer, int cmp, int *irq, int enable)
-{
-        u32 zsel, lpc, dummy;
-        int shift;
-
-        if (timer < 0 || timer >= MFGPT_MAX_TIMERS)
-                return -EIO;
-
-        /*
-         * Unfortunately, MFGPTs come in pairs sharing their IRQ lines. If VSA
-         * is using the same CMP of the timer's Siamese twin, the IRQ is set to
-         * 2, and we mustn't use nor change it.
-         * XXX: Likewise, 2 Linux drivers might clash if the 2nd overwrites the
-         * IRQ of the 1st. This can only happen if forcing an IRQ, calling this
-         * with *irq==0 is safe. Currently there _are_ no 2 drivers.
-         */
-        rdmsr(MSR_PIC_ZSEL_LOW, zsel, dummy);
-        shift = ((cmp == MFGPT_CMP1 ? 0 : 4) + timer % 4) * 4;
-        if (((zsel >> shift) & 0xF) == 2)
-                return -EIO;
-
-        /* Choose IRQ: if none supplied, keep IRQ already set or use default */
-        if (!*irq)
-                *irq = (zsel >> shift) & 0xF;
-        if (!*irq)
-                *irq = MFGPT_DEFAULT_IRQ;
-
-        /* Can't use IRQ if it's 0 (=disabled), 2, or routed to LPC */
-        if (*irq < 1 || *irq == 2 || *irq > 15)
-                return -EIO;
-        rdmsr(MSR_PIC_IRQM_LPC, lpc, dummy);
-        if (lpc & (1 << *irq))
-                return -EIO;
-
-        /* All chosen and checked - go for it */
-        if (geode_mfgpt_toggle_event(timer, cmp, MFGPT_EVENT_IRQ, enable))
-                return -EIO;
-        if (enable) {
-                zsel = (zsel & ~(0xF << shift)) | (*irq << shift);
-                wrmsr(MSR_PIC_ZSEL_LOW, zsel, dummy);
-        }
-
-        return 0;
-}
-
-static int mfgpt_get(int timer)
-{
-        mfgpt_timers[timer].avail = 0;
-        printk(KERN_INFO "geode-mfgpt:  Registered timer %d\n", timer);
-        return timer;
-}
-
-int geode_mfgpt_alloc_timer(int timer, int domain)
-{
-        int i;
-
-        if (timers == -1) {
-                /* timers haven't been detected yet */
-                geode_mfgpt_detect();
-        }
-
-        if (!timers)
-                return -1;
-
-        if (timer >= MFGPT_MAX_TIMERS)
-                return -1;
-
-        if (timer < 0) {
-                /* Try to find an available timer */
-                for (i = 0; i < MFGPT_MAX_TIMERS; i++) {
-                        if (mfgpt_timers[i].avail)
-                                return mfgpt_get(i);
-
-                        if (i == 5 && domain == MFGPT_DOMAIN_WORKING)
-                                break;
-                }
-        } else {
-                /* If they requested a specific timer, try to honor that */
-                if (mfgpt_timers[timer].avail)
-                        return mfgpt_get(timer);
-        }
-
-        /* No timers available - too bad */
-        return -1;
-}
-EXPORT_SYMBOL_GPL(geode_mfgpt_alloc_timer);
-
-
-#ifdef CONFIG_GEODE_MFGPT_TIMER
-
-/*
- * The MFPGT timers on the CS5536 provide us with suitable timers to use
- * as clock event sources - not as good as a HPET or APIC, but certainly
- * better than the PIT.  This isn't a general purpose MFGPT driver, but
- * a simplified one designed specifically to act as a clock event source.
- * For full details about the MFGPT, please consult the CS5536 data sheet.
- */
-
-#include <linux/clocksource.h>
-#include <linux/clockchips.h>
-
-static unsigned int mfgpt_tick_mode = CLOCK_EVT_MODE_SHUTDOWN;
-static u16 mfgpt_event_clock;
-
-static int irq;
-static int __init mfgpt_setup(char *str)
-{
-        get_option(&str, &irq);
-        return 1;
-}
-__setup("mfgpt_irq=", mfgpt_setup);
-
-static void mfgpt_disable_timer(u16 clock)
-{
-        /* avoid races by clearing CMP1 and CMP2 unconditionally */
-        geode_mfgpt_write(clock, MFGPT_REG_SETUP, (u16) ~MFGPT_SETUP_CNTEN |
-                        MFGPT_SETUP_CMP1 | MFGPT_SETUP_CMP2);
-}
-
-static int mfgpt_next_event(unsigned long, struct clock_event_device *);
-static void mfgpt_set_mode(enum clock_event_mode, struct clock_event_device *);
-
-static struct clock_event_device mfgpt_clockevent = {
-        .name = "mfgpt-timer",
-        .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-        .set_mode = mfgpt_set_mode,
-        .set_next_event = mfgpt_next_event,
-        .rating = 250,
-        .cpumask = cpu_all_mask,
-        .shift = 32
-};
-
-static void mfgpt_start_timer(u16 delta)
-{
-        geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_CMP2, (u16) delta);
-        geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_COUNTER, 0);
-
-        geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_SETUP,
-                          MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2);
-}
-
-static void mfgpt_set_mode(enum clock_event_mode mode,
-                           struct clock_event_device *evt)
-{
-        mfgpt_disable_timer(mfgpt_event_clock);
-
-        if (mode == CLOCK_EVT_MODE_PERIODIC)
-                mfgpt_start_timer(MFGPT_PERIODIC);
-
-        mfgpt_tick_mode = mode;
-}
-
-static int mfgpt_next_event(unsigned long delta, struct clock_event_device *evt)
-{
-        mfgpt_start_timer(delta);
-        return 0;
-}
-
-static irqreturn_t mfgpt_tick(int irq, void *dev_id)
-{
-        u16 val = geode_mfgpt_read(mfgpt_event_clock, MFGPT_REG_SETUP);
-
-        /* See if the interrupt was for us */
-        if (!(val & (MFGPT_SETUP_SETUP  | MFGPT_SETUP_CMP2 | MFGPT_SETUP_CMP1)))
-                return IRQ_NONE;
-
-        /* Turn off the clock (and clear the event) */
-        mfgpt_disable_timer(mfgpt_event_clock);
-
-        if (mfgpt_tick_mode == CLOCK_EVT_MODE_SHUTDOWN)
-                return IRQ_HANDLED;
-
-        /* Clear the counter */
-        geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_COUNTER, 0);
-
-        /* Restart the clock in periodic mode */
-
-        if (mfgpt_tick_mode == CLOCK_EVT_MODE_PERIODIC) {
-                geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_SETUP,
-                                  MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2);
-        }
-
-        mfgpt_clockevent.event_handler(&mfgpt_clockevent);
-        return IRQ_HANDLED;
-}
-
-static struct irqaction mfgptirq  = {
-        .handler = mfgpt_tick,
-        .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_TIMER,
-        .name = "mfgpt-timer"
-};
-
-int __init mfgpt_timer_setup(void)
-{
-        int timer, ret;
-        u16 val;
-
-        timer = geode_mfgpt_alloc_timer(MFGPT_TIMER_ANY, MFGPT_DOMAIN_WORKING);
-        if (timer < 0) {
-                printk(KERN_ERR
-                       "mfgpt-timer:  Could not allocate a MFPGT timer\n");
-                return -ENODEV;
-        }
-
-        mfgpt_event_clock = timer;
-
-        /* Set up the IRQ on the MFGPT side */
-        if (geode_mfgpt_setup_irq(mfgpt_event_clock, MFGPT_CMP2, &irq)) {
-                printk(KERN_ERR "mfgpt-timer:  Could not set up IRQ %d\n", irq);
-                return -EIO;
-        }
-
-        /* And register it with the kernel */
-        ret = setup_irq(irq, &mfgptirq);
-
-        if (ret) {
-                printk(KERN_ERR
-                       "mfgpt-timer:  Unable to set up the interrupt.\n");
-                goto err;
-        }
-
-        /* Set the clock scale and enable the event mode for CMP2 */
-        val = MFGPT_SCALE | (3 << 8);
-
-        geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_SETUP, val);
-
-        /* Set up the clock event */
-        mfgpt_clockevent.mult = div_sc(MFGPT_HZ, NSEC_PER_SEC,
-                                       mfgpt_clockevent.shift);
-        mfgpt_clockevent.min_delta_ns = clockevent_delta2ns(0xF,
-                        &mfgpt_clockevent);
-        mfgpt_clockevent.max_delta_ns = clockevent_delta2ns(0xFFFE,
-                        &mfgpt_clockevent);
-
-        printk(KERN_INFO
-               "mfgpt-timer:  Registering MFGPT timer %d as a clock event, using IRQ %d\n",
-               timer, irq);
-        clockevents_register_device(&mfgpt_clockevent);
-
-        return 0;
-
-err:
-        geode_mfgpt_release_irq(mfgpt_event_clock, MFGPT_CMP2, &irq);
-        printk(KERN_ERR
-               "mfgpt-timer:  Unable to set up the MFGPT clock source\n");
-        return -EIO;
-}
-
-#endif
diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c
index 4006c522adc7..9d1d263f786f 100644
--- a/arch/x86/kernel/olpc.c
+++ b/arch/x86/kernel/olpc.c
@@ -212,7 +212,7 @@ static int __init olpc_init(void)
         unsigned char *romsig;
 
         /* The ioremap check is dangerous; limit what we run it on */
-        if (!is_geode() || geode_has_vsa2())
+        if (!is_geode() || cs5535_has_vsa2())
                 return 0;
 
         spin_lock_init(&ec_lock);
@@ -244,7 +244,7 @@ static int __init olpc_init(void)
                         (unsigned char *) &olpc_platform_info.ecver, 1);
 
         /* check to see if the VSA exists */
-        if (geode_has_vsa2())
+        if (cs5535_has_vsa2())
                 olpc_platform_info.flags |= OLPC_F_VSA;
 
         printk(KERN_INFO "OLPC board revision %s%X (EC=%x)\n",
diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
index 3a7c5a44082e..676b8c77a976 100644
--- a/arch/x86/kernel/paravirt-spinlocks.c
+++ b/arch/x86/kernel/paravirt-spinlocks.c
@@ -8,9 +8,9 @@
 #include <asm/paravirt.h>
 
 static inline void
-default_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
+default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
 {
-        __raw_spin_lock(lock);
+        arch_spin_lock(lock);
 }
 
 struct pv_lock_ops pv_lock_ops = {
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index c563e4c8ff39..2bbde6078143 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -31,7 +31,7 @@
 #include <linux/string.h>
 #include <linux/crash_dump.h>
 #include <linux/dma-mapping.h>
-#include <linux/bitops.h>
+#include <linux/bitmap.h>
 #include <linux/pci_ids.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
@@ -212,7 +212,7 @@ static void iommu_range_reserve(struct iommu_table *tbl,
 
         spin_lock_irqsave(&tbl->it_lock, flags);
 
-        iommu_area_reserve(tbl->it_map, index, npages);
+        bitmap_set(tbl->it_map, index, npages);
 
         spin_unlock_irqrestore(&tbl->it_lock, flags);
 }
@@ -303,7 +303,7 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr,
 
         spin_lock_irqsave(&tbl->it_lock, flags);
 
-        iommu_area_free(tbl->it_map, entry, npages);
+        bitmap_clear(tbl->it_map, entry, npages);
 
         spin_unlock_irqrestore(&tbl->it_lock, flags);
 }
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index 56c0e730d3fe..34de53b46f87 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/topology.h>
 #include <linux/interrupt.h>
-#include <linux/bitops.h>
+#include <linux/bitmap.h>
 #include <linux/kdebug.h>
 #include <linux/scatterlist.h>
 #include <linux/iommu-helper.h>
@@ -126,7 +126,7 @@ static void free_iommu(unsigned long offset, int size)
         unsigned long flags;
 
         spin_lock_irqsave(&iommu_bitmap_lock, flags);
-        iommu_area_free(iommu_gart_bitmap, offset, size);
+        bitmap_clear(iommu_gart_bitmap, offset, size);
         if (offset >= next_bit)
                 next_bit = offset + size;
         spin_unlock_irqrestore(&iommu_bitmap_lock, flags);
@@ -792,7 +792,7 @@ int __init gart_iommu_init(void)
          * Out of IOMMU space handling.
          * Reserve some invalid pages at the beginning of the GART.
          */
-        iommu_area_reserve(iommu_gart_bitmap, 0, EMERGENCY_PAGES);
+        bitmap_set(iommu_gart_bitmap, 0, EMERGENCY_PAGES);
 
         pr_info("PCI-DMA: Reserving %luMB of IOMMU area in the AGP aperture\n",
                iommu_size >> 20);
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index 7079ddaf0731..2779321046bd 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -1676,21 +1676,33 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task)
 #endif
 }
 
-void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
-                                         int error_code, int si_code)
+static void fill_sigtrap_info(struct task_struct *tsk,
+                                struct pt_regs *regs,
+                                int error_code, int si_code,
+                                struct siginfo *info)
 {
-        struct siginfo info;
-
         tsk->thread.trap_no = 1;
         tsk->thread.error_code = error_code;
 
-        memset(&info, 0, sizeof(info));
-        info.si_signo = SIGTRAP;
-        info.si_code = si_code;
+        memset(info, 0, sizeof(*info));
+        info->si_signo = SIGTRAP;
+        info->si_code = si_code;
+        info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
+}
 
-        /* User-mode ip? */
-        info.si_addr = user_mode_vm(regs) ? (void __user *) regs->ip : NULL;
+void user_single_step_siginfo(struct task_struct *tsk,
+                                struct pt_regs *regs,
+                                struct siginfo *info)
+{
+        fill_sigtrap_info(tsk, regs, 0, TRAP_BRKPT, info);
+}
 
+void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
+                                         int error_code, int si_code)
+{
+        struct siginfo info;
+
+        fill_sigtrap_info(tsk, regs, error_code, si_code, &info);
         /* Send us the fake SIGTRAP */
         force_sig_info(SIGTRAP, &info, tsk);
 }
@@ -1755,29 +1767,22 @@ asmregparm long syscall_trace_enter(struct pt_regs *regs)
 
 asmregparm void syscall_trace_leave(struct pt_regs *regs)
 {
+        bool step;
+
         if (unlikely(current->audit_context))
                 audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
 
         if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
                 trace_sys_exit(regs, regs->ax);
 
-        if (test_thread_flag(TIF_SYSCALL_TRACE))
-                tracehook_report_syscall_exit(regs, 0);
-
         /*
          * If TIF_SYSCALL_EMU is set, we only get here because of
          * TIF_SINGLESTEP (i.e. this is PTRACE_SYSEMU_SINGLESTEP).
          * We already reported this syscall instruction in
-         * syscall_trace_enter(), so don't do any more now.
-         */
-        if (unlikely(test_thread_flag(TIF_SYSCALL_EMU)))
-                return;
-
-        /*
-         * If we are single-stepping, synthesize a trap to follow the
-         * system call instruction.
+         * syscall_trace_enter().
          */
-        if (test_thread_flag(TIF_SINGLESTEP) &&
-            tracehook_consider_fatal_signal(current, SIGTRAP))
-                send_sigtrap(current, regs, 0, TRAP_BRKPT);
+        step = unlikely(test_thread_flag(TIF_SINGLESTEP)) &&
+                        !test_thread_flag(TIF_SYSCALL_EMU);
+        if (step || test_thread_flag(TIF_SYSCALL_TRACE))
+                tracehook_report_syscall_exit(regs, step);
 }
diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
index 201eab63b05f..fda313ebbb03 100644
--- a/arch/x86/kernel/reboot_fixups_32.c
+++ b/arch/x86/kernel/reboot_fixups_32.c
@@ -12,7 +12,7 @@
 #include <linux/interrupt.h>
 #include <asm/reboot_fixups.h>
 #include <asm/msr.h>
-#include <asm/geode.h>
+#include <linux/cs5535.h>
 
 static void cs5530a_warm_reset(struct pci_dev *dev)
 {
diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index eed156851f5d..0aa5fed8b9e6 100644
--- a/arch/x86/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
@@ -33,7 +33,7 @@ static __cpuinitdata atomic_t stop_count;
  * we want to have the fastest, inlined, non-debug version
  * of a critical section, to be able to prove TSC time-warps:
  */
-static __cpuinitdata raw_spinlock_t sync_lock = __RAW_SPIN_LOCK_UNLOCKED;
+static __cpuinitdata arch_spinlock_t sync_lock = __ARCH_SPIN_LOCK_UNLOCKED;
 
 static __cpuinitdata cycles_t last_tsc;
 static __cpuinitdata cycles_t max_warp;
@@ -62,13 +62,13 @@ static __cpuinit void check_tsc_warp(void)
                  * previous TSC that was measured (possibly on
                  * another CPU) and update the previous TSC timestamp.
                  */
-                __raw_spin_lock(&sync_lock);
+                arch_spin_lock(&sync_lock);
                 prev = last_tsc;
                 rdtsc_barrier();
                 now = get_cycles();
                 rdtsc_barrier();
                 last_tsc = now;
-                __raw_spin_unlock(&sync_lock);
+                arch_spin_unlock(&sync_lock);
 
                 /*
                  * Be nice every now and then (and also check whether
@@ -87,10 +87,10 @@ static __cpuinit void check_tsc_warp(void)
                  * we saw a time-warp of the TSC going backwards:
                  */
                 if (unlikely(prev > now)) {
-                        __raw_spin_lock(&sync_lock);
+                        arch_spin_lock(&sync_lock);
                         max_warp = max(max_warp, prev - now);
                         nr_warps++;
-                        __raw_spin_unlock(&sync_lock);
+                        arch_spin_unlock(&sync_lock);
                 }
         }
         WARN(!(now-start),
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index 36a5141108df..24ded31b5aec 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -120,14 +120,14 @@ struct xen_spinlock {
         unsigned short spinners;        /* count of waiting cpus */
 };
 
-static int xen_spin_is_locked(struct raw_spinlock *lock)
+static int xen_spin_is_locked(struct arch_spinlock *lock)
 {
         struct xen_spinlock *xl = (struct xen_spinlock *)lock;
 
         return xl->lock != 0;
 }
 
-static int xen_spin_is_contended(struct raw_spinlock *lock)
+static int xen_spin_is_contended(struct arch_spinlock *lock)
 {
         struct xen_spinlock *xl = (struct xen_spinlock *)lock;
 
@@ -136,7 +136,7 @@ static int xen_spin_is_contended(struct raw_spinlock *lock)
         return xl->spinners != 0;
 }
 
-static int xen_spin_trylock(struct raw_spinlock *lock)
+static int xen_spin_trylock(struct arch_spinlock *lock)
 {
         struct xen_spinlock *xl = (struct xen_spinlock *)lock;
         u8 old = 1;
@@ -181,7 +181,7 @@ static inline void unspinning_lock(struct xen_spinlock *xl, struct xen_spinlock
         __get_cpu_var(lock_spinners) = prev;
 }
 
-static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enable)
+static noinline int xen_spin_lock_slow(struct arch_spinlock *lock, bool irq_enable)
 {
         struct xen_spinlock *xl = (struct xen_spinlock *)lock;
         struct xen_spinlock *prev;
@@ -254,7 +254,7 @@ out:
         return ret;
 }
 
-static inline void __xen_spin_lock(struct raw_spinlock *lock, bool irq_enable)
+static inline void __xen_spin_lock(struct arch_spinlock *lock, bool irq_enable)
 {
         struct xen_spinlock *xl = (struct xen_spinlock *)lock;
         unsigned timeout;
@@ -291,12 +291,12 @@ static inline void __xen_spin_lock(struct raw_spinlock *lock, bool irq_enable)
         spin_time_accum_total(start_spin);
 }
 
-static void xen_spin_lock(struct raw_spinlock *lock)
+static void xen_spin_lock(struct arch_spinlock *lock)
 {
         __xen_spin_lock(lock, false);
 }
 
-static void xen_spin_lock_flags(struct raw_spinlock *lock, unsigned long flags)
+static void xen_spin_lock_flags(struct arch_spinlock *lock, unsigned long flags)
 {
         __xen_spin_lock(lock, !raw_irqs_disabled_flags(flags));
 }
@@ -317,7 +317,7 @@ static noinline void xen_spin_unlock_slow(struct xen_spinlock *xl)
         }
 }
 
-static void xen_spin_unlock(struct raw_spinlock *lock)
+static void xen_spin_unlock(struct arch_spinlock *lock)
 {
         struct xen_spinlock *xl = (struct xen_spinlock *)lock;
 
diff --git a/arch/xtensa/include/asm/elf.h b/arch/xtensa/include/asm/elf.h
index c3f53e755ca5..5eb6d695e987 100644
--- a/arch/xtensa/include/asm/elf.h
+++ b/arch/xtensa/include/asm/elf.h
@@ -123,7 +123,6 @@ extern void xtensa_elf_core_copy_regs (xtensa_gregset_t *, struct pt_regs *);
 #define ELF_CLASS       ELFCLASS32
 #define ELF_ARCH        EM_XTENSA
 
-#define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE       PAGE_SIZE
 
 /*
diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c
index a1badb32fcda..8cd38484e130 100644
--- a/arch/xtensa/kernel/irq.c
+++ b/arch/xtensa/kernel/irq.c
@@ -90,7 +90,7 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < NR_IRQS) {
-                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
                 action = irq_desc[i].action;
                 if (!action)
                         goto skip;
@@ -109,7 +109,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
 skip:
-                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         } else if (i == NR_IRQS) {
                 seq_printf(p, "NMI: ");
                 for_each_online_cpu(j)
diff --git a/block/blk-settings.c b/block/blk-settings.c
index dd1f1e0e196f..6ae118d6e193 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -554,11 +554,18 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
                 ret = -1;
         }
 
+        /*
+         * Temporarily disable discard granularity. It's currently buggy
+         * since we default to 0 for discard_granularity, hence this
+         * "failure" will always trigger for non-zero offsets.
+         */
+#if 0
         if (offset &&
             (offset & (b->discard_granularity - 1)) != b->discard_alignment) {
                 t->discard_misaligned = 1;
                 ret = -1;
         }
+#endif
 
         /* If top has no alignment offset, inherit from bottom */
         if (!t->alignment_offset)
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index cfb0b2f5f63d..e2f80463ed0d 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -283,7 +283,7 @@ struct cfq_data {
          */
         struct cfq_queue oom_cfqq;
 
-        unsigned long last_end_sync_rq;
+        unsigned long last_delayed_sync;
 
         /* List of cfq groups being managed on this device*/
         struct hlist_head cfqg_list;
@@ -319,7 +319,6 @@ enum cfqq_state_flags {
         CFQ_CFQQ_FLAG_coop,             /* cfqq is shared */
         CFQ_CFQQ_FLAG_deep,             /* sync cfqq experienced large depth */
         CFQ_CFQQ_FLAG_wait_busy,        /* Waiting for next request */
-        CFQ_CFQQ_FLAG_wait_busy_done,   /* Got new request. Expire the queue */
 };
 
 #define CFQ_CFQQ_FNS(name)                                              \
@@ -348,7 +347,6 @@ CFQ_CFQQ_FNS(sync);
 CFQ_CFQQ_FNS(coop);
 CFQ_CFQQ_FNS(deep);
 CFQ_CFQQ_FNS(wait_busy);
-CFQ_CFQQ_FNS(wait_busy_done);
 #undef CFQ_CFQQ_FNS
 
 #ifdef CONFIG_DEBUG_CFQ_IOSCHED
@@ -1574,7 +1572,6 @@ __cfq_slice_expired(struct cfq_data *cfqd, struct cfq_queue *cfqq,
 
         cfq_clear_cfqq_wait_request(cfqq);
         cfq_clear_cfqq_wait_busy(cfqq);
-        cfq_clear_cfqq_wait_busy_done(cfqq);
 
         /*
          * store what was left of this slice, if the queue idled/timed out
@@ -1750,6 +1747,12 @@ static struct cfq_queue *cfq_close_cooperator(struct cfq_data *cfqd,
                 return NULL;
 
         /*
+         * Don't search priority tree if it's the only queue in the group.
+         */
+        if (cur_cfqq->cfqg->nr_cfqq == 1)
+                return NULL;
+
+        /*
          * We should notice if some of the queues are cooperating, eg
          * working closely on the same area of the disk. In that case,
          * we can group them together and don't waste time idling.
@@ -2110,7 +2113,9 @@ static void cfq_choose_cfqg(struct cfq_data *cfqd)
                 cfqd->workload_expires = jiffies + cfqg->saved_workload_slice;
                 cfqd->serving_type = cfqg->saved_workload;
                 cfqd->serving_prio = cfqg->saved_serving_prio;
-        }
+        } else
+                cfqd->workload_expires = jiffies - 1;
+
         choose_service_tree(cfqd, cfqg);
 }
 
@@ -2128,14 +2133,35 @@ static struct cfq_queue *cfq_select_queue(struct cfq_data *cfqd)
 
         if (!cfqd->rq_queued)
                 return NULL;
+
         /*
-         * The active queue has run out of time, expire it and select new.
+         * We were waiting for group to get backlogged. Expire the queue
          */
-        if ((cfq_slice_used(cfqq) || cfq_cfqq_wait_busy_done(cfqq))
-             && !cfq_cfqq_must_dispatch(cfqq))
+        if (cfq_cfqq_wait_busy(cfqq) && !RB_EMPTY_ROOT(&cfqq->sort_list))
                 goto expire;
 
         /*
+         * The active queue has run out of time, expire it and select new.
+         */
+        if (cfq_slice_used(cfqq) && !cfq_cfqq_must_dispatch(cfqq)) {
+                /*
+                 * If slice had not expired at the completion of last request
+                 * we might not have turned on wait_busy flag. Don't expire
+                 * the queue yet. Allow the group to get backlogged.
+                 *
+                 * The very fact that we have used the slice, that means we
+                 * have been idling all along on this queue and it should be
+                 * ok to wait for this request to complete.
+                 */
+                if (cfqq->cfqg->nr_cfqq == 1 && RB_EMPTY_ROOT(&cfqq->sort_list)
+                    && cfqq->dispatched && cfq_should_idle(cfqd, cfqq)) {
+                        cfqq = NULL;
+                        goto keep_queue;
+                } else
+                        goto expire;
+        }
+
+        /*
          * The active queue has requests and isn't expired, allow it to
          * dispatch.
          */
@@ -2264,7 +2290,7 @@ static bool cfq_may_dispatch(struct cfq_data *cfqd, struct cfq_queue *cfqq)
          * based on the last sync IO we serviced
          */
         if (!cfq_cfqq_sync(cfqq) && cfqd->cfq_latency) {
-                unsigned long last_sync = jiffies - cfqd->last_end_sync_rq;
+                unsigned long last_sync = jiffies - cfqd->last_delayed_sync;
                 unsigned int depth;
 
                 depth = last_sync / cfqd->cfq_slice[1];
@@ -3165,10 +3191,6 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
         cfqq->last_request_pos = blk_rq_pos(rq) + blk_rq_sectors(rq);
 
         if (cfqq == cfqd->active_queue) {
-                if (cfq_cfqq_wait_busy(cfqq)) {
-                        cfq_clear_cfqq_wait_busy(cfqq);
-                        cfq_mark_cfqq_wait_busy_done(cfqq);
-                }
                 /*
                  * Remember that we saw a request from this process, but
                  * don't start queuing just yet. Otherwise we risk seeing lots
@@ -3183,6 +3205,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
                         if (blk_rq_bytes(rq) > PAGE_CACHE_SIZE ||
                             cfqd->busy_queues > 1) {
                                 del_timer(&cfqd->idle_slice_timer);
+                                cfq_clear_cfqq_wait_request(cfqq);
                                 __blk_run_queue(cfqd->queue);
                         } else
                                 cfq_mark_cfqq_must_dispatch(cfqq);
@@ -3251,6 +3274,35 @@ static void cfq_update_hw_tag(struct cfq_data *cfqd)
                 cfqd->hw_tag = 0;
 }
 
+static bool cfq_should_wait_busy(struct cfq_data *cfqd, struct cfq_queue *cfqq)
+{
+        struct cfq_io_context *cic = cfqd->active_cic;
+
+        /* If there are other queues in the group, don't wait */
+        if (cfqq->cfqg->nr_cfqq > 1)
+                return false;
+
+        if (cfq_slice_used(cfqq))
+                return true;
+
+        /* if slice left is less than think time, wait busy */
+        if (cic && sample_valid(cic->ttime_samples)
+            && (cfqq->slice_end - jiffies < cic->ttime_mean))
+                return true;
+
+        /*
+         * If think times is less than a jiffy than ttime_mean=0 and above
+         * will not be true. It might happen that slice has not expired yet
+         * but will expire soon (4-5 ns) during select_queue(). To cover the
+         * case where think time is less than a jiffy, mark the queue wait
+         * busy if only 1 jiffy is left in the slice.
+         */
+        if (cfqq->slice_end - jiffies == 1)
+                return true;
+
+        return false;
+}
+
 static void cfq_completed_request(struct request_queue *q, struct request *rq)
 {
         struct cfq_queue *cfqq = RQ_CFQQ(rq);
@@ -3273,7 +3325,8 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)
 
         if (sync) {
                 RQ_CIC(rq)->last_end_request = now;
-                cfqd->last_end_sync_rq = now;
+                if (!time_after(rq->start_time + cfqd->cfq_fifo_expire[1], now))
+                        cfqd->last_delayed_sync = now;
         }
 
         /*
@@ -3289,11 +3342,10 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)
                 }
 
                 /*
-                 * If this queue consumed its slice and this is last queue
-                 * in the group, wait for next request before we expire
-                 * the queue
+                 * Should we wait for next request to come in before we expire
+                 * the queue.
                  */
-                if (cfq_slice_used(cfqq) && cfqq->cfqg->nr_cfqq == 1) {
+                if (cfq_should_wait_busy(cfqd, cfqq)) {
                         cfqq->slice_end = jiffies + cfqd->cfq_slice_idle;
                         cfq_mark_cfqq_wait_busy(cfqq);
                 }
@@ -3711,7 +3763,11 @@ static void *cfq_init_queue(struct request_queue *q)
         cfqd->cfq_latency = 1;
         cfqd->cfq_group_isolation = 0;
         cfqd->hw_tag = -1;
-        cfqd->last_end_sync_rq = jiffies;
+        /*
+         * we optimistically start assuming sync ops weren't delayed in last
+         * second, in order to have larger depth for async operations.
+         */
+        cfqd->last_delayed_sync = jiffies - HZ;
         INIT_RCU_HEAD(&cfqd->rcu);
         return cfqd;
 }
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 26e434ad373c..8a07363417ed 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -96,6 +96,8 @@ source "drivers/edac/Kconfig"
 
 source "drivers/rtc/Kconfig"
 
+source "drivers/clocksource/Kconfig"
+
 source "drivers/dma/Kconfig"
 
 source "drivers/dca/Kconfig"
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index f734b345ac71..25a4c86f839b 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -557,7 +557,7 @@ static int ia_cbr_setup (IADEV *dev, struct atm_vcc *vcc) {
           memcpy((caddr_t)&cbrVC,(caddr_t)TstSchedTbl,sizeof(cbrVC));
        } /* while */
        // Move this VCI number into this location of the CBR Sched table.
-       memcpy((caddr_t)TstSchedTbl, (caddr_t)&vcIndex,sizeof(TstSchedTbl));
+       memcpy((caddr_t)TstSchedTbl, (caddr_t)&vcIndex, sizeof(*TstSchedTbl));
        dev->CbrRemEntries--;
        toBeAssigned--;
    } /* while */ 
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 1fe5536d404f..70122791683d 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -173,6 +173,47 @@ static ssize_t node_read_distance(struct sys_device * dev,
 }
 static SYSDEV_ATTR(distance, S_IRUGO, node_read_distance, NULL);
 
+#ifdef CONFIG_HUGETLBFS
+/*
+ * hugetlbfs per node attributes registration interface:
+ * When/if hugetlb[fs] subsystem initializes [sometime after this module],
+ * it will register its per node attributes for all online nodes with
+ * memory.  It will also call register_hugetlbfs_with_node(), below, to
+ * register its attribute registration functions with this node driver.
+ * Once these hooks have been initialized, the node driver will call into
+ * the hugetlb module to [un]register attributes for hot-plugged nodes.
+ */
+static node_registration_func_t __hugetlb_register_node;
+static node_registration_func_t __hugetlb_unregister_node;
+
+static inline bool hugetlb_register_node(struct node *node)
+{
+        if (__hugetlb_register_node &&
+                        node_state(node->sysdev.id, N_HIGH_MEMORY)) {
+                __hugetlb_register_node(node);
+                return true;
+        }
+        return false;
+}
+
+static inline void hugetlb_unregister_node(struct node *node)
+{
+        if (__hugetlb_unregister_node)
+                __hugetlb_unregister_node(node);
+}
+
+void register_hugetlbfs_with_node(node_registration_func_t doregister,
+                                  node_registration_func_t unregister)
+{
+        __hugetlb_register_node   = doregister;
+        __hugetlb_unregister_node = unregister;
+}
+#else
+static inline void hugetlb_register_node(struct node *node) {}
+
+static inline void hugetlb_unregister_node(struct node *node) {}
+#endif
+
 
 /*
  * register_node - Setup a sysfs device for a node.
@@ -196,6 +237,8 @@ int register_node(struct node *node, int num, struct node *parent)
                 sysdev_create_file(&node->sysdev, &attr_distance);
 
                 scan_unevictable_register_node(node);
+
+                hugetlb_register_node(node);
         }
         return error;
 }
@@ -216,6 +259,7 @@ void unregister_node(struct node *node)
         sysdev_remove_file(&node->sysdev, &attr_distance);
 
         scan_unevictable_unregister_node(node);
+        hugetlb_unregister_node(node);          /* no-op, if memoryless node */
 
         sysdev_unregister(&node->sysdev);
 }
@@ -227,26 +271,43 @@ struct node node_devices[MAX_NUMNODES];
  */
 int register_cpu_under_node(unsigned int cpu, unsigned int nid)
 {
-        if (node_online(nid)) {
-                struct sys_device *obj = get_cpu_sysdev(cpu);
-                if (!obj)
-                        return 0;
-                return sysfs_create_link(&node_devices[nid].sysdev.kobj,
-                                         &obj->kobj,
-                                         kobject_name(&obj->kobj));
-         }
+        int ret;
+        struct sys_device *obj;
 
-        return 0;
+        if (!node_online(nid))
+                return 0;
+
+        obj = get_cpu_sysdev(cpu);
+        if (!obj)
+                return 0;
+
+        ret = sysfs_create_link(&node_devices[nid].sysdev.kobj,
+                                &obj->kobj,
+                                kobject_name(&obj->kobj));
+        if (ret)
+                return ret;
+
+        return sysfs_create_link(&obj->kobj,
+                                 &node_devices[nid].sysdev.kobj,
+                                 kobject_name(&node_devices[nid].sysdev.kobj));
 }
 
 int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
 {
-        if (node_online(nid)) {
-                struct sys_device *obj = get_cpu_sysdev(cpu);
-                if (obj)
-                        sysfs_remove_link(&node_devices[nid].sysdev.kobj,
-                                         kobject_name(&obj->kobj));
-        }
+        struct sys_device *obj;
+
+        if (!node_online(nid))
+                return 0;
+
+        obj = get_cpu_sysdev(cpu);
+        if (!obj)
+                return 0;
+
+        sysfs_remove_link(&node_devices[nid].sysdev.kobj,
+                          kobject_name(&obj->kobj));
+        sysfs_remove_link(&obj->kobj,
+                          kobject_name(&node_devices[nid].sysdev.kobj));
+
         return 0;
 }
 
@@ -268,6 +329,7 @@ static int get_nid_for_pfn(unsigned long pfn)
 /* register memory section under specified node if it spans that node */
 int register_mem_sect_under_node(struct memory_block *mem_blk, int nid)
 {
+        int ret;
         unsigned long pfn, sect_start_pfn, sect_end_pfn;
 
         if (!mem_blk)
@@ -284,9 +346,15 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, int nid)
                         continue;
                 if (page_nid != nid)
                         continue;
-                return sysfs_create_link_nowarn(&node_devices[nid].sysdev.kobj,
+                ret = sysfs_create_link_nowarn(&node_devices[nid].sysdev.kobj,
                                         &mem_blk->sysdev.kobj,
                                         kobject_name(&mem_blk->sysdev.kobj));
+                if (ret)
+                        return ret;
+
+                return sysfs_create_link_nowarn(&mem_blk->sysdev.kobj,
+                                &node_devices[nid].sysdev.kobj,
+                                kobject_name(&node_devices[nid].sysdev.kobj));
         }
         /* mem section does not span the specified node */
         return 0;
@@ -295,12 +363,16 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, int nid)
 /* unregister memory section under all nodes that it spans */
 int unregister_mem_sect_under_nodes(struct memory_block *mem_blk)
 {
-        nodemask_t unlinked_nodes;
+        NODEMASK_ALLOC(nodemask_t, unlinked_nodes, GFP_KERNEL);
         unsigned long pfn, sect_start_pfn, sect_end_pfn;
 
-        if (!mem_blk)
+        if (!mem_blk) {
+                NODEMASK_FREE(unlinked_nodes);
                 return -EFAULT;
-        nodes_clear(unlinked_nodes);
+        }
+        if (!unlinked_nodes)
+                return -ENOMEM;
+        nodes_clear(*unlinked_nodes);
         sect_start_pfn = section_nr_to_pfn(mem_blk->phys_index);
         sect_end_pfn = sect_start_pfn + PAGES_PER_SECTION - 1;
         for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) {
@@ -311,11 +383,14 @@ int unregister_mem_sect_under_nodes(struct memory_block *mem_blk)
                         continue;
                 if (!node_online(nid))
                         continue;
-                if (node_test_and_set(nid, unlinked_nodes))
+                if (node_test_and_set(nid, *unlinked_nodes))
                         continue;
                 sysfs_remove_link(&node_devices[nid].sysdev.kobj,
                          kobject_name(&mem_blk->sysdev.kobj));
+                sysfs_remove_link(&mem_blk->sysdev.kobj,
+                         kobject_name(&node_devices[nid].sysdev.kobj));
         }
+        NODEMASK_FREE(unlinked_nodes);
         return 0;
 }
 
@@ -345,9 +420,77 @@ static int link_mem_sections(int nid)
         }
         return err;
 }
-#else
+
+#ifdef CONFIG_HUGETLBFS
+/*
+ * Handle per node hstate attribute [un]registration on transistions
+ * to/from memoryless state.
+ */
+static void node_hugetlb_work(struct work_struct *work)
+{
+        struct node *node = container_of(work, struct node, node_work);
+
+        /*
+         * We only get here when a node transitions to/from memoryless state.
+         * We can detect which transition occurred by examining whether the
+         * node has memory now.  hugetlb_register_node() already check this
+         * so we try to register the attributes.  If that fails, then the
+         * node has transitioned to memoryless, try to unregister the
+         * attributes.
+         */
+        if (!hugetlb_register_node(node))
+                hugetlb_unregister_node(node);
+}
+
+static void init_node_hugetlb_work(int nid)
+{
+        INIT_WORK(&node_devices[nid].node_work, node_hugetlb_work);
+}
+
+static int node_memory_callback(struct notifier_block *self,
+                                unsigned long action, void *arg)
+{
+        struct memory_notify *mnb = arg;
+        int nid = mnb->status_change_nid;
+
+        switch (action) {
+        case MEM_ONLINE:
+        case MEM_OFFLINE:
+                /*
+                 * offload per node hstate [un]registration to a work thread
+                 * when transitioning to/from memoryless state.
+                 */
+                if (nid != NUMA_NO_NODE)
+                        schedule_work(&node_devices[nid].node_work);
+                break;
+
+        case MEM_GOING_ONLINE:
+        case MEM_GOING_OFFLINE:
+        case MEM_CANCEL_ONLINE:
+        case MEM_CANCEL_OFFLINE:
+        default:
+                break;
+        }
+
+        return NOTIFY_OK;
+}
+#endif  /* CONFIG_HUGETLBFS */
+#else   /* !CONFIG_MEMORY_HOTPLUG_SPARSE */
+
 static int link_mem_sections(int nid) { return 0; }
-#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
+#endif  /* CONFIG_MEMORY_HOTPLUG_SPARSE */
+
+#if !defined(CONFIG_MEMORY_HOTPLUG_SPARSE) || \
+    !defined(CONFIG_HUGETLBFS)
+static inline int node_memory_callback(struct notifier_block *self,
+                                unsigned long action, void *arg)
+{
+        return NOTIFY_OK;
+}
+
+static void init_node_hugetlb_work(int nid) { }
+
+#endif
 
 int register_one_node(int nid)
 {
@@ -371,6 +514,9 @@ int register_one_node(int nid)
 
                 /* link memory sections under this node */
                 error = link_mem_sections(nid);
+
+                /* initialize work queue for memory hot plug */
+                init_node_hugetlb_work(nid);
         }
 
         return error;
@@ -460,13 +606,17 @@ static int node_states_init(void)
         return err;
 }
 
+#define NODE_CALLBACK_PRI       2       /* lower than SLAB */
 static int __init register_node_type(void)
 {
         int ret;
 
         ret = sysdev_class_register(&node_class);
-        if (!ret)
+        if (!ret) {
                 ret = node_states_init();
+                hotplug_memory_notifier(node_memory_callback,
+                                        NODE_CALLBACK_PRI);
+        }
 
         /*
          * Note:  we're not going to unregister the node class if we fail
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 436a090b532b..4e0726aa53b0 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1271,8 +1271,7 @@ static int drbd_nl_net_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
                         goto fail;
                 }
 
-                if (crypto_tfm_alg_type(crypto_hash_tfm(tfm))
-                                                != CRYPTO_ALG_TYPE_HASH) {
+                if (crypto_tfm_alg_type(crypto_hash_tfm(tfm)) != CRYPTO_ALG_TYPE_SHASH) {
                         retcode = ERR_AUTH_ALG_ND;
                         goto fail;
                 }
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 5c01f747571b..3266b4f65daa 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3497,6 +3497,9 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
             ((cmd & 0x80) && !capable(CAP_SYS_ADMIN)))
                 return -EPERM;
 
+        if (WARN_ON(size < 0 || size > sizeof(inparam)))
+                return -EINVAL;
+
         /* copyin */
         CLEARSTRUCT(&inparam);
         if (_IOC_DIR(cmd) & _IOC_WRITE)
@@ -4162,7 +4165,7 @@ static int floppy_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops floppy_pm_ops = {
+static const struct dev_pm_ops floppy_pm_ops = {
         .resume = floppy_resume,
         .restore = floppy_resume,
 };
diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index 0877d3628fda..d1fd032e7514 100644
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -169,13 +169,6 @@ static int __init xd_init(void)
 
         init_timer (&xd_watchdog_int); xd_watchdog_int.function = xd_watchdog;
 
-        if (!xd_dma_buffer)
-                xd_dma_buffer = (char *)xd_dma_mem_alloc(xd_maxsectors * 0x200);
-        if (!xd_dma_buffer) {
-                printk(KERN_ERR "xd: Out of memory.\n");
-                return -ENOMEM;
-        }
-
         err = -EBUSY;
         if (register_blkdev(XT_DISK_MAJOR, "xd"))
                 goto out1;
@@ -202,6 +195,19 @@ static int __init xd_init(void)
                         xd_drives,xd_drives == 1 ? "" : "s",xd_irq,xd_dma);
         }
 
+        /*
+         * With the drive detected, xd_maxsectors should now be known.
+         * If xd_maxsectors is 0, nothing was detected and we fall through
+         * to return -ENODEV
+         */
+        if (!xd_dma_buffer && xd_maxsectors) {
+                xd_dma_buffer = (char *)xd_dma_mem_alloc(xd_maxsectors * 0x200);
+                if (!xd_dma_buffer) {
+                        printk(KERN_ERR "xd: Out of memory.\n");
+                        goto out3;
+                }
+        }
+
         err = -ENODEV;
         if (!xd_drives)
                 goto out3;
@@ -249,15 +255,17 @@ out4:
         for (i = 0; i < xd_drives; i++)
                 put_disk(xd_gendisk[i]);
 out3:
-        release_region(xd_iobase,4);
+        if (xd_maxsectors)
+                release_region(xd_iobase,4);
+
+        if (xd_dma_buffer)
+                xd_dma_mem_free((unsigned long)xd_dma_buffer,
+                                xd_maxsectors * 0x200);
 out2:
         blk_cleanup_queue(xd_queue);
 out1a:
         unregister_blkdev(XT_DISK_MAJOR, "xd");
 out1:
-        if (xd_dma_buffer)
-                xd_dma_mem_free((unsigned long)xd_dma_buffer,
-                                xd_maxsectors * 0x200);
         return err;
 Enomem:
         err = -ENOMEM;
diff --git a/drivers/char/efirtc.c b/drivers/char/efirtc.c
index 26a47dc88f61..53c524e7b829 100644
--- a/drivers/char/efirtc.c
+++ b/drivers/char/efirtc.c
@@ -285,6 +285,7 @@ static const struct file_operations efi_rtc_fops = {
         .unlocked_ioctl = efi_rtc_ioctl,
         .open           = efi_rtc_open,
         .release        = efi_rtc_close,
+        .llseek         = no_llseek,
 };
 
 static struct miscdevice efi_rtc_dev= {
diff --git a/drivers/char/hvc_iucv.c b/drivers/char/hvc_iucv.c
index b8a5d654d3d0..fe62bd0e17b7 100644
--- a/drivers/char/hvc_iucv.c
+++ b/drivers/char/hvc_iucv.c
@@ -931,7 +931,7 @@ static struct hv_ops hvc_iucv_ops = {
 };
 
 /* Suspend / resume device operations */
-static struct dev_pm_ops hvc_iucv_pm_ops = {
+static const struct dev_pm_ops hvc_iucv_pm_ops = {
         .freeze   = hvc_iucv_pm_freeze,
         .thaw     = hvc_iucv_pm_restore_thaw,
         .restore  = hvc_iucv_pm_restore_thaw,
diff --git a/drivers/char/ipmi/ipmi_kcs_sm.c b/drivers/char/ipmi/ipmi_kcs_sm.c
index 80704875794c..cf82fedae099 100644
--- a/drivers/char/ipmi/ipmi_kcs_sm.c
+++ b/drivers/char/ipmi/ipmi_kcs_sm.c
@@ -370,7 +370,7 @@ static enum si_sm_result kcs_event(struct si_sm_data *kcs, long time)
                         return SI_SM_IDLE;
 
         case KCS_START_OP:
-                if (state != KCS_IDLE) {
+                if (state != KCS_IDLE_STATE) {
                         start_error_recovery(kcs,
                                              "State machine not idle at start");
                         break;
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 5619007e7e05..f706b1dffdb3 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -233,7 +233,8 @@ int setkeycode(unsigned int scancode, unsigned int keycode)
 }
 
 /*
- * Making beeps and bells.
+ * Making beeps and bells. Note that we prefer beeps to bells, but when
+ * shutting the sound off we do both.
  */
 
 static int kd_sound_helper(struct input_handle *handle, void *data)
@@ -242,9 +243,12 @@ static int kd_sound_helper(struct input_handle *handle, void *data)
         struct input_dev *dev = handle->dev;
 
         if (test_bit(EV_SND, dev->evbit)) {
-                if (test_bit(SND_TONE, dev->sndbit))
+                if (test_bit(SND_TONE, dev->sndbit)) {
                         input_inject_event(handle, EV_SND, SND_TONE, *hz);
-                if (test_bit(SND_BELL, handle->dev->sndbit))
+                        if (*hz)
+                                return 0;
+                }
+                if (test_bit(SND_BELL, dev->sndbit))
                         input_inject_event(handle, EV_SND, SND_BELL, *hz ? 1 : 0);
         }
 
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index fba76fb55abf..be832b6f8279 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -34,6 +34,16 @@
 # include <linux/efi.h>
 #endif
 
+static inline unsigned long size_inside_page(unsigned long start,
+                                             unsigned long size)
+{
+        unsigned long sz;
+
+        sz = PAGE_SIZE - (start & (PAGE_SIZE - 1));
+
+        return min(sz, size);
+}
+
 /*
  * Architectures vary in how they handle caching for addresses
  * outside of main memory.
@@ -126,9 +136,7 @@ static ssize_t read_mem(struct file * file, char __user * buf,
 #ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
         /* we don't have page 0 mapped on sparc and m68k.. */
         if (p < PAGE_SIZE) {
-                sz = PAGE_SIZE - p;
-                if (sz > count) 
-                        sz = count; 
+                sz = size_inside_page(p, count);
                 if (sz > 0) {
                         if (clear_user(buf, sz))
                                 return -EFAULT;
@@ -141,15 +149,9 @@ static ssize_t read_mem(struct file * file, char __user * buf,
 #endif
 
         while (count > 0) {
-                /*
-                 * Handle first page in case it's not aligned
-                 */
-                if (-p & (PAGE_SIZE - 1))
-                        sz = -p & (PAGE_SIZE - 1);
-                else
-                        sz = PAGE_SIZE;
+                unsigned long remaining;
 
-                sz = min_t(unsigned long, sz, count);
+                sz = size_inside_page(p, count);
 
                 if (!range_is_allowed(p >> PAGE_SHIFT, count))
                         return -EPERM;
@@ -163,12 +165,10 @@ static ssize_t read_mem(struct file * file, char __user * buf,
                 if (!ptr)
                         return -EFAULT;
 
-                if (copy_to_user(buf, ptr, sz)) {
-                        unxlate_dev_mem_ptr(p, ptr);
-                        return -EFAULT;
-                }
-
+                remaining = copy_to_user(buf, ptr, sz);
                 unxlate_dev_mem_ptr(p, ptr);
+                if (remaining)
+                        return -EFAULT;
 
                 buf += sz;
                 p += sz;
@@ -196,9 +196,7 @@ static ssize_t write_mem(struct file * file, const char __user * buf,
 #ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
         /* we don't have page 0 mapped on sparc and m68k.. */
         if (p < PAGE_SIZE) {
-                unsigned long sz = PAGE_SIZE - p;
-                if (sz > count)
-                        sz = count;
+                sz = size_inside_page(p, count);
                 /* Hmm. Do something? */
                 buf += sz;
                 p += sz;
@@ -208,15 +206,7 @@ static ssize_t write_mem(struct file * file, const char __user * buf,
 #endif
 
         while (count > 0) {
-                /*
-                 * Handle first page in case it's not aligned
-                 */
-                if (-p & (PAGE_SIZE - 1))
-                        sz = -p & (PAGE_SIZE - 1);
-                else
-                        sz = PAGE_SIZE;
-
-                sz = min_t(unsigned long, sz, count);
+                sz = size_inside_page(p, count);
 
                 if (!range_is_allowed(p >> PAGE_SHIFT, sz))
                         return -EPERM;
@@ -234,16 +224,14 @@ static ssize_t write_mem(struct file * file, const char __user * buf,
                 }
 
                 copied = copy_from_user(ptr, buf, sz);
+                unxlate_dev_mem_ptr(p, ptr);
                 if (copied) {
                         written += sz - copied;
-                        unxlate_dev_mem_ptr(p, ptr);
                         if (written)
                                 break;
                         return -EFAULT;
                 }
 
-                unxlate_dev_mem_ptr(p, ptr);
-
                 buf += sz;
                 p += sz;
                 count -= sz;
@@ -417,27 +405,18 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
 #ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
                 /* we don't have page 0 mapped on sparc and m68k.. */
                 if (p < PAGE_SIZE && low_count > 0) {
-                        size_t tmp = PAGE_SIZE - p;
-                        if (tmp > low_count) tmp = low_count;
-                        if (clear_user(buf, tmp))
+                        sz = size_inside_page(p, low_count);
+                        if (clear_user(buf, sz))
                                 return -EFAULT;
-                        buf += tmp;
-                        p += tmp;
-                        read += tmp;
-                        low_count -= tmp;
-                        count -= tmp;
+                        buf += sz;
+                        p += sz;
+                        read += sz;
+                        low_count -= sz;
+                        count -= sz;
                 }
 #endif
                 while (low_count > 0) {
-                        /*
-                         * Handle first page in case it's not aligned
-                         */
-                        if (-p & (PAGE_SIZE - 1))
-                                sz = -p & (PAGE_SIZE - 1);
-                        else
-                                sz = PAGE_SIZE;
-
-                        sz = min_t(unsigned long, sz, low_count);
+                        sz = size_inside_page(p, low_count);
 
                         /*
                          * On ia64 if a page has been mapped somewhere as
@@ -461,21 +440,18 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
                 if (!kbuf)
                         return -ENOMEM;
                 while (count > 0) {
-                        int len = count;
-
-                        if (len > PAGE_SIZE)
-                                len = PAGE_SIZE;
-                        len = vread(kbuf, (char *)p, len);
-                        if (!len)
+                        sz = size_inside_page(p, count);
+                        sz = vread(kbuf, (char *)p, sz);
+                        if (!sz)
                                 break;
-                        if (copy_to_user(buf, kbuf, len)) {
+                        if (copy_to_user(buf, kbuf, sz)) {
                                 free_page((unsigned long)kbuf);
                                 return -EFAULT;
                         }
-                        count -= len;
-                        buf += len;
-                        read += len;
-                        p += len;
+                        count -= sz;
+                        buf += sz;
+                        read += sz;
+                        p += sz;
                 }
                 free_page((unsigned long)kbuf);
         }
@@ -485,7 +461,7 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
 
 
 static inline ssize_t
-do_write_kmem(void *p, unsigned long realp, const char __user * buf,
+do_write_kmem(unsigned long p, const char __user *buf,
               size_t count, loff_t *ppos)
 {
         ssize_t written, sz;
@@ -494,14 +470,11 @@ do_write_kmem(void *p, unsigned long realp, const char __user * buf,
         written = 0;
 #ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
         /* we don't have page 0 mapped on sparc and m68k.. */
-        if (realp < PAGE_SIZE) {
-                unsigned long sz = PAGE_SIZE - realp;
-                if (sz > count)
-                        sz = count;
+        if (p < PAGE_SIZE) {
+                sz = size_inside_page(p, count);
                 /* Hmm. Do something? */
                 buf += sz;
                 p += sz;
-                realp += sz;
                 count -= sz;
                 written += sz;
         }
@@ -509,22 +482,15 @@ do_write_kmem(void *p, unsigned long realp, const char __user * buf,
 
         while (count > 0) {
                 char *ptr;
-                /*
-                 * Handle first page in case it's not aligned
-                 */
-                if (-realp & (PAGE_SIZE - 1))
-                        sz = -realp & (PAGE_SIZE - 1);
-                else
-                        sz = PAGE_SIZE;
 
-                sz = min_t(unsigned long, sz, count);
+                sz = size_inside_page(p, count);
 
                 /*
                  * On ia64 if a page has been mapped somewhere as
                  * uncached, then it must also be accessed uncached
                  * by the kernel or data corruption may occur
                  */
-                ptr = xlate_dev_kmem_ptr(p);
+                ptr = xlate_dev_kmem_ptr((char *)p);
 
                 copied = copy_from_user(ptr, buf, sz);
                 if (copied) {
@@ -535,7 +501,6 @@ do_write_kmem(void *p, unsigned long realp, const char __user * buf,
                 }
                 buf += sz;
                 p += sz;
-                realp += sz;
                 count -= sz;
                 written += sz;
         }
@@ -554,19 +519,14 @@ static ssize_t write_kmem(struct file * file, const char __user * buf,
         unsigned long p = *ppos;
         ssize_t wrote = 0;
         ssize_t virtr = 0;
-        ssize_t written;
         char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
 
         if (p < (unsigned long) high_memory) {
-
-                wrote = count;
-                if (count > (unsigned long) high_memory - p)
-                        wrote = (unsigned long) high_memory - p;
-
-                written = do_write_kmem((void*)p, p, buf, wrote, ppos);
-                if (written != wrote)
-                        return written;
-                wrote = written;
+                unsigned long to_write = min_t(unsigned long, count,
+                                               (unsigned long)high_memory - p);
+                wrote = do_write_kmem(p, buf, to_write, ppos);
+                if (wrote != to_write)
+                        return wrote;
                 p += wrote;
                 buf += wrote;
                 count -= wrote;
@@ -577,24 +537,21 @@ static ssize_t write_kmem(struct file * file, const char __user * buf,
                 if (!kbuf)
                         return wrote ? wrote : -ENOMEM;
                 while (count > 0) {
-                        int len = count;
-
-                        if (len > PAGE_SIZE)
-                                len = PAGE_SIZE;
-                        if (len) {
-                                written = copy_from_user(kbuf, buf, len);
-                                if (written) {
-                                        if (wrote + virtr)
-                                                break;
-                                        free_page((unsigned long)kbuf);
-                                        return -EFAULT;
-                                }
+                        unsigned long sz = size_inside_page(p, count);
+                        unsigned long n;
+
+                        n = copy_from_user(kbuf, buf, sz);
+                        if (n) {
+                                if (wrote + virtr)
+                                        break;
+                                free_page((unsigned long)kbuf);
+                                return -EFAULT;
                         }
-                        len = vwrite(kbuf, (char *)p, len);
-                        count -= len;
-                        buf += len;
-                        virtr += len;
-                        p += len;
+                        sz = vwrite(kbuf, (char *)p, sz);
+                        count -= sz;
+                        buf += sz;
+                        virtr += sz;
+                        p += sz;
                 }
                 free_page((unsigned long)kbuf);
         }
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 96f1cd086dd2..94a136e96c06 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -60,9 +60,7 @@ static DEFINE_MUTEX(misc_mtx);
  * Assigned numbers, used for dynamic minors
  */
 #define DYNAMIC_MINORS 64 /* like dynamic majors */
-static unsigned char misc_minors[DYNAMIC_MINORS / 8];
-
-extern int pmu_device_init(void);
+static DECLARE_BITMAP(misc_minors, DYNAMIC_MINORS);
 
 #ifdef CONFIG_PROC_FS
 static void *misc_seq_start(struct seq_file *seq, loff_t *pos)
@@ -198,24 +196,23 @@ int misc_register(struct miscdevice * misc)
         }
 
         if (misc->minor == MISC_DYNAMIC_MINOR) {
-                int i = DYNAMIC_MINORS;
-                while (--i >= 0)
-                        if ( (misc_minors[i>>3] & (1 << (i&7))) == 0)
-                                break;
-                if (i<0) {
+                int i = find_first_zero_bit(misc_minors, DYNAMIC_MINORS);
+                if (i >= DYNAMIC_MINORS) {
                         mutex_unlock(&misc_mtx);
                         return -EBUSY;
                 }
-                misc->minor = i;
+                misc->minor = DYNAMIC_MINORS - i - 1;
+                set_bit(i, misc_minors);
         }
 
-        if (misc->minor < DYNAMIC_MINORS)
-                misc_minors[misc->minor >> 3] |= 1 << (misc->minor & 7);
         dev = MKDEV(MISC_MAJOR, misc->minor);
 
         misc->this_device = device_create(misc_class, misc->parent, dev,
                                           misc, "%s", misc->name);
         if (IS_ERR(misc->this_device)) {
+                int i = DYNAMIC_MINORS - misc->minor - 1;
+                if (i < DYNAMIC_MINORS && i >= 0)
+                        clear_bit(i, misc_minors);
                 err = PTR_ERR(misc->this_device);
                 goto out;
         }
@@ -242,7 +239,7 @@ int misc_register(struct miscdevice * misc)
 
 int misc_deregister(struct miscdevice *misc)
 {
-        int i = misc->minor;
+        int i = DYNAMIC_MINORS - misc->minor - 1;
 
         if (list_empty(&misc->list))
                 return -EINVAL;
@@ -250,9 +247,8 @@ int misc_deregister(struct miscdevice *misc)
         mutex_lock(&misc_mtx);
         list_del(&misc->list);
         device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor));
-        if (i < DYNAMIC_MINORS && i>0) {
-                misc_minors[i>>3] &= ~(1 << (misc->minor & 7));
-        }
+        if (i < DYNAMIC_MINORS && i >= 0)
+                clear_bit(i, misc_minors);
         mutex_unlock(&misc_mtx);
         return 0;
 }
diff --git a/drivers/char/random.c b/drivers/char/random.c
index dcd08635cf1b..8258982b49ec 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1245,12 +1245,8 @@ static int proc_do_uuid(ctl_table *table, int write,
         if (uuid[8] == 0)
                 generate_random_uuid(uuid);
 
-        sprintf(buf, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-"
-                "%02x%02x%02x%02x%02x%02x",
-                uuid[0],  uuid[1],  uuid[2],  uuid[3],
-                uuid[4],  uuid[5],  uuid[6],  uuid[7],
-                uuid[8],  uuid[9],  uuid[10], uuid[11],
-                uuid[12], uuid[13], uuid[14], uuid[15]);
+        sprintf(buf, "%pU", uuid);
+
         fake_table.data = buf;
         fake_table.maxlen = sizeof(buf);
 
@@ -1310,7 +1306,7 @@ ctl_table random_table[] = {
 
 /********************************************************************
  *
- * Random funtions for networking
+ * Random functions for networking
  *
  ********************************************************************/
 
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 44203ff599da..1ae2de7d8b4f 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -339,7 +339,7 @@ static struct sysrq_key_op sysrq_term_op = {
 
 static void moom_callback(struct work_struct *ignored)
 {
-        out_of_memory(node_zonelist(0, GFP_KERNEL), GFP_KERNEL, 0);
+        out_of_memory(node_zonelist(0, GFP_KERNEL), GFP_KERNEL, 0, NULL);
 }
 
 static DECLARE_WORK(moom_work, moom_callback);
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 1e3d728dbf7e..50faa1fb0f06 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -164,6 +164,9 @@ module_param(default_utf8, int, S_IRUGO | S_IWUSR);
 int global_cursor_default = -1;
 module_param(global_cursor_default, int, S_IRUGO | S_IWUSR);
 
+static int cur_default = CUR_DEFAULT;
+module_param(cur_default, int, S_IRUGO | S_IWUSR);
+
 /*
  * ignore_poke: don't unblank the screen when things are typed.  This is
  * mainly for the privacy of braille terminal users.
@@ -184,12 +187,10 @@ static DECLARE_WORK(console_work, console_callback);
  * fg_console is the current virtual console,
  * last_console is the last used one,
  * want_console is the console we want to switch to,
- * kmsg_redirect is the console for kernel messages,
  */
 int fg_console;
 int last_console;
 int want_console = -1;
-int kmsg_redirect;
 
 /*
  * For each existing display, we have a pointer to console currently visible
@@ -1638,7 +1639,7 @@ static void reset_terminal(struct vc_data *vc, int do_clear)
         /* do not do set_leds here because this causes an endless tasklet loop
            when the keyboard hasn't been initialized yet */
 
-        vc->vc_cursor_type = CUR_DEFAULT;
+        vc->vc_cursor_type = cur_default;
         vc->vc_complement_mask = vc->vc_s_complement_mask;
 
         default_attr(vc);
@@ -1840,7 +1841,7 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
                                 if (vc->vc_par[0])
                                         vc->vc_cursor_type = vc->vc_par[0] | (vc->vc_par[1] << 8) | (vc->vc_par[2] << 16);
                                 else
-                                        vc->vc_cursor_type = CUR_DEFAULT;
+                                        vc->vc_cursor_type = cur_default;
                                 return;
                         }
                         break;
@@ -2434,6 +2435,37 @@ struct tty_driver *console_driver;
 
 #ifdef CONFIG_VT_CONSOLE
 
+/**
+ * vt_kmsg_redirect() - Sets/gets the kernel message console
+ * @new:        The new virtual terminal number or -1 if the console should stay
+ *              unchanged
+ *
+ * By default, the kernel messages are always printed on the current virtual
+ * console. However, the user may modify that default with the
+ * TIOCL_SETKMSGREDIRECT ioctl call.
+ *
+ * This function sets the kernel message console to be @new. It returns the old
+ * virtual console number. The virtual terminal number 0 (both as parameter and
+ * return value) means no redirection (i.e. always printed on the currently
+ * active console).
+ *
+ * The parameter -1 means that only the current console is returned, but the
+ * value is not modified. You may use the macro vt_get_kmsg_redirect() in that
+ * case to make the code more understandable.
+ *
+ * When the kernel is compiled without CONFIG_VT_CONSOLE, this function ignores
+ * the parameter and always returns 0.
+ */
+int vt_kmsg_redirect(int new)
+{
+        static int kmsg_con;
+
+        if (new != -1)
+                return xchg(&kmsg_con, new);
+        else
+                return kmsg_con;
+}
+
 /*
  *      Console on virtual terminal
  *
@@ -2448,6 +2480,7 @@ static void vt_console_print(struct console *co, const char *b, unsigned count)
         const ushort *start;
         ushort cnt = 0;
         ushort myx;
+        int kmsg_console;
 
         /* console busy or not yet initialized */
         if (!printable)
@@ -2455,8 +2488,9 @@ static void vt_console_print(struct console *co, const char *b, unsigned count)
         if (!spin_trylock(&printing_lock))
                 return;
 
-        if (kmsg_redirect && vc_cons_allocated(kmsg_redirect - 1))
-                vc = vc_cons[kmsg_redirect - 1].d;
+        kmsg_console = vt_get_kmsg_redirect();
+        if (kmsg_console && vc_cons_allocated(kmsg_console - 1))
+                vc = vc_cons[kmsg_console - 1].d;
 
         /* read `x' only after setting currcons properly (otherwise
            the `x' macro will read the x of the foreground console). */
@@ -2613,7 +2647,7 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                         ret = set_vesa_blanking(p);
                         break;
                 case TIOCL_GETKMSGREDIRECT:
-                        data = kmsg_redirect;
+                        data = vt_get_kmsg_redirect();
                         ret = __put_user(data, p);
                         break;
                 case TIOCL_SETKMSGREDIRECT:
@@ -2623,7 +2657,7 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                                 if (get_user(data, p+1))
                                         ret = -EFAULT;
                                 else
-                                        kmsg_redirect = data;
+                                        vt_kmsg_redirect(data);
                         }
                         break;
                 case TIOCL_GETFGCONSOLE:
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
new file mode 100644
index 000000000000..08f726c5fee5
--- /dev/null
+++ b/drivers/clocksource/Kconfig
@@ -0,0 +1,9 @@
+config CS5535_CLOCK_EVENT_SRC
+        tristate "CS5535/CS5536 high-res timer (MFGPT) events"
+        depends on GENERIC_TIME && GENERIC_CLOCKEVENTS && CS5535_MFGPT
+        help
+          This driver provides a clock event source based on the MFGPT
+          timer(s) in the CS5535 and CS5536 companion chips.
+          MFGPTs have a better resolution and max interval than the
+          generic PIT, and are suitable for use as high-res timers.
+
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index eef216f7f61d..be61ece6330b 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -2,6 +2,7 @@ obj-$(CONFIG_ATMEL_TCB_CLKSRC)	+= tcb_clksrc.o
 obj-$(CONFIG_X86_CYCLONE_TIMER) += cyclone.o
 obj-$(CONFIG_X86_PM_TIMER)      += acpi_pm.o
 obj-$(CONFIG_SCx200HR_TIMER)    += scx200_hrt.o
+obj-$(CONFIG_CS5535_CLOCK_EVENT_SRC)    += cs5535-clockevt.o
 obj-$(CONFIG_SH_TIMER_CMT)      += sh_cmt.o
 obj-$(CONFIG_SH_TIMER_MTU2)     += sh_mtu2.o
 obj-$(CONFIG_SH_TIMER_TMU)      += sh_tmu.o
diff --git a/drivers/clocksource/cs5535-clockevt.c b/drivers/clocksource/cs5535-clockevt.c
new file mode 100644
index 000000000000..27d20fac19d1
--- /dev/null
+++ b/drivers/clocksource/cs5535-clockevt.c
@@ -0,0 +1,197 @@
+/*
+ * Clock event driver for the CS5535/CS5536
+ *
+ * Copyright (C) 2006, Advanced Micro Devices, Inc.
+ * Copyright (C) 2007  Andres Salomon <dilinger@debian.org>
+ * Copyright (C) 2009  Andres Salomon <dilinger@collabora.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public License
+ * as published by the Free Software Foundation.
+ *
+ * The MFGPTs are documented in AMD Geode CS5536 Companion Device Data Book.
+ */
+
+#include <linux/kernel.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/cs5535.h>
+#include <linux/clockchips.h>
+
+#define DRV_NAME "cs5535-clockevt"
+
+static int timer_irq = CONFIG_CS5535_MFGPT_DEFAULT_IRQ;
+module_param_named(irq, timer_irq, int, 0644);
+MODULE_PARM_DESC(irq, "Which IRQ to use for the clock source MFGPT ticks.");
+
+/*
+ * We are using the 32.768kHz input clock - it's the only one that has the
+ * ranges we find desirable.  The following table lists the suitable
+ * divisors and the associated Hz, minimum interval and the maximum interval:
+ *
+ *  Divisor   Hz      Min Delta (s)  Max Delta (s)
+ *   1        32768   .00048828125      2.000
+ *   2        16384   .0009765625       4.000
+ *   4         8192   .001953125        8.000
+ *   8         4096   .00390625        16.000
+ *   16        2048   .0078125         32.000
+ *   32        1024   .015625          64.000
+ *   64         512   .03125          128.000
+ *  128         256   .0625           256.000
+ *  256         128   .125            512.000
+ */
+
+static unsigned int cs5535_tick_mode = CLOCK_EVT_MODE_SHUTDOWN;
+static struct cs5535_mfgpt_timer *cs5535_event_clock;
+
+/* Selected from the table above */
+
+#define MFGPT_DIVISOR 16
+#define MFGPT_SCALE  4     /* divisor = 2^(scale) */
+#define MFGPT_HZ  (32768 / MFGPT_DIVISOR)
+#define MFGPT_PERIODIC (MFGPT_HZ / HZ)
+
+/*
+ * The MFPGT timers on the CS5536 provide us with suitable timers to use
+ * as clock event sources - not as good as a HPET or APIC, but certainly
+ * better than the PIT.  This isn't a general purpose MFGPT driver, but
+ * a simplified one designed specifically to act as a clock event source.
+ * For full details about the MFGPT, please consult the CS5536 data sheet.
+ */
+
+static void disable_timer(struct cs5535_mfgpt_timer *timer)
+{
+        /* avoid races by clearing CMP1 and CMP2 unconditionally */
+        cs5535_mfgpt_write(timer, MFGPT_REG_SETUP,
+                        (uint16_t) ~MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP1 |
+                                MFGPT_SETUP_CMP2);
+}
+
+static void start_timer(struct cs5535_mfgpt_timer *timer, uint16_t delta)
+{
+        cs5535_mfgpt_write(timer, MFGPT_REG_CMP2, delta);
+        cs5535_mfgpt_write(timer, MFGPT_REG_COUNTER, 0);
+
+        cs5535_mfgpt_write(timer, MFGPT_REG_SETUP,
+                        MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2);
+}
+
+static void mfgpt_set_mode(enum clock_event_mode mode,
+                struct clock_event_device *evt)
+{
+        disable_timer(cs5535_event_clock);
+
+        if (mode == CLOCK_EVT_MODE_PERIODIC)
+                start_timer(cs5535_event_clock, MFGPT_PERIODIC);
+
+        cs5535_tick_mode = mode;
+}
+
+static int mfgpt_next_event(unsigned long delta, struct clock_event_device *evt)
+{
+        start_timer(cs5535_event_clock, delta);
+        return 0;
+}
+
+static struct clock_event_device cs5535_clockevent = {
+        .name = DRV_NAME,
+        .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
+        .set_mode = mfgpt_set_mode,
+        .set_next_event = mfgpt_next_event,
+        .rating = 250,
+        .cpumask = cpu_all_mask,
+        .shift = 32
+};
+
+static irqreturn_t mfgpt_tick(int irq, void *dev_id)
+{
+        uint16_t val = cs5535_mfgpt_read(cs5535_event_clock, MFGPT_REG_SETUP);
+
+        /* See if the interrupt was for us */
+        if (!(val & (MFGPT_SETUP_SETUP | MFGPT_SETUP_CMP2 | MFGPT_SETUP_CMP1)))
+                return IRQ_NONE;
+
+        /* Turn off the clock (and clear the event) */
+        disable_timer(cs5535_event_clock);
+
+        if (cs5535_tick_mode == CLOCK_EVT_MODE_SHUTDOWN)
+                return IRQ_HANDLED;
+
+        /* Clear the counter */
+        cs5535_mfgpt_write(cs5535_event_clock, MFGPT_REG_COUNTER, 0);
+
+        /* Restart the clock in periodic mode */
+
+        if (cs5535_tick_mode == CLOCK_EVT_MODE_PERIODIC)
+                cs5535_mfgpt_write(cs5535_event_clock, MFGPT_REG_SETUP,
+                                MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2);
+
+        cs5535_clockevent.event_handler(&cs5535_clockevent);
+        return IRQ_HANDLED;
+}
+
+static struct irqaction mfgptirq  = {
+        .handler = mfgpt_tick,
+        .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_TIMER,
+        .name = DRV_NAME,
+};
+
+static int __init cs5535_mfgpt_init(void)
+{
+        struct cs5535_mfgpt_timer *timer;
+        int ret;
+        uint16_t val;
+
+        timer = cs5535_mfgpt_alloc_timer(MFGPT_TIMER_ANY, MFGPT_DOMAIN_WORKING);
+        if (!timer) {
+                printk(KERN_ERR DRV_NAME ": Could not allocate MFPGT timer\n");
+                return -ENODEV;
+        }
+        cs5535_event_clock = timer;
+
+        /* Set up the IRQ on the MFGPT side */
+        if (cs5535_mfgpt_setup_irq(timer, MFGPT_CMP2, &timer_irq)) {
+                printk(KERN_ERR DRV_NAME ": Could not set up IRQ %d\n",
+                                timer_irq);
+                return -EIO;
+        }
+
+        /* And register it with the kernel */
+        ret = setup_irq(timer_irq, &mfgptirq);
+        if (ret) {
+                printk(KERN_ERR DRV_NAME ": Unable to set up the interrupt.\n");
+                goto err;
+        }
+
+        /* Set the clock scale and enable the event mode for CMP2 */
+        val = MFGPT_SCALE | (3 << 8);
+
+        cs5535_mfgpt_write(cs5535_event_clock, MFGPT_REG_SETUP, val);
+
+        /* Set up the clock event */
+        cs5535_clockevent.mult = div_sc(MFGPT_HZ, NSEC_PER_SEC,
+                        cs5535_clockevent.shift);
+        cs5535_clockevent.min_delta_ns = clockevent_delta2ns(0xF,
+                        &cs5535_clockevent);
+        cs5535_clockevent.max_delta_ns = clockevent_delta2ns(0xFFFE,
+                        &cs5535_clockevent);
+
+        printk(KERN_INFO DRV_NAME
+                ": Registering MFGPT timer as a clock event, using IRQ %d\n",
+                timer_irq);
+        clockevents_register_device(&cs5535_clockevent);
+
+        return 0;
+
+err:
+        cs5535_mfgpt_release_irq(cs5535_event_clock, MFGPT_CMP2, &timer_irq);
+        printk(KERN_ERR DRV_NAME ": Unable to set up the MFGPT clock source\n");
+        return -EIO;
+}
+
+module_init(cs5535_mfgpt_init);
+
+MODULE_AUTHOR("Andres Salomon <dilinger@collabora.co.uk>");
+MODULE_DESCRIPTION("CS5535/CS5536 MFGPT clock event driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c
index a4bec3f919aa..1c1ceb4f218f 100644
--- a/drivers/cpuidle/governors/ladder.c
+++ b/drivers/cpuidle/governors/ladder.c
@@ -69,9 +69,6 @@ static int ladder_select_state(struct cpuidle_device *dev)
         int last_residency, last_idx = ldev->last_state_idx;
         int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY);
 
-        if (unlikely(!ldev))
-                return 0;
-
         /* Special case when user has set very strict latency requirement */
         if (unlikely(latency_req == 0)) {
                 ladder_do_selection(ldev, last_idx, 0);
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index eb140ff38c27..e02d74b1e892 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -111,6 +111,24 @@ config SH_DMAE
         help
           Enable support for the Renesas SuperH DMA controllers.
 
+config COH901318
+        bool "ST-Ericsson COH901318 DMA support"
+        select DMA_ENGINE
+        depends on ARCH_U300
+        help
+          Enable support for ST-Ericsson COH 901 318 DMA.
+
+config AMCC_PPC440SPE_ADMA
+        tristate "AMCC PPC440SPe ADMA support"
+        depends on 440SPe || 440SP
+        select DMA_ENGINE
+        select ARCH_HAS_ASYNC_TX_FIND_CHANNEL
+        help
+          Enable support for the AMCC PPC440SPe RAID engines.
+
+config ARCH_HAS_ASYNC_TX_FIND_CHANNEL
+        bool
+
 config DMA_ENGINE
         bool
 
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index eca71ba78ae9..807053d48232 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -10,3 +10,5 @@ obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
 obj-$(CONFIG_MX3_IPU) += ipu/
 obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
 obj-$(CONFIG_SH_DMAE) += shdma.o
+obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o
+obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index c52ac9efd0bf..f15112569c1d 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -1188,7 +1188,7 @@ static int at_dma_resume_noirq(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops at_dma_dev_pm_ops = {
+static const struct dev_pm_ops at_dma_dev_pm_ops = {
         .suspend_noirq = at_dma_suspend_noirq,
         .resume_noirq = at_dma_resume_noirq,
 };
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
new file mode 100644
index 000000000000..4a99cd94536b
--- /dev/null
+++ b/drivers/dma/coh901318.c
@@ -0,0 +1,1325 @@
+/*
+ * driver/dma/coh901318.c
+ *
+ * Copyright (C) 2007-2009 ST-Ericsson
+ * License terms: GNU General Public License (GPL) version 2
+ * DMA driver for COH 901 318
+ * Author: Per Friden <per.friden@stericsson.com>
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/kernel.h> /* printk() */
+#include <linux/fs.h> /* everything... */
+#include <linux/slab.h> /* kmalloc() */
+#include <linux/dmaengine.h>
+#include <linux/platform_device.h>
+#include <linux/device.h>
+#include <linux/irqreturn.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
+#include <linux/debugfs.h>
+#include <mach/coh901318.h>
+
+#include "coh901318_lli.h"
+
+#define COHC_2_DEV(cohc) (&cohc->chan.dev->device)
+
+#ifdef VERBOSE_DEBUG
+#define COH_DBG(x) ({ if (1) x; 0; })
+#else
+#define COH_DBG(x) ({ if (0) x; 0; })
+#endif
+
+struct coh901318_desc {
+        struct dma_async_tx_descriptor desc;
+        struct list_head node;
+        struct scatterlist *sg;
+        unsigned int sg_len;
+        struct coh901318_lli *data;
+        enum dma_data_direction dir;
+        int pending_irqs;
+        unsigned long flags;
+};
+
+struct coh901318_base {
+        struct device *dev;
+        void __iomem *virtbase;
+        struct coh901318_pool pool;
+        struct powersave pm;
+        struct dma_device dma_slave;
+        struct dma_device dma_memcpy;
+        struct coh901318_chan *chans;
+        struct coh901318_platform *platform;
+};
+
+struct coh901318_chan {
+        spinlock_t lock;
+        int allocated;
+        int completed;
+        int id;
+        int stopped;
+
+        struct work_struct free_work;
+        struct dma_chan chan;
+
+        struct tasklet_struct tasklet;
+
+        struct list_head active;
+        struct list_head queue;
+        struct list_head free;
+
+        unsigned long nbr_active_done;
+        unsigned long busy;
+        int pending_irqs;
+
+        struct coh901318_base *base;
+};
+
+static void coh901318_list_print(struct coh901318_chan *cohc,
+                                 struct coh901318_lli *lli)
+{
+        struct coh901318_lli *l;
+        dma_addr_t addr =  virt_to_phys(lli);
+        int i = 0;
+
+        while (addr) {
+                l = phys_to_virt(addr);
+                dev_vdbg(COHC_2_DEV(cohc), "i %d, lli %p, ctrl 0x%x, src 0x%x"
+                         ", dst 0x%x, link 0x%x link_virt 0x%p\n",
+                         i, l, l->control, l->src_addr, l->dst_addr,
+                         l->link_addr, phys_to_virt(l->link_addr));
+                i++;
+                addr = l->link_addr;
+        }
+}
+
+#ifdef CONFIG_DEBUG_FS
+
+#define COH901318_DEBUGFS_ASSIGN(x, y) (x = y)
+
+static struct coh901318_base *debugfs_dma_base;
+static struct dentry *dma_dentry;
+
+static int coh901318_debugfs_open(struct inode *inode, struct file *file)
+{
+
+        file->private_data = inode->i_private;
+        return 0;
+}
+
+static int coh901318_debugfs_read(struct file *file, char __user *buf,
+                                  size_t count, loff_t *f_pos)
+{
+        u64 started_channels = debugfs_dma_base->pm.started_channels;
+        int pool_count = debugfs_dma_base->pool.debugfs_pool_counter;
+        int i;
+        int ret = 0;
+        char *dev_buf;
+        char *tmp;
+        int dev_size;
+
+        dev_buf = kmalloc(4*1024, GFP_KERNEL);
+        if (dev_buf == NULL)
+                goto err_kmalloc;
+        tmp = dev_buf;
+
+        tmp += sprintf(tmp, "DMA -- enable dma channels\n");
+
+        for (i = 0; i < debugfs_dma_base->platform->max_channels; i++)
+                if (started_channels & (1 << i))
+                        tmp += sprintf(tmp, "channel %d\n", i);
+
+        tmp += sprintf(tmp, "Pool alloc nbr %d\n", pool_count);
+        dev_size = tmp  - dev_buf;
+
+        /* No more to read if offset != 0 */
+        if (*f_pos > dev_size)
+                goto out;
+
+        if (count > dev_size - *f_pos)
+                count = dev_size - *f_pos;
+
+        if (copy_to_user(buf, dev_buf + *f_pos, count))
+                ret = -EINVAL;
+        ret = count;
+        *f_pos += count;
+
+ out:
+        kfree(dev_buf);
+        return ret;
+
+ err_kmalloc:
+        return 0;
+}
+
+static const struct file_operations coh901318_debugfs_status_operations = {
+        .owner          = THIS_MODULE,
+        .open           = coh901318_debugfs_open,
+        .read           = coh901318_debugfs_read,
+};
+
+
+static int __init init_coh901318_debugfs(void)
+{
+
+        dma_dentry = debugfs_create_dir("dma", NULL);
+
+        (void) debugfs_create_file("status",
+                                   S_IFREG | S_IRUGO,
+                                   dma_dentry, NULL,
+                                   &coh901318_debugfs_status_operations);
+        return 0;
+}
+
+static void __exit exit_coh901318_debugfs(void)
+{
+        debugfs_remove_recursive(dma_dentry);
+}
+
+module_init(init_coh901318_debugfs);
+module_exit(exit_coh901318_debugfs);
+#else
+
+#define COH901318_DEBUGFS_ASSIGN(x, y)
+
+#endif /* CONFIG_DEBUG_FS */
+
+static inline struct coh901318_chan *to_coh901318_chan(struct dma_chan *chan)
+{
+        return container_of(chan, struct coh901318_chan, chan);
+}
+
+static inline dma_addr_t
+cohc_dev_addr(struct coh901318_chan *cohc)
+{
+        return cohc->base->platform->chan_conf[cohc->id].dev_addr;
+}
+
+static inline const struct coh901318_params *
+cohc_chan_param(struct coh901318_chan *cohc)
+{
+        return &cohc->base->platform->chan_conf[cohc->id].param;
+}
+
+static inline const struct coh_dma_channel *
+cohc_chan_conf(struct coh901318_chan *cohc)
+{
+        return &cohc->base->platform->chan_conf[cohc->id];
+}
+
+static void enable_powersave(struct coh901318_chan *cohc)
+{
+        unsigned long flags;
+        struct powersave *pm = &cohc->base->pm;
+
+        spin_lock_irqsave(&pm->lock, flags);
+
+        pm->started_channels &= ~(1ULL << cohc->id);
+
+        if (!pm->started_channels) {
+                /* DMA no longer intends to access memory */
+                cohc->base->platform->access_memory_state(cohc->base->dev,
+                                                          false);
+        }
+
+        spin_unlock_irqrestore(&pm->lock, flags);
+}
+static void disable_powersave(struct coh901318_chan *cohc)
+{
+        unsigned long flags;
+        struct powersave *pm = &cohc->base->pm;
+
+        spin_lock_irqsave(&pm->lock, flags);
+
+        if (!pm->started_channels) {
+                /* DMA intends to access memory */
+                cohc->base->platform->access_memory_state(cohc->base->dev,
+                                                          true);
+        }
+
+        pm->started_channels |= (1ULL << cohc->id);
+
+        spin_unlock_irqrestore(&pm->lock, flags);
+}
+
+static inline int coh901318_set_ctrl(struct coh901318_chan *cohc, u32 control)
+{
+        int channel = cohc->id;
+        void __iomem *virtbase = cohc->base->virtbase;
+
+        writel(control,
+               virtbase + COH901318_CX_CTRL +
+               COH901318_CX_CTRL_SPACING * channel);
+        return 0;
+}
+
+static inline int coh901318_set_conf(struct coh901318_chan *cohc, u32 conf)
+{
+        int channel = cohc->id;
+        void __iomem *virtbase = cohc->base->virtbase;
+
+        writel(conf,
+               virtbase + COH901318_CX_CFG +
+               COH901318_CX_CFG_SPACING*channel);
+        return 0;
+}
+
+
+static int coh901318_start(struct coh901318_chan *cohc)
+{
+        u32 val;
+        int channel = cohc->id;
+        void __iomem *virtbase = cohc->base->virtbase;
+
+        disable_powersave(cohc);
+
+        val = readl(virtbase + COH901318_CX_CFG +
+                    COH901318_CX_CFG_SPACING * channel);
+
+        /* Enable channel */
+        val |= COH901318_CX_CFG_CH_ENABLE;
+        writel(val, virtbase + COH901318_CX_CFG +
+               COH901318_CX_CFG_SPACING * channel);
+
+        return 0;
+}
+
+static int coh901318_prep_linked_list(struct coh901318_chan *cohc,
+                                      struct coh901318_lli *data)
+{
+        int channel = cohc->id;
+        void __iomem *virtbase = cohc->base->virtbase;
+
+        BUG_ON(readl(virtbase + COH901318_CX_STAT +
+                     COH901318_CX_STAT_SPACING*channel) &
+               COH901318_CX_STAT_ACTIVE);
+
+        writel(data->src_addr,
+               virtbase + COH901318_CX_SRC_ADDR +
+               COH901318_CX_SRC_ADDR_SPACING * channel);
+
+        writel(data->dst_addr, virtbase +
+               COH901318_CX_DST_ADDR +
+               COH901318_CX_DST_ADDR_SPACING * channel);
+
+        writel(data->link_addr, virtbase + COH901318_CX_LNK_ADDR +
+               COH901318_CX_LNK_ADDR_SPACING * channel);
+
+        writel(data->control, virtbase + COH901318_CX_CTRL +
+               COH901318_CX_CTRL_SPACING * channel);
+
+        return 0;
+}
+static dma_cookie_t
+coh901318_assign_cookie(struct coh901318_chan *cohc,
+                        struct coh901318_desc *cohd)
+{
+        dma_cookie_t cookie = cohc->chan.cookie;
+
+        if (++cookie < 0)
+                cookie = 1;
+
+        cohc->chan.cookie = cookie;
+        cohd->desc.cookie = cookie;
+
+        return cookie;
+}
+
+static struct coh901318_desc *
+coh901318_desc_get(struct coh901318_chan *cohc)
+{
+        struct coh901318_desc *desc;
+
+        if (list_empty(&cohc->free)) {
+                /* alloc new desc because we're out of used ones
+                 * TODO: alloc a pile of descs instead of just one,
+                 * avoid many small allocations.
+                 */
+                desc = kmalloc(sizeof(struct coh901318_desc), GFP_NOWAIT);
+                if (desc == NULL)
+                        goto out;
+                INIT_LIST_HEAD(&desc->node);
+        } else {
+                /* Reuse an old desc. */
+                desc = list_first_entry(&cohc->free,
+                                        struct coh901318_desc,
+                                        node);
+                list_del(&desc->node);
+        }
+
+ out:
+        return desc;
+}
+
+static void
+coh901318_desc_free(struct coh901318_chan *cohc, struct coh901318_desc *cohd)
+{
+        list_add_tail(&cohd->node, &cohc->free);
+}
+
+/* call with irq lock held */
+static void
+coh901318_desc_submit(struct coh901318_chan *cohc, struct coh901318_desc *desc)
+{
+        list_add_tail(&desc->node, &cohc->active);
+
+        BUG_ON(cohc->pending_irqs != 0);
+
+        cohc->pending_irqs = desc->pending_irqs;
+}
+
+static struct coh901318_desc *
+coh901318_first_active_get(struct coh901318_chan *cohc)
+{
+        struct coh901318_desc *d;
+
+        if (list_empty(&cohc->active))
+                return NULL;
+
+        d = list_first_entry(&cohc->active,
+                             struct coh901318_desc,
+                             node);
+        return d;
+}
+
+static void
+coh901318_desc_remove(struct coh901318_desc *cohd)
+{
+        list_del(&cohd->node);
+}
+
+static void
+coh901318_desc_queue(struct coh901318_chan *cohc, struct coh901318_desc *desc)
+{
+        list_add_tail(&desc->node, &cohc->queue);
+}
+
+static struct coh901318_desc *
+coh901318_first_queued(struct coh901318_chan *cohc)
+{
+        struct coh901318_desc *d;
+
+        if (list_empty(&cohc->queue))
+                return NULL;
+
+        d = list_first_entry(&cohc->queue,
+                             struct coh901318_desc,
+                             node);
+        return d;
+}
+
+/*
+ * DMA start/stop controls
+ */
+u32 coh901318_get_bytes_left(struct dma_chan *chan)
+{
+        unsigned long flags;
+        u32 ret;
+        struct coh901318_chan *cohc = to_coh901318_chan(chan);
+
+        spin_lock_irqsave(&cohc->lock, flags);
+
+        /* Read transfer count value */
+        ret = readl(cohc->base->virtbase +
+                    COH901318_CX_CTRL+COH901318_CX_CTRL_SPACING *
+                    cohc->id) & COH901318_CX_CTRL_TC_VALUE_MASK;
+
+        spin_unlock_irqrestore(&cohc->lock, flags);
+
+        return ret;
+}
+EXPORT_SYMBOL(coh901318_get_bytes_left);
+
+
+/* Stops a transfer without losing data. Enables power save.
+   Use this function in conjunction with coh901318_continue(..)
+*/
+void coh901318_stop(struct dma_chan *chan)
+{
+        u32 val;
+        unsigned long flags;
+        struct coh901318_chan *cohc = to_coh901318_chan(chan);
+        int channel = cohc->id;
+        void __iomem *virtbase = cohc->base->virtbase;
+
+        spin_lock_irqsave(&cohc->lock, flags);
+
+        /* Disable channel in HW */
+        val = readl(virtbase + COH901318_CX_CFG +
+                    COH901318_CX_CFG_SPACING * channel);
+
+        /* Stopping infinit transfer */
+        if ((val & COH901318_CX_CTRL_TC_ENABLE) == 0 &&
+            (val & COH901318_CX_CFG_CH_ENABLE))
+                cohc->stopped = 1;
+
+
+        val &= ~COH901318_CX_CFG_CH_ENABLE;
+        /* Enable twice, HW bug work around */
+        writel(val, virtbase + COH901318_CX_CFG +
+               COH901318_CX_CFG_SPACING * channel);
+        writel(val, virtbase + COH901318_CX_CFG +
+               COH901318_CX_CFG_SPACING * channel);
+
+        /* Spin-wait for it to actually go inactive */
+        while (readl(virtbase + COH901318_CX_STAT+COH901318_CX_STAT_SPACING *
+                     channel) & COH901318_CX_STAT_ACTIVE)
+                cpu_relax();
+
+        /* Check if we stopped an active job */
+        if ((readl(virtbase + COH901318_CX_CTRL+COH901318_CX_CTRL_SPACING *
+                   channel) & COH901318_CX_CTRL_TC_VALUE_MASK) > 0)
+                cohc->stopped = 1;
+
+        enable_powersave(cohc);
+
+        spin_unlock_irqrestore(&cohc->lock, flags);
+}
+EXPORT_SYMBOL(coh901318_stop);
+
+/* Continues a transfer that has been stopped via 300_dma_stop(..).
+   Power save is handled.
+*/
+void coh901318_continue(struct dma_chan *chan)
+{
+        u32 val;
+        unsigned long flags;
+        struct coh901318_chan *cohc = to_coh901318_chan(chan);
+        int channel = cohc->id;
+
+        spin_lock_irqsave(&cohc->lock, flags);
+
+        disable_powersave(cohc);
+
+        if (cohc->stopped) {
+                /* Enable channel in HW */
+                val = readl(cohc->base->virtbase + COH901318_CX_CFG +
+                            COH901318_CX_CFG_SPACING * channel);
+
+                val |= COH901318_CX_CFG_CH_ENABLE;
+
+                writel(val, cohc->base->virtbase + COH901318_CX_CFG +
+                       COH901318_CX_CFG_SPACING*channel);
+
+                cohc->stopped = 0;
+        }
+
+        spin_unlock_irqrestore(&cohc->lock, flags);
+}
+EXPORT_SYMBOL(coh901318_continue);
+
+bool coh901318_filter_id(struct dma_chan *chan, void *chan_id)
+{
+        unsigned int ch_nr = (unsigned int) chan_id;
+
+        if (ch_nr == to_coh901318_chan(chan)->id)
+                return true;
+
+        return false;
+}
+EXPORT_SYMBOL(coh901318_filter_id);
+
+/*
+ * DMA channel allocation
+ */
+static int coh901318_config(struct coh901318_chan *cohc,
+                            struct coh901318_params *param)
+{
+        unsigned long flags;
+        const struct coh901318_params *p;
+        int channel = cohc->id;
+        void __iomem *virtbase = cohc->base->virtbase;
+
+        spin_lock_irqsave(&cohc->lock, flags);
+
+        if (param)
+                p = param;
+        else
+                p = &cohc->base->platform->chan_conf[channel].param;
+
+        /* Clear any pending BE or TC interrupt */
+        if (channel < 32) {
+                writel(1 << channel, virtbase + COH901318_BE_INT_CLEAR1);
+                writel(1 << channel, virtbase + COH901318_TC_INT_CLEAR1);
+        } else {
+                writel(1 << (channel - 32), virtbase +
+                       COH901318_BE_INT_CLEAR2);
+                writel(1 << (channel - 32), virtbase +
+                       COH901318_TC_INT_CLEAR2);
+        }
+
+        coh901318_set_conf(cohc, p->config);
+        coh901318_set_ctrl(cohc, p->ctrl_lli_last);
+
+        spin_unlock_irqrestore(&cohc->lock, flags);
+
+        return 0;
+}
+
+/* must lock when calling this function
+ * start queued jobs, if any
+ * TODO: start all queued jobs in one go
+ *
+ * Returns descriptor if queued job is started otherwise NULL.
+ * If the queue is empty NULL is returned.
+ */
+static struct coh901318_desc *coh901318_queue_start(struct coh901318_chan *cohc)
+{
+        struct coh901318_desc *cohd_que;
+
+        /* start queued jobs, if any
+         * TODO: transmit all queued jobs in one go
+         */
+        cohd_que = coh901318_first_queued(cohc);
+
+        if (cohd_que != NULL) {
+                /* Remove from queue */
+                coh901318_desc_remove(cohd_que);
+                /* initiate DMA job */
+                cohc->busy = 1;
+
+                coh901318_desc_submit(cohc, cohd_que);
+
+                coh901318_prep_linked_list(cohc, cohd_que->data);
+
+                /* start dma job */
+                coh901318_start(cohc);
+
+        }
+
+        return cohd_que;
+}
+
+static void dma_tasklet(unsigned long data)
+{
+        struct coh901318_chan *cohc = (struct coh901318_chan *) data;
+        struct coh901318_desc *cohd_fin;
+        unsigned long flags;
+        dma_async_tx_callback callback;
+        void *callback_param;
+
+        spin_lock_irqsave(&cohc->lock, flags);
+
+        /* get first active entry from list */
+        cohd_fin = coh901318_first_active_get(cohc);
+
+        BUG_ON(cohd_fin->pending_irqs == 0);
+
+        if (cohd_fin == NULL)
+                goto err;
+
+        cohd_fin->pending_irqs--;
+        cohc->completed = cohd_fin->desc.cookie;
+
+        BUG_ON(cohc->nbr_active_done && cohd_fin == NULL);
+
+        if (cohc->nbr_active_done == 0)
+                return;
+
+        if (!cohd_fin->pending_irqs) {
+                /* release the lli allocation*/
+                coh901318_lli_free(&cohc->base->pool, &cohd_fin->data);
+        }
+
+        dev_vdbg(COHC_2_DEV(cohc), "[%s] chan_id %d pending_irqs %d"
+                 " nbr_active_done %ld\n", __func__,
+                 cohc->id, cohc->pending_irqs, cohc->nbr_active_done);
+
+        /* callback to client */
+        callback = cohd_fin->desc.callback;
+        callback_param = cohd_fin->desc.callback_param;
+
+        if (!cohd_fin->pending_irqs) {
+                coh901318_desc_remove(cohd_fin);
+
+                /* return desc to free-list */
+                coh901318_desc_free(cohc, cohd_fin);
+        }
+
+        if (cohc->nbr_active_done)
+                cohc->nbr_active_done--;
+
+        if (cohc->nbr_active_done) {
+                if (cohc_chan_conf(cohc)->priority_high)
+                        tasklet_hi_schedule(&cohc->tasklet);
+                else
+                        tasklet_schedule(&cohc->tasklet);
+        }
+        spin_unlock_irqrestore(&cohc->lock, flags);
+
+        if (callback)
+                callback(callback_param);
+
+        return;
+
+ err:
+        spin_unlock_irqrestore(&cohc->lock, flags);
+        dev_err(COHC_2_DEV(cohc), "[%s] No active dma desc\n", __func__);
+}
+
+
+/* called from interrupt context */
+static void dma_tc_handle(struct coh901318_chan *cohc)
+{
+        BUG_ON(!cohc->allocated && (list_empty(&cohc->active) ||
+                                    list_empty(&cohc->queue)));
+
+        if (!cohc->allocated)
+                return;
+
+        BUG_ON(cohc->pending_irqs == 0);
+
+        cohc->pending_irqs--;
+        cohc->nbr_active_done++;
+
+        if (cohc->pending_irqs == 0 && coh901318_queue_start(cohc) == NULL)
+                cohc->busy = 0;
+
+        BUG_ON(list_empty(&cohc->active));
+
+        if (cohc_chan_conf(cohc)->priority_high)
+                tasklet_hi_schedule(&cohc->tasklet);
+        else
+                tasklet_schedule(&cohc->tasklet);
+}
+
+
+static irqreturn_t dma_irq_handler(int irq, void *dev_id)
+{
+        u32 status1;
+        u32 status2;
+        int i;
+        int ch;
+        struct coh901318_base *base  = dev_id;
+        struct coh901318_chan *cohc;
+        void __iomem *virtbase = base->virtbase;
+
+        status1 = readl(virtbase + COH901318_INT_STATUS1);
+        status2 = readl(virtbase + COH901318_INT_STATUS2);
+
+        if (unlikely(status1 == 0 && status2 == 0)) {
+                dev_warn(base->dev, "spurious DMA IRQ from no channel!\n");
+                return IRQ_HANDLED;
+        }
+
+        /* TODO: consider handle IRQ in tasklet here to
+         *       minimize interrupt latency */
+
+        /* Check the first 32 DMA channels for IRQ */
+        while (status1) {
+                /* Find first bit set, return as a number. */
+                i = ffs(status1) - 1;
+                ch = i;
+
+                cohc = &base->chans[ch];
+                spin_lock(&cohc->lock);
+
+                /* Mask off this bit */
+                status1 &= ~(1 << i);
+                /* Check the individual channel bits */
+                if (test_bit(i, virtbase + COH901318_BE_INT_STATUS1)) {
+                        dev_crit(COHC_2_DEV(cohc),
+                                 "DMA bus error on channel %d!\n", ch);
+                        BUG_ON(1);
+                        /* Clear BE interrupt */
+                        __set_bit(i, virtbase + COH901318_BE_INT_CLEAR1);
+                } else {
+                        /* Caused by TC, really? */
+                        if (unlikely(!test_bit(i, virtbase +
+                                               COH901318_TC_INT_STATUS1))) {
+                                dev_warn(COHC_2_DEV(cohc),
+                                         "ignoring interrupt not caused by terminal count on channel %d\n", ch);
+                                /* Clear TC interrupt */
+                                BUG_ON(1);
+                                __set_bit(i, virtbase + COH901318_TC_INT_CLEAR1);
+                        } else {
+                                /* Enable powersave if transfer has finished */
+                                if (!(readl(virtbase + COH901318_CX_STAT +
+                                            COH901318_CX_STAT_SPACING*ch) &
+                                      COH901318_CX_STAT_ENABLED)) {
+                                        enable_powersave(cohc);
+                                }
+
+                                /* Must clear TC interrupt before calling
+                                 * dma_tc_handle
+                                 * in case tc_handle initate a new dma job
+                                 */
+                                __set_bit(i, virtbase + COH901318_TC_INT_CLEAR1);
+
+                                dma_tc_handle(cohc);
+                        }
+                }
+                spin_unlock(&cohc->lock);
+        }
+
+        /* Check the remaining 32 DMA channels for IRQ */
+        while (status2) {
+                /* Find first bit set, return as a number. */
+                i = ffs(status2) - 1;
+                ch = i + 32;
+                cohc = &base->chans[ch];
+                spin_lock(&cohc->lock);
+
+                /* Mask off this bit */
+                status2 &= ~(1 << i);
+                /* Check the individual channel bits */
+                if (test_bit(i, virtbase + COH901318_BE_INT_STATUS2)) {
+                        dev_crit(COHC_2_DEV(cohc),
+                                 "DMA bus error on channel %d!\n", ch);
+                        /* Clear BE interrupt */
+                        BUG_ON(1);
+                        __set_bit(i, virtbase + COH901318_BE_INT_CLEAR2);
+                } else {
+                        /* Caused by TC, really? */
+                        if (unlikely(!test_bit(i, virtbase +
+                                               COH901318_TC_INT_STATUS2))) {
+                                dev_warn(COHC_2_DEV(cohc),
+                                         "ignoring interrupt not caused by terminal count on channel %d\n", ch);
+                                /* Clear TC interrupt */
+                                __set_bit(i, virtbase + COH901318_TC_INT_CLEAR2);
+                                BUG_ON(1);
+                        } else {
+                                /* Enable powersave if transfer has finished */
+                                if (!(readl(virtbase + COH901318_CX_STAT +
+                                            COH901318_CX_STAT_SPACING*ch) &
+                                      COH901318_CX_STAT_ENABLED)) {
+                                        enable_powersave(cohc);
+                                }
+                                /* Must clear TC interrupt before calling
+                                 * dma_tc_handle
+                                 * in case tc_handle initate a new dma job
+                                 */
+                                __set_bit(i, virtbase + COH901318_TC_INT_CLEAR2);
+
+                                dma_tc_handle(cohc);
+                        }
+                }
+                spin_unlock(&cohc->lock);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static int coh901318_alloc_chan_resources(struct dma_chan *chan)
+{
+        struct coh901318_chan   *cohc = to_coh901318_chan(chan);
+
+        dev_vdbg(COHC_2_DEV(cohc), "[%s] DMA channel %d\n",
+                 __func__, cohc->id);
+
+        if (chan->client_count > 1)
+                return -EBUSY;
+
+        coh901318_config(cohc, NULL);
+
+        cohc->allocated = 1;
+        cohc->completed = chan->cookie = 1;
+
+        return 1;
+}
+
+static void
+coh901318_free_chan_resources(struct dma_chan *chan)
+{
+        struct coh901318_chan   *cohc = to_coh901318_chan(chan);
+        int channel = cohc->id;
+        unsigned long flags;
+
+        spin_lock_irqsave(&cohc->lock, flags);
+
+        /* Disable HW */
+        writel(0x00000000U, cohc->base->virtbase + COH901318_CX_CFG +
+               COH901318_CX_CFG_SPACING*channel);
+        writel(0x00000000U, cohc->base->virtbase + COH901318_CX_CTRL +
+               COH901318_CX_CTRL_SPACING*channel);
+
+        cohc->allocated = 0;
+
+        spin_unlock_irqrestore(&cohc->lock, flags);
+
+        chan->device->device_terminate_all(chan);
+}
+
+
+static dma_cookie_t
+coh901318_tx_submit(struct dma_async_tx_descriptor *tx)
+{
+        struct coh901318_desc *cohd = container_of(tx, struct coh901318_desc,
+                                                   desc);
+        struct coh901318_chan *cohc = to_coh901318_chan(tx->chan);
+        unsigned long flags;
+
+        spin_lock_irqsave(&cohc->lock, flags);
+
+        tx->cookie = coh901318_assign_cookie(cohc, cohd);
+
+        coh901318_desc_queue(cohc, cohd);
+
+        spin_unlock_irqrestore(&cohc->lock, flags);
+
+        return tx->cookie;
+}
+
+static struct dma_async_tx_descriptor *
+coh901318_prep_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
+                      size_t size, unsigned long flags)
+{
+        struct coh901318_lli *data;
+        struct coh901318_desc *cohd;
+        unsigned long flg;
+        struct coh901318_chan *cohc = to_coh901318_chan(chan);
+        int lli_len;
+        u32 ctrl_last = cohc_chan_param(cohc)->ctrl_lli_last;
+
+        spin_lock_irqsave(&cohc->lock, flg);
+
+        dev_vdbg(COHC_2_DEV(cohc),
+                 "[%s] channel %d src 0x%x dest 0x%x size %d\n",
+                 __func__, cohc->id, src, dest, size);
+
+        if (flags & DMA_PREP_INTERRUPT)
+                /* Trigger interrupt after last lli */
+                ctrl_last |= COH901318_CX_CTRL_TC_IRQ_ENABLE;
+
+        lli_len = size >> MAX_DMA_PACKET_SIZE_SHIFT;
+        if ((lli_len << MAX_DMA_PACKET_SIZE_SHIFT) < size)
+                lli_len++;
+
+        data = coh901318_lli_alloc(&cohc->base->pool, lli_len);
+
+        if (data == NULL)
+                goto err;
+
+        cohd = coh901318_desc_get(cohc);
+        cohd->sg = NULL;
+        cohd->sg_len = 0;
+        cohd->data = data;
+
+        cohd->pending_irqs =
+                coh901318_lli_fill_memcpy(
+                                &cohc->base->pool, data, src, size, dest,
+                                cohc_chan_param(cohc)->ctrl_lli_chained,
+                                ctrl_last);
+        cohd->flags = flags;
+
+        COH_DBG(coh901318_list_print(cohc, data));
+
+        dma_async_tx_descriptor_init(&cohd->desc, chan);
+
+        cohd->desc.tx_submit = coh901318_tx_submit;
+
+        spin_unlock_irqrestore(&cohc->lock, flg);
+
+        return &cohd->desc;
+ err:
+        spin_unlock_irqrestore(&cohc->lock, flg);
+        return NULL;
+}
+
+static struct dma_async_tx_descriptor *
+coh901318_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
+                        unsigned int sg_len, enum dma_data_direction direction,
+                        unsigned long flags)
+{
+        struct coh901318_chan *cohc = to_coh901318_chan(chan);
+        struct coh901318_lli *data;
+        struct coh901318_desc *cohd;
+        struct scatterlist *sg;
+        int len = 0;
+        int size;
+        int i;
+        u32 ctrl_chained = cohc_chan_param(cohc)->ctrl_lli_chained;
+        u32 ctrl = cohc_chan_param(cohc)->ctrl_lli;
+        u32 ctrl_last = cohc_chan_param(cohc)->ctrl_lli_last;
+        unsigned long flg;
+
+        if (!sgl)
+                goto out;
+        if (sgl->length == 0)
+                goto out;
+
+        spin_lock_irqsave(&cohc->lock, flg);
+
+        dev_vdbg(COHC_2_DEV(cohc), "[%s] sg_len %d dir %d\n",
+                 __func__, sg_len, direction);
+
+        if (flags & DMA_PREP_INTERRUPT)
+                /* Trigger interrupt after last lli */
+                ctrl_last |= COH901318_CX_CTRL_TC_IRQ_ENABLE;
+
+        cohd = coh901318_desc_get(cohc);
+        cohd->sg = NULL;
+        cohd->sg_len = 0;
+        cohd->dir = direction;
+
+        if (direction == DMA_TO_DEVICE) {
+                u32 tx_flags = COH901318_CX_CTRL_PRDD_SOURCE |
+                        COH901318_CX_CTRL_SRC_ADDR_INC_ENABLE;
+
+                ctrl_chained |= tx_flags;
+                ctrl_last |= tx_flags;
+                ctrl |= tx_flags;
+        } else if (direction == DMA_FROM_DEVICE) {
+                u32 rx_flags = COH901318_CX_CTRL_PRDD_DEST |
+                        COH901318_CX_CTRL_DST_ADDR_INC_ENABLE;
+
+                ctrl_chained |= rx_flags;
+                ctrl_last |= rx_flags;
+                ctrl |= rx_flags;
+        } else
+                goto err_direction;
+
+        dma_async_tx_descriptor_init(&cohd->desc, chan);
+
+        cohd->desc.tx_submit = coh901318_tx_submit;
+
+
+        /* The dma only supports transmitting packages up to
+         * MAX_DMA_PACKET_SIZE. Calculate to total number of
+         * dma elemts required to send the entire sg list
+         */
+        for_each_sg(sgl, sg, sg_len, i) {
+                unsigned int factor;
+                size = sg_dma_len(sg);
+
+                if (size <= MAX_DMA_PACKET_SIZE) {
+                        len++;
+                        continue;
+                }
+
+                factor = size >> MAX_DMA_PACKET_SIZE_SHIFT;
+                if ((factor << MAX_DMA_PACKET_SIZE_SHIFT) < size)
+                        factor++;
+
+                len += factor;
+        }
+
+        data = coh901318_lli_alloc(&cohc->base->pool, len);
+
+        if (data == NULL)
+                goto err_dma_alloc;
+
+        /* initiate allocated data list */
+        cohd->pending_irqs =
+                coh901318_lli_fill_sg(&cohc->base->pool, data, sgl, sg_len,
+                                      cohc_dev_addr(cohc),
+                                      ctrl_chained,
+                                      ctrl,
+                                      ctrl_last,
+                                      direction, COH901318_CX_CTRL_TC_IRQ_ENABLE);
+        cohd->data = data;
+
+        cohd->flags = flags;
+
+        COH_DBG(coh901318_list_print(cohc, data));
+
+        spin_unlock_irqrestore(&cohc->lock, flg);
+
+        return &cohd->desc;
+ err_dma_alloc:
+ err_direction:
+        coh901318_desc_remove(cohd);
+        coh901318_desc_free(cohc, cohd);
+        spin_unlock_irqrestore(&cohc->lock, flg);
+ out:
+        return NULL;
+}
+
+static enum dma_status
+coh901318_is_tx_complete(struct dma_chan *chan,
+                         dma_cookie_t cookie, dma_cookie_t *done,
+                         dma_cookie_t *used)
+{
+        struct coh901318_chan *cohc = to_coh901318_chan(chan);
+        dma_cookie_t last_used;
+        dma_cookie_t last_complete;
+        int ret;
+
+        last_complete = cohc->completed;
+        last_used = chan->cookie;
+
+        ret = dma_async_is_complete(cookie, last_complete, last_used);
+
+        if (done)
+                *done = last_complete;
+        if (used)
+                *used = last_used;
+
+        return ret;
+}
+
+static void
+coh901318_issue_pending(struct dma_chan *chan)
+{
+        struct coh901318_chan *cohc = to_coh901318_chan(chan);
+        unsigned long flags;
+
+        spin_lock_irqsave(&cohc->lock, flags);
+
+        /* Busy means that pending jobs are already being processed */
+        if (!cohc->busy)
+                coh901318_queue_start(cohc);
+
+        spin_unlock_irqrestore(&cohc->lock, flags);
+}
+
+static void
+coh901318_terminate_all(struct dma_chan *chan)
+{
+        unsigned long flags;
+        struct coh901318_chan *cohc = to_coh901318_chan(chan);
+        struct coh901318_desc *cohd;
+        void __iomem *virtbase = cohc->base->virtbase;
+
+        coh901318_stop(chan);
+
+        spin_lock_irqsave(&cohc->lock, flags);
+
+        /* Clear any pending BE or TC interrupt */
+        if (cohc->id < 32) {
+                writel(1 << cohc->id, virtbase + COH901318_BE_INT_CLEAR1);
+                writel(1 << cohc->id, virtbase + COH901318_TC_INT_CLEAR1);
+        } else {
+                writel(1 << (cohc->id - 32), virtbase +
+                       COH901318_BE_INT_CLEAR2);
+                writel(1 << (cohc->id - 32), virtbase +
+                       COH901318_TC_INT_CLEAR2);
+        }
+
+        enable_powersave(cohc);
+
+        while ((cohd = coh901318_first_active_get(cohc))) {
+                /* release the lli allocation*/
+                coh901318_lli_free(&cohc->base->pool, &cohd->data);
+
+                coh901318_desc_remove(cohd);
+
+                /* return desc to free-list */
+                coh901318_desc_free(cohc, cohd);
+        }
+
+        while ((cohd = coh901318_first_queued(cohc))) {
+                /* release the lli allocation*/
+                coh901318_lli_free(&cohc->base->pool, &cohd->data);
+
+                coh901318_desc_remove(cohd);
+
+                /* return desc to free-list */
+                coh901318_desc_free(cohc, cohd);
+        }
+
+
+        cohc->nbr_active_done = 0;
+        cohc->busy = 0;
+        cohc->pending_irqs = 0;
+
+        spin_unlock_irqrestore(&cohc->lock, flags);
+}
+void coh901318_base_init(struct dma_device *dma, const int *pick_chans,
+                         struct coh901318_base *base)
+{
+        int chans_i;
+        int i = 0;
+        struct coh901318_chan *cohc;
+
+        INIT_LIST_HEAD(&dma->channels);
+
+        for (chans_i = 0; pick_chans[chans_i] != -1; chans_i += 2) {
+                for (i = pick_chans[chans_i]; i <= pick_chans[chans_i+1]; i++) {
+                        cohc = &base->chans[i];
+
+                        cohc->base = base;
+                        cohc->chan.device = dma;
+                        cohc->id = i;
+
+                        /* TODO: do we really need this lock if only one
+                         * client is connected to each channel?
+                         */
+
+                        spin_lock_init(&cohc->lock);
+
+                        cohc->pending_irqs = 0;
+                        cohc->nbr_active_done = 0;
+                        cohc->busy = 0;
+                        INIT_LIST_HEAD(&cohc->free);
+                        INIT_LIST_HEAD(&cohc->active);
+                        INIT_LIST_HEAD(&cohc->queue);
+
+                        tasklet_init(&cohc->tasklet, dma_tasklet,
+                                     (unsigned long) cohc);
+
+                        list_add_tail(&cohc->chan.device_node,
+                                      &dma->channels);
+                }
+        }
+}
+
+static int __init coh901318_probe(struct platform_device *pdev)
+{
+        int err = 0;
+        struct coh901318_platform *pdata;
+        struct coh901318_base *base;
+        int irq;
+        struct resource *io;
+
+        io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!io)
+                goto err_get_resource;
+
+        /* Map DMA controller registers to virtual memory */
+        if (request_mem_region(io->start,
+                               resource_size(io),
+                               pdev->dev.driver->name) == NULL) {
+                err = -EBUSY;
+                goto err_request_mem;
+        }
+
+        pdata = pdev->dev.platform_data;
+        if (!pdata)
+                goto err_no_platformdata;
+
+        base = kmalloc(ALIGN(sizeof(struct coh901318_base), 4) +
+                       pdata->max_channels *
+                       sizeof(struct coh901318_chan),
+                       GFP_KERNEL);
+        if (!base)
+                goto err_alloc_coh_dma_channels;
+
+        base->chans = ((void *)base) + ALIGN(sizeof(struct coh901318_base), 4);
+
+        base->virtbase = ioremap(io->start, resource_size(io));
+        if (!base->virtbase) {
+                err = -ENOMEM;
+                goto err_no_ioremap;
+        }
+
+        base->dev = &pdev->dev;
+        base->platform = pdata;
+        spin_lock_init(&base->pm.lock);
+        base->pm.started_channels = 0;
+
+        COH901318_DEBUGFS_ASSIGN(debugfs_dma_base, base);
+
+        platform_set_drvdata(pdev, base);
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0)
+                goto err_no_irq;
+
+        err = request_irq(irq, dma_irq_handler, IRQF_DISABLED,
+                          "coh901318", base);
+        if (err) {
+                dev_crit(&pdev->dev,
+                         "Cannot allocate IRQ for DMA controller!\n");
+                goto err_request_irq;
+        }
+
+        err = coh901318_pool_create(&base->pool, &pdev->dev,
+                                    sizeof(struct coh901318_lli),
+                                    32);
+        if (err)
+                goto err_pool_create;
+
+        /* init channels for device transfers */
+        coh901318_base_init(&base->dma_slave,  base->platform->chans_slave,
+                            base);
+
+        dma_cap_zero(base->dma_slave.cap_mask);
+        dma_cap_set(DMA_SLAVE, base->dma_slave.cap_mask);
+
+        base->dma_slave.device_alloc_chan_resources = coh901318_alloc_chan_resources;
+        base->dma_slave.device_free_chan_resources = coh901318_free_chan_resources;
+        base->dma_slave.device_prep_slave_sg = coh901318_prep_slave_sg;
+        base->dma_slave.device_is_tx_complete = coh901318_is_tx_complete;
+        base->dma_slave.device_issue_pending = coh901318_issue_pending;
+        base->dma_slave.device_terminate_all = coh901318_terminate_all;
+        base->dma_slave.dev = &pdev->dev;
+
+        err = dma_async_device_register(&base->dma_slave);
+
+        if (err)
+                goto err_register_slave;
+
+        /* init channels for memcpy */
+        coh901318_base_init(&base->dma_memcpy, base->platform->chans_memcpy,
+                            base);
+
+        dma_cap_zero(base->dma_memcpy.cap_mask);
+        dma_cap_set(DMA_MEMCPY, base->dma_memcpy.cap_mask);
+
+        base->dma_memcpy.device_alloc_chan_resources = coh901318_alloc_chan_resources;
+        base->dma_memcpy.device_free_chan_resources = coh901318_free_chan_resources;
+        base->dma_memcpy.device_prep_dma_memcpy = coh901318_prep_memcpy;
+        base->dma_memcpy.device_is_tx_complete = coh901318_is_tx_complete;
+        base->dma_memcpy.device_issue_pending = coh901318_issue_pending;
+        base->dma_memcpy.device_terminate_all = coh901318_terminate_all;
+        base->dma_memcpy.dev = &pdev->dev;
+        err = dma_async_device_register(&base->dma_memcpy);
+
+        if (err)
+                goto err_register_memcpy;
+
+        dev_dbg(&pdev->dev, "Initialized COH901318 DMA on virtual base 0x%08x\n",
+                (u32) base->virtbase);
+
+        return err;
+
+ err_register_memcpy:
+        dma_async_device_unregister(&base->dma_slave);
+ err_register_slave:
+        coh901318_pool_destroy(&base->pool);
+ err_pool_create:
+        free_irq(platform_get_irq(pdev, 0), base);
+ err_request_irq:
+ err_no_irq:
+        iounmap(base->virtbase);
+ err_no_ioremap:
+        kfree(base);
+ err_alloc_coh_dma_channels:
+ err_no_platformdata:
+        release_mem_region(pdev->resource->start,
+                           resource_size(pdev->resource));
+ err_request_mem:
+ err_get_resource:
+        return err;
+}
+
+static int __exit coh901318_remove(struct platform_device *pdev)
+{
+        struct coh901318_base *base = platform_get_drvdata(pdev);
+
+        dma_async_device_unregister(&base->dma_memcpy);
+        dma_async_device_unregister(&base->dma_slave);
+        coh901318_pool_destroy(&base->pool);
+        free_irq(platform_get_irq(pdev, 0), base);
+        kfree(base);
+        iounmap(base->virtbase);
+        release_mem_region(pdev->resource->start,
+                           resource_size(pdev->resource));
+        return 0;
+}
+
+
+static struct platform_driver coh901318_driver = {
+        .remove = __exit_p(coh901318_remove),
+        .driver = {
+                .name   = "coh901318",
+        },
+};
+
+int __init coh901318_init(void)
+{
+        return platform_driver_probe(&coh901318_driver, coh901318_probe);
+}
+subsys_initcall(coh901318_init);
+
+void __exit coh901318_exit(void)
+{
+        platform_driver_unregister(&coh901318_driver);
+}
+module_exit(coh901318_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Per Friden");
diff --git a/drivers/dma/coh901318_lli.c b/drivers/dma/coh901318_lli.c
new file mode 100644
index 000000000000..f5120f238a4d
--- /dev/null
+++ b/drivers/dma/coh901318_lli.c
@@ -0,0 +1,318 @@
+/*
+ * driver/dma/coh901318_lli.c
+ *
+ * Copyright (C) 2007-2009 ST-Ericsson
+ * License terms: GNU General Public License (GPL) version 2
+ * Support functions for handling lli for dma
+ * Author: Per Friden <per.friden@stericsson.com>
+ */
+
+#include <linux/dma-mapping.h>
+#include <linux/spinlock.h>
+#include <linux/dmapool.h>
+#include <linux/memory.h>
+#include <mach/coh901318.h>
+
+#include "coh901318_lli.h"
+
+#if (defined(CONFIG_DEBUG_FS) && defined(CONFIG_U300_DEBUG))
+#define DEBUGFS_POOL_COUNTER_RESET(pool) (pool->debugfs_pool_counter = 0)
+#define DEBUGFS_POOL_COUNTER_ADD(pool, add) (pool->debugfs_pool_counter += add)
+#else
+#define DEBUGFS_POOL_COUNTER_RESET(pool)
+#define DEBUGFS_POOL_COUNTER_ADD(pool, add)
+#endif
+
+static struct coh901318_lli *
+coh901318_lli_next(struct coh901318_lli *data)
+{
+        if (data == NULL || data->link_addr == 0)
+                return NULL;
+
+        return (struct coh901318_lli *) data->virt_link_addr;
+}
+
+int coh901318_pool_create(struct coh901318_pool *pool,
+                          struct device *dev,
+                          size_t size, size_t align)
+{
+        spin_lock_init(&pool->lock);
+        pool->dev = dev;
+        pool->dmapool = dma_pool_create("lli_pool", dev, size, align, 0);
+
+        DEBUGFS_POOL_COUNTER_RESET(pool);
+        return 0;
+}
+
+int coh901318_pool_destroy(struct coh901318_pool *pool)
+{
+
+        dma_pool_destroy(pool->dmapool);
+        return 0;
+}
+
+struct coh901318_lli *
+coh901318_lli_alloc(struct coh901318_pool *pool, unsigned int len)
+{
+        int i;
+        struct coh901318_lli *head;
+        struct coh901318_lli *lli;
+        struct coh901318_lli *lli_prev;
+        dma_addr_t phy;
+
+        if (len == 0)
+                goto err;
+
+        spin_lock(&pool->lock);
+
+        head = dma_pool_alloc(pool->dmapool, GFP_NOWAIT, &phy);
+
+        if (head == NULL)
+                goto err;
+
+        DEBUGFS_POOL_COUNTER_ADD(pool, 1);
+
+        lli = head;
+        lli->phy_this = phy;
+
+        for (i = 1; i < len; i++) {
+                lli_prev = lli;
+
+                lli = dma_pool_alloc(pool->dmapool, GFP_NOWAIT, &phy);
+
+                if (lli == NULL)
+                        goto err_clean_up;
+
+                DEBUGFS_POOL_COUNTER_ADD(pool, 1);
+                lli->phy_this = phy;
+
+                lli_prev->link_addr = phy;
+                lli_prev->virt_link_addr = lli;
+        }
+
+        lli->link_addr = 0x00000000U;
+
+        spin_unlock(&pool->lock);
+
+        return head;
+
+ err:
+        spin_unlock(&pool->lock);
+        return NULL;
+
+ err_clean_up:
+        lli_prev->link_addr = 0x00000000U;
+        spin_unlock(&pool->lock);
+        coh901318_lli_free(pool, &head);
+        return NULL;
+}
+
+void coh901318_lli_free(struct coh901318_pool *pool,
+                        struct coh901318_lli **lli)
+{
+        struct coh901318_lli *l;
+        struct coh901318_lli *next;
+
+        if (lli == NULL)
+                return;
+
+        l = *lli;
+
+        if (l == NULL)
+                return;
+
+        spin_lock(&pool->lock);
+
+        while (l->link_addr) {
+                next = l->virt_link_addr;
+                dma_pool_free(pool->dmapool, l, l->phy_this);
+                DEBUGFS_POOL_COUNTER_ADD(pool, -1);
+                l = next;
+        }
+        dma_pool_free(pool->dmapool, l, l->phy_this);
+        DEBUGFS_POOL_COUNTER_ADD(pool, -1);
+
+        spin_unlock(&pool->lock);
+        *lli = NULL;
+}
+
+int
+coh901318_lli_fill_memcpy(struct coh901318_pool *pool,
+                          struct coh901318_lli *lli,
+                          dma_addr_t source, unsigned int size,
+                          dma_addr_t destination, u32 ctrl_chained,
+                          u32 ctrl_eom)
+{
+        int s = size;
+        dma_addr_t src = source;
+        dma_addr_t dst = destination;
+
+        lli->src_addr = src;
+        lli->dst_addr = dst;
+
+        while (lli->link_addr) {
+                lli->control = ctrl_chained | MAX_DMA_PACKET_SIZE;
+                lli->src_addr = src;
+                lli->dst_addr = dst;
+
+                s -= MAX_DMA_PACKET_SIZE;
+                lli = coh901318_lli_next(lli);
+
+                src += MAX_DMA_PACKET_SIZE;
+                dst += MAX_DMA_PACKET_SIZE;
+        }
+
+        lli->control = ctrl_eom | s;
+        lli->src_addr = src;
+        lli->dst_addr = dst;
+
+        /* One irq per single transfer */
+        return 1;
+}
+
+int
+coh901318_lli_fill_single(struct coh901318_pool *pool,
+                          struct coh901318_lli *lli,
+                          dma_addr_t buf, unsigned int size,
+                          dma_addr_t dev_addr, u32 ctrl_chained, u32 ctrl_eom,
+                          enum dma_data_direction dir)
+{
+        int s = size;
+        dma_addr_t src;
+        dma_addr_t dst;
+
+
+        if (dir == DMA_TO_DEVICE) {
+                src = buf;
+                dst = dev_addr;
+
+        } else if (dir == DMA_FROM_DEVICE) {
+
+                src = dev_addr;
+                dst = buf;
+        } else {
+                return -EINVAL;
+        }
+
+        while (lli->link_addr) {
+                size_t block_size = MAX_DMA_PACKET_SIZE;
+                lli->control = ctrl_chained | MAX_DMA_PACKET_SIZE;
+
+                /* If we are on the next-to-final block and there will
+                 * be less than half a DMA packet left for the last
+                 * block, then we want to make this block a little
+                 * smaller to balance the sizes. This is meant to
+                 * avoid too small transfers if the buffer size is
+                 * (MAX_DMA_PACKET_SIZE*N + 1) */
+                if (s < (MAX_DMA_PACKET_SIZE + MAX_DMA_PACKET_SIZE/2))
+                        block_size = MAX_DMA_PACKET_SIZE/2;
+
+                s -= block_size;
+                lli->src_addr = src;
+                lli->dst_addr = dst;
+
+                lli = coh901318_lli_next(lli);
+
+                if (dir == DMA_TO_DEVICE)
+                        src += block_size;
+                else if (dir == DMA_FROM_DEVICE)
+                        dst += block_size;
+        }
+
+        lli->control = ctrl_eom | s;
+        lli->src_addr = src;
+        lli->dst_addr = dst;
+
+        /* One irq per single transfer */
+        return 1;
+}
+
+int
+coh901318_lli_fill_sg(struct coh901318_pool *pool,
+                      struct coh901318_lli *lli,
+                      struct scatterlist *sgl, unsigned int nents,
+                      dma_addr_t dev_addr, u32 ctrl_chained, u32 ctrl,
+                      u32 ctrl_last,
+                      enum dma_data_direction dir, u32 ctrl_irq_mask)
+{
+        int i;
+        struct scatterlist *sg;
+        u32 ctrl_sg;
+        dma_addr_t src = 0;
+        dma_addr_t dst = 0;
+        int nbr_of_irq = 0;
+        u32 bytes_to_transfer;
+        u32 elem_size;
+
+        if (lli == NULL)
+                goto err;
+
+        spin_lock(&pool->lock);
+
+        if (dir == DMA_TO_DEVICE)
+                dst = dev_addr;
+        else if (dir == DMA_FROM_DEVICE)
+                src = dev_addr;
+        else
+                goto err;
+
+        for_each_sg(sgl, sg, nents, i) {
+                if (sg_is_chain(sg)) {
+                        /* sg continues to the next sg-element don't
+                         * send ctrl_finish until the last
+                         * sg-element in the chain
+                         */
+                        ctrl_sg = ctrl_chained;
+                } else if (i == nents - 1)
+                        ctrl_sg = ctrl_last;
+                else
+                        ctrl_sg = ctrl ? ctrl : ctrl_last;
+
+
+                if ((ctrl_sg & ctrl_irq_mask))
+                        nbr_of_irq++;
+
+                if (dir == DMA_TO_DEVICE)
+                        /* increment source address */
+                        src = sg_dma_address(sg);
+                else
+                        /* increment destination address */
+                        dst =  sg_dma_address(sg);
+
+                bytes_to_transfer = sg_dma_len(sg);
+
+                while (bytes_to_transfer) {
+                        u32 val;
+
+                        if (bytes_to_transfer > MAX_DMA_PACKET_SIZE) {
+                                elem_size = MAX_DMA_PACKET_SIZE;
+                                val = ctrl_chained;
+                        } else {
+                                elem_size = bytes_to_transfer;
+                                val = ctrl_sg;
+                        }
+
+                        lli->control = val | elem_size;
+                        lli->src_addr = src;
+                        lli->dst_addr = dst;
+
+                        if (dir == DMA_FROM_DEVICE)
+                                dst += elem_size;
+                        else
+                                src += elem_size;
+
+                        BUG_ON(lli->link_addr & 3);
+
+                        bytes_to_transfer -= elem_size;
+                        lli = coh901318_lli_next(lli);
+                }
+
+        }
+        spin_unlock(&pool->lock);
+
+        /* There can be many IRQs per sg transfer */
+        return nbr_of_irq;
+ err:
+        spin_unlock(&pool->lock);
+        return -EINVAL;
+}
diff --git a/drivers/dma/coh901318_lli.h b/drivers/dma/coh901318_lli.h
new file mode 100644
index 000000000000..7bf713b79c6b
--- /dev/null
+++ b/drivers/dma/coh901318_lli.h
@@ -0,0 +1,124 @@
+/*
+ * driver/dma/coh901318_lli.h
+ *
+ * Copyright (C) 2007-2009 ST-Ericsson
+ * License terms: GNU General Public License (GPL) version 2
+ * Support functions for handling lli for coh901318
+ * Author: Per Friden <per.friden@stericsson.com>
+ */
+
+#ifndef COH901318_LLI_H
+#define COH901318_LLI_H
+
+#include <mach/coh901318.h>
+
+struct device;
+
+struct coh901318_pool {
+        spinlock_t lock;
+        struct dma_pool *dmapool;
+        struct device *dev;
+
+#ifdef CONFIG_DEBUG_FS
+        int debugfs_pool_counter;
+#endif
+};
+
+struct device;
+/**
+ * coh901318_pool_create() - Creates an dma pool for lli:s
+ * @pool: pool handle
+ * @dev: dma device
+ * @lli_nbr: number of lli:s in the pool
+ * @algin: adress alignemtn of lli:s
+ * returns 0 on success otherwise none zero
+ */
+int coh901318_pool_create(struct coh901318_pool *pool,
+                          struct device *dev,
+                          size_t lli_nbr, size_t align);
+
+/**
+ * coh901318_pool_destroy() - Destroys the dma pool
+ * @pool: pool handle
+ * returns 0 on success otherwise none zero
+ */
+int coh901318_pool_destroy(struct coh901318_pool *pool);
+
+/**
+ * coh901318_lli_alloc() - Allocates a linked list
+ *
+ * @pool: pool handle
+ * @len: length to list
+ * return: none NULL if success otherwise NULL
+ */
+struct coh901318_lli *
+coh901318_lli_alloc(struct coh901318_pool *pool,
+                    unsigned int len);
+
+/**
+ * coh901318_lli_free() - Returns the linked list items to the pool
+ * @pool: pool handle
+ * @lli: reference to lli pointer to be freed
+ */
+void coh901318_lli_free(struct coh901318_pool *pool,
+                        struct coh901318_lli **lli);
+
+/**
+ * coh901318_lli_fill_memcpy() - Prepares the lli:s for dma memcpy
+ * @pool: pool handle
+ * @lli: allocated lli
+ * @src: src address
+ * @size: transfer size
+ * @dst: destination address
+ * @ctrl_chained: ctrl for chained lli
+ * @ctrl_last: ctrl for the last lli
+ * returns number of CPU interrupts for the lli, negative on error.
+ */
+int
+coh901318_lli_fill_memcpy(struct coh901318_pool *pool,
+                          struct coh901318_lli *lli,
+                          dma_addr_t src, unsigned int size,
+                          dma_addr_t dst, u32 ctrl_chained, u32 ctrl_last);
+
+/**
+ * coh901318_lli_fill_single() - Prepares the lli:s for dma single transfer
+ * @pool: pool handle
+ * @lli: allocated lli
+ * @buf: transfer buffer
+ * @size: transfer size
+ * @dev_addr: address of periphal
+ * @ctrl_chained: ctrl for chained lli
+ * @ctrl_last: ctrl for the last lli
+ * @dir: direction of transfer (to or from device)
+ * returns number of CPU interrupts for the lli, negative on error.
+ */
+int
+coh901318_lli_fill_single(struct coh901318_pool *pool,
+                          struct coh901318_lli *lli,
+                          dma_addr_t buf, unsigned int size,
+                          dma_addr_t dev_addr, u32 ctrl_chained, u32 ctrl_last,
+                          enum dma_data_direction dir);
+
+/**
+ * coh901318_lli_fill_single() - Prepares the lli:s for dma scatter list transfer
+ * @pool: pool handle
+ * @lli: allocated lli
+ * @sg: scatter gather list
+ * @nents: number of entries in sg
+ * @dev_addr: address of periphal
+ * @ctrl_chained: ctrl for chained lli
+ * @ctrl: ctrl of middle lli
+ * @ctrl_last: ctrl for the last lli
+ * @dir: direction of transfer (to or from device)
+ * @ctrl_irq_mask: ctrl mask for CPU interrupt
+ * returns number of CPU interrupts for the lli, negative on error.
+ */
+int
+coh901318_lli_fill_sg(struct coh901318_pool *pool,
+                      struct coh901318_lli *lli,
+                      struct scatterlist *sg, unsigned int nents,
+                      dma_addr_t dev_addr, u32 ctrl_chained,
+                      u32 ctrl, u32 ctrl_last,
+                      enum dma_data_direction dir, u32 ctrl_irq_mask);
+
+#endif /* COH901318_LLI_H */
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index a32a4cf7b1e0..8b905161fbf4 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -298,10 +298,6 @@ static int dmatest_func(void *data)
 
                 total_tests++;
 
-                len = dmatest_random() % test_buf_size + 1;
-                src_off = dmatest_random() % (test_buf_size - len + 1);
-                dst_off = dmatest_random() % (test_buf_size - len + 1);
-
                 /* honor alignment restrictions */
                 if (thread->type == DMA_MEMCPY)
                         align = dev->copy_align;
@@ -310,7 +306,19 @@ static int dmatest_func(void *data)
                 else if (thread->type == DMA_PQ)
                         align = dev->pq_align;
 
+                if (1 << align > test_buf_size) {
+                        pr_err("%u-byte buffer too small for %d-byte alignment\n",
+                               test_buf_size, 1 << align);
+                        break;
+                }
+
+                len = dmatest_random() % test_buf_size + 1;
                 len = (len >> align) << align;
+                if (!len)
+                        len = 1 << align;
+                src_off = dmatest_random() % (test_buf_size - len + 1);
+                dst_off = dmatest_random() % (test_buf_size - len + 1);
+
                 src_off = (src_off >> align) << align;
                 dst_off = (dst_off >> align) << align;
 
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 2eea823516a7..285bed0fe17b 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -1427,7 +1427,7 @@ static int dw_resume_noirq(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops dw_dev_pm_ops = {
+static const struct dev_pm_ops dw_dev_pm_ops = {
         .suspend_noirq = dw_suspend_noirq,
         .resume_noirq = dw_resume_noirq,
 };
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index 645ca8d54ec4..ca6e6a0cb793 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -1470,7 +1470,7 @@ static int __devinit iop_adma_probe(struct platform_device *pdev)
                 return -ENODEV;
 
         if (!devm_request_mem_region(&pdev->dev, res->start,
-                                res->end - res->start, pdev->name))
+                                resource_size(res), pdev->name))
                 return -EBUSY;
 
         adev = kzalloc(sizeof(*adev), GFP_KERNEL);
@@ -1542,7 +1542,7 @@ static int __devinit iop_adma_probe(struct platform_device *pdev)
         iop_chan->device = adev;
 
         iop_chan->mmr_base = devm_ioremap(&pdev->dev, res->start,
-                                        res->end - res->start);
+                                        resource_size(res));
         if (!iop_chan->mmr_base) {
                 ret = -ENOMEM;
                 goto err_free_iop_chan;
diff --git a/drivers/dma/ppc4xx/Makefile b/drivers/dma/ppc4xx/Makefile
new file mode 100644
index 000000000000..b3d259b3e52a
--- /dev/null
+++ b/drivers/dma/ppc4xx/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += adma.o
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
new file mode 100644
index 000000000000..0a3478e910f0
--- /dev/null
+++ b/drivers/dma/ppc4xx/adma.c
@@ -0,0 +1,5027 @@
+/*
+ * Copyright (C) 2006-2009 DENX Software Engineering.
+ *
+ * Author: Yuri Tikhonov <yur@emcraft.com>
+ *
+ * Further porting to arch/powerpc by
+ *      Anatolij Gustschin <agust@denx.de>
+ *
+ * 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.
+ */
+
+/*
+ * This driver supports the asynchrounous DMA copy and RAID engines available
+ * on the AMCC PPC440SPe Processors.
+ * Based on the Intel Xscale(R) family of I/O Processors (IOP 32x, 33x, 134x)
+ * ADMA driver written by D.Williams.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/async_tx.h>
+#include <linux/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/spinlock.h>
+#include <linux/interrupt.h>
+#include <linux/uaccess.h>
+#include <linux/proc_fs.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <asm/dcr.h>
+#include <asm/dcr-regs.h>
+#include "adma.h"
+
+enum ppc_adma_init_code {
+        PPC_ADMA_INIT_OK = 0,
+        PPC_ADMA_INIT_MEMRES,
+        PPC_ADMA_INIT_MEMREG,
+        PPC_ADMA_INIT_ALLOC,
+        PPC_ADMA_INIT_COHERENT,
+        PPC_ADMA_INIT_CHANNEL,
+        PPC_ADMA_INIT_IRQ1,
+        PPC_ADMA_INIT_IRQ2,
+        PPC_ADMA_INIT_REGISTER
+};
+
+static char *ppc_adma_errors[] = {
+        [PPC_ADMA_INIT_OK] = "ok",
+        [PPC_ADMA_INIT_MEMRES] = "failed to get memory resource",
+        [PPC_ADMA_INIT_MEMREG] = "failed to request memory region",
+        [PPC_ADMA_INIT_ALLOC] = "failed to allocate memory for adev "
+                                "structure",
+        [PPC_ADMA_INIT_COHERENT] = "failed to allocate coherent memory for "
+                                   "hardware descriptors",
+        [PPC_ADMA_INIT_CHANNEL] = "failed to allocate memory for channel",
+        [PPC_ADMA_INIT_IRQ1] = "failed to request first irq",
+        [PPC_ADMA_INIT_IRQ2] = "failed to request second irq",
+        [PPC_ADMA_INIT_REGISTER] = "failed to register dma async device",
+};
+
+static enum ppc_adma_init_code
+ppc440spe_adma_devices[PPC440SPE_ADMA_ENGINES_NUM];
+
+struct ppc_dma_chan_ref {
+        struct dma_chan *chan;
+        struct list_head node;
+};
+
+/* The list of channels exported by ppc440spe ADMA */
+struct list_head
+ppc440spe_adma_chan_list = LIST_HEAD_INIT(ppc440spe_adma_chan_list);
+
+/* This flag is set when want to refetch the xor chain in the interrupt
+ * handler
+ */
+static u32 do_xor_refetch;
+
+/* Pointer to DMA0, DMA1 CP/CS FIFO */
+static void *ppc440spe_dma_fifo_buf;
+
+/* Pointers to last submitted to DMA0, DMA1 CDBs */
+static struct ppc440spe_adma_desc_slot *chan_last_sub[3];
+static struct ppc440spe_adma_desc_slot *chan_first_cdb[3];
+
+/* Pointer to last linked and submitted xor CB */
+static struct ppc440spe_adma_desc_slot *xor_last_linked;
+static struct ppc440spe_adma_desc_slot *xor_last_submit;
+
+/* This array is used in data-check operations for storing a pattern */
+static char ppc440spe_qword[16];
+
+static atomic_t ppc440spe_adma_err_irq_ref;
+static dcr_host_t ppc440spe_mq_dcr_host;
+static unsigned int ppc440spe_mq_dcr_len;
+
+/* Since RXOR operations use the common register (MQ0_CF2H) for setting-up
+ * the block size in transactions, then we do not allow to activate more than
+ * only one RXOR transactions simultaneously. So use this var to store
+ * the information about is RXOR currently active (PPC440SPE_RXOR_RUN bit is
+ * set) or not (PPC440SPE_RXOR_RUN is clear).
+ */
+static unsigned long ppc440spe_rxor_state;
+
+/* These are used in enable & check routines
+ */
+static u32 ppc440spe_r6_enabled;
+static struct ppc440spe_adma_chan *ppc440spe_r6_tchan;
+static struct completion ppc440spe_r6_test_comp;
+
+static int ppc440spe_adma_dma2rxor_prep_src(
+                struct ppc440spe_adma_desc_slot *desc,
+                struct ppc440spe_rxor *cursor, int index,
+                int src_cnt, u32 addr);
+static void ppc440spe_adma_dma2rxor_set_src(
+                struct ppc440spe_adma_desc_slot *desc,
+                int index, dma_addr_t addr);
+static void ppc440spe_adma_dma2rxor_set_mult(
+                struct ppc440spe_adma_desc_slot *desc,
+                int index, u8 mult);
+
+#ifdef ADMA_LL_DEBUG
+#define ADMA_LL_DBG(x) ({ if (1) x; 0; })
+#else
+#define ADMA_LL_DBG(x) ({ if (0) x; 0; })
+#endif
+
+static void print_cb(struct ppc440spe_adma_chan *chan, void *block)
+{
+        struct dma_cdb *cdb;
+        struct xor_cb *cb;
+        int i;
+
+        switch (chan->device->id) {
+        case 0:
+        case 1:
+                cdb = block;
+
+                pr_debug("CDB at %p [%d]:\n"
+                        "\t attr 0x%02x opc 0x%02x cnt 0x%08x\n"
+                        "\t sg1u 0x%08x sg1l 0x%08x\n"
+                        "\t sg2u 0x%08x sg2l 0x%08x\n"
+                        "\t sg3u 0x%08x sg3l 0x%08x\n",
+                        cdb, chan->device->id,
+                        cdb->attr, cdb->opc, le32_to_cpu(cdb->cnt),
+                        le32_to_cpu(cdb->sg1u), le32_to_cpu(cdb->sg1l),
+                        le32_to_cpu(cdb->sg2u), le32_to_cpu(cdb->sg2l),
+                        le32_to_cpu(cdb->sg3u), le32_to_cpu(cdb->sg3l)
+                );
+                break;
+        case 2:
+                cb = block;
+
+                pr_debug("CB at %p [%d]:\n"
+                        "\t cbc 0x%08x cbbc 0x%08x cbs 0x%08x\n"
+                        "\t cbtah 0x%08x cbtal 0x%08x\n"
+                        "\t cblah 0x%08x cblal 0x%08x\n",
+                        cb, chan->device->id,
+                        cb->cbc, cb->cbbc, cb->cbs,
+                        cb->cbtah, cb->cbtal,
+                        cb->cblah, cb->cblal);
+                for (i = 0; i < 16; i++) {
+                        if (i && !cb->ops[i].h && !cb->ops[i].l)
+                                continue;
+                        pr_debug("\t ops[%2d]: h 0x%08x l 0x%08x\n",
+                                i, cb->ops[i].h, cb->ops[i].l);
+                }
+                break;
+        }
+}
+
+static void print_cb_list(struct ppc440spe_adma_chan *chan,
+                          struct ppc440spe_adma_desc_slot *iter)
+{
+        for (; iter; iter = iter->hw_next)
+                print_cb(chan, iter->hw_desc);
+}
+
+static void prep_dma_xor_dbg(int id, dma_addr_t dst, dma_addr_t *src,
+                             unsigned int src_cnt)
+{
+        int i;
+
+        pr_debug("\n%s(%d):\nsrc: ", __func__, id);
+        for (i = 0; i < src_cnt; i++)
+                pr_debug("\t0x%016llx ", src[i]);
+        pr_debug("dst:\n\t0x%016llx\n", dst);
+}
+
+static void prep_dma_pq_dbg(int id, dma_addr_t *dst, dma_addr_t *src,
+                            unsigned int src_cnt)
+{
+        int i;
+
+        pr_debug("\n%s(%d):\nsrc: ", __func__, id);
+        for (i = 0; i < src_cnt; i++)
+                pr_debug("\t0x%016llx ", src[i]);
+        pr_debug("dst: ");
+        for (i = 0; i < 2; i++)
+                pr_debug("\t0x%016llx ", dst[i]);
+}
+
+static void prep_dma_pqzero_sum_dbg(int id, dma_addr_t *src,
+                                    unsigned int src_cnt,
+                                    const unsigned char *scf)
+{
+        int i;
+
+        pr_debug("\n%s(%d):\nsrc(coef): ", __func__, id);
+        if (scf) {
+                for (i = 0; i < src_cnt; i++)
+                        pr_debug("\t0x%016llx(0x%02x) ", src[i], scf[i]);
+        } else {
+                for (i = 0; i < src_cnt; i++)
+                        pr_debug("\t0x%016llx(no) ", src[i]);
+        }
+
+        pr_debug("dst: ");
+        for (i = 0; i < 2; i++)
+                pr_debug("\t0x%016llx ", src[src_cnt + i]);
+}
+
+/******************************************************************************
+ * Command (Descriptor) Blocks low-level routines
+ ******************************************************************************/
+/**
+ * ppc440spe_desc_init_interrupt - initialize the descriptor for INTERRUPT
+ * pseudo operation
+ */
+static void ppc440spe_desc_init_interrupt(struct ppc440spe_adma_desc_slot *desc,
+                                          struct ppc440spe_adma_chan *chan)
+{
+        struct xor_cb *p;
+
+        switch (chan->device->id) {
+        case PPC440SPE_XOR_ID:
+                p = desc->hw_desc;
+                memset(desc->hw_desc, 0, sizeof(struct xor_cb));
+                /* NOP with Command Block Complete Enable */
+                p->cbc = XOR_CBCR_CBCE_BIT;
+                break;
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                memset(desc->hw_desc, 0, sizeof(struct dma_cdb));
+                /* NOP with interrupt */
+                set_bit(PPC440SPE_DESC_INT, &desc->flags);
+                break;
+        default:
+                printk(KERN_ERR "Unsupported id %d in %s\n", chan->device->id,
+                                __func__);
+                break;
+        }
+}
+
+/**
+ * ppc440spe_desc_init_null_xor - initialize the descriptor for NULL XOR
+ * pseudo operation
+ */
+static void ppc440spe_desc_init_null_xor(struct ppc440spe_adma_desc_slot *desc)
+{
+        memset(desc->hw_desc, 0, sizeof(struct xor_cb));
+        desc->hw_next = NULL;
+        desc->src_cnt = 0;
+        desc->dst_cnt = 1;
+}
+
+/**
+ * ppc440spe_desc_init_xor - initialize the descriptor for XOR operation
+ */
+static void ppc440spe_desc_init_xor(struct ppc440spe_adma_desc_slot *desc,
+                                         int src_cnt, unsigned long flags)
+{
+        struct xor_cb *hw_desc = desc->hw_desc;
+
+        memset(desc->hw_desc, 0, sizeof(struct xor_cb));
+        desc->hw_next = NULL;
+        desc->src_cnt = src_cnt;
+        desc->dst_cnt = 1;
+
+        hw_desc->cbc = XOR_CBCR_TGT_BIT | src_cnt;
+        if (flags & DMA_PREP_INTERRUPT)
+                /* Enable interrupt on completion */
+                hw_desc->cbc |= XOR_CBCR_CBCE_BIT;
+}
+
+/**
+ * ppc440spe_desc_init_dma2pq - initialize the descriptor for PQ
+ * operation in DMA2 controller
+ */
+static void ppc440spe_desc_init_dma2pq(struct ppc440spe_adma_desc_slot *desc,
+                int dst_cnt, int src_cnt, unsigned long flags)
+{
+        struct xor_cb *hw_desc = desc->hw_desc;
+
+        memset(desc->hw_desc, 0, sizeof(struct xor_cb));
+        desc->hw_next = NULL;
+        desc->src_cnt = src_cnt;
+        desc->dst_cnt = dst_cnt;
+        memset(desc->reverse_flags, 0, sizeof(desc->reverse_flags));
+        desc->descs_per_op = 0;
+
+        hw_desc->cbc = XOR_CBCR_TGT_BIT;
+        if (flags & DMA_PREP_INTERRUPT)
+                /* Enable interrupt on completion */
+                hw_desc->cbc |= XOR_CBCR_CBCE_BIT;
+}
+
+#define DMA_CTRL_FLAGS_LAST     DMA_PREP_FENCE
+#define DMA_PREP_ZERO_P         (DMA_CTRL_FLAGS_LAST << 1)
+#define DMA_PREP_ZERO_Q         (DMA_PREP_ZERO_P << 1)
+
+/**
+ * ppc440spe_desc_init_dma01pq - initialize the descriptors for PQ operation
+ * with DMA0/1
+ */
+static void ppc440spe_desc_init_dma01pq(struct ppc440spe_adma_desc_slot *desc,
+                                int dst_cnt, int src_cnt, unsigned long flags,
+                                unsigned long op)
+{
+        struct dma_cdb *hw_desc;
+        struct ppc440spe_adma_desc_slot *iter;
+        u8 dopc;
+
+        /* Common initialization of a PQ descriptors chain */
+        set_bits(op, &desc->flags);
+        desc->src_cnt = src_cnt;
+        desc->dst_cnt = dst_cnt;
+
+        /* WXOR MULTICAST if both P and Q are being computed
+         * MV_SG1_SG2 if Q only
+         */
+        dopc = (desc->dst_cnt == DMA_DEST_MAX_NUM) ?
+                DMA_CDB_OPC_MULTICAST : DMA_CDB_OPC_MV_SG1_SG2;
+
+        list_for_each_entry(iter, &desc->group_list, chain_node) {
+                hw_desc = iter->hw_desc;
+                memset(iter->hw_desc, 0, sizeof(struct dma_cdb));
+
+                if (likely(!list_is_last(&iter->chain_node,
+                                &desc->group_list))) {
+                        /* set 'next' pointer */
+                        iter->hw_next = list_entry(iter->chain_node.next,
+                                struct ppc440spe_adma_desc_slot, chain_node);
+                        clear_bit(PPC440SPE_DESC_INT, &iter->flags);
+                } else {
+                        /* this is the last descriptor.
+                         * this slot will be pasted from ADMA level
+                         * each time it wants to configure parameters
+                         * of the transaction (src, dst, ...)
+                         */
+                        iter->hw_next = NULL;
+                        if (flags & DMA_PREP_INTERRUPT)
+                                set_bit(PPC440SPE_DESC_INT, &iter->flags);
+                        else
+                                clear_bit(PPC440SPE_DESC_INT, &iter->flags);
+                }
+        }
+
+        /* Set OPS depending on WXOR/RXOR type of operation */
+        if (!test_bit(PPC440SPE_DESC_RXOR, &desc->flags)) {
+                /* This is a WXOR only chain:
+                 * - first descriptors are for zeroing destinations
+                 *   if PPC440SPE_ZERO_P/Q set;
+                 * - descriptors remained are for GF-XOR operations.
+                 */
+                iter = list_first_entry(&desc->group_list,
+                                        struct ppc440spe_adma_desc_slot,
+                                        chain_node);
+
+                if (test_bit(PPC440SPE_ZERO_P, &desc->flags)) {
+                        hw_desc = iter->hw_desc;
+                        hw_desc->opc = DMA_CDB_OPC_MV_SG1_SG2;
+                        iter = list_first_entry(&iter->chain_node,
+                                        struct ppc440spe_adma_desc_slot,
+                                        chain_node);
+                }
+
+                if (test_bit(PPC440SPE_ZERO_Q, &desc->flags)) {
+                        hw_desc = iter->hw_desc;
+                        hw_desc->opc = DMA_CDB_OPC_MV_SG1_SG2;
+                        iter = list_first_entry(&iter->chain_node,
+                                        struct ppc440spe_adma_desc_slot,
+                                        chain_node);
+                }
+
+                list_for_each_entry_from(iter, &desc->group_list, chain_node) {
+                        hw_desc = iter->hw_desc;
+                        hw_desc->opc = dopc;
+                }
+        } else {
+                /* This is either RXOR-only or mixed RXOR/WXOR */
+
+                /* The first 1 or 2 slots in chain are always RXOR,
+                 * if need to calculate P & Q, then there are two
+                 * RXOR slots; if only P or only Q, then there is one
+                 */
+                iter = list_first_entry(&desc->group_list,
+                                        struct ppc440spe_adma_desc_slot,
+                                        chain_node);
+                hw_desc = iter->hw_desc;
+                hw_desc->opc = DMA_CDB_OPC_MV_SG1_SG2;
+
+                if (desc->dst_cnt == DMA_DEST_MAX_NUM) {
+                        iter = list_first_entry(&iter->chain_node,
+                                                struct ppc440spe_adma_desc_slot,
+                                                chain_node);
+                        hw_desc = iter->hw_desc;
+                        hw_desc->opc = DMA_CDB_OPC_MV_SG1_SG2;
+                }
+
+                /* The remaining descs (if any) are WXORs */
+                if (test_bit(PPC440SPE_DESC_WXOR, &desc->flags)) {
+                        iter = list_first_entry(&iter->chain_node,
+                                                struct ppc440spe_adma_desc_slot,
+                                                chain_node);
+                        list_for_each_entry_from(iter, &desc->group_list,
+                                                chain_node) {
+                                hw_desc = iter->hw_desc;
+                                hw_desc->opc = dopc;
+                        }
+                }
+        }
+}
+
+/**
+ * ppc440spe_desc_init_dma01pqzero_sum - initialize the descriptor
+ * for PQ_ZERO_SUM operation
+ */
+static void ppc440spe_desc_init_dma01pqzero_sum(
+                                struct ppc440spe_adma_desc_slot *desc,
+                                int dst_cnt, int src_cnt)
+{
+        struct dma_cdb *hw_desc;
+        struct ppc440spe_adma_desc_slot *iter;
+        int i = 0;
+        u8 dopc = (dst_cnt == 2) ? DMA_CDB_OPC_MULTICAST :
+                                   DMA_CDB_OPC_MV_SG1_SG2;
+        /*
+         * Initialize starting from 2nd or 3rd descriptor dependent
+         * on dst_cnt. First one or two slots are for cloning P
+         * and/or Q to chan->pdest and/or chan->qdest as we have
+         * to preserve original P/Q.
+         */
+        iter = list_first_entry(&desc->group_list,
+                                struct ppc440spe_adma_desc_slot, chain_node);
+        iter = list_entry(iter->chain_node.next,
+                          struct ppc440spe_adma_desc_slot, chain_node);
+
+        if (dst_cnt > 1) {
+                iter = list_entry(iter->chain_node.next,
+                                  struct ppc440spe_adma_desc_slot, chain_node);
+        }
+        /* initialize each source descriptor in chain */
+        list_for_each_entry_from(iter, &desc->group_list, chain_node) {
+                hw_desc = iter->hw_desc;
+                memset(iter->hw_desc, 0, sizeof(struct dma_cdb));
+                iter->src_cnt = 0;
+                iter->dst_cnt = 0;
+
+                /* This is a ZERO_SUM operation:
+                 * - <src_cnt> descriptors starting from 2nd or 3rd
+                 *   descriptor are for GF-XOR operations;
+                 * - remaining <dst_cnt> descriptors are for checking the result
+                 */
+                if (i++ < src_cnt)
+                        /* MV_SG1_SG2 if only Q is being verified
+                         * MULTICAST if both P and Q are being verified
+                         */
+                        hw_desc->opc = dopc;
+                else
+                        /* DMA_CDB_OPC_DCHECK128 operation */
+                        hw_desc->opc = DMA_CDB_OPC_DCHECK128;
+
+                if (likely(!list_is_last(&iter->chain_node,
+                                         &desc->group_list))) {
+                        /* set 'next' pointer */
+                        iter->hw_next = list_entry(iter->chain_node.next,
+                                                struct ppc440spe_adma_desc_slot,
+                                                chain_node);
+                } else {
+                        /* this is the last descriptor.
+                         * this slot will be pasted from ADMA level
+                         * each time it wants to configure parameters
+                         * of the transaction (src, dst, ...)
+                         */
+                        iter->hw_next = NULL;
+                        /* always enable interrupt generation since we get
+                         * the status of pqzero from the handler
+                         */
+                        set_bit(PPC440SPE_DESC_INT, &iter->flags);
+                }
+        }
+        desc->src_cnt = src_cnt;
+        desc->dst_cnt = dst_cnt;
+}
+
+/**
+ * ppc440spe_desc_init_memcpy - initialize the descriptor for MEMCPY operation
+ */
+static void ppc440spe_desc_init_memcpy(struct ppc440spe_adma_desc_slot *desc,
+                                        unsigned long flags)
+{
+        struct dma_cdb *hw_desc = desc->hw_desc;
+
+        memset(desc->hw_desc, 0, sizeof(struct dma_cdb));
+        desc->hw_next = NULL;
+        desc->src_cnt = 1;
+        desc->dst_cnt = 1;
+
+        if (flags & DMA_PREP_INTERRUPT)
+                set_bit(PPC440SPE_DESC_INT, &desc->flags);
+        else
+                clear_bit(PPC440SPE_DESC_INT, &desc->flags);
+
+        hw_desc->opc = DMA_CDB_OPC_MV_SG1_SG2;
+}
+
+/**
+ * ppc440spe_desc_init_memset - initialize the descriptor for MEMSET operation
+ */
+static void ppc440spe_desc_init_memset(struct ppc440spe_adma_desc_slot *desc,
+                                        int value, unsigned long flags)
+{
+        struct dma_cdb *hw_desc = desc->hw_desc;
+
+        memset(desc->hw_desc, 0, sizeof(struct dma_cdb));
+        desc->hw_next = NULL;
+        desc->src_cnt = 1;
+        desc->dst_cnt = 1;
+
+        if (flags & DMA_PREP_INTERRUPT)
+                set_bit(PPC440SPE_DESC_INT, &desc->flags);
+        else
+                clear_bit(PPC440SPE_DESC_INT, &desc->flags);
+
+        hw_desc->sg1u = hw_desc->sg1l = cpu_to_le32((u32)value);
+        hw_desc->sg3u = hw_desc->sg3l = cpu_to_le32((u32)value);
+        hw_desc->opc = DMA_CDB_OPC_DFILL128;
+}
+
+/**
+ * ppc440spe_desc_set_src_addr - set source address into the descriptor
+ */
+static void ppc440spe_desc_set_src_addr(struct ppc440spe_adma_desc_slot *desc,
+                                        struct ppc440spe_adma_chan *chan,
+                                        int src_idx, dma_addr_t addrh,
+                                        dma_addr_t addrl)
+{
+        struct dma_cdb *dma_hw_desc;
+        struct xor_cb *xor_hw_desc;
+        phys_addr_t addr64, tmplow, tmphi;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                if (!addrh) {
+                        addr64 = addrl;
+                        tmphi = (addr64 >> 32);
+                        tmplow = (addr64 & 0xFFFFFFFF);
+                } else {
+                        tmphi = addrh;
+                        tmplow = addrl;
+                }
+                dma_hw_desc = desc->hw_desc;
+                dma_hw_desc->sg1l = cpu_to_le32((u32)tmplow);
+                dma_hw_desc->sg1u |= cpu_to_le32((u32)tmphi);
+                break;
+        case PPC440SPE_XOR_ID:
+                xor_hw_desc = desc->hw_desc;
+                xor_hw_desc->ops[src_idx].l = addrl;
+                xor_hw_desc->ops[src_idx].h |= addrh;
+                break;
+        }
+}
+
+/**
+ * ppc440spe_desc_set_src_mult - set source address mult into the descriptor
+ */
+static void ppc440spe_desc_set_src_mult(struct ppc440spe_adma_desc_slot *desc,
+                        struct ppc440spe_adma_chan *chan, u32 mult_index,
+                        int sg_index, unsigned char mult_value)
+{
+        struct dma_cdb *dma_hw_desc;
+        struct xor_cb *xor_hw_desc;
+        u32 *psgu;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                dma_hw_desc = desc->hw_desc;
+
+                switch (sg_index) {
+                /* for RXOR operations set multiplier
+                 * into source cued address
+                 */
+                case DMA_CDB_SG_SRC:
+                        psgu = &dma_hw_desc->sg1u;
+                        break;
+                /* for WXOR operations set multiplier
+                 * into destination cued address(es)
+                 */
+                case DMA_CDB_SG_DST1:
+                        psgu = &dma_hw_desc->sg2u;
+                        break;
+                case DMA_CDB_SG_DST2:
+                        psgu = &dma_hw_desc->sg3u;
+                        break;
+                default:
+                        BUG();
+                }
+
+                *psgu |= cpu_to_le32(mult_value << mult_index);
+                break;
+        case PPC440SPE_XOR_ID:
+                xor_hw_desc = desc->hw_desc;
+                break;
+        default:
+                BUG();
+        }
+}
+
+/**
+ * ppc440spe_desc_set_dest_addr - set destination address into the descriptor
+ */
+static void ppc440spe_desc_set_dest_addr(struct ppc440spe_adma_desc_slot *desc,
+                                struct ppc440spe_adma_chan *chan,
+                                dma_addr_t addrh, dma_addr_t addrl,
+                                u32 dst_idx)
+{
+        struct dma_cdb *dma_hw_desc;
+        struct xor_cb *xor_hw_desc;
+        phys_addr_t addr64, tmphi, tmplow;
+        u32 *psgu, *psgl;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                if (!addrh) {
+                        addr64 = addrl;
+                        tmphi = (addr64 >> 32);
+                        tmplow = (addr64 & 0xFFFFFFFF);
+                } else {
+                        tmphi = addrh;
+                        tmplow = addrl;
+                }
+                dma_hw_desc = desc->hw_desc;
+
+                psgu = dst_idx ? &dma_hw_desc->sg3u : &dma_hw_desc->sg2u;
+                psgl = dst_idx ? &dma_hw_desc->sg3l : &dma_hw_desc->sg2l;
+
+                *psgl = cpu_to_le32((u32)tmplow);
+                *psgu |= cpu_to_le32((u32)tmphi);
+                break;
+        case PPC440SPE_XOR_ID:
+                xor_hw_desc = desc->hw_desc;
+                xor_hw_desc->cbtal = addrl;
+                xor_hw_desc->cbtah |= addrh;
+                break;
+        }
+}
+
+/**
+ * ppc440spe_desc_set_byte_count - set number of data bytes involved
+ * into the operation
+ */
+static void ppc440spe_desc_set_byte_count(struct ppc440spe_adma_desc_slot *desc,
+                                struct ppc440spe_adma_chan *chan,
+                                u32 byte_count)
+{
+        struct dma_cdb *dma_hw_desc;
+        struct xor_cb *xor_hw_desc;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                dma_hw_desc = desc->hw_desc;
+                dma_hw_desc->cnt = cpu_to_le32(byte_count);
+                break;
+        case PPC440SPE_XOR_ID:
+                xor_hw_desc = desc->hw_desc;
+                xor_hw_desc->cbbc = byte_count;
+                break;
+        }
+}
+
+/**
+ * ppc440spe_desc_set_rxor_block_size - set RXOR block size
+ */
+static inline void ppc440spe_desc_set_rxor_block_size(u32 byte_count)
+{
+        /* assume that byte_count is aligned on the 512-boundary;
+         * thus write it directly to the register (bits 23:31 are
+         * reserved there).
+         */
+        dcr_write(ppc440spe_mq_dcr_host, DCRN_MQ0_CF2H, byte_count);
+}
+
+/**
+ * ppc440spe_desc_set_dcheck - set CHECK pattern
+ */
+static void ppc440spe_desc_set_dcheck(struct ppc440spe_adma_desc_slot *desc,
+                                struct ppc440spe_adma_chan *chan, u8 *qword)
+{
+        struct dma_cdb *dma_hw_desc;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                dma_hw_desc = desc->hw_desc;
+                iowrite32(qword[0], &dma_hw_desc->sg3l);
+                iowrite32(qword[4], &dma_hw_desc->sg3u);
+                iowrite32(qword[8], &dma_hw_desc->sg2l);
+                iowrite32(qword[12], &dma_hw_desc->sg2u);
+                break;
+        default:
+                BUG();
+        }
+}
+
+/**
+ * ppc440spe_xor_set_link - set link address in xor CB
+ */
+static void ppc440spe_xor_set_link(struct ppc440spe_adma_desc_slot *prev_desc,
+                                struct ppc440spe_adma_desc_slot *next_desc)
+{
+        struct xor_cb *xor_hw_desc = prev_desc->hw_desc;
+
+        if (unlikely(!next_desc || !(next_desc->phys))) {
+                printk(KERN_ERR "%s: next_desc=0x%p; next_desc->phys=0x%llx\n",
+                        __func__, next_desc,
+                        next_desc ? next_desc->phys : 0);
+                BUG();
+        }
+
+        xor_hw_desc->cbs = 0;
+        xor_hw_desc->cblal = next_desc->phys;
+        xor_hw_desc->cblah = 0;
+        xor_hw_desc->cbc |= XOR_CBCR_LNK_BIT;
+}
+
+/**
+ * ppc440spe_desc_set_link - set the address of descriptor following this
+ * descriptor in chain
+ */
+static void ppc440spe_desc_set_link(struct ppc440spe_adma_chan *chan,
+                                struct ppc440spe_adma_desc_slot *prev_desc,
+                                struct ppc440spe_adma_desc_slot *next_desc)
+{
+        unsigned long flags;
+        struct ppc440spe_adma_desc_slot *tail = next_desc;
+
+        if (unlikely(!prev_desc || !next_desc ||
+                (prev_desc->hw_next && prev_desc->hw_next != next_desc))) {
+                /* If previous next is overwritten something is wrong.
+                 * though we may refetch from append to initiate list
+                 * processing; in this case - it's ok.
+                 */
+                printk(KERN_ERR "%s: prev_desc=0x%p; next_desc=0x%p; "
+                        "prev->hw_next=0x%p\n", __func__, prev_desc,
+                        next_desc, prev_desc ? prev_desc->hw_next : 0);
+                BUG();
+        }
+
+        local_irq_save(flags);
+
+        /* do s/w chaining both for DMA and XOR descriptors */
+        prev_desc->hw_next = next_desc;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                break;
+        case PPC440SPE_XOR_ID:
+                /* bind descriptor to the chain */
+                while (tail->hw_next)
+                        tail = tail->hw_next;
+                xor_last_linked = tail;
+
+                if (prev_desc == xor_last_submit)
+                        /* do not link to the last submitted CB */
+                        break;
+                ppc440spe_xor_set_link(prev_desc, next_desc);
+                break;
+        }
+
+        local_irq_restore(flags);
+}
+
+/**
+ * ppc440spe_desc_get_src_addr - extract the source address from the descriptor
+ */
+static u32 ppc440spe_desc_get_src_addr(struct ppc440spe_adma_desc_slot *desc,
+                                struct ppc440spe_adma_chan *chan, int src_idx)
+{
+        struct dma_cdb *dma_hw_desc;
+        struct xor_cb *xor_hw_desc;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                dma_hw_desc = desc->hw_desc;
+                /* May have 0, 1, 2, or 3 sources */
+                switch (dma_hw_desc->opc) {
+                case DMA_CDB_OPC_NO_OP:
+                case DMA_CDB_OPC_DFILL128:
+                        return 0;
+                case DMA_CDB_OPC_DCHECK128:
+                        if (unlikely(src_idx)) {
+                                printk(KERN_ERR "%s: try to get %d source for"
+                                    " DCHECK128\n", __func__, src_idx);
+                                BUG();
+                        }
+                        return le32_to_cpu(dma_hw_desc->sg1l);
+                case DMA_CDB_OPC_MULTICAST:
+                case DMA_CDB_OPC_MV_SG1_SG2:
+                        if (unlikely(src_idx > 2)) {
+                                printk(KERN_ERR "%s: try to get %d source from"
+                                    " DMA descr\n", __func__, src_idx);
+                                BUG();
+                        }
+                        if (src_idx) {
+                                if (le32_to_cpu(dma_hw_desc->sg1u) &
+                                    DMA_CUED_XOR_WIN_MSK) {
+                                        u8 region;
+
+                                        if (src_idx == 1)
+                                                return le32_to_cpu(
+                                                    dma_hw_desc->sg1l) +
+                                                        desc->unmap_len;
+
+                                        region = (le32_to_cpu(
+                                            dma_hw_desc->sg1u)) >>
+                                                DMA_CUED_REGION_OFF;
+
+                                        region &= DMA_CUED_REGION_MSK;
+                                        switch (region) {
+                                        case DMA_RXOR123:
+                                                return le32_to_cpu(
+                                                    dma_hw_desc->sg1l) +
+                                                        (desc->unmap_len << 1);
+                                        case DMA_RXOR124:
+                                                return le32_to_cpu(
+                                                    dma_hw_desc->sg1l) +
+                                                        (desc->unmap_len * 3);
+                                        case DMA_RXOR125:
+                                                return le32_to_cpu(
+                                                    dma_hw_desc->sg1l) +
+                                                        (desc->unmap_len << 2);
+                                        default:
+                                                printk(KERN_ERR
+                                                    "%s: try to"
+                                                    " get src3 for region %02x"
+                                                    "PPC440SPE_DESC_RXOR12?\n",
+                                                    __func__, region);
+                                                BUG();
+                                        }
+                                } else {
+                                        printk(KERN_ERR
+                                                "%s: try to get %d"
+                                                " source for non-cued descr\n",
+                                                __func__, src_idx);
+                                        BUG();
+                                }
+                        }
+                        return le32_to_cpu(dma_hw_desc->sg1l);
+                default:
+                        printk(KERN_ERR "%s: unknown OPC 0x%02x\n",
+                                __func__, dma_hw_desc->opc);
+                        BUG();
+                }
+                return le32_to_cpu(dma_hw_desc->sg1l);
+        case PPC440SPE_XOR_ID:
+                /* May have up to 16 sources */
+                xor_hw_desc = desc->hw_desc;
+                return xor_hw_desc->ops[src_idx].l;
+        }
+        return 0;
+}
+
+/**
+ * ppc440spe_desc_get_dest_addr - extract the destination address from the
+ * descriptor
+ */
+static u32 ppc440spe_desc_get_dest_addr(struct ppc440spe_adma_desc_slot *desc,
+                                struct ppc440spe_adma_chan *chan, int idx)
+{
+        struct dma_cdb *dma_hw_desc;
+        struct xor_cb *xor_hw_desc;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                dma_hw_desc = desc->hw_desc;
+
+                if (likely(!idx))
+                        return le32_to_cpu(dma_hw_desc->sg2l);
+                return le32_to_cpu(dma_hw_desc->sg3l);
+        case PPC440SPE_XOR_ID:
+                xor_hw_desc = desc->hw_desc;
+                return xor_hw_desc->cbtal;
+        }
+        return 0;
+}
+
+/**
+ * ppc440spe_desc_get_src_num - extract the number of source addresses from
+ * the descriptor
+ */
+static u32 ppc440spe_desc_get_src_num(struct ppc440spe_adma_desc_slot *desc,
+                                struct ppc440spe_adma_chan *chan)
+{
+        struct dma_cdb *dma_hw_desc;
+        struct xor_cb *xor_hw_desc;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                dma_hw_desc = desc->hw_desc;
+
+                switch (dma_hw_desc->opc) {
+                case DMA_CDB_OPC_NO_OP:
+                case DMA_CDB_OPC_DFILL128:
+                        return 0;
+                case DMA_CDB_OPC_DCHECK128:
+                        return 1;
+                case DMA_CDB_OPC_MV_SG1_SG2:
+                case DMA_CDB_OPC_MULTICAST:
+                        /*
+                         * Only for RXOR operations we have more than
+                         * one source
+                         */
+                        if (le32_to_cpu(dma_hw_desc->sg1u) &
+                            DMA_CUED_XOR_WIN_MSK) {
+                                /* RXOR op, there are 2 or 3 sources */
+                                if (((le32_to_cpu(dma_hw_desc->sg1u) >>
+                                    DMA_CUED_REGION_OFF) &
+                                      DMA_CUED_REGION_MSK) == DMA_RXOR12) {
+                                        /* RXOR 1-2 */
+                                        return 2;
+                                } else {
+                                        /* RXOR 1-2-3/1-2-4/1-2-5 */
+                                        return 3;
+                                }
+                        }
+                        return 1;
+                default:
+                        printk(KERN_ERR "%s: unknown OPC 0x%02x\n",
+                                __func__, dma_hw_desc->opc);
+                        BUG();
+                }
+        case PPC440SPE_XOR_ID:
+                /* up to 16 sources */
+                xor_hw_desc = desc->hw_desc;
+                return xor_hw_desc->cbc & XOR_CDCR_OAC_MSK;
+        default:
+                BUG();
+        }
+        return 0;
+}
+
+/**
+ * ppc440spe_desc_get_dst_num - get the number of destination addresses in
+ * this descriptor
+ */
+static u32 ppc440spe_desc_get_dst_num(struct ppc440spe_adma_desc_slot *desc,
+                                struct ppc440spe_adma_chan *chan)
+{
+        struct dma_cdb *dma_hw_desc;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                /* May be 1 or 2 destinations */
+                dma_hw_desc = desc->hw_desc;
+                switch (dma_hw_desc->opc) {
+                case DMA_CDB_OPC_NO_OP:
+                case DMA_CDB_OPC_DCHECK128:
+                        return 0;
+                case DMA_CDB_OPC_MV_SG1_SG2:
+                case DMA_CDB_OPC_DFILL128:
+                        return 1;
+                case DMA_CDB_OPC_MULTICAST:
+                        if (desc->dst_cnt == 2)
+                                return 2;
+                        else
+                                return 1;
+                default:
+                        printk(KERN_ERR "%s: unknown OPC 0x%02x\n",
+                                __func__, dma_hw_desc->opc);
+                        BUG();
+                }
+        case PPC440SPE_XOR_ID:
+                /* Always only 1 destination */
+                return 1;
+        default:
+                BUG();
+        }
+        return 0;
+}
+
+/**
+ * ppc440spe_desc_get_link - get the address of the descriptor that
+ * follows this one
+ */
+static inline u32 ppc440spe_desc_get_link(struct ppc440spe_adma_desc_slot *desc,
+                                        struct ppc440spe_adma_chan *chan)
+{
+        if (!desc->hw_next)
+                return 0;
+
+        return desc->hw_next->phys;
+}
+
+/**
+ * ppc440spe_desc_is_aligned - check alignment
+ */
+static inline int ppc440spe_desc_is_aligned(
+        struct ppc440spe_adma_desc_slot *desc, int num_slots)
+{
+        return (desc->idx & (num_slots - 1)) ? 0 : 1;
+}
+
+/**
+ * ppc440spe_chan_xor_slot_count - get the number of slots necessary for
+ * XOR operation
+ */
+static int ppc440spe_chan_xor_slot_count(size_t len, int src_cnt,
+                        int *slots_per_op)
+{
+        int slot_cnt;
+
+        /* each XOR descriptor provides up to 16 source operands */
+        slot_cnt = *slots_per_op = (src_cnt + XOR_MAX_OPS - 1)/XOR_MAX_OPS;
+
+        if (likely(len <= PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT))
+                return slot_cnt;
+
+        printk(KERN_ERR "%s: len %d > max %d !!\n",
+                __func__, len, PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT);
+        BUG();
+        return slot_cnt;
+}
+
+/**
+ * ppc440spe_dma2_pq_slot_count - get the number of slots necessary for
+ * DMA2 PQ operation
+ */
+static int ppc440spe_dma2_pq_slot_count(dma_addr_t *srcs,
+                int src_cnt, size_t len)
+{
+        signed long long order = 0;
+        int state = 0;
+        int addr_count = 0;
+        int i;
+        for (i = 1; i < src_cnt; i++) {
+                dma_addr_t cur_addr = srcs[i];
+                dma_addr_t old_addr = srcs[i-1];
+                switch (state) {
+                case 0:
+                        if (cur_addr == old_addr + len) {
+                                /* direct RXOR */
+                                order = 1;
+                                state = 1;
+                                if (i == src_cnt-1)
+                                        addr_count++;
+                        } else if (old_addr == cur_addr + len) {
+                                /* reverse RXOR */
+                                order = -1;
+                                state = 1;
+                                if (i == src_cnt-1)
+                                        addr_count++;
+                        } else {
+                                state = 3;
+                        }
+                        break;
+                case 1:
+                        if (i == src_cnt-2 || (order == -1
+                                && cur_addr != old_addr - len)) {
+                                order = 0;
+                                state = 0;
+                                addr_count++;
+                        } else if (cur_addr == old_addr + len*order) {
+                                state = 2;
+                                if (i == src_cnt-1)
+                                        addr_count++;
+                        } else if (cur_addr == old_addr + 2*len) {
+                                state = 2;
+                                if (i == src_cnt-1)
+                                        addr_count++;
+                        } else if (cur_addr == old_addr + 3*len) {
+                                state = 2;
+                                if (i == src_cnt-1)
+                                        addr_count++;
+                        } else {
+                                order = 0;
+                                state = 0;
+                                addr_count++;
+                        }
+                        break;
+                case 2:
+                        order = 0;
+                        state = 0;
+                        addr_count++;
+                                break;
+                }
+                if (state == 3)
+                        break;
+        }
+        if (src_cnt <= 1 || (state != 1 && state != 2)) {
+                pr_err("%s: src_cnt=%d, state=%d, addr_count=%d, order=%lld\n",
+                        __func__, src_cnt, state, addr_count, order);
+                for (i = 0; i < src_cnt; i++)
+                        pr_err("\t[%d] 0x%llx \n", i, srcs[i]);
+                BUG();
+        }
+
+        return (addr_count + XOR_MAX_OPS - 1) / XOR_MAX_OPS;
+}
+
+
+/******************************************************************************
+ * ADMA channel low-level routines
+ ******************************************************************************/
+
+static u32
+ppc440spe_chan_get_current_descriptor(struct ppc440spe_adma_chan *chan);
+static void ppc440spe_chan_append(struct ppc440spe_adma_chan *chan);
+
+/**
+ * ppc440spe_adma_device_clear_eot_status - interrupt ack to XOR or DMA engine
+ */
+static void ppc440spe_adma_device_clear_eot_status(
+                                        struct ppc440spe_adma_chan *chan)
+{
+        struct dma_regs *dma_reg;
+        struct xor_regs *xor_reg;
+        u8 *p = chan->device->dma_desc_pool_virt;
+        struct dma_cdb *cdb;
+        u32 rv, i;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                /* read FIFO to ack */
+                dma_reg = chan->device->dma_reg;
+                while ((rv = ioread32(&dma_reg->csfpl))) {
+                        i = rv & DMA_CDB_ADDR_MSK;
+                        cdb = (struct dma_cdb *)&p[i -
+                            (u32)chan->device->dma_desc_pool];
+
+                        /* Clear opcode to ack. This is necessary for
+                         * ZeroSum operations only
+                         */
+                        cdb->opc = 0;
+
+                        if (test_bit(PPC440SPE_RXOR_RUN,
+                            &ppc440spe_rxor_state)) {
+                                /* probably this is a completed RXOR op,
+                                 * get pointer to CDB using the fact that
+                                 * physical and virtual addresses of CDB
+                                 * in pools have the same offsets
+                                 */
+                                if (le32_to_cpu(cdb->sg1u) &
+                                    DMA_CUED_XOR_BASE) {
+                                        /* this is a RXOR */
+                                        clear_bit(PPC440SPE_RXOR_RUN,
+                                                  &ppc440spe_rxor_state);
+                                }
+                        }
+
+                        if (rv & DMA_CDB_STATUS_MSK) {
+                                /* ZeroSum check failed
+                                 */
+                                struct ppc440spe_adma_desc_slot *iter;
+                                dma_addr_t phys = rv & ~DMA_CDB_MSK;
+
+                                /*
+                                 * Update the status of corresponding
+                                 * descriptor.
+                                 */
+                                list_for_each_entry(iter, &chan->chain,
+                                    chain_node) {
+                                        if (iter->phys == phys)
+                                                break;
+                                }
+                                /*
+                                 * if cannot find the corresponding
+                                 * slot it's a bug
+                                 */
+                                BUG_ON(&iter->chain_node == &chan->chain);
+
+                                if (iter->xor_check_result) {
+                                        if (test_bit(PPC440SPE_DESC_PCHECK,
+                                                     &iter->flags)) {
+                                                *iter->xor_check_result |=
+                                                        SUM_CHECK_P_RESULT;
+                                        } else
+                                        if (test_bit(PPC440SPE_DESC_QCHECK,
+                                                     &iter->flags)) {
+                                                *iter->xor_check_result |=
+                                                        SUM_CHECK_Q_RESULT;
+                                        } else
+                                                BUG();
+                                }
+                        }
+                }
+
+                rv = ioread32(&dma_reg->dsts);
+                if (rv) {
+                        pr_err("DMA%d err status: 0x%x\n",
+                               chan->device->id, rv);
+                        /* write back to clear */
+                        iowrite32(rv, &dma_reg->dsts);
+                }
+                break;
+        case PPC440SPE_XOR_ID:
+                /* reset status bits to ack */
+                xor_reg = chan->device->xor_reg;
+                rv = ioread32be(&xor_reg->sr);
+                iowrite32be(rv, &xor_reg->sr);
+
+                if (rv & (XOR_IE_ICBIE_BIT|XOR_IE_ICIE_BIT|XOR_IE_RPTIE_BIT)) {
+                        if (rv & XOR_IE_RPTIE_BIT) {
+                                /* Read PLB Timeout Error.
+                                 * Try to resubmit the CB
+                                 */
+                                u32 val = ioread32be(&xor_reg->ccbalr);
+
+                                iowrite32be(val, &xor_reg->cblalr);
+
+                                val = ioread32be(&xor_reg->crsr);
+                                iowrite32be(val | XOR_CRSR_XAE_BIT,
+                                            &xor_reg->crsr);
+                        } else
+                                pr_err("XOR ERR 0x%x status\n", rv);
+                        break;
+                }
+
+                /*  if the XORcore is idle, but there are unprocessed CBs
+                 * then refetch the s/w chain here
+                 */
+                if (!(ioread32be(&xor_reg->sr) & XOR_SR_XCP_BIT) &&
+                    do_xor_refetch)
+                        ppc440spe_chan_append(chan);
+                break;
+        }
+}
+
+/**
+ * ppc440spe_chan_is_busy - get the channel status
+ */
+static int ppc440spe_chan_is_busy(struct ppc440spe_adma_chan *chan)
+{
+        struct dma_regs *dma_reg;
+        struct xor_regs *xor_reg;
+        int busy = 0;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                dma_reg = chan->device->dma_reg;
+                /*  if command FIFO's head and tail pointers are equal and
+                 * status tail is the same as command, then channel is free
+                 */
+                if (ioread16(&dma_reg->cpfhp) != ioread16(&dma_reg->cpftp) ||
+                    ioread16(&dma_reg->cpftp) != ioread16(&dma_reg->csftp))
+                        busy = 1;
+                break;
+        case PPC440SPE_XOR_ID:
+                /* use the special status bit for the XORcore
+                 */
+                xor_reg = chan->device->xor_reg;
+                busy = (ioread32be(&xor_reg->sr) & XOR_SR_XCP_BIT) ? 1 : 0;
+                break;
+        }
+
+        return busy;
+}
+
+/**
+ * ppc440spe_chan_set_first_xor_descriptor -  init XORcore chain
+ */
+static void ppc440spe_chan_set_first_xor_descriptor(
+                                struct ppc440spe_adma_chan *chan,
+                                struct ppc440spe_adma_desc_slot *next_desc)
+{
+        struct xor_regs *xor_reg = chan->device->xor_reg;
+
+        if (ioread32be(&xor_reg->sr) & XOR_SR_XCP_BIT)
+                printk(KERN_INFO "%s: Warn: XORcore is running "
+                        "when try to set the first CDB!\n",
+                        __func__);
+
+        xor_last_submit = xor_last_linked = next_desc;
+
+        iowrite32be(XOR_CRSR_64BA_BIT, &xor_reg->crsr);
+
+        iowrite32be(next_desc->phys, &xor_reg->cblalr);
+        iowrite32be(0, &xor_reg->cblahr);
+        iowrite32be(ioread32be(&xor_reg->cbcr) | XOR_CBCR_LNK_BIT,
+                    &xor_reg->cbcr);
+
+        chan->hw_chain_inited = 1;
+}
+
+/**
+ * ppc440spe_dma_put_desc - put DMA0,1 descriptor to FIFO.
+ * called with irqs disabled
+ */
+static void ppc440spe_dma_put_desc(struct ppc440spe_adma_chan *chan,
+                struct ppc440spe_adma_desc_slot *desc)
+{
+        u32 pcdb;
+        struct dma_regs *dma_reg = chan->device->dma_reg;
+
+        pcdb = desc->phys;
+        if (!test_bit(PPC440SPE_DESC_INT, &desc->flags))
+                pcdb |= DMA_CDB_NO_INT;
+
+        chan_last_sub[chan->device->id] = desc;
+
+        ADMA_LL_DBG(print_cb(chan, desc->hw_desc));
+
+        iowrite32(pcdb, &dma_reg->cpfpl);
+}
+
+/**
+ * ppc440spe_chan_append - update the h/w chain in the channel
+ */
+static void ppc440spe_chan_append(struct ppc440spe_adma_chan *chan)
+{
+        struct xor_regs *xor_reg;
+        struct ppc440spe_adma_desc_slot *iter;
+        struct xor_cb *xcb;
+        u32 cur_desc;
+        unsigned long flags;
+
+        local_irq_save(flags);
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                cur_desc = ppc440spe_chan_get_current_descriptor(chan);
+
+                if (likely(cur_desc)) {
+                        iter = chan_last_sub[chan->device->id];
+                        BUG_ON(!iter);
+                } else {
+                        /* first peer */
+                        iter = chan_first_cdb[chan->device->id];
+                        BUG_ON(!iter);
+                        ppc440spe_dma_put_desc(chan, iter);
+                        chan->hw_chain_inited = 1;
+                }
+
+                /* is there something new to append */
+                if (!iter->hw_next)
+                        break;
+
+                /* flush descriptors from the s/w queue to fifo */
+                list_for_each_entry_continue(iter, &chan->chain, chain_node) {
+                        ppc440spe_dma_put_desc(chan, iter);
+                        if (!iter->hw_next)
+                                break;
+                }
+                break;
+        case PPC440SPE_XOR_ID:
+                /* update h/w links and refetch */
+                if (!xor_last_submit->hw_next)
+                        break;
+
+                xor_reg = chan->device->xor_reg;
+                /* the last linked CDB has to generate an interrupt
+                 * that we'd be able to append the next lists to h/w
+                 * regardless of the XOR engine state at the moment of
+                 * appending of these next lists
+                 */
+                xcb = xor_last_linked->hw_desc;
+                xcb->cbc |= XOR_CBCR_CBCE_BIT;
+
+                if (!(ioread32be(&xor_reg->sr) & XOR_SR_XCP_BIT)) {
+                        /* XORcore is idle. Refetch now */
+                        do_xor_refetch = 0;
+                        ppc440spe_xor_set_link(xor_last_submit,
+                                xor_last_submit->hw_next);
+
+                        ADMA_LL_DBG(print_cb_list(chan,
+                                xor_last_submit->hw_next));
+
+                        xor_last_submit = xor_last_linked;
+                        iowrite32be(ioread32be(&xor_reg->crsr) |
+                                    XOR_CRSR_RCBE_BIT | XOR_CRSR_64BA_BIT,
+                                    &xor_reg->crsr);
+                } else {
+                        /* XORcore is running. Refetch later in the handler */
+                        do_xor_refetch = 1;
+                }
+
+                break;
+        }
+
+        local_irq_restore(flags);
+}
+
+/**
+ * ppc440spe_chan_get_current_descriptor - get the currently executed descriptor
+ */
+static u32
+ppc440spe_chan_get_current_descriptor(struct ppc440spe_adma_chan *chan)
+{
+        struct dma_regs *dma_reg;
+        struct xor_regs *xor_reg;
+
+        if (unlikely(!chan->hw_chain_inited))
+                /* h/w descriptor chain is not initialized yet */
+                return 0;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                dma_reg = chan->device->dma_reg;
+                return ioread32(&dma_reg->acpl) & (~DMA_CDB_MSK);
+        case PPC440SPE_XOR_ID:
+                xor_reg = chan->device->xor_reg;
+                return ioread32be(&xor_reg->ccbalr);
+        }
+        return 0;
+}
+
+/**
+ * ppc440spe_chan_run - enable the channel
+ */
+static void ppc440spe_chan_run(struct ppc440spe_adma_chan *chan)
+{
+        struct xor_regs *xor_reg;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                /* DMAs are always enabled, do nothing */
+                break;
+        case PPC440SPE_XOR_ID:
+                /* drain write buffer */
+                xor_reg = chan->device->xor_reg;
+
+                /* fetch descriptor pointed to in <link> */
+                iowrite32be(XOR_CRSR_64BA_BIT | XOR_CRSR_XAE_BIT,
+                            &xor_reg->crsr);
+                break;
+        }
+}
+
+/******************************************************************************
+ * ADMA device level
+ ******************************************************************************/
+
+static void ppc440spe_chan_start_null_xor(struct ppc440spe_adma_chan *chan);
+static int ppc440spe_adma_alloc_chan_resources(struct dma_chan *chan);
+
+static dma_cookie_t
+ppc440spe_adma_tx_submit(struct dma_async_tx_descriptor *tx);
+
+static void ppc440spe_adma_set_dest(struct ppc440spe_adma_desc_slot *tx,
+                                    dma_addr_t addr, int index);
+static void
+ppc440spe_adma_memcpy_xor_set_src(struct ppc440spe_adma_desc_slot *tx,
+                                  dma_addr_t addr, int index);
+
+static void
+ppc440spe_adma_pq_set_dest(struct ppc440spe_adma_desc_slot *tx,
+                           dma_addr_t *paddr, unsigned long flags);
+static void
+ppc440spe_adma_pq_set_src(struct ppc440spe_adma_desc_slot *tx,
+                          dma_addr_t addr, int index);
+static void
+ppc440spe_adma_pq_set_src_mult(struct ppc440spe_adma_desc_slot *tx,
+                               unsigned char mult, int index, int dst_pos);
+static void
+ppc440spe_adma_pqzero_sum_set_dest(struct ppc440spe_adma_desc_slot *tx,
+                                   dma_addr_t paddr, dma_addr_t qaddr);
+
+static struct page *ppc440spe_rxor_srcs[32];
+
+/**
+ * ppc440spe_can_rxor - check if the operands may be processed with RXOR
+ */
+static int ppc440spe_can_rxor(struct page **srcs, int src_cnt, size_t len)
+{
+        int i, order = 0, state = 0;
+        int idx = 0;
+
+        if (unlikely(!(src_cnt > 1)))
+                return 0;
+
+        BUG_ON(src_cnt > ARRAY_SIZE(ppc440spe_rxor_srcs));
+
+        /* Skip holes in the source list before checking */
+        for (i = 0; i < src_cnt; i++) {
+                if (!srcs[i])
+                        continue;
+                ppc440spe_rxor_srcs[idx++] = srcs[i];
+        }
+        src_cnt = idx;
+
+        for (i = 1; i < src_cnt; i++) {
+                char *cur_addr = page_address(ppc440spe_rxor_srcs[i]);
+                char *old_addr = page_address(ppc440spe_rxor_srcs[i - 1]);
+
+                switch (state) {
+                case 0:
+                        if (cur_addr == old_addr + len) {
+                                /* direct RXOR */
+                                order = 1;
+                                state = 1;
+                        } else if (old_addr == cur_addr + len) {
+                                /* reverse RXOR */
+                                order = -1;
+                                state = 1;
+                        } else
+                                goto out;
+                        break;
+                case 1:
+                        if ((i == src_cnt - 2) ||
+                            (order == -1 && cur_addr != old_addr - len)) {
+                                order = 0;
+                                state = 0;
+                        } else if ((cur_addr == old_addr + len * order) ||
+                                   (cur_addr == old_addr + 2 * len) ||
+                                   (cur_addr == old_addr + 3 * len)) {
+                                state = 2;
+                        } else {
+                                order = 0;
+                                state = 0;
+                        }
+                        break;
+                case 2:
+                        order = 0;
+                        state = 0;
+                        break;
+                }
+        }
+
+out:
+        if (state == 1 || state == 2)
+                return 1;
+
+        return 0;
+}
+
+/**
+ * ppc440spe_adma_device_estimate - estimate the efficiency of processing
+ *      the operation given on this channel. It's assumed that 'chan' is
+ *      capable to process 'cap' type of operation.
+ * @chan: channel to use
+ * @cap: type of transaction
+ * @dst_lst: array of destination pointers
+ * @dst_cnt: number of destination operands
+ * @src_lst: array of source pointers
+ * @src_cnt: number of source operands
+ * @src_sz: size of each source operand
+ */
+static int ppc440spe_adma_estimate(struct dma_chan *chan,
+        enum dma_transaction_type cap, struct page **dst_lst, int dst_cnt,
+        struct page **src_lst, int src_cnt, size_t src_sz)
+{
+        int ef = 1;
+
+        if (cap == DMA_PQ || cap == DMA_PQ_VAL) {
+                /* If RAID-6 capabilities were not activated don't try
+                 * to use them
+                 */
+                if (unlikely(!ppc440spe_r6_enabled))
+                        return -1;
+        }
+        /*  In the current implementation of ppc440spe ADMA driver it
+         * makes sense to pick out only pq case, because it may be
+         * processed:
+         * (1) either using Biskup method on DMA2;
+         * (2) or on DMA0/1.
+         *  Thus we give a favour to (1) if the sources are suitable;
+         * else let it be processed on one of the DMA0/1 engines.
+         *  In the sum_product case where destination is also the
+         * source process it on DMA0/1 only.
+         */
+        if (cap == DMA_PQ && chan->chan_id == PPC440SPE_XOR_ID) {
+
+                if (dst_cnt == 1 && src_cnt == 2 && dst_lst[0] == src_lst[1])
+                        ef = 0; /* sum_product case, process on DMA0/1 */
+                else if (ppc440spe_can_rxor(src_lst, src_cnt, src_sz))
+                        ef = 3; /* override (DMA0/1 + idle) */
+                else
+                        ef = 0; /* can't process on DMA2 if !rxor */
+        }
+
+        /* channel idleness increases the priority */
+        if (likely(ef) &&
+            !ppc440spe_chan_is_busy(to_ppc440spe_adma_chan(chan)))
+                ef++;
+
+        return ef;
+}
+
+struct dma_chan *
+ppc440spe_async_tx_find_best_channel(enum dma_transaction_type cap,
+        struct page **dst_lst, int dst_cnt, struct page **src_lst,
+        int src_cnt, size_t src_sz)
+{
+        struct dma_chan *best_chan = NULL;
+        struct ppc_dma_chan_ref *ref;
+        int best_rank = -1;
+
+        if (unlikely(!src_sz))
+                return NULL;
+        if (src_sz > PAGE_SIZE) {
+                /*
+                 * should a user of the api ever pass > PAGE_SIZE requests
+                 * we sort out cases where temporary page-sized buffers
+                 * are used.
+                 */
+                switch (cap) {
+                case DMA_PQ:
+                        if (src_cnt == 1 && dst_lst[1] == src_lst[0])
+                                return NULL;
+                        if (src_cnt == 2 && dst_lst[1] == src_lst[1])
+                                return NULL;
+                        break;
+                case DMA_PQ_VAL:
+                case DMA_XOR_VAL:
+                        return NULL;
+                default:
+                        break;
+                }
+        }
+
+        list_for_each_entry(ref, &ppc440spe_adma_chan_list, node) {
+                if (dma_has_cap(cap, ref->chan->device->cap_mask)) {
+                        int rank;
+
+                        rank = ppc440spe_adma_estimate(ref->chan, cap, dst_lst,
+                                        dst_cnt, src_lst, src_cnt, src_sz);
+                        if (rank > best_rank) {
+                                best_rank = rank;
+                                best_chan = ref->chan;
+                        }
+                }
+        }
+
+        return best_chan;
+}
+EXPORT_SYMBOL_GPL(ppc440spe_async_tx_find_best_channel);
+
+/**
+ * ppc440spe_get_group_entry - get group entry with index idx
+ * @tdesc: is the last allocated slot in the group.
+ */
+static struct ppc440spe_adma_desc_slot *
+ppc440spe_get_group_entry(struct ppc440spe_adma_desc_slot *tdesc, u32 entry_idx)
+{
+        struct ppc440spe_adma_desc_slot *iter = tdesc->group_head;
+        int i = 0;
+
+        if (entry_idx < 0 || entry_idx >= (tdesc->src_cnt + tdesc->dst_cnt)) {
+                printk("%s: entry_idx %d, src_cnt %d, dst_cnt %d\n",
+                        __func__, entry_idx, tdesc->src_cnt, tdesc->dst_cnt);
+                BUG();
+        }
+
+        list_for_each_entry(iter, &tdesc->group_list, chain_node) {
+                if (i++ == entry_idx)
+                        break;
+        }
+        return iter;
+}
+
+/**
+ * ppc440spe_adma_free_slots - flags descriptor slots for reuse
+ * @slot: Slot to free
+ * Caller must hold &ppc440spe_chan->lock while calling this function
+ */
+static void ppc440spe_adma_free_slots(struct ppc440spe_adma_desc_slot *slot,
+                                      struct ppc440spe_adma_chan *chan)
+{
+        int stride = slot->slots_per_op;
+
+        while (stride--) {
+                slot->slots_per_op = 0;
+                slot = list_entry(slot->slot_node.next,
+                                struct ppc440spe_adma_desc_slot,
+                                slot_node);
+        }
+}
+
+static void ppc440spe_adma_unmap(struct ppc440spe_adma_chan *chan,
+                                 struct ppc440spe_adma_desc_slot *desc)
+{
+        u32 src_cnt, dst_cnt;
+        dma_addr_t addr;
+
+        /*
+         * get the number of sources & destination
+         * included in this descriptor and unmap
+         * them all
+         */
+        src_cnt = ppc440spe_desc_get_src_num(desc, chan);
+        dst_cnt = ppc440spe_desc_get_dst_num(desc, chan);
+
+        /* unmap destinations */
+        if (!(desc->async_tx.flags & DMA_COMPL_SKIP_DEST_UNMAP)) {
+                while (dst_cnt--) {
+                        addr = ppc440spe_desc_get_dest_addr(
+                                desc, chan, dst_cnt);
+                        dma_unmap_page(chan->device->dev,
+                                        addr, desc->unmap_len,
+                                        DMA_FROM_DEVICE);
+                }
+        }
+
+        /* unmap sources */
+        if (!(desc->async_tx.flags & DMA_COMPL_SKIP_SRC_UNMAP)) {
+                while (src_cnt--) {
+                        addr = ppc440spe_desc_get_src_addr(
+                                desc, chan, src_cnt);
+                        dma_unmap_page(chan->device->dev,
+                                        addr, desc->unmap_len,
+                                        DMA_TO_DEVICE);
+                }
+        }
+}
+
+/**
+ * ppc440spe_adma_run_tx_complete_actions - call functions to be called
+ * upon completion
+ */
+static dma_cookie_t ppc440spe_adma_run_tx_complete_actions(
+                struct ppc440spe_adma_desc_slot *desc,
+                struct ppc440spe_adma_chan *chan,
+                dma_cookie_t cookie)
+{
+        int i;
+
+        BUG_ON(desc->async_tx.cookie < 0);
+        if (desc->async_tx.cookie > 0) {
+                cookie = desc->async_tx.cookie;
+                desc->async_tx.cookie = 0;
+
+                /* call the callback (must not sleep or submit new
+                 * operations to this channel)
+                 */
+                if (desc->async_tx.callback)
+                        desc->async_tx.callback(
+                                desc->async_tx.callback_param);
+
+                /* unmap dma addresses
+                 * (unmap_single vs unmap_page?)
+                 *
+                 * actually, ppc's dma_unmap_page() functions are empty, so
+                 * the following code is just for the sake of completeness
+                 */
+                if (chan && chan->needs_unmap && desc->group_head &&
+                     desc->unmap_len) {
+                        struct ppc440spe_adma_desc_slot *unmap =
+                                                        desc->group_head;
+                        /* assume 1 slot per op always */
+                        u32 slot_count = unmap->slot_cnt;
+
+                        /* Run through the group list and unmap addresses */
+                        for (i = 0; i < slot_count; i++) {
+                                BUG_ON(!unmap);
+                                ppc440spe_adma_unmap(chan, unmap);
+                                unmap = unmap->hw_next;
+                        }
+                }
+        }
+
+        /* run dependent operations */
+        dma_run_dependencies(&desc->async_tx);
+
+        return cookie;
+}
+
+/**
+ * ppc440spe_adma_clean_slot - clean up CDB slot (if ack is set)
+ */
+static int ppc440spe_adma_clean_slot(struct ppc440spe_adma_desc_slot *desc,
+                struct ppc440spe_adma_chan *chan)
+{
+        /* the client is allowed to attach dependent operations
+         * until 'ack' is set
+         */
+        if (!async_tx_test_ack(&desc->async_tx))
+                return 0;
+
+        /* leave the last descriptor in the chain
+         * so we can append to it
+         */
+        if (list_is_last(&desc->chain_node, &chan->chain) ||
+            desc->phys == ppc440spe_chan_get_current_descriptor(chan))
+                return 1;
+
+        if (chan->device->id != PPC440SPE_XOR_ID) {
+                /* our DMA interrupt handler clears opc field of
+                 * each processed descriptor. For all types of
+                 * operations except for ZeroSum we do not actually
+                 * need ack from the interrupt handler. ZeroSum is a
+                 * special case since the result of this operation
+                 * is available from the handler only, so if we see
+                 * such type of descriptor (which is unprocessed yet)
+                 * then leave it in chain.
+                 */
+                struct dma_cdb *cdb = desc->hw_desc;
+                if (cdb->opc == DMA_CDB_OPC_DCHECK128)
+                        return 1;
+        }
+
+        dev_dbg(chan->device->common.dev, "\tfree slot %llx: %d stride: %d\n",
+                desc->phys, desc->idx, desc->slots_per_op);
+
+        list_del(&desc->chain_node);
+        ppc440spe_adma_free_slots(desc, chan);
+        return 0;
+}
+
+/**
+ * __ppc440spe_adma_slot_cleanup - this is the common clean-up routine
+ *      which runs through the channel CDBs list until reach the descriptor
+ *      currently processed. When routine determines that all CDBs of group
+ *      are completed then corresponding callbacks (if any) are called and slots
+ *      are freed.
+ */
+static void __ppc440spe_adma_slot_cleanup(struct ppc440spe_adma_chan *chan)
+{
+        struct ppc440spe_adma_desc_slot *iter, *_iter, *group_start = NULL;
+        dma_cookie_t cookie = 0;
+        u32 current_desc = ppc440spe_chan_get_current_descriptor(chan);
+        int busy = ppc440spe_chan_is_busy(chan);
+        int seen_current = 0, slot_cnt = 0, slots_per_op = 0;
+
+        dev_dbg(chan->device->common.dev, "ppc440spe adma%d: %s\n",
+                chan->device->id, __func__);
+
+        if (!current_desc) {
+                /*  There were no transactions yet, so
+                 * nothing to clean
+                 */
+                return;
+        }
+
+        /* free completed slots from the chain starting with
+         * the oldest descriptor
+         */
+        list_for_each_entry_safe(iter, _iter, &chan->chain,
+                                        chain_node) {
+                dev_dbg(chan->device->common.dev, "\tcookie: %d slot: %d "
+                    "busy: %d this_desc: %#llx next_desc: %#x "
+                    "cur: %#x ack: %d\n",
+                    iter->async_tx.cookie, iter->idx, busy, iter->phys,
+                    ppc440spe_desc_get_link(iter, chan), current_desc,
+                    async_tx_test_ack(&iter->async_tx));
+                prefetch(_iter);
+                prefetch(&_iter->async_tx);
+
+                /* do not advance past the current descriptor loaded into the
+                 * hardware channel,subsequent descriptors are either in process
+                 * or have not been submitted
+                 */
+                if (seen_current)
+                        break;
+
+                /* stop the search if we reach the current descriptor and the
+                 * channel is busy, or if it appears that the current descriptor
+                 * needs to be re-read (i.e. has been appended to)
+                 */
+                if (iter->phys == current_desc) {
+                        BUG_ON(seen_current++);
+                        if (busy || ppc440spe_desc_get_link(iter, chan)) {
+                                /* not all descriptors of the group have
+                                 * been completed; exit.
+                                 */
+                                break;
+                        }
+                }
+
+                /* detect the start of a group transaction */
+                if (!slot_cnt && !slots_per_op) {
+                        slot_cnt = iter->slot_cnt;
+                        slots_per_op = iter->slots_per_op;
+                        if (slot_cnt <= slots_per_op) {
+                                slot_cnt = 0;
+                                slots_per_op = 0;
+                        }
+                }
+
+                if (slot_cnt) {
+                        if (!group_start)
+                                group_start = iter;
+                        slot_cnt -= slots_per_op;
+                }
+
+                /* all the members of a group are complete */
+                if (slots_per_op != 0 && slot_cnt == 0) {
+                        struct ppc440spe_adma_desc_slot *grp_iter, *_grp_iter;
+                        int end_of_chain = 0;
+
+                        /* clean up the group */
+                        slot_cnt = group_start->slot_cnt;
+                        grp_iter = group_start;
+                        list_for_each_entry_safe_from(grp_iter, _grp_iter,
+                                &chan->chain, chain_node) {
+
+                                cookie = ppc440spe_adma_run_tx_complete_actions(
+                                        grp_iter, chan, cookie);
+
+                                slot_cnt -= slots_per_op;
+                                end_of_chain = ppc440spe_adma_clean_slot(
+                                    grp_iter, chan);
+                                if (end_of_chain && slot_cnt) {
+                                        /* Should wait for ZeroSum completion */
+                                        if (cookie > 0)
+                                                chan->completed_cookie = cookie;
+                                        return;
+                                }
+
+                                if (slot_cnt == 0 || end_of_chain)
+                                        break;
+                        }
+
+                        /* the group should be complete at this point */
+                        BUG_ON(slot_cnt);
+
+                        slots_per_op = 0;
+                        group_start = NULL;
+                        if (end_of_chain)
+                                break;
+                        else
+                                continue;
+                } else if (slots_per_op) /* wait for group completion */
+                        continue;
+
+                cookie = ppc440spe_adma_run_tx_complete_actions(iter, chan,
+                    cookie);
+
+                if (ppc440spe_adma_clean_slot(iter, chan))
+                        break;
+        }
+
+        BUG_ON(!seen_current);
+
+        if (cookie > 0) {
+                chan->completed_cookie = cookie;
+                pr_debug("\tcompleted cookie %d\n", cookie);
+        }
+
+}
+
+/**
+ * ppc440spe_adma_tasklet - clean up watch-dog initiator
+ */
+static void ppc440spe_adma_tasklet(unsigned long data)
+{
+        struct ppc440spe_adma_chan *chan = (struct ppc440spe_adma_chan *) data;
+
+        spin_lock_nested(&chan->lock, SINGLE_DEPTH_NESTING);
+        __ppc440spe_adma_slot_cleanup(chan);
+        spin_unlock(&chan->lock);
+}
+
+/**
+ * ppc440spe_adma_slot_cleanup - clean up scheduled initiator
+ */
+static void ppc440spe_adma_slot_cleanup(struct ppc440spe_adma_chan *chan)
+{
+        spin_lock_bh(&chan->lock);
+        __ppc440spe_adma_slot_cleanup(chan);
+        spin_unlock_bh(&chan->lock);
+}
+
+/**
+ * ppc440spe_adma_alloc_slots - allocate free slots (if any)
+ */
+static struct ppc440spe_adma_desc_slot *ppc440spe_adma_alloc_slots(
+                struct ppc440spe_adma_chan *chan, int num_slots,
+                int slots_per_op)
+{
+        struct ppc440spe_adma_desc_slot *iter = NULL, *_iter;
+        struct ppc440spe_adma_desc_slot *alloc_start = NULL;
+        struct list_head chain = LIST_HEAD_INIT(chain);
+        int slots_found, retry = 0;
+
+
+        BUG_ON(!num_slots || !slots_per_op);
+        /* start search from the last allocated descrtiptor
+         * if a contiguous allocation can not be found start searching
+         * from the beginning of the list
+         */
+retry:
+        slots_found = 0;
+        if (retry == 0)
+                iter = chan->last_used;
+        else
+                iter = list_entry(&chan->all_slots,
+                                  struct ppc440spe_adma_desc_slot,
+                                  slot_node);
+        list_for_each_entry_safe_continue(iter, _iter, &chan->all_slots,
+            slot_node) {
+                prefetch(_iter);
+                prefetch(&_iter->async_tx);
+                if (iter->slots_per_op) {
+                        slots_found = 0;
+                        continue;
+                }
+
+                /* start the allocation if the slot is correctly aligned */
+                if (!slots_found++)
+                        alloc_start = iter;
+
+                if (slots_found == num_slots) {
+                        struct ppc440spe_adma_desc_slot *alloc_tail = NULL;
+                        struct ppc440spe_adma_desc_slot *last_used = NULL;
+
+                        iter = alloc_start;
+                        while (num_slots) {
+                                int i;
+                                /* pre-ack all but the last descriptor */
+                                if (num_slots != slots_per_op)
+                                        async_tx_ack(&iter->async_tx);
+
+                                list_add_tail(&iter->chain_node, &chain);
+                                alloc_tail = iter;
+                                iter->async_tx.cookie = 0;
+                                iter->hw_next = NULL;
+                                iter->flags = 0;
+                                iter->slot_cnt = num_slots;
+                                iter->xor_check_result = NULL;
+                                for (i = 0; i < slots_per_op; i++) {
+                                        iter->slots_per_op = slots_per_op - i;
+                                        last_used = iter;
+                                        iter = list_entry(iter->slot_node.next,
+                                                struct ppc440spe_adma_desc_slot,
+                                                slot_node);
+                                }
+                                num_slots -= slots_per_op;
+                        }
+                        alloc_tail->group_head = alloc_start;
+                        alloc_tail->async_tx.cookie = -EBUSY;
+                        list_splice(&chain, &alloc_tail->group_list);
+                        chan->last_used = last_used;
+                        return alloc_tail;
+                }
+        }
+        if (!retry++)
+                goto retry;
+
+        /* try to free some slots if the allocation fails */
+        tasklet_schedule(&chan->irq_tasklet);
+        return NULL;
+}
+
+/**
+ * ppc440spe_adma_alloc_chan_resources -  allocate pools for CDB slots
+ */
+static int ppc440spe_adma_alloc_chan_resources(struct dma_chan *chan)
+{
+        struct ppc440spe_adma_chan *ppc440spe_chan;
+        struct ppc440spe_adma_desc_slot *slot = NULL;
+        char *hw_desc;
+        int i, db_sz;
+        int init;
+
+        ppc440spe_chan = to_ppc440spe_adma_chan(chan);
+        init = ppc440spe_chan->slots_allocated ? 0 : 1;
+        chan->chan_id = ppc440spe_chan->device->id;
+
+        /* Allocate descriptor slots */
+        i = ppc440spe_chan->slots_allocated;
+        if (ppc440spe_chan->device->id != PPC440SPE_XOR_ID)
+                db_sz = sizeof(struct dma_cdb);
+        else
+                db_sz = sizeof(struct xor_cb);
+
+        for (; i < (ppc440spe_chan->device->pool_size / db_sz); i++) {
+                slot = kzalloc(sizeof(struct ppc440spe_adma_desc_slot),
+                               GFP_KERNEL);
+                if (!slot) {
+                        printk(KERN_INFO "SPE ADMA Channel only initialized"
+                                " %d descriptor slots", i--);
+                        break;
+                }
+
+                hw_desc = (char *) ppc440spe_chan->device->dma_desc_pool_virt;
+                slot->hw_desc = (void *) &hw_desc[i * db_sz];
+                dma_async_tx_descriptor_init(&slot->async_tx, chan);
+                slot->async_tx.tx_submit = ppc440spe_adma_tx_submit;
+                INIT_LIST_HEAD(&slot->chain_node);
+                INIT_LIST_HEAD(&slot->slot_node);
+                INIT_LIST_HEAD(&slot->group_list);
+                slot->phys = ppc440spe_chan->device->dma_desc_pool + i * db_sz;
+                slot->idx = i;
+
+                spin_lock_bh(&ppc440spe_chan->lock);
+                ppc440spe_chan->slots_allocated++;
+                list_add_tail(&slot->slot_node, &ppc440spe_chan->all_slots);
+                spin_unlock_bh(&ppc440spe_chan->lock);
+        }
+
+        if (i && !ppc440spe_chan->last_used) {
+                ppc440spe_chan->last_used =
+                        list_entry(ppc440spe_chan->all_slots.next,
+                                struct ppc440spe_adma_desc_slot,
+                                slot_node);
+        }
+
+        dev_dbg(ppc440spe_chan->device->common.dev,
+                "ppc440spe adma%d: allocated %d descriptor slots\n",
+                ppc440spe_chan->device->id, i);
+
+        /* initialize the channel and the chain with a null operation */
+        if (init) {
+                switch (ppc440spe_chan->device->id) {
+                case PPC440SPE_DMA0_ID:
+                case PPC440SPE_DMA1_ID:
+                        ppc440spe_chan->hw_chain_inited = 0;
+                        /* Use WXOR for self-testing */
+                        if (!ppc440spe_r6_tchan)
+                                ppc440spe_r6_tchan = ppc440spe_chan;
+                        break;
+                case PPC440SPE_XOR_ID:
+                        ppc440spe_chan_start_null_xor(ppc440spe_chan);
+                        break;
+                default:
+                        BUG();
+                }
+                ppc440spe_chan->needs_unmap = 1;
+        }
+
+        return (i > 0) ? i : -ENOMEM;
+}
+
+/**
+ * ppc440spe_desc_assign_cookie - assign a cookie
+ */
+static dma_cookie_t ppc440spe_desc_assign_cookie(
+                struct ppc440spe_adma_chan *chan,
+                struct ppc440spe_adma_desc_slot *desc)
+{
+        dma_cookie_t cookie = chan->common.cookie;
+
+        cookie++;
+        if (cookie < 0)
+                cookie = 1;
+        chan->common.cookie = desc->async_tx.cookie = cookie;
+        return cookie;
+}
+
+/**
+ * ppc440spe_rxor_set_region_data -
+ */
+static void ppc440spe_rxor_set_region(struct ppc440spe_adma_desc_slot *desc,
+        u8 xor_arg_no, u32 mask)
+{
+        struct xor_cb *xcb = desc->hw_desc;
+
+        xcb->ops[xor_arg_no].h |= mask;
+}
+
+/**
+ * ppc440spe_rxor_set_src -
+ */
+static void ppc440spe_rxor_set_src(struct ppc440spe_adma_desc_slot *desc,
+        u8 xor_arg_no, dma_addr_t addr)
+{
+        struct xor_cb *xcb = desc->hw_desc;
+
+        xcb->ops[xor_arg_no].h |= DMA_CUED_XOR_BASE;
+        xcb->ops[xor_arg_no].l = addr;
+}
+
+/**
+ * ppc440spe_rxor_set_mult -
+ */
+static void ppc440spe_rxor_set_mult(struct ppc440spe_adma_desc_slot *desc,
+        u8 xor_arg_no, u8 idx, u8 mult)
+{
+        struct xor_cb *xcb = desc->hw_desc;
+
+        xcb->ops[xor_arg_no].h |= mult << (DMA_CUED_MULT1_OFF + idx * 8);
+}
+
+/**
+ * ppc440spe_adma_check_threshold - append CDBs to h/w chain if threshold
+ *      has been achieved
+ */
+static void ppc440spe_adma_check_threshold(struct ppc440spe_adma_chan *chan)
+{
+        dev_dbg(chan->device->common.dev, "ppc440spe adma%d: pending: %d\n",
+                chan->device->id, chan->pending);
+
+        if (chan->pending >= PPC440SPE_ADMA_THRESHOLD) {
+                chan->pending = 0;
+                ppc440spe_chan_append(chan);
+        }
+}
+
+/**
+ * ppc440spe_adma_tx_submit - submit new descriptor group to the channel
+ *      (it's not necessary that descriptors will be submitted to the h/w
+ *      chains too right now)
+ */
+static dma_cookie_t ppc440spe_adma_tx_submit(struct dma_async_tx_descriptor *tx)
+{
+        struct ppc440spe_adma_desc_slot *sw_desc;
+        struct ppc440spe_adma_chan *chan = to_ppc440spe_adma_chan(tx->chan);
+        struct ppc440spe_adma_desc_slot *group_start, *old_chain_tail;
+        int slot_cnt;
+        int slots_per_op;
+        dma_cookie_t cookie;
+
+        sw_desc = tx_to_ppc440spe_adma_slot(tx);
+
+        group_start = sw_desc->group_head;
+        slot_cnt = group_start->slot_cnt;
+        slots_per_op = group_start->slots_per_op;
+
+        spin_lock_bh(&chan->lock);
+
+        cookie = ppc440spe_desc_assign_cookie(chan, sw_desc);
+
+        if (unlikely(list_empty(&chan->chain))) {
+                /* first peer */
+                list_splice_init(&sw_desc->group_list, &chan->chain);
+                chan_first_cdb[chan->device->id] = group_start;
+        } else {
+                /* isn't first peer, bind CDBs to chain */
+                old_chain_tail = list_entry(chan->chain.prev,
+                                        struct ppc440spe_adma_desc_slot,
+                                        chain_node);
+                list_splice_init(&sw_desc->group_list,
+                    &old_chain_tail->chain_node);
+                /* fix up the hardware chain */
+                ppc440spe_desc_set_link(chan, old_chain_tail, group_start);
+        }
+
+        /* increment the pending count by the number of operations */
+        chan->pending += slot_cnt / slots_per_op;
+        ppc440spe_adma_check_threshold(chan);
+        spin_unlock_bh(&chan->lock);
+
+        dev_dbg(chan->device->common.dev,
+                "ppc440spe adma%d: %s cookie: %d slot: %d tx %p\n",
+                chan->device->id, __func__,
+                sw_desc->async_tx.cookie, sw_desc->idx, sw_desc);
+
+        return cookie;
+}
+
+/**
+ * ppc440spe_adma_prep_dma_interrupt - prepare CDB for a pseudo DMA operation
+ */
+static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_interrupt(
+                struct dma_chan *chan, unsigned long flags)
+{
+        struct ppc440spe_adma_chan *ppc440spe_chan;
+        struct ppc440spe_adma_desc_slot *sw_desc, *group_start;
+        int slot_cnt, slots_per_op;
+
+        ppc440spe_chan = to_ppc440spe_adma_chan(chan);
+
+        dev_dbg(ppc440spe_chan->device->common.dev,
+                "ppc440spe adma%d: %s\n", ppc440spe_chan->device->id,
+                __func__);
+
+        spin_lock_bh(&ppc440spe_chan->lock);
+        slot_cnt = slots_per_op = 1;
+        sw_desc = ppc440spe_adma_alloc_slots(ppc440spe_chan, slot_cnt,
+                        slots_per_op);
+        if (sw_desc) {
+                group_start = sw_desc->group_head;
+                ppc440spe_desc_init_interrupt(group_start, ppc440spe_chan);
+                group_start->unmap_len = 0;
+                sw_desc->async_tx.flags = flags;
+        }
+        spin_unlock_bh(&ppc440spe_chan->lock);
+
+        return sw_desc ? &sw_desc->async_tx : NULL;
+}
+
+/**
+ * ppc440spe_adma_prep_dma_memcpy - prepare CDB for a MEMCPY operation
+ */
+static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_memcpy(
+                struct dma_chan *chan, dma_addr_t dma_dest,
+                dma_addr_t dma_src, size_t len, unsigned long flags)
+{
+        struct ppc440spe_adma_chan *ppc440spe_chan;
+        struct ppc440spe_adma_desc_slot *sw_desc, *group_start;
+        int slot_cnt, slots_per_op;
+
+        ppc440spe_chan = to_ppc440spe_adma_chan(chan);
+
+        if (unlikely(!len))
+                return NULL;
+
+        BUG_ON(unlikely(len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT));
+
+        spin_lock_bh(&ppc440spe_chan->lock);
+
+        dev_dbg(ppc440spe_chan->device->common.dev,
+                "ppc440spe adma%d: %s len: %u int_en %d\n",
+                ppc440spe_chan->device->id, __func__, len,
+                flags & DMA_PREP_INTERRUPT ? 1 : 0);
+        slot_cnt = slots_per_op = 1;
+        sw_desc = ppc440spe_adma_alloc_slots(ppc440spe_chan, slot_cnt,
+                slots_per_op);
+        if (sw_desc) {
+                group_start = sw_desc->group_head;
+                ppc440spe_desc_init_memcpy(group_start, flags);
+                ppc440spe_adma_set_dest(group_start, dma_dest, 0);
+                ppc440spe_adma_memcpy_xor_set_src(group_start, dma_src, 0);
+                ppc440spe_desc_set_byte_count(group_start, ppc440spe_chan, len);
+                sw_desc->unmap_len = len;
+                sw_desc->async_tx.flags = flags;
+        }
+        spin_unlock_bh(&ppc440spe_chan->lock);
+
+        return sw_desc ? &sw_desc->async_tx : NULL;
+}
+
+/**
+ * ppc440spe_adma_prep_dma_memset - prepare CDB for a MEMSET operation
+ */
+static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_memset(
+                struct dma_chan *chan, dma_addr_t dma_dest, int value,
+                size_t len, unsigned long flags)
+{
+        struct ppc440spe_adma_chan *ppc440spe_chan;
+        struct ppc440spe_adma_desc_slot *sw_desc, *group_start;
+        int slot_cnt, slots_per_op;
+
+        ppc440spe_chan = to_ppc440spe_adma_chan(chan);
+
+        if (unlikely(!len))
+                return NULL;
+
+        BUG_ON(unlikely(len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT));
+
+        spin_lock_bh(&ppc440spe_chan->lock);
+
+        dev_dbg(ppc440spe_chan->device->common.dev,
+                "ppc440spe adma%d: %s cal: %u len: %u int_en %d\n",
+                ppc440spe_chan->device->id, __func__, value, len,
+                flags & DMA_PREP_INTERRUPT ? 1 : 0);
+
+        slot_cnt = slots_per_op = 1;
+        sw_desc = ppc440spe_adma_alloc_slots(ppc440spe_chan, slot_cnt,
+                slots_per_op);
+        if (sw_desc) {
+                group_start = sw_desc->group_head;
+                ppc440spe_desc_init_memset(group_start, value, flags);
+                ppc440spe_adma_set_dest(group_start, dma_dest, 0);
+                ppc440spe_desc_set_byte_count(group_start, ppc440spe_chan, len);
+                sw_desc->unmap_len = len;
+                sw_desc->async_tx.flags = flags;
+        }
+        spin_unlock_bh(&ppc440spe_chan->lock);
+
+        return sw_desc ? &sw_desc->async_tx : NULL;
+}
+
+/**
+ * ppc440spe_adma_prep_dma_xor - prepare CDB for a XOR operation
+ */
+static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_xor(
+                struct dma_chan *chan, dma_addr_t dma_dest,
+                dma_addr_t *dma_src, u32 src_cnt, size_t len,
+                unsigned long flags)
+{
+        struct ppc440spe_adma_chan *ppc440spe_chan;
+        struct ppc440spe_adma_desc_slot *sw_desc, *group_start;
+        int slot_cnt, slots_per_op;
+
+        ppc440spe_chan = to_ppc440spe_adma_chan(chan);
+
+        ADMA_LL_DBG(prep_dma_xor_dbg(ppc440spe_chan->device->id,
+                                     dma_dest, dma_src, src_cnt));
+        if (unlikely(!len))
+                return NULL;
+        BUG_ON(unlikely(len > PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT));
+
+        dev_dbg(ppc440spe_chan->device->common.dev,
+                "ppc440spe adma%d: %s src_cnt: %d len: %u int_en: %d\n",
+                ppc440spe_chan->device->id, __func__, src_cnt, len,
+                flags & DMA_PREP_INTERRUPT ? 1 : 0);
+
+        spin_lock_bh(&ppc440spe_chan->lock);
+        slot_cnt = ppc440spe_chan_xor_slot_count(len, src_cnt, &slots_per_op);
+        sw_desc = ppc440spe_adma_alloc_slots(ppc440spe_chan, slot_cnt,
+                        slots_per_op);
+        if (sw_desc) {
+                group_start = sw_desc->group_head;
+                ppc440spe_desc_init_xor(group_start, src_cnt, flags);
+                ppc440spe_adma_set_dest(group_start, dma_dest, 0);
+                while (src_cnt--)
+                        ppc440spe_adma_memcpy_xor_set_src(group_start,
+                                dma_src[src_cnt], src_cnt);
+                ppc440spe_desc_set_byte_count(group_start, ppc440spe_chan, len);
+                sw_desc->unmap_len = len;
+                sw_desc->async_tx.flags = flags;
+        }
+        spin_unlock_bh(&ppc440spe_chan->lock);
+
+        return sw_desc ? &sw_desc->async_tx : NULL;
+}
+
+static inline void
+ppc440spe_desc_set_xor_src_cnt(struct ppc440spe_adma_desc_slot *desc,
+                                int src_cnt);
+static void ppc440spe_init_rxor_cursor(struct ppc440spe_rxor *cursor);
+
+/**
+ * ppc440spe_adma_init_dma2rxor_slot -
+ */
+static void ppc440spe_adma_init_dma2rxor_slot(
+                struct ppc440spe_adma_desc_slot *desc,
+                dma_addr_t *src, int src_cnt)
+{
+        int i;
+
+        /* initialize CDB */
+        for (i = 0; i < src_cnt; i++) {
+                ppc440spe_adma_dma2rxor_prep_src(desc, &desc->rxor_cursor, i,
+                                                 desc->src_cnt, (u32)src[i]);
+        }
+}
+
+/**
+ * ppc440spe_dma01_prep_mult -
+ * for Q operation where destination is also the source
+ */
+static struct ppc440spe_adma_desc_slot *ppc440spe_dma01_prep_mult(
+                struct ppc440spe_adma_chan *ppc440spe_chan,
+                dma_addr_t *dst, int dst_cnt, dma_addr_t *src, int src_cnt,
+                const unsigned char *scf, size_t len, unsigned long flags)
+{
+        struct ppc440spe_adma_desc_slot *sw_desc = NULL;
+        unsigned long op = 0;
+        int slot_cnt;
+
+        set_bit(PPC440SPE_DESC_WXOR, &op);
+        slot_cnt = 2;
+
+        spin_lock_bh(&ppc440spe_chan->lock);
+
+        /* use WXOR, each descriptor occupies one slot */
+        sw_desc = ppc440spe_adma_alloc_slots(ppc440spe_chan, slot_cnt, 1);
+        if (sw_desc) {
+                struct ppc440spe_adma_chan *chan;
+                struct ppc440spe_adma_desc_slot *iter;
+                struct dma_cdb *hw_desc;
+
+                chan = to_ppc440spe_adma_chan(sw_desc->async_tx.chan);
+                set_bits(op, &sw_desc->flags);
+                sw_desc->src_cnt = src_cnt;
+                sw_desc->dst_cnt = dst_cnt;
+                /* First descriptor, zero data in the destination and copy it
+                 * to q page using MULTICAST transfer.
+                 */
+                iter = list_first_entry(&sw_desc->group_list,
+                                        struct ppc440spe_adma_desc_slot,
+                                        chain_node);
+                memset(iter->hw_desc, 0, sizeof(struct dma_cdb));
+                /* set 'next' pointer */
+                iter->hw_next = list_entry(iter->chain_node.next,
+                                           struct ppc440spe_adma_desc_slot,
+                                           chain_node);
+                clear_bit(PPC440SPE_DESC_INT, &iter->flags);
+                hw_desc = iter->hw_desc;
+                hw_desc->opc = DMA_CDB_OPC_MULTICAST;
+
+                ppc440spe_desc_set_dest_addr(iter, chan,
+                                             DMA_CUED_XOR_BASE, dst[0], 0);
+                ppc440spe_desc_set_dest_addr(iter, chan, 0, dst[1], 1);
+                ppc440spe_desc_set_src_addr(iter, chan, 0, DMA_CUED_XOR_HB,
+                                            src[0]);
+                ppc440spe_desc_set_byte_count(iter, ppc440spe_chan, len);
+                iter->unmap_len = len;
+
+                /*
+                 * Second descriptor, multiply data from the q page
+                 * and store the result in real destination.
+                 */
+                iter = list_first_entry(&iter->chain_node,
+                                        struct ppc440spe_adma_desc_slot,
+                                        chain_node);
+                memset(iter->hw_desc, 0, sizeof(struct dma_cdb));
+                iter->hw_next = NULL;
+                if (flags & DMA_PREP_INTERRUPT)
+                        set_bit(PPC440SPE_DESC_INT, &iter->flags);
+                else
+                        clear_bit(PPC440SPE_DESC_INT, &iter->flags);
+
+                hw_desc = iter->hw_desc;
+                hw_desc->opc = DMA_CDB_OPC_MV_SG1_SG2;
+                ppc440spe_desc_set_src_addr(iter, chan, 0,
+                                            DMA_CUED_XOR_HB, dst[1]);
+                ppc440spe_desc_set_dest_addr(iter, chan,
+                                             DMA_CUED_XOR_BASE, dst[0], 0);
+
+                ppc440spe_desc_set_src_mult(iter, chan, DMA_CUED_MULT1_OFF,
+                                            DMA_CDB_SG_DST1, scf[0]);
+                ppc440spe_desc_set_byte_count(iter, ppc440spe_chan, len);
+                iter->unmap_len = len;
+                sw_desc->async_tx.flags = flags;
+        }
+
+        spin_unlock_bh(&ppc440spe_chan->lock);
+
+        return sw_desc;
+}
+
+/**
+ * ppc440spe_dma01_prep_sum_product -
+ * Dx = A*(P+Pxy) + B*(Q+Qxy) operation where destination is also
+ * the source.
+ */
+static struct ppc440spe_adma_desc_slot *ppc440spe_dma01_prep_sum_product(
+                struct ppc440spe_adma_chan *ppc440spe_chan,
+                dma_addr_t *dst, dma_addr_t *src, int src_cnt,
+                const unsigned char *scf, size_t len, unsigned long flags)
+{
+        struct ppc440spe_adma_desc_slot *sw_desc = NULL;
+        unsigned long op = 0;
+        int slot_cnt;
+
+        set_bit(PPC440SPE_DESC_WXOR, &op);
+        slot_cnt = 3;
+
+        spin_lock_bh(&ppc440spe_chan->lock);
+
+        /* WXOR, each descriptor occupies one slot */
+        sw_desc = ppc440spe_adma_alloc_slots(ppc440spe_chan, slot_cnt, 1);
+        if (sw_desc) {
+                struct ppc440spe_adma_chan *chan;
+                struct ppc440spe_adma_desc_slot *iter;
+                struct dma_cdb *hw_desc;
+
+                chan = to_ppc440spe_adma_chan(sw_desc->async_tx.chan);
+                set_bits(op, &sw_desc->flags);
+                sw_desc->src_cnt = src_cnt;
+                sw_desc->dst_cnt = 1;
+                /* 1st descriptor, src[1] data to q page and zero destination */
+                iter = list_first_entry(&sw_desc->group_list,
+                                        struct ppc440spe_adma_desc_slot,
+                                        chain_node);
+                memset(iter->hw_desc, 0, sizeof(struct dma_cdb));
+                iter->hw_next = list_entry(iter->chain_node.next,
+                                           struct ppc440spe_adma_desc_slot,
+                                           chain_node);
+                clear_bit(PPC440SPE_DESC_INT, &iter->flags);
+                hw_desc = iter->hw_desc;
+                hw_desc->opc = DMA_CDB_OPC_MULTICAST;
+
+                ppc440spe_desc_set_dest_addr(iter, chan, DMA_CUED_XOR_BASE,
+                                             *dst, 0);
+                ppc440spe_desc_set_dest_addr(iter, chan, 0,
+                                             ppc440spe_chan->qdest, 1);
+                ppc440spe_desc_set_src_addr(iter, chan, 0, DMA_CUED_XOR_HB,
+                                            src[1]);
+                ppc440spe_desc_set_byte_count(iter, ppc440spe_chan, len);
+                iter->unmap_len = len;
+
+                /* 2nd descriptor, multiply src[1] data and store the
+                 * result in destination */
+                iter = list_first_entry(&iter->chain_node,
+                                        struct ppc440spe_adma_desc_slot,
+                                        chain_node);
+                memset(iter->hw_desc, 0, sizeof(struct dma_cdb));
+                /* set 'next' pointer */
+                iter->hw_next = list_entry(iter->chain_node.next,
+                                           struct ppc440spe_adma_desc_slot,
+                                           chain_node);
+                if (flags & DMA_PREP_INTERRUPT)
+                        set_bit(PPC440SPE_DESC_INT, &iter->flags);
+                else
+                        clear_bit(PPC440SPE_DESC_INT, &iter->flags);
+
+                hw_desc = iter->hw_desc;
+                hw_desc->opc = DMA_CDB_OPC_MV_SG1_SG2;
+                ppc440spe_desc_set_src_addr(iter, chan, 0, DMA_CUED_XOR_HB,
+                                            ppc440spe_chan->qdest);
+                ppc440spe_desc_set_dest_addr(iter, chan, DMA_CUED_XOR_BASE,
+                                             *dst, 0);
+                ppc440spe_desc_set_src_mult(iter, chan, DMA_CUED_MULT1_OFF,
+                                            DMA_CDB_SG_DST1, scf[1]);
+                ppc440spe_desc_set_byte_count(iter, ppc440spe_chan, len);
+                iter->unmap_len = len;
+
+                /*
+                 * 3rd descriptor, multiply src[0] data and xor it
+                 * with destination
+                 */
+                iter = list_first_entry(&iter->chain_node,
+                                        struct ppc440spe_adma_desc_slot,
+                                        chain_node);
+                memset(iter->hw_desc, 0, sizeof(struct dma_cdb));
+                iter->hw_next = NULL;
+                if (flags & DMA_PREP_INTERRUPT)
+                        set_bit(PPC440SPE_DESC_INT, &iter->flags);
+                else
+                        clear_bit(PPC440SPE_DESC_INT, &iter->flags);
+
+                hw_desc = iter->hw_desc;
+                hw_desc->opc = DMA_CDB_OPC_MV_SG1_SG2;
+                ppc440spe_desc_set_src_addr(iter, chan, 0, DMA_CUED_XOR_HB,
+                                            src[0]);
+                ppc440spe_desc_set_dest_addr(iter, chan, DMA_CUED_XOR_BASE,
+                                             *dst, 0);
+                ppc440spe_desc_set_src_mult(iter, chan, DMA_CUED_MULT1_OFF,
+                                            DMA_CDB_SG_DST1, scf[0]);
+                ppc440spe_desc_set_byte_count(iter, ppc440spe_chan, len);
+                iter->unmap_len = len;
+                sw_desc->async_tx.flags = flags;
+        }
+
+        spin_unlock_bh(&ppc440spe_chan->lock);
+
+        return sw_desc;
+}
+
+static struct ppc440spe_adma_desc_slot *ppc440spe_dma01_prep_pq(
+                struct ppc440spe_adma_chan *ppc440spe_chan,
+                dma_addr_t *dst, int dst_cnt, dma_addr_t *src, int src_cnt,
+                const unsigned char *scf, size_t len, unsigned long flags)
+{
+        int slot_cnt;
+        struct ppc440spe_adma_desc_slot *sw_desc = NULL, *iter;
+        unsigned long op = 0;
+        unsigned char mult = 1;
+
+        pr_debug("%s: dst_cnt %d, src_cnt %d, len %d\n",
+                 __func__, dst_cnt, src_cnt, len);
+        /*  select operations WXOR/RXOR depending on the
+         * source addresses of operators and the number
+         * of destinations (RXOR support only Q-parity calculations)
+         */
+        set_bit(PPC440SPE_DESC_WXOR, &op);
+        if (!test_and_set_bit(PPC440SPE_RXOR_RUN, &ppc440spe_rxor_state)) {
+                /* no active RXOR;
+                 * do RXOR if:
+                 * - there are more than 1 source,
+                 * - len is aligned on 512-byte boundary,
+                 * - source addresses fit to one of 4 possible regions.
+                 */
+                if (src_cnt > 1 &&
+                    !(len & MQ0_CF2H_RXOR_BS_MASK) &&
+                    (src[0] + len) == src[1]) {
+                        /* may do RXOR R1 R2 */
+                        set_bit(PPC440SPE_DESC_RXOR, &op);
+                        if (src_cnt != 2) {
+                                /* may try to enhance region of RXOR */
+                                if ((src[1] + len) == src[2]) {
+                                        /* do RXOR R1 R2 R3 */
+                                        set_bit(PPC440SPE_DESC_RXOR123,
+                                                &op);
+                                } else if ((src[1] + len * 2) == src[2]) {
+                                        /* do RXOR R1 R2 R4 */
+                                        set_bit(PPC440SPE_DESC_RXOR124, &op);
+                                } else if ((src[1] + len * 3) == src[2]) {
+                                        /* do RXOR R1 R2 R5 */
+                                        set_bit(PPC440SPE_DESC_RXOR125,
+                                                &op);
+                                } else {
+                                        /* do RXOR R1 R2 */
+                                        set_bit(PPC440SPE_DESC_RXOR12,
+                                                &op);
+                                }
+                        } else {
+                                /* do RXOR R1 R2 */
+                                set_bit(PPC440SPE_DESC_RXOR12, &op);
+                        }
+                }
+
+                if (!test_bit(PPC440SPE_DESC_RXOR, &op)) {
+                        /* can not do this operation with RXOR */
+                        clear_bit(PPC440SPE_RXOR_RUN,
+                                &ppc440spe_rxor_state);
+                } else {
+                        /* can do; set block size right now */
+                        ppc440spe_desc_set_rxor_block_size(len);
+                }
+        }
+
+        /* Number of necessary slots depends on operation type selected */
+        if (!test_bit(PPC440SPE_DESC_RXOR, &op)) {
+                /*  This is a WXOR only chain. Need descriptors for each
+                 * source to GF-XOR them with WXOR, and need descriptors
+                 * for each destination to zero them with WXOR
+                 */
+                slot_cnt = src_cnt;
+
+                if (flags & DMA_PREP_ZERO_P) {
+                        slot_cnt++;
+                        set_bit(PPC440SPE_ZERO_P, &op);
+                }
+                if (flags & DMA_PREP_ZERO_Q) {
+                        slot_cnt++;
+                        set_bit(PPC440SPE_ZERO_Q, &op);
+                }
+        } else {
+                /*  Need 1/2 descriptor for RXOR operation, and
+                 * need (src_cnt - (2 or 3)) for WXOR of sources
+                 * remained (if any)
+                 */
+                slot_cnt = dst_cnt;
+
+                if (flags & DMA_PREP_ZERO_P)
+                        set_bit(PPC440SPE_ZERO_P, &op);
+                if (flags & DMA_PREP_ZERO_Q)
+                        set_bit(PPC440SPE_ZERO_Q, &op);
+
+                if (test_bit(PPC440SPE_DESC_RXOR12, &op))
+                        slot_cnt += src_cnt - 2;
+                else
+                        slot_cnt += src_cnt - 3;
+
+                /*  Thus we have either RXOR only chain or
+                 * mixed RXOR/WXOR
+                 */
+                if (slot_cnt == dst_cnt)
+                        /* RXOR only chain */
+                        clear_bit(PPC440SPE_DESC_WXOR, &op);
+        }
+
+        spin_lock_bh(&ppc440spe_chan->lock);
+        /* for both RXOR/WXOR each descriptor occupies one slot */
+        sw_desc = ppc440spe_adma_alloc_slots(ppc440spe_chan, slot_cnt, 1);
+        if (sw_desc) {
+                ppc440spe_desc_init_dma01pq(sw_desc, dst_cnt, src_cnt,
+                                flags, op);
+
+                /* setup dst/src/mult */
+                pr_debug("%s: set dst descriptor 0, 1: 0x%016llx, 0x%016llx\n",
+                         __func__, dst[0], dst[1]);
+                ppc440spe_adma_pq_set_dest(sw_desc, dst, flags);
+                while (src_cnt--) {
+                        ppc440spe_adma_pq_set_src(sw_desc, src[src_cnt],
+                                                  src_cnt);
+
+                        /* NOTE: "Multi = 0 is equivalent to = 1" as it
+                         * stated in 440SPSPe_RAID6_Addendum_UM_1_17.pdf
+                         * doesn't work for RXOR with DMA0/1! Instead, multi=0
+                         * leads to zeroing source data after RXOR.
+                         * So, for P case set-up mult=1 explicitly.
+                         */
+                        if (!(flags & DMA_PREP_PQ_DISABLE_Q))
+                                mult = scf[src_cnt];
+                        ppc440spe_adma_pq_set_src_mult(sw_desc,
+                                mult, src_cnt,  dst_cnt - 1);
+                }
+
+                /* Setup byte count foreach slot just allocated */
+                sw_desc->async_tx.flags = flags;
+                list_for_each_entry(iter, &sw_desc->group_list,
+                                chain_node) {
+                        ppc440spe_desc_set_byte_count(iter,
+                                ppc440spe_chan, len);
+                        iter->unmap_len = len;
+                }
+        }
+        spin_unlock_bh(&ppc440spe_chan->lock);
+
+        return sw_desc;
+}
+
+static struct ppc440spe_adma_desc_slot *ppc440spe_dma2_prep_pq(
+                struct ppc440spe_adma_chan *ppc440spe_chan,
+                dma_addr_t *dst, int dst_cnt, dma_addr_t *src, int src_cnt,
+                const unsigned char *scf, size_t len, unsigned long flags)
+{
+        int slot_cnt, descs_per_op;
+        struct ppc440spe_adma_desc_slot *sw_desc = NULL, *iter;
+        unsigned long op = 0;
+        unsigned char mult = 1;
+
+        BUG_ON(!dst_cnt);
+        /*pr_debug("%s: dst_cnt %d, src_cnt %d, len %d\n",
+                 __func__, dst_cnt, src_cnt, len);*/
+
+        spin_lock_bh(&ppc440spe_chan->lock);
+        descs_per_op = ppc440spe_dma2_pq_slot_count(src, src_cnt, len);
+        if (descs_per_op < 0) {
+                spin_unlock_bh(&ppc440spe_chan->lock);
+                return NULL;
+        }
+
+        /* depending on number of sources we have 1 or 2 RXOR chains */
+        slot_cnt = descs_per_op * dst_cnt;
+
+        sw_desc = ppc440spe_adma_alloc_slots(ppc440spe_chan, slot_cnt, 1);
+        if (sw_desc) {
+                op = slot_cnt;
+                sw_desc->async_tx.flags = flags;
+                list_for_each_entry(iter, &sw_desc->group_list, chain_node) {
+                        ppc440spe_desc_init_dma2pq(iter, dst_cnt, src_cnt,
+                                --op ? 0 : flags);
+                        ppc440spe_desc_set_byte_count(iter, ppc440spe_chan,
+                                len);
+                        iter->unmap_len = len;
+
+                        ppc440spe_init_rxor_cursor(&(iter->rxor_cursor));
+                        iter->rxor_cursor.len = len;
+                        iter->descs_per_op = descs_per_op;
+                }
+                op = 0;
+                list_for_each_entry(iter, &sw_desc->group_list, chain_node) {
+                        op++;
+                        if (op % descs_per_op == 0)
+                                ppc440spe_adma_init_dma2rxor_slot(iter, src,
+                                                                  src_cnt);
+                        if (likely(!list_is_last(&iter->chain_node,
+                                                 &sw_desc->group_list))) {
+                                /* set 'next' pointer */
+                                iter->hw_next =
+                                        list_entry(iter->chain_node.next,
+                                                struct ppc440spe_adma_desc_slot,
+                                                chain_node);
+                                ppc440spe_xor_set_link(iter, iter->hw_next);
+                        } else {
+                                /* this is the last descriptor. */
+                                iter->hw_next = NULL;
+                        }
+                }
+
+                /* fixup head descriptor */
+                sw_desc->dst_cnt = dst_cnt;
+                if (flags & DMA_PREP_ZERO_P)
+                        set_bit(PPC440SPE_ZERO_P, &sw_desc->flags);
+                if (flags & DMA_PREP_ZERO_Q)
+                        set_bit(PPC440SPE_ZERO_Q, &sw_desc->flags);
+
+                /* setup dst/src/mult */
+                ppc440spe_adma_pq_set_dest(sw_desc, dst, flags);
+
+                while (src_cnt--) {
+                        /* handle descriptors (if dst_cnt == 2) inside
+                         * the ppc440spe_adma_pq_set_srcxxx() functions
+                         */
+                        ppc440spe_adma_pq_set_src(sw_desc, src[src_cnt],
+                                                  src_cnt);
+                        if (!(flags & DMA_PREP_PQ_DISABLE_Q))
+                                mult = scf[src_cnt];
+                        ppc440spe_adma_pq_set_src_mult(sw_desc,
+                                        mult, src_cnt, dst_cnt - 1);
+                }
+        }
+        spin_unlock_bh(&ppc440spe_chan->lock);
+        ppc440spe_desc_set_rxor_block_size(len);
+        return sw_desc;
+}
+
+/**
+ * ppc440spe_adma_prep_dma_pq - prepare CDB (group) for a GF-XOR operation
+ */
+static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_pq(
+                struct dma_chan *chan, dma_addr_t *dst, dma_addr_t *src,
+                unsigned int src_cnt, const unsigned char *scf,
+                size_t len, unsigned long flags)
+{
+        struct ppc440spe_adma_chan *ppc440spe_chan;
+        struct ppc440spe_adma_desc_slot *sw_desc = NULL;
+        int dst_cnt = 0;
+
+        ppc440spe_chan = to_ppc440spe_adma_chan(chan);
+
+        ADMA_LL_DBG(prep_dma_pq_dbg(ppc440spe_chan->device->id,
+                                    dst, src, src_cnt));
+        BUG_ON(!len);
+        BUG_ON(unlikely(len > PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT));
+        BUG_ON(!src_cnt);
+
+        if (src_cnt == 1 && dst[1] == src[0]) {
+                dma_addr_t dest[2];
+
+                /* dst[1] is real destination (Q) */
+                dest[0] = dst[1];
+                /* this is the page to multicast source data to */
+                dest[1] = ppc440spe_chan->qdest;
+                sw_desc = ppc440spe_dma01_prep_mult(ppc440spe_chan,
+                                dest, 2, src, src_cnt, scf, len, flags);
+                return sw_desc ? &sw_desc->async_tx : NULL;
+        }
+
+        if (src_cnt == 2 && dst[1] == src[1]) {
+                sw_desc = ppc440spe_dma01_prep_sum_product(ppc440spe_chan,
+                                        &dst[1], src, 2, scf, len, flags);
+                return sw_desc ? &sw_desc->async_tx : NULL;
+        }
+
+        if (!(flags & DMA_PREP_PQ_DISABLE_P)) {
+                BUG_ON(!dst[0]);
+                dst_cnt++;
+                flags |= DMA_PREP_ZERO_P;
+        }
+
+        if (!(flags & DMA_PREP_PQ_DISABLE_Q)) {
+                BUG_ON(!dst[1]);
+                dst_cnt++;
+                flags |= DMA_PREP_ZERO_Q;
+        }
+
+        BUG_ON(!dst_cnt);
+
+        dev_dbg(ppc440spe_chan->device->common.dev,
+                "ppc440spe adma%d: %s src_cnt: %d len: %u int_en: %d\n",
+                ppc440spe_chan->device->id, __func__, src_cnt, len,
+                flags & DMA_PREP_INTERRUPT ? 1 : 0);
+
+        switch (ppc440spe_chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                sw_desc = ppc440spe_dma01_prep_pq(ppc440spe_chan,
+                                dst, dst_cnt, src, src_cnt, scf,
+                                len, flags);
+                break;
+
+        case PPC440SPE_XOR_ID:
+                sw_desc = ppc440spe_dma2_prep_pq(ppc440spe_chan,
+                                dst, dst_cnt, src, src_cnt, scf,
+                                len, flags);
+                break;
+        }
+
+        return sw_desc ? &sw_desc->async_tx : NULL;
+}
+
+/**
+ * ppc440spe_adma_prep_dma_pqzero_sum - prepare CDB group for
+ * a PQ_ZERO_SUM operation
+ */
+static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_pqzero_sum(
+                struct dma_chan *chan, dma_addr_t *pq, dma_addr_t *src,
+                unsigned int src_cnt, const unsigned char *scf, size_t len,
+                enum sum_check_flags *pqres, unsigned long flags)
+{
+        struct ppc440spe_adma_chan *ppc440spe_chan;
+        struct ppc440spe_adma_desc_slot *sw_desc, *iter;
+        dma_addr_t pdest, qdest;
+        int slot_cnt, slots_per_op, idst, dst_cnt;
+
+        ppc440spe_chan = to_ppc440spe_adma_chan(chan);
+
+        if (flags & DMA_PREP_PQ_DISABLE_P)
+                pdest = 0;
+        else
+                pdest = pq[0];
+
+        if (flags & DMA_PREP_PQ_DISABLE_Q)
+                qdest = 0;
+        else
+                qdest = pq[1];
+
+        ADMA_LL_DBG(prep_dma_pqzero_sum_dbg(ppc440spe_chan->device->id,
+                                            src, src_cnt, scf));
+
+        /* Always use WXOR for P/Q calculations (two destinations).
+         * Need 1 or 2 extra slots to verify results are zero.
+         */
+        idst = dst_cnt = (pdest && qdest) ? 2 : 1;
+
+        /* One additional slot per destination to clone P/Q
+         * before calculation (we have to preserve destinations).
+         */
+        slot_cnt = src_cnt + dst_cnt * 2;
+        slots_per_op = 1;
+
+        spin_lock_bh(&ppc440spe_chan->lock);
+        sw_desc = ppc440spe_adma_alloc_slots(ppc440spe_chan, slot_cnt,
+                                             slots_per_op);
+        if (sw_desc) {
+                ppc440spe_desc_init_dma01pqzero_sum(sw_desc, dst_cnt, src_cnt);
+
+                /* Setup byte count for each slot just allocated */
+                sw_desc->async_tx.flags = flags;
+                list_for_each_entry(iter, &sw_desc->group_list, chain_node) {
+                        ppc440spe_desc_set_byte_count(iter, ppc440spe_chan,
+                                                      len);
+                        iter->unmap_len = len;
+                }
+
+                if (pdest) {
+                        struct dma_cdb *hw_desc;
+                        struct ppc440spe_adma_chan *chan;
+
+                        iter = sw_desc->group_head;
+                        chan = to_ppc440spe_adma_chan(iter->async_tx.chan);
+                        memset(iter->hw_desc, 0, sizeof(struct dma_cdb));
+                        iter->hw_next = list_entry(iter->chain_node.next,
+                                                struct ppc440spe_adma_desc_slot,
+                                                chain_node);
+                        hw_desc = iter->hw_desc;
+                        hw_desc->opc = DMA_CDB_OPC_MV_SG1_SG2;
+                        iter->src_cnt = 0;
+                        iter->dst_cnt = 0;
+                        ppc440spe_desc_set_dest_addr(iter, chan, 0,
+                                                     ppc440spe_chan->pdest, 0);
+                        ppc440spe_desc_set_src_addr(iter, chan, 0, 0, pdest);
+                        ppc440spe_desc_set_byte_count(iter, ppc440spe_chan,
+                                                      len);
+                        iter->unmap_len = 0;
+                        /* override pdest to preserve original P */
+                        pdest = ppc440spe_chan->pdest;
+                }
+                if (qdest) {
+                        struct dma_cdb *hw_desc;
+                        struct ppc440spe_adma_chan *chan;
+
+                        iter = list_first_entry(&sw_desc->group_list,
+                                                struct ppc440spe_adma_desc_slot,
+                                                chain_node);
+                        chan = to_ppc440spe_adma_chan(iter->async_tx.chan);
+
+                        if (pdest) {
+                                iter = list_entry(iter->chain_node.next,
+                                                struct ppc440spe_adma_desc_slot,
+                                                chain_node);
+                        }
+
+                        memset(iter->hw_desc, 0, sizeof(struct dma_cdb));
+                        iter->hw_next = list_entry(iter->chain_node.next,
+                                                struct ppc440spe_adma_desc_slot,
+                                                chain_node);
+                        hw_desc = iter->hw_desc;
+                        hw_desc->opc = DMA_CDB_OPC_MV_SG1_SG2;
+                        iter->src_cnt = 0;
+                        iter->dst_cnt = 0;
+                        ppc440spe_desc_set_dest_addr(iter, chan, 0,
+                                                     ppc440spe_chan->qdest, 0);
+                        ppc440spe_desc_set_src_addr(iter, chan, 0, 0, qdest);
+                        ppc440spe_desc_set_byte_count(iter, ppc440spe_chan,
+                                                      len);
+                        iter->unmap_len = 0;
+                        /* override qdest to preserve original Q */
+                        qdest = ppc440spe_chan->qdest;
+                }
+
+                /* Setup destinations for P/Q ops */
+                ppc440spe_adma_pqzero_sum_set_dest(sw_desc, pdest, qdest);
+
+                /* Setup zero QWORDs into DCHECK CDBs */
+                idst = dst_cnt;
+                list_for_each_entry_reverse(iter, &sw_desc->group_list,
+                                            chain_node) {
+                        /*
+                         * The last CDB corresponds to Q-parity check,
+                         * the one before last CDB corresponds
+                         * P-parity check
+                         */
+                        if (idst == DMA_DEST_MAX_NUM) {
+                                if (idst == dst_cnt) {
+                                        set_bit(PPC440SPE_DESC_QCHECK,
+                                                &iter->flags);
+                                } else {
+                                        set_bit(PPC440SPE_DESC_PCHECK,
+                                                &iter->flags);
+                                }
+                        } else {
+                                if (qdest) {
+                                        set_bit(PPC440SPE_DESC_QCHECK,
+                                                &iter->flags);
+                                } else {
+                                        set_bit(PPC440SPE_DESC_PCHECK,
+                                                &iter->flags);
+                                }
+                        }
+                        iter->xor_check_result = pqres;
+
+                        /*
+                         * set it to zero, if check fail then result will
+                         * be updated
+                         */
+                        *iter->xor_check_result = 0;
+                        ppc440spe_desc_set_dcheck(iter, ppc440spe_chan,
+                                ppc440spe_qword);
+
+                        if (!(--dst_cnt))
+                                break;
+                }
+
+                /* Setup sources and mults for P/Q ops */
+                list_for_each_entry_continue_reverse(iter, &sw_desc->group_list,
+                                                     chain_node) {
+                        struct ppc440spe_adma_chan *chan;
+                        u32 mult_dst;
+
+                        chan = to_ppc440spe_adma_chan(iter->async_tx.chan);
+                        ppc440spe_desc_set_src_addr(iter, chan, 0,
+                                                    DMA_CUED_XOR_HB,
+                                                    src[src_cnt - 1]);
+                        if (qdest) {
+                                mult_dst = (dst_cnt - 1) ? DMA_CDB_SG_DST2 :
+                                                           DMA_CDB_SG_DST1;
+                                ppc440spe_desc_set_src_mult(iter, chan,
+                                                            DMA_CUED_MULT1_OFF,
+                                                            mult_dst,
+                                                            scf[src_cnt - 1]);
+                        }
+                        if (!(--src_cnt))
+                                break;
+                }
+        }
+        spin_unlock_bh(&ppc440spe_chan->lock);
+        return sw_desc ? &sw_desc->async_tx : NULL;
+}
+
+/**
+ * ppc440spe_adma_prep_dma_xor_zero_sum - prepare CDB group for
+ * XOR ZERO_SUM operation
+ */
+static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_xor_zero_sum(
+                struct dma_chan *chan, dma_addr_t *src, unsigned int src_cnt,
+                size_t len, enum sum_check_flags *result, unsigned long flags)
+{
+        struct dma_async_tx_descriptor *tx;
+        dma_addr_t pq[2];
+
+        /* validate P, disable Q */
+        pq[0] = src[0];
+        pq[1] = 0;
+        flags |= DMA_PREP_PQ_DISABLE_Q;
+
+        tx = ppc440spe_adma_prep_dma_pqzero_sum(chan, pq, &src[1],
+                                                src_cnt - 1, 0, len,
+                                                result, flags);
+        return tx;
+}
+
+/**
+ * ppc440spe_adma_set_dest - set destination address into descriptor
+ */
+static void ppc440spe_adma_set_dest(struct ppc440spe_adma_desc_slot *sw_desc,
+                dma_addr_t addr, int index)
+{
+        struct ppc440spe_adma_chan *chan;
+
+        BUG_ON(index >= sw_desc->dst_cnt);
+
+        chan = to_ppc440spe_adma_chan(sw_desc->async_tx.chan);
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                /* to do: support transfers lengths >
+                 * PPC440SPE_ADMA_DMA/XOR_MAX_BYTE_COUNT
+                 */
+                ppc440spe_desc_set_dest_addr(sw_desc->group_head,
+                        chan, 0, addr, index);
+                break;
+        case PPC440SPE_XOR_ID:
+                sw_desc = ppc440spe_get_group_entry(sw_desc, index);
+                ppc440spe_desc_set_dest_addr(sw_desc,
+                        chan, 0, addr, index);
+                break;
+        }
+}
+
+static void ppc440spe_adma_pq_zero_op(struct ppc440spe_adma_desc_slot *iter,
+                struct ppc440spe_adma_chan *chan, dma_addr_t addr)
+{
+        /*  To clear destinations update the descriptor
+         * (P or Q depending on index) as follows:
+         * addr is destination (0 corresponds to SG2):
+         */
+        ppc440spe_desc_set_dest_addr(iter, chan, DMA_CUED_XOR_BASE, addr, 0);
+
+        /* ... and the addr is source: */
+        ppc440spe_desc_set_src_addr(iter, chan, 0, DMA_CUED_XOR_HB, addr);
+
+        /* addr is always SG2 then the mult is always DST1 */
+        ppc440spe_desc_set_src_mult(iter, chan, DMA_CUED_MULT1_OFF,
+                                    DMA_CDB_SG_DST1, 1);
+}
+
+/**
+ * ppc440spe_adma_pq_set_dest - set destination address into descriptor
+ * for the PQXOR operation
+ */
+static void ppc440spe_adma_pq_set_dest(struct ppc440spe_adma_desc_slot *sw_desc,
+                dma_addr_t *addrs, unsigned long flags)
+{
+        struct ppc440spe_adma_desc_slot *iter;
+        struct ppc440spe_adma_chan *chan;
+        dma_addr_t paddr, qaddr;
+        dma_addr_t addr = 0, ppath, qpath;
+        int index = 0, i;
+
+        chan = to_ppc440spe_adma_chan(sw_desc->async_tx.chan);
+
+        if (flags & DMA_PREP_PQ_DISABLE_P)
+                paddr = 0;
+        else
+                paddr = addrs[0];
+
+        if (flags & DMA_PREP_PQ_DISABLE_Q)
+                qaddr = 0;
+        else
+                qaddr = addrs[1];
+
+        if (!paddr || !qaddr)
+                addr = paddr ? paddr : qaddr;
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                /* walk through the WXOR source list and set P/Q-destinations
+                 * for each slot:
+                 */
+                if (!test_bit(PPC440SPE_DESC_RXOR, &sw_desc->flags)) {
+                        /* This is WXOR-only chain; may have 1/2 zero descs */
+                        if (test_bit(PPC440SPE_ZERO_P, &sw_desc->flags))
+                                index++;
+                        if (test_bit(PPC440SPE_ZERO_Q, &sw_desc->flags))
+                                index++;
+
+                        iter = ppc440spe_get_group_entry(sw_desc, index);
+                        if (addr) {
+                                /* one destination */
+                                list_for_each_entry_from(iter,
+                                        &sw_desc->group_list, chain_node)
+                                        ppc440spe_desc_set_dest_addr(iter, chan,
+                                                DMA_CUED_XOR_BASE, addr, 0);
+                        } else {
+                                /* two destinations */
+                                list_for_each_entry_from(iter,
+                                        &sw_desc->group_list, chain_node) {
+                                        ppc440spe_desc_set_dest_addr(iter, chan,
+                                                DMA_CUED_XOR_BASE, paddr, 0);
+                                        ppc440spe_desc_set_dest_addr(iter, chan,
+                                                DMA_CUED_XOR_BASE, qaddr, 1);
+                                }
+                        }
+
+                        if (index) {
+                                /*  To clear destinations update the descriptor
+                                 * (1st,2nd, or both depending on flags)
+                                 */
+                                index = 0;
+                                if (test_bit(PPC440SPE_ZERO_P,
+                                                &sw_desc->flags)) {
+                                        iter = ppc440spe_get_group_entry(
+                                                        sw_desc, index++);
+                                        ppc440spe_adma_pq_zero_op(iter, chan,
+                                                        paddr);
+                                }
+
+                                if (test_bit(PPC440SPE_ZERO_Q,
+                                                &sw_desc->flags)) {
+                                        iter = ppc440spe_get_group_entry(
+                                                        sw_desc, index++);
+                                        ppc440spe_adma_pq_zero_op(iter, chan,
+                                                        qaddr);
+                                }
+
+                                return;
+                        }
+                } else {
+                        /* This is RXOR-only or RXOR/WXOR mixed chain */
+
+                        /* If we want to include destination into calculations,
+                         * then make dest addresses cued with mult=1 (XOR).
+                         */
+                        ppath = test_bit(PPC440SPE_ZERO_P, &sw_desc->flags) ?
+                                        DMA_CUED_XOR_HB :
+                                        DMA_CUED_XOR_BASE |
+                                                (1 << DMA_CUED_MULT1_OFF);
+                        qpath = test_bit(PPC440SPE_ZERO_Q, &sw_desc->flags) ?
+                                        DMA_CUED_XOR_HB :
+                                        DMA_CUED_XOR_BASE |
+                                                (1 << DMA_CUED_MULT1_OFF);
+
+                        /* Setup destination(s) in RXOR slot(s) */
+                        iter = ppc440spe_get_group_entry(sw_desc, index++);
+                        ppc440spe_desc_set_dest_addr(iter, chan,
+                                                paddr ? ppath : qpath,
+                                                paddr ? paddr : qaddr, 0);
+                        if (!addr) {
+                                /* two destinations */
+                                iter = ppc440spe_get_group_entry(sw_desc,
+                                                                 index++);
+                                ppc440spe_desc_set_dest_addr(iter, chan,
+                                                qpath, qaddr, 0);
+                        }
+
+                        if (test_bit(PPC440SPE_DESC_WXOR, &sw_desc->flags)) {
+                                /* Setup destination(s) in remaining WXOR
+                                 * slots
+                                 */
+                                iter = ppc440spe_get_group_entry(sw_desc,
+                                                                 index);
+                                if (addr) {
+                                        /* one destination */
+                                        list_for_each_entry_from(iter,
+                                            &sw_desc->group_list,
+                                            chain_node)
+                                                ppc440spe_desc_set_dest_addr(
+                                                        iter, chan,
+                                                        DMA_CUED_XOR_BASE,
+                                                        addr, 0);
+
+                                } else {
+                                        /* two destinations */
+                                        list_for_each_entry_from(iter,
+                                            &sw_desc->group_list,
+                                            chain_node) {
+                                                ppc440spe_desc_set_dest_addr(
+                                                        iter, chan,
+                                                        DMA_CUED_XOR_BASE,
+                                                        paddr, 0);
+                                                ppc440spe_desc_set_dest_addr(
+                                                        iter, chan,
+                                                        DMA_CUED_XOR_BASE,
+                                                        qaddr, 1);
+                                        }
+                                }
+                        }
+
+                }
+                break;
+
+        case PPC440SPE_XOR_ID:
+                /* DMA2 descriptors have only 1 destination, so there are
+                 * two chains - one for each dest.
+                 * If we want to include destination into calculations,
+                 * then make dest addresses cued with mult=1 (XOR).
+                 */
+                ppath = test_bit(PPC440SPE_ZERO_P, &sw_desc->flags) ?
+                                DMA_CUED_XOR_HB :
+                                DMA_CUED_XOR_BASE |
+                                        (1 << DMA_CUED_MULT1_OFF);
+
+                qpath = test_bit(PPC440SPE_ZERO_Q, &sw_desc->flags) ?
+                                DMA_CUED_XOR_HB :
+                                DMA_CUED_XOR_BASE |
+                                        (1 << DMA_CUED_MULT1_OFF);
+
+                iter = ppc440spe_get_group_entry(sw_desc, 0);
+                for (i = 0; i < sw_desc->descs_per_op; i++) {
+                        ppc440spe_desc_set_dest_addr(iter, chan,
+                                paddr ? ppath : qpath,
+                                paddr ? paddr : qaddr, 0);
+                        iter = list_entry(iter->chain_node.next,
+                                          struct ppc440spe_adma_desc_slot,
+                                          chain_node);
+                }
+
+                if (!addr) {
+                        /* Two destinations; setup Q here */
+                        iter = ppc440spe_get_group_entry(sw_desc,
+                                sw_desc->descs_per_op);
+                        for (i = 0; i < sw_desc->descs_per_op; i++) {
+                                ppc440spe_desc_set_dest_addr(iter,
+                                        chan, qpath, qaddr, 0);
+                                iter = list_entry(iter->chain_node.next,
+                                                struct ppc440spe_adma_desc_slot,
+                                                chain_node);
+                        }
+                }
+
+                break;
+        }
+}
+
+/**
+ * ppc440spe_adma_pq_zero_sum_set_dest - set destination address into descriptor
+ * for the PQ_ZERO_SUM operation
+ */
+static void ppc440spe_adma_pqzero_sum_set_dest(
+                struct ppc440spe_adma_desc_slot *sw_desc,
+                dma_addr_t paddr, dma_addr_t qaddr)
+{
+        struct ppc440spe_adma_desc_slot *iter, *end;
+        struct ppc440spe_adma_chan *chan;
+        dma_addr_t addr = 0;
+        int idx;
+
+        chan = to_ppc440spe_adma_chan(sw_desc->async_tx.chan);
+
+        /* walk through the WXOR source list and set P/Q-destinations
+         * for each slot
+         */
+        idx = (paddr && qaddr) ? 2 : 1;
+        /* set end */
+        list_for_each_entry_reverse(end, &sw_desc->group_list,
+                                    chain_node) {
+                if (!(--idx))
+                        break;
+        }
+        /* set start */
+        idx = (paddr && qaddr) ? 2 : 1;
+        iter = ppc440spe_get_group_entry(sw_desc, idx);
+
+        if (paddr && qaddr) {
+                /* two destinations */
+                list_for_each_entry_from(iter, &sw_desc->group_list,
+                                         chain_node) {
+                        if (unlikely(iter == end))
+                                break;
+                        ppc440spe_desc_set_dest_addr(iter, chan,
+                                                DMA_CUED_XOR_BASE, paddr, 0);
+                        ppc440spe_desc_set_dest_addr(iter, chan,
+                                                DMA_CUED_XOR_BASE, qaddr, 1);
+                }
+        } else {
+                /* one destination */
+                addr = paddr ? paddr : qaddr;
+                list_for_each_entry_from(iter, &sw_desc->group_list,
+                                         chain_node) {
+                        if (unlikely(iter == end))
+                                break;
+                        ppc440spe_desc_set_dest_addr(iter, chan,
+                                                DMA_CUED_XOR_BASE, addr, 0);
+                }
+        }
+
+        /*  The remaining descriptors are DATACHECK. These have no need in
+         * destination. Actually, these destinations are used there
+         * as sources for check operation. So, set addr as source.
+         */
+        ppc440spe_desc_set_src_addr(end, chan, 0, 0, addr ? addr : paddr);
+
+        if (!addr) {
+                end = list_entry(end->chain_node.next,
+                                 struct ppc440spe_adma_desc_slot, chain_node);
+                ppc440spe_desc_set_src_addr(end, chan, 0, 0, qaddr);
+        }
+}
+
+/**
+ * ppc440spe_desc_set_xor_src_cnt - set source count into descriptor
+ */
+static inline void ppc440spe_desc_set_xor_src_cnt(
+                        struct ppc440spe_adma_desc_slot *desc,
+                        int src_cnt)
+{
+        struct xor_cb *hw_desc = desc->hw_desc;
+
+        hw_desc->cbc &= ~XOR_CDCR_OAC_MSK;
+        hw_desc->cbc |= src_cnt;
+}
+
+/**
+ * ppc440spe_adma_pq_set_src - set source address into descriptor
+ */
+static void ppc440spe_adma_pq_set_src(struct ppc440spe_adma_desc_slot *sw_desc,
+                dma_addr_t addr, int index)
+{
+        struct ppc440spe_adma_chan *chan;
+        dma_addr_t haddr = 0;
+        struct ppc440spe_adma_desc_slot *iter = NULL;
+
+        chan = to_ppc440spe_adma_chan(sw_desc->async_tx.chan);
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                /* DMA0,1 may do: WXOR, RXOR, RXOR+WXORs chain
+                 */
+                if (test_bit(PPC440SPE_DESC_RXOR, &sw_desc->flags)) {
+                        /* RXOR-only or RXOR/WXOR operation */
+                        int iskip = test_bit(PPC440SPE_DESC_RXOR12,
+                                &sw_desc->flags) ?  2 : 3;
+
+                        if (index == 0) {
+                                /* 1st slot (RXOR) */
+                                /* setup sources region (R1-2-3, R1-2-4,
+                                 * or R1-2-5)
+                                 */
+                                if (test_bit(PPC440SPE_DESC_RXOR12,
+                                                &sw_desc->flags))
+                                        haddr = DMA_RXOR12 <<
+                                                DMA_CUED_REGION_OFF;
+                                else if (test_bit(PPC440SPE_DESC_RXOR123,
+                                    &sw_desc->flags))
+                                        haddr = DMA_RXOR123 <<
+                                                DMA_CUED_REGION_OFF;
+                                else if (test_bit(PPC440SPE_DESC_RXOR124,
+                                    &sw_desc->flags))
+                                        haddr = DMA_RXOR124 <<
+                                                DMA_CUED_REGION_OFF;
+                                else if (test_bit(PPC440SPE_DESC_RXOR125,
+                                    &sw_desc->flags))
+                                        haddr = DMA_RXOR125 <<
+                                                DMA_CUED_REGION_OFF;
+                                else
+                                        BUG();
+                                haddr |= DMA_CUED_XOR_BASE;
+                                iter = ppc440spe_get_group_entry(sw_desc, 0);
+                        } else if (index < iskip) {
+                                /* 1st slot (RXOR)
+                                 * shall actually set source address only once
+                                 * instead of first <iskip>
+                                 */
+                                iter = NULL;
+                        } else {
+                                /* 2nd/3d and next slots (WXOR);
+                                 * skip first slot with RXOR
+                                 */
+                                haddr = DMA_CUED_XOR_HB;
+                                iter = ppc440spe_get_group_entry(sw_desc,
+                                    index - iskip + sw_desc->dst_cnt);
+                        }
+                } else {
+                        int znum = 0;
+
+                        /* WXOR-only operation; skip first slots with
+                         * zeroing destinations
+                         */
+                        if (test_bit(PPC440SPE_ZERO_P, &sw_desc->flags))
+                                znum++;
+                        if (test_bit(PPC440SPE_ZERO_Q, &sw_desc->flags))
+                                znum++;
+
+                        haddr = DMA_CUED_XOR_HB;
+                        iter = ppc440spe_get_group_entry(sw_desc,
+                                        index + znum);
+                }
+
+                if (likely(iter)) {
+                        ppc440spe_desc_set_src_addr(iter, chan, 0, haddr, addr);
+
+                        if (!index &&
+                            test_bit(PPC440SPE_DESC_RXOR, &sw_desc->flags) &&
+                            sw_desc->dst_cnt == 2) {
+                                /* if we have two destinations for RXOR, then
+                                 * setup source in the second descr too
+                                 */
+                                iter = ppc440spe_get_group_entry(sw_desc, 1);
+                                ppc440spe_desc_set_src_addr(iter, chan, 0,
+                                        haddr, addr);
+                        }
+                }
+                break;
+
+        case PPC440SPE_XOR_ID:
+                /* DMA2 may do Biskup */
+                iter = sw_desc->group_head;
+                if (iter->dst_cnt == 2) {
+                        /* both P & Q calculations required; set P src here */
+                        ppc440spe_adma_dma2rxor_set_src(iter, index, addr);
+
+                        /* this is for Q */
+                        iter = ppc440spe_get_group_entry(sw_desc,
+                                sw_desc->descs_per_op);
+                }
+                ppc440spe_adma_dma2rxor_set_src(iter, index, addr);
+                break;
+        }
+}
+
+/**
+ * ppc440spe_adma_memcpy_xor_set_src - set source address into descriptor
+ */
+static void ppc440spe_adma_memcpy_xor_set_src(
+                struct ppc440spe_adma_desc_slot *sw_desc,
+                dma_addr_t addr, int index)
+{
+        struct ppc440spe_adma_chan *chan;
+
+        chan = to_ppc440spe_adma_chan(sw_desc->async_tx.chan);
+        sw_desc = sw_desc->group_head;
+
+        if (likely(sw_desc))
+                ppc440spe_desc_set_src_addr(sw_desc, chan, index, 0, addr);
+}
+
+/**
+ * ppc440spe_adma_dma2rxor_inc_addr  -
+ */
+static void ppc440spe_adma_dma2rxor_inc_addr(
+                struct ppc440spe_adma_desc_slot *desc,
+                struct ppc440spe_rxor *cursor, int index, int src_cnt)
+{
+        cursor->addr_count++;
+        if (index == src_cnt - 1) {
+                ppc440spe_desc_set_xor_src_cnt(desc, cursor->addr_count);
+        } else if (cursor->addr_count == XOR_MAX_OPS) {
+                ppc440spe_desc_set_xor_src_cnt(desc, cursor->addr_count);
+                cursor->addr_count = 0;
+                cursor->desc_count++;
+        }
+}
+
+/**
+ * ppc440spe_adma_dma2rxor_prep_src - setup RXOR types in DMA2 CDB
+ */
+static int ppc440spe_adma_dma2rxor_prep_src(
+                struct ppc440spe_adma_desc_slot *hdesc,
+                struct ppc440spe_rxor *cursor, int index,
+                int src_cnt, u32 addr)
+{
+        int rval = 0;
+        u32 sign;
+        struct ppc440spe_adma_desc_slot *desc = hdesc;
+        int i;
+
+        for (i = 0; i < cursor->desc_count; i++) {
+                desc = list_entry(hdesc->chain_node.next,
+                                  struct ppc440spe_adma_desc_slot,
+                                  chain_node);
+        }
+
+        switch (cursor->state) {
+        case 0:
+                if (addr == cursor->addrl + cursor->len) {
+                        /* direct RXOR */
+                        cursor->state = 1;
+                        cursor->xor_count++;
+                        if (index == src_cnt-1) {
+                                ppc440spe_rxor_set_region(desc,
+                                        cursor->addr_count,
+                                        DMA_RXOR12 << DMA_CUED_REGION_OFF);
+                                ppc440spe_adma_dma2rxor_inc_addr(
+                                        desc, cursor, index, src_cnt);
+                        }
+                } else if (cursor->addrl == addr + cursor->len) {
+                        /* reverse RXOR */
+                        cursor->state = 1;
+                        cursor->xor_count++;
+                        set_bit(cursor->addr_count, &desc->reverse_flags[0]);
+                        if (index == src_cnt-1) {
+                                ppc440spe_rxor_set_region(desc,
+                                        cursor->addr_count,
+                                        DMA_RXOR12 << DMA_CUED_REGION_OFF);
+                                ppc440spe_adma_dma2rxor_inc_addr(
+                                        desc, cursor, index, src_cnt);
+                        }
+                } else {
+                        printk(KERN_ERR "Cannot build "
+                                "DMA2 RXOR command block.\n");
+                        BUG();
+                }
+                break;
+        case 1:
+                sign = test_bit(cursor->addr_count,
+                                desc->reverse_flags)
+                        ? -1 : 1;
+                if (index == src_cnt-2 || (sign == -1
+                        && addr != cursor->addrl - 2*cursor->len)) {
+                        cursor->state = 0;
+                        cursor->xor_count = 1;
+                        cursor->addrl = addr;
+                        ppc440spe_rxor_set_region(desc,
+                                cursor->addr_count,
+                                DMA_RXOR12 << DMA_CUED_REGION_OFF);
+                        ppc440spe_adma_dma2rxor_inc_addr(
+                                desc, cursor, index, src_cnt);
+                } else if (addr == cursor->addrl + 2*sign*cursor->len) {
+                        cursor->state = 2;
+                        cursor->xor_count = 0;
+                        ppc440spe_rxor_set_region(desc,
+                                cursor->addr_count,
+                                DMA_RXOR123 << DMA_CUED_REGION_OFF);
+                        if (index == src_cnt-1) {
+                                ppc440spe_adma_dma2rxor_inc_addr(
+                                        desc, cursor, index, src_cnt);
+                        }
+                } else if (addr == cursor->addrl + 3*cursor->len) {
+                        cursor->state = 2;
+                        cursor->xor_count = 0;
+                        ppc440spe_rxor_set_region(desc,
+                                cursor->addr_count,
+                                DMA_RXOR124 << DMA_CUED_REGION_OFF);
+                        if (index == src_cnt-1) {
+                                ppc440spe_adma_dma2rxor_inc_addr(
+                                        desc, cursor, index, src_cnt);
+                        }
+                } else if (addr == cursor->addrl + 4*cursor->len) {
+                        cursor->state = 2;
+                        cursor->xor_count = 0;
+                        ppc440spe_rxor_set_region(desc,
+                                cursor->addr_count,
+                                DMA_RXOR125 << DMA_CUED_REGION_OFF);
+                        if (index == src_cnt-1) {
+                                ppc440spe_adma_dma2rxor_inc_addr(
+                                        desc, cursor, index, src_cnt);
+                        }
+                } else {
+                        cursor->state = 0;
+                        cursor->xor_count = 1;
+                        cursor->addrl = addr;
+                        ppc440spe_rxor_set_region(desc,
+                                cursor->addr_count,
+                                DMA_RXOR12 << DMA_CUED_REGION_OFF);
+                        ppc440spe_adma_dma2rxor_inc_addr(
+                                desc, cursor, index, src_cnt);
+                }
+                break;
+        case 2:
+                cursor->state = 0;
+                cursor->addrl = addr;
+                cursor->xor_count++;
+                if (index) {
+                        ppc440spe_adma_dma2rxor_inc_addr(
+                                desc, cursor, index, src_cnt);
+                }
+                break;
+        }
+
+        return rval;
+}
+
+/**
+ * ppc440spe_adma_dma2rxor_set_src - set RXOR source address; it's assumed that
+ *      ppc440spe_adma_dma2rxor_prep_src() has already done prior this call
+ */
+static void ppc440spe_adma_dma2rxor_set_src(
+                struct ppc440spe_adma_desc_slot *desc,
+                int index, dma_addr_t addr)
+{
+        struct xor_cb *xcb = desc->hw_desc;
+        int k = 0, op = 0, lop = 0;
+
+        /* get the RXOR operand which corresponds to index addr */
+        while (op <= index) {
+                lop = op;
+                if (k == XOR_MAX_OPS) {
+                        k = 0;
+                        desc = list_entry(desc->chain_node.next,
+                                struct ppc440spe_adma_desc_slot, chain_node);
+                        xcb = desc->hw_desc;
+
+                }
+                if ((xcb->ops[k++].h & (DMA_RXOR12 << DMA_CUED_REGION_OFF)) ==
+                    (DMA_RXOR12 << DMA_CUED_REGION_OFF))
+                        op += 2;
+                else
+                        op += 3;
+        }
+
+        BUG_ON(k < 1);
+
+        if (test_bit(k-1, desc->reverse_flags)) {
+                /* reverse operand order; put last op in RXOR group */
+                if (index == op - 1)
+                        ppc440spe_rxor_set_src(desc, k - 1, addr);
+        } else {
+                /* direct operand order; put first op in RXOR group */
+                if (index == lop)
+                        ppc440spe_rxor_set_src(desc, k - 1, addr);
+        }
+}
+
+/**
+ * ppc440spe_adma_dma2rxor_set_mult - set RXOR multipliers; it's assumed that
+ *      ppc440spe_adma_dma2rxor_prep_src() has already done prior this call
+ */
+static void ppc440spe_adma_dma2rxor_set_mult(
+                struct ppc440spe_adma_desc_slot *desc,
+                int index, u8 mult)
+{
+        struct xor_cb *xcb = desc->hw_desc;
+        int k = 0, op = 0, lop = 0;
+
+        /* get the RXOR operand which corresponds to index mult */
+        while (op <= index) {
+                lop = op;
+                if (k == XOR_MAX_OPS) {
+                        k = 0;
+                        desc = list_entry(desc->chain_node.next,
+                                          struct ppc440spe_adma_desc_slot,
+                                          chain_node);
+                        xcb = desc->hw_desc;
+
+                }
+                if ((xcb->ops[k++].h & (DMA_RXOR12 << DMA_CUED_REGION_OFF)) ==
+                    (DMA_RXOR12 << DMA_CUED_REGION_OFF))
+                        op += 2;
+                else
+                        op += 3;
+        }
+
+        BUG_ON(k < 1);
+        if (test_bit(k-1, desc->reverse_flags)) {
+                /* reverse order */
+                ppc440spe_rxor_set_mult(desc, k - 1, op - index - 1, mult);
+        } else {
+                /* direct order */
+                ppc440spe_rxor_set_mult(desc, k - 1, index - lop, mult);
+        }
+}
+
+/**
+ * ppc440spe_init_rxor_cursor -
+ */
+static void ppc440spe_init_rxor_cursor(struct ppc440spe_rxor *cursor)
+{
+        memset(cursor, 0, sizeof(struct ppc440spe_rxor));
+        cursor->state = 2;
+}
+
+/**
+ * ppc440spe_adma_pq_set_src_mult - set multiplication coefficient into
+ * descriptor for the PQXOR operation
+ */
+static void ppc440spe_adma_pq_set_src_mult(
+                struct ppc440spe_adma_desc_slot *sw_desc,
+                unsigned char mult, int index, int dst_pos)
+{
+        struct ppc440spe_adma_chan *chan;
+        u32 mult_idx, mult_dst;
+        struct ppc440spe_adma_desc_slot *iter = NULL, *iter1 = NULL;
+
+        chan = to_ppc440spe_adma_chan(sw_desc->async_tx.chan);
+
+        switch (chan->device->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                if (test_bit(PPC440SPE_DESC_RXOR, &sw_desc->flags)) {
+                        int region = test_bit(PPC440SPE_DESC_RXOR12,
+                                        &sw_desc->flags) ? 2 : 3;
+
+                        if (index < region) {
+                                /* RXOR multipliers */
+                                iter = ppc440spe_get_group_entry(sw_desc,
+                                        sw_desc->dst_cnt - 1);
+                                if (sw_desc->dst_cnt == 2)
+                                        iter1 = ppc440spe_get_group_entry(
+                                                        sw_desc, 0);
+
+                                mult_idx = DMA_CUED_MULT1_OFF + (index << 3);
+                                mult_dst = DMA_CDB_SG_SRC;
+                        } else {
+                                /* WXOR multiplier */
+                                iter = ppc440spe_get_group_entry(sw_desc,
+                                                        index - region +
+                                                        sw_desc->dst_cnt);
+                                mult_idx = DMA_CUED_MULT1_OFF;
+                                mult_dst = dst_pos ? DMA_CDB_SG_DST2 :
+                                                     DMA_CDB_SG_DST1;
+                        }
+                } else {
+                        int znum = 0;
+
+                        /* WXOR-only;
+                         * skip first slots with destinations (if ZERO_DST has
+                         * place)
+                         */
+                        if (test_bit(PPC440SPE_ZERO_P, &sw_desc->flags))
+                                znum++;
+                        if (test_bit(PPC440SPE_ZERO_Q, &sw_desc->flags))
+                                znum++;
+
+                        iter = ppc440spe_get_group_entry(sw_desc, index + znum);
+                        mult_idx = DMA_CUED_MULT1_OFF;
+                        mult_dst = dst_pos ? DMA_CDB_SG_DST2 : DMA_CDB_SG_DST1;
+                }
+
+                if (likely(iter)) {
+                        ppc440spe_desc_set_src_mult(iter, chan,
+                                mult_idx, mult_dst, mult);
+
+                        if (unlikely(iter1)) {
+                                /* if we have two destinations for RXOR, then
+                                 * we've just set Q mult. Set-up P now.
+                                 */
+                                ppc440spe_desc_set_src_mult(iter1, chan,
+                                        mult_idx, mult_dst, 1);
+                        }
+
+                }
+                break;
+
+        case PPC440SPE_XOR_ID:
+                iter = sw_desc->group_head;
+                if (sw_desc->dst_cnt == 2) {
+                        /* both P & Q calculations required; set P mult here */
+                        ppc440spe_adma_dma2rxor_set_mult(iter, index, 1);
+
+                        /* and then set Q mult */
+                        iter = ppc440spe_get_group_entry(sw_desc,
+                               sw_desc->descs_per_op);
+                }
+                ppc440spe_adma_dma2rxor_set_mult(iter, index, mult);
+                break;
+        }
+}
+
+/**
+ * ppc440spe_adma_free_chan_resources - free the resources allocated
+ */
+static void ppc440spe_adma_free_chan_resources(struct dma_chan *chan)
+{
+        struct ppc440spe_adma_chan *ppc440spe_chan;
+        struct ppc440spe_adma_desc_slot *iter, *_iter;
+        int in_use_descs = 0;
+
+        ppc440spe_chan = to_ppc440spe_adma_chan(chan);
+        ppc440spe_adma_slot_cleanup(ppc440spe_chan);
+
+        spin_lock_bh(&ppc440spe_chan->lock);
+        list_for_each_entry_safe(iter, _iter, &ppc440spe_chan->chain,
+                                        chain_node) {
+                in_use_descs++;
+                list_del(&iter->chain_node);
+        }
+        list_for_each_entry_safe_reverse(iter, _iter,
+                        &ppc440spe_chan->all_slots, slot_node) {
+                list_del(&iter->slot_node);
+                kfree(iter);
+                ppc440spe_chan->slots_allocated--;
+        }
+        ppc440spe_chan->last_used = NULL;
+
+        dev_dbg(ppc440spe_chan->device->common.dev,
+                "ppc440spe adma%d %s slots_allocated %d\n",
+                ppc440spe_chan->device->id,
+                __func__, ppc440spe_chan->slots_allocated);
+        spin_unlock_bh(&ppc440spe_chan->lock);
+
+        /* one is ok since we left it on there on purpose */
+        if (in_use_descs > 1)
+                printk(KERN_ERR "SPE: Freeing %d in use descriptors!\n",
+                        in_use_descs - 1);
+}
+
+/**
+ * ppc440spe_adma_is_complete - poll the status of an ADMA transaction
+ * @chan: ADMA channel handle
+ * @cookie: ADMA transaction identifier
+ */
+static enum dma_status ppc440spe_adma_is_complete(struct dma_chan *chan,
+        dma_cookie_t cookie, dma_cookie_t *done, dma_cookie_t *used)
+{
+        struct ppc440spe_adma_chan *ppc440spe_chan;
+        dma_cookie_t last_used;
+        dma_cookie_t last_complete;
+        enum dma_status ret;
+
+        ppc440spe_chan = to_ppc440spe_adma_chan(chan);
+        last_used = chan->cookie;
+        last_complete = ppc440spe_chan->completed_cookie;
+
+        if (done)
+                *done = last_complete;
+        if (used)
+                *used = last_used;
+
+        ret = dma_async_is_complete(cookie, last_complete, last_used);
+        if (ret == DMA_SUCCESS)
+                return ret;
+
+        ppc440spe_adma_slot_cleanup(ppc440spe_chan);
+
+        last_used = chan->cookie;
+        last_complete = ppc440spe_chan->completed_cookie;
+
+        if (done)
+                *done = last_complete;
+        if (used)
+                *used = last_used;
+
+        return dma_async_is_complete(cookie, last_complete, last_used);
+}
+
+/**
+ * ppc440spe_adma_eot_handler - end of transfer interrupt handler
+ */
+static irqreturn_t ppc440spe_adma_eot_handler(int irq, void *data)
+{
+        struct ppc440spe_adma_chan *chan = data;
+
+        dev_dbg(chan->device->common.dev,
+                "ppc440spe adma%d: %s\n", chan->device->id, __func__);
+
+        tasklet_schedule(&chan->irq_tasklet);
+        ppc440spe_adma_device_clear_eot_status(chan);
+
+        return IRQ_HANDLED;
+}
+
+/**
+ * ppc440spe_adma_err_handler - DMA error interrupt handler;
+ *      do the same things as a eot handler
+ */
+static irqreturn_t ppc440spe_adma_err_handler(int irq, void *data)
+{
+        struct ppc440spe_adma_chan *chan = data;
+
+        dev_dbg(chan->device->common.dev,
+                "ppc440spe adma%d: %s\n", chan->device->id, __func__);
+
+        tasklet_schedule(&chan->irq_tasklet);
+        ppc440spe_adma_device_clear_eot_status(chan);
+
+        return IRQ_HANDLED;
+}
+
+/**
+ * ppc440spe_test_callback - called when test operation has been done
+ */
+static void ppc440spe_test_callback(void *unused)
+{
+        complete(&ppc440spe_r6_test_comp);
+}
+
+/**
+ * ppc440spe_adma_issue_pending - flush all pending descriptors to h/w
+ */
+static void ppc440spe_adma_issue_pending(struct dma_chan *chan)
+{
+        struct ppc440spe_adma_chan *ppc440spe_chan;
+
+        ppc440spe_chan = to_ppc440spe_adma_chan(chan);
+        dev_dbg(ppc440spe_chan->device->common.dev,
+                "ppc440spe adma%d: %s %d \n", ppc440spe_chan->device->id,
+                __func__, ppc440spe_chan->pending);
+
+        if (ppc440spe_chan->pending) {
+                ppc440spe_chan->pending = 0;
+                ppc440spe_chan_append(ppc440spe_chan);
+        }
+}
+
+/**
+ * ppc440spe_chan_start_null_xor - initiate the first XOR operation (DMA engines
+ *      use FIFOs (as opposite to chains used in XOR) so this is a XOR
+ *      specific operation)
+ */
+static void ppc440spe_chan_start_null_xor(struct ppc440spe_adma_chan *chan)
+{
+        struct ppc440spe_adma_desc_slot *sw_desc, *group_start;
+        dma_cookie_t cookie;
+        int slot_cnt, slots_per_op;
+
+        dev_dbg(chan->device->common.dev,
+                "ppc440spe adma%d: %s\n", chan->device->id, __func__);
+
+        spin_lock_bh(&chan->lock);
+        slot_cnt = ppc440spe_chan_xor_slot_count(0, 2, &slots_per_op);
+        sw_desc = ppc440spe_adma_alloc_slots(chan, slot_cnt, slots_per_op);
+        if (sw_desc) {
+                group_start = sw_desc->group_head;
+                list_splice_init(&sw_desc->group_list, &chan->chain);
+                async_tx_ack(&sw_desc->async_tx);
+                ppc440spe_desc_init_null_xor(group_start);
+
+                cookie = chan->common.cookie;
+                cookie++;
+                if (cookie <= 1)
+                        cookie = 2;
+
+                /* initialize the completed cookie to be less than
+                 * the most recently used cookie
+                 */
+                chan->completed_cookie = cookie - 1;
+                chan->common.cookie = sw_desc->async_tx.cookie = cookie;
+
+                /* channel should not be busy */
+                BUG_ON(ppc440spe_chan_is_busy(chan));
+
+                /* set the descriptor address */
+                ppc440spe_chan_set_first_xor_descriptor(chan, sw_desc);
+
+                /* run the descriptor */
+                ppc440spe_chan_run(chan);
+        } else
+                printk(KERN_ERR "ppc440spe adma%d"
+                        " failed to allocate null descriptor\n",
+                        chan->device->id);
+        spin_unlock_bh(&chan->lock);
+}
+
+/**
+ * ppc440spe_test_raid6 - test are RAID-6 capabilities enabled successfully.
+ *      For this we just perform one WXOR operation with the same source
+ *      and destination addresses, the GF-multiplier is 1; so if RAID-6
+ *      capabilities are enabled then we'll get src/dst filled with zero.
+ */
+static int ppc440spe_test_raid6(struct ppc440spe_adma_chan *chan)
+{
+        struct ppc440spe_adma_desc_slot *sw_desc, *iter;
+        struct page *pg;
+        char *a;
+        dma_addr_t dma_addr, addrs[2];
+        unsigned long op = 0;
+        int rval = 0;
+
+        set_bit(PPC440SPE_DESC_WXOR, &op);
+
+        pg = alloc_page(GFP_KERNEL);
+        if (!pg)
+                return -ENOMEM;
+
+        spin_lock_bh(&chan->lock);
+        sw_desc = ppc440spe_adma_alloc_slots(chan, 1, 1);
+        if (sw_desc) {
+                /* 1 src, 1 dsr, int_ena, WXOR */
+                ppc440spe_desc_init_dma01pq(sw_desc, 1, 1, 1, op);
+                list_for_each_entry(iter, &sw_desc->group_list, chain_node) {
+                        ppc440spe_desc_set_byte_count(iter, chan, PAGE_SIZE);
+                        iter->unmap_len = PAGE_SIZE;
+                }
+        } else {
+                rval = -EFAULT;
+                spin_unlock_bh(&chan->lock);
+                goto exit;
+        }
+        spin_unlock_bh(&chan->lock);
+
+        /* Fill the test page with ones */
+        memset(page_address(pg), 0xFF, PAGE_SIZE);
+        dma_addr = dma_map_page(chan->device->dev, pg, 0,
+                                PAGE_SIZE, DMA_BIDIRECTIONAL);
+
+        /* Setup addresses */
+        ppc440spe_adma_pq_set_src(sw_desc, dma_addr, 0);
+        ppc440spe_adma_pq_set_src_mult(sw_desc, 1, 0, 0);
+        addrs[0] = dma_addr;
+        addrs[1] = 0;
+        ppc440spe_adma_pq_set_dest(sw_desc, addrs, DMA_PREP_PQ_DISABLE_Q);
+
+        async_tx_ack(&sw_desc->async_tx);
+        sw_desc->async_tx.callback = ppc440spe_test_callback;
+        sw_desc->async_tx.callback_param = NULL;
+
+        init_completion(&ppc440spe_r6_test_comp);
+
+        ppc440spe_adma_tx_submit(&sw_desc->async_tx);
+        ppc440spe_adma_issue_pending(&chan->common);
+
+        wait_for_completion(&ppc440spe_r6_test_comp);
+
+        /* Now check if the test page is zeroed */
+        a = page_address(pg);
+        if ((*(u32 *)a) == 0 && memcmp(a, a+4, PAGE_SIZE-4) == 0) {
+                /* page is zero - RAID-6 enabled */
+                rval = 0;
+        } else {
+                /* RAID-6 was not enabled */
+                rval = -EINVAL;
+        }
+exit:
+        __free_page(pg);
+        return rval;
+}
+
+static void ppc440spe_adma_init_capabilities(struct ppc440spe_adma_device *adev)
+{
+        switch (adev->id) {
+        case PPC440SPE_DMA0_ID:
+        case PPC440SPE_DMA1_ID:
+                dma_cap_set(DMA_MEMCPY, adev->common.cap_mask);
+                dma_cap_set(DMA_INTERRUPT, adev->common.cap_mask);
+                dma_cap_set(DMA_MEMSET, adev->common.cap_mask);
+                dma_cap_set(DMA_PQ, adev->common.cap_mask);
+                dma_cap_set(DMA_PQ_VAL, adev->common.cap_mask);
+                dma_cap_set(DMA_XOR_VAL, adev->common.cap_mask);
+                break;
+        case PPC440SPE_XOR_ID:
+                dma_cap_set(DMA_XOR, adev->common.cap_mask);
+                dma_cap_set(DMA_PQ, adev->common.cap_mask);
+                dma_cap_set(DMA_INTERRUPT, adev->common.cap_mask);
+                adev->common.cap_mask = adev->common.cap_mask;
+                break;
+        }
+
+        /* Set base routines */
+        adev->common.device_alloc_chan_resources =
+                                ppc440spe_adma_alloc_chan_resources;
+        adev->common.device_free_chan_resources =
+                                ppc440spe_adma_free_chan_resources;
+        adev->common.device_is_tx_complete = ppc440spe_adma_is_complete;
+        adev->common.device_issue_pending = ppc440spe_adma_issue_pending;
+
+        /* Set prep routines based on capability */
+        if (dma_has_cap(DMA_MEMCPY, adev->common.cap_mask)) {
+                adev->common.device_prep_dma_memcpy =
+                        ppc440spe_adma_prep_dma_memcpy;
+        }
+        if (dma_has_cap(DMA_MEMSET, adev->common.cap_mask)) {
+                adev->common.device_prep_dma_memset =
+                        ppc440spe_adma_prep_dma_memset;
+        }
+        if (dma_has_cap(DMA_XOR, adev->common.cap_mask)) {
+                adev->common.max_xor = XOR_MAX_OPS;
+                adev->common.device_prep_dma_xor =
+                        ppc440spe_adma_prep_dma_xor;
+        }
+        if (dma_has_cap(DMA_PQ, adev->common.cap_mask)) {
+                switch (adev->id) {
+                case PPC440SPE_DMA0_ID:
+                        dma_set_maxpq(&adev->common,
+                                DMA0_FIFO_SIZE / sizeof(struct dma_cdb), 0);
+                        break;
+                case PPC440SPE_DMA1_ID:
+                        dma_set_maxpq(&adev->common,
+                                DMA1_FIFO_SIZE / sizeof(struct dma_cdb), 0);
+                        break;
+                case PPC440SPE_XOR_ID:
+                        adev->common.max_pq = XOR_MAX_OPS * 3;
+                        break;
+                }
+                adev->common.device_prep_dma_pq =
+                        ppc440spe_adma_prep_dma_pq;
+        }
+        if (dma_has_cap(DMA_PQ_VAL, adev->common.cap_mask)) {
+                switch (adev->id) {
+                case PPC440SPE_DMA0_ID:
+                        adev->common.max_pq = DMA0_FIFO_SIZE /
+                                                sizeof(struct dma_cdb);
+                        break;
+                case PPC440SPE_DMA1_ID:
+                        adev->common.max_pq = DMA1_FIFO_SIZE /
+                                                sizeof(struct dma_cdb);
+                        break;
+                }
+                adev->common.device_prep_dma_pq_val =
+                        ppc440spe_adma_prep_dma_pqzero_sum;
+        }
+        if (dma_has_cap(DMA_XOR_VAL, adev->common.cap_mask)) {
+                switch (adev->id) {
+                case PPC440SPE_DMA0_ID:
+                        adev->common.max_xor = DMA0_FIFO_SIZE /
+                                                sizeof(struct dma_cdb);
+                        break;
+                case PPC440SPE_DMA1_ID:
+                        adev->common.max_xor = DMA1_FIFO_SIZE /
+                                                sizeof(struct dma_cdb);
+                        break;
+                }
+                adev->common.device_prep_dma_xor_val =
+                        ppc440spe_adma_prep_dma_xor_zero_sum;
+        }
+        if (dma_has_cap(DMA_INTERRUPT, adev->common.cap_mask)) {
+                adev->common.device_prep_dma_interrupt =
+                        ppc440spe_adma_prep_dma_interrupt;
+        }
+        pr_info("%s: AMCC(R) PPC440SP(E) ADMA Engine: "
+          "( %s%s%s%s%s%s%s)\n",
+          dev_name(adev->dev),
+          dma_has_cap(DMA_PQ, adev->common.cap_mask) ? "pq " : "",
+          dma_has_cap(DMA_PQ_VAL, adev->common.cap_mask) ? "pq_val " : "",
+          dma_has_cap(DMA_XOR, adev->common.cap_mask) ? "xor " : "",
+          dma_has_cap(DMA_XOR_VAL, adev->common.cap_mask) ? "xor_val " : "",
+          dma_has_cap(DMA_MEMCPY, adev->common.cap_mask) ? "memcpy " : "",
+          dma_has_cap(DMA_MEMSET, adev->common.cap_mask)  ? "memset " : "",
+          dma_has_cap(DMA_INTERRUPT, adev->common.cap_mask) ? "intr " : "");
+}
+
+static int ppc440spe_adma_setup_irqs(struct ppc440spe_adma_device *adev,
+                                     struct ppc440spe_adma_chan *chan,
+                                     int *initcode)
+{
+        struct device_node *np;
+        int ret;
+
+        np = container_of(adev->dev, struct of_device, dev)->node;
+        if (adev->id != PPC440SPE_XOR_ID) {
+                adev->err_irq = irq_of_parse_and_map(np, 1);
+                if (adev->err_irq == NO_IRQ) {
+                        dev_warn(adev->dev, "no err irq resource?\n");
+                        *initcode = PPC_ADMA_INIT_IRQ2;
+                        adev->err_irq = -ENXIO;
+                } else
+                        atomic_inc(&ppc440spe_adma_err_irq_ref);
+        } else {
+                adev->err_irq = -ENXIO;
+        }
+
+        adev->irq = irq_of_parse_and_map(np, 0);
+        if (adev->irq == NO_IRQ) {
+                dev_err(adev->dev, "no irq resource\n");
+                *initcode = PPC_ADMA_INIT_IRQ1;
+                ret = -ENXIO;
+                goto err_irq_map;
+        }
+        dev_dbg(adev->dev, "irq %d, err irq %d\n",
+                adev->irq, adev->err_irq);
+
+        ret = request_irq(adev->irq, ppc440spe_adma_eot_handler,
+                          0, dev_driver_string(adev->dev), chan);
+        if (ret) {
+                dev_err(adev->dev, "can't request irq %d\n",
+                        adev->irq);
+                *initcode = PPC_ADMA_INIT_IRQ1;
+                ret = -EIO;
+                goto err_req1;
+        }
+
+        /* only DMA engines have a separate error IRQ
+         * so it's Ok if err_irq < 0 in XOR engine case.
+         */
+        if (adev->err_irq > 0) {
+                /* both DMA engines share common error IRQ */
+                ret = request_irq(adev->err_irq,
+                                  ppc440spe_adma_err_handler,
+                                  IRQF_SHARED,
+                                  dev_driver_string(adev->dev),
+                                  chan);
+                if (ret) {
+                        dev_err(adev->dev, "can't request irq %d\n",
+                                adev->err_irq);
+                        *initcode = PPC_ADMA_INIT_IRQ2;
+                        ret = -EIO;
+                        goto err_req2;
+                }
+        }
+
+        if (adev->id == PPC440SPE_XOR_ID) {
+                /* enable XOR engine interrupts */
+                iowrite32be(XOR_IE_CBCIE_BIT | XOR_IE_ICBIE_BIT |
+                            XOR_IE_ICIE_BIT | XOR_IE_RPTIE_BIT,
+                            &adev->xor_reg->ier);
+        } else {
+                u32 mask, enable;
+
+                np = of_find_compatible_node(NULL, NULL, "ibm,i2o-440spe");
+                if (!np) {
+                        pr_err("%s: can't find I2O device tree node\n",
+                                __func__);
+                        ret = -ENODEV;
+                        goto err_req2;
+                }
+                adev->i2o_reg = of_iomap(np, 0);
+                if (!adev->i2o_reg) {
+                        pr_err("%s: failed to map I2O registers\n", __func__);
+                        of_node_put(np);
+                        ret = -EINVAL;
+                        goto err_req2;
+                }
+                of_node_put(np);
+                /* Unmask 'CS FIFO Attention' interrupts and
+                 * enable generating interrupts on errors
+                 */
+                enable = (adev->id == PPC440SPE_DMA0_ID) ?
+                         ~(I2O_IOPIM_P0SNE | I2O_IOPIM_P0EM) :
+                         ~(I2O_IOPIM_P1SNE | I2O_IOPIM_P1EM);
+                mask = ioread32(&adev->i2o_reg->iopim) & enable;
+                iowrite32(mask, &adev->i2o_reg->iopim);
+        }
+        return 0;
+
+err_req2:
+        free_irq(adev->irq, chan);
+err_req1:
+        irq_dispose_mapping(adev->irq);
+err_irq_map:
+        if (adev->err_irq > 0) {
+                if (atomic_dec_and_test(&ppc440spe_adma_err_irq_ref))
+                        irq_dispose_mapping(adev->err_irq);
+        }
+        return ret;
+}
+
+static void ppc440spe_adma_release_irqs(struct ppc440spe_adma_device *adev,
+                                        struct ppc440spe_adma_chan *chan)
+{
+        u32 mask, disable;
+
+        if (adev->id == PPC440SPE_XOR_ID) {
+                /* disable XOR engine interrupts */
+                mask = ioread32be(&adev->xor_reg->ier);
+                mask &= ~(XOR_IE_CBCIE_BIT | XOR_IE_ICBIE_BIT |
+                          XOR_IE_ICIE_BIT | XOR_IE_RPTIE_BIT);
+                iowrite32be(mask, &adev->xor_reg->ier);
+        } else {
+                /* disable DMAx engine interrupts */
+                disable = (adev->id == PPC440SPE_DMA0_ID) ?
+                          (I2O_IOPIM_P0SNE | I2O_IOPIM_P0EM) :
+                          (I2O_IOPIM_P1SNE | I2O_IOPIM_P1EM);
+                mask = ioread32(&adev->i2o_reg->iopim) | disable;
+                iowrite32(mask, &adev->i2o_reg->iopim);
+        }
+        free_irq(adev->irq, chan);
+        irq_dispose_mapping(adev->irq);
+        if (adev->err_irq > 0) {
+                free_irq(adev->err_irq, chan);
+                if (atomic_dec_and_test(&ppc440spe_adma_err_irq_ref)) {
+                        irq_dispose_mapping(adev->err_irq);
+                        iounmap(adev->i2o_reg);
+                }
+        }
+}
+
+/**
+ * ppc440spe_adma_probe - probe the asynch device
+ */
+static int __devinit ppc440spe_adma_probe(struct of_device *ofdev,
+                                          const struct of_device_id *match)
+{
+        struct device_node *np = ofdev->node;
+        struct resource res;
+        struct ppc440spe_adma_device *adev;
+        struct ppc440spe_adma_chan *chan;
+        struct ppc_dma_chan_ref *ref, *_ref;
+        int ret = 0, initcode = PPC_ADMA_INIT_OK;
+        const u32 *idx;
+        int len;
+        void *regs;
+        u32 id, pool_size;
+
+        if (of_device_is_compatible(np, "amcc,xor-accelerator")) {
+                id = PPC440SPE_XOR_ID;
+                /* As far as the XOR engine is concerned, it does not
+                 * use FIFOs but uses linked list. So there is no dependency
+                 * between pool size to allocate and the engine configuration.
+                 */
+                pool_size = PAGE_SIZE << 1;
+        } else {
+                /* it is DMA0 or DMA1 */
+                idx = of_get_property(np, "cell-index", &len);
+                if (!idx || (len != sizeof(u32))) {
+                        dev_err(&ofdev->dev, "Device node %s has missing "
+                                "or invalid cell-index property\n",
+                                np->full_name);
+                        return -EINVAL;
+                }
+                id = *idx;
+                /* DMA0,1 engines use FIFO to maintain CDBs, so we
+                 * should allocate the pool accordingly to size of this
+                 * FIFO. Thus, the pool size depends on the FIFO depth:
+                 * how much CDBs pointers the FIFO may contain then so
+                 * much CDBs we should provide in the pool.
+                 * That is
+                 *   CDB size = 32B;
+                 *   CDBs number = (DMA0_FIFO_SIZE >> 3);
+                 *   Pool size = CDBs number * CDB size =
+                 *      = (DMA0_FIFO_SIZE >> 3) << 5 = DMA0_FIFO_SIZE << 2.
+                 */
+                pool_size = (id == PPC440SPE_DMA0_ID) ?
+                            DMA0_FIFO_SIZE : DMA1_FIFO_SIZE;
+                pool_size <<= 2;
+        }
+
+        if (of_address_to_resource(np, 0, &res)) {
+                dev_err(&ofdev->dev, "failed to get memory resource\n");
+                initcode = PPC_ADMA_INIT_MEMRES;
+                ret = -ENODEV;
+                goto out;
+        }
+
+        if (!request_mem_region(res.start, resource_size(&res),
+                                dev_driver_string(&ofdev->dev))) {
+                dev_err(&ofdev->dev, "failed to request memory region "
+                        "(0x%016llx-0x%016llx)\n",
+                        (u64)res.start, (u64)res.end);
+                initcode = PPC_ADMA_INIT_MEMREG;
+                ret = -EBUSY;
+                goto out;
+        }
+
+        /* create a device */
+        adev = kzalloc(sizeof(*adev), GFP_KERNEL);
+        if (!adev) {
+                dev_err(&ofdev->dev, "failed to allocate device\n");
+                initcode = PPC_ADMA_INIT_ALLOC;
+                ret = -ENOMEM;
+                goto err_adev_alloc;
+        }
+
+        adev->id = id;
+        adev->pool_size = pool_size;
+        /* allocate coherent memory for hardware descriptors */
+        adev->dma_desc_pool_virt = dma_alloc_coherent(&ofdev->dev,
+                                        adev->pool_size, &adev->dma_desc_pool,
+                                        GFP_KERNEL);
+        if (adev->dma_desc_pool_virt == NULL) {
+                dev_err(&ofdev->dev, "failed to allocate %d bytes of coherent "
+                        "memory for hardware descriptors\n",
+                        adev->pool_size);
+                initcode = PPC_ADMA_INIT_COHERENT;
+                ret = -ENOMEM;
+                goto err_dma_alloc;
+        }
+        dev_dbg(&ofdev->dev, "allocted descriptor pool virt 0x%p phys 0x%llx\n",
+                adev->dma_desc_pool_virt, (u64)adev->dma_desc_pool);
+
+        regs = ioremap(res.start, resource_size(&res));
+        if (!regs) {
+                dev_err(&ofdev->dev, "failed to ioremap regs!\n");
+                goto err_regs_alloc;
+        }
+
+        if (adev->id == PPC440SPE_XOR_ID) {
+                adev->xor_reg = regs;
+                /* Reset XOR */
+                iowrite32be(XOR_CRSR_XASR_BIT, &adev->xor_reg->crsr);
+                iowrite32be(XOR_CRSR_64BA_BIT, &adev->xor_reg->crrr);
+        } else {
+                size_t fifo_size = (adev->id == PPC440SPE_DMA0_ID) ?
+                                   DMA0_FIFO_SIZE : DMA1_FIFO_SIZE;
+                adev->dma_reg = regs;
+                /* DMAx_FIFO_SIZE is defined in bytes,
+                 * <fsiz> - is defined in number of CDB pointers (8byte).
+                 * DMA FIFO Length = CSlength + CPlength, where
+                 * CSlength = CPlength = (fsiz + 1) * 8.
+                 */
+                iowrite32(DMA_FIFO_ENABLE | ((fifo_size >> 3) - 2),
+                          &adev->dma_reg->fsiz);
+                /* Configure DMA engine */
+                iowrite32(DMA_CFG_DXEPR_HP | DMA_CFG_DFMPP_HP | DMA_CFG_FALGN,
+                          &adev->dma_reg->cfg);
+                /* Clear Status */
+                iowrite32(~0, &adev->dma_reg->dsts);
+        }
+
+        adev->dev = &ofdev->dev;
+        adev->common.dev = &ofdev->dev;
+        INIT_LIST_HEAD(&adev->common.channels);
+        dev_set_drvdata(&ofdev->dev, adev);
+
+        /* create a channel */
+        chan = kzalloc(sizeof(*chan), GFP_KERNEL);
+        if (!chan) {
+                dev_err(&ofdev->dev, "can't allocate channel structure\n");
+                initcode = PPC_ADMA_INIT_CHANNEL;
+                ret = -ENOMEM;
+                goto err_chan_alloc;
+        }
+
+        spin_lock_init(&chan->lock);
+        INIT_LIST_HEAD(&chan->chain);
+        INIT_LIST_HEAD(&chan->all_slots);
+        chan->device = adev;
+        chan->common.device = &adev->common;
+        list_add_tail(&chan->common.device_node, &adev->common.channels);
+        tasklet_init(&chan->irq_tasklet, ppc440spe_adma_tasklet,
+                     (unsigned long)chan);
+
+        /* allocate and map helper pages for async validation or
+         * async_mult/async_sum_product operations on DMA0/1.
+         */
+        if (adev->id != PPC440SPE_XOR_ID) {
+                chan->pdest_page = alloc_page(GFP_KERNEL);
+                chan->qdest_page = alloc_page(GFP_KERNEL);
+                if (!chan->pdest_page ||
+                    !chan->qdest_page) {
+                        if (chan->pdest_page)
+                                __free_page(chan->pdest_page);
+                        if (chan->qdest_page)
+                                __free_page(chan->qdest_page);
+                        ret = -ENOMEM;
+                        goto err_page_alloc;
+                }
+                chan->pdest = dma_map_page(&ofdev->dev, chan->pdest_page, 0,
+                                           PAGE_SIZE, DMA_BIDIRECTIONAL);
+                chan->qdest = dma_map_page(&ofdev->dev, chan->qdest_page, 0,
+                                           PAGE_SIZE, DMA_BIDIRECTIONAL);
+        }
+
+        ref = kmalloc(sizeof(*ref), GFP_KERNEL);
+        if (ref) {
+                ref->chan = &chan->common;
+                INIT_LIST_HEAD(&ref->node);
+                list_add_tail(&ref->node, &ppc440spe_adma_chan_list);
+        } else {
+                dev_err(&ofdev->dev, "failed to allocate channel reference!\n");
+                ret = -ENOMEM;
+                goto err_ref_alloc;
+        }
+
+        ret = ppc440spe_adma_setup_irqs(adev, chan, &initcode);
+        if (ret)
+                goto err_irq;
+
+        ppc440spe_adma_init_capabilities(adev);
+
+        ret = dma_async_device_register(&adev->common);
+        if (ret) {
+                initcode = PPC_ADMA_INIT_REGISTER;
+                dev_err(&ofdev->dev, "failed to register dma device\n");
+                goto err_dev_reg;
+        }
+
+        goto out;
+
+err_dev_reg:
+        ppc440spe_adma_release_irqs(adev, chan);
+err_irq:
+        list_for_each_entry_safe(ref, _ref, &ppc440spe_adma_chan_list, node) {
+                if (chan == to_ppc440spe_adma_chan(ref->chan)) {
+                        list_del(&ref->node);
+                        kfree(ref);
+                }
+        }
+err_ref_alloc:
+        if (adev->id != PPC440SPE_XOR_ID) {
+                dma_unmap_page(&ofdev->dev, chan->pdest,
+                               PAGE_SIZE, DMA_BIDIRECTIONAL);
+                dma_unmap_page(&ofdev->dev, chan->qdest,
+                               PAGE_SIZE, DMA_BIDIRECTIONAL);
+                __free_page(chan->pdest_page);
+                __free_page(chan->qdest_page);
+        }
+err_page_alloc:
+        kfree(chan);
+err_chan_alloc:
+        if (adev->id == PPC440SPE_XOR_ID)
+                iounmap(adev->xor_reg);
+        else
+                iounmap(adev->dma_reg);
+err_regs_alloc:
+        dma_free_coherent(adev->dev, adev->pool_size,
+                          adev->dma_desc_pool_virt,
+                          adev->dma_desc_pool);
+err_dma_alloc:
+        kfree(adev);
+err_adev_alloc:
+        release_mem_region(res.start, resource_size(&res));
+out:
+        if (id < PPC440SPE_ADMA_ENGINES_NUM)
+                ppc440spe_adma_devices[id] = initcode;
+
+        return ret;
+}
+
+/**
+ * ppc440spe_adma_remove - remove the asynch device
+ */
+static int __devexit ppc440spe_adma_remove(struct of_device *ofdev)
+{
+        struct ppc440spe_adma_device *adev = dev_get_drvdata(&ofdev->dev);
+        struct device_node *np = ofdev->node;
+        struct resource res;
+        struct dma_chan *chan, *_chan;
+        struct ppc_dma_chan_ref *ref, *_ref;
+        struct ppc440spe_adma_chan *ppc440spe_chan;
+
+        dev_set_drvdata(&ofdev->dev, NULL);
+        if (adev->id < PPC440SPE_ADMA_ENGINES_NUM)
+                ppc440spe_adma_devices[adev->id] = -1;
+
+        dma_async_device_unregister(&adev->common);
+
+        list_for_each_entry_safe(chan, _chan, &adev->common.channels,
+                                 device_node) {
+                ppc440spe_chan = to_ppc440spe_adma_chan(chan);
+                ppc440spe_adma_release_irqs(adev, ppc440spe_chan);
+                tasklet_kill(&ppc440spe_chan->irq_tasklet);
+                if (adev->id != PPC440SPE_XOR_ID) {
+                        dma_unmap_page(&ofdev->dev, ppc440spe_chan->pdest,
+                                        PAGE_SIZE, DMA_BIDIRECTIONAL);
+                        dma_unmap_page(&ofdev->dev, ppc440spe_chan->qdest,
+                                        PAGE_SIZE, DMA_BIDIRECTIONAL);
+                        __free_page(ppc440spe_chan->pdest_page);
+                        __free_page(ppc440spe_chan->qdest_page);
+                }
+                list_for_each_entry_safe(ref, _ref, &ppc440spe_adma_chan_list,
+                                         node) {
+                        if (ppc440spe_chan ==
+                            to_ppc440spe_adma_chan(ref->chan)) {
+                                list_del(&ref->node);
+                                kfree(ref);
+                        }
+                }
+                list_del(&chan->device_node);
+                kfree(ppc440spe_chan);
+        }
+
+        dma_free_coherent(adev->dev, adev->pool_size,
+                          adev->dma_desc_pool_virt, adev->dma_desc_pool);
+        if (adev->id == PPC440SPE_XOR_ID)
+                iounmap(adev->xor_reg);
+        else
+                iounmap(adev->dma_reg);
+        of_address_to_resource(np, 0, &res);
+        release_mem_region(res.start, resource_size(&res));
+        kfree(adev);
+        return 0;
+}
+
+/*
+ * /sys driver interface to enable h/w RAID-6 capabilities
+ * Files created in e.g. /sys/devices/plb.0/400100100.dma0/driver/
+ * directory are "devices", "enable" and "poly".
+ * "devices" shows available engines.
+ * "enable" is used to enable RAID-6 capabilities or to check
+ * whether these has been activated.
+ * "poly" allows setting/checking used polynomial (for PPC440SPe only).
+ */
+
+static ssize_t show_ppc440spe_devices(struct device_driver *dev, char *buf)
+{
+        ssize_t size = 0;
+        int i;
+
+        for (i = 0; i < PPC440SPE_ADMA_ENGINES_NUM; i++) {
+                if (ppc440spe_adma_devices[i] == -1)
+                        continue;
+                size += snprintf(buf + size, PAGE_SIZE - size,
+                                 "PPC440SP(E)-ADMA.%d: %s\n", i,
+                                 ppc_adma_errors[ppc440spe_adma_devices[i]]);
+        }
+        return size;
+}
+
+static ssize_t show_ppc440spe_r6enable(struct device_driver *dev, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE,
+                        "PPC440SP(e) RAID-6 capabilities are %sABLED.\n",
+                        ppc440spe_r6_enabled ? "EN" : "DIS");
+}
+
+static ssize_t store_ppc440spe_r6enable(struct device_driver *dev,
+                                        const char *buf, size_t count)
+{
+        unsigned long val;
+
+        if (!count || count > 11)
+                return -EINVAL;
+
+        if (!ppc440spe_r6_tchan)
+                return -EFAULT;
+
+        /* Write a key */
+        sscanf(buf, "%lx", &val);
+        dcr_write(ppc440spe_mq_dcr_host, DCRN_MQ0_XORBA, val);
+        isync();
+
+        /* Verify whether it really works now */
+        if (ppc440spe_test_raid6(ppc440spe_r6_tchan) == 0) {
+                pr_info("PPC440SP(e) RAID-6 has been activated "
+                        "successfully\n");
+                ppc440spe_r6_enabled = 1;
+        } else {
+                pr_info("PPC440SP(e) RAID-6 hasn't been activated!"
+                        " Error key ?\n");
+                ppc440spe_r6_enabled = 0;
+        }
+        return count;
+}
+
+static ssize_t show_ppc440spe_r6poly(struct device_driver *dev, char *buf)
+{
+        ssize_t size = 0;
+        u32 reg;
+
+#ifdef CONFIG_440SP
+        /* 440SP has fixed polynomial */
+        reg = 0x4d;
+#else
+        reg = dcr_read(ppc440spe_mq_dcr_host, DCRN_MQ0_CFBHL);
+        reg >>= MQ0_CFBHL_POLY;
+        reg &= 0xFF;
+#endif
+
+        size = snprintf(buf, PAGE_SIZE, "PPC440SP(e) RAID-6 driver "
+                        "uses 0x1%02x polynomial.\n", reg);
+        return size;
+}
+
+static ssize_t store_ppc440spe_r6poly(struct device_driver *dev,
+                                      const char *buf, size_t count)
+{
+        unsigned long reg, val;
+
+#ifdef CONFIG_440SP
+        /* 440SP uses default 0x14D polynomial only */
+        return -EINVAL;
+#endif
+
+        if (!count || count > 6)
+                return -EINVAL;
+
+        /* e.g., 0x14D or 0x11D */
+        sscanf(buf, "%lx", &val);
+
+        if (val & ~0x1FF)
+                return -EINVAL;
+
+        val &= 0xFF;
+        reg = dcr_read(ppc440spe_mq_dcr_host, DCRN_MQ0_CFBHL);
+        reg &= ~(0xFF << MQ0_CFBHL_POLY);
+        reg |= val << MQ0_CFBHL_POLY;
+        dcr_write(ppc440spe_mq_dcr_host, DCRN_MQ0_CFBHL, reg);
+
+        return count;
+}
+
+static DRIVER_ATTR(devices, S_IRUGO, show_ppc440spe_devices, NULL);
+static DRIVER_ATTR(enable, S_IRUGO | S_IWUSR, show_ppc440spe_r6enable,
+                   store_ppc440spe_r6enable);
+static DRIVER_ATTR(poly, S_IRUGO | S_IWUSR, show_ppc440spe_r6poly,
+                   store_ppc440spe_r6poly);
+
+/*
+ * Common initialisation for RAID engines; allocate memory for
+ * DMAx FIFOs, perform configuration common for all DMA engines.
+ * Further DMA engine specific configuration is done at probe time.
+ */
+static int ppc440spe_configure_raid_devices(void)
+{
+        struct device_node *np;
+        struct resource i2o_res;
+        struct i2o_regs __iomem *i2o_reg;
+        dcr_host_t i2o_dcr_host;
+        unsigned int dcr_base, dcr_len;
+        int i, ret;
+
+        np = of_find_compatible_node(NULL, NULL, "ibm,i2o-440spe");
+        if (!np) {
+                pr_err("%s: can't find I2O device tree node\n",
+                        __func__);
+                return -ENODEV;
+        }
+
+        if (of_address_to_resource(np, 0, &i2o_res)) {
+                of_node_put(np);
+                return -EINVAL;
+        }
+
+        i2o_reg = of_iomap(np, 0);
+        if (!i2o_reg) {
+                pr_err("%s: failed to map I2O registers\n", __func__);
+                of_node_put(np);
+                return -EINVAL;
+        }
+
+        /* Get I2O DCRs base */
+        dcr_base = dcr_resource_start(np, 0);
+        dcr_len = dcr_resource_len(np, 0);
+        if (!dcr_base && !dcr_len) {
+                pr_err("%s: can't get DCR registers base/len!\n",
+                        np->full_name);
+                of_node_put(np);
+                iounmap(i2o_reg);
+                return -ENODEV;
+        }
+
+        i2o_dcr_host = dcr_map(np, dcr_base, dcr_len);
+        if (!DCR_MAP_OK(i2o_dcr_host)) {
+                pr_err("%s: failed to map DCRs!\n", np->full_name);
+                of_node_put(np);
+                iounmap(i2o_reg);
+                return -ENODEV;
+        }
+        of_node_put(np);
+
+        /* Provide memory regions for DMA's FIFOs: I2O, DMA0 and DMA1 share
+         * the base address of FIFO memory space.
+         * Actually we need twice more physical memory than programmed in the
+         * <fsiz> register (because there are two FIFOs for each DMA: CP and CS)
+         */
+        ppc440spe_dma_fifo_buf = kmalloc((DMA0_FIFO_SIZE + DMA1_FIFO_SIZE) << 1,
+                                         GFP_KERNEL);
+        if (!ppc440spe_dma_fifo_buf) {
+                pr_err("%s: DMA FIFO buffer allocation failed.\n", __func__);
+                iounmap(i2o_reg);
+                dcr_unmap(i2o_dcr_host, dcr_len);
+                return -ENOMEM;
+        }
+
+        /*
+         * Configure h/w
+         */
+        /* Reset I2O/DMA */
+        mtdcri(SDR0, DCRN_SDR0_SRST, DCRN_SDR0_SRST_I2ODMA);
+        mtdcri(SDR0, DCRN_SDR0_SRST, 0);
+
+        /* Setup the base address of mmaped registers */
+        dcr_write(i2o_dcr_host, DCRN_I2O0_IBAH, (u32)(i2o_res.start >> 32));
+        dcr_write(i2o_dcr_host, DCRN_I2O0_IBAL, (u32)(i2o_res.start) |
+                                                I2O_REG_ENABLE);
+        dcr_unmap(i2o_dcr_host, dcr_len);
+
+        /* Setup FIFO memory space base address */
+        iowrite32(0, &i2o_reg->ifbah);
+        iowrite32(((u32)__pa(ppc440spe_dma_fifo_buf)), &i2o_reg->ifbal);
+
+        /* set zero FIFO size for I2O, so the whole
+         * ppc440spe_dma_fifo_buf is used by DMAs.
+         * DMAx_FIFOs will be configured while probe.
+         */
+        iowrite32(0, &i2o_reg->ifsiz);
+        iounmap(i2o_reg);
+
+        /* To prepare WXOR/RXOR functionality we need access to
+         * Memory Queue Module DCRs (finally it will be enabled
+         * via /sys interface of the ppc440spe ADMA driver).
+         */
+        np = of_find_compatible_node(NULL, NULL, "ibm,mq-440spe");
+        if (!np) {
+                pr_err("%s: can't find MQ device tree node\n",
+                        __func__);
+                ret = -ENODEV;
+                goto out_free;
+        }
+
+        /* Get MQ DCRs base */
+        dcr_base = dcr_resource_start(np, 0);
+        dcr_len = dcr_resource_len(np, 0);
+        if (!dcr_base && !dcr_len) {
+                pr_err("%s: can't get DCR registers base/len!\n",
+                        np->full_name);
+                ret = -ENODEV;
+                goto out_mq;
+        }
+
+        ppc440spe_mq_dcr_host = dcr_map(np, dcr_base, dcr_len);
+        if (!DCR_MAP_OK(ppc440spe_mq_dcr_host)) {
+                pr_err("%s: failed to map DCRs!\n", np->full_name);
+                ret = -ENODEV;
+                goto out_mq;
+        }
+        of_node_put(np);
+        ppc440spe_mq_dcr_len = dcr_len;
+
+        /* Set HB alias */
+        dcr_write(ppc440spe_mq_dcr_host, DCRN_MQ0_BAUH, DMA_CUED_XOR_HB);
+
+        /* Set:
+         * - LL transaction passing limit to 1;
+         * - Memory controller cycle limit to 1;
+         * - Galois Polynomial to 0x14d (default)
+         */
+        dcr_write(ppc440spe_mq_dcr_host, DCRN_MQ0_CFBHL,
+                  (1 << MQ0_CFBHL_TPLM) | (1 << MQ0_CFBHL_HBCL) |
+                  (PPC440SPE_DEFAULT_POLY << MQ0_CFBHL_POLY));
+
+        atomic_set(&ppc440spe_adma_err_irq_ref, 0);
+        for (i = 0; i < PPC440SPE_ADMA_ENGINES_NUM; i++)
+                ppc440spe_adma_devices[i] = -1;
+
+        return 0;
+
+out_mq:
+        of_node_put(np);
+out_free:
+        kfree(ppc440spe_dma_fifo_buf);
+        return ret;
+}
+
+static struct of_device_id __devinitdata ppc440spe_adma_of_match[] = {
+        { .compatible   = "ibm,dma-440spe", },
+        { .compatible   = "amcc,xor-accelerator", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, ppc440spe_adma_of_match);
+
+static struct of_platform_driver ppc440spe_adma_driver = {
+        .match_table = ppc440spe_adma_of_match,
+        .probe = ppc440spe_adma_probe,
+        .remove = __devexit_p(ppc440spe_adma_remove),
+        .driver = {
+                .name = "PPC440SP(E)-ADMA",
+                .owner = THIS_MODULE,
+        },
+};
+
+static __init int ppc440spe_adma_init(void)
+{
+        int ret;
+
+        ret = ppc440spe_configure_raid_devices();
+        if (ret)
+                return ret;
+
+        ret = of_register_platform_driver(&ppc440spe_adma_driver);
+        if (ret) {
+                pr_err("%s: failed to register platform driver\n",
+                        __func__);
+                goto out_reg;
+        }
+
+        /* Initialization status */
+        ret = driver_create_file(&ppc440spe_adma_driver.driver,
+                                 &driver_attr_devices);
+        if (ret)
+                goto out_dev;
+
+        /* RAID-6 h/w enable entry */
+        ret = driver_create_file(&ppc440spe_adma_driver.driver,
+                                 &driver_attr_enable);
+        if (ret)
+                goto out_en;
+
+        /* GF polynomial to use */
+        ret = driver_create_file(&ppc440spe_adma_driver.driver,
+                                 &driver_attr_poly);
+        if (!ret)
+                return ret;
+
+        driver_remove_file(&ppc440spe_adma_driver.driver,
+                           &driver_attr_enable);
+out_en:
+        driver_remove_file(&ppc440spe_adma_driver.driver,
+                           &driver_attr_devices);
+out_dev:
+        /* User will not be able to enable h/w RAID-6 */
+        pr_err("%s: failed to create RAID-6 driver interface\n",
+                __func__);
+        of_unregister_platform_driver(&ppc440spe_adma_driver);
+out_reg:
+        dcr_unmap(ppc440spe_mq_dcr_host, ppc440spe_mq_dcr_len);
+        kfree(ppc440spe_dma_fifo_buf);
+        return ret;
+}
+
+static void __exit ppc440spe_adma_exit(void)
+{
+        driver_remove_file(&ppc440spe_adma_driver.driver,
+                           &driver_attr_poly);
+        driver_remove_file(&ppc440spe_adma_driver.driver,
+                           &driver_attr_enable);
+        driver_remove_file(&ppc440spe_adma_driver.driver,
+                           &driver_attr_devices);
+        of_unregister_platform_driver(&ppc440spe_adma_driver);
+        dcr_unmap(ppc440spe_mq_dcr_host, ppc440spe_mq_dcr_len);
+        kfree(ppc440spe_dma_fifo_buf);
+}
+
+arch_initcall(ppc440spe_adma_init);
+module_exit(ppc440spe_adma_exit);
+
+MODULE_AUTHOR("Yuri Tikhonov <yur@emcraft.com>");
+MODULE_DESCRIPTION("PPC440SPE ADMA Engine Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/dma/ppc4xx/adma.h b/drivers/dma/ppc4xx/adma.h
new file mode 100644
index 000000000000..8ada5a812e3b
--- /dev/null
+++ b/drivers/dma/ppc4xx/adma.h
@@ -0,0 +1,195 @@
+/*
+ * 2006-2009 (C) DENX Software Engineering.
+ *
+ * Author: Yuri Tikhonov <yur@emcraft.com>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of
+ * any kind, whether express or implied.
+ */
+
+#ifndef _PPC440SPE_ADMA_H
+#define _PPC440SPE_ADMA_H
+
+#include <linux/types.h>
+#include "dma.h"
+#include "xor.h"
+
+#define to_ppc440spe_adma_chan(chan) \
+                container_of(chan, struct ppc440spe_adma_chan, common)
+#define to_ppc440spe_adma_device(dev) \
+                container_of(dev, struct ppc440spe_adma_device, common)
+#define tx_to_ppc440spe_adma_slot(tx) \
+                container_of(tx, struct ppc440spe_adma_desc_slot, async_tx)
+
+/* Default polynomial (for 440SP is only available) */
+#define PPC440SPE_DEFAULT_POLY  0x4d
+
+#define PPC440SPE_ADMA_ENGINES_NUM      (XOR_ENGINES_NUM + DMA_ENGINES_NUM)
+
+#define PPC440SPE_ADMA_WATCHDOG_MSEC    3
+#define PPC440SPE_ADMA_THRESHOLD        1
+
+#define PPC440SPE_DMA0_ID       0
+#define PPC440SPE_DMA1_ID       1
+#define PPC440SPE_XOR_ID        2
+
+#define PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT       0xFFFFFFUL
+/* this is the XOR_CBBCR width */
+#define PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT       (1 << 31)
+#define PPC440SPE_ADMA_ZERO_SUM_MAX_BYTE_COUNT PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT
+
+#define PPC440SPE_RXOR_RUN      0
+
+#define MQ0_CF2H_RXOR_BS_MASK   0x1FF
+
+#undef ADMA_LL_DEBUG
+
+/**
+ * struct ppc440spe_adma_device - internal representation of an ADMA device
+ * @dev: device
+ * @dma_reg: base for DMAx register access
+ * @xor_reg: base for XOR register access
+ * @i2o_reg: base for I2O register access
+ * @id: HW ADMA Device selector
+ * @dma_desc_pool_virt: base of DMA descriptor region (CPU address)
+ * @dma_desc_pool: base of DMA descriptor region (DMA address)
+ * @pool_size: size of the pool
+ * @irq: DMAx or XOR irq number
+ * @err_irq: DMAx error irq number
+ * @common: embedded struct dma_device
+ */
+struct ppc440spe_adma_device {
+        struct device *dev;
+        struct dma_regs __iomem *dma_reg;
+        struct xor_regs __iomem *xor_reg;
+        struct i2o_regs __iomem *i2o_reg;
+        int id;
+        void *dma_desc_pool_virt;
+        dma_addr_t dma_desc_pool;
+        size_t pool_size;
+        int irq;
+        int err_irq;
+        struct dma_device common;
+};
+
+/**
+ * struct ppc440spe_adma_chan - internal representation of an ADMA channel
+ * @lock: serializes enqueue/dequeue operations to the slot pool
+ * @device: parent device
+ * @chain: device chain view of the descriptors
+ * @common: common dmaengine channel object members
+ * @all_slots: complete domain of slots usable by the channel
+ * @pending: allows batching of hardware operations
+ * @completed_cookie: identifier for the most recently completed operation
+ * @slots_allocated: records the actual size of the descriptor slot pool
+ * @hw_chain_inited: h/w descriptor chain initialization flag
+ * @irq_tasklet: bottom half where ppc440spe_adma_slot_cleanup runs
+ * @needs_unmap: if buffers should not be unmapped upon final processing
+ * @pdest_page: P destination page for async validate operation
+ * @qdest_page: Q destination page for async validate operation
+ * @pdest: P dma addr for async validate operation
+ * @qdest: Q dma addr for async validate operation
+ */
+struct ppc440spe_adma_chan {
+        spinlock_t lock;
+        struct ppc440spe_adma_device *device;
+        struct list_head chain;
+        struct dma_chan common;
+        struct list_head all_slots;
+        struct ppc440spe_adma_desc_slot *last_used;
+        int pending;
+        dma_cookie_t completed_cookie;
+        int slots_allocated;
+        int hw_chain_inited;
+        struct tasklet_struct irq_tasklet;
+        u8 needs_unmap;
+        struct page *pdest_page;
+        struct page *qdest_page;
+        dma_addr_t pdest;
+        dma_addr_t qdest;
+};
+
+struct ppc440spe_rxor {
+        u32 addrl;
+        u32 addrh;
+        int len;
+        int xor_count;
+        int addr_count;
+        int desc_count;
+        int state;
+};
+
+/**
+ * struct ppc440spe_adma_desc_slot - PPC440SPE-ADMA software descriptor
+ * @phys: hardware address of the hardware descriptor chain
+ * @group_head: first operation in a transaction
+ * @hw_next: pointer to the next descriptor in chain
+ * @async_tx: support for the async_tx api
+ * @slot_node: node on the iop_adma_chan.all_slots list
+ * @chain_node: node on the op_adma_chan.chain list
+ * @group_list: list of slots that make up a multi-descriptor transaction
+ *              for example transfer lengths larger than the supported hw max
+ * @unmap_len: transaction bytecount
+ * @hw_desc: virtual address of the hardware descriptor chain
+ * @stride: currently chained or not
+ * @idx: pool index
+ * @slot_cnt: total slots used in an transaction (group of operations)
+ * @src_cnt: number of sources set in this descriptor
+ * @dst_cnt: number of destinations set in the descriptor
+ * @slots_per_op: number of slots per operation
+ * @descs_per_op: number of slot per P/Q operation see comment
+ *                for ppc440spe_prep_dma_pqxor function
+ * @flags: desc state/type
+ * @reverse_flags: 1 if a corresponding rxor address uses reversed address order
+ * @xor_check_result: result of zero sum
+ * @crc32_result: result crc calculation
+ */
+struct ppc440spe_adma_desc_slot {
+        dma_addr_t phys;
+        struct ppc440spe_adma_desc_slot *group_head;
+        struct ppc440spe_adma_desc_slot *hw_next;
+        struct dma_async_tx_descriptor async_tx;
+        struct list_head slot_node;
+        struct list_head chain_node; /* node in channel ops list */
+        struct list_head group_list; /* list */
+        unsigned int unmap_len;
+        void *hw_desc;
+        u16 stride;
+        u16 idx;
+        u16 slot_cnt;
+        u8 src_cnt;
+        u8 dst_cnt;
+        u8 slots_per_op;
+        u8 descs_per_op;
+        unsigned long flags;
+        unsigned long reverse_flags[8];
+
+#define PPC440SPE_DESC_INT      0       /* generate interrupt on complete */
+#define PPC440SPE_ZERO_P        1       /* clear P destionaion */
+#define PPC440SPE_ZERO_Q        2       /* clear Q destination */
+#define PPC440SPE_COHERENT      3       /* src/dst are coherent */
+
+#define PPC440SPE_DESC_WXOR     4       /* WXORs are in chain */
+#define PPC440SPE_DESC_RXOR     5       /* RXOR is in chain */
+
+#define PPC440SPE_DESC_RXOR123  8       /* CDB for RXOR123 operation */
+#define PPC440SPE_DESC_RXOR124  9       /* CDB for RXOR124 operation */
+#define PPC440SPE_DESC_RXOR125  10      /* CDB for RXOR125 operation */
+#define PPC440SPE_DESC_RXOR12   11      /* CDB for RXOR12 operation */
+#define PPC440SPE_DESC_RXOR_REV 12      /* CDB has srcs in reversed order */
+
+#define PPC440SPE_DESC_PCHECK   13
+#define PPC440SPE_DESC_QCHECK   14
+
+#define PPC440SPE_DESC_RXOR_MSK 0x3
+
+        struct ppc440spe_rxor rxor_cursor;
+
+        union {
+                u32 *xor_check_result;
+                u32 *crc32_result;
+        };
+};
+
+#endif /* _PPC440SPE_ADMA_H */
diff --git a/drivers/dma/ppc4xx/dma.h b/drivers/dma/ppc4xx/dma.h
new file mode 100644
index 000000000000..bcde2df2f373
--- /dev/null
+++ b/drivers/dma/ppc4xx/dma.h
@@ -0,0 +1,223 @@
+/*
+ * 440SPe's DMA engines support header file
+ *
+ * 2006-2009 (C) DENX Software Engineering.
+ *
+ * Author: Yuri Tikhonov <yur@emcraft.com>
+ *
+ * This file is licensed under the term of  the GNU General Public License
+ * version 2. The program licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#ifndef _PPC440SPE_DMA_H
+#define _PPC440SPE_DMA_H
+
+#include <linux/types.h>
+
+/* Number of elements in the array with statical CDBs */
+#define MAX_STAT_DMA_CDBS       16
+/* Number of DMA engines available on the contoller */
+#define DMA_ENGINES_NUM         2
+
+/* Maximum h/w supported number of destinations */
+#define DMA_DEST_MAX_NUM        2
+
+/* FIFO's params */
+#define DMA0_FIFO_SIZE          0x1000
+#define DMA1_FIFO_SIZE          0x1000
+#define DMA_FIFO_ENABLE         (1<<12)
+
+/* DMA Configuration Register. Data Transfer Engine PLB Priority: */
+#define DMA_CFG_DXEPR_LP        (0<<26)
+#define DMA_CFG_DXEPR_HP        (3<<26)
+#define DMA_CFG_DXEPR_HHP       (2<<26)
+#define DMA_CFG_DXEPR_HHHP      (1<<26)
+
+/* DMA Configuration Register. DMA FIFO Manager PLB Priority: */
+#define DMA_CFG_DFMPP_LP        (0<<23)
+#define DMA_CFG_DFMPP_HP        (3<<23)
+#define DMA_CFG_DFMPP_HHP       (2<<23)
+#define DMA_CFG_DFMPP_HHHP      (1<<23)
+
+/* DMA Configuration Register. Force 64-byte Alignment */
+#define DMA_CFG_FALGN           (1 << 19)
+
+/*UIC0:*/
+#define D0CPF_INT               (1<<12)
+#define D0CSF_INT               (1<<11)
+#define D1CPF_INT               (1<<10)
+#define D1CSF_INT               (1<<9)
+/*UIC1:*/
+#define DMAE_INT                (1<<9)
+
+/* I2O IOP Interrupt Mask Register */
+#define I2O_IOPIM_P0SNE         (1<<3)
+#define I2O_IOPIM_P0EM          (1<<5)
+#define I2O_IOPIM_P1SNE         (1<<6)
+#define I2O_IOPIM_P1EM          (1<<8)
+
+/* DMA CDB fields */
+#define DMA_CDB_MSK             (0xF)
+#define DMA_CDB_64B_ADDR        (1<<2)
+#define DMA_CDB_NO_INT          (1<<3)
+#define DMA_CDB_STATUS_MSK      (0x3)
+#define DMA_CDB_ADDR_MSK        (0xFFFFFFF0)
+
+/* DMA CDB OpCodes */
+#define DMA_CDB_OPC_NO_OP       (0x00)
+#define DMA_CDB_OPC_MV_SG1_SG2  (0x01)
+#define DMA_CDB_OPC_MULTICAST   (0x05)
+#define DMA_CDB_OPC_DFILL128    (0x24)
+#define DMA_CDB_OPC_DCHECK128   (0x23)
+
+#define DMA_CUED_XOR_BASE       (0x10000000)
+#define DMA_CUED_XOR_HB         (0x00000008)
+
+#ifdef CONFIG_440SP
+#define DMA_CUED_MULT1_OFF      0
+#define DMA_CUED_MULT2_OFF      8
+#define DMA_CUED_MULT3_OFF      16
+#define DMA_CUED_REGION_OFF     24
+#define DMA_CUED_XOR_WIN_MSK    (0xFC000000)
+#else
+#define DMA_CUED_MULT1_OFF      2
+#define DMA_CUED_MULT2_OFF      10
+#define DMA_CUED_MULT3_OFF      18
+#define DMA_CUED_REGION_OFF     26
+#define DMA_CUED_XOR_WIN_MSK    (0xF0000000)
+#endif
+
+#define DMA_CUED_REGION_MSK     0x3
+#define DMA_RXOR123             0x0
+#define DMA_RXOR124             0x1
+#define DMA_RXOR125             0x2
+#define DMA_RXOR12              0x3
+
+/* S/G addresses */
+#define DMA_CDB_SG_SRC          1
+#define DMA_CDB_SG_DST1         2
+#define DMA_CDB_SG_DST2         3
+
+/*
+ * DMAx engines Command Descriptor Block Type
+ */
+struct dma_cdb {
+        /*
+         * Basic CDB structure (Table 20-17, p.499, 440spe_um_1_22.pdf)
+         */
+        u8      pad0[2];        /* reserved */
+        u8      attr;           /* attributes */
+        u8      opc;            /* opcode */
+        u32     sg1u;           /* upper SG1 address */
+        u32     sg1l;           /* lower SG1 address */
+        u32     cnt;            /* SG count, 3B used */
+        u32     sg2u;           /* upper SG2 address */
+        u32     sg2l;           /* lower SG2 address */
+        u32     sg3u;           /* upper SG3 address */
+        u32     sg3l;           /* lower SG3 address */
+};
+
+/*
+ * DMAx hardware registers (p.515 in 440SPe UM 1.22)
+ */
+struct dma_regs {
+        u32     cpfpl;
+        u32     cpfph;
+        u32     csfpl;
+        u32     csfph;
+        u32     dsts;
+        u32     cfg;
+        u8      pad0[0x8];
+        u16     cpfhp;
+        u16     cpftp;
+        u16     csfhp;
+        u16     csftp;
+        u8      pad1[0x8];
+        u32     acpl;
+        u32     acph;
+        u32     s1bpl;
+        u32     s1bph;
+        u32     s2bpl;
+        u32     s2bph;
+        u32     s3bpl;
+        u32     s3bph;
+        u8      pad2[0x10];
+        u32     earl;
+        u32     earh;
+        u8      pad3[0x8];
+        u32     seat;
+        u32     sead;
+        u32     op;
+        u32     fsiz;
+};
+
+/*
+ * I2O hardware registers (p.528 in 440SPe UM 1.22)
+ */
+struct i2o_regs {
+        u32     ists;
+        u32     iseat;
+        u32     isead;
+        u8      pad0[0x14];
+        u32     idbel;
+        u8      pad1[0xc];
+        u32     ihis;
+        u32     ihim;
+        u8      pad2[0x8];
+        u32     ihiq;
+        u32     ihoq;
+        u8      pad3[0x8];
+        u32     iopis;
+        u32     iopim;
+        u32     iopiq;
+        u8      iopoq;
+        u8      pad4[3];
+        u16     iiflh;
+        u16     iiflt;
+        u16     iiplh;
+        u16     iiplt;
+        u16     ioflh;
+        u16     ioflt;
+        u16     ioplh;
+        u16     ioplt;
+        u32     iidc;
+        u32     ictl;
+        u32     ifcpp;
+        u8      pad5[0x4];
+        u16     mfac0;
+        u16     mfac1;
+        u16     mfac2;
+        u16     mfac3;
+        u16     mfac4;
+        u16     mfac5;
+        u16     mfac6;
+        u16     mfac7;
+        u16     ifcfh;
+        u16     ifcht;
+        u8      pad6[0x4];
+        u32     iifmc;
+        u32     iodb;
+        u32     iodbc;
+        u32     ifbal;
+        u32     ifbah;
+        u32     ifsiz;
+        u32     ispd0;
+        u32     ispd1;
+        u32     ispd2;
+        u32     ispd3;
+        u32     ihipl;
+        u32     ihiph;
+        u32     ihopl;
+        u32     ihoph;
+        u32     iiipl;
+        u32     iiiph;
+        u32     iiopl;
+        u32     iioph;
+        u32     ifcpl;
+        u32     ifcph;
+        u8      pad7[0x8];
+        u32     iopt;
+};
+
+#endif /* _PPC440SPE_DMA_H */
diff --git a/drivers/dma/ppc4xx/xor.h b/drivers/dma/ppc4xx/xor.h
new file mode 100644
index 000000000000..daed7384daac
--- /dev/null
+++ b/drivers/dma/ppc4xx/xor.h
@@ -0,0 +1,110 @@
+/*
+ * 440SPe's XOR engines support header file
+ *
+ * 2006-2009 (C) DENX Software Engineering.
+ *
+ * Author: Yuri Tikhonov <yur@emcraft.com>
+ *
+ * This file is licensed under the term of  the GNU General Public License
+ * version 2. The program licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#ifndef _PPC440SPE_XOR_H
+#define _PPC440SPE_XOR_H
+
+#include <linux/types.h>
+
+/* Number of XOR engines available on the contoller */
+#define XOR_ENGINES_NUM         1
+
+/* Number of operands supported in the h/w */
+#define XOR_MAX_OPS             16
+
+/*
+ * XOR Command Block Control Register bits
+ */
+#define XOR_CBCR_LNK_BIT        (1<<31) /* link present */
+#define XOR_CBCR_TGT_BIT        (1<<30) /* target present */
+#define XOR_CBCR_CBCE_BIT       (1<<29) /* command block compete enable */
+#define XOR_CBCR_RNZE_BIT       (1<<28) /* result not zero enable */
+#define XOR_CBCR_XNOR_BIT       (1<<15) /* XOR/XNOR */
+#define XOR_CDCR_OAC_MSK        (0x7F)  /* operand address count */
+
+/*
+ * XORCore Status Register bits
+ */
+#define XOR_SR_XCP_BIT          (1<<31) /* core processing */
+#define XOR_SR_ICB_BIT          (1<<17) /* invalid CB */
+#define XOR_SR_IC_BIT           (1<<16) /* invalid command */
+#define XOR_SR_IPE_BIT          (1<<15) /* internal parity error */
+#define XOR_SR_RNZ_BIT          (1<<2)  /* result not Zero */
+#define XOR_SR_CBC_BIT          (1<<1)  /* CB complete */
+#define XOR_SR_CBLC_BIT         (1<<0)  /* CB list complete */
+
+/*
+ * XORCore Control Set and Reset Register bits
+ */
+#define XOR_CRSR_XASR_BIT       (1<<31) /* soft reset */
+#define XOR_CRSR_XAE_BIT        (1<<30) /* enable */
+#define XOR_CRSR_RCBE_BIT       (1<<29) /* refetch CB enable */
+#define XOR_CRSR_PAUS_BIT       (1<<28) /* pause */
+#define XOR_CRSR_64BA_BIT       (1<<27) /* 64/32 CB format */
+#define XOR_CRSR_CLP_BIT        (1<<25) /* continue list processing */
+
+/*
+ * XORCore Interrupt Enable Register
+ */
+#define XOR_IE_ICBIE_BIT        (1<<17) /* Invalid Command Block IRQ Enable */
+#define XOR_IE_ICIE_BIT         (1<<16) /* Invalid Command IRQ Enable */
+#define XOR_IE_RPTIE_BIT        (1<<14) /* Read PLB Timeout Error IRQ Enable */
+#define XOR_IE_CBCIE_BIT        (1<<1)  /* CB complete interrupt enable */
+#define XOR_IE_CBLCI_BIT        (1<<0)  /* CB list complete interrupt enable */
+
+/*
+ * XOR Accelerator engine Command Block Type
+ */
+struct xor_cb {
+        /*
+         * Basic 64-bit format XOR CB (Table 19-1, p.463, 440spe_um_1_22.pdf)
+         */
+        u32     cbc;            /* control */
+        u32     cbbc;           /* byte count */
+        u32     cbs;            /* status */
+        u8      pad0[4];        /* reserved */
+        u32     cbtah;          /* target address high */
+        u32     cbtal;          /* target address low */
+        u32     cblah;          /* link address high */
+        u32     cblal;          /* link address low */
+        struct {
+                u32 h;
+                u32 l;
+        } __attribute__ ((packed)) ops[16];
+} __attribute__ ((packed));
+
+/*
+ * XOR hardware registers Table 19-3, UM 1.22
+ */
+struct xor_regs {
+        u32     op_ar[16][2];   /* operand address[0]-high,[1]-low registers */
+        u8      pad0[352];      /* reserved */
+        u32     cbcr;           /* CB control register */
+        u32     cbbcr;          /* CB byte count register */
+        u32     cbsr;           /* CB status register */
+        u8      pad1[4];        /* reserved */
+        u32     cbtahr;         /* operand target address high register */
+        u32     cbtalr;         /* operand target address low register */
+        u32     cblahr;         /* CB link address high register */
+        u32     cblalr;         /* CB link address low register */
+        u32     crsr;           /* control set register */
+        u32     crrr;           /* control reset register */
+        u32     ccbahr;         /* current CB address high register */
+        u32     ccbalr;         /* current CB address low register */
+        u32     plbr;           /* PLB configuration register */
+        u32     ier;            /* interrupt enable register */
+        u32     pecr;           /* parity error count register */
+        u32     sr;             /* status register */
+        u32     revidr;         /* revision ID register */
+};
+
+#endif /* _PPC440SPE_XOR_H */
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index 034ecf0ace03..2e4a54c8afeb 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -80,17 +80,17 @@ static int sh_dmae_rst(int id)
         unsigned short dmaor;
 
         sh_dmae_ctl_stop(id);
-        dmaor = (dmaor_read_reg(id)|DMAOR_INIT);
+        dmaor = dmaor_read_reg(id) | DMAOR_INIT;
 
         dmaor_write_reg(id, dmaor);
-        if ((dmaor_read_reg(id) & (DMAOR_AE | DMAOR_NMIF))) {
+        if (dmaor_read_reg(id) & (DMAOR_AE | DMAOR_NMIF)) {
                 pr_warning(KERN_ERR "dma-sh: Can't initialize DMAOR.\n");
                 return -EINVAL;
         }
         return 0;
 }
 
-static int dmae_is_idle(struct sh_dmae_chan *sh_chan)
+static int dmae_is_busy(struct sh_dmae_chan *sh_chan)
 {
         u32 chcr = sh_dmae_readl(sh_chan, CHCR);
         if (chcr & CHCR_DE) {
@@ -110,15 +110,14 @@ static void dmae_set_reg(struct sh_dmae_chan *sh_chan, struct sh_dmae_regs hw)
 {
         sh_dmae_writel(sh_chan, hw.sar, SAR);
         sh_dmae_writel(sh_chan, hw.dar, DAR);
-        sh_dmae_writel(sh_chan,
-                (hw.tcr >> calc_xmit_shift(sh_chan)), TCR);
+        sh_dmae_writel(sh_chan, hw.tcr >> calc_xmit_shift(sh_chan), TCR);
 }
 
 static void dmae_start(struct sh_dmae_chan *sh_chan)
 {
         u32 chcr = sh_dmae_readl(sh_chan, CHCR);
 
-        chcr |= (CHCR_DE|CHCR_IE);
+        chcr |= CHCR_DE | CHCR_IE;
         sh_dmae_writel(sh_chan, chcr, CHCR);
 }
 
@@ -132,7 +131,7 @@ static void dmae_halt(struct sh_dmae_chan *sh_chan)
 
 static int dmae_set_chcr(struct sh_dmae_chan *sh_chan, u32 val)
 {
-        int ret = dmae_is_idle(sh_chan);
+        int ret = dmae_is_busy(sh_chan);
         /* When DMA was working, can not set data to CHCR */
         if (ret)
                 return ret;
@@ -149,7 +148,7 @@ static int dmae_set_dmars(struct sh_dmae_chan *sh_chan, u16 val)
 {
         u32 addr;
         int shift = 0;
-        int ret = dmae_is_idle(sh_chan);
+        int ret = dmae_is_busy(sh_chan);
         if (ret)
                 return ret;
 
@@ -307,7 +306,7 @@ static struct dma_async_tx_descriptor *sh_dmae_prep_memcpy(
                 new = sh_dmae_get_desc(sh_chan);
                 if (!new) {
                         dev_err(sh_chan->dev,
-                                        "No free memory for link descriptor\n");
+                                "No free memory for link descriptor\n");
                         goto err_get_desc;
                 }
 
@@ -388,7 +387,7 @@ static void sh_chan_xfer_ld_queue(struct sh_dmae_chan *sh_chan)
         struct sh_dmae_regs hw;
 
         /* DMA work check */
-        if (dmae_is_idle(sh_chan))
+        if (dmae_is_busy(sh_chan))
                 return;
 
         /* Find the first un-transfer desciptor */
@@ -497,8 +496,9 @@ static void dmae_do_tasklet(unsigned long data)
         struct sh_dmae_chan *sh_chan = (struct sh_dmae_chan *)data;
         struct sh_desc *desc, *_desc, *cur_desc = NULL;
         u32 sar_buf = sh_dmae_readl(sh_chan, SAR);
+
         list_for_each_entry_safe(desc, _desc,
-                                        &sh_chan->ld_queue, node) {
+                                 &sh_chan->ld_queue, node) {
                 if ((desc->hw.sar + desc->hw.tcr) == sar_buf) {
                         cur_desc = desc;
                         break;
@@ -543,8 +543,8 @@ static int __devinit sh_dmae_chan_probe(struct sh_dmae_device *shdev, int id)
         /* alloc channel */
         new_sh_chan = kzalloc(sizeof(struct sh_dmae_chan), GFP_KERNEL);
         if (!new_sh_chan) {
-                dev_err(shdev->common.dev, "No free memory for allocating "
-                                "dma channels!\n");
+                dev_err(shdev->common.dev,
+                        "No free memory for allocating dma channels!\n");
                 return -ENOMEM;
         }
 
@@ -586,8 +586,8 @@ static int __devinit sh_dmae_chan_probe(struct sh_dmae_device *shdev, int id)
                         "sh-dmae%d", new_sh_chan->id);
 
         /* set up channel irq */
-        err = request_irq(irq, &sh_dmae_interrupt,
-                irqflags, new_sh_chan->dev_id, new_sh_chan);
+        err = request_irq(irq, &sh_dmae_interrupt, irqflags,
+                          new_sh_chan->dev_id, new_sh_chan);
         if (err) {
                 dev_err(shdev->common.dev, "DMA channel %d request_irq error "
                         "with return %d\n", id, err);
@@ -676,6 +676,8 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
         shdev->common.device_is_tx_complete = sh_dmae_is_complete;
         shdev->common.device_issue_pending = sh_dmae_memcpy_issue_pending;
         shdev->common.dev = &pdev->dev;
+        /* Default transfer size of 32 bytes requires 32-byte alignment */
+        shdev->common.copy_align = 5;
 
 #if defined(CONFIG_CPU_SH4)
         /* Non Mix IRQ mode SH7722/SH7730 etc... */
@@ -688,8 +690,8 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
         }
 
         for (ecnt = 0 ; ecnt < ARRAY_SIZE(eirq); ecnt++) {
-                err = request_irq(eirq[ecnt], sh_dmae_err,
-                        irqflags, "DMAC Address Error", shdev);
+                err = request_irq(eirq[ecnt], sh_dmae_err, irqflags,
+                                  "DMAC Address Error", shdev);
                 if (err) {
                         dev_err(&pdev->dev, "DMA device request_irq"
                                 "error (irq %d) with return %d\n",
diff --git a/drivers/dma/shdma.h b/drivers/dma/shdma.h
index 2b4bc15a2c0a..60b81e529b42 100644
--- a/drivers/dma/shdma.h
+++ b/drivers/dma/shdma.h
@@ -35,15 +35,15 @@ struct sh_desc {
 
 struct sh_dmae_chan {
         dma_cookie_t completed_cookie;  /* The maximum cookie completed */
-        spinlock_t desc_lock;                   /* Descriptor operation lock */
-        struct list_head ld_queue;              /* Link descriptors queue */
-        struct list_head ld_free;               /* Link descriptors free */
-        struct dma_chan common;                 /* DMA common channel */
-        struct device *dev;                             /* Channel device */
+        spinlock_t desc_lock;           /* Descriptor operation lock */
+        struct list_head ld_queue;      /* Link descriptors queue */
+        struct list_head ld_free;       /* Link descriptors free */
+        struct dma_chan common;         /* DMA common channel */
+        struct device *dev;             /* Channel device */
         struct tasklet_struct tasklet;  /* Tasklet */
-        int descs_allocated;                    /* desc count */
+        int descs_allocated;            /* desc count */
         int id;                         /* Raw id of this channel */
-        char dev_id[16];        /* unique name per DMAC of channel */
+        char dev_id[16];                /* unique name per DMAC of channel */
 
         /* Set chcr */
         int (*set_chcr)(struct sh_dmae_chan *sh_chan, u32 regs);
diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c
index fb6bb64e8861..3ebc61067e54 100644
--- a/drivers/dma/txx9dmac.c
+++ b/drivers/dma/txx9dmac.c
@@ -1313,7 +1313,7 @@ static int txx9dmac_resume_noirq(struct device *dev)
 
 }
 
-static struct dev_pm_ops txx9dmac_dev_pm_ops = {
+static const struct dev_pm_ops txx9dmac_dev_pm_ops = {
         .suspend_noirq = txx9dmac_suspend_noirq,
         .resume_noirq = txx9dmac_resume_noirq,
 };
diff --git a/drivers/edac/edac_mce_amd.c b/drivers/edac/edac_mce_amd.c
index c693fcc2213c..8fc91a019620 100644
--- a/drivers/edac/edac_mce_amd.c
+++ b/drivers/edac/edac_mce_amd.c
@@ -299,6 +299,12 @@ void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors)
         if (!handle_errors)
                 return;
 
+        /*
+         * GART TLB error reporting is disabled by default. Bail out early.
+         */
+        if (TLB_ERROR(ec) && !report_gart_errors)
+                return;
+
         pr_emerg(" Northbridge Error, node %d", node_id);
 
         /*
@@ -310,10 +316,9 @@ void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors)
                 if (regs->nbsh & K8_NBSH_ERR_CPU_VAL)
                         pr_cont(", core: %u\n", (u8)(regs->nbsh & 0xf));
         } else {
-                pr_cont(", core: %d\n", ilog2((regs->nbsh & 0xf)));
+                pr_cont(", core: %d\n", fls((regs->nbsh & 0xf) - 1));
         }
 
-
         pr_emerg("%s.\n", EXT_ERR_MSG(xec));
 
         if (BUS_ERROR(ec) && nb_bus_decoder)
@@ -333,21 +338,6 @@ static void amd_decode_fr_mce(u64 mc5_status)
 static inline void amd_decode_err_code(unsigned int ec)
 {
         if (TLB_ERROR(ec)) {
-                /*
-                 * GART errors are intended to help graphics driver developers
-                 * to detect bad GART PTEs. It is recommended by AMD to disable
-                 * GART table walk error reporting by default[1] (currently
-                 * being disabled in mce_cpu_quirks()) and according to the
-                 * comment in mce_cpu_quirks(), such GART errors can be
-                 * incorrectly triggered. We may see these errors anyway and
-                 * unless requested by the user, they won't be reported.
-                 *
-                 * [1] section 13.10.1 on BIOS and Kernel Developers Guide for
-                 *     AMD NPT family 0Fh processors
-                 */
-                if (!report_gart_errors)
-                        return;
-
                 pr_emerg(" Transaction: %s, Cache Level %s\n",
                          TT_MSG(ec), LL_MSG(ec));
         } else if (MEM_ERROR(ec)) {
diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
index 22db05a67bfb..7785d8ffa404 100644
--- a/drivers/edac/i5100_edac.c
+++ b/drivers/edac/i5100_edac.c
@@ -9,6 +9,11 @@
  * Intel 5100X Chipset Memory Controller Hub (MCH) - Datasheet
  *      http://download.intel.com/design/chipsets/datashts/318378.pdf
  *
+ * The intel 5100 has two independent channels. EDAC core currently
+ * can not reflect this configuration so instead the chip-select
+ * rows for each respective channel are layed out one after another,
+ * the first half belonging to channel 0, the second half belonging
+ * to channel 1.
  */
 #include <linux/module.h>
 #include <linux/init.h>
@@ -25,6 +30,8 @@
 
 /* device 16, func 1 */
 #define I5100_MC                0x40    /* Memory Control Register */
+#define         I5100_MC_SCRBEN_MASK    (1 << 7)
+#define         I5100_MC_SCRBDONE_MASK  (1 << 4)
 #define I5100_MS                0x44    /* Memory Status Register */
 #define I5100_SPDDATA           0x48    /* Serial Presence Detect Status Reg */
 #define I5100_SPDCMD            0x4c    /* Serial Presence Detect Command Reg */
@@ -72,11 +79,21 @@
 
 /* bit field accessors */
 
+static inline u32 i5100_mc_scrben(u32 mc)
+{
+        return mc >> 7 & 1;
+}
+
 static inline u32 i5100_mc_errdeten(u32 mc)
 {
         return mc >> 5 & 1;
 }
 
+static inline u32 i5100_mc_scrbdone(u32 mc)
+{
+        return mc >> 4 & 1;
+}
+
 static inline u16 i5100_spddata_rdo(u16 a)
 {
         return a >> 15 & 1;
@@ -265,42 +282,43 @@ static inline u32 i5100_recmemb_ras(u32 a)
 }
 
 /* some generic limits */
-#define I5100_MAX_RANKS_PER_CTLR        6
-#define I5100_MAX_CTLRS                 2
+#define I5100_MAX_RANKS_PER_CHAN        6
+#define I5100_CHANNELS                      2
 #define I5100_MAX_RANKS_PER_DIMM        4
 #define I5100_DIMM_ADDR_LINES           (6 - 3) /* 64 bits / 8 bits per byte */
-#define I5100_MAX_DIMM_SLOTS_PER_CTLR   4
+#define I5100_MAX_DIMM_SLOTS_PER_CHAN   4
 #define I5100_MAX_RANK_INTERLEAVE       4
 #define I5100_MAX_DMIRS                 5
+#define I5100_SCRUB_REFRESH_RATE        (5 * 60 * HZ)
 
 struct i5100_priv {
         /* ranks on each dimm -- 0 maps to not present -- obtained via SPD */
-        int dimm_numrank[I5100_MAX_CTLRS][I5100_MAX_DIMM_SLOTS_PER_CTLR];
+        int dimm_numrank[I5100_CHANNELS][I5100_MAX_DIMM_SLOTS_PER_CHAN];
 
         /*
          * mainboard chip select map -- maps i5100 chip selects to
          * DIMM slot chip selects.  In the case of only 4 ranks per
-         * controller, the mapping is fairly obvious but not unique.
-         * we map -1 -> NC and assume both controllers use the same
+         * channel, the mapping is fairly obvious but not unique.
+         * we map -1 -> NC and assume both channels use the same
          * map...
          *
          */
-        int dimm_csmap[I5100_MAX_DIMM_SLOTS_PER_CTLR][I5100_MAX_RANKS_PER_DIMM];
+        int dimm_csmap[I5100_MAX_DIMM_SLOTS_PER_CHAN][I5100_MAX_RANKS_PER_DIMM];
 
         /* memory interleave range */
         struct {
                 u64      limit;
                 unsigned way[2];
-        } mir[I5100_MAX_CTLRS];
+        } mir[I5100_CHANNELS];
 
         /* adjusted memory interleave range register */
-        unsigned amir[I5100_MAX_CTLRS];
+        unsigned amir[I5100_CHANNELS];
 
         /* dimm interleave range */
         struct {
                 unsigned rank[I5100_MAX_RANK_INTERLEAVE];
                 u64      limit;
-        } dmir[I5100_MAX_CTLRS][I5100_MAX_DMIRS];
+        } dmir[I5100_CHANNELS][I5100_MAX_DMIRS];
 
         /* memory technology registers... */
         struct {
@@ -310,30 +328,33 @@ struct i5100_priv {
                 unsigned numbank;       /* 2 or 3 lines */
                 unsigned numrow;        /* 13 .. 16 lines */
                 unsigned numcol;        /* 11 .. 12 lines */
-        } mtr[I5100_MAX_CTLRS][I5100_MAX_RANKS_PER_CTLR];
+        } mtr[I5100_CHANNELS][I5100_MAX_RANKS_PER_CHAN];
 
         u64 tolm;               /* top of low memory in bytes */
-        unsigned ranksperctlr;  /* number of ranks per controller */
+        unsigned ranksperchan;  /* number of ranks per channel */
 
         struct pci_dev *mc;     /* device 16 func 1 */
         struct pci_dev *ch0mm;  /* device 21 func 0 */
         struct pci_dev *ch1mm;  /* device 22 func 0 */
+
+        struct delayed_work i5100_scrubbing;
+        int scrub_enable;
 };
 
-/* map a rank/ctlr to a slot number on the mainboard */
+/* map a rank/chan to a slot number on the mainboard */
 static int i5100_rank_to_slot(const struct mem_ctl_info *mci,
-                              int ctlr, int rank)
+                              int chan, int rank)
 {
         const struct i5100_priv *priv = mci->pvt_info;
         int i;
 
-        for (i = 0; i < I5100_MAX_DIMM_SLOTS_PER_CTLR; i++) {
+        for (i = 0; i < I5100_MAX_DIMM_SLOTS_PER_CHAN; i++) {
                 int j;
-                const int numrank = priv->dimm_numrank[ctlr][i];
+                const int numrank = priv->dimm_numrank[chan][i];
 
                 for (j = 0; j < numrank; j++)
                         if (priv->dimm_csmap[i][j] == rank)
-                                return i * 2 + ctlr;
+                                return i * 2 + chan;
         }
 
         return -1;
@@ -374,32 +395,32 @@ static const char *i5100_err_msg(unsigned err)
         return "none";
 }
 
-/* convert csrow index into a rank (per controller -- 0..5) */
+/* convert csrow index into a rank (per channel -- 0..5) */
 static int i5100_csrow_to_rank(const struct mem_ctl_info *mci, int csrow)
 {
         const struct i5100_priv *priv = mci->pvt_info;
 
-        return csrow % priv->ranksperctlr;
+        return csrow % priv->ranksperchan;
 }
 
-/* convert csrow index into a controller (0..1) */
-static int i5100_csrow_to_cntlr(const struct mem_ctl_info *mci, int csrow)
+/* convert csrow index into a channel (0..1) */
+static int i5100_csrow_to_chan(const struct mem_ctl_info *mci, int csrow)
 {
         const struct i5100_priv *priv = mci->pvt_info;
 
-        return csrow / priv->ranksperctlr;
+        return csrow / priv->ranksperchan;
 }
 
 static unsigned i5100_rank_to_csrow(const struct mem_ctl_info *mci,
-                                    int ctlr, int rank)
+                                    int chan, int rank)
 {
         const struct i5100_priv *priv = mci->pvt_info;
 
-        return ctlr * priv->ranksperctlr + rank;
+        return chan * priv->ranksperchan + rank;
 }
 
 static void i5100_handle_ce(struct mem_ctl_info *mci,
-                            int ctlr,
+                            int chan,
                             unsigned bank,
                             unsigned rank,
                             unsigned long syndrome,
@@ -407,12 +428,12 @@ static void i5100_handle_ce(struct mem_ctl_info *mci,
                             unsigned ras,
                             const char *msg)
 {
-        const int csrow = i5100_rank_to_csrow(mci, ctlr, rank);
+        const int csrow = i5100_rank_to_csrow(mci, chan, rank);
 
         printk(KERN_ERR
-                "CE ctlr %d, bank %u, rank %u, syndrome 0x%lx, "
+                "CE chan %d, bank %u, rank %u, syndrome 0x%lx, "
                 "cas %u, ras %u, csrow %u, label \"%s\": %s\n",
-                ctlr, bank, rank, syndrome, cas, ras,
+                chan, bank, rank, syndrome, cas, ras,
                 csrow, mci->csrows[csrow].channels[0].label, msg);
 
         mci->ce_count++;
@@ -421,7 +442,7 @@ static void i5100_handle_ce(struct mem_ctl_info *mci,
 }
 
 static void i5100_handle_ue(struct mem_ctl_info *mci,
-                            int ctlr,
+                            int chan,
                             unsigned bank,
                             unsigned rank,
                             unsigned long syndrome,
@@ -429,23 +450,23 @@ static void i5100_handle_ue(struct mem_ctl_info *mci,
                             unsigned ras,
                             const char *msg)
 {
-        const int csrow = i5100_rank_to_csrow(mci, ctlr, rank);
+        const int csrow = i5100_rank_to_csrow(mci, chan, rank);
 
         printk(KERN_ERR
-                "UE ctlr %d, bank %u, rank %u, syndrome 0x%lx, "
+                "UE chan %d, bank %u, rank %u, syndrome 0x%lx, "
                 "cas %u, ras %u, csrow %u, label \"%s\": %s\n",
-                ctlr, bank, rank, syndrome, cas, ras,
+                chan, bank, rank, syndrome, cas, ras,
                 csrow, mci->csrows[csrow].channels[0].label, msg);
 
         mci->ue_count++;
         mci->csrows[csrow].ue_count++;
 }
 
-static void i5100_read_log(struct mem_ctl_info *mci, int ctlr,
+static void i5100_read_log(struct mem_ctl_info *mci, int chan,
                            u32 ferr, u32 nerr)
 {
         struct i5100_priv *priv = mci->pvt_info;
-        struct pci_dev *pdev = (ctlr) ? priv->ch1mm : priv->ch0mm;
+        struct pci_dev *pdev = (chan) ? priv->ch1mm : priv->ch0mm;
         u32 dw;
         u32 dw2;
         unsigned syndrome = 0;
@@ -484,7 +505,7 @@ static void i5100_read_log(struct mem_ctl_info *mci, int ctlr,
                 else
                         msg = i5100_err_msg(nerr);
 
-                i5100_handle_ce(mci, ctlr, bank, rank, syndrome, cas, ras, msg);
+                i5100_handle_ce(mci, chan, bank, rank, syndrome, cas, ras, msg);
         }
 
         if (i5100_validlog_nrecmemvalid(dw)) {
@@ -506,7 +527,7 @@ static void i5100_read_log(struct mem_ctl_info *mci, int ctlr,
                 else
                         msg = i5100_err_msg(nerr);
 
-                i5100_handle_ue(mci, ctlr, bank, rank, syndrome, cas, ras, msg);
+                i5100_handle_ue(mci, chan, bank, rank, syndrome, cas, ras, msg);
         }
 
         pci_write_config_dword(pdev, I5100_VALIDLOG, dw);
@@ -534,6 +555,80 @@ static void i5100_check_error(struct mem_ctl_info *mci)
         }
 }
 
+/* The i5100 chipset will scrub the entire memory once, then
+ * set a done bit. Continuous scrubbing is achieved by enqueing
+ * delayed work to a workqueue, checking every few minutes if
+ * the scrubbing has completed and if so reinitiating it.
+ */
+
+static void i5100_refresh_scrubbing(struct work_struct *work)
+{
+        struct delayed_work *i5100_scrubbing = container_of(work,
+                                                            struct delayed_work,
+                                                            work);
+        struct i5100_priv *priv = container_of(i5100_scrubbing,
+                                               struct i5100_priv,
+                                               i5100_scrubbing);
+        u32 dw;
+
+        pci_read_config_dword(priv->mc, I5100_MC, &dw);
+
+        if (priv->scrub_enable) {
+
+                pci_read_config_dword(priv->mc, I5100_MC, &dw);
+
+                if (i5100_mc_scrbdone(dw)) {
+                        dw |= I5100_MC_SCRBEN_MASK;
+                        pci_write_config_dword(priv->mc, I5100_MC, dw);
+                        pci_read_config_dword(priv->mc, I5100_MC, &dw);
+                }
+
+                schedule_delayed_work(&(priv->i5100_scrubbing),
+                                      I5100_SCRUB_REFRESH_RATE);
+        }
+}
+/*
+ * The bandwidth is based on experimentation, feel free to refine it.
+ */
+static int i5100_set_scrub_rate(struct mem_ctl_info *mci,
+                                       u32 *bandwidth)
+{
+        struct i5100_priv *priv = mci->pvt_info;
+        u32 dw;
+
+        pci_read_config_dword(priv->mc, I5100_MC, &dw);
+        if (*bandwidth) {
+                priv->scrub_enable = 1;
+                dw |= I5100_MC_SCRBEN_MASK;
+                schedule_delayed_work(&(priv->i5100_scrubbing),
+                                      I5100_SCRUB_REFRESH_RATE);
+        } else {
+                priv->scrub_enable = 0;
+                dw &= ~I5100_MC_SCRBEN_MASK;
+                cancel_delayed_work(&(priv->i5100_scrubbing));
+        }
+        pci_write_config_dword(priv->mc, I5100_MC, dw);
+
+        pci_read_config_dword(priv->mc, I5100_MC, &dw);
+
+        *bandwidth = 5900000 * i5100_mc_scrben(dw);
+
+        return 0;
+}
+
+static int i5100_get_scrub_rate(struct mem_ctl_info *mci,
+                                u32 *bandwidth)
+{
+        struct i5100_priv *priv = mci->pvt_info;
+        u32 dw;
+
+        pci_read_config_dword(priv->mc, I5100_MC, &dw);
+
+        *bandwidth = 5900000 * i5100_mc_scrben(dw);
+
+        return 0;
+}
+
 static struct pci_dev *pci_get_device_func(unsigned vendor,
                                            unsigned device,
                                            unsigned func)
@@ -557,19 +652,19 @@ static unsigned long __devinit i5100_npages(struct mem_ctl_info *mci,
                                             int csrow)
 {
         struct i5100_priv *priv = mci->pvt_info;
-        const unsigned ctlr_rank = i5100_csrow_to_rank(mci, csrow);
-        const unsigned ctlr = i5100_csrow_to_cntlr(mci, csrow);
+        const unsigned chan_rank = i5100_csrow_to_rank(mci, csrow);
+        const unsigned chan = i5100_csrow_to_chan(mci, csrow);
         unsigned addr_lines;
 
         /* dimm present? */
-        if (!priv->mtr[ctlr][ctlr_rank].present)
+        if (!priv->mtr[chan][chan_rank].present)
                 return 0ULL;
 
         addr_lines =
                 I5100_DIMM_ADDR_LINES +
-                priv->mtr[ctlr][ctlr_rank].numcol +
-                priv->mtr[ctlr][ctlr_rank].numrow +
-                priv->mtr[ctlr][ctlr_rank].numbank;
+                priv->mtr[chan][chan_rank].numcol +
+                priv->mtr[chan][chan_rank].numrow +
+                priv->mtr[chan][chan_rank].numbank;
 
         return (unsigned long)
                 ((unsigned long long) (1ULL << addr_lines) / PAGE_SIZE);
@@ -581,11 +676,11 @@ static void __devinit i5100_init_mtr(struct mem_ctl_info *mci)
         struct pci_dev *mms[2] = { priv->ch0mm, priv->ch1mm };
         int i;
 
-        for (i = 0; i < I5100_MAX_CTLRS; i++) {
+        for (i = 0; i < I5100_CHANNELS; i++) {
                 int j;
                 struct pci_dev *pdev = mms[i];
 
-                for (j = 0; j < I5100_MAX_RANKS_PER_CTLR; j++) {
+                for (j = 0; j < I5100_MAX_RANKS_PER_CHAN; j++) {
                         const unsigned addr =
                                 (j < 4) ? I5100_MTR_0 + j * 2 :
                                           I5100_MTR_4 + (j - 4) * 2;
@@ -644,7 +739,6 @@ static int i5100_read_spd_byte(const struct mem_ctl_info *mci,
  * fill dimm chip select map
  *
  * FIXME:
- *   o only valid for 4 ranks per controller
  *   o not the only way to may chip selects to dimm slots
  *   o investigate if there is some way to obtain this map from the bios
  */
@@ -653,9 +747,7 @@ static void __devinit i5100_init_dimm_csmap(struct mem_ctl_info *mci)
         struct i5100_priv *priv = mci->pvt_info;
         int i;
 
-        WARN_ON(priv->ranksperctlr != 4);
-
-        for (i = 0; i < I5100_MAX_DIMM_SLOTS_PER_CTLR; i++) {
+        for (i = 0; i < I5100_MAX_DIMM_SLOTS_PER_CHAN; i++) {
                 int j;
 
                 for (j = 0; j < I5100_MAX_RANKS_PER_DIMM; j++)
@@ -663,12 +755,21 @@ static void __devinit i5100_init_dimm_csmap(struct mem_ctl_info *mci)
         }
 
         /* only 2 chip selects per slot... */
-        priv->dimm_csmap[0][0] = 0;
-        priv->dimm_csmap[0][1] = 3;
-        priv->dimm_csmap[1][0] = 1;
-        priv->dimm_csmap[1][1] = 2;
-        priv->dimm_csmap[2][0] = 2;
-        priv->dimm_csmap[3][0] = 3;
+        if (priv->ranksperchan == 4) {
+                priv->dimm_csmap[0][0] = 0;
+                priv->dimm_csmap[0][1] = 3;
+                priv->dimm_csmap[1][0] = 1;
+                priv->dimm_csmap[1][1] = 2;
+                priv->dimm_csmap[2][0] = 2;
+                priv->dimm_csmap[3][0] = 3;
+        } else {
+                priv->dimm_csmap[0][0] = 0;
+                priv->dimm_csmap[0][1] = 1;
+                priv->dimm_csmap[1][0] = 2;
+                priv->dimm_csmap[1][1] = 3;
+                priv->dimm_csmap[2][0] = 4;
+                priv->dimm_csmap[2][1] = 5;
+        }
 }
 
 static void __devinit i5100_init_dimm_layout(struct pci_dev *pdev,
@@ -677,10 +778,10 @@ static void __devinit i5100_init_dimm_layout(struct pci_dev *pdev,
         struct i5100_priv *priv = mci->pvt_info;
         int i;
 
-        for (i = 0; i < I5100_MAX_CTLRS; i++) {
+        for (i = 0; i < I5100_CHANNELS; i++) {
                 int j;
 
-                for (j = 0; j < I5100_MAX_DIMM_SLOTS_PER_CTLR; j++) {
+                for (j = 0; j < I5100_MAX_DIMM_SLOTS_PER_CHAN; j++) {
                         u8 rank;
 
                         if (i5100_read_spd_byte(mci, i, j, 5, &rank) < 0)
@@ -720,7 +821,7 @@ static void __devinit i5100_init_interleaving(struct pci_dev *pdev,
         pci_read_config_word(pdev, I5100_AMIR_1, &w);
         priv->amir[1] = w;
 
-        for (i = 0; i < I5100_MAX_CTLRS; i++) {
+        for (i = 0; i < I5100_CHANNELS; i++) {
                 int j;
 
                 for (j = 0; j < 5; j++) {
@@ -747,7 +848,7 @@ static void __devinit i5100_init_csrows(struct mem_ctl_info *mci)
 
         for (i = 0; i < mci->nr_csrows; i++) {
                 const unsigned long npages = i5100_npages(mci, i);
-                const unsigned cntlr = i5100_csrow_to_cntlr(mci, i);
+                const unsigned chan = i5100_csrow_to_chan(mci, i);
                 const unsigned rank = i5100_csrow_to_rank(mci, i);
 
                 if (!npages)
@@ -765,7 +866,7 @@ static void __devinit i5100_init_csrows(struct mem_ctl_info *mci)
                 mci->csrows[i].grain = 32;
                 mci->csrows[i].csrow_idx = i;
                 mci->csrows[i].dtype =
-                        (priv->mtr[cntlr][rank].width == 4) ? DEV_X4 : DEV_X8;
+                        (priv->mtr[chan][rank].width == 4) ? DEV_X4 : DEV_X8;
                 mci->csrows[i].ue_count = 0;
                 mci->csrows[i].ce_count = 0;
                 mci->csrows[i].mtype = MEM_RDDR2;
@@ -777,7 +878,7 @@ static void __devinit i5100_init_csrows(struct mem_ctl_info *mci)
                 mci->csrows[i].channels[0].csrow = mci->csrows + i;
                 snprintf(mci->csrows[i].channels[0].label,
                          sizeof(mci->csrows[i].channels[0].label),
-                         "DIMM%u", i5100_rank_to_slot(mci, cntlr, rank));
+                         "DIMM%u", i5100_rank_to_slot(mci, chan, rank));
 
                 total_pages += npages;
         }
@@ -815,13 +916,6 @@ static int __devinit i5100_init_one(struct pci_dev *pdev,
         pci_read_config_dword(pdev, I5100_MS, &dw);
         ranksperch = !!(dw & (1 << 8)) * 2 + 4;
 
-        if (ranksperch != 4) {
-                /* FIXME: get 6 ranks / controller to work - need hw... */
-                printk(KERN_INFO "i5100_edac: unsupported configuration.\n");
-                ret = -ENODEV;
-                goto bail_pdev;
-        }
-
         /* enable error reporting... */
         pci_read_config_dword(pdev, I5100_EMASK_MEM, &dw);
         dw &= ~I5100_FERR_NF_MEM_ANY_MASK;
@@ -864,11 +958,21 @@ static int __devinit i5100_init_one(struct pci_dev *pdev,
         mci->dev = &pdev->dev;
 
         priv = mci->pvt_info;
-        priv->ranksperctlr = ranksperch;
+        priv->ranksperchan = ranksperch;
         priv->mc = pdev;
         priv->ch0mm = ch0mm;
         priv->ch1mm = ch1mm;
 
+        INIT_DELAYED_WORK(&(priv->i5100_scrubbing), i5100_refresh_scrubbing);
+
+        /* If scrubbing was already enabled by the bios, start maintaining it */
+        pci_read_config_dword(pdev, I5100_MC, &dw);
+        if (i5100_mc_scrben(dw)) {
+                priv->scrub_enable = 1;
+                schedule_delayed_work(&(priv->i5100_scrubbing),
+                                      I5100_SCRUB_REFRESH_RATE);
+        }
+
         i5100_init_dimm_layout(pdev, mci);
         i5100_init_interleaving(pdev, mci);
 
@@ -882,6 +986,8 @@ static int __devinit i5100_init_one(struct pci_dev *pdev,
         mci->ctl_page_to_phys = NULL;
 
         mci->edac_check = i5100_check_error;
+        mci->set_sdram_scrub_rate = i5100_set_scrub_rate;
+        mci->get_sdram_scrub_rate = i5100_get_scrub_rate;
 
         i5100_init_csrows(mci);
 
@@ -897,12 +1003,14 @@ static int __devinit i5100_init_one(struct pci_dev *pdev,
 
         if (edac_mc_add_mc(mci)) {
                 ret = -ENODEV;
-                goto bail_mc;
+                goto bail_scrub;
         }
 
         return ret;
 
-bail_mc:
+bail_scrub:
+        priv->scrub_enable = 0;
+        cancel_delayed_work_sync(&(priv->i5100_scrubbing));
         edac_mc_free(mci);
 
 bail_disable_ch1:
@@ -935,6 +1043,10 @@ static void __devexit i5100_remove_one(struct pci_dev *pdev)
                 return;
 
         priv = mci->pvt_info;
+
+        priv->scrub_enable = 0;
+        cancel_delayed_work_sync(&(priv->i5100_scrubbing));
+
         pci_disable_device(pdev);
         pci_disable_device(priv->ch0mm);
         pci_disable_device(priv->ch1mm);
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index ebb9e51deb0c..1b03ba1d0834 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -7,7 +7,7 @@ menu "Firmware Drivers"
 
 config EDD
         tristate "BIOS Enhanced Disk Drive calls determine boot disk"
-        depends on !IA64
+        depends on X86
         help
           Say Y or M here if you want to enable BIOS Enhanced Disk Drive
           Services real mode BIOS calls to determine which disk
@@ -28,7 +28,7 @@ config EDD_OFF
 
 config FIRMWARE_MEMMAP
     bool "Add firmware-provided memory map to sysfs" if EMBEDDED
-    default (X86_64 || X86_32)
+    default X86
     help
       Add the firmware-provided (unmodified) memory map to /sys/firmware/memmap.
       That memory map is used for example by kexec to set up parameter area
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 3a2ccb09e2f8..31b983d9462c 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -169,10 +169,7 @@ static void __init dmi_save_uuid(const struct dmi_header *dm, int slot, int inde
         if (!s)
                 return;
 
-        sprintf(s,
-                "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X",
-                d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7],
-                d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]);
+        sprintf(s, "%pUB", d);
 
         dmi_ident[slot] = s;
 }
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 2ad0128c63c6..a019b49ecc9b 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -174,6 +174,16 @@ config GPIO_ADP5520
 
 comment "PCI GPIO expanders:"
 
+config GPIO_CS5535
+        tristate "AMD CS5535/CS5536 GPIO support"
+        depends on PCI && !CS5535_GPIO
+        help
+          The AMD CS5535 and CS5536 southbridges support 28 GPIO pins that
+          can be used for quite a number of things.  The CS5535/6 is found on
+          AMD Geode and Lemote Yeeloong devices.
+
+          If unsure, say N.
+
 config GPIO_BT8XX
         tristate "BT8XX GPIO abuser"
         depends on PCI && VIDEO_BT848=n
@@ -196,6 +206,12 @@ config GPIO_LANGWELL
         help
           Say Y here to support Intel Moorestown platform GPIO.
 
+config GPIO_TIMBERDALE
+        bool "Support for timberdale GPIO IP"
+        depends on MFD_TIMBERDALE && GPIOLIB && HAS_IOMEM
+        ---help---
+        Add support for the GPIO IP in the timberdale FPGA.
+
 comment "SPI GPIO expanders:"
 
 config GPIO_MAX7301
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 00a532c9a1e2..52fe4cf734c7 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -13,9 +13,11 @@ obj-$(CONFIG_GPIO_MCP23S08)	+= mcp23s08.o
 obj-$(CONFIG_GPIO_PCA953X)      += pca953x.o
 obj-$(CONFIG_GPIO_PCF857X)      += pcf857x.o
 obj-$(CONFIG_GPIO_PL061)        += pl061.o
+obj-$(CONFIG_GPIO_TIMBERDALE)   += timbgpio.o
 obj-$(CONFIG_GPIO_TWL4030)      += twl4030-gpio.o
 obj-$(CONFIG_GPIO_UCB1400)      += ucb1400_gpio.o
 obj-$(CONFIG_GPIO_XILINX)       += xilinx_gpio.o
+obj-$(CONFIG_GPIO_CS5535)       += cs5535-gpio.o
 obj-$(CONFIG_GPIO_BT8XX)        += bt8xxgpio.o
 obj-$(CONFIG_GPIO_VR41XX)       += vr41xx_giu.o
 obj-$(CONFIG_GPIO_WM831X)       += wm831x-gpio.o
diff --git a/drivers/gpio/cs5535-gpio.c b/drivers/gpio/cs5535-gpio.c
new file mode 100644
index 000000000000..0fdbe94f24a3
--- /dev/null
+++ b/drivers/gpio/cs5535-gpio.c
@@ -0,0 +1,355 @@
+/*
+ * AMD CS5535/CS5536 GPIO driver
+ * Copyright (C) 2006  Advanced Micro Devices, Inc.
+ * Copyright (C) 2007-2009  Andres Salomon <dilinger@collabora.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public License
+ * as published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/gpio.h>
+#include <linux/io.h>
+#include <linux/cs5535.h>
+
+#define DRV_NAME "cs5535-gpio"
+#define GPIO_BAR 1
+
+/*
+ * Some GPIO pins
+ *  31-29,23 : reserved (always mask out)
+ *  28       : Power Button
+ *  26       : PME#
+ *  22-16    : LPC
+ *  14,15    : SMBus
+ *  9,8      : UART1
+ *  7        : PCI INTB
+ *  3,4      : UART2/DDC
+ *  2        : IDE_IRQ0
+ *  1        : AC_BEEP
+ *  0        : PCI INTA
+ *
+ * If a mask was not specified, allow all except
+ * reserved and Power Button
+ */
+#define GPIO_DEFAULT_MASK 0x0F7FFFFF
+
+static ulong mask = GPIO_DEFAULT_MASK;
+module_param_named(mask, mask, ulong, 0444);
+MODULE_PARM_DESC(mask, "GPIO channel mask.");
+
+static struct cs5535_gpio_chip {
+        struct gpio_chip chip;
+        resource_size_t base;
+
+        struct pci_dev *pdev;
+        spinlock_t lock;
+} cs5535_gpio_chip;
+
+/*
+ * The CS5535/CS5536 GPIOs support a number of extra features not defined
+ * by the gpio_chip API, so these are exported.  For a full list of the
+ * registers, see include/linux/cs5535.h.
+ */
+
+static void __cs5535_gpio_set(struct cs5535_gpio_chip *chip, unsigned offset,
+                unsigned int reg)
+{
+        if (offset < 16)
+                /* low bank register */
+                outl(1 << offset, chip->base + reg);
+        else
+                /* high bank register */
+                outl(1 << (offset - 16), chip->base + 0x80 + reg);
+}
+
+void cs5535_gpio_set(unsigned offset, unsigned int reg)
+{
+        struct cs5535_gpio_chip *chip = &cs5535_gpio_chip;
+        unsigned long flags;
+
+        spin_lock_irqsave(&chip->lock, flags);
+        __cs5535_gpio_set(chip, offset, reg);
+        spin_unlock_irqrestore(&chip->lock, flags);
+}
+EXPORT_SYMBOL_GPL(cs5535_gpio_set);
+
+static void __cs5535_gpio_clear(struct cs5535_gpio_chip *chip, unsigned offset,
+                unsigned int reg)
+{
+        if (offset < 16)
+                /* low bank register */
+                outl(1 << (offset + 16), chip->base + reg);
+        else
+                /* high bank register */
+                outl(1 << offset, chip->base + 0x80 + reg);
+}
+
+void cs5535_gpio_clear(unsigned offset, unsigned int reg)
+{
+        struct cs5535_gpio_chip *chip = &cs5535_gpio_chip;
+        unsigned long flags;
+
+        spin_lock_irqsave(&chip->lock, flags);
+        __cs5535_gpio_clear(chip, offset, reg);
+        spin_unlock_irqrestore(&chip->lock, flags);
+}
+EXPORT_SYMBOL_GPL(cs5535_gpio_clear);
+
+int cs5535_gpio_isset(unsigned offset, unsigned int reg)
+{
+        struct cs5535_gpio_chip *chip = &cs5535_gpio_chip;
+        unsigned long flags;
+        long val;
+
+        spin_lock_irqsave(&chip->lock, flags);
+        if (offset < 16)
+                /* low bank register */
+                val = inl(chip->base + reg);
+        else {
+                /* high bank register */
+                val = inl(chip->base + 0x80 + reg);
+                offset -= 16;
+        }
+        spin_unlock_irqrestore(&chip->lock, flags);
+
+        return (val & (1 << offset)) ? 1 : 0;
+}
+EXPORT_SYMBOL_GPL(cs5535_gpio_isset);
+
+/*
+ * Generic gpio_chip API support.
+ */
+
+static int chip_gpio_request(struct gpio_chip *c, unsigned offset)
+{
+        struct cs5535_gpio_chip *chip = (struct cs5535_gpio_chip *) c;
+        unsigned long flags;
+
+        spin_lock_irqsave(&chip->lock, flags);
+
+        /* check if this pin is available */
+        if ((mask & (1 << offset)) == 0) {
+                dev_info(&chip->pdev->dev,
+                        "pin %u is not available (check mask)\n", offset);
+                spin_unlock_irqrestore(&chip->lock, flags);
+                return -EINVAL;
+        }
+
+        /* disable output aux 1 & 2 on this pin */
+        __cs5535_gpio_clear(chip, offset, GPIO_OUTPUT_AUX1);
+        __cs5535_gpio_clear(chip, offset, GPIO_OUTPUT_AUX2);
+
+        /* disable input aux 1 on this pin */
+        __cs5535_gpio_clear(chip, offset, GPIO_INPUT_AUX1);
+
+        spin_unlock_irqrestore(&chip->lock, flags);
+
+        return 0;
+}
+
+static int chip_gpio_get(struct gpio_chip *chip, unsigned offset)
+{
+        return cs5535_gpio_isset(offset, GPIO_OUTPUT_VAL);
+}
+
+static void chip_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
+{
+        if (val)
+                cs5535_gpio_set(offset, GPIO_OUTPUT_VAL);
+        else
+                cs5535_gpio_clear(offset, GPIO_OUTPUT_VAL);
+}
+
+static int chip_direction_input(struct gpio_chip *c, unsigned offset)
+{
+        struct cs5535_gpio_chip *chip = (struct cs5535_gpio_chip *) c;
+        unsigned long flags;
+
+        spin_lock_irqsave(&chip->lock, flags);
+        __cs5535_gpio_set(chip, offset, GPIO_INPUT_ENABLE);
+        spin_unlock_irqrestore(&chip->lock, flags);
+
+        return 0;
+}
+
+static int chip_direction_output(struct gpio_chip *c, unsigned offset, int val)
+{
+        struct cs5535_gpio_chip *chip = (struct cs5535_gpio_chip *) c;
+        unsigned long flags;
+
+        spin_lock_irqsave(&chip->lock, flags);
+
+        __cs5535_gpio_set(chip, offset, GPIO_OUTPUT_ENABLE);
+        if (val)
+                __cs5535_gpio_set(chip, offset, GPIO_OUTPUT_VAL);
+        else
+                __cs5535_gpio_clear(chip, offset, GPIO_OUTPUT_VAL);
+
+        spin_unlock_irqrestore(&chip->lock, flags);
+
+        return 0;
+}
+
+static char *cs5535_gpio_names[] = {
+        "GPIO0", "GPIO1", "GPIO2", "GPIO3",
+        "GPIO4", "GPIO5", "GPIO6", "GPIO7",
+        "GPIO8", "GPIO9", "GPIO10", "GPIO11",
+        "GPIO12", "GPIO13", "GPIO14", "GPIO15",
+        "GPIO16", "GPIO17", "GPIO18", "GPIO19",
+        "GPIO20", "GPIO21", "GPIO22", NULL,
+        "GPIO24", "GPIO25", "GPIO26", "GPIO27",
+        "GPIO28", NULL, NULL, NULL,
+};
+
+static struct cs5535_gpio_chip cs5535_gpio_chip = {
+        .chip = {
+                .owner = THIS_MODULE,
+                .label = DRV_NAME,
+
+                .base = 0,
+                .ngpio = 32,
+                .names = cs5535_gpio_names,
+                .request = chip_gpio_request,
+
+                .get = chip_gpio_get,
+                .set = chip_gpio_set,
+
+                .direction_input = chip_direction_input,
+                .direction_output = chip_direction_output,
+        },
+};
+
+static int __init cs5535_gpio_probe(struct pci_dev *pdev,
+                const struct pci_device_id *pci_id)
+{
+        int err;
+        ulong mask_orig = mask;
+
+        /* There are two ways to get the GPIO base address; one is by
+         * fetching it from MSR_LBAR_GPIO, the other is by reading the
+         * PCI BAR info.  The latter method is easier (especially across
+         * different architectures), so we'll stick with that for now.  If
+         * it turns out to be unreliable in the face of crappy BIOSes, we
+         * can always go back to using MSRs.. */
+
+        err = pci_enable_device_io(pdev);
+        if (err) {
+                dev_err(&pdev->dev, "can't enable device IO\n");
+                goto done;
+        }
+
+        err = pci_request_region(pdev, GPIO_BAR, DRV_NAME);
+        if (err) {
+                dev_err(&pdev->dev, "can't alloc PCI BAR #%d\n", GPIO_BAR);
+                goto done;
+        }
+
+        /* set up the driver-specific struct */
+        cs5535_gpio_chip.base = pci_resource_start(pdev, GPIO_BAR);
+        cs5535_gpio_chip.pdev = pdev;
+        spin_lock_init(&cs5535_gpio_chip.lock);
+
+        dev_info(&pdev->dev, "allocated PCI BAR #%d: base 0x%llx\n", GPIO_BAR,
+                        (unsigned long long) cs5535_gpio_chip.base);
+
+        /* mask out reserved pins */
+        mask &= 0x1F7FFFFF;
+
+        /* do not allow pin 28, Power Button, as there's special handling
+         * in the PMC needed. (note 12, p. 48) */
+        mask &= ~(1 << 28);
+
+        if (mask_orig != mask)
+                dev_info(&pdev->dev, "mask changed from 0x%08lX to 0x%08lX\n",
+                                mask_orig, mask);
+
+        /* finally, register with the generic GPIO API */
+        err = gpiochip_add(&cs5535_gpio_chip.chip);
+        if (err)
+                goto release_region;
+
+        dev_info(&pdev->dev, DRV_NAME ": GPIO support successfully loaded.\n");
+        return 0;
+
+release_region:
+        pci_release_region(pdev, GPIO_BAR);
+done:
+        return err;
+}
+
+static void __exit cs5535_gpio_remove(struct pci_dev *pdev)
+{
+        int err;
+
+        err = gpiochip_remove(&cs5535_gpio_chip.chip);
+        if (err) {
+                /* uhh? */
+                dev_err(&pdev->dev, "unable to remove gpio_chip?\n");
+        }
+        pci_release_region(pdev, GPIO_BAR);
+}
+
+static struct pci_device_id cs5535_gpio_pci_tbl[] = {
+        { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) },
+        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
+        { 0, },
+};
+MODULE_DEVICE_TABLE(pci, cs5535_gpio_pci_tbl);
+
+/*
+ * We can't use the standard PCI driver registration stuff here, since
+ * that allows only one driver to bind to each PCI device (and we want
+ * multiple drivers to be able to bind to the device).  Instead, manually
+ * scan for the PCI device, request a single region, and keep track of the
+ * devices that we're using.
+ */
+
+static int __init cs5535_gpio_scan_pci(void)
+{
+        struct pci_dev *pdev;
+        int err = -ENODEV;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(cs5535_gpio_pci_tbl); i++) {
+                pdev = pci_get_device(cs5535_gpio_pci_tbl[i].vendor,
+                                cs5535_gpio_pci_tbl[i].device, NULL);
+                if (pdev) {
+                        err = cs5535_gpio_probe(pdev, &cs5535_gpio_pci_tbl[i]);
+                        if (err)
+                                pci_dev_put(pdev);
+
+                        /* we only support a single CS5535/6 southbridge */
+                        break;
+                }
+        }
+
+        return err;
+}
+
+static void __exit cs5535_gpio_free_pci(void)
+{
+        cs5535_gpio_remove(cs5535_gpio_chip.pdev);
+        pci_dev_put(cs5535_gpio_chip.pdev);
+}
+
+static int __init cs5535_gpio_init(void)
+{
+        return cs5535_gpio_scan_pci();
+}
+
+static void __exit cs5535_gpio_exit(void)
+{
+        cs5535_gpio_free_pci();
+}
+
+module_init(cs5535_gpio_init);
+module_exit(cs5535_gpio_exit);
+
+MODULE_AUTHOR("Andres Salomon <dilinger@collabora.co.uk>");
+MODULE_DESCRIPTION("AMD CS5535/CS5536 GPIO driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 50de0f5750d8..a25ad284a272 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -53,6 +53,7 @@ struct gpio_desc {
 #define FLAG_SYSFS      4       /* exported via /sys/class/gpio/control */
 #define FLAG_TRIG_FALL  5       /* trigger on falling edge */
 #define FLAG_TRIG_RISE  6       /* trigger on rising edge */
+#define FLAG_ACTIVE_LOW 7       /* sysfs value has active low */
 
 #define PDESC_ID_SHIFT  16      /* add new flags before this one */
 
@@ -210,6 +211,11 @@ static DEFINE_MUTEX(sysfs_lock);
  *      * configures behavior of poll(2) on /value
  *      * available only if pin can generate IRQs on input
  *      * is read/write as "none", "falling", "rising", or "both"
+ *   /active_low
+ *      * configures polarity of /value
+ *      * is read/write as zero/nonzero
+ *      * also affects existing and subsequent "falling" and "rising"
+ *        /edge configuration
  */
 
 static ssize_t gpio_direction_show(struct device *dev,
@@ -255,7 +261,7 @@ static ssize_t gpio_direction_store(struct device *dev,
         return status ? : size;
 }
 
-static const DEVICE_ATTR(direction, 0644,
+static /* const */ DEVICE_ATTR(direction, 0644,
                 gpio_direction_show, gpio_direction_store);
 
 static ssize_t gpio_value_show(struct device *dev,
@@ -267,10 +273,17 @@ static ssize_t gpio_value_show(struct device *dev,
 
         mutex_lock(&sysfs_lock);
 
-        if (!test_bit(FLAG_EXPORT, &desc->flags))
+        if (!test_bit(FLAG_EXPORT, &desc->flags)) {
                 status = -EIO;
-        else
-                status = sprintf(buf, "%d\n", !!gpio_get_value_cansleep(gpio));
+        } else {
+                int value;
+
+                value = !!gpio_get_value_cansleep(gpio);
+                if (test_bit(FLAG_ACTIVE_LOW, &desc->flags))
+                        value = !value;
+
+                status = sprintf(buf, "%d\n", value);
+        }
 
         mutex_unlock(&sysfs_lock);
         return status;
@@ -294,6 +307,8 @@ static ssize_t gpio_value_store(struct device *dev,
 
                 status = strict_strtol(buf, 0, &value);
                 if (status == 0) {
+                        if (test_bit(FLAG_ACTIVE_LOW, &desc->flags))
+                                value = !value;
                         gpio_set_value_cansleep(gpio, value != 0);
                         status = size;
                 }
@@ -303,7 +318,7 @@ static ssize_t gpio_value_store(struct device *dev,
         return status;
 }
 
-static /*const*/ DEVICE_ATTR(value, 0644,
+static const DEVICE_ATTR(value, 0644,
                 gpio_value_show, gpio_value_store);
 
 static irqreturn_t gpio_sysfs_irq(int irq, void *priv)
@@ -352,9 +367,11 @@ static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev,
 
         irq_flags = IRQF_SHARED;
         if (test_bit(FLAG_TRIG_FALL, &gpio_flags))
-                irq_flags |= IRQF_TRIGGER_FALLING;
+                irq_flags |= test_bit(FLAG_ACTIVE_LOW, &desc->flags) ?
+                        IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING;
         if (test_bit(FLAG_TRIG_RISE, &gpio_flags))
-                irq_flags |= IRQF_TRIGGER_RISING;
+                irq_flags |= test_bit(FLAG_ACTIVE_LOW, &desc->flags) ?
+                        IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING;
 
         if (!pdesc) {
                 pdesc = kmalloc(sizeof(*pdesc), GFP_KERNEL);
@@ -475,9 +492,79 @@ found:
 
 static DEVICE_ATTR(edge, 0644, gpio_edge_show, gpio_edge_store);
 
+static int sysfs_set_active_low(struct gpio_desc *desc, struct device *dev,
+                                int value)
+{
+        int                     status = 0;
+
+        if (!!test_bit(FLAG_ACTIVE_LOW, &desc->flags) == !!value)
+                return 0;
+
+        if (value)
+                set_bit(FLAG_ACTIVE_LOW, &desc->flags);
+        else
+                clear_bit(FLAG_ACTIVE_LOW, &desc->flags);
+
+        /* reconfigure poll(2) support if enabled on one edge only */
+        if (dev != NULL && (!!test_bit(FLAG_TRIG_RISE, &desc->flags) ^
+                                !!test_bit(FLAG_TRIG_FALL, &desc->flags))) {
+                unsigned long trigger_flags = desc->flags & GPIO_TRIGGER_MASK;
+
+                gpio_setup_irq(desc, dev, 0);
+                status = gpio_setup_irq(desc, dev, trigger_flags);
+        }
+
+        return status;
+}
+
+static ssize_t gpio_active_low_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        const struct gpio_desc  *desc = dev_get_drvdata(dev);
+        ssize_t                 status;
+
+        mutex_lock(&sysfs_lock);
+
+        if (!test_bit(FLAG_EXPORT, &desc->flags))
+                status = -EIO;
+        else
+                status = sprintf(buf, "%d\n",
+                                !!test_bit(FLAG_ACTIVE_LOW, &desc->flags));
+
+        mutex_unlock(&sysfs_lock);
+
+        return status;
+}
+
+static ssize_t gpio_active_low_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t size)
+{
+        struct gpio_desc        *desc = dev_get_drvdata(dev);
+        ssize_t                 status;
+
+        mutex_lock(&sysfs_lock);
+
+        if (!test_bit(FLAG_EXPORT, &desc->flags)) {
+                status = -EIO;
+        } else {
+                long            value;
+
+                status = strict_strtol(buf, 0, &value);
+                if (status == 0)
+                        status = sysfs_set_active_low(desc, dev, value != 0);
+        }
+
+        mutex_unlock(&sysfs_lock);
+
+        return status ? : size;
+}
+
+static const DEVICE_ATTR(active_low, 0644,
+                gpio_active_low_show, gpio_active_low_store);
+
 static const struct attribute *gpio_attrs[] = {
-        &dev_attr_direction.attr,
         &dev_attr_value.attr,
+        &dev_attr_active_low.attr,
         NULL,
 };
 
@@ -662,12 +749,12 @@ int gpio_export(unsigned gpio, bool direction_may_change)
                 dev = device_create(&gpio_class, desc->chip->dev, MKDEV(0, 0),
                                 desc, ioname ? ioname : "gpio%d", gpio);
                 if (!IS_ERR(dev)) {
-                        if (direction_may_change)
-                                status = sysfs_create_group(&dev->kobj,
+                        status = sysfs_create_group(&dev->kobj,
                                                 &gpio_attr_group);
-                        else
+
+                        if (!status && direction_may_change)
                                 status = device_create_file(dev,
-                                                &dev_attr_value);
+                                                &dev_attr_direction);
 
                         if (!status && gpio_to_irq(gpio) >= 0
                                         && (direction_may_change
@@ -744,6 +831,55 @@ done:
 }
 EXPORT_SYMBOL_GPL(gpio_export_link);
 
+
+/**
+ * gpio_sysfs_set_active_low - set the polarity of gpio sysfs value
+ * @gpio: gpio to change
+ * @value: non-zero to use active low, i.e. inverted values
+ *
+ * Set the polarity of /sys/class/gpio/gpioN/value sysfs attribute.
+ * The GPIO does not have to be exported yet.  If poll(2) support has
+ * been enabled for either rising or falling edge, it will be
+ * reconfigured to follow the new polarity.
+ *
+ * Returns zero on success, else an error.
+ */
+int gpio_sysfs_set_active_low(unsigned gpio, int value)
+{
+        struct gpio_desc        *desc;
+        struct device           *dev = NULL;
+        int                     status = -EINVAL;
+
+        if (!gpio_is_valid(gpio))
+                goto done;
+
+        mutex_lock(&sysfs_lock);
+
+        desc = &gpio_desc[gpio];
+
+        if (test_bit(FLAG_EXPORT, &desc->flags)) {
+                struct device *dev;
+
+                dev = class_find_device(&gpio_class, NULL, desc, match_export);
+                if (dev == NULL) {
+                        status = -ENODEV;
+                        goto unlock;
+                }
+        }
+
+        status = sysfs_set_active_low(desc, dev, value);
+
+unlock:
+        mutex_unlock(&sysfs_lock);
+
+done:
+        if (status)
+                pr_debug("%s: gpio%d status %d\n", __func__, gpio, status);
+
+        return status;
+}
+EXPORT_SYMBOL_GPL(gpio_sysfs_set_active_low);
+
 /**
  * gpio_unexport - reverse effect of gpio_export()
  * @gpio: gpio to make unavailable
@@ -1094,6 +1230,7 @@ void gpio_free(unsigned gpio)
                 }
                 desc_set_label(desc, NULL);
                 module_put(desc->chip->owner);
+                clear_bit(FLAG_ACTIVE_LOW, &desc->flags);
                 clear_bit(FLAG_REQUESTED, &desc->flags);
         } else
                 WARN_ON(extra_checks);
diff --git a/drivers/gpio/langwell_gpio.c b/drivers/gpio/langwell_gpio.c
index 4baf3d7d0f8e..6c0ebbdc659e 100644
--- a/drivers/gpio/langwell_gpio.c
+++ b/drivers/gpio/langwell_gpio.c
@@ -123,7 +123,7 @@ static int lnw_irq_type(unsigned irq, unsigned type)
         void __iomem *grer = (void __iomem *)(&lnw->reg_base->GRER[reg]);
         void __iomem *gfer = (void __iomem *)(&lnw->reg_base->GFER[reg]);
 
-        if (gpio < 0 || gpio > lnw->chip.ngpio)
+        if (gpio >= lnw->chip.ngpio)
                 return -EINVAL;
         spin_lock_irqsave(&lnw->lock, flags);
         if (type & IRQ_TYPE_EDGE_RISING)
diff --git a/drivers/gpio/timbgpio.c b/drivers/gpio/timbgpio.c
new file mode 100644
index 000000000000..a4d344ba8e5c
--- /dev/null
+++ b/drivers/gpio/timbgpio.c
@@ -0,0 +1,342 @@
+/*
+ * timbgpio.c timberdale FPGA GPIO driver
+ * Copyright (c) 2009 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.
+ *
+ * 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.
+ */
+
+/* Supports:
+ * Timberdale FPGA GPIO
+ */
+
+#include <linux/module.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/timb_gpio.h>
+#include <linux/interrupt.h>
+
+#define DRIVER_NAME "timb-gpio"
+
+#define TGPIOVAL        0x00
+#define TGPIODIR        0x04
+#define TGPIO_IER       0x08
+#define TGPIO_ISR       0x0c
+#define TGPIO_IPR       0x10
+#define TGPIO_ICR       0x14
+#define TGPIO_FLR       0x18
+#define TGPIO_LVR       0x1c
+
+struct timbgpio {
+        void __iomem            *membase;
+        spinlock_t              lock; /* mutual exclusion */
+        struct gpio_chip        gpio;
+        int                     irq_base;
+};
+
+static int timbgpio_update_bit(struct gpio_chip *gpio, unsigned index,
+        unsigned offset, bool enabled)
+{
+        struct timbgpio *tgpio = container_of(gpio, struct timbgpio, gpio);
+        u32 reg;
+
+        spin_lock(&tgpio->lock);
+        reg = ioread32(tgpio->membase + offset);
+
+        if (enabled)
+                reg |= (1 << index);
+        else
+                reg &= ~(1 << index);
+
+        iowrite32(reg, tgpio->membase + offset);
+        spin_unlock(&tgpio->lock);
+
+        return 0;
+}
+
+static int timbgpio_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)
+{
+        return timbgpio_update_bit(gpio, nr, TGPIODIR, true);
+}
+
+static int timbgpio_gpio_get(struct gpio_chip *gpio, unsigned nr)
+{
+        struct timbgpio *tgpio = container_of(gpio, struct timbgpio, gpio);
+        u32 value;
+
+        value = ioread32(tgpio->membase + TGPIOVAL);
+        return (value & (1 << nr)) ? 1 : 0;
+}
+
+static int timbgpio_gpio_direction_output(struct gpio_chip *gpio,
+                                                unsigned nr, int val)
+{
+        return timbgpio_update_bit(gpio, nr, TGPIODIR, false);
+}
+
+static void timbgpio_gpio_set(struct gpio_chip *gpio,
+                                unsigned nr, int val)
+{
+        timbgpio_update_bit(gpio, nr, TGPIOVAL, val != 0);
+}
+
+static int timbgpio_to_irq(struct gpio_chip *gpio, unsigned offset)
+{
+        struct timbgpio *tgpio = container_of(gpio, struct timbgpio, gpio);
+
+        if (tgpio->irq_base <= 0)
+                return -EINVAL;
+
+        return tgpio->irq_base + offset;
+}
+
+/*
+ * GPIO IRQ
+ */
+static void timbgpio_irq_disable(unsigned irq)
+{
+        struct timbgpio *tgpio = get_irq_chip_data(irq);
+        int offset = irq - tgpio->irq_base;
+
+        timbgpio_update_bit(&tgpio->gpio, offset, TGPIO_IER, 0);
+}
+
+static void timbgpio_irq_enable(unsigned irq)
+{
+        struct timbgpio *tgpio = get_irq_chip_data(irq);
+        int offset = irq - tgpio->irq_base;
+
+        timbgpio_update_bit(&tgpio->gpio, offset, TGPIO_IER, 1);
+}
+
+static int timbgpio_irq_type(unsigned irq, unsigned trigger)
+{
+        struct timbgpio *tgpio = get_irq_chip_data(irq);
+        int offset = irq - tgpio->irq_base;
+        unsigned long flags;
+        u32 lvr, flr;
+
+        if (offset < 0 || offset > tgpio->gpio.ngpio)
+                return -EINVAL;
+
+        spin_lock_irqsave(&tgpio->lock, flags);
+
+        lvr = ioread32(tgpio->membase + TGPIO_LVR);
+        flr = ioread32(tgpio->membase + TGPIO_FLR);
+
+        if (trigger & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) {
+                flr &= ~(1 << offset);
+                if (trigger & IRQ_TYPE_LEVEL_HIGH)
+                        lvr |= 1 << offset;
+                else
+                        lvr &= ~(1 << offset);
+        }
+
+        if ((trigger & IRQ_TYPE_EDGE_BOTH) == IRQ_TYPE_EDGE_BOTH)
+                return -EINVAL;
+        else {
+                flr |= 1 << offset;
+                /* opposite compared to the datasheet, but it mirrors the
+                 * reality
+                 */
+                if (trigger & IRQ_TYPE_EDGE_FALLING)
+                        lvr |= 1 << offset;
+                else
+                        lvr &= ~(1 << offset);
+        }
+
+        iowrite32(lvr, tgpio->membase + TGPIO_LVR);
+        iowrite32(flr, tgpio->membase + TGPIO_FLR);
+        iowrite32(1 << offset, tgpio->membase + TGPIO_ICR);
+        spin_unlock_irqrestore(&tgpio->lock, flags);
+
+        return 0;
+}
+
+static void timbgpio_irq(unsigned int irq, struct irq_desc *desc)
+{
+        struct timbgpio *tgpio = get_irq_data(irq);
+        unsigned long ipr;
+        int offset;
+
+        desc->chip->ack(irq);
+        ipr = ioread32(tgpio->membase + TGPIO_IPR);
+        iowrite32(ipr, tgpio->membase + TGPIO_ICR);
+
+        for_each_bit(offset, &ipr, tgpio->gpio.ngpio)
+                generic_handle_irq(timbgpio_to_irq(&tgpio->gpio, offset));
+}
+
+static struct irq_chip timbgpio_irqchip = {
+        .name           = "GPIO",
+        .enable         = timbgpio_irq_enable,
+        .disable        = timbgpio_irq_disable,
+        .set_type       = timbgpio_irq_type,
+};
+
+static int __devinit timbgpio_probe(struct platform_device *pdev)
+{
+        int err, i;
+        struct gpio_chip *gc;
+        struct timbgpio *tgpio;
+        struct resource *iomem;
+        struct timbgpio_platform_data *pdata = pdev->dev.platform_data;
+        int irq = platform_get_irq(pdev, 0);
+
+        if (!pdata || pdata->nr_pins > 32) {
+                err = -EINVAL;
+                goto err_mem;
+        }
+
+        iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!iomem) {
+                err = -EINVAL;
+                goto err_mem;
+        }
+
+        tgpio = kzalloc(sizeof(*tgpio), GFP_KERNEL);
+        if (!tgpio) {
+                err = -EINVAL;
+                goto err_mem;
+        }
+        tgpio->irq_base = pdata->irq_base;
+
+        spin_lock_init(&tgpio->lock);
+
+        if (!request_mem_region(iomem->start, resource_size(iomem),
+                DRIVER_NAME)) {
+                err = -EBUSY;
+                goto err_request;
+        }
+
+        tgpio->membase = ioremap(iomem->start, resource_size(iomem));
+        if (!tgpio->membase) {
+                err = -ENOMEM;
+                goto err_ioremap;
+        }
+
+        gc = &tgpio->gpio;
+
+        gc->label = dev_name(&pdev->dev);
+        gc->owner = THIS_MODULE;
+        gc->dev = &pdev->dev;
+        gc->direction_input = timbgpio_gpio_direction_input;
+        gc->get = timbgpio_gpio_get;
+        gc->direction_output = timbgpio_gpio_direction_output;
+        gc->set = timbgpio_gpio_set;
+        gc->to_irq = (irq >= 0 && tgpio->irq_base > 0) ? timbgpio_to_irq : NULL;
+        gc->dbg_show = NULL;
+        gc->base = pdata->gpio_base;
+        gc->ngpio = pdata->nr_pins;
+        gc->can_sleep = 0;
+
+        err = gpiochip_add(gc);
+        if (err)
+                goto err_chipadd;
+
+        platform_set_drvdata(pdev, tgpio);
+
+        /* make sure to disable interrupts */
+        iowrite32(0x0, tgpio->membase + TGPIO_IER);
+
+        if (irq < 0 || tgpio->irq_base <= 0)
+                return 0;
+
+        for (i = 0; i < pdata->nr_pins; i++) {
+                set_irq_chip_and_handler_name(tgpio->irq_base + i,
+                        &timbgpio_irqchip, handle_simple_irq, "mux");
+                set_irq_chip_data(tgpio->irq_base + i, tgpio);
+#ifdef CONFIG_ARM
+                set_irq_flags(tgpio->irq_base + i, IRQF_VALID | IRQF_PROBE);
+#endif
+        }
+
+        set_irq_data(irq, tgpio);
+        set_irq_chained_handler(irq, timbgpio_irq);
+
+        return 0;
+
+err_chipadd:
+        iounmap(tgpio->membase);
+err_ioremap:
+        release_mem_region(iomem->start, resource_size(iomem));
+err_request:
+        kfree(tgpio);
+err_mem:
+        printk(KERN_ERR DRIVER_NAME": Failed to register GPIOs: %d\n", err);
+
+        return err;
+}
+
+static int __devexit timbgpio_remove(struct platform_device *pdev)
+{
+        int err;
+        struct timbgpio_platform_data *pdata = pdev->dev.platform_data;
+        struct timbgpio *tgpio = platform_get_drvdata(pdev);
+        struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        int irq = platform_get_irq(pdev, 0);
+
+        if (irq >= 0 && tgpio->irq_base > 0) {
+                int i;
+                for (i = 0; i < pdata->nr_pins; i++) {
+                        set_irq_chip(tgpio->irq_base + i, NULL);
+                        set_irq_chip_data(tgpio->irq_base + i, NULL);
+                }
+
+                set_irq_handler(irq, NULL);
+                set_irq_data(irq, NULL);
+        }
+
+        err = gpiochip_remove(&tgpio->gpio);
+        if (err)
+                printk(KERN_ERR DRIVER_NAME": failed to remove gpio_chip\n");
+
+        iounmap(tgpio->membase);
+        release_mem_region(iomem->start, resource_size(iomem));
+        kfree(tgpio);
+
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+static struct platform_driver timbgpio_platform_driver = {
+        .driver = {
+                .name   = DRIVER_NAME,
+                .owner  = THIS_MODULE,
+        },
+        .probe          = timbgpio_probe,
+        .remove         = timbgpio_remove,
+};
+
+/*--------------------------------------------------------------------------*/
+
+static int __init timbgpio_init(void)
+{
+        return platform_driver_register(&timbgpio_platform_driver);
+}
+
+static void __exit timbgpio_exit(void)
+{
+        platform_driver_unregister(&timbgpio_platform_driver);
+}
+
+module_init(timbgpio_init);
+module_exit(timbgpio_exit);
+
+MODULE_DESCRIPTION("Timberdale GPIO driver");
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Mocean Laboratories");
+MODULE_ALIAS("platform:"DRIVER_NAME);
+
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index d823e6319516..b1bc1ea182b8 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -30,11 +30,12 @@ config DRM_NOUVEAU_DEBUG
           via debugfs.
 
 menu "I2C encoder or helper chips"
-     depends on DRM
+     depends on DRM && I2C
 
 config DRM_I2C_CH7006
         tristate "Chrontel ch7006 TV encoder"
-        default m if DRM_NOUVEAU
+        depends on DRM_NOUVEAU
+        default m
         help
           Support for Chrontel ch7006 and similar TV encoders, found
           on some nVidia video cards.
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 320a14bceb99..aa2dfbc3e351 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -311,8 +311,10 @@ nouveau_bo_create_ttm_backend_entry(struct ttm_bo_device *bdev)
         struct drm_device *dev = dev_priv->dev;
 
         switch (dev_priv->gart_info.type) {
+#if __OS_HAS_AGP
         case NOUVEAU_GART_AGP:
                 return ttm_agp_backend_init(bdev, dev->agp->bridge);
+#endif
         case NOUVEAU_GART_SGDMA:
                 return nouveau_sgdma_init_ttm(dev);
         default:
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 0cff7eb3690a..dacac9a0842a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -205,7 +205,7 @@ nouveau_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr)
                         schedule_timeout(1);
 
                 if (intr && signal_pending(current)) {
-                        ret = -ERESTART;
+                        ret = -ERESTARTSYS;
                         break;
                 }
         }
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 11f831f0ddc5..18fd8ac9fca7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -342,8 +342,6 @@ retry:
                         }
 
                         ret = ttm_bo_wait_cpu(&nvbo->bo, false);
-                        if (ret == -ERESTART)
-                                ret = -EAGAIN;
                         if (ret)
                                 return ret;
                         goto retry;
@@ -915,8 +913,6 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
                         goto out;
 
                 ret = ttm_bo_wait_cpu(&nvbo->bo, no_wait);
-                if (ret == -ERESTART)
-                        ret = -EAGAIN;
                 if (ret)
                         goto out;
         }
@@ -925,9 +921,6 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
                 ret = ttm_bo_wait(&nvbo->bo, false, false, no_wait);
         } else {
                 ret = ttm_bo_synccpu_write_grab(&nvbo->bo, no_wait);
-                if (ret == -ERESTART)
-                        ret = -EAGAIN;
-                else
                 if (ret == 0)
                         nvbo->cpu_filp = file_priv;
         }
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index 02755712ed3d..5158a12f7844 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -407,6 +407,7 @@ uint64_t nouveau_mem_fb_amount(struct drm_device *dev)
         return 0;
 }
 
+#if __OS_HAS_AGP
 static void nouveau_mem_reset_agp(struct drm_device *dev)
 {
         uint32_t saved_pci_nv_1, saved_pci_nv_19, pmc_enable;
@@ -432,10 +433,12 @@ static void nouveau_mem_reset_agp(struct drm_device *dev)
         nv_wr32(dev, NV04_PBUS_PCI_NV_19, saved_pci_nv_19);
         nv_wr32(dev, NV04_PBUS_PCI_NV_1, saved_pci_nv_1);
 }
+#endif
 
 int
 nouveau_mem_init_agp(struct drm_device *dev)
 {
+#if __OS_HAS_AGP
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct drm_agp_info info;
         struct drm_agp_mode mode;
@@ -471,6 +474,7 @@ nouveau_mem_init_agp(struct drm_device *dev)
         dev_priv->gart_info.type        = NOUVEAU_GART_AGP;
         dev_priv->gart_info.aper_base   = info.aperture_base;
         dev_priv->gart_info.aper_size   = info.aperture_size;
+#endif
         return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c
index d3e0a2a6acf8..7e8547cb5833 100644
--- a/drivers/gpu/drm/nouveau/nv40_graph.c
+++ b/drivers/gpu/drm/nouveau/nv40_graph.c
@@ -252,8 +252,9 @@ nv40_grctx_init(struct drm_device *dev)
                 memcpy(pgraph->ctxprog, fw->data, fw->size);
 
                 cp = pgraph->ctxprog;
-                if (cp->signature != 0x5043564e || cp->version != 0 ||
-                    cp->length != ((fw->size - 7) / 4)) {
+                if (le32_to_cpu(cp->signature) != 0x5043564e ||
+                    cp->version != 0 ||
+                    le16_to_cpu(cp->length) != ((fw->size - 7) / 4)) {
                         NV_ERROR(dev, "ctxprog invalid\n");
                         release_firmware(fw);
                         nv40_grctx_fini(dev);
@@ -281,8 +282,9 @@ nv40_grctx_init(struct drm_device *dev)
                 memcpy(pgraph->ctxvals, fw->data, fw->size);
 
                 cv = (void *)pgraph->ctxvals;
-                if (cv->signature != 0x5643564e || cv->version != 0 ||
-                    cv->length != ((fw->size - 9) / 8)) {
+                if (le32_to_cpu(cv->signature) != 0x5643564e ||
+                    cv->version != 0 ||
+                    le32_to_cpu(cv->length) != ((fw->size - 9) / 8)) {
                         NV_ERROR(dev, "ctxvals invalid\n");
                         release_firmware(fw);
                         nv40_grctx_fini(dev);
@@ -294,8 +296,9 @@ nv40_grctx_init(struct drm_device *dev)
         cp = pgraph->ctxprog;
 
         nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_INDEX, 0);
-        for (i = 0; i < cp->length; i++)
-                nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA, cp->data[i]);
+        for (i = 0; i < le16_to_cpu(cp->length); i++)
+                nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA,
+                        le32_to_cpu(cp->data[i]));
 
         pgraph->accel_blocked = false;
         return 0;
@@ -329,8 +332,9 @@ nv40_grctx_vals_load(struct drm_device *dev, struct nouveau_gpuobj *ctx)
         if (!cv)
                 return;
 
-        for (i = 0; i < cv->length; i++)
-                nv_wo32(dev, ctx, cv->data[i].offset, cv->data[i].value);
+        for (i = 0; i < le32_to_cpu(cv->length); i++)
+                nv_wo32(dev, ctx, le32_to_cpu(cv->data[i].offset),
+                        le32_to_cpu(cv->data[i].value));
 }
 
 /*
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
index feb52eee4314..b5f5fe75e6af 100644
--- a/drivers/gpu/drm/radeon/Makefile
+++ b/drivers/gpu/drm/radeon/Makefile
@@ -49,7 +49,7 @@ radeon-y += radeon_device.o radeon_kms.o \
         radeon_cs.o radeon_bios.o radeon_benchmark.o r100.o r300.o r420.o \
         rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o \
         r200.o radeon_legacy_tv.o r600_cs.o r600_blit.o r600_blit_shaders.o \
-        r600_blit_kms.o radeon_pm.o atombios_dp.o
+        r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o
 
 radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
 
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 824cc6480a06..84e5df766d3f 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -1374,7 +1374,6 @@ static int r100_packet0_check(struct radeon_cs_parser *p,
                 case RADEON_TXFORMAT_ARGB4444:
                 case RADEON_TXFORMAT_VYUY422:
                 case RADEON_TXFORMAT_YVYU422:
-                case RADEON_TXFORMAT_DXT1:
                 case RADEON_TXFORMAT_SHADOW16:
                 case RADEON_TXFORMAT_LDUDV655:
                 case RADEON_TXFORMAT_DUDV88:
@@ -1382,12 +1381,19 @@ static int r100_packet0_check(struct radeon_cs_parser *p,
                         break;
                 case RADEON_TXFORMAT_ARGB8888:
                 case RADEON_TXFORMAT_RGBA8888:
-                case RADEON_TXFORMAT_DXT23:
-                case RADEON_TXFORMAT_DXT45:
                 case RADEON_TXFORMAT_SHADOW32:
                 case RADEON_TXFORMAT_LDUDUV8888:
                         track->textures[i].cpp = 4;
                         break;
+                case RADEON_TXFORMAT_DXT1:
+                        track->textures[i].cpp = 1;
+                        track->textures[i].compress_format = R100_TRACK_COMP_DXT1;
+                        break;
+                case RADEON_TXFORMAT_DXT23:
+                case RADEON_TXFORMAT_DXT45:
+                        track->textures[i].cpp = 1;
+                        track->textures[i].compress_format = R100_TRACK_COMP_DXT35;
+                        break;
                 }
                 track->textures[i].cube_info[4].width = 1 << ((idx_value >> 16) & 0xf);
                 track->textures[i].cube_info[4].height = 1 << ((idx_value >> 20) & 0xf);
@@ -2731,6 +2737,7 @@ static inline void r100_cs_track_texture_print(struct r100_cs_track_texture *t)
         DRM_ERROR("coordinate type            %d\n", t->tex_coord_type);
         DRM_ERROR("width round to power of 2  %d\n", t->roundup_w);
         DRM_ERROR("height round to power of 2 %d\n", t->roundup_h);
+        DRM_ERROR("compress format            %d\n", t->compress_format);
 }
 
 static int r100_cs_track_cube(struct radeon_device *rdev,
@@ -2760,6 +2767,36 @@ static int r100_cs_track_cube(struct radeon_device *rdev,
         return 0;
 }
 
+static int r100_track_compress_size(int compress_format, int w, int h)
+{
+        int block_width, block_height, block_bytes;
+        int wblocks, hblocks;
+        int min_wblocks;
+        int sz;
+
+        block_width = 4;
+        block_height = 4;
+
+        switch (compress_format) {
+        case R100_TRACK_COMP_DXT1:
+                block_bytes = 8;
+                min_wblocks = 4;
+                break;
+        default:
+        case R100_TRACK_COMP_DXT35:
+                block_bytes = 16;
+                min_wblocks = 2;
+                break;
+        }
+
+        hblocks = (h + block_height - 1) / block_height;
+        wblocks = (w + block_width - 1) / block_width;
+        if (wblocks < min_wblocks)
+                wblocks = min_wblocks;
+        sz = wblocks * hblocks * block_bytes;
+        return sz;
+}
+
 static int r100_cs_track_texture_check(struct radeon_device *rdev,
                                        struct r100_cs_track *track)
 {
@@ -2797,9 +2834,15 @@ static int r100_cs_track_texture_check(struct radeon_device *rdev,
                         h = h / (1 << i);
                         if (track->textures[u].roundup_h)
                                 h = roundup_pow_of_two(h);
-                        size += w * h;
+                        if (track->textures[u].compress_format) {
+
+                                size += r100_track_compress_size(track->textures[u].compress_format, w, h);
+                                /* compressed textures are block based */
+                        } else
+                                size += w * h;
                 }
                 size *= track->textures[u].cpp;
+
                 switch (track->textures[u].tex_coord_type) {
                 case 0:
                         break;
@@ -2967,6 +3010,7 @@ void r100_cs_track_clear(struct radeon_device *rdev, struct r100_cs_track *track
                 track->arrays[i].esize = 0x7F;
         }
         for (i = 0; i < track->num_texture; i++) {
+                track->textures[i].compress_format = R100_TRACK_COMP_NONE;
                 track->textures[i].pitch = 16536;
                 track->textures[i].width = 16536;
                 track->textures[i].height = 16536;
@@ -3399,6 +3443,8 @@ int r100_init(struct radeon_device *rdev)
         r100_errata(rdev);
         /* Initialize clocks */
         radeon_get_clock_info(rdev->ddev);
+        /* Initialize power management */
+        radeon_pm_init(rdev);
         /* Get vram informations */
         r100_vram_info(rdev);
         /* Initialize memory controller (also test AGP) */
diff --git a/drivers/gpu/drm/radeon/r100_track.h b/drivers/gpu/drm/radeon/r100_track.h
index ca50903dd2bb..7188c3778ee2 100644
--- a/drivers/gpu/drm/radeon/r100_track.h
+++ b/drivers/gpu/drm/radeon/r100_track.h
@@ -28,6 +28,10 @@ struct r100_cs_cube_info {
         unsigned                height;
 };
 
+#define R100_TRACK_COMP_NONE   0
+#define R100_TRACK_COMP_DXT1   1
+#define R100_TRACK_COMP_DXT35  2
+
 struct r100_cs_track_texture {
         struct radeon_bo        *robj;
         struct r100_cs_cube_info cube_info[5]; /* info for 5 non-primary faces */
@@ -44,6 +48,7 @@ struct r100_cs_track_texture {
         bool                    enabled;
         bool                    roundup_w;
         bool                    roundup_h;
+        unsigned                compress_format;
 };
 
 struct r100_cs_track_limits {
diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c
index eb740fc3549f..20942127c46b 100644
--- a/drivers/gpu/drm/radeon/r200.c
+++ b/drivers/gpu/drm/radeon/r200.c
@@ -401,7 +401,6 @@ int r200_packet0_check(struct radeon_cs_parser *p,
                 case R200_TXFORMAT_Y8:
                         track->textures[i].cpp = 1;
                         break;
-                case R200_TXFORMAT_DXT1:
                 case R200_TXFORMAT_AI88:
                 case R200_TXFORMAT_ARGB1555:
                 case R200_TXFORMAT_RGB565:
@@ -418,9 +417,16 @@ int r200_packet0_check(struct radeon_cs_parser *p,
                 case R200_TXFORMAT_ABGR8888:
                 case R200_TXFORMAT_BGR111110:
                 case R200_TXFORMAT_LDVDU8888:
+                        track->textures[i].cpp = 4;
+                        break;
+                case R200_TXFORMAT_DXT1:
+                        track->textures[i].cpp = 1;
+                        track->textures[i].compress_format = R100_TRACK_COMP_DXT1;
+                        break;
                 case R200_TXFORMAT_DXT23:
                 case R200_TXFORMAT_DXT45:
-                        track->textures[i].cpp = 4;
+                        track->textures[i].cpp = 1;
+                        track->textures[i].compress_format = R100_TRACK_COMP_DXT1;
                         break;
                 }
                 track->textures[i].cube_info[4].width = 1 << ((idx_value >> 16) & 0xf);
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 83378c39d0e3..83490c2b5061 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -686,7 +686,15 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
                         r100_cs_dump_packet(p, pkt);
                         return r;
                 }
-                ib[idx] = idx_value + ((u32)reloc->lobj.gpu_offset);
+
+                if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO)
+                        tile_flags |= R300_TXO_MACRO_TILE;
+                if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO)
+                        tile_flags |= R300_TXO_MICRO_TILE;
+
+                tmp = idx_value + ((u32)reloc->lobj.gpu_offset);
+                tmp |= tile_flags;
+                ib[idx] = tmp;
                 track->textures[i].robj = reloc->robj;
                 break;
         /* Tracked registers */
@@ -852,7 +860,6 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
                 case R300_TX_FORMAT_Z6Y5X5:
                 case R300_TX_FORMAT_W4Z4Y4X4:
                 case R300_TX_FORMAT_W1Z5Y5X5:
-                case R300_TX_FORMAT_DXT1:
                 case R300_TX_FORMAT_D3DMFT_CxV8U8:
                 case R300_TX_FORMAT_B8G8_B8G8:
                 case R300_TX_FORMAT_G8R8_G8B8:
@@ -866,8 +873,6 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
                 case 0x17:
                 case R300_TX_FORMAT_FL_I32:
                 case 0x1e:
-                case R300_TX_FORMAT_DXT3:
-                case R300_TX_FORMAT_DXT5:
                         track->textures[i].cpp = 4;
                         break;
                 case R300_TX_FORMAT_W16Z16Y16X16:
@@ -878,6 +883,15 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
                 case R300_TX_FORMAT_FL_R32G32B32A32:
                         track->textures[i].cpp = 16;
                         break;
+                case R300_TX_FORMAT_DXT1:
+                        track->textures[i].cpp = 1;
+                        track->textures[i].compress_format = R100_TRACK_COMP_DXT1;
+                        break;
+                case R300_TX_FORMAT_DXT3:
+                case R300_TX_FORMAT_DXT5:
+                        track->textures[i].cpp = 1;
+                        track->textures[i].compress_format = R100_TRACK_COMP_DXT35;
+                        break;
                 default:
                         DRM_ERROR("Invalid texture format %u\n",
                                   (idx_value & 0x1F));
@@ -1324,6 +1338,8 @@ int r300_init(struct radeon_device *rdev)
         r300_errata(rdev);
         /* Initialize clocks */
         radeon_get_clock_info(rdev->ddev);
+        /* Initialize power management */
+        radeon_pm_init(rdev);
         /* Get vram informations */
         r300_vram_info(rdev);
         /* Initialize memory controller (also test AGP) */
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 36656bd110bf..a0ac3c134b1b 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -1863,6 +1863,14 @@ int r600_startup(struct radeon_device *rdev)
         }
         r600_gpu_init(rdev);
 
+        if (!rdev->r600_blit.shader_obj) {
+                r = r600_blit_init(rdev);
+                if (r) {
+                        DRM_ERROR("radeon: failed blitter (%d).\n", r);
+                        return r;
+                }
+        }
+
         r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
         if (unlikely(r != 0))
                 return r;
@@ -2038,12 +2046,6 @@ int r600_init(struct radeon_device *rdev)
         if (r)
                 return r;
 
-        r = r600_blit_init(rdev);
-        if (r) {
-                DRM_ERROR("radeon: failed blitter (%d).\n", r);
-                return r;
-        }
-
         rdev->accel_working = true;
         r = r600_startup(rdev);
         if (r) {
@@ -2065,6 +2067,10 @@ int r600_init(struct radeon_device *rdev)
                         rdev->accel_working = false;
                 }
         }
+
+        r = r600_audio_init(rdev);
+        if (r)
+                return r; /* TODO error handling */
         return 0;
 }
 
@@ -2073,6 +2079,7 @@ void r600_fini(struct radeon_device *rdev)
         /* Suspend operations */
         r600_suspend(rdev);
 
+        r600_audio_fini(rdev);
         r600_blit_fini(rdev);
         r600_irq_fini(rdev);
         radeon_irq_kms_fini(rdev);
diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c
new file mode 100644
index 000000000000..99e2c3891a7d
--- /dev/null
+++ b/drivers/gpu/drm/radeon/r600_audio.c
@@ -0,0 +1,267 @@
+/*
+ * Copyright 2008 Advanced Micro Devices, Inc.
+ * Copyright 2008 Red Hat Inc.
+ * Copyright 2009 Christian König.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ *
+ * Authors: Christian König
+ */
+#include "drmP.h"
+#include "radeon.h"
+#include "radeon_reg.h"
+#include "atom.h"
+
+#define AUDIO_TIMER_INTERVALL 100 /* 1/10 sekund should be enough */
+
+/*
+ * check if the chipset is supported
+ */
+static int r600_audio_chipset_supported(struct radeon_device *rdev)
+{
+        return rdev->family >= CHIP_R600
+                || rdev->family == CHIP_RS600
+                || rdev->family == CHIP_RS690
+                || rdev->family == CHIP_RS740;
+}
+
+/*
+ * current number of channels
+ */
+static int r600_audio_channels(struct radeon_device *rdev)
+{
+        return (RREG32(R600_AUDIO_RATE_BPS_CHANNEL) & 0x7) + 1;
+}
+
+/*
+ * current bits per sample
+ */
+static int r600_audio_bits_per_sample(struct radeon_device *rdev)
+{
+        uint32_t value = (RREG32(R600_AUDIO_RATE_BPS_CHANNEL) & 0xF0) >> 4;
+        switch (value) {
+        case 0x0: return  8;
+        case 0x1: return 16;
+        case 0x2: return 20;
+        case 0x3: return 24;
+        case 0x4: return 32;
+        }
+
+        DRM_ERROR("Unknown bits per sample 0x%x using 16 instead.\n", (int)value);
+
+        return 16;
+}
+
+/*
+ * current sampling rate in HZ
+ */
+static int r600_audio_rate(struct radeon_device *rdev)
+{
+        uint32_t value = RREG32(R600_AUDIO_RATE_BPS_CHANNEL);
+        uint32_t result;
+
+        if (value & 0x4000)
+                result = 44100;
+        else
+                result = 48000;
+
+        result *= ((value >> 11) & 0x7) + 1;
+        result /= ((value >> 8) & 0x7) + 1;
+
+        return result;
+}
+
+/*
+ * iec 60958 status bits
+ */
+static uint8_t r600_audio_status_bits(struct radeon_device *rdev)
+{
+        return RREG32(R600_AUDIO_STATUS_BITS) & 0xff;
+}
+
+/*
+ * iec 60958 category code
+ */
+static uint8_t r600_audio_category_code(struct radeon_device *rdev)
+{
+        return (RREG32(R600_AUDIO_STATUS_BITS) >> 8) & 0xff;
+}
+
+/*
+ * update all hdmi interfaces with current audio parameters
+ */
+static void r600_audio_update_hdmi(unsigned long param)
+{
+        struct radeon_device *rdev = (struct radeon_device *)param;
+        struct drm_device *dev = rdev->ddev;
+
+        int channels = r600_audio_channels(rdev);
+        int rate = r600_audio_rate(rdev);
+        int bps = r600_audio_bits_per_sample(rdev);
+        uint8_t status_bits = r600_audio_status_bits(rdev);
+        uint8_t category_code = r600_audio_category_code(rdev);
+
+        struct drm_encoder *encoder;
+        int changes = 0;
+
+        changes |= channels != rdev->audio_channels;
+        changes |= rate != rdev->audio_rate;
+        changes |= bps != rdev->audio_bits_per_sample;
+        changes |= status_bits != rdev->audio_status_bits;
+        changes |= category_code != rdev->audio_category_code;
+
+        if (changes) {
+                rdev->audio_channels = channels;
+                rdev->audio_rate = rate;
+                rdev->audio_bits_per_sample = bps;
+                rdev->audio_status_bits = status_bits;
+                rdev->audio_category_code = category_code;
+        }
+
+        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+                if (changes || r600_hdmi_buffer_status_changed(encoder))
+                        r600_hdmi_update_audio_settings(
+                                encoder, channels,
+                                rate, bps, status_bits,
+                                category_code);
+        }
+
+        mod_timer(&rdev->audio_timer,
+                jiffies + msecs_to_jiffies(AUDIO_TIMER_INTERVALL));
+}
+
+/*
+ * initialize the audio vars and register the update timer
+ */
+int r600_audio_init(struct radeon_device *rdev)
+{
+        if (!r600_audio_chipset_supported(rdev))
+                return 0;
+
+        DRM_INFO("%s audio support", radeon_audio ? "Enabling" : "Disabling");
+        WREG32_P(R600_AUDIO_ENABLE, radeon_audio ? 0x81000000 : 0x0, ~0x81000000);
+
+        rdev->audio_channels = -1;
+        rdev->audio_rate = -1;
+        rdev->audio_bits_per_sample = -1;
+        rdev->audio_status_bits = 0;
+        rdev->audio_category_code = 0;
+
+        setup_timer(
+                &rdev->audio_timer,
+                r600_audio_update_hdmi,
+                (unsigned long)rdev);
+
+        mod_timer(&rdev->audio_timer, jiffies + 1);
+
+        return 0;
+}
+
+/*
+ * determin how the encoders and audio interface is wired together
+ */
+int r600_audio_tmds_index(struct drm_encoder *encoder)
+{
+        struct drm_device *dev = encoder->dev;
+        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+        struct drm_encoder *other;
+
+        switch (radeon_encoder->encoder_id) {
+        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
+                return 0;
+
+        case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
+                /* special case check if an TMDS1 is present */
+                list_for_each_entry(other, &dev->mode_config.encoder_list, head) {
+                        if (to_radeon_encoder(other)->encoder_id ==
+                                ENCODER_OBJECT_ID_INTERNAL_TMDS1)
+                                return 1;
+                }
+                return 0;
+
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
+        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+                return 1;
+
+        default:
+                DRM_ERROR("Unsupported encoder type 0x%02X\n",
+                          radeon_encoder->encoder_id);
+                return -1;
+        }
+}
+
+/*
+ * atach the audio codec to the clock source of the encoder
+ */
+void r600_audio_set_clock(struct drm_encoder *encoder, int clock)
+{
+        struct drm_device *dev = encoder->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+        int base_rate = 48000;
+
+        switch (radeon_encoder->encoder_id) {
+        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
+        case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
+                WREG32_P(R600_AUDIO_TIMING, 0, ~0x301);
+                break;
+
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
+        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+                WREG32_P(R600_AUDIO_TIMING, 0x100, ~0x301);
+                break;
+
+        default:
+                DRM_ERROR("Unsupported encoder type 0x%02X\n",
+                          radeon_encoder->encoder_id);
+                return;
+        }
+
+        switch (r600_audio_tmds_index(encoder)) {
+        case 0:
+                WREG32(R600_AUDIO_PLL1_MUL, base_rate*50);
+                WREG32(R600_AUDIO_PLL1_DIV, clock*100);
+                WREG32(R600_AUDIO_CLK_SRCSEL, 0);
+                break;
+
+        case 1:
+                WREG32(R600_AUDIO_PLL2_MUL, base_rate*50);
+                WREG32(R600_AUDIO_PLL2_DIV, clock*100);
+                WREG32(R600_AUDIO_CLK_SRCSEL, 1);
+                break;
+        }
+}
+
+/*
+ * release the audio timer
+ * TODO: How to do this correctly on SMP systems?
+ */
+void r600_audio_fini(struct radeon_device *rdev)
+{
+        if (!r600_audio_chipset_supported(rdev))
+                return;
+
+        WREG32_P(R600_AUDIO_ENABLE, 0x0, ~0x81000000);
+
+        del_timer(&rdev->audio_timer);
+}
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
new file mode 100644
index 000000000000..fcc949df0e5d
--- /dev/null
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -0,0 +1,506 @@
+/*
+ * Copyright 2008 Advanced Micro Devices, Inc.
+ * Copyright 2008 Red Hat Inc.
+ * Copyright 2009 Christian König.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ *
+ * Authors: Christian König
+ */
+#include "drmP.h"
+#include "radeon_drm.h"
+#include "radeon.h"
+#include "atom.h"
+
+/*
+ * HDMI color format
+ */
+enum r600_hdmi_color_format {
+        RGB = 0,
+        YCC_422 = 1,
+        YCC_444 = 2
+};
+
+/*
+ * IEC60958 status bits
+ */
+enum r600_hdmi_iec_status_bits {
+        AUDIO_STATUS_DIG_ENABLE   = 0x01,
+        AUDIO_STATUS_V      = 0x02,
+        AUDIO_STATUS_VCFG        = 0x04,
+        AUDIO_STATUS_EMPHASIS     = 0x08,
+        AUDIO_STATUS_COPYRIGHT    = 0x10,
+        AUDIO_STATUS_NONAUDIO     = 0x20,
+        AUDIO_STATUS_PROFESSIONAL = 0x40,
+        AUDIO_STATUS_LEVEL      = 0x80
+};
+
+struct {
+        uint32_t Clock;
+
+        int N_32kHz;
+        int CTS_32kHz;
+
+        int N_44_1kHz;
+        int CTS_44_1kHz;
+
+        int N_48kHz;
+        int CTS_48kHz;
+
+} r600_hdmi_ACR[] = {
+    /*       32kHz        44.1kHz       48kHz    */
+    /* Clock      N     CTS      N     CTS      N     CTS */
+    {  25174,  4576,  28125,  7007,  31250,  6864,  28125 }, /*  25,20/1.001 MHz */
+    {  25200,  4096,  25200,  6272,  28000,  6144,  25200 }, /*  25.20       MHz */
+    {  27000,  4096,  27000,  6272,  30000,  6144,  27000 }, /*  27.00       MHz */
+    {  27027,  4096,  27027,  6272,  30030,  6144,  27027 }, /*  27.00*1.001 MHz */
+    {  54000,  4096,  54000,  6272,  60000,  6144,  54000 }, /*  54.00       MHz */
+    {  54054,  4096,  54054,  6272,  60060,  6144,  54054 }, /*  54.00*1.001 MHz */
+    {  74175, 11648, 210937, 17836, 234375, 11648, 140625 }, /*  74.25/1.001 MHz */
+    {  74250,  4096,  74250,  6272,  82500,  6144,  74250 }, /*  74.25       MHz */
+    { 148351, 11648, 421875,  8918, 234375,  5824, 140625 }, /* 148.50/1.001 MHz */
+    { 148500,  4096, 148500,  6272, 165000,  6144, 148500 }, /* 148.50       MHz */
+    {      0,  4096,      0,  6272,      0,  6144,      0 }  /* Other */
+};
+
+/*
+ * calculate CTS value if it's not found in the table
+ */
+static void r600_hdmi_calc_CTS(uint32_t clock, int *CTS, int N, int freq)
+{
+        if (*CTS == 0)
+                *CTS = clock*N/(128*freq)*1000;
+        DRM_DEBUG("Using ACR timing N=%d CTS=%d for frequency %d\n",
+                  N, *CTS, freq);
+}
+
+/*
+ * update the N and CTS parameters for a given pixel clock rate
+ */
+static void r600_hdmi_update_ACR(struct drm_encoder *encoder, uint32_t clock)
+{
+        struct drm_device *dev = encoder->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        uint32_t offset = to_radeon_encoder(encoder)->hdmi_offset;
+        int CTS;
+        int N;
+        int i;
+
+        for (i = 0; r600_hdmi_ACR[i].Clock != clock && r600_hdmi_ACR[i].Clock != 0; i++);
+
+        CTS = r600_hdmi_ACR[i].CTS_32kHz;
+        N = r600_hdmi_ACR[i].N_32kHz;
+        r600_hdmi_calc_CTS(clock, &CTS, N, 32000);
+        WREG32(offset+R600_HDMI_32kHz_CTS, CTS << 12);
+        WREG32(offset+R600_HDMI_32kHz_N, N);
+
+        CTS = r600_hdmi_ACR[i].CTS_44_1kHz;
+        N = r600_hdmi_ACR[i].N_44_1kHz;
+        r600_hdmi_calc_CTS(clock, &CTS, N, 44100);
+        WREG32(offset+R600_HDMI_44_1kHz_CTS, CTS << 12);
+        WREG32(offset+R600_HDMI_44_1kHz_N, N);
+
+        CTS = r600_hdmi_ACR[i].CTS_48kHz;
+        N = r600_hdmi_ACR[i].N_48kHz;
+        r600_hdmi_calc_CTS(clock, &CTS, N, 48000);
+        WREG32(offset+R600_HDMI_48kHz_CTS, CTS << 12);
+        WREG32(offset+R600_HDMI_48kHz_N, N);
+}
+
+/*
+ * calculate the crc for a given info frame
+ */
+static void r600_hdmi_infoframe_checksum(uint8_t packetType,
+                                         uint8_t versionNumber,
+                                         uint8_t length,
+                                         uint8_t *frame)
+{
+    int i;
+    frame[0] = packetType + versionNumber + length;
+    for (i = 1; i <= length; i++)
+        frame[0] += frame[i];
+    frame[0] = 0x100 - frame[0];
+}
+
+/*
+ * build a HDMI Video Info Frame
+ */
+static void r600_hdmi_videoinfoframe(
+        struct drm_encoder *encoder,
+        enum r600_hdmi_color_format color_format,
+        int active_information_present,
+        uint8_t active_format_aspect_ratio,
+        uint8_t scan_information,
+        uint8_t colorimetry,
+        uint8_t ex_colorimetry,
+        uint8_t quantization,
+        int ITC,
+        uint8_t picture_aspect_ratio,
+        uint8_t video_format_identification,
+        uint8_t pixel_repetition,
+        uint8_t non_uniform_picture_scaling,
+        uint8_t bar_info_data_valid,
+        uint16_t top_bar,
+        uint16_t bottom_bar,
+        uint16_t left_bar,
+        uint16_t right_bar
+)
+{
+        struct drm_device *dev = encoder->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        uint32_t offset = to_radeon_encoder(encoder)->hdmi_offset;
+
+        uint8_t frame[14];
+
+        frame[0x0] = 0;
+        frame[0x1] =
+                (scan_information & 0x3) |
+                ((bar_info_data_valid & 0x3) << 2) |
+                ((active_information_present & 0x1) << 4) |
+                ((color_format & 0x3) << 5);
+        frame[0x2] =
+                (active_format_aspect_ratio & 0xF) |
+                ((picture_aspect_ratio & 0x3) << 4) |
+                ((colorimetry & 0x3) << 6);
+        frame[0x3] =
+                (non_uniform_picture_scaling & 0x3) |
+                ((quantization & 0x3) << 2) |
+                ((ex_colorimetry & 0x7) << 4) |
+                ((ITC & 0x1) << 7);
+        frame[0x4] = (video_format_identification & 0x7F);
+        frame[0x5] = (pixel_repetition & 0xF);
+        frame[0x6] = (top_bar & 0xFF);
+        frame[0x7] = (top_bar >> 8);
+        frame[0x8] = (bottom_bar & 0xFF);
+        frame[0x9] = (bottom_bar >> 8);
+        frame[0xA] = (left_bar & 0xFF);
+        frame[0xB] = (left_bar >> 8);
+        frame[0xC] = (right_bar & 0xFF);
+        frame[0xD] = (right_bar >> 8);
+
+        r600_hdmi_infoframe_checksum(0x82, 0x02, 0x0D, frame);
+
+        WREG32(offset+R600_HDMI_VIDEOINFOFRAME_0,
+                frame[0x0] | (frame[0x1] << 8) | (frame[0x2] << 16) | (frame[0x3] << 24));
+        WREG32(offset+R600_HDMI_VIDEOINFOFRAME_1,
+                frame[0x4] | (frame[0x5] << 8) | (frame[0x6] << 16) | (frame[0x7] << 24));
+        WREG32(offset+R600_HDMI_VIDEOINFOFRAME_2,
+                frame[0x8] | (frame[0x9] << 8) | (frame[0xA] << 16) | (frame[0xB] << 24));
+        WREG32(offset+R600_HDMI_VIDEOINFOFRAME_3,
+                frame[0xC] | (frame[0xD] << 8));
+}
+
+/*
+ * build a Audio Info Frame
+ */
+static void r600_hdmi_audioinfoframe(
+        struct drm_encoder *encoder,
+        uint8_t channel_count,
+        uint8_t coding_type,
+        uint8_t sample_size,
+        uint8_t sample_frequency,
+        uint8_t format,
+        uint8_t channel_allocation,
+        uint8_t level_shift,
+        int downmix_inhibit
+)
+{
+        struct drm_device *dev = encoder->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        uint32_t offset = to_radeon_encoder(encoder)->hdmi_offset;
+
+        uint8_t frame[11];
+
+        frame[0x0] = 0;
+        frame[0x1] = (channel_count & 0x7) | ((coding_type & 0xF) << 4);
+        frame[0x2] = (sample_size & 0x3) | ((sample_frequency & 0x7) << 2);
+        frame[0x3] = format;
+        frame[0x4] = channel_allocation;
+        frame[0x5] = ((level_shift & 0xF) << 3) | ((downmix_inhibit & 0x1) << 7);
+        frame[0x6] = 0;
+        frame[0x7] = 0;
+        frame[0x8] = 0;
+        frame[0x9] = 0;
+        frame[0xA] = 0;
+
+        r600_hdmi_infoframe_checksum(0x84, 0x01, 0x0A, frame);
+
+        WREG32(offset+R600_HDMI_AUDIOINFOFRAME_0,
+                frame[0x0] | (frame[0x1] << 8) | (frame[0x2] << 16) | (frame[0x3] << 24));
+        WREG32(offset+R600_HDMI_AUDIOINFOFRAME_1,
+                frame[0x4] | (frame[0x5] << 8) | (frame[0x6] << 16) | (frame[0x8] << 24));
+}
+
+/*
+ * test if audio buffer is filled enough to start playing
+ */
+static int r600_hdmi_is_audio_buffer_filled(struct drm_encoder *encoder)
+{
+        struct drm_device *dev = encoder->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        uint32_t offset = to_radeon_encoder(encoder)->hdmi_offset;
+
+        return (RREG32(offset+R600_HDMI_STATUS) & 0x10) != 0;
+}
+
+/*
+ * have buffer status changed since last call?
+ */
+int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder)
+{
+        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+        int status, result;
+
+        if (!radeon_encoder->hdmi_offset)
+                return 0;
+
+        status = r600_hdmi_is_audio_buffer_filled(encoder);
+        result = radeon_encoder->hdmi_buffer_status != status;
+        radeon_encoder->hdmi_buffer_status = status;
+
+        return result;
+}
+
+/*
+ * write the audio workaround status to the hardware
+ */
+void r600_hdmi_audio_workaround(struct drm_encoder *encoder)
+{
+        struct drm_device *dev = encoder->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+        uint32_t offset = radeon_encoder->hdmi_offset;
+
+        if (!offset)
+                return;
+
+        if (r600_hdmi_is_audio_buffer_filled(encoder)) {
+                /* disable audio workaround and start delivering of audio frames */
+                WREG32_P(offset+R600_HDMI_CNTL, 0x00000001, ~0x00001001);
+
+        } else if (radeon_encoder->hdmi_audio_workaround) {
+                /* enable audio workaround and start delivering of audio frames */
+                WREG32_P(offset+R600_HDMI_CNTL, 0x00001001, ~0x00001001);
+
+        } else {
+                /* disable audio workaround and stop delivering of audio frames */
+                WREG32_P(offset+R600_HDMI_CNTL, 0x00000000, ~0x00001001);
+        }
+}
+
+
+/*
+ * update the info frames with the data from the current display mode
+ */
+void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode)
+{
+        struct drm_device *dev = encoder->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        uint32_t offset = to_radeon_encoder(encoder)->hdmi_offset;
+
+        if (!offset)
+                return;
+
+        r600_audio_set_clock(encoder, mode->clock);
+
+        WREG32(offset+R600_HDMI_UNKNOWN_0, 0x1000);
+        WREG32(offset+R600_HDMI_UNKNOWN_1, 0x0);
+        WREG32(offset+R600_HDMI_UNKNOWN_2, 0x1000);
+
+        r600_hdmi_update_ACR(encoder, mode->clock);
+
+        WREG32(offset+R600_HDMI_VIDEOCNTL, 0x13);
+
+        WREG32(offset+R600_HDMI_VERSION, 0x202);
+
+        r600_hdmi_videoinfoframe(encoder, RGB, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+
+        /* it's unknown what these bits do excatly, but it's indeed quite usefull for debugging */
+        WREG32(offset+R600_HDMI_AUDIO_DEBUG_0, 0x00FFFFFF);
+        WREG32(offset+R600_HDMI_AUDIO_DEBUG_1, 0x007FFFFF);
+        WREG32(offset+R600_HDMI_AUDIO_DEBUG_2, 0x00000001);
+        WREG32(offset+R600_HDMI_AUDIO_DEBUG_3, 0x00000001);
+
+        r600_hdmi_audio_workaround(encoder);
+
+        /* audio packets per line, does anyone know how to calc this ? */
+        WREG32_P(offset+R600_HDMI_CNTL, 0x00040000, ~0x001F0000);
+
+        /* update? reset? don't realy know */
+        WREG32_P(offset+R600_HDMI_CNTL, 0x14000000, ~0x14000000);
+}
+
+/*
+ * update settings with current parameters from audio engine
+ */
+void r600_hdmi_update_audio_settings(struct drm_encoder *encoder,
+                                     int channels,
+                                     int rate,
+                                     int bps,
+                                     uint8_t status_bits,
+                                     uint8_t category_code)
+{
+        struct drm_device *dev = encoder->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        uint32_t offset = to_radeon_encoder(encoder)->hdmi_offset;
+
+        uint32_t iec;
+
+        if (!offset)
+                return;
+
+        DRM_DEBUG("%s with %d channels, %d Hz sampling rate, %d bits per sample,\n",
+                 r600_hdmi_is_audio_buffer_filled(encoder) ? "playing" : "stopped",
+                channels, rate, bps);
+        DRM_DEBUG("0x%02X IEC60958 status bits and 0x%02X category code\n",
+                  (int)status_bits, (int)category_code);
+
+        iec = 0;
+        if (status_bits & AUDIO_STATUS_PROFESSIONAL)
+                iec |= 1 << 0;
+        if (status_bits & AUDIO_STATUS_NONAUDIO)
+                iec |= 1 << 1;
+        if (status_bits & AUDIO_STATUS_COPYRIGHT)
+                iec |= 1 << 2;
+        if (status_bits & AUDIO_STATUS_EMPHASIS)
+                iec |= 1 << 3;
+
+        iec |= category_code << 8;
+
+        switch (rate) {
+        case  32000: iec |= 0x3 << 24; break;
+        case  44100: iec |= 0x0 << 24; break;
+        case  88200: iec |= 0x8 << 24; break;
+        case 176400: iec |= 0xc << 24; break;
+        case  48000: iec |= 0x2 << 24; break;
+        case  96000: iec |= 0xa << 24; break;
+        case 192000: iec |= 0xe << 24; break;
+        }
+
+        WREG32(offset+R600_HDMI_IEC60958_1, iec);
+
+        iec = 0;
+        switch (bps) {
+        case 16: iec |= 0x2; break;
+        case 20: iec |= 0x3; break;
+        case 24: iec |= 0xb; break;
+        }
+        if (status_bits & AUDIO_STATUS_V)
+                iec |= 0x5 << 16;
+
+        WREG32_P(offset+R600_HDMI_IEC60958_2, iec, ~0x5000f);
+
+        /* 0x021 or 0x031 sets the audio frame length */
+        WREG32(offset+R600_HDMI_AUDIOCNTL, 0x31);
+        r600_hdmi_audioinfoframe(encoder, channels-1, 0, 0, 0, 0, 0, 0, 0);
+
+        r600_hdmi_audio_workaround(encoder);
+
+        /* update? reset? don't realy know */
+        WREG32_P(offset+R600_HDMI_CNTL, 0x04000000, ~0x04000000);
+}
+
+/*
+ * enable/disable the HDMI engine
+ */
+void r600_hdmi_enable(struct drm_encoder *encoder, int enable)
+{
+        struct drm_device *dev = encoder->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+        uint32_t offset = to_radeon_encoder(encoder)->hdmi_offset;
+
+        if (!offset)
+                return;
+
+        DRM_DEBUG("%s HDMI interface @ 0x%04X\n", enable ? "Enabling" : "Disabling", offset);
+
+        /* some version of atombios ignore the enable HDMI flag
+         * so enabling/disabling HDMI was moved here for TMDS1+2 */
+        switch (radeon_encoder->encoder_id) {
+        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
+                WREG32_P(AVIVO_TMDSA_CNTL, enable ? 0x4 : 0x0, ~0x4);
+                WREG32(offset+R600_HDMI_ENABLE, enable ? 0x101 : 0x0);
+                break;
+
+        case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
+                WREG32_P(AVIVO_LVTMA_CNTL, enable ? 0x4 : 0x0, ~0x4);
+                WREG32(offset+R600_HDMI_ENABLE, enable ? 0x105 : 0x0);
+                break;
+
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
+        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+                /* This part is doubtfull in my opinion */
+                WREG32(offset+R600_HDMI_ENABLE, enable ? 0x110 : 0x0);
+                break;
+
+        default:
+                DRM_ERROR("unknown HDMI output type\n");
+                break;
+        }
+}
+
+/*
+ * determin at which register offset the HDMI encoder is
+ */
+void r600_hdmi_init(struct drm_encoder *encoder)
+{
+        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+
+        switch (radeon_encoder->encoder_id) {
+        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
+                radeon_encoder->hdmi_offset = R600_HDMI_TMDS1;
+                break;
+
+        case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
+                switch (r600_audio_tmds_index(encoder)) {
+                case 0:
+                        radeon_encoder->hdmi_offset = R600_HDMI_TMDS1;
+                        break;
+                case 1:
+                        radeon_encoder->hdmi_offset = R600_HDMI_TMDS2;
+                        break;
+                default:
+                        radeon_encoder->hdmi_offset = 0;
+                        break;
+                }
+        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
+                radeon_encoder->hdmi_offset = R600_HDMI_TMDS2;
+                break;
+
+        case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+                radeon_encoder->hdmi_offset = R600_HDMI_DIG;
+                break;
+
+        default:
+                radeon_encoder->hdmi_offset = 0;
+                break;
+        }
+
+        DRM_DEBUG("using HDMI engine at offset 0x%04X for encoder 0x%x\n",
+                  radeon_encoder->hdmi_offset, radeon_encoder->encoder_id);
+
+        /* TODO: make this configureable */
+        radeon_encoder->hdmi_audio_workaround = 0;
+}
diff --git a/drivers/gpu/drm/radeon/r600_reg.h b/drivers/gpu/drm/radeon/r600_reg.h
index e2d1f5f33f7e..d0e28ffdeda9 100644
--- a/drivers/gpu/drm/radeon/r600_reg.h
+++ b/drivers/gpu/drm/radeon/r600_reg.h
@@ -110,5 +110,79 @@
 #define R600_BIOS_6_SCRATCH               0x173c
 #define R600_BIOS_7_SCRATCH               0x1740
 
+/* Audio, these regs were reverse enginered,
+ * so the chance is high that the naming is wrong
+ * R6xx+ ??? */
+
+/* Audio clocks */
+#define R600_AUDIO_PLL1_MUL               0x0514
+#define R600_AUDIO_PLL1_DIV               0x0518
+#define R600_AUDIO_PLL2_MUL               0x0524
+#define R600_AUDIO_PLL2_DIV               0x0528
+#define R600_AUDIO_CLK_SRCSEL             0x0534
+
+/* Audio general */
+#define R600_AUDIO_ENABLE                 0x7300
+#define R600_AUDIO_TIMING                 0x7344
+
+/* Audio params */
+#define R600_AUDIO_VENDOR_ID              0x7380
+#define R600_AUDIO_REVISION_ID            0x7384
+#define R600_AUDIO_ROOT_NODE_COUNT        0x7388
+#define R600_AUDIO_NID1_NODE_COUNT        0x738c
+#define R600_AUDIO_NID1_TYPE              0x7390
+#define R600_AUDIO_SUPPORTED_SIZE_RATE    0x7394
+#define R600_AUDIO_SUPPORTED_CODEC        0x7398
+#define R600_AUDIO_SUPPORTED_POWER_STATES 0x739c
+#define R600_AUDIO_NID2_CAPS              0x73a0
+#define R600_AUDIO_NID3_CAPS              0x73a4
+#define R600_AUDIO_NID3_PIN_CAPS          0x73a8
+
+/* Audio conn list */
+#define R600_AUDIO_CONN_LIST_LEN          0x73ac
+#define R600_AUDIO_CONN_LIST              0x73b0
+
+/* Audio verbs */
+#define R600_AUDIO_RATE_BPS_CHANNEL       0x73c0
+#define R600_AUDIO_PLAYING                0x73c4
+#define R600_AUDIO_IMPLEMENTATION_ID      0x73c8
+#define R600_AUDIO_CONFIG_DEFAULT         0x73cc
+#define R600_AUDIO_PIN_SENSE              0x73d0
+#define R600_AUDIO_PIN_WIDGET_CNTL        0x73d4
+#define R600_AUDIO_STATUS_BITS            0x73d8
+
+/* HDMI base register addresses */
+#define R600_HDMI_TMDS1                   0x7400
+#define R600_HDMI_TMDS2                   0x7700
+#define R600_HDMI_DIG                     0x7800
+
+/* HDMI registers */
+#define R600_HDMI_ENABLE           0x00
+#define R600_HDMI_STATUS           0x04
+#define R600_HDMI_CNTL             0x08
+#define R600_HDMI_UNKNOWN_0        0x0C
+#define R600_HDMI_AUDIOCNTL        0x10
+#define R600_HDMI_VIDEOCNTL        0x14
+#define R600_HDMI_VERSION          0x18
+#define R600_HDMI_UNKNOWN_1        0x28
+#define R600_HDMI_VIDEOINFOFRAME_0 0x54
+#define R600_HDMI_VIDEOINFOFRAME_1 0x58
+#define R600_HDMI_VIDEOINFOFRAME_2 0x5c
+#define R600_HDMI_VIDEOINFOFRAME_3 0x60
+#define R600_HDMI_32kHz_CTS        0xac
+#define R600_HDMI_32kHz_N          0xb0
+#define R600_HDMI_44_1kHz_CTS      0xb4
+#define R600_HDMI_44_1kHz_N        0xb8
+#define R600_HDMI_48kHz_CTS        0xbc
+#define R600_HDMI_48kHz_N          0xc0
+#define R600_HDMI_AUDIOINFOFRAME_0 0xcc
+#define R600_HDMI_AUDIOINFOFRAME_1 0xd0
+#define R600_HDMI_IEC60958_1       0xd4
+#define R600_HDMI_IEC60958_2       0xd8
+#define R600_HDMI_UNKNOWN_2        0xdc
+#define R600_HDMI_AUDIO_DEBUG_0    0xe0
+#define R600_HDMI_AUDIO_DEBUG_1    0xe4
+#define R600_HDMI_AUDIO_DEBUG_2    0xe8
+#define R600_HDMI_AUDIO_DEBUG_3    0xec
 
 #endif
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index c938bb54123c..cd650fd3964e 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -89,6 +89,7 @@ extern int radeon_testing;
 extern int radeon_connector_table;
 extern int radeon_tv;
 extern int radeon_new_pll;
+extern int radeon_audio;
 
 /*
  * Copy from radeon_drv.h so we don't have to include both and have conflicting
@@ -814,6 +815,14 @@ struct radeon_device {
         struct r600_ih ih; /* r6/700 interrupt ring */
         struct workqueue_struct *wq;
         struct work_struct hotplug_work;
+
+        /* audio stuff */
+        struct timer_list       audio_timer;
+        int                     audio_channels;
+        int                     audio_rate;
+        int                     audio_bits_per_sample;
+        uint8_t                 audio_status_bits;
+        uint8_t                 audio_category_code;
 };
 
 int radeon_device_init(struct radeon_device *rdev,
@@ -1016,6 +1025,7 @@ extern int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data);
 extern void radeon_legacy_set_clock_gating(struct radeon_device *rdev, int enable);
 extern void radeon_atom_set_clock_gating(struct radeon_device *rdev, int enable);
 extern void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain);
+extern bool radeon_ttm_bo_is_radeon_bo(struct ttm_buffer_object *bo);
 
 /* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */
 struct r100_mc_save {
@@ -1146,6 +1156,21 @@ extern void r600_irq_fini(struct radeon_device *rdev);
 extern void r600_ih_ring_init(struct radeon_device *rdev, unsigned ring_size);
 extern int r600_irq_set(struct radeon_device *rdev);
 
+extern int r600_audio_init(struct radeon_device *rdev);
+extern int r600_audio_tmds_index(struct drm_encoder *encoder);
+extern void r600_audio_set_clock(struct drm_encoder *encoder, int clock);
+extern void r600_audio_fini(struct radeon_device *rdev);
+extern void r600_hdmi_init(struct drm_encoder *encoder);
+extern void r600_hdmi_enable(struct drm_encoder *encoder, int enable);
+extern void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode);
+extern int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder);
+extern void r600_hdmi_update_audio_settings(struct drm_encoder *encoder,
+                                            int channels,
+                                            int rate,
+                                            int bps,
+                                            uint8_t status_bits,
+                                            uint8_t category_code);
+
 #include "radeon_object.h"
 
 #endif
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index c5c45e626d74..dbd56ef82f9c 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -87,6 +87,7 @@ int radeon_testing = 0;
 int radeon_connector_table = 0;
 int radeon_tv = 1;
 int radeon_new_pll = 1;
+int radeon_audio = 1;
 
 MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
 module_param_named(no_wb, radeon_no_wb, int, 0444);
@@ -124,6 +125,9 @@ module_param_named(tv, radeon_tv, int, 0444);
 MODULE_PARM_DESC(new_pll, "Select new PLL code for AVIVO chips");
 module_param_named(new_pll, radeon_new_pll, int, 0444);
 
+MODULE_PARM_DESC(audio, "Audio enable (0 = disable)");
+module_param_named(audio, radeon_audio, int, 0444);
+
 static int radeon_suspend(struct drm_device *dev, pm_message_t state)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index b4f23ec93201..0d1d908e5225 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -438,6 +438,7 @@ atombios_digital_setup(struct drm_encoder *encoder, int action)
         struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
         union lvds_encoder_control args;
         int index = 0;
+        int hdmi_detected = 0;
         uint8_t frev, crev;
         struct radeon_encoder_atom_dig *dig;
         struct drm_connector *connector;
@@ -458,6 +459,9 @@ atombios_digital_setup(struct drm_encoder *encoder, int action)
         if (!radeon_connector->con_priv)
                 return;
 
+        if (drm_detect_hdmi_monitor(radeon_connector->edid))
+                hdmi_detected = 1;
+
         dig_connector = radeon_connector->con_priv;
 
         memset(&args, 0, sizeof(args));
@@ -487,7 +491,7 @@ atombios_digital_setup(struct drm_encoder *encoder, int action)
                 case 1:
                         args.v1.ucMisc = 0;
                         args.v1.ucAction = action;
-                        if (drm_detect_hdmi_monitor(radeon_connector->edid))
+                        if (hdmi_detected)
                                 args.v1.ucMisc |= PANEL_ENCODER_MISC_HDMI_TYPE;
                         args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
                         if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
@@ -512,7 +516,7 @@ atombios_digital_setup(struct drm_encoder *encoder, int action)
                                 if (dig->coherent_mode)
                                         args.v2.ucMisc |= PANEL_ENCODER_MISC_COHERENT;
                         }
-                        if (drm_detect_hdmi_monitor(radeon_connector->edid))
+                        if (hdmi_detected)
                                 args.v2.ucMisc |= PANEL_ENCODER_MISC_HDMI_TYPE;
                         args.v2.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
                         args.v2.ucTruncate = 0;
@@ -552,7 +556,7 @@ atombios_digital_setup(struct drm_encoder *encoder, int action)
         }
 
         atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
-
+        r600_hdmi_enable(encoder, hdmi_detected);
 }
 
 int
@@ -893,7 +897,6 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
         }
 
         atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
-
 }
 
 static void
@@ -1162,7 +1165,6 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder)
         }
 
         atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
-
 }
 
 static void
@@ -1265,6 +1267,8 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
                 break;
         }
         atombios_apply_encoder_quirks(encoder, adjusted_mode);
+
+        r600_hdmi_setmode(encoder, adjusted_mode);
 }
 
 static bool
@@ -1510,4 +1514,6 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su
                 drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);
                 break;
         }
+
+        r600_hdmi_init(encoder);
 }
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index 2944486871b0..60df2d7e7e4c 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -66,8 +66,9 @@ int radeon_gem_object_create(struct radeon_device *rdev, int size,
         }
         r = radeon_bo_create(rdev, gobj, size, kernel, initial_domain, &robj);
         if (r) {
-                DRM_ERROR("Failed to allocate GEM object (%d, %d, %u)\n",
-                          size, initial_domain, alignment);
+                if (r != -ERESTARTSYS)
+                        DRM_ERROR("Failed to allocate GEM object (%d, %d, %u, %d)\n",
+                                  size, initial_domain, alignment, r);
                 mutex_lock(&rdev->ddev->struct_mutex);
                 drm_gem_object_unreference(gobj);
                 mutex_unlock(&rdev->ddev->struct_mutex);
@@ -350,9 +351,10 @@ int radeon_gem_get_tiling_ioctl(struct drm_device *dev, void *data,
         rbo = gobj->driver_private;
         r = radeon_bo_reserve(rbo, false);
         if (unlikely(r != 0))
-                return r;
+                goto out;
         radeon_bo_get_tiling_flags(rbo, &args->tiling_flags, &args->pitch);
         radeon_bo_unreserve(rbo);
+out:
         mutex_lock(&dev->struct_mutex);
         drm_gem_object_unreference(gobj);
         mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index 44d4b652ea12..3dcbe130c422 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -334,6 +334,9 @@ struct radeon_encoder {
         enum radeon_rmx_type rmx_type;
         struct drm_display_mode native_mode;
         void *enc_priv;
+        int hdmi_offset;
+        int hdmi_audio_workaround;
+        int hdmi_buffer_status;
 };
 
 struct radeon_connector_atom_dig {
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index 544e18ffaf22..d9ffe1f56e8f 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -56,6 +56,13 @@ static void radeon_ttm_bo_destroy(struct ttm_buffer_object *tbo)
         kfree(bo);
 }
 
+bool radeon_ttm_bo_is_radeon_bo(struct ttm_buffer_object *bo)
+{
+        if (bo->destroy == &radeon_ttm_bo_destroy)
+                return true;
+        return false;
+}
+
 void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain)
 {
         u32 c = 0;
@@ -71,6 +78,8 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain)
                 rbo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT;
         if (domain & RADEON_GEM_DOMAIN_CPU)
                 rbo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
+        if (!c)
+                rbo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
         rbo->placement.num_placement = c;
         rbo->placement.num_busy_placement = c;
 }
@@ -481,14 +490,20 @@ int radeon_bo_check_tiling(struct radeon_bo *bo, bool has_moved,
 }
 
 void radeon_bo_move_notify(struct ttm_buffer_object *bo,
-                                struct ttm_mem_reg *mem)
+                           struct ttm_mem_reg *mem)
 {
-        struct radeon_bo *rbo = container_of(bo, struct radeon_bo, tbo);
+        struct radeon_bo *rbo;
+        if (!radeon_ttm_bo_is_radeon_bo(bo))
+                return;
+        rbo = container_of(bo, struct radeon_bo, tbo);
         radeon_bo_check_tiling(rbo, 0, 1);
 }
 
 void radeon_bo_fault_reserve_notify(struct ttm_buffer_object *bo)
 {
-        struct radeon_bo *rbo = container_of(bo, struct radeon_bo, tbo);
+        struct radeon_bo *rbo;
+        if (!radeon_ttm_bo_is_radeon_bo(bo))
+                return;
+        rbo = container_of(bo, struct radeon_bo, tbo);
         radeon_bo_check_tiling(rbo, 0, 0);
 }
diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h
index f6b69c2c0d00..a02f18011ad1 100644
--- a/drivers/gpu/drm/radeon/radeon_object.h
+++ b/drivers/gpu/drm/radeon/radeon_object.h
@@ -59,19 +59,17 @@ static inline unsigned radeon_mem_type_to_domain(u32 mem_type)
  *
  * Returns:
  * -EBUSY: buffer is busy and @no_wait is true
- * -ERESTART: A wait for the buffer to become unreserved was interrupted by
+ * -ERESTARTSYS: A wait for the buffer to become unreserved was interrupted by
  * a signal. Release all buffer reservations and return to user-space.
  */
 static inline int radeon_bo_reserve(struct radeon_bo *bo, bool no_wait)
 {
         int r;
 
-retry:
         r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0);
         if (unlikely(r != 0)) {
-                if (r == -ERESTART)
-                        goto retry;
-                dev_err(bo->rdev->dev, "%p reserve failed\n", bo);
+                if (r != -ERESTARTSYS)
+                        dev_err(bo->rdev->dev, "%p reserve failed\n", bo);
                 return r;
         }
         return 0;
@@ -125,12 +123,10 @@ static inline int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type,
 {
         int r;
 
-retry:
         r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0);
         if (unlikely(r != 0)) {
-                if (r == -ERESTART)
-                        goto retry;
-                dev_err(bo->rdev->dev, "%p reserve failed for wait\n", bo);
+                if (r != -ERESTARTSYS)
+                        dev_err(bo->rdev->dev, "%p reserve failed for wait\n", bo);
                 return r;
         }
         spin_lock(&bo->tbo.lock);
@@ -140,8 +136,6 @@ retry:
                 r = ttm_bo_wait(&bo->tbo, true, true, no_wait);
         spin_unlock(&bo->tbo.lock);
         ttm_bo_unreserve(&bo->tbo);
-        if (unlikely(r == -ERESTART))
-                goto retry;
         return r;
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 34b08d307c81..8bce64cdc320 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -44,8 +44,11 @@ static int radeon_debugfs_pm_info(struct seq_file *m, void *data)
         struct drm_device *dev = node->minor->dev;
         struct radeon_device *rdev = dev->dev_private;
 
-        seq_printf(m, "engine clock: %u0 kHz\n", radeon_get_engine_clock(rdev));
-        seq_printf(m, "memory clock: %u0 kHz\n", radeon_get_memory_clock(rdev));
+        seq_printf(m, "default engine clock: %u0 kHz\n", rdev->clock.default_sclk);
+        seq_printf(m, "current engine clock: %u0 kHz\n", radeon_get_engine_clock(rdev));
+        seq_printf(m, "default memory clock: %u0 kHz\n", rdev->clock.default_mclk);
+        if (rdev->asic->get_memory_clock)
+                seq_printf(m, "current memory clock: %u0 kHz\n", radeon_get_memory_clock(rdev));
 
         return 0;
 }
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 5a19d529d1c0..d7fd160cc671 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -200,7 +200,19 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
 static void radeon_evict_flags(struct ttm_buffer_object *bo,
                                 struct ttm_placement *placement)
 {
-        struct radeon_bo *rbo = container_of(bo, struct radeon_bo, tbo);
+        struct radeon_bo *rbo;
+        static u32 placements = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
+
+        if (!radeon_ttm_bo_is_radeon_bo(bo)) {
+                placement->fpfn = 0;
+                placement->lpfn = 0;
+                placement->placement = &placements;
+                placement->busy_placement = &placements;
+                placement->num_placement = 1;
+                placement->num_busy_placement = 1;
+                return;
+        }
+        rbo = container_of(bo, struct radeon_bo, tbo);
         switch (bo->mem.mem_type) {
         case TTM_PL_VRAM:
                 radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_GTT);
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index c1fcdddb6be6..368415df5f3a 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -497,6 +497,8 @@ int rs400_init(struct radeon_device *rdev)
 
         /* Initialize clocks */
         radeon_get_clock_info(rdev->ddev);
+        /* Initialize power management */
+        radeon_pm_init(rdev);
         /* Get vram informations */
         rs400_vram_info(rdev);
         /* Initialize memory controller (also test AGP) */
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index fbb0357f1ec3..3bcb66e52786 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -892,6 +892,14 @@ static int rv770_startup(struct radeon_device *rdev)
         }
         rv770_gpu_init(rdev);
 
+        if (!rdev->r600_blit.shader_obj) {
+                r = r600_blit_init(rdev);
+                if (r) {
+                        DRM_ERROR("radeon: failed blitter (%d).\n", r);
+                        return r;
+                }
+        }
+
         r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
         if (unlikely(r != 0))
                 return r;
@@ -1051,12 +1059,6 @@ int rv770_init(struct radeon_device *rdev)
         if (r)
                 return r;
 
-        r = r600_blit_init(rdev);
-        if (r) {
-                DRM_ERROR("radeon: failed blitter (%d).\n", r);
-                return r;
-        }
-
         rdev->accel_working = true;
         r = rv770_startup(rdev);
         if (r) {
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 1fbb2eea5e88..2920f9a279e1 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -71,34 +71,34 @@ static inline int ttm_mem_type_from_flags(uint32_t flags, uint32_t *mem_type)
         return -EINVAL;
 }
 
-static void ttm_mem_type_manager_debug(struct ttm_bo_global *glob,
-                                        struct ttm_mem_type_manager *man)
+static void ttm_mem_type_debug(struct ttm_bo_device *bdev, int mem_type)
 {
+        struct ttm_mem_type_manager *man = &bdev->man[mem_type];
+
         printk(KERN_ERR TTM_PFX "    has_type: %d\n", man->has_type);
         printk(KERN_ERR TTM_PFX "    use_type: %d\n", man->use_type);
         printk(KERN_ERR TTM_PFX "    flags: 0x%08X\n", man->flags);
         printk(KERN_ERR TTM_PFX "    gpu_offset: 0x%08lX\n", man->gpu_offset);
         printk(KERN_ERR TTM_PFX "    io_offset: 0x%08lX\n", man->io_offset);
         printk(KERN_ERR TTM_PFX "    io_size: %ld\n", man->io_size);
-        printk(KERN_ERR TTM_PFX "    size: %ld\n", (unsigned long)man->size);
+        printk(KERN_ERR TTM_PFX "    size: %llu\n", man->size);
         printk(KERN_ERR TTM_PFX "    available_caching: 0x%08X\n",
                 man->available_caching);
         printk(KERN_ERR TTM_PFX "    default_caching: 0x%08X\n",
                 man->default_caching);
-        spin_lock(&glob->lru_lock);
-        drm_mm_debug_table(&man->manager, TTM_PFX);
-        spin_unlock(&glob->lru_lock);
+        if (mem_type != TTM_PL_SYSTEM) {
+                spin_lock(&bdev->glob->lru_lock);
+                drm_mm_debug_table(&man->manager, TTM_PFX);
+                spin_unlock(&bdev->glob->lru_lock);
+        }
 }
 
 static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
                                         struct ttm_placement *placement)
 {
-        struct ttm_bo_device *bdev = bo->bdev;
-        struct ttm_bo_global *glob = bo->glob;
-        struct ttm_mem_type_manager *man;
         int i, ret, mem_type;
 
-        printk(KERN_ERR TTM_PFX "No space for %p (%ld pages, %ldK, %ldM)\n",
+        printk(KERN_ERR TTM_PFX "No space for %p (%lu pages, %luK, %luM)\n",
                 bo, bo->mem.num_pages, bo->mem.size >> 10,
                 bo->mem.size >> 20);
         for (i = 0; i < placement->num_placement; i++) {
@@ -106,10 +106,9 @@ static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
                                                 &mem_type);
                 if (ret)
                         return;
-                man = &bdev->man[mem_type];
                 printk(KERN_ERR TTM_PFX "  placement[%d]=0x%08X (%d)\n",
                         i, placement->placement[i], mem_type);
-                ttm_mem_type_manager_debug(glob, man);
+                ttm_mem_type_debug(bo->bdev, mem_type);
         }
 }
 
@@ -465,6 +464,8 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo, bool remove_all)
                 spin_unlock(&bo->lock);
 
                 spin_lock(&glob->lru_lock);
+                put_count = ttm_bo_del_from_lru(bo);
+
                 ret = ttm_bo_reserve_locked(bo, false, false, false, 0);
                 BUG_ON(ret);
                 if (bo->ttm)
@@ -472,20 +473,19 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo, bool remove_all)
 
                 if (!list_empty(&bo->ddestroy)) {
                         list_del_init(&bo->ddestroy);
-                        kref_put(&bo->list_kref, ttm_bo_ref_bug);
+                        ++put_count;
                 }
                 if (bo->mem.mm_node) {
                         bo->mem.mm_node->private = NULL;
                         drm_mm_put_block(bo->mem.mm_node);
                         bo->mem.mm_node = NULL;
                 }
-                put_count = ttm_bo_del_from_lru(bo);
                 spin_unlock(&glob->lru_lock);
 
                 atomic_set(&bo->reserved, 0);
 
                 while (put_count--)
-                        kref_put(&bo->list_kref, ttm_bo_release_list);
+                        kref_put(&bo->list_kref, ttm_bo_ref_bug);
 
                 return 0;
         }
@@ -684,19 +684,45 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
         struct ttm_buffer_object *bo;
         int ret, put_count = 0;
 
+retry:
         spin_lock(&glob->lru_lock);
+        if (list_empty(&man->lru)) {
+                spin_unlock(&glob->lru_lock);
+                return -EBUSY;
+        }
+
         bo = list_first_entry(&man->lru, struct ttm_buffer_object, lru);
         kref_get(&bo->list_kref);
-        ret = ttm_bo_reserve_locked(bo, interruptible, no_wait, false, 0);
-        if (likely(ret == 0))
-                put_count = ttm_bo_del_from_lru(bo);
+
+        ret = ttm_bo_reserve_locked(bo, false, true, false, 0);
+
+        if (unlikely(ret == -EBUSY)) {
+                spin_unlock(&glob->lru_lock);
+                if (likely(!no_wait))
+                        ret = ttm_bo_wait_unreserved(bo, interruptible);
+
+                kref_put(&bo->list_kref, ttm_bo_release_list);
+
+                /**
+                 * We *need* to retry after releasing the lru lock.
+                 */
+
+                if (unlikely(ret != 0))
+                        return ret;
+                goto retry;
+        }
+
+        put_count = ttm_bo_del_from_lru(bo);
         spin_unlock(&glob->lru_lock);
-        if (unlikely(ret != 0))
-                return ret;
+
+        BUG_ON(ret != 0);
+
         while (put_count--)
                 kref_put(&bo->list_kref, ttm_bo_ref_bug);
+
         ret = ttm_bo_evict(bo, interruptible, no_wait);
         ttm_bo_unreserve(bo);
+
         kref_put(&bo->list_kref, ttm_bo_release_list);
         return ret;
 }
@@ -849,7 +875,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
         int i, ret;
 
         mem->mm_node = NULL;
-        for (i = 0; i <= placement->num_placement; ++i) {
+        for (i = 0; i < placement->num_placement; ++i) {
                 ret = ttm_mem_type_from_flags(placement->placement[i],
                                                 &mem_type);
                 if (ret)
@@ -900,8 +926,8 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
         if (!type_found)
                 return -EINVAL;
 
-        for (i = 0; i <= placement->num_busy_placement; ++i) {
-                ret = ttm_mem_type_from_flags(placement->placement[i],
+        for (i = 0; i < placement->num_busy_placement; ++i) {
+                ret = ttm_mem_type_from_flags(placement->busy_placement[i],
                                                 &mem_type);
                 if (ret)
                         return ret;
@@ -911,7 +937,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
                 if (!ttm_bo_mt_compatible(man,
                                                 bo->type == ttm_bo_type_user,
                                                 mem_type,
-                                                placement->placement[i],
+                                                placement->busy_placement[i],
                                                 &cur_flags))
                         continue;
 
@@ -921,7 +947,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
                  * Use the access and other non-mapping-related flag bits from
                  * the memory placement flags to the current flags
                  */
-                ttm_flag_masked(&cur_flags, placement->placement[i],
+                ttm_flag_masked(&cur_flags, placement->busy_placement[i],
                                 ~TTM_PL_MASK_MEMTYPE);
 
                 ret = ttm_bo_mem_force_space(bo, mem_type, placement, mem,
@@ -1115,6 +1141,7 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
         bo->glob = bdev->glob;
         bo->type = type;
         bo->num_pages = num_pages;
+        bo->mem.size = num_pages << PAGE_SHIFT;
         bo->mem.mem_type = TTM_PL_SYSTEM;
         bo->mem.num_pages = bo->num_pages;
         bo->mem.mm_node = NULL;
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 609a85a4d855..668dbe8b8dd3 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -320,7 +320,7 @@ ssize_t ttm_bo_io(struct ttm_bo_device *bdev, struct file *filp,
                 return -EFAULT;
 
         driver = bo->bdev->driver;
-        if (unlikely(driver->verify_access)) {
+        if (unlikely(!driver->verify_access)) {
                 ret = -EPERM;
                 goto out_unref;
         }
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 9e640c62ebd9..95ccbe377f9c 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1046,25 +1046,27 @@ config SENSORS_ATK0110
           will be called asus_atk0110.
 
 config SENSORS_LIS3LV02D
-        tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer"
+        tristate "STMicroeletronics LIS3* three-axis digital accelerometer"
         depends on INPUT
         select INPUT_POLLDEV
         select NEW_LEDS
         select LEDS_CLASS
         default n
         help
-          This driver provides support for the LIS3LV02Dx accelerometer. In
-          particular, it can be found in a number of HP laptops, which have the
-          "Mobile Data Protection System 3D" or "3D DriveGuard" feature. On such
-          systems the driver should load automatically (via ACPI). The
-          accelerometer might also be found in other systems, connected via SPI
-          or I2C.  The accelerometer data is readable via
-          /sys/devices/platform/lis3lv02d.
+          This driver provides support for the LIS3* accelerometers, such as the
+          LIS3LV02DL or the LIS331DL. In particular, it can be found in a number
+          of HP laptops, which have the "Mobile Data Protection System 3D" or
+          "3D DriveGuard" feature. On such systems the driver should load
+          automatically (via ACPI alias). The accelerometer might also be found
+          in other systems, connected via SPI or I2C. The accelerometer data is
+          readable via /sys/devices/platform/lis3lv02d.
 
           This driver also provides an absolute input class device, allowing
-          the laptop to act as a pinball machine-esque joystick. On HP laptops,
+          a laptop to act as a pinball machine-esque joystick. It provides also
+          a misc device which can be used to detect free-fall. On HP laptops,
           if the led infrastructure is activated, support for a led indicating
-          disk protection will be provided as hp:red:hddprotection.
+          disk protection will be provided as hp::hddprotect. For more
+          information on the feature, refer to Documentation/hwmon/lis3lv02d.
 
           This driver can also be built as modules.  If so, the core module
           will be called lis3lv02d and a specific module for HP laptops will be
diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index 33acf29531af..1ad0a885c5a5 100644
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -34,9 +34,8 @@
 static const unsigned short normal_i2c[] = {
         0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm,
-                        mc1066);
+enum chips {
+        adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm, mc1066 };
 
 /* adm1021 constants specified below */
 
@@ -97,7 +96,7 @@ struct adm1021_data {
 
 static int adm1021_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int adm1021_detect(struct i2c_client *client, int kind,
+static int adm1021_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static void adm1021_init_client(struct i2c_client *client);
 static int adm1021_remove(struct i2c_client *client);
@@ -130,7 +129,7 @@ static struct i2c_driver adm1021_driver = {
         .remove         = adm1021_remove,
         .id_table       = adm1021_id,
         .detect         = adm1021_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static ssize_t show_temp(struct device *dev,
@@ -284,7 +283,7 @@ static const struct attribute_group adm1021_group = {
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int adm1021_detect(struct i2c_client *client, int kind,
+static int adm1021_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index db6ac2b04f6f..251b63165e2a 100644
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -64,11 +64,7 @@
 
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
-/*
- * Insmod parameters
- */
-
-I2C_CLIENT_INSMOD_2(adm1025, ne1619);
+enum chips { adm1025, ne1619 };
 
 /*
  * The ADM1025 registers
@@ -111,7 +107,7 @@ static const int in_scale[6] = { 2500, 2250, 3300, 5000, 12000, 3300 };
 
 static int adm1025_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int adm1025_detect(struct i2c_client *client, int kind,
+static int adm1025_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static void adm1025_init_client(struct i2c_client *client);
 static int adm1025_remove(struct i2c_client *client);
@@ -137,7 +133,7 @@ static struct i2c_driver adm1025_driver = {
         .remove         = adm1025_remove,
         .id_table       = adm1025_id,
         .detect         = adm1025_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -409,7 +405,7 @@ static const struct attribute_group adm1025_group_in4 = {
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int adm1025_detect(struct i2c_client *client, int kind,
+static int adm1025_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index fb5363985e21..65335b268fa9 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -37,9 +37,6 @@
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(adm1026);
-
 static int gpio_input[17] = { -1, -1, -1, -1, -1, -1, -1, -1, -1,
                                 -1, -1, -1, -1, -1, -1, -1, -1 };
 static int gpio_output[17] = { -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -293,7 +290,7 @@ struct adm1026_data {
 
 static int adm1026_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int adm1026_detect(struct i2c_client *client, int kind,
+static int adm1026_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static int adm1026_remove(struct i2c_client *client);
 static int adm1026_read_value(struct i2c_client *client, u8 reg);
@@ -305,7 +302,7 @@ static void adm1026_init_client(struct i2c_client *client);
 
 
 static const struct i2c_device_id adm1026_id[] = {
-        { "adm1026", adm1026 },
+        { "adm1026", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, adm1026_id);
@@ -319,7 +316,7 @@ static struct i2c_driver adm1026_driver = {
         .remove         = adm1026_remove,
         .id_table       = adm1026_id,
         .detect         = adm1026_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static int adm1026_read_value(struct i2c_client *client, u8 reg)
@@ -1650,7 +1647,7 @@ static const struct attribute_group adm1026_group_in8_9 = {
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int adm1026_detect(struct i2c_client *client, int kind,
+static int adm1026_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/adm1029.c b/drivers/hwmon/adm1029.c
index ef91e2a4a567..0b8a3b145bd2 100644
--- a/drivers/hwmon/adm1029.c
+++ b/drivers/hwmon/adm1029.c
@@ -44,12 +44,6 @@ static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
 };
 
 /*
- * Insmod parameters
- */
-
-I2C_CLIENT_INSMOD_1(adm1029);
-
-/*
  * The ADM1029 registers
  * Manufacturer ID is 0x41 for Analog Devices
  */
@@ -117,7 +111,7 @@ static const u8 ADM1029_REG_FAN_DIV[] = {
 
 static int adm1029_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int adm1029_detect(struct i2c_client *client, int kind,
+static int adm1029_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static int adm1029_remove(struct i2c_client *client);
 static struct adm1029_data *adm1029_update_device(struct device *dev);
@@ -128,7 +122,7 @@ static int adm1029_init_client(struct i2c_client *client);
  */
 
 static const struct i2c_device_id adm1029_id[] = {
-        { "adm1029", adm1029 },
+        { "adm1029", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, adm1029_id);
@@ -142,7 +136,7 @@ static struct i2c_driver adm1029_driver = {
         .remove         = adm1029_remove,
         .id_table       = adm1029_id,
         .detect         = adm1029_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -297,7 +291,7 @@ static const struct attribute_group adm1029_group = {
  */
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int adm1029_detect(struct i2c_client *client, int kind,
+static int adm1029_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index 0e722175aae0..1644b92e7cc4 100644
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -64,8 +64,7 @@
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_2(adm1030, adm1031);
+enum chips { adm1030, adm1031 };
 
 typedef u8 auto_chan_table_t[8][2];
 
@@ -102,7 +101,7 @@ struct adm1031_data {
 
 static int adm1031_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int adm1031_detect(struct i2c_client *client, int kind,
+static int adm1031_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static void adm1031_init_client(struct i2c_client *client);
 static int adm1031_remove(struct i2c_client *client);
@@ -125,7 +124,7 @@ static struct i2c_driver adm1031_driver = {
         .remove         = adm1031_remove,
         .id_table       = adm1031_id,
         .detect         = adm1031_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static inline u8 adm1031_read_value(struct i2c_client *client, u8 reg)
@@ -813,7 +812,7 @@ static const struct attribute_group adm1031_group_opt = {
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int adm1031_detect(struct i2c_client *client, int kind,
+static int adm1031_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index 20e0481cc206..0727ad250793 100644
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -55,8 +55,7 @@
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
                                         I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_3(adm9240, ds1780, lm81);
+enum chips { adm9240, ds1780, lm81 };
 
 /* ADM9240 registers */
 #define ADM9240_REG_MAN_ID              0x3e
@@ -132,7 +131,7 @@ static inline unsigned int AOUT_FROM_REG(u8 reg)
 
 static int adm9240_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int adm9240_detect(struct i2c_client *client, int kind,
+static int adm9240_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static void adm9240_init_client(struct i2c_client *client);
 static int adm9240_remove(struct i2c_client *client);
@@ -156,7 +155,7 @@ static struct i2c_driver adm9240_driver = {
         .remove         = adm9240_remove,
         .id_table       = adm9240_id,
         .detect         = adm9240_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /* per client data */
@@ -545,7 +544,7 @@ static const struct attribute_group adm9240_group = {
 /*** sensor chip detect and driver install ***/
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int adm9240_detect(struct i2c_client *new_client, int kind,
+static int adm9240_detect(struct i2c_client *new_client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = new_client->adapter;
diff --git a/drivers/hwmon/ads7828.c b/drivers/hwmon/ads7828.c
index 451977bca7d6..aac85f3aed50 100644
--- a/drivers/hwmon/ads7828.c
+++ b/drivers/hwmon/ads7828.c
@@ -47,10 +47,7 @@
 static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
         I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(ads7828);
-
-/* Other module parameters */
+/* Module parameters */
 static int se_input = 1; /* Default is SE, 0 == diff */
 static int int_vref = 1; /* Default is internal ref ON */
 static int vref_mv = ADS7828_INT_VREF_MV; /* set if vref != 2.5V */
@@ -72,7 +69,7 @@ struct ads7828_data {
 };
 
 /* Function declaration - necessary due to function dependencies */
-static int ads7828_detect(struct i2c_client *client, int kind,
+static int ads7828_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static int ads7828_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
@@ -168,7 +165,7 @@ static int ads7828_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ads7828_id[] = {
-        { "ads7828", ads7828 },
+        { "ads7828", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, ads7828_id);
@@ -183,11 +180,11 @@ static struct i2c_driver ads7828_driver = {
         .remove = ads7828_remove,
         .id_table = ads7828_id,
         .detect = ads7828_detect,
-        .address_data = &addr_data,
+        .address_list = normal_i2c,
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int ads7828_detect(struct i2c_client *client, int kind,
+static int ads7828_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/adt7462.c b/drivers/hwmon/adt7462.c
index f9c9562b6a94..a1a7ef14b519 100644
--- a/drivers/hwmon/adt7462.c
+++ b/drivers/hwmon/adt7462.c
@@ -32,9 +32,6 @@
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(adt7462);
-
 /* ADT7462 registers */
 #define ADT7462_REG_DEVICE                      0x3D
 #define ADT7462_REG_VENDOR                      0x3E
@@ -237,12 +234,12 @@ struct adt7462_data {
 
 static int adt7462_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int adt7462_detect(struct i2c_client *client, int kind,
+static int adt7462_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static int adt7462_remove(struct i2c_client *client);
 
 static const struct i2c_device_id adt7462_id[] = {
-        { "adt7462", adt7462 },
+        { "adt7462", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, adt7462_id);
@@ -256,7 +253,7 @@ static struct i2c_driver adt7462_driver = {
         .remove         = adt7462_remove,
         .id_table       = adt7462_id,
         .detect         = adt7462_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -1902,7 +1899,7 @@ static struct attribute *adt7462_attr[] =
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int adt7462_detect(struct i2c_client *client, int kind,
+static int adt7462_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c
index 32b1750a6890..3445ce1cba81 100644
--- a/drivers/hwmon/adt7470.c
+++ b/drivers/hwmon/adt7470.c
@@ -33,9 +33,6 @@
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x2C, 0x2E, 0x2F, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(adt7470);
-
 /* ADT7470 registers */
 #define ADT7470_REG_BASE_ADDR                   0x20
 #define ADT7470_REG_TEMP_BASE_ADDR              0x20
@@ -177,12 +174,12 @@ struct adt7470_data {
 
 static int adt7470_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int adt7470_detect(struct i2c_client *client, int kind,
+static int adt7470_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static int adt7470_remove(struct i2c_client *client);
 
 static const struct i2c_device_id adt7470_id[] = {
-        { "adt7470", adt7470 },
+        { "adt7470", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, adt7470_id);
@@ -196,7 +193,7 @@ static struct i2c_driver adt7470_driver = {
         .remove         = adt7470_remove,
         .id_table       = adt7470_id,
         .detect         = adt7470_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -1225,7 +1222,7 @@ static struct attribute *adt7470_attr[] =
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int adt7470_detect(struct i2c_client *client, int kind,
+static int adt7470_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/adt7473.c b/drivers/hwmon/adt7473.c
index aea244db974e..434576f61c84 100644
--- a/drivers/hwmon/adt7473.c
+++ b/drivers/hwmon/adt7473.c
@@ -32,9 +32,6 @@
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x2C, 0x2D, 0x2E, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(adt7473);
-
 /* ADT7473 registers */
 #define ADT7473_REG_BASE_ADDR                   0x20
 
@@ -166,12 +163,12 @@ struct adt7473_data {
 
 static int adt7473_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int adt7473_detect(struct i2c_client *client, int kind,
+static int adt7473_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static int adt7473_remove(struct i2c_client *client);
 
 static const struct i2c_device_id adt7473_id[] = {
-        { "adt7473", adt7473 },
+        { "adt7473", 0 },
         { }
 };
 
@@ -184,7 +181,7 @@ static struct i2c_driver adt7473_driver = {
         .remove         = adt7473_remove,
         .id_table       = adt7473_id,
         .detect         = adt7473_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -1085,7 +1082,7 @@ static struct attribute *adt7473_attr[] =
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int adt7473_detect(struct i2c_client *client, int kind,
+static int adt7473_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c
index 99abfddedbc3..a0c385145686 100644
--- a/drivers/hwmon/adt7475.c
+++ b/drivers/hwmon/adt7475.c
@@ -148,7 +148,7 @@
 
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
-I2C_CLIENT_INSMOD_4(adt7473, adt7475, adt7476, adt7490);
+enum chips { adt7473, adt7475, adt7476, adt7490 };
 
 static const struct i2c_device_id adt7475_id[] = {
         { "adt7473", adt7473 },
@@ -1172,7 +1172,7 @@ static struct attribute_group in4_attr_group = { .attrs = in4_attrs };
 static struct attribute_group in5_attr_group = { .attrs = in5_attrs };
 static struct attribute_group vid_attr_group = { .attrs = vid_attrs };
 
-static int adt7475_detect(struct i2c_client *client, int kind,
+static int adt7475_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
@@ -1412,7 +1412,7 @@ static struct i2c_driver adt7475_driver = {
         .remove         = adt7475_remove,
         .id_table       = adt7475_id,
         .detect         = adt7475_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static void adt7475_read_hystersis(struct i2c_client *client)
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 7ea6a8f66056..c1605b528e8f 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -518,7 +518,7 @@ static int applesmc_pm_restore(struct device *dev)
         return applesmc_pm_resume(dev);
 }
 
-static struct dev_pm_ops applesmc_pm_ops = {
+static const struct dev_pm_ops applesmc_pm_ops = {
         .resume = applesmc_pm_resume,
         .restore = applesmc_pm_restore,
 };
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index 480f80ea1fa0..7dada559b3a1 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -51,9 +51,6 @@
 /* I2C addresses to scan */
 static const unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(asb100);
-
 static unsigned short force_subclients[4];
 module_param_array(force_subclients, short, NULL, 0);
 MODULE_PARM_DESC(force_subclients, "List of subclient addresses: "
@@ -209,14 +206,14 @@ static void asb100_write_value(struct i2c_client *client, u16 reg, u16 val);
 
 static int asb100_probe(struct i2c_client *client,
                         const struct i2c_device_id *id);
-static int asb100_detect(struct i2c_client *client, int kind,
+static int asb100_detect(struct i2c_client *client,
                          struct i2c_board_info *info);
 static int asb100_remove(struct i2c_client *client);
 static struct asb100_data *asb100_update_device(struct device *dev);
 static void asb100_init_client(struct i2c_client *client);
 
 static const struct i2c_device_id asb100_id[] = {
-        { "asb100", asb100 },
+        { "asb100", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, asb100_id);
@@ -230,7 +227,7 @@ static struct i2c_driver asb100_driver = {
         .remove         = asb100_remove,
         .id_table       = asb100_id,
         .detect         = asb100_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /* 7 Voltages */
@@ -697,7 +694,7 @@ ERROR_SC_2:
 }
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int asb100_detect(struct i2c_client *client, int kind,
+static int asb100_detect(struct i2c_client *client,
                          struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index d6b490d3e36f..94cadc19f0c5 100644
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -44,17 +44,14 @@ MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>");
 
 static const unsigned short normal_i2c[] = { 0x37, 0x4e, I2C_CLIENT_END };
 
-I2C_CLIENT_INSMOD_1(atxp1);
-
 static int atxp1_probe(struct i2c_client *client,
                        const struct i2c_device_id *id);
 static int atxp1_remove(struct i2c_client *client);
 static struct atxp1_data * atxp1_update_device(struct device *dev);
-static int atxp1_detect(struct i2c_client *client, int kind,
-                        struct i2c_board_info *info);
+static int atxp1_detect(struct i2c_client *client, struct i2c_board_info *info);
 
 static const struct i2c_device_id atxp1_id[] = {
-        { "atxp1", atxp1 },
+        { "atxp1", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, atxp1_id);
@@ -68,7 +65,7 @@ static struct i2c_driver atxp1_driver = {
         .remove         = atxp1_remove,
         .id_table       = atxp1_id,
         .detect         = atxp1_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 struct atxp1_data {
@@ -275,7 +272,7 @@ static const struct attribute_group atxp1_group = {
 
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int atxp1_detect(struct i2c_client *new_client, int kind,
+static int atxp1_detect(struct i2c_client *new_client,
                         struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = new_client->adapter;
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index 4377bb0cc526..823dd28a902c 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -57,11 +57,7 @@ MODULE_PARM_DESC(probe_all_addr, "Include probing of non-standard LPC "
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END};
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_2(dme1737, sch5027);
-
-/* ISA chip types */
-enum isa_chips { sch311x = sch5027 + 1 };
+enum chips { dme1737, sch5027, sch311x };
 
 /* ---------------------------------------------------------------------
  * Registers
@@ -2208,7 +2204,7 @@ exit:
 }
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int dme1737_i2c_detect(struct i2c_client *client, int kind,
+static int dme1737_i2c_detect(struct i2c_client *client,
                               struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
@@ -2318,7 +2314,7 @@ static struct i2c_driver dme1737_i2c_driver = {
         .remove = dme1737_i2c_remove,
         .id_table = dme1737_id,
         .detect = dme1737_i2c_detect,
-        .address_data = &addr_data,
+        .address_list = normal_i2c,
 };
 
 /* ---------------------------------------------------------------------
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 2a4c6a05b14f..e11363467a8d 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -38,7 +38,6 @@ static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                         0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
 
 /* Insmod parameters */
-I2C_CLIENT_INSMOD_1(ds1621);
 static int polarity = -1;
 module_param(polarity, int, 0);
 MODULE_PARM_DESC(polarity, "Output's polarity: 0 = active high, 1 = active low");
@@ -224,7 +223,7 @@ static const struct attribute_group ds1621_group = {
 
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int ds1621_detect(struct i2c_client *client, int kind,
+static int ds1621_detect(struct i2c_client *client,
                          struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
@@ -305,8 +304,8 @@ static int ds1621_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ds1621_id[] = {
-        { "ds1621", ds1621 },
-        { "ds1625", ds1621 },
+        { "ds1621", 0 },
+        { "ds1625", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, ds1621_id);
@@ -321,7 +320,7 @@ static struct i2c_driver ds1621_driver = {
         .remove         = ds1621_remove,
         .id_table       = ds1621_id,
         .detect         = ds1621_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static int __init ds1621_init(void)
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
index 40dfbcd3f3f2..277398f9c938 100644
--- a/drivers/hwmon/f75375s.c
+++ b/drivers/hwmon/f75375s.c
@@ -39,8 +39,7 @@
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_2(f75373, f75375);
+enum chips { f75373, f75375 };
 
 /* Fintek F75375 registers  */
 #define F75375_REG_CONFIG0              0x0
@@ -113,7 +112,7 @@ struct f75375_data {
         s8 temp_max_hyst[2];
 };
 
-static int f75375_detect(struct i2c_client *client, int kind,
+static int f75375_detect(struct i2c_client *client,
                          struct i2c_board_info *info);
 static int f75375_probe(struct i2c_client *client,
                         const struct i2c_device_id *id);
@@ -135,7 +134,7 @@ static struct i2c_driver f75375_driver = {
         .remove = f75375_remove,
         .id_table = f75375_id,
         .detect = f75375_detect,
-        .address_data = &addr_data,
+        .address_list = normal_i2c,
 };
 
 static inline int f75375_read8(struct i2c_client *client, u8 reg)
@@ -677,7 +676,7 @@ static int f75375_remove(struct i2c_client *client)
 }
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int f75375_detect(struct i2c_client *client, int kind,
+static int f75375_detect(struct i2c_client *client,
                          struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c
index 281829cd1533..bd0fc67e804b 100644
--- a/drivers/hwmon/fschmd.c
+++ b/drivers/hwmon/fschmd.c
@@ -56,7 +56,8 @@ static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
         __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
-I2C_CLIENT_INSMOD_7(fscpos, fscher, fscscy, fschrc, fschmd, fschds, fscsyl);
+
+enum chips { fscpos, fscher, fscscy, fschrc, fschmd, fschds, fscsyl };
 
 /*
  * The FSCHMD registers and other defines
@@ -221,7 +222,7 @@ static const int FSCHMD_NO_TEMP_SENSORS[7] = { 3, 3, 4, 3, 5, 5, 11 };
 
 static int fschmd_probe(struct i2c_client *client,
                         const struct i2c_device_id *id);
-static int fschmd_detect(struct i2c_client *client, int kind,
+static int fschmd_detect(struct i2c_client *client,
                          struct i2c_board_info *info);
 static int fschmd_remove(struct i2c_client *client);
 static struct fschmd_data *fschmd_update_device(struct device *dev);
@@ -251,7 +252,7 @@ static struct i2c_driver fschmd_driver = {
         .remove         = fschmd_remove,
         .id_table       = fschmd_id,
         .detect         = fschmd_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -1000,7 +1001,7 @@ static void fschmd_dmi_decode(const struct dmi_header *header, void *dummy)
         }
 }
 
-static int fschmd_detect(struct i2c_client *client, int _kind,
+static int fschmd_detect(struct i2c_client *client,
                          struct i2c_board_info *info)
 {
         enum chips kind;
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index 1d69458aa0b6..e7ae5743e181 100644
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -46,8 +46,7 @@
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_2(gl518sm_r00, gl518sm_r80);
+enum chips { gl518sm_r00, gl518sm_r80 };
 
 /* Many GL518 constants specified below */
 
@@ -139,8 +138,7 @@ struct gl518_data {
 
 static int gl518_probe(struct i2c_client *client,
                        const struct i2c_device_id *id);
-static int gl518_detect(struct i2c_client *client, int kind,
-                        struct i2c_board_info *info);
+static int gl518_detect(struct i2c_client *client, struct i2c_board_info *info);
 static void gl518_init_client(struct i2c_client *client);
 static int gl518_remove(struct i2c_client *client);
 static int gl518_read_value(struct i2c_client *client, u8 reg);
@@ -163,7 +161,7 @@ static struct i2c_driver gl518_driver = {
         .remove         = gl518_remove,
         .id_table       = gl518_id,
         .detect         = gl518_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -484,8 +482,7 @@ static const struct attribute_group gl518_group_r80 = {
  */
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int gl518_detect(struct i2c_client *client, int kind,
-                        struct i2c_board_info *info)
+static int gl518_detect(struct i2c_client *client, struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
         int rev;
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index 92b5720ceaff..ec588026f0a9 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -41,9 +41,6 @@ MODULE_PARM_DESC(extra_sensor_type, "Type of extra sensor (0=autodetect, 1=tempe
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(gl520sm);
-
 /* Many GL520 constants specified below
 One of the inputs can be configured as either temp or voltage.
 That's why _TEMP2 and _IN4 access the same register
@@ -81,8 +78,7 @@ static const u8 GL520_REG_TEMP_MAX_HYST[]	= { 0x06, 0x18 };
 
 static int gl520_probe(struct i2c_client *client,
                        const struct i2c_device_id *id);
-static int gl520_detect(struct i2c_client *client, int kind,
-                        struct i2c_board_info *info);
+static int gl520_detect(struct i2c_client *client, struct i2c_board_info *info);
 static void gl520_init_client(struct i2c_client *client);
 static int gl520_remove(struct i2c_client *client);
 static int gl520_read_value(struct i2c_client *client, u8 reg);
@@ -91,7 +87,7 @@ static struct gl520_data *gl520_update_device(struct device *dev);
 
 /* Driver data */
 static const struct i2c_device_id gl520_id[] = {
-        { "gl520sm", gl520sm },
+        { "gl520sm", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, gl520_id);
@@ -105,7 +101,7 @@ static struct i2c_driver gl520_driver = {
         .remove         = gl520_remove,
         .id_table       = gl520_id,
         .detect         = gl520_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /* Client data */
@@ -681,8 +677,7 @@ static const struct attribute_group gl520_group_opt = {
  */
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int gl520_detect(struct i2c_client *client, int kind,
-                        struct i2c_board_info *info)
+static int gl520_detect(struct i2c_client *client, struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
 
diff --git a/drivers/hwmon/lis3lv02d.c b/drivers/hwmon/lis3lv02d.c
index cf5afb9a10ab..b2f2277cad3c 100644
--- a/drivers/hwmon/lis3lv02d.c
+++ b/drivers/hwmon/lis3lv02d.c
@@ -43,13 +43,30 @@
 #define MDPS_POLL_INTERVAL 50
 /*
  * The sensor can also generate interrupts (DRDY) but it's pretty pointless
- * because their are generated even if the data do not change. So it's better
+ * because they are generated even if the data do not change. So it's better
  * to keep the interrupt for the free-fall event. The values are updated at
  * 40Hz (at the lowest frequency), but as it can be pretty time consuming on
  * some low processor, we poll the sensor only at 20Hz... enough for the
  * joystick.
  */
 
+#define LIS3_PWRON_DELAY_WAI_12B        (5000)
+#define LIS3_PWRON_DELAY_WAI_8B         (3000)
+
+/*
+ * LIS3LV02D spec says 1024 LSBs corresponds 1 G -> 1LSB is 1000/1024 mG
+ * LIS302D spec says: 18 mG / digit
+ * LIS3_ACCURACY is used to increase accuracy of the intermediate
+ * calculation results.
+ */
+#define LIS3_ACCURACY                   1024
+/* Sensitivity values for -2G +2G scale */
+#define LIS3_SENSITIVITY_12B            ((LIS3_ACCURACY * 1000) / 1024)
+#define LIS3_SENSITIVITY_8B             (18 * LIS3_ACCURACY)
+
+#define LIS3_DEFAULT_FUZZ               3
+#define LIS3_DEFAULT_FLAT               3
+
 struct lis3lv02d lis3_dev = {
         .misc_wait   = __WAIT_QUEUE_HEAD_INITIALIZER(lis3_dev.misc_wait),
 };
@@ -65,7 +82,7 @@ static s16 lis3lv02d_read_8(struct lis3lv02d *lis3, int reg)
         return lo;
 }
 
-static s16 lis3lv02d_read_16(struct lis3lv02d *lis3, int reg)
+static s16 lis3lv02d_read_12(struct lis3lv02d *lis3, int reg)
 {
         u8 lo, hi;
 
@@ -102,16 +119,106 @@ static inline int lis3lv02d_get_axis(s8 axis, int hw_values[3])
 static void lis3lv02d_get_xyz(struct lis3lv02d *lis3, int *x, int *y, int *z)
 {
         int position[3];
+        int i;
 
+        mutex_lock(&lis3->mutex);
         position[0] = lis3->read_data(lis3, OUTX);
         position[1] = lis3->read_data(lis3, OUTY);
         position[2] = lis3->read_data(lis3, OUTZ);
+        mutex_unlock(&lis3->mutex);
+
+        for (i = 0; i < 3; i++)
+                position[i] = (position[i] * lis3->scale) / LIS3_ACCURACY;
 
         *x = lis3lv02d_get_axis(lis3->ac.x, position);
         *y = lis3lv02d_get_axis(lis3->ac.y, position);
         *z = lis3lv02d_get_axis(lis3->ac.z, position);
 }
 
+/* conversion btw sampling rate and the register values */
+static int lis3_12_rates[4] = {40, 160, 640, 2560};
+static int lis3_8_rates[2] = {100, 400};
+
+/* ODR is Output Data Rate */
+static int lis3lv02d_get_odr(void)
+{
+        u8 ctrl;
+        int shift;
+
+        lis3_dev.read(&lis3_dev, CTRL_REG1, &ctrl);
+        ctrl &= lis3_dev.odr_mask;
+        shift = ffs(lis3_dev.odr_mask) - 1;
+        return lis3_dev.odrs[(ctrl >> shift)];
+}
+
+static int lis3lv02d_set_odr(int rate)
+{
+        u8 ctrl;
+        int i, len, shift;
+
+        lis3_dev.read(&lis3_dev, CTRL_REG1, &ctrl);
+        ctrl &= ~lis3_dev.odr_mask;
+        len = 1 << hweight_long(lis3_dev.odr_mask); /* # of possible values */
+        shift = ffs(lis3_dev.odr_mask) - 1;
+
+        for (i = 0; i < len; i++)
+                if (lis3_dev.odrs[i] == rate) {
+                        lis3_dev.write(&lis3_dev, CTRL_REG1,
+                                        ctrl | (i << shift));
+                        return 0;
+                }
+        return -EINVAL;
+}
+
+static int lis3lv02d_selftest(struct lis3lv02d *lis3, s16 results[3])
+{
+        u8 reg;
+        s16 x, y, z;
+        u8 selftest;
+        int ret;
+
+        mutex_lock(&lis3->mutex);
+        if (lis3_dev.whoami == WAI_12B)
+                selftest = CTRL1_ST;
+        else
+                selftest = CTRL1_STP;
+
+        lis3->read(lis3, CTRL_REG1, &reg);
+        lis3->write(lis3, CTRL_REG1, (reg | selftest));
+        msleep(lis3->pwron_delay / lis3lv02d_get_odr());
+
+        /* Read directly to avoid axis remap */
+        x = lis3->read_data(lis3, OUTX);
+        y = lis3->read_data(lis3, OUTY);
+        z = lis3->read_data(lis3, OUTZ);
+
+        /* back to normal settings */
+        lis3->write(lis3, CTRL_REG1, reg);
+        msleep(lis3->pwron_delay / lis3lv02d_get_odr());
+
+        results[0] = x - lis3->read_data(lis3, OUTX);
+        results[1] = y - lis3->read_data(lis3, OUTY);
+        results[2] = z - lis3->read_data(lis3, OUTZ);
+
+        ret = 0;
+        if (lis3->pdata) {
+                int i;
+                for (i = 0; i < 3; i++) {
+                        /* Check against selftest acceptance limits */
+                        if ((results[i] < lis3->pdata->st_min_limits[i]) ||
+                            (results[i] > lis3->pdata->st_max_limits[i])) {
+                                ret = -EIO;
+                                goto fail;
+                        }
+                }
+        }
+
+        /* test passed */
+fail:
+        mutex_unlock(&lis3->mutex);
+        return ret;
+}
+
 void lis3lv02d_poweroff(struct lis3lv02d *lis3)
 {
         /* disable X,Y,Z axis and power down */
@@ -125,14 +232,19 @@ void lis3lv02d_poweron(struct lis3lv02d *lis3)
 
         lis3->init(lis3);
 
+        /* LIS3 power on delay is quite long */
+        msleep(lis3->pwron_delay / lis3lv02d_get_odr());
+
         /*
          * Common configuration
-         * BDU: LSB and MSB values are not updated until both have been read.
-         *      So the value read will always be correct.
+         * BDU: (12 bits sensors only) LSB and MSB values are not updated until
+         *      both have been read. So the value read will always be correct.
          */
-        lis3->read(lis3, CTRL_REG2, &reg);
-        reg |= CTRL2_BDU;
-        lis3->write(lis3, CTRL_REG2, reg);
+        if (lis3->whoami ==  WAI_12B) {
+                lis3->read(lis3, CTRL_REG2, &reg);
+                reg |= CTRL2_BDU;
+                lis3->write(lis3, CTRL_REG2, reg);
+        }
 }
 EXPORT_SYMBOL_GPL(lis3lv02d_poweron);
 
@@ -273,22 +385,17 @@ static void lis3lv02d_joystick_poll(struct input_polled_dev *pidev)
         int x, y, z;
 
         lis3lv02d_get_xyz(&lis3_dev, &x, &y, &z);
-        input_report_abs(pidev->input, ABS_X, x - lis3_dev.xcalib);
-        input_report_abs(pidev->input, ABS_Y, y - lis3_dev.ycalib);
-        input_report_abs(pidev->input, ABS_Z, z - lis3_dev.zcalib);
-}
-
-
-static inline void lis3lv02d_calibrate_joystick(void)
-{
-        lis3lv02d_get_xyz(&lis3_dev,
-                &lis3_dev.xcalib, &lis3_dev.ycalib, &lis3_dev.zcalib);
+        input_report_abs(pidev->input, ABS_X, x);
+        input_report_abs(pidev->input, ABS_Y, y);
+        input_report_abs(pidev->input, ABS_Z, z);
+        input_sync(pidev->input);
 }
 
 int lis3lv02d_joystick_enable(void)
 {
         struct input_dev *input_dev;
         int err;
+        int max_val, fuzz, flat;
 
         if (lis3_dev.idev)
                 return -EINVAL;
@@ -301,8 +408,6 @@ int lis3lv02d_joystick_enable(void)
         lis3_dev.idev->poll_interval = MDPS_POLL_INTERVAL;
         input_dev = lis3_dev.idev->input;
 
-        lis3lv02d_calibrate_joystick();
-
         input_dev->name       = "ST LIS3LV02DL Accelerometer";
         input_dev->phys       = DRIVER_NAME "/input0";
         input_dev->id.bustype = BUS_HOST;
@@ -310,9 +415,12 @@ int lis3lv02d_joystick_enable(void)
         input_dev->dev.parent = &lis3_dev.pdev->dev;
 
         set_bit(EV_ABS, input_dev->evbit);
-        input_set_abs_params(input_dev, ABS_X, -lis3_dev.mdps_max_val, lis3_dev.mdps_max_val, 3, 3);
-        input_set_abs_params(input_dev, ABS_Y, -lis3_dev.mdps_max_val, lis3_dev.mdps_max_val, 3, 3);
-        input_set_abs_params(input_dev, ABS_Z, -lis3_dev.mdps_max_val, lis3_dev.mdps_max_val, 3, 3);
+        max_val = (lis3_dev.mdps_max_val * lis3_dev.scale) / LIS3_ACCURACY;
+        fuzz = (LIS3_DEFAULT_FUZZ * lis3_dev.scale) / LIS3_ACCURACY;
+        flat = (LIS3_DEFAULT_FLAT * lis3_dev.scale) / LIS3_ACCURACY;
+        input_set_abs_params(input_dev, ABS_X, -max_val, max_val, fuzz, flat);
+        input_set_abs_params(input_dev, ABS_Y, -max_val, max_val, fuzz, flat);
+        input_set_abs_params(input_dev, ABS_Z, -max_val, max_val, fuzz, flat);
 
         err = input_register_polled_device(lis3_dev.idev);
         if (err) {
@@ -332,11 +440,23 @@ void lis3lv02d_joystick_disable(void)
         if (lis3_dev.irq)
                 misc_deregister(&lis3lv02d_misc_device);
         input_unregister_polled_device(lis3_dev.idev);
+        input_free_polled_device(lis3_dev.idev);
         lis3_dev.idev = NULL;
 }
 EXPORT_SYMBOL_GPL(lis3lv02d_joystick_disable);
 
 /* Sysfs stuff */
+static ssize_t lis3lv02d_selftest_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        int result;
+        s16 values[3];
+
+        result = lis3lv02d_selftest(&lis3_dev, values);
+        return sprintf(buf, "%s %d %d %d\n", result == 0 ? "OK" : "FAIL",
+                values[0], values[1], values[2]);
+}
+
 static ssize_t lis3lv02d_position_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
@@ -346,41 +466,35 @@ static ssize_t lis3lv02d_position_show(struct device *dev,
         return sprintf(buf, "(%d,%d,%d)\n", x, y, z);
 }
 
-static ssize_t lis3lv02d_calibrate_show(struct device *dev,
-                                struct device_attribute *attr, char *buf)
+static ssize_t lis3lv02d_rate_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
-        return sprintf(buf, "(%d,%d,%d)\n", lis3_dev.xcalib, lis3_dev.ycalib, lis3_dev.zcalib);
+        return sprintf(buf, "%d\n", lis3lv02d_get_odr());
 }
 
-static ssize_t lis3lv02d_calibrate_store(struct device *dev,
-                                struct device_attribute *attr,
-                                const char *buf, size_t count)
+static ssize_t lis3lv02d_rate_set(struct device *dev,
+                                struct device_attribute *attr, const char *buf,
+                                size_t count)
 {
-        lis3lv02d_calibrate_joystick();
-        return count;
-}
+        unsigned long rate;
 
-/* conversion btw sampling rate and the register values */
-static int lis3lv02dl_df_val[4] = {40, 160, 640, 2560};
-static ssize_t lis3lv02d_rate_show(struct device *dev,
-                        struct device_attribute *attr, char *buf)
-{
-        u8 ctrl;
-        int val;
+        if (strict_strtoul(buf, 0, &rate))
+                return -EINVAL;
 
-        lis3_dev.read(&lis3_dev, CTRL_REG1, &ctrl);
-        val = (ctrl & (CTRL1_DF0 | CTRL1_DF1)) >> 4;
-        return sprintf(buf, "%d\n", lis3lv02dl_df_val[val]);
+        if (lis3lv02d_set_odr(rate))
+                return -EINVAL;
+
+        return count;
 }
 
+static DEVICE_ATTR(selftest, S_IRUSR, lis3lv02d_selftest_show, NULL);
 static DEVICE_ATTR(position, S_IRUGO, lis3lv02d_position_show, NULL);
-static DEVICE_ATTR(calibrate, S_IRUGO|S_IWUSR, lis3lv02d_calibrate_show,
-        lis3lv02d_calibrate_store);
-static DEVICE_ATTR(rate, S_IRUGO, lis3lv02d_rate_show, NULL);
+static DEVICE_ATTR(rate, S_IRUGO | S_IWUSR, lis3lv02d_rate_show,
+                                            lis3lv02d_rate_set);
 
 static struct attribute *lis3lv02d_attributes[] = {
+        &dev_attr_selftest.attr,
         &dev_attr_position.attr,
-        &dev_attr_calibrate.attr,
         &dev_attr_rate.attr,
         NULL
 };
@@ -409,22 +523,30 @@ EXPORT_SYMBOL_GPL(lis3lv02d_remove_fs);
 
 /*
  * Initialise the accelerometer and the various subsystems.
- * Should be rather independant of the bus system.
+ * Should be rather independent of the bus system.
  */
 int lis3lv02d_init_device(struct lis3lv02d *dev)
 {
         dev->whoami = lis3lv02d_read_8(dev, WHO_AM_I);
 
         switch (dev->whoami) {
-        case LIS_DOUBLE_ID:
-                printk(KERN_INFO DRIVER_NAME ": 2-byte sensor found\n");
-                dev->read_data = lis3lv02d_read_16;
+        case WAI_12B:
+                printk(KERN_INFO DRIVER_NAME ": 12 bits sensor found\n");
+                dev->read_data = lis3lv02d_read_12;
                 dev->mdps_max_val = 2048;
+                dev->pwron_delay = LIS3_PWRON_DELAY_WAI_12B;
+                dev->odrs = lis3_12_rates;
+                dev->odr_mask = CTRL1_DF0 | CTRL1_DF1;
+                dev->scale = LIS3_SENSITIVITY_12B;
                 break;
-        case LIS_SINGLE_ID:
-                printk(KERN_INFO DRIVER_NAME ": 1-byte sensor found\n");
+        case WAI_8B:
+                printk(KERN_INFO DRIVER_NAME ": 8 bits sensor found\n");
                 dev->read_data = lis3lv02d_read_8;
                 dev->mdps_max_val = 128;
+                dev->pwron_delay = LIS3_PWRON_DELAY_WAI_8B;
+                dev->odrs = lis3_8_rates;
+                dev->odr_mask = CTRL1_DR;
+                dev->scale = LIS3_SENSITIVITY_8B;
                 break;
         default:
                 printk(KERN_ERR DRIVER_NAME
@@ -432,6 +554,8 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
                 return -EINVAL;
         }
 
+        mutex_init(&dev->mutex);
+
         lis3lv02d_add_fs(dev);
         lis3lv02d_poweron(dev);
 
@@ -443,7 +567,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
         if (dev->pdata) {
                 struct lis3lv02d_platform_data *p = dev->pdata;
 
-                if (p->click_flags && (dev->whoami == LIS_SINGLE_ID)) {
+                if (p->click_flags && (dev->whoami == WAI_8B)) {
                         dev->write(dev, CLICK_CFG, p->click_flags);
                         dev->write(dev, CLICK_TIMELIMIT, p->click_time_limit);
                         dev->write(dev, CLICK_LATENCY, p->click_latency);
@@ -454,7 +578,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
                                         (p->click_thresh_y << 4));
                 }
 
-                if (p->wakeup_flags && (dev->whoami == LIS_SINGLE_ID)) {
+                if (p->wakeup_flags && (dev->whoami == WAI_8B)) {
                         dev->write(dev, FF_WU_CFG_1, p->wakeup_flags);
                         dev->write(dev, FF_WU_THS_1, p->wakeup_thresh & 0x7f);
                         /* default to 2.5ms for now */
@@ -484,4 +608,3 @@ EXPORT_SYMBOL_GPL(lis3lv02d_init_device);
 MODULE_DESCRIPTION("ST LIS3LV02Dx three-axis digital accelerometer driver");
 MODULE_AUTHOR("Yan Burman, Eric Piel, Pavel Machek");
 MODULE_LICENSE("GPL");
-
diff --git a/drivers/hwmon/lis3lv02d.h b/drivers/hwmon/lis3lv02d.h
index 3e1ff46f72d3..e6a01f44709b 100644
--- a/drivers/hwmon/lis3lv02d.h
+++ b/drivers/hwmon/lis3lv02d.h
@@ -2,7 +2,7 @@
  *  lis3lv02d.h - ST LIS3LV02DL accelerometer driver
  *
  *  Copyright (C) 2007-2008 Yan Burman
- *  Copyright (C) 2008 Eric Piel
+ *  Copyright (C) 2008-2009 Eric Piel
  *
  *  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
@@ -22,20 +22,18 @@
 #include <linux/input-polldev.h>
 
 /*
- * The actual chip is STMicroelectronics LIS3LV02DL or LIS3LV02DQ that seems to
- * be connected via SPI. There exists also several similar chips (such as LIS302DL or
- * LIS3L02DQ) and they have slightly different registers, but we can provide a
- * common interface for all of them.
- * They can also be connected via I²C.
+ * This driver tries to support the "digital" accelerometer chips from
+ * STMicroelectronics such as LIS3LV02DL, LIS302DL, LIS3L02DQ, LIS331DL,
+ * LIS35DE, or LIS202DL. They are very similar in terms of programming, with
+ * almost the same registers. In addition to differing on physical properties,
+ * they differ on the number of axes (2/3), precision (8/12 bits), and special
+ * features (freefall detection, click...). Unfortunately, not all the
+ * differences can be probed via a register.
+ * They can be connected either via I²C or SPI.
  */
 
 #include <linux/lis3lv02d.h>
 
-/* 2-byte registers */
-#define LIS_DOUBLE_ID   0x3A /* LIS3LV02D[LQ] */
-/* 1-byte registers */
-#define LIS_SINGLE_ID   0x3B /* LIS[32]02DL and others */
-
 enum lis3_reg {
         WHO_AM_I        = 0x0F,
         OFFSET_X        = 0x16,
@@ -94,7 +92,13 @@ enum lis3lv02d_reg {
         DD_THSE_H       = 0x3F,
 };
 
-enum lis3lv02d_ctrl1 {
+enum lis3_who_am_i {
+        WAI_12B         = 0x3A, /* 12 bits: LIS3LV02D[LQ]... */
+        WAI_8B          = 0x3B, /* 8 bits: LIS[23]02D[LQ]... */
+        WAI_6B          = 0x52, /* 6 bits: LIS331DLF - not supported */
+};
+
+enum lis3lv02d_ctrl1_12b {
         CTRL1_Xen       = 0x01,
         CTRL1_Yen       = 0x02,
         CTRL1_Zen       = 0x04,
@@ -104,6 +108,16 @@ enum lis3lv02d_ctrl1 {
         CTRL1_PD0       = 0x40,
         CTRL1_PD1       = 0x80,
 };
+
+/* Delta to ctrl1_12b version */
+enum lis3lv02d_ctrl1_8b {
+        CTRL1_STM       = 0x08,
+        CTRL1_STP       = 0x10,
+        CTRL1_FS        = 0x20,
+        CTRL1_PD        = 0x40,
+        CTRL1_DR        = 0x80,
+};
+
 enum lis3lv02d_ctrl2 {
         CTRL2_DAS       = 0x01,
         CTRL2_SIM       = 0x02,
@@ -194,16 +208,20 @@ struct lis3lv02d {
         int (*write) (struct lis3lv02d *lis3, int reg, u8 val);
         int (*read) (struct lis3lv02d *lis3, int reg, u8 *ret);
 
-        u8                      whoami;    /* 3Ah: 2-byte registries, 3Bh: 1-byte registries */
+        int                     *odrs;     /* Supported output data rates */
+        u8                      odr_mask;  /* ODR bit mask */
+        u8                      whoami;    /* indicates measurement precision */
         s16 (*read_data) (struct lis3lv02d *lis3, int reg);
         int                     mdps_max_val;
+        int                     pwron_delay;
+        int                     scale; /*
+                                        * relationship between 1 LBS and mG
+                                        * (1/1000th of earth gravity)
+                                        */
 
         struct input_polled_dev *idev;     /* input device */
         struct platform_device  *pdev;     /* platform device */
         atomic_t                count;     /* interrupt count after last read */
-        int                     xcalib;    /* calibrated null value for x */
-        int                     ycalib;    /* calibrated null value for y */
-        int                     zcalib;    /* calibrated null value for z */
         struct axis_conversion  ac;        /* hw -> logical axis */
 
         u32                     irq;       /* IRQ number */
@@ -212,6 +230,7 @@ struct lis3lv02d {
         unsigned long           misc_opened; /* bit0: whether the device is open */
 
         struct lis3lv02d_platform_data *pdata;  /* for passing board config */
+        struct mutex            mutex;     /* Serialize poll and selftest */
 };
 
 int lis3lv02d_init_device(struct lis3lv02d *lis3);
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index 5da66ab04f74..bf81aff7051d 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -56,12 +56,6 @@
 static const unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END };
 
 /*
- * Insmod parameters
- */
-
-I2C_CLIENT_INSMOD_1(lm63);
-
-/*
  * The LM63 registers
  */
 
@@ -134,8 +128,7 @@ static int lm63_remove(struct i2c_client *client);
 
 static struct lm63_data *lm63_update_device(struct device *dev);
 
-static int lm63_detect(struct i2c_client *client, int kind,
-                       struct i2c_board_info *info);
+static int lm63_detect(struct i2c_client *client, struct i2c_board_info *info);
 static void lm63_init_client(struct i2c_client *client);
 
 /*
@@ -143,7 +136,7 @@ static void lm63_init_client(struct i2c_client *client);
  */
 
 static const struct i2c_device_id lm63_id[] = {
-        { "lm63", lm63 },
+        { "lm63", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, lm63_id);
@@ -157,7 +150,7 @@ static struct i2c_driver lm63_driver = {
         .remove         = lm63_remove,
         .id_table       = lm63_id,
         .detect         = lm63_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -423,7 +416,7 @@ static const struct attribute_group lm63_group_fan1 = {
  */
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm63_detect(struct i2c_client *new_client, int kind,
+static int lm63_detect(struct i2c_client *new_client,
                        struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = new_client->adapter;
diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c
index 0bf8b2a8e9f0..c5f39ba103c0 100644
--- a/drivers/hwmon/lm73.c
+++ b/drivers/hwmon/lm73.c
@@ -27,9 +27,6 @@
 static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4c,
                                         0x4d, 0x4e, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(lm73);
-
 /* LM73 registers */
 #define LM73_REG_INPUT          0x00
 #define LM73_REG_CONF           0x01
@@ -145,13 +142,13 @@ static int lm73_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id lm73_ids[] = {
-        { "lm73", lm73 },
+        { "lm73", 0 },
         { /* LIST END */ }
 };
 MODULE_DEVICE_TABLE(i2c, lm73_ids);
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm73_detect(struct i2c_client *new_client, int kind,
+static int lm73_detect(struct i2c_client *new_client,
                         struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = new_client->adapter;
@@ -182,7 +179,7 @@ static struct i2c_driver lm73_driver = {
         .remove         = lm73_remove,
         .id_table       = lm73_ids,
         .detect         = lm73_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /* module glue */
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index e392548cccb8..8ae2cfe2d827 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -32,15 +32,12 @@
 
 /*
  * This driver handles the LM75 and compatible digital temperature sensors.
- * Only types which are _not_ listed in I2C_CLIENT_INSMOD_*() need to be
- * listed here.  We start at 9 since I2C_CLIENT_INSMOD_*() currently allow
- * definition of up to 8 chip types (plus zero).
  */
 
 enum lm75_type {                /* keep sorted in alphabetical order */
-        ds1775 = 9,
+        ds1775,
         ds75,
-        /* lm75 -- in I2C_CLIENT_INSMOD_1() */
+        lm75,
         lm75a,
         max6625,
         max6626,
@@ -58,9 +55,6 @@ enum lm75_type {		/* keep sorted in alphabetical order */
 static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                         0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(lm75);
-
 
 /* The LM75 registers */
 #define LM75_REG_CONF           0x01
@@ -234,7 +228,7 @@ static const struct i2c_device_id lm75_ids[] = {
 MODULE_DEVICE_TABLE(i2c, lm75_ids);
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm75_detect(struct i2c_client *new_client, int kind,
+static int lm75_detect(struct i2c_client *new_client,
                        struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = new_client->adapter;
@@ -295,7 +289,7 @@ static struct i2c_driver lm75_driver = {
         .remove         = lm75_remove,
         .id_table       = lm75_ids,
         .detect         = lm75_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*-----------------------------------------------------------------------*/
diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c
index ac067fd19482..b28a297be50c 100644
--- a/drivers/hwmon/lm77.c
+++ b/drivers/hwmon/lm77.c
@@ -39,9 +39,6 @@
 static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
                                                 I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(lm77);
-
 /* The LM77 registers */
 #define LM77_REG_TEMP           0x00
 #define LM77_REG_CONF           0x01
@@ -66,8 +63,7 @@ struct lm77_data {
 
 static int lm77_probe(struct i2c_client *client,
                       const struct i2c_device_id *id);
-static int lm77_detect(struct i2c_client *client, int kind,
-                       struct i2c_board_info *info);
+static int lm77_detect(struct i2c_client *client, struct i2c_board_info *info);
 static void lm77_init_client(struct i2c_client *client);
 static int lm77_remove(struct i2c_client *client);
 static u16 lm77_read_value(struct i2c_client *client, u8 reg);
@@ -77,7 +73,7 @@ static struct lm77_data *lm77_update_device(struct device *dev);
 
 
 static const struct i2c_device_id lm77_id[] = {
-        { "lm77", lm77 },
+        { "lm77", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, lm77_id);
@@ -92,7 +88,7 @@ static struct i2c_driver lm77_driver = {
         .remove         = lm77_remove,
         .id_table       = lm77_id,
         .detect         = lm77_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /* straight from the datasheet */
@@ -245,7 +241,7 @@ static const struct attribute_group lm77_group = {
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm77_detect(struct i2c_client *new_client, int kind,
+static int lm77_detect(struct i2c_client *new_client,
                        struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = new_client->adapter;
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 5978291cebb3..cadcbd90ff3b 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -41,8 +41,7 @@ static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
                                                 0x2e, 0x2f, I2C_CLIENT_END };
 static unsigned short isa_address = 0x290;
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_2(lm78, lm79);
+enum chips { lm78, lm79 };
 
 /* Many LM78 constants specified below */
 
@@ -142,7 +141,7 @@ struct lm78_data {
 };
 
 
-static int lm78_i2c_detect(struct i2c_client *client, int kind,
+static int lm78_i2c_detect(struct i2c_client *client,
                            struct i2c_board_info *info);
 static int lm78_i2c_probe(struct i2c_client *client,
                           const struct i2c_device_id *id);
@@ -173,7 +172,7 @@ static struct i2c_driver lm78_driver = {
         .remove         = lm78_i2c_remove,
         .id_table       = lm78_i2c_id,
         .detect         = lm78_i2c_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static struct platform_driver lm78_isa_driver = {
@@ -558,7 +557,7 @@ static int lm78_alias_detect(struct i2c_client *client, u8 chipid)
         return 1;
 }
 
-static int lm78_i2c_detect(struct i2c_client *client, int kind,
+static int lm78_i2c_detect(struct i2c_client *client,
                            struct i2c_board_info *info)
 {
         int i;
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index bcffc1899403..18a0e6c5fe88 100644
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -35,9 +35,6 @@
 static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
                                                 0x2e, 0x2f, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(lm80);
-
 /* Many LM80 constants specified below */
 
 /* The LM80 registers */
@@ -133,8 +130,7 @@ struct lm80_data {
 
 static int lm80_probe(struct i2c_client *client,
                       const struct i2c_device_id *id);
-static int lm80_detect(struct i2c_client *client, int kind,
-                       struct i2c_board_info *info);
+static int lm80_detect(struct i2c_client *client, struct i2c_board_info *info);
 static void lm80_init_client(struct i2c_client *client);
 static int lm80_remove(struct i2c_client *client);
 static struct lm80_data *lm80_update_device(struct device *dev);
@@ -146,7 +142,7 @@ static int lm80_write_value(struct i2c_client *client, u8 reg, u8 value);
  */
 
 static const struct i2c_device_id lm80_id[] = {
-        { "lm80", lm80 },
+        { "lm80", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, lm80_id);
@@ -160,7 +156,7 @@ static struct i2c_driver lm80_driver = {
         .remove         = lm80_remove,
         .id_table       = lm80_id,
         .detect         = lm80_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -447,8 +443,7 @@ static const struct attribute_group lm80_group = {
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm80_detect(struct i2c_client *client, int kind,
-                       struct i2c_board_info *info)
+static int lm80_detect(struct i2c_client *client, struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
         int i, cur;
diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index 08b03e6ed0b7..8290476aee4a 100644
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -51,11 +51,7 @@
 static const unsigned short normal_i2c[] = {
         0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
 
-/*
- * Insmod parameters
- */
-
-I2C_CLIENT_INSMOD_2(lm83, lm82);
+enum chips { lm83, lm82 };
 
 /*
  * The LM83 registers
@@ -118,7 +114,7 @@ static const u8 LM83_REG_W_HIGH[] = {
  * Functions declaration
  */
 
-static int lm83_detect(struct i2c_client *new_client, int kind,
+static int lm83_detect(struct i2c_client *new_client,
                        struct i2c_board_info *info);
 static int lm83_probe(struct i2c_client *client,
                       const struct i2c_device_id *id);
@@ -145,7 +141,7 @@ static struct i2c_driver lm83_driver = {
         .remove         = lm83_remove,
         .id_table       = lm83_id,
         .detect         = lm83_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -291,7 +287,7 @@ static const struct attribute_group lm83_group_opt = {
  */
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm83_detect(struct i2c_client *new_client, int kind,
+static int lm83_detect(struct i2c_client *new_client,
                        struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = new_client->adapter;
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index d56da2e74708..b3841a615595 100644
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -38,9 +38,11 @@
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_7(lm85b, lm85c, adm1027, adt7463, adt7468, emc6d100,
-                    emc6d102);
+enum chips {
+        any_chip, lm85b, lm85c,
+        adm1027, adt7463, adt7468,
+        emc6d100, emc6d102
+};
 
 /* The LM85 registers */
 
@@ -323,8 +325,7 @@ struct lm85_data {
         struct lm85_zone zone[3];
 };
 
-static int lm85_detect(struct i2c_client *client, int kind,
-                       struct i2c_board_info *info);
+static int lm85_detect(struct i2c_client *client, struct i2c_board_info *info);
 static int lm85_probe(struct i2c_client *client,
                       const struct i2c_device_id *id);
 static int lm85_remove(struct i2c_client *client);
@@ -357,7 +358,7 @@ static struct i2c_driver lm85_driver = {
         .remove         = lm85_remove,
         .id_table       = lm85_id,
         .detect         = lm85_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 
@@ -1156,8 +1157,7 @@ static int lm85_is_fake(struct i2c_client *client)
 }
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm85_detect(struct i2c_client *client, int kind,
-                       struct i2c_board_info *info)
+static int lm85_detect(struct i2c_client *client, struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
         int address = client->addr;
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 4929b1815eee..f1e6e7512ffa 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -74,11 +74,7 @@
 
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
-/*
- * Insmod parameters
- */
-
-I2C_CLIENT_INSMOD_2(lm87, adm1024);
+enum chips { lm87, adm1024 };
 
 /*
  * The LM87 registers
@@ -158,7 +154,7 @@ static u8 LM87_REG_TEMP_LOW[3] = { 0x3A, 0x38, 0x2C };
 
 static int lm87_probe(struct i2c_client *client,
                       const struct i2c_device_id *id);
-static int lm87_detect(struct i2c_client *new_client, int kind,
+static int lm87_detect(struct i2c_client *new_client,
                        struct i2c_board_info *info);
 static void lm87_init_client(struct i2c_client *client);
 static int lm87_remove(struct i2c_client *client);
@@ -184,7 +180,7 @@ static struct i2c_driver lm87_driver = {
         .remove         = lm87_remove,
         .id_table       = lm87_id,
         .detect         = lm87_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -662,7 +658,7 @@ static const struct attribute_group lm87_group_opt = {
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm87_detect(struct i2c_client *new_client, int kind,
+static int lm87_detect(struct i2c_client *new_client,
                        struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = new_client->adapter;
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index b7c905f50ed4..7c9bdc167426 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -93,12 +93,7 @@
 static const unsigned short normal_i2c[] = {
         0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
 
-/*
- * Insmod parameters
- */
-
-I2C_CLIENT_INSMOD_8(lm90, adm1032, lm99, lm86, max6657, adt7461, max6680,
-                    max6646);
+enum chips { lm90, adm1032, lm99, lm86, max6657, adt7461, max6680, max6646 };
 
 /*
  * The LM90 registers
@@ -152,8 +147,7 @@ I2C_CLIENT_INSMOD_8(lm90, adm1032, lm99, lm86, max6657, adt7461, max6680,
  * Functions declaration
  */
 
-static int lm90_detect(struct i2c_client *client, int kind,
-                       struct i2c_board_info *info);
+static int lm90_detect(struct i2c_client *client, struct i2c_board_info *info);
 static int lm90_probe(struct i2c_client *client,
                       const struct i2c_device_id *id);
 static void lm90_init_client(struct i2c_client *client);
@@ -192,7 +186,7 @@ static struct i2c_driver lm90_driver = {
         .remove         = lm90_remove,
         .id_table       = lm90_id,
         .detect         = lm90_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -656,7 +650,7 @@ static int lm90_read_reg(struct i2c_client* client, u8 reg, u8 *value)
 }
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm90_detect(struct i2c_client *new_client, int kind,
+static int lm90_detect(struct i2c_client *new_client,
                        struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = new_client->adapter;
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index 47ac698709dc..7c31e6205f85 100644
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -54,9 +54,6 @@
 static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
                                                 I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(lm92);
-
 /* The LM92 registers */
 #define LM92_REG_CONFIG                 0x01 /* 8-bit, RW */
 #define LM92_REG_TEMP                   0x00 /* 16-bit, RO */
@@ -319,7 +316,7 @@ static const struct attribute_group lm92_group = {
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm92_detect(struct i2c_client *new_client, int kind,
+static int lm92_detect(struct i2c_client *new_client,
                        struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = new_client->adapter;
@@ -401,7 +398,7 @@ static int lm92_remove(struct i2c_client *client)
  */
 
 static const struct i2c_device_id lm92_id[] = {
-        { "lm92", lm92 },
+        { "lm92", 0 },
         /* max6635 could be added here */
         { }
 };
@@ -416,7 +413,7 @@ static struct i2c_driver lm92_driver = {
         .remove         = lm92_remove,
         .id_table       = lm92_id,
         .detect         = lm92_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static int __init sensors_lm92_init(void)
diff --git a/drivers/hwmon/lm93.c b/drivers/hwmon/lm93.c
index 124dd7cea54c..6669255aadcf 100644
--- a/drivers/hwmon/lm93.c
+++ b/drivers/hwmon/lm93.c
@@ -145,7 +145,6 @@
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
 /* Insmod parameters */
-I2C_CLIENT_INSMOD_1(lm93);
 
 static int disable_block;
 module_param(disable_block, bool, 0);
@@ -2501,8 +2500,7 @@ static void lm93_init_client(struct i2c_client *client)
 }
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm93_detect(struct i2c_client *client, int kind,
-                       struct i2c_board_info *info)
+static int lm93_detect(struct i2c_client *client, struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
         int mfr, ver;
@@ -2603,7 +2601,7 @@ static int lm93_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id lm93_id[] = {
-        { "lm93", lm93 },
+        { "lm93", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, lm93_id);
@@ -2617,7 +2615,7 @@ static struct i2c_driver lm93_driver = {
         .remove         = lm93_remove,
         .id_table       = lm93_id,
         .detect         = lm93_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static int __init lm93_init(void)
diff --git a/drivers/hwmon/lm95241.c b/drivers/hwmon/lm95241.c
index 906b896cf1d0..8fc8eb8cba47 100644
--- a/drivers/hwmon/lm95241.c
+++ b/drivers/hwmon/lm95241.c
@@ -39,9 +39,6 @@
 static const unsigned short normal_i2c[] = {
         0x19, 0x2a, 0x2b, I2C_CLIENT_END};
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(lm95241);
-
 /* LM95241 registers */
 #define LM95241_REG_R_MAN_ID            0xFE
 #define LM95241_REG_R_CHIP_ID           0xFF
@@ -310,7 +307,7 @@ static const struct attribute_group lm95241_group = {
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int lm95241_detect(struct i2c_client *new_client, int kind,
+static int lm95241_detect(struct i2c_client *new_client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = new_client->adapter;
@@ -446,7 +443,7 @@ static struct lm95241_data *lm95241_update_device(struct device *dev)
 
 /* Driver data (common to all clients) */
 static const struct i2c_device_id lm95241_id[] = {
-        { "lm95241", lm95241 },
+        { "lm95241", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, lm95241_id);
@@ -460,7 +457,7 @@ static struct i2c_driver lm95241_driver = {
         .remove         = lm95241_remove,
         .id_table       = lm95241_id,
         .detect         = lm95241_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static int __init sensors_lm95241_init(void)
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 7fcf5ff89e7f..022ded098100 100644
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -41,12 +41,6 @@ static const unsigned short normal_i2c[] = {
         0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
 
 /*
- * Insmod parameters
- */
-
-I2C_CLIENT_INSMOD_1(max1619);
-
-/*
  * The MAX1619 registers
  */
 
@@ -88,7 +82,7 @@ static int temp_to_reg(int val)
 
 static int max1619_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int max1619_detect(struct i2c_client *client, int kind,
+static int max1619_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static void max1619_init_client(struct i2c_client *client);
 static int max1619_remove(struct i2c_client *client);
@@ -99,7 +93,7 @@ static struct max1619_data *max1619_update_device(struct device *dev);
  */
 
 static const struct i2c_device_id max1619_id[] = {
-        { "max1619", max1619 },
+        { "max1619", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, max1619_id);
@@ -113,7 +107,7 @@ static struct i2c_driver max1619_driver = {
         .remove         = max1619_remove,
         .id_table       = max1619_id,
         .detect         = max1619_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -226,7 +220,7 @@ static const struct attribute_group max1619_group = {
  */
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int max1619_detect(struct i2c_client *client, int kind,
+static int max1619_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c
index 1da561e0cb37..a0160ee5caef 100644
--- a/drivers/hwmon/max6650.c
+++ b/drivers/hwmon/max6650.c
@@ -62,8 +62,6 @@ module_param(fan_voltage, int, S_IRUGO);
 module_param(prescaler, int, S_IRUGO);
 module_param(clock, int, S_IRUGO);
 
-I2C_CLIENT_INSMOD_1(max6650);
-
 /*
  * MAX 6650/6651 registers
  */
@@ -116,7 +114,7 @@ I2C_CLIENT_INSMOD_1(max6650);
 
 static int max6650_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int max6650_detect(struct i2c_client *client, int kind,
+static int max6650_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static int max6650_init_client(struct i2c_client *client);
 static int max6650_remove(struct i2c_client *client);
@@ -127,7 +125,7 @@ static struct max6650_data *max6650_update_device(struct device *dev);
  */
 
 static const struct i2c_device_id max6650_id[] = {
-        { "max6650", max6650 },
+        { "max6650", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, max6650_id);
@@ -141,7 +139,7 @@ static struct i2c_driver max6650_driver = {
         .remove         = max6650_remove,
         .id_table       = max6650_id,
         .detect         = max6650_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -528,7 +526,7 @@ static struct attribute_group max6650_attr_grp = {
  */
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int max6650_detect(struct i2c_client *client, int kind,
+static int max6650_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/pcf8591.c b/drivers/hwmon/pcf8591.c
index 1d7ffebd679d..d44787949851 100644
--- a/drivers/hwmon/pcf8591.c
+++ b/drivers/hwmon/pcf8591.c
@@ -29,7 +29,6 @@ static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                         0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
 
 /* Insmod parameters */
-I2C_CLIENT_INSMOD_1(pcf8591);
 
 static int input_mode;
 module_param(input_mode, int, 0);
@@ -169,7 +168,7 @@ static const struct attribute_group pcf8591_attr_group_opt = {
  */
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int pcf8591_detect(struct i2c_client *client, int kind,
+static int pcf8591_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
@@ -299,7 +298,7 @@ static struct i2c_driver pcf8591_driver = {
 
         .class          = I2C_CLASS_HWMON,      /* Nearest choice */
         .detect         = pcf8591_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static int __init pcf8591_init(void)
diff --git a/drivers/hwmon/smsc47m192.c b/drivers/hwmon/smsc47m192.c
index 4d88c045781c..40b26673d87f 100644
--- a/drivers/hwmon/smsc47m192.c
+++ b/drivers/hwmon/smsc47m192.c
@@ -36,9 +36,6 @@
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(smsc47m192);
-
 /* SMSC47M192 registers */
 #define SMSC47M192_REG_IN(nr)           ((nr)<6 ? (0x20 + (nr)) : \
                                         (0x50 + (nr) - 6))
@@ -115,13 +112,13 @@ struct smsc47m192_data {
 
 static int smsc47m192_probe(struct i2c_client *client,
                             const struct i2c_device_id *id);
-static int smsc47m192_detect(struct i2c_client *client, int kind,
+static int smsc47m192_detect(struct i2c_client *client,
                              struct i2c_board_info *info);
 static int smsc47m192_remove(struct i2c_client *client);
 static struct smsc47m192_data *smsc47m192_update_device(struct device *dev);
 
 static const struct i2c_device_id smsc47m192_id[] = {
-        { "smsc47m192", smsc47m192 },
+        { "smsc47m192", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, smsc47m192_id);
@@ -135,7 +132,7 @@ static struct i2c_driver smsc47m192_driver = {
         .remove         = smsc47m192_remove,
         .id_table       = smsc47m192_id,
         .detect         = smsc47m192_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /* Voltages */
@@ -481,7 +478,7 @@ static void smsc47m192_init_client(struct i2c_client *client)
 }
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int smsc47m192_detect(struct i2c_client *client, int kind,
+static int smsc47m192_detect(struct i2c_client *client,
                              struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/thmc50.c b/drivers/hwmon/thmc50.c
index 4b793849c738..7dfb4dec4c5f 100644
--- a/drivers/hwmon/thmc50.c
+++ b/drivers/hwmon/thmc50.c
@@ -35,7 +35,7 @@ MODULE_LICENSE("GPL");
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
 /* Insmod parameters */
-I2C_CLIENT_INSMOD_2(thmc50, adm1022);
+enum chips { thmc50, adm1022 };
 
 static unsigned short adm1022_temp3[16];
 static unsigned int adm1022_temp3_num;
@@ -84,7 +84,7 @@ struct thmc50_data {
         u8 alarms;
 };
 
-static int thmc50_detect(struct i2c_client *client, int kind,
+static int thmc50_detect(struct i2c_client *client,
                          struct i2c_board_info *info);
 static int thmc50_probe(struct i2c_client *client,
                         const struct i2c_device_id *id);
@@ -108,7 +108,7 @@ static struct i2c_driver thmc50_driver = {
         .remove = thmc50_remove,
         .id_table = thmc50_id,
         .detect = thmc50_detect,
-        .address_data = &addr_data,
+        .address_list = normal_i2c,
 };
 
 static ssize_t show_analog_out(struct device *dev,
@@ -286,7 +286,7 @@ static const struct attribute_group temp3_group = {
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int thmc50_detect(struct i2c_client *client, int kind,
+static int thmc50_detect(struct i2c_client *client,
                          struct i2c_board_info *info)
 {
         unsigned company;
diff --git a/drivers/hwmon/tmp401.c b/drivers/hwmon/tmp401.c
index ee9673467c4a..a13b30e8d8d8 100644
--- a/drivers/hwmon/tmp401.c
+++ b/drivers/hwmon/tmp401.c
@@ -42,8 +42,7 @@
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_2(tmp401, tmp411);
+enum chips { tmp401, tmp411 };
 
 /*
  * The TMP401 registers, note some registers have different addresses for
@@ -98,7 +97,7 @@ static const u8 TMP411_TEMP_HIGHEST_LSB[2]		= { 0x33, 0x37 };
 
 static int tmp401_probe(struct i2c_client *client,
                         const struct i2c_device_id *id);
-static int tmp401_detect(struct i2c_client *client, int kind,
+static int tmp401_detect(struct i2c_client *client,
                          struct i2c_board_info *info);
 static int tmp401_remove(struct i2c_client *client);
 static struct tmp401_data *tmp401_update_device(struct device *dev);
@@ -123,7 +122,7 @@ static struct i2c_driver tmp401_driver = {
         .remove         = tmp401_remove,
         .id_table       = tmp401_id,
         .detect         = tmp401_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -488,7 +487,7 @@ static void tmp401_init_client(struct i2c_client *client)
                 i2c_smbus_write_byte_data(client, TMP401_CONFIG_WRITE, config);
 }
 
-static int tmp401_detect(struct i2c_client *client, int _kind,
+static int tmp401_detect(struct i2c_client *client,
                          struct i2c_board_info *info)
 {
         enum chips kind;
diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c
index bb5464a289ca..4f7c051e2d7b 100644
--- a/drivers/hwmon/tmp421.c
+++ b/drivers/hwmon/tmp421.c
@@ -39,8 +39,7 @@
 static unsigned short normal_i2c[] = { 0x2a, 0x4c, 0x4d, 0x4e, 0x4f,
                                        I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_3(tmp421, tmp422, tmp423);
+enum chips { tmp421, tmp422, tmp423 };
 
 /* The TMP421 registers */
 #define TMP421_CONFIG_REG_1                     0x09
@@ -223,7 +222,7 @@ static int tmp421_init_client(struct i2c_client *client)
         return 0;
 }
 
-static int tmp421_detect(struct i2c_client *client, int _kind,
+static int tmp421_detect(struct i2c_client *client,
                          struct i2c_board_info *info)
 {
         enum chips kind;
@@ -322,7 +321,7 @@ static struct i2c_driver tmp421_driver = {
         .remove = tmp421_remove,
         .id_table = tmp421_id,
         .detect = tmp421_detect,
-        .address_data = &addr_data,
+        .address_list = normal_i2c,
 };
 
 static int __init tmp421_init(void)
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index bb5e78748783..0dcaba9b7189 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -5,6 +5,7 @@
     Copyright (C) 2006  Yuan Mu (Winbond),
                         Rudolf Marek <r.marek@assembler.cz>
                         David Hubbard <david.c.hubbard@gmail.com>
+                        Daniel J Blueman <daniel.blueman@gmail.com>
 
     Shamelessly ripped from the w83627hf driver
     Copyright (C) 2003  Mark Studebaker
@@ -177,12 +178,15 @@ static const u16 W83627EHF_REG_TEMP_CONFIG[] = { 0x152, 0x252 };
 #define W83627EHF_REG_ALARM3            0x45B
 
 /* SmartFan registers */
+#define W83627EHF_REG_FAN_STEPUP_TIME 0x0f
+#define W83627EHF_REG_FAN_STEPDOWN_TIME 0x0e
+
 /* DC or PWM output fan configuration */
 static const u8 W83627EHF_REG_PWM_ENABLE[] = {
         0x04,                   /* SYS FAN0 output mode and PWM mode */
         0x04,                   /* CPU FAN0 output mode and PWM mode */
         0x12,                   /* AUX FAN mode */
-        0x62,                   /* CPU fan1 mode */
+        0x62,                   /* CPU FAN1 mode */
 };
 
 static const u8 W83627EHF_PWM_MODE_SHIFT[] = { 0, 1, 0, 6 };
@@ -193,10 +197,12 @@ static const u8 W83627EHF_REG_PWM[] = { 0x01, 0x03, 0x11, 0x61 };
 static const u8 W83627EHF_REG_TARGET[] = { 0x05, 0x06, 0x13, 0x63 };
 static const u8 W83627EHF_REG_TOLERANCE[] = { 0x07, 0x07, 0x14, 0x62 };
 
-
 /* Advanced Fan control, some values are common for all fans */
-static const u8 W83627EHF_REG_FAN_MIN_OUTPUT[] = { 0x08, 0x09, 0x15, 0x64 };
-static const u8 W83627EHF_REG_FAN_STOP_TIME[] = { 0x0C, 0x0D, 0x17, 0x66 };
+static const u8 W83627EHF_REG_FAN_START_OUTPUT[] = { 0x0a, 0x0b, 0x16, 0x65 };
+static const u8 W83627EHF_REG_FAN_STOP_OUTPUT[] = { 0x08, 0x09, 0x15, 0x64 };
+static const u8 W83627EHF_REG_FAN_STOP_TIME[] = { 0x0c, 0x0d, 0x17, 0x66 };
+static const u8 W83627EHF_REG_FAN_MAX_OUTPUT[] = { 0xff, 0x67, 0xff, 0x69 };
+static const u8 W83627EHF_REG_FAN_STEP_OUTPUT[] = { 0xff, 0x68, 0xff, 0x6a };
 
 /*
  * Conversions
@@ -295,14 +301,19 @@ struct w83627ehf_data {
 
         u8 pwm_mode[4]; /* 0->DC variable voltage, 1->PWM variable duty cycle */
         u8 pwm_enable[4]; /* 1->manual
-                             2->thermal cruise (also called SmartFan I) */
+                             2->thermal cruise mode (also called SmartFan I)
+                             3->fan speed cruise mode
+                             4->variable thermal cruise (also called SmartFan III) */
         u8 pwm_num;             /* number of pwm */
         u8 pwm[4];
         u8 target_temp[4];
         u8 tolerance[4];
 
-        u8 fan_min_output[4]; /* minimum fan speed */
-        u8 fan_stop_time[4];
+        u8 fan_start_output[4]; /* minimum fan speed when spinning up */
+        u8 fan_stop_output[4]; /* minimum fan speed when spinning down */
+        u8 fan_stop_time[4]; /* time at minimum before disabling fan */
+        u8 fan_max_output[4]; /* maximum fan speed */
+        u8 fan_step_output[4]; /* rate of change output value */
 
         u8 vid;
         u8 vrm;
@@ -529,8 +540,10 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
                                                 & 3) + 1;
                         data->pwm[i] = w83627ehf_read_value(data,
                                                 W83627EHF_REG_PWM[i]);
-                        data->fan_min_output[i] = w83627ehf_read_value(data,
-                                                W83627EHF_REG_FAN_MIN_OUTPUT[i]);
+                        data->fan_start_output[i] = w83627ehf_read_value(data,
+                                                W83627EHF_REG_FAN_START_OUTPUT[i]);
+                        data->fan_stop_output[i] = w83627ehf_read_value(data,
+                                                W83627EHF_REG_FAN_STOP_OUTPUT[i]);
                         data->fan_stop_time[i] = w83627ehf_read_value(data,
                                                 W83627EHF_REG_FAN_STOP_TIME[i]);
                         data->target_temp[i] =
@@ -976,7 +989,7 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr,
         u32 val = simple_strtoul(buf, NULL, 10);
         u16 reg;
 
-        if (!val || (val > 2))  /* only modes 1 and 2 are supported */
+        if (!val || (val > 4))
                 return -EINVAL;
         mutex_lock(&data->update_lock);
         reg = w83627ehf_read_value(data, W83627EHF_REG_PWM_ENABLE[nr]);
@@ -1118,7 +1131,10 @@ store_##reg(struct device *dev, struct device_attribute *attr, \
         return count; \
 }
 
-fan_functions(fan_min_output, FAN_MIN_OUTPUT)
+fan_functions(fan_start_output, FAN_START_OUTPUT)
+fan_functions(fan_stop_output, FAN_STOP_OUTPUT)
+fan_functions(fan_max_output, FAN_MAX_OUTPUT)
+fan_functions(fan_step_output, FAN_STEP_OUTPUT)
 
 #define fan_time_functions(reg, REG) \
 static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \
@@ -1161,8 +1177,14 @@ static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
 static struct sensor_device_attribute sda_sf3_arrays_fan4[] = {
         SENSOR_ATTR(pwm4_stop_time, S_IWUSR | S_IRUGO, show_fan_stop_time,
                     store_fan_stop_time, 3),
-        SENSOR_ATTR(pwm4_min_output, S_IWUSR | S_IRUGO, show_fan_min_output,
-                    store_fan_min_output, 3),
+        SENSOR_ATTR(pwm4_start_output, S_IWUSR | S_IRUGO, show_fan_start_output,
+                    store_fan_start_output, 3),
+        SENSOR_ATTR(pwm4_stop_output, S_IWUSR | S_IRUGO, show_fan_stop_output,
+                    store_fan_stop_output, 3),
+        SENSOR_ATTR(pwm4_max_output, S_IWUSR | S_IRUGO, show_fan_max_output,
+                    store_fan_max_output, 3),
+        SENSOR_ATTR(pwm4_step_output, S_IWUSR | S_IRUGO, show_fan_step_output,
+                    store_fan_step_output, 3),
 };
 
 static struct sensor_device_attribute sda_sf3_arrays[] = {
@@ -1172,12 +1194,24 @@ static struct sensor_device_attribute sda_sf3_arrays[] = {
                     store_fan_stop_time, 1),
         SENSOR_ATTR(pwm3_stop_time, S_IWUSR | S_IRUGO, show_fan_stop_time,
                     store_fan_stop_time, 2),
-        SENSOR_ATTR(pwm1_min_output, S_IWUSR | S_IRUGO, show_fan_min_output,
-                    store_fan_min_output, 0),
-        SENSOR_ATTR(pwm2_min_output, S_IWUSR | S_IRUGO, show_fan_min_output,
-                    store_fan_min_output, 1),
-        SENSOR_ATTR(pwm3_min_output, S_IWUSR | S_IRUGO, show_fan_min_output,
-                    store_fan_min_output, 2),
+        SENSOR_ATTR(pwm1_start_output, S_IWUSR | S_IRUGO, show_fan_start_output,
+                    store_fan_start_output, 0),
+        SENSOR_ATTR(pwm2_start_output, S_IWUSR | S_IRUGO, show_fan_start_output,
+                    store_fan_start_output, 1),
+        SENSOR_ATTR(pwm3_start_output, S_IWUSR | S_IRUGO, show_fan_start_output,
+                    store_fan_start_output, 2),
+        SENSOR_ATTR(pwm1_stop_output, S_IWUSR | S_IRUGO, show_fan_stop_output,
+                    store_fan_stop_output, 0),
+        SENSOR_ATTR(pwm2_stop_output, S_IWUSR | S_IRUGO, show_fan_stop_output,
+                    store_fan_stop_output, 1),
+        SENSOR_ATTR(pwm3_stop_output, S_IWUSR | S_IRUGO, show_fan_stop_output,
+                    store_fan_stop_output, 2),
+
+        /* pwm1 and pwm3 don't support max and step settings */
+        SENSOR_ATTR(pwm2_max_output, S_IWUSR | S_IRUGO, show_fan_max_output,
+                    store_fan_max_output, 1),
+        SENSOR_ATTR(pwm2_step_output, S_IWUSR | S_IRUGO, show_fan_step_output,
+                    store_fan_step_output, 1),
 };
 
 static ssize_t
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 7ab7967da0a0..05f9225b6f94 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -56,9 +56,10 @@
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
                                                 0x2e, 0x2f, I2C_CLIENT_END };
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_4(w83781d, w83782d, w83783s, as99127f);
 
+enum chips { w83781d, w83782d, w83783s, as99127f };
+
+/* Insmod parameters */
 static unsigned short force_subclients[4];
 module_param_array(force_subclients, short, NULL, 0);
 MODULE_PARM_DESC(force_subclients, "List of subclient addresses: "
@@ -1051,8 +1052,7 @@ w83781d_create_files(struct device *dev, int kind, int is_isa)
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
 static int
-w83781d_detect(struct i2c_client *client, int kind,
-               struct i2c_board_info *info)
+w83781d_detect(struct i2c_client *client, struct i2c_board_info *info)
 {
         int val1, val2;
         struct w83781d_data *isa = w83781d_data_if_isa();
@@ -1537,7 +1537,7 @@ static struct i2c_driver w83781d_driver = {
         .remove         = w83781d_remove,
         .id_table       = w83781d_ids,
         .detect         = w83781d_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
index 0410bf12c521..400a88bde278 100644
--- a/drivers/hwmon/w83791d.c
+++ b/drivers/hwmon/w83791d.c
@@ -52,7 +52,6 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
                                                 I2C_CLIENT_END };
 
 /* Insmod parameters */
-I2C_CLIENT_INSMOD_1(w83791d);
 
 static unsigned short force_subclients[4];
 module_param_array(force_subclients, short, NULL, 0);
@@ -326,7 +325,7 @@ struct w83791d_data {
 
 static int w83791d_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int w83791d_detect(struct i2c_client *client, int kind,
+static int w83791d_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static int w83791d_remove(struct i2c_client *client);
 
@@ -341,7 +340,7 @@ static void w83791d_print_debug(struct w83791d_data *data, struct device *dev);
 static void w83791d_init_client(struct i2c_client *client);
 
 static const struct i2c_device_id w83791d_id[] = {
-        { "w83791d", w83791d },
+        { "w83791d", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, w83791d_id);
@@ -355,7 +354,7 @@ static struct i2c_driver w83791d_driver = {
         .remove         = w83791d_remove,
         .id_table       = w83791d_id,
         .detect         = w83791d_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /* following are the sysfs callback functions */
@@ -1259,7 +1258,7 @@ error_sc_0:
 
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int w83791d_detect(struct i2c_client *client, int kind,
+static int w83791d_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index 38978851333f..679718e6b017 100644
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -50,7 +50,6 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
                                                 I2C_CLIENT_END };
 
 /* Insmod parameters */
-I2C_CLIENT_INSMOD_1(w83792d);
 
 static unsigned short force_subclients[4];
 module_param_array(force_subclients, short, NULL, 0);
@@ -302,7 +301,7 @@ struct w83792d_data {
 
 static int w83792d_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int w83792d_detect(struct i2c_client *client, int kind,
+static int w83792d_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static int w83792d_remove(struct i2c_client *client);
 static struct w83792d_data *w83792d_update_device(struct device *dev);
@@ -314,7 +313,7 @@ static void w83792d_print_debug(struct w83792d_data *data, struct device *dev);
 static void w83792d_init_client(struct i2c_client *client);
 
 static const struct i2c_device_id w83792d_id[] = {
-        { "w83792d", w83792d },
+        { "w83792d", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, w83792d_id);
@@ -328,7 +327,7 @@ static struct i2c_driver w83792d_driver = {
         .remove         = w83792d_remove,
         .id_table       = w83792d_id,
         .detect         = w83792d_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static inline long in_count_from_reg(int nr, struct w83792d_data *data)
@@ -1263,7 +1262,7 @@ static const struct attribute_group w83792d_group = {
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
 static int
-w83792d_detect(struct i2c_client *client, int kind, struct i2c_board_info *info)
+w83792d_detect(struct i2c_client *client, struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
         int val1, val2;
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
index 80a2191bf127..9a2022b67495 100644
--- a/drivers/hwmon/w83793.c
+++ b/drivers/hwmon/w83793.c
@@ -41,7 +41,6 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
                                                 I2C_CLIENT_END };
 
 /* Insmod parameters */
-I2C_CLIENT_INSMOD_1(w83793);
 
 static unsigned short force_subclients[4];
 module_param_array(force_subclients, short, NULL, 0);
@@ -230,7 +229,7 @@ static u8 w83793_read_value(struct i2c_client *client, u16 reg);
 static int w83793_write_value(struct i2c_client *client, u16 reg, u8 value);
 static int w83793_probe(struct i2c_client *client,
                         const struct i2c_device_id *id);
-static int w83793_detect(struct i2c_client *client, int kind,
+static int w83793_detect(struct i2c_client *client,
                          struct i2c_board_info *info);
 static int w83793_remove(struct i2c_client *client);
 static void w83793_init_client(struct i2c_client *client);
@@ -238,7 +237,7 @@ static void w83793_update_nonvolatile(struct device *dev);
 static struct w83793_data *w83793_update_device(struct device *dev);
 
 static const struct i2c_device_id w83793_id[] = {
-        { "w83793", w83793 },
+        { "w83793", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, w83793_id);
@@ -252,7 +251,7 @@ static struct i2c_driver w83793_driver = {
         .remove         = w83793_remove,
         .id_table       = w83793_id,
         .detect         = w83793_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static ssize_t
@@ -1161,7 +1160,7 @@ ERROR_SC_0:
 }
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int w83793_detect(struct i2c_client *client, int kind,
+static int w83793_detect(struct i2c_client *client,
                          struct i2c_board_info *info)
 {
         u8 tmp, bank, chip_id;
diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 9b6c4c10fba7..20781def65ed 100644
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -52,12 +52,6 @@
 static const unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END };
 
 /*
- * Insmod parameters
- */
-
-I2C_CLIENT_INSMOD_1(w83l785ts);
-
-/*
  * The W83L785TS-S registers
  * Manufacturer ID is 0x5CA3 for Winbond.
  */
@@ -83,7 +77,7 @@ I2C_CLIENT_INSMOD_1(w83l785ts);
 
 static int w83l785ts_probe(struct i2c_client *client,
                            const struct i2c_device_id *id);
-static int w83l785ts_detect(struct i2c_client *client, int kind,
+static int w83l785ts_detect(struct i2c_client *client,
                             struct i2c_board_info *info);
 static int w83l785ts_remove(struct i2c_client *client);
 static u8 w83l785ts_read_value(struct i2c_client *client, u8 reg, u8 defval);
@@ -94,7 +88,7 @@ static struct w83l785ts_data *w83l785ts_update_device(struct device *dev);
  */
  
 static const struct i2c_device_id w83l785ts_id[] = {
-        { "w83l785ts", w83l785ts },
+        { "w83l785ts", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, w83l785ts_id);
@@ -108,7 +102,7 @@ static struct i2c_driver w83l785ts_driver = {
         .remove         = w83l785ts_remove,
         .id_table       = w83l785ts_id,
         .detect         = w83l785ts_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 /*
@@ -146,7 +140,7 @@ static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO, show_temp, NULL, 1);
  */
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int w83l785ts_detect(struct i2c_client *client, int kind,
+static int w83l785ts_detect(struct i2c_client *client,
                             struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/hwmon/w83l786ng.c b/drivers/hwmon/w83l786ng.c
index 27da7d2b15fb..0254e181893d 100644
--- a/drivers/hwmon/w83l786ng.c
+++ b/drivers/hwmon/w83l786ng.c
@@ -38,7 +38,6 @@
 static const unsigned short normal_i2c[] = { 0x2e, 0x2f, I2C_CLIENT_END };
 
 /* Insmod parameters */
-I2C_CLIENT_INSMOD_1(w83l786ng);
 
 static int reset;
 module_param(reset, bool, 0);
@@ -147,14 +146,14 @@ struct w83l786ng_data {
 
 static int w83l786ng_probe(struct i2c_client *client,
                            const struct i2c_device_id *id);
-static int w83l786ng_detect(struct i2c_client *client, int kind,
+static int w83l786ng_detect(struct i2c_client *client,
                             struct i2c_board_info *info);
 static int w83l786ng_remove(struct i2c_client *client);
 static void w83l786ng_init_client(struct i2c_client *client);
 static struct w83l786ng_data *w83l786ng_update_device(struct device *dev);
 
 static const struct i2c_device_id w83l786ng_id[] = {
-        { "w83l786ng", w83l786ng },
+        { "w83l786ng", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, w83l786ng_id);
@@ -168,7 +167,7 @@ static struct i2c_driver w83l786ng_driver = {
         .remove         = w83l786ng_remove,
         .id_table       = w83l786ng_id,
         .detect         = w83l786ng_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static u8
@@ -586,8 +585,7 @@ static const struct attribute_group w83l786ng_group = {
 };
 
 static int
-w83l786ng_detect(struct i2c_client *client, int kind,
-                 struct i2c_board_info *info)
+w83l786ng_detect(struct i2c_client *client, struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
         u16 man_id;
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 049555777f67..7647a20523a0 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1155,7 +1155,7 @@ static int i2c_pxa_resume_noirq(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops i2c_pxa_dev_pm_ops = {
+static const struct dev_pm_ops i2c_pxa_dev_pm_ops = {
         .suspend_noirq = i2c_pxa_suspend_noirq,
         .resume_noirq = i2c_pxa_resume_noirq,
 };
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 96aafb91b69a..1d8c98613fa0 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -967,7 +967,7 @@ static int s3c24xx_i2c_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = {
+static const struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = {
         .suspend_noirq = s3c24xx_i2c_suspend_noirq,
         .resume = s3c24xx_i2c_resume,
 };
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 86a9d4e81472..ccc46418ef7f 100644
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -647,7 +647,7 @@ static int sh_mobile_i2c_runtime_nop(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops sh_mobile_i2c_dev_pm_ops = {
+static const struct dev_pm_ops sh_mobile_i2c_dev_pm_ops = {
         .runtime_suspend = sh_mobile_i2c_runtime_nop,
         .runtime_resume = sh_mobile_i2c_runtime_nop,
 };
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 4f34823e86b1..0ac2f90ab840 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -155,6 +155,35 @@ static void i2c_device_shutdown(struct device *dev)
                 driver->shutdown(client);
 }
 
+#ifdef CONFIG_SUSPEND
+static int i2c_device_pm_suspend(struct device *dev)
+{
+        const struct dev_pm_ops *pm;
+
+        if (!dev->driver)
+                return 0;
+        pm = dev->driver->pm;
+        if (!pm || !pm->suspend)
+                return 0;
+        return pm->suspend(dev);
+}
+
+static int i2c_device_pm_resume(struct device *dev)
+{
+        const struct dev_pm_ops *pm;
+
+        if (!dev->driver)
+                return 0;
+        pm = dev->driver->pm;
+        if (!pm || !pm->resume)
+                return 0;
+        return pm->resume(dev);
+}
+#else
+#define i2c_device_pm_suspend   NULL
+#define i2c_device_pm_resume    NULL
+#endif
+
 static int i2c_device_suspend(struct device *dev, pm_message_t mesg)
 {
         struct i2c_client *client = i2c_verify_client(dev);
@@ -219,6 +248,11 @@ static const struct attribute_group *i2c_dev_attr_groups[] = {
         NULL
 };
 
+const static struct dev_pm_ops i2c_device_pm_ops = {
+        .suspend = i2c_device_pm_suspend,
+        .resume = i2c_device_pm_resume,
+};
+
 struct bus_type i2c_bus_type = {
         .name           = "i2c",
         .match          = i2c_device_match,
@@ -227,6 +261,7 @@ struct bus_type i2c_bus_type = {
         .shutdown       = i2c_device_shutdown,
         .suspend        = i2c_device_suspend,
         .resume         = i2c_device_resume,
+        .pm             = &i2c_device_pm_ops,
 };
 EXPORT_SYMBOL_GPL(i2c_bus_type);
 
@@ -1184,7 +1219,7 @@ static int i2c_detect_address(struct i2c_client *temp_client,
         /* Finally call the custom detection function */
         memset(&info, 0, sizeof(struct i2c_board_info));
         info.addr = addr;
-        err = driver->detect(temp_client, -1, &info);
+        err = driver->detect(temp_client, &info);
         if (err) {
                 /* -ENODEV is returned if the detection fails. We catch it
                    here as this isn't an error. */
@@ -1214,13 +1249,13 @@ static int i2c_detect_address(struct i2c_client *temp_client,
 
 static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
 {
-        const struct i2c_client_address_data *address_data;
+        const unsigned short *address_list;
         struct i2c_client *temp_client;
         int i, err = 0;
         int adap_id = i2c_adapter_id(adapter);
 
-        address_data = driver->address_data;
-        if (!driver->detect || !address_data)
+        address_list = driver->address_list;
+        if (!driver->detect || !address_list)
                 return 0;
 
         /* Set up a temporary client to help detect callback */
@@ -1235,7 +1270,7 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
 
         /* Stop here if we can't use SMBUS_QUICK */
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) {
-                if (address_data->normal_i2c[0] == I2C_CLIENT_END)
+                if (address_list[0] == I2C_CLIENT_END)
                         goto exit_free;
 
                 dev_warn(&adapter->dev, "SMBus Quick command not supported, "
@@ -1244,11 +1279,10 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
                 goto exit_free;
         }
 
-        for (i = 0; address_data->normal_i2c[i] != I2C_CLIENT_END; i += 1) {
+        for (i = 0; address_list[i] != I2C_CLIENT_END; i += 1) {
                 dev_dbg(&adapter->dev, "found normal entry for adapter %d, "
-                        "addr 0x%02x\n", adap_id,
-                        address_data->normal_i2c[i]);
-                temp_client->addr = address_data->normal_i2c[i];
+                        "addr 0x%02x\n", adap_id, address_list[i]);
+                temp_client->addr = address_list[i];
                 err = i2c_detect_address(temp_client, driver);
                 if (err)
                         goto exit_free;
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index bd07803e9183..abbb06996f9e 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -36,7 +36,6 @@
 #include <linux/mutex.h>
 #include <linux/inetdevice.h>
 #include <linux/workqueue.h>
-#include <linux/if_arp.h>
 #include <net/arp.h>
 #include <net/neighbour.h>
 #include <net/route.h>
@@ -92,22 +91,12 @@ EXPORT_SYMBOL(rdma_addr_unregister_client);
 int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct net_device *dev,
                      const unsigned char *dst_dev_addr)
 {
-        switch (dev->type) {
-        case ARPHRD_INFINIBAND:
-                dev_addr->dev_type = RDMA_NODE_IB_CA;
-                break;
-        case ARPHRD_ETHER:
-                dev_addr->dev_type = RDMA_NODE_RNIC;
-                break;
-        default:
-                return -EADDRNOTAVAIL;
-        }
-
+        dev_addr->dev_type = dev->type;
         memcpy(dev_addr->src_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
         memcpy(dev_addr->broadcast, dev->broadcast, MAX_ADDR_LEN);
         if (dst_dev_addr)
                 memcpy(dev_addr->dst_dev_addr, dst_dev_addr, MAX_ADDR_LEN);
-        dev_addr->src_dev = dev;
+        dev_addr->bound_dev_if = dev->ifindex;
         return 0;
 }
 EXPORT_SYMBOL(rdma_copy_addr);
@@ -117,6 +106,15 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr)
         struct net_device *dev;
         int ret = -EADDRNOTAVAIL;
 
+        if (dev_addr->bound_dev_if) {
+                dev = dev_get_by_index(&init_net, dev_addr->bound_dev_if);
+                if (!dev)
+                        return -ENODEV;
+                ret = rdma_copy_addr(dev_addr, dev, NULL);
+                dev_put(dev);
+                return ret;
+        }
+
         switch (addr->sa_family) {
         case AF_INET:
                 dev = ip_dev_find(&init_net,
@@ -131,6 +129,7 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr)
 
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         case AF_INET6:
+                read_lock(&dev_base_lock);
                 for_each_netdev(&init_net, dev) {
                         if (ipv6_chk_addr(&init_net,
                                           &((struct sockaddr_in6 *) addr)->sin6_addr,
@@ -139,6 +138,7 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr)
                                 break;
                         }
                 }
+                read_unlock(&dev_base_lock);
                 break;
 #endif
         }
@@ -176,48 +176,9 @@ static void queue_req(struct addr_req *req)
         mutex_unlock(&lock);
 }
 
-static void addr_send_arp(struct sockaddr *dst_in)
-{
-        struct rtable *rt;
-        struct flowi fl;
-
-        memset(&fl, 0, sizeof fl);
-
-        switch (dst_in->sa_family) {
-        case AF_INET:
-                fl.nl_u.ip4_u.daddr =
-                        ((struct sockaddr_in *) dst_in)->sin_addr.s_addr;
-
-                if (ip_route_output_key(&init_net, &rt, &fl))
-                        return;
-
-                neigh_event_send(rt->u.dst.neighbour, NULL);
-                ip_rt_put(rt);
-                break;
-
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-        case AF_INET6:
-        {
-                struct dst_entry *dst;
-
-                fl.nl_u.ip6_u.daddr =
-                        ((struct sockaddr_in6 *) dst_in)->sin6_addr;
-
-                dst = ip6_route_output(&init_net, NULL, &fl);
-                if (!dst)
-                        return;
-
-                neigh_event_send(dst->neighbour, NULL);
-                dst_release(dst);
-                break;
-        }
-#endif
-        }
-}
-
-static int addr4_resolve_remote(struct sockaddr_in *src_in,
-                               struct sockaddr_in *dst_in,
-                               struct rdma_dev_addr *addr)
+static int addr4_resolve(struct sockaddr_in *src_in,
+                         struct sockaddr_in *dst_in,
+                         struct rdma_dev_addr *addr)
 {
         __be32 src_ip = src_in->sin_addr.s_addr;
         __be32 dst_ip = dst_in->sin_addr.s_addr;
@@ -229,10 +190,22 @@ static int addr4_resolve_remote(struct sockaddr_in *src_in,
         memset(&fl, 0, sizeof fl);
         fl.nl_u.ip4_u.daddr = dst_ip;
         fl.nl_u.ip4_u.saddr = src_ip;
+        fl.oif = addr->bound_dev_if;
+
         ret = ip_route_output_key(&init_net, &rt, &fl);
         if (ret)
                 goto out;
 
+        src_in->sin_family = AF_INET;
+        src_in->sin_addr.s_addr = rt->rt_src;
+
+        if (rt->idev->dev->flags & IFF_LOOPBACK) {
+                ret = rdma_translate_ip((struct sockaddr *) dst_in, addr);
+                if (!ret)
+                        memcpy(addr->dst_dev_addr, addr->src_dev_addr, MAX_ADDR_LEN);
+                goto put;
+        }
+
         /* If the device does ARP internally, return 'done' */
         if (rt->idev->dev->flags & IFF_NOARP) {
                 rdma_copy_addr(addr, rt->idev->dev, NULL);
@@ -240,21 +213,14 @@ static int addr4_resolve_remote(struct sockaddr_in *src_in,
         }
 
         neigh = neigh_lookup(&arp_tbl, &rt->rt_gateway, rt->idev->dev);
-        if (!neigh) {
+        if (!neigh || !(neigh->nud_state & NUD_VALID)) {
+                neigh_event_send(rt->u.dst.neighbour, NULL);
                 ret = -ENODATA;
+                if (neigh)
+                        goto release;
                 goto put;
         }
 
-        if (!(neigh->nud_state & NUD_VALID)) {
-                ret = -ENODATA;
-                goto release;
-        }
-
-        if (!src_ip) {
-                src_in->sin_family = dst_in->sin_family;
-                src_in->sin_addr.s_addr = rt->rt_src;
-        }
-
         ret = rdma_copy_addr(addr, neigh->dev, neigh->ha);
 release:
         neigh_release(neigh);
@@ -265,52 +231,77 @@ out:
 }
 
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-static int addr6_resolve_remote(struct sockaddr_in6 *src_in,
-                               struct sockaddr_in6 *dst_in,
-                               struct rdma_dev_addr *addr)
+static int addr6_resolve(struct sockaddr_in6 *src_in,
+                         struct sockaddr_in6 *dst_in,
+                         struct rdma_dev_addr *addr)
 {
         struct flowi fl;
         struct neighbour *neigh;
         struct dst_entry *dst;
-        int ret = -ENODATA;
+        int ret;
 
         memset(&fl, 0, sizeof fl);
-        fl.nl_u.ip6_u.daddr = dst_in->sin6_addr;
-        fl.nl_u.ip6_u.saddr = src_in->sin6_addr;
+        ipv6_addr_copy(&fl.fl6_dst, &dst_in->sin6_addr);
+        ipv6_addr_copy(&fl.fl6_src, &src_in->sin6_addr);
+        fl.oif = addr->bound_dev_if;
 
         dst = ip6_route_output(&init_net, NULL, &fl);
-        if (!dst)
-                return ret;
+        if ((ret = dst->error))
+                goto put;
+
+        if (ipv6_addr_any(&fl.fl6_src)) {
+                ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev,
+                                         &fl.fl6_dst, 0, &fl.fl6_src);
+                if (ret)
+                        goto put;
+
+                src_in->sin6_family = AF_INET6;
+                ipv6_addr_copy(&src_in->sin6_addr, &fl.fl6_src);
+        }
+
+        if (dst->dev->flags & IFF_LOOPBACK) {
+                ret = rdma_translate_ip((struct sockaddr *) dst_in, addr);
+                if (!ret)
+                        memcpy(addr->dst_dev_addr, addr->src_dev_addr, MAX_ADDR_LEN);
+                goto put;
+        }
 
+        /* If the device does ARP internally, return 'done' */
         if (dst->dev->flags & IFF_NOARP) {
                 ret = rdma_copy_addr(addr, dst->dev, NULL);
-        } else {
-                neigh = dst->neighbour;
-                if (neigh && (neigh->nud_state & NUD_VALID))
-                        ret = rdma_copy_addr(addr, neigh->dev, neigh->ha);
+                goto put;
+        }
+
+        neigh = dst->neighbour;
+        if (!neigh || !(neigh->nud_state & NUD_VALID)) {
+                neigh_event_send(dst->neighbour, NULL);
+                ret = -ENODATA;
+                goto put;
         }
 
+        ret = rdma_copy_addr(addr, dst->dev, neigh->ha);
+put:
         dst_release(dst);
         return ret;
 }
 #else
-static int addr6_resolve_remote(struct sockaddr_in6 *src_in,
-                               struct sockaddr_in6 *dst_in,
-                               struct rdma_dev_addr *addr)
+static int addr6_resolve(struct sockaddr_in6 *src_in,
+                         struct sockaddr_in6 *dst_in,
+                         struct rdma_dev_addr *addr)
 {
         return -EADDRNOTAVAIL;
 }
 #endif
 
-static int addr_resolve_remote(struct sockaddr *src_in,
-                                struct sockaddr *dst_in,
-                                struct rdma_dev_addr *addr)
+static int addr_resolve(struct sockaddr *src_in,
+                        struct sockaddr *dst_in,
+                        struct rdma_dev_addr *addr)
 {
         if (src_in->sa_family == AF_INET) {
-                return addr4_resolve_remote((struct sockaddr_in *) src_in,
+                return addr4_resolve((struct sockaddr_in *) src_in,
                         (struct sockaddr_in *) dst_in, addr);
         } else
-                return addr6_resolve_remote((struct sockaddr_in6 *) src_in,
+                return addr6_resolve((struct sockaddr_in6 *) src_in,
                         (struct sockaddr_in6 *) dst_in, addr);
 }
 
@@ -327,8 +318,7 @@ static void process_req(struct work_struct *work)
                 if (req->status == -ENODATA) {
                         src_in = (struct sockaddr *) &req->src_addr;
                         dst_in = (struct sockaddr *) &req->dst_addr;
-                        req->status = addr_resolve_remote(src_in, dst_in,
-                                                          req->addr);
+                        req->status = addr_resolve(src_in, dst_in, req->addr);
                         if (req->status && time_after_eq(jiffies, req->timeout))
                                 req->status = -ETIMEDOUT;
                         else if (req->status == -ENODATA)
@@ -352,82 +342,6 @@ static void process_req(struct work_struct *work)
         }
 }
 
-static int addr_resolve_local(struct sockaddr *src_in,
-                              struct sockaddr *dst_in,
-                              struct rdma_dev_addr *addr)
-{
-        struct net_device *dev;
-        int ret;
-
-        switch (dst_in->sa_family) {
-        case AF_INET:
-        {
-                __be32 src_ip = ((struct sockaddr_in *) src_in)->sin_addr.s_addr;
-                __be32 dst_ip = ((struct sockaddr_in *) dst_in)->sin_addr.s_addr;
-
-                dev = ip_dev_find(&init_net, dst_ip);
-                if (!dev)
-                        return -EADDRNOTAVAIL;
-
-                if (ipv4_is_zeronet(src_ip)) {
-                        src_in->sa_family = dst_in->sa_family;
-                        ((struct sockaddr_in *) src_in)->sin_addr.s_addr = dst_ip;
-                        ret = rdma_copy_addr(addr, dev, dev->dev_addr);
-                } else if (ipv4_is_loopback(src_ip)) {
-                        ret = rdma_translate_ip(dst_in, addr);
-                        if (!ret)
-                                memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
-                } else {
-                        ret = rdma_translate_ip(src_in, addr);
-                        if (!ret)
-                                memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
-                }
-                dev_put(dev);
-                break;
-        }
-
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-        case AF_INET6:
-        {
-                struct in6_addr *a;
-
-                for_each_netdev(&init_net, dev)
-                        if (ipv6_chk_addr(&init_net,
-                                          &((struct sockaddr_in6 *) dst_in)->sin6_addr,
-                                          dev, 1))
-                                break;
-
-                if (!dev)
-                        return -EADDRNOTAVAIL;
-
-                a = &((struct sockaddr_in6 *) src_in)->sin6_addr;
-
-                if (ipv6_addr_any(a)) {
-                        src_in->sa_family = dst_in->sa_family;
-                        ((struct sockaddr_in6 *) src_in)->sin6_addr =
-                                ((struct sockaddr_in6 *) dst_in)->sin6_addr;
-                        ret = rdma_copy_addr(addr, dev, dev->dev_addr);
-                } else if (ipv6_addr_loopback(a)) {
-                        ret = rdma_translate_ip(dst_in, addr);
-                        if (!ret)
-                                memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
-                } else  {
-                        ret = rdma_translate_ip(src_in, addr);
-                        if (!ret)
-                                memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
-                }
-                break;
-        }
-#endif
-
-        default:
-                ret = -EADDRNOTAVAIL;
-                break;
-        }
-
-        return ret;
-}
-
 int rdma_resolve_ip(struct rdma_addr_client *client,
                     struct sockaddr *src_addr, struct sockaddr *dst_addr,
                     struct rdma_dev_addr *addr, int timeout_ms,
@@ -443,22 +357,28 @@ int rdma_resolve_ip(struct rdma_addr_client *client,
         if (!req)
                 return -ENOMEM;
 
-        if (src_addr)
-                memcpy(&req->src_addr, src_addr, ip_addr_size(src_addr));
-        memcpy(&req->dst_addr, dst_addr, ip_addr_size(dst_addr));
+        src_in = (struct sockaddr *) &req->src_addr;
+        dst_in = (struct sockaddr *) &req->dst_addr;
+
+        if (src_addr) {
+                if (src_addr->sa_family != dst_addr->sa_family) {
+                        ret = -EINVAL;
+                        goto err;
+                }
+
+                memcpy(src_in, src_addr, ip_addr_size(src_addr));
+        } else {
+                src_in->sa_family = dst_addr->sa_family;
+        }
+
+        memcpy(dst_in, dst_addr, ip_addr_size(dst_addr));
         req->addr = addr;
         req->callback = callback;
         req->context = context;
         req->client = client;
         atomic_inc(&client->refcount);
 
-        src_in = (struct sockaddr *) &req->src_addr;
-        dst_in = (struct sockaddr *) &req->dst_addr;
-
-        req->status = addr_resolve_local(src_in, dst_in, addr);
-        if (req->status == -EADDRNOTAVAIL)
-                req->status = addr_resolve_remote(src_in, dst_in, addr);
-
+        req->status = addr_resolve(src_in, dst_in, addr);
         switch (req->status) {
         case 0:
                 req->timeout = jiffies;
@@ -467,15 +387,16 @@ int rdma_resolve_ip(struct rdma_addr_client *client,
         case -ENODATA:
                 req->timeout = msecs_to_jiffies(timeout_ms) + jiffies;
                 queue_req(req);
-                addr_send_arp(dst_in);
                 break;
         default:
                 ret = req->status;
                 atomic_dec(&client->refcount);
-                kfree(req);
-                break;
+                goto err;
         }
         return ret;
+err:
+        kfree(req);
+        return ret;
 }
 EXPORT_SYMBOL(rdma_resolve_ip);
 
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 075317884b53..fbdd73106000 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -330,17 +330,7 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv)
         union ib_gid gid;
         int ret = -ENODEV;
 
-        switch (rdma_node_get_transport(dev_addr->dev_type)) {
-        case RDMA_TRANSPORT_IB:
-                ib_addr_get_sgid(dev_addr, &gid);
-                break;
-        case RDMA_TRANSPORT_IWARP:
-                iw_addr_get_sgid(dev_addr, &gid);
-                break;
-        default:
-                return -ENODEV;
-        }
-
+        rdma_addr_get_sgid(dev_addr, &gid);
         list_for_each_entry(cma_dev, &dev_list, list) {
                 ret = ib_find_cached_gid(cma_dev->device, &gid,
                                          &id_priv->id.port_num, NULL);
@@ -1032,11 +1022,17 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id,
         if (rt->num_paths == 2)
                 rt->path_rec[1] = *ib_event->param.req_rcvd.alternate_path;
 
-        ib_addr_set_dgid(&rt->addr.dev_addr, &rt->path_rec[0].dgid);
-        ret = rdma_translate_ip((struct sockaddr *) &id->route.addr.src_addr,
-                                &id->route.addr.dev_addr);
-        if (ret)
-                goto destroy_id;
+        if (cma_any_addr((struct sockaddr *) &rt->addr.src_addr)) {
+                rt->addr.dev_addr.dev_type = ARPHRD_INFINIBAND;
+                rdma_addr_set_sgid(&rt->addr.dev_addr, &rt->path_rec[0].sgid);
+                ib_addr_set_pkey(&rt->addr.dev_addr, rt->path_rec[0].pkey);
+        } else {
+                ret = rdma_translate_ip((struct sockaddr *) &rt->addr.src_addr,
+                                        &rt->addr.dev_addr);
+                if (ret)
+                        goto destroy_id;
+        }
+        rdma_addr_set_dgid(&rt->addr.dev_addr, &rt->path_rec[0].dgid);
 
         id_priv = container_of(id, struct rdma_id_private, id);
         id_priv->state = CMA_CONNECT;
@@ -1071,10 +1067,12 @@ static struct rdma_id_private *cma_new_udp_id(struct rdma_cm_id *listen_id,
         cma_save_net_info(&id->route.addr, &listen_id->route.addr,
                           ip_ver, port, src, dst);
 
-        ret = rdma_translate_ip((struct sockaddr *) &id->route.addr.src_addr,
-                                &id->route.addr.dev_addr);
-        if (ret)
-                goto err;
+        if (!cma_any_addr((struct sockaddr *) &id->route.addr.src_addr)) {
+                ret = rdma_translate_ip((struct sockaddr *) &id->route.addr.src_addr,
+                                        &id->route.addr.dev_addr);
+                if (ret)
+                        goto err;
+        }
 
         id_priv = container_of(id, struct rdma_id_private, id);
         id_priv->state = CMA_CONNECT;
@@ -1474,15 +1472,6 @@ static void cma_listen_on_all(struct rdma_id_private *id_priv)
         mutex_unlock(&lock);
 }
 
-static int cma_bind_any(struct rdma_cm_id *id, sa_family_t af)
-{
-        struct sockaddr_storage addr_in;
-
-        memset(&addr_in, 0, sizeof addr_in);
-        addr_in.ss_family = af;
-        return rdma_bind_addr(id, (struct sockaddr *) &addr_in);
-}
-
 int rdma_listen(struct rdma_cm_id *id, int backlog)
 {
         struct rdma_id_private *id_priv;
@@ -1490,7 +1479,8 @@ int rdma_listen(struct rdma_cm_id *id, int backlog)
 
         id_priv = container_of(id, struct rdma_id_private, id);
         if (id_priv->state == CMA_IDLE) {
-                ret = cma_bind_any(id, AF_INET);
+                ((struct sockaddr *) &id->route.addr.src_addr)->sa_family = AF_INET;
+                ret = rdma_bind_addr(id, (struct sockaddr *) &id->route.addr.src_addr);
                 if (ret)
                         return ret;
         }
@@ -1565,8 +1555,8 @@ static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms,
         struct sockaddr_in6 *sin6;
 
         memset(&path_rec, 0, sizeof path_rec);
-        ib_addr_get_sgid(&addr->dev_addr, &path_rec.sgid);
-        ib_addr_get_dgid(&addr->dev_addr, &path_rec.dgid);
+        rdma_addr_get_sgid(&addr->dev_addr, &path_rec.sgid);
+        rdma_addr_get_dgid(&addr->dev_addr, &path_rec.dgid);
         path_rec.pkey = cpu_to_be16(ib_addr_get_pkey(&addr->dev_addr));
         path_rec.numb_path = 1;
         path_rec.reversible = 1;
@@ -1781,7 +1771,11 @@ port_found:
         if (ret)
                 goto out;
 
-        ib_addr_set_sgid(&id_priv->id.route.addr.dev_addr, &gid);
+        id_priv->id.route.addr.dev_addr.dev_type =
+                (rdma_node_get_transport(cma_dev->device->node_type) == RDMA_TRANSPORT_IB) ?
+                ARPHRD_INFINIBAND : ARPHRD_ETHER;
+
+        rdma_addr_set_sgid(&id_priv->id.route.addr.dev_addr, &gid);
         ib_addr_set_pkey(&id_priv->id.route.addr.dev_addr, pkey);
         id_priv->id.port_num = p;
         cma_attach_to_dev(id_priv, cma_dev);
@@ -1839,7 +1833,7 @@ out:
 static int cma_resolve_loopback(struct rdma_id_private *id_priv)
 {
         struct cma_work *work;
-        struct sockaddr_in *src_in, *dst_in;
+        struct sockaddr *src, *dst;
         union ib_gid gid;
         int ret;
 
@@ -1853,14 +1847,19 @@ static int cma_resolve_loopback(struct rdma_id_private *id_priv)
                         goto err;
         }
 
-        ib_addr_get_sgid(&id_priv->id.route.addr.dev_addr, &gid);
-        ib_addr_set_dgid(&id_priv->id.route.addr.dev_addr, &gid);
+        rdma_addr_get_sgid(&id_priv->id.route.addr.dev_addr, &gid);
+        rdma_addr_set_dgid(&id_priv->id.route.addr.dev_addr, &gid);
 
-        if (cma_zero_addr((struct sockaddr *) &id_priv->id.route.addr.src_addr)) {
-                src_in = (struct sockaddr_in *)&id_priv->id.route.addr.src_addr;
-                dst_in = (struct sockaddr_in *)&id_priv->id.route.addr.dst_addr;
-                src_in->sin_family = dst_in->sin_family;
-                src_in->sin_addr.s_addr = dst_in->sin_addr.s_addr;
+        src = (struct sockaddr *) &id_priv->id.route.addr.src_addr;
+        if (cma_zero_addr(src)) {
+                dst = (struct sockaddr *) &id_priv->id.route.addr.dst_addr;
+                if ((src->sa_family = dst->sa_family) == AF_INET) {
+                        ((struct sockaddr_in *) src)->sin_addr.s_addr =
+                                ((struct sockaddr_in *) dst)->sin_addr.s_addr;
+                } else {
+                        ipv6_addr_copy(&((struct sockaddr_in6 *) src)->sin6_addr,
+                                       &((struct sockaddr_in6 *) dst)->sin6_addr);
+                }
         }
 
         work->id = id_priv;
@@ -1878,10 +1877,14 @@ err:
 static int cma_bind_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
                          struct sockaddr *dst_addr)
 {
-        if (src_addr && src_addr->sa_family)
-                return rdma_bind_addr(id, src_addr);
-        else
-                return cma_bind_any(id, dst_addr->sa_family);
+        if (!src_addr || !src_addr->sa_family) {
+                src_addr = (struct sockaddr *) &id->route.addr.src_addr;
+                if ((src_addr->sa_family = dst_addr->sa_family) == AF_INET6) {
+                        ((struct sockaddr_in6 *) src_addr)->sin6_scope_id =
+                                ((struct sockaddr_in6 *) dst_addr)->sin6_scope_id;
+                }
+        }
+        return rdma_bind_addr(id, src_addr);
 }
 
 int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
@@ -2077,6 +2080,25 @@ static int cma_get_port(struct rdma_id_private *id_priv)
         return ret;
 }
 
+static int cma_check_linklocal(struct rdma_dev_addr *dev_addr,
+                               struct sockaddr *addr)
+{
+#if defined(CONFIG_IPv6) || defined(CONFIG_IPV6_MODULE)
+        struct sockaddr_in6 *sin6;
+
+        if (addr->sa_family != AF_INET6)
+                return 0;
+
+        sin6 = (struct sockaddr_in6 *) addr;
+        if ((ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LINKLOCAL) &&
+            !sin6->sin6_scope_id)
+                        return -EINVAL;
+
+        dev_addr->bound_dev_if = sin6->sin6_scope_id;
+#endif
+        return 0;
+}
+
 int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr)
 {
         struct rdma_id_private *id_priv;
@@ -2089,7 +2111,13 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr)
         if (!cma_comp_exch(id_priv, CMA_IDLE, CMA_ADDR_BOUND))
                 return -EINVAL;
 
-        if (!cma_any_addr(addr)) {
+        ret = cma_check_linklocal(&id->route.addr.dev_addr, addr);
+        if (ret)
+                goto err1;
+
+        if (cma_loopback_addr(addr)) {
+                ret = cma_bind_loopback(id_priv);
+        } else if (!cma_zero_addr(addr)) {
                 ret = rdma_translate_ip(addr, &id->route.addr.dev_addr);
                 if (ret)
                         goto err1;
@@ -2108,7 +2136,7 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr)
 
         return 0;
 err2:
-        if (!cma_any_addr(addr)) {
+        if (id_priv->cma_dev) {
                 mutex_lock(&lock);
                 cma_detach_from_dev(id_priv);
                 mutex_unlock(&lock);
@@ -2687,10 +2715,15 @@ static void cma_set_mgid(struct rdma_id_private *id_priv,
         if (cma_any_addr(addr)) {
                 memset(mgid, 0, sizeof *mgid);
         } else if ((addr->sa_family == AF_INET6) &&
-                   ((be32_to_cpu(sin6->sin6_addr.s6_addr32[0]) & 0xFF10A01B) ==
+                   ((be32_to_cpu(sin6->sin6_addr.s6_addr32[0]) & 0xFFF0FFFF) ==
                                                                  0xFF10A01B)) {
                 /* IPv6 address is an SA assigned MGID. */
                 memcpy(mgid, &sin6->sin6_addr, sizeof *mgid);
+        } else if ((addr->sa_family == AF_INET6)) {
+                ipv6_ib_mc_map(&sin6->sin6_addr, dev_addr->broadcast, mc_map);
+                if (id_priv->id.ps == RDMA_PS_UDP)
+                        mc_map[7] = 0x01;       /* Use RDMA CM signature */
+                *mgid = *(union ib_gid *) (mc_map + 4);
         } else {
                 ip_ib_mc_map(sin->sin_addr.s_addr, dev_addr->broadcast, mc_map);
                 if (id_priv->id.ps == RDMA_PS_UDP)
@@ -2716,7 +2749,7 @@ static int cma_join_ib_multicast(struct rdma_id_private *id_priv,
         cma_set_mgid(id_priv, (struct sockaddr *) &mc->addr, &rec.mgid);
         if (id_priv->id.ps == RDMA_PS_UDP)
                 rec.qkey = cpu_to_be32(RDMA_UDP_QKEY);
-        ib_addr_get_sgid(dev_addr, &rec.port_gid);
+        rdma_addr_get_sgid(dev_addr, &rec.port_gid);
         rec.pkey = cpu_to_be16(ib_addr_get_pkey(dev_addr));
         rec.join_state = 1;
 
@@ -2815,7 +2848,7 @@ static int cma_netdev_change(struct net_device *ndev, struct rdma_id_private *id
 
         dev_addr = &id_priv->id.route.addr.dev_addr;
 
-        if ((dev_addr->src_dev == ndev) &&
+        if ((dev_addr->bound_dev_if == ndev->ifindex) &&
             memcmp(dev_addr->src_dev_addr, ndev->dev_addr, ndev->addr_len)) {
                 printk(KERN_INFO "RDMA CM addr change for ndev %s used by id %p\n",
                        ndev->name, &id_priv->id);
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index 82543716d59e..7e1ffd8ccd5c 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -604,6 +604,12 @@ retry:
         return ret ? ret : id;
 }
 
+void ib_sa_unpack_path(void *attribute, struct ib_sa_path_rec *rec)
+{
+        ib_unpack(path_rec_table, ARRAY_SIZE(path_rec_table), attribute, rec);
+}
+EXPORT_SYMBOL(ib_sa_unpack_path);
+
 static void ib_sa_path_rec_callback(struct ib_sa_query *sa_query,
                                     int status,
                                     struct ib_sa_mad *mad)
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index bb96d3c4b0f4..b2e16c332d5b 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -43,6 +43,7 @@
 #include <rdma/rdma_user_cm.h>
 #include <rdma/ib_marshall.h>
 #include <rdma/rdma_cm.h>
+#include <rdma/rdma_cm_ib.h>
 
 MODULE_AUTHOR("Sean Hefty");
 MODULE_DESCRIPTION("RDMA Userspace Connection Manager Access");
@@ -562,10 +563,10 @@ static void ucma_copy_ib_route(struct rdma_ucm_query_route_resp *resp,
         switch (route->num_paths) {
         case 0:
                 dev_addr = &route->addr.dev_addr;
-                ib_addr_get_dgid(dev_addr,
-                                 (union ib_gid *) &resp->ib_route[0].dgid);
-                ib_addr_get_sgid(dev_addr,
-                                 (union ib_gid *) &resp->ib_route[0].sgid);
+                rdma_addr_get_dgid(dev_addr,
+                                   (union ib_gid *) &resp->ib_route[0].dgid);
+                rdma_addr_get_sgid(dev_addr,
+                                   (union ib_gid *) &resp->ib_route[0].sgid);
                 resp->ib_route[0].pkey = cpu_to_be16(ib_addr_get_pkey(dev_addr));
                 break;
         case 2:
@@ -812,6 +813,51 @@ static int ucma_set_option_id(struct ucma_context *ctx, int optname,
         return ret;
 }
 
+static int ucma_set_ib_path(struct ucma_context *ctx,
+                            struct ib_path_rec_data *path_data, size_t optlen)
+{
+        struct ib_sa_path_rec sa_path;
+        struct rdma_cm_event event;
+        int ret;
+
+        if (optlen % sizeof(*path_data))
+                return -EINVAL;
+
+        for (; optlen; optlen -= sizeof(*path_data), path_data++) {
+                if (path_data->flags == (IB_PATH_GMP | IB_PATH_PRIMARY |
+                                         IB_PATH_BIDIRECTIONAL))
+                        break;
+        }
+
+        if (!optlen)
+                return -EINVAL;
+
+        ib_sa_unpack_path(path_data->path_rec, &sa_path);
+        ret = rdma_set_ib_paths(ctx->cm_id, &sa_path, 1);
+        if (ret)
+                return ret;
+
+        memset(&event, 0, sizeof event);
+        event.event = RDMA_CM_EVENT_ROUTE_RESOLVED;
+        return ucma_event_handler(ctx->cm_id, &event);
+}
+
+static int ucma_set_option_ib(struct ucma_context *ctx, int optname,
+                              void *optval, size_t optlen)
+{
+        int ret;
+
+        switch (optname) {
+        case RDMA_OPTION_IB_PATH:
+                ret = ucma_set_ib_path(ctx, optval, optlen);
+                break;
+        default:
+                ret = -ENOSYS;
+        }
+
+        return ret;
+}
+
 static int ucma_set_option_level(struct ucma_context *ctx, int level,
                                  int optname, void *optval, size_t optlen)
 {
@@ -821,6 +867,9 @@ static int ucma_set_option_level(struct ucma_context *ctx, int level,
         case RDMA_OPTION_ID:
                 ret = ucma_set_option_id(ctx, optname, optval, optlen);
                 break;
+        case RDMA_OPTION_IB:
+                ret = ucma_set_option_ib(ctx, optname, optval, optlen);
+                break;
         default:
                 ret = -ENOSYS;
         }
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 56feab6c251e..112d3970222a 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -285,7 +285,7 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file,
 
         ucontext = ibdev->alloc_ucontext(ibdev, &udata);
         if (IS_ERR(ucontext)) {
-                ret = PTR_ERR(file->ucontext);
+                ret = PTR_ERR(ucontext);
                 goto err;
         }
 
diff --git a/drivers/infiniband/hw/amso1100/c2_qp.c b/drivers/infiniband/hw/amso1100/c2_qp.c
index a6d89440ad2c..ad518868df77 100644
--- a/drivers/infiniband/hw/amso1100/c2_qp.c
+++ b/drivers/infiniband/hw/amso1100/c2_qp.c
@@ -798,8 +798,10 @@ int c2_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
         u8 actual_sge_count;
         u32 msg_size;
 
-        if (qp->state > IB_QPS_RTS)
-                return -EINVAL;
+        if (qp->state > IB_QPS_RTS) {
+                err = -EINVAL;
+                goto out;
+        }
 
         while (ib_wr) {
 
@@ -930,6 +932,7 @@ int c2_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
                 ib_wr = ib_wr->next;
         }
 
+out:
         if (err)
                 *bad_wr = ib_wr;
         return err;
@@ -944,8 +947,10 @@ int c2_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *ib_wr,
         unsigned long lock_flags;
         int err = 0;
 
-        if (qp->state > IB_QPS_RTS)
-                return -EINVAL;
+        if (qp->state > IB_QPS_RTS) {
+                err = -EINVAL;
+                goto out;
+        }
 
         /*
          * Try and post each work request
@@ -998,6 +1003,7 @@ int c2_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *ib_wr,
                 ib_wr = ib_wr->next;
         }
 
+out:
         if (err)
                 *bad_wr = ib_wr;
         return err;
diff --git a/drivers/infiniband/hw/cxgb3/iwch_qp.c b/drivers/infiniband/hw/cxgb3/iwch_qp.c
index 1cecf98829ac..3eb8cecf81d7 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_qp.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_qp.c
@@ -365,18 +365,19 @@ int iwch_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
         spin_lock_irqsave(&qhp->lock, flag);
         if (qhp->attr.state > IWCH_QP_STATE_RTS) {
                 spin_unlock_irqrestore(&qhp->lock, flag);
-                return -EINVAL;
+                err = -EINVAL;
+                goto out;
         }
         num_wrs = Q_FREECNT(qhp->wq.sq_rptr, qhp->wq.sq_wptr,
                   qhp->wq.sq_size_log2);
         if (num_wrs <= 0) {
                 spin_unlock_irqrestore(&qhp->lock, flag);
-                return -ENOMEM;
+                err = -ENOMEM;
+                goto out;
         }
         while (wr) {
                 if (num_wrs == 0) {
                         err = -ENOMEM;
-                        *bad_wr = wr;
                         break;
                 }
                 idx = Q_PTR2IDX(qhp->wq.wptr, qhp->wq.size_log2);
@@ -428,10 +429,8 @@ int iwch_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                              wr->opcode);
                         err = -EINVAL;
                 }
-                if (err) {
-                        *bad_wr = wr;
+                if (err)
                         break;
-                }
                 wqe->send.wrid.id0.hi = qhp->wq.sq_wptr;
                 sqp->wr_id = wr->wr_id;
                 sqp->opcode = wr2opcode(t3_wr_opcode);
@@ -454,6 +453,10 @@ int iwch_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
         }
         spin_unlock_irqrestore(&qhp->lock, flag);
         ring_doorbell(qhp->wq.doorbell, qhp->wq.qpid);
+
+out:
+        if (err)
+                *bad_wr = wr;
         return err;
 }
 
@@ -471,18 +474,19 @@ int iwch_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
         spin_lock_irqsave(&qhp->lock, flag);
         if (qhp->attr.state > IWCH_QP_STATE_RTS) {
                 spin_unlock_irqrestore(&qhp->lock, flag);
-                return -EINVAL;
+                err = -EINVAL;
+                goto out;
         }
         num_wrs = Q_FREECNT(qhp->wq.rq_rptr, qhp->wq.rq_wptr,
                             qhp->wq.rq_size_log2) - 1;
         if (!wr) {
                 spin_unlock_irqrestore(&qhp->lock, flag);
-                return -EINVAL;
+                err = -ENOMEM;
+                goto out;
         }
         while (wr) {
                 if (wr->num_sge > T3_MAX_SGE) {
                         err = -EINVAL;
-                        *bad_wr = wr;
                         break;
                 }
                 idx = Q_PTR2IDX(qhp->wq.wptr, qhp->wq.size_log2);
@@ -494,10 +498,10 @@ int iwch_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
                                 err = build_zero_stag_recv(qhp, wqe, wr);
                 else
                         err = -ENOMEM;
-                if (err) {
-                        *bad_wr = wr;
+
+                if (err)
                         break;
-                }
+
                 build_fw_riwrh((void *) wqe, T3_WR_RCV, T3_COMPLETION_FLAG,
                                Q_GENBIT(qhp->wq.wptr, qhp->wq.size_log2),
                                0, sizeof(struct t3_receive_wr) >> 3, T3_SOPEOP);
@@ -511,6 +515,10 @@ int iwch_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
         }
         spin_unlock_irqrestore(&qhp->lock, flag);
         ring_doorbell(qhp->wq.doorbell, qhp->wq.qpid);
+
+out:
+        if (err)
+                *bad_wr = wr;
         return err;
 }
 
diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h
index c825142a2fb7..0136abd50dd4 100644
--- a/drivers/infiniband/hw/ehca/ehca_classes.h
+++ b/drivers/infiniband/hw/ehca/ehca_classes.h
@@ -375,6 +375,7 @@ extern rwlock_t ehca_qp_idr_lock;
 extern rwlock_t ehca_cq_idr_lock;
 extern struct idr ehca_qp_idr;
 extern struct idr ehca_cq_idr;
+extern spinlock_t shca_list_lock;
 
 extern int ehca_static_rate;
 extern int ehca_port_act_time;
diff --git a/drivers/infiniband/hw/ehca/ehca_eq.c b/drivers/infiniband/hw/ehca/ehca_eq.c
index 523e733c630e..3b87589b8ea0 100644
--- a/drivers/infiniband/hw/ehca/ehca_eq.c
+++ b/drivers/infiniband/hw/ehca/ehca_eq.c
@@ -169,12 +169,15 @@ int ehca_destroy_eq(struct ehca_shca *shca, struct ehca_eq *eq)
         unsigned long flags;
         u64 h_ret;
 
-        spin_lock_irqsave(&eq->spinlock, flags);
         ibmebus_free_irq(eq->ist, (void *)shca);
 
-        h_ret = hipz_h_destroy_eq(shca->ipz_hca_handle, eq);
+        spin_lock_irqsave(&shca_list_lock, flags);
+        eq->is_initialized = 0;
+        spin_unlock_irqrestore(&shca_list_lock, flags);
 
-        spin_unlock_irqrestore(&eq->spinlock, flags);
+        tasklet_kill(&eq->interrupt_task);
+
+        h_ret = hipz_h_destroy_eq(shca->ipz_hca_handle, eq);
 
         if (h_ret != H_SUCCESS) {
                 ehca_err(&shca->ib_device, "Can't free EQ resources.");
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index fb2d83c5bf01..129a6bebd6e3 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -123,7 +123,7 @@ DEFINE_IDR(ehca_qp_idr);
 DEFINE_IDR(ehca_cq_idr);
 
 static LIST_HEAD(shca_list); /* list of all registered ehcas */
-static DEFINE_SPINLOCK(shca_list_lock);
+DEFINE_SPINLOCK(shca_list_lock);
 
 static struct timer_list poll_eqs_timer;
 
diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c
index 8fd88cd828fd..e3ec7fdd67bd 100644
--- a/drivers/infiniband/hw/ehca/ehca_reqs.c
+++ b/drivers/infiniband/hw/ehca/ehca_reqs.c
@@ -400,7 +400,6 @@ static inline void map_ib_wc_status(u32 cqe_status,
 
 static inline int post_one_send(struct ehca_qp *my_qp,
                          struct ib_send_wr *cur_send_wr,
-                         struct ib_send_wr **bad_send_wr,
                          int hidden)
 {
         struct ehca_wqe *wqe_p;
@@ -412,8 +411,6 @@ static inline int post_one_send(struct ehca_qp *my_qp,
         wqe_p = ipz_qeit_get_inc(&my_qp->ipz_squeue);
         if (unlikely(!wqe_p)) {
                 /* too many posted work requests: queue overflow */
-                if (bad_send_wr)
-                        *bad_send_wr = cur_send_wr;
                 ehca_err(my_qp->ib_qp.device, "Too many posted WQEs "
                          "qp_num=%x", my_qp->ib_qp.qp_num);
                 return -ENOMEM;
@@ -433,8 +430,6 @@ static inline int post_one_send(struct ehca_qp *my_qp,
          */
         if (unlikely(ret)) {
                 my_qp->ipz_squeue.current_q_offset = start_offset;
-                if (bad_send_wr)
-                        *bad_send_wr = cur_send_wr;
                 ehca_err(my_qp->ib_qp.device, "Could not write WQE "
                          "qp_num=%x", my_qp->ib_qp.qp_num);
                 return -EINVAL;
@@ -448,7 +443,6 @@ int ehca_post_send(struct ib_qp *qp,
                    struct ib_send_wr **bad_send_wr)
 {
         struct ehca_qp *my_qp = container_of(qp, struct ehca_qp, ib_qp);
-        struct ib_send_wr *cur_send_wr;
         int wqe_cnt = 0;
         int ret = 0;
         unsigned long flags;
@@ -457,7 +451,8 @@ int ehca_post_send(struct ib_qp *qp,
         if (unlikely(my_qp->state < IB_QPS_RTS)) {
                 ehca_err(qp->device, "Invalid QP state  qp_state=%d qpn=%x",
                          my_qp->state, qp->qp_num);
-                return -EINVAL;
+                ret = -EINVAL;
+                goto out;
         }
 
         /* LOCK the QUEUE */
@@ -476,24 +471,21 @@ int ehca_post_send(struct ib_qp *qp,
                 struct ib_send_wr circ_wr;
                 memset(&circ_wr, 0, sizeof(circ_wr));
                 circ_wr.opcode = IB_WR_RDMA_READ;
-                post_one_send(my_qp, &circ_wr, NULL, 1); /* ignore retcode */
+                post_one_send(my_qp, &circ_wr, 1); /* ignore retcode */
                 wqe_cnt++;
                 ehca_dbg(qp->device, "posted circ wr  qp_num=%x", qp->qp_num);
                 my_qp->message_count = my_qp->packet_count = 0;
         }
 
         /* loop processes list of send reqs */
-        for (cur_send_wr = send_wr; cur_send_wr != NULL;
-             cur_send_wr = cur_send_wr->next) {
-                ret = post_one_send(my_qp, cur_send_wr, bad_send_wr, 0);
+        while (send_wr) {
+                ret = post_one_send(my_qp, send_wr, 0);
                 if (unlikely(ret)) {
-                        /* if one or more WQEs were successful, don't fail */
-                        if (wqe_cnt)
-                                ret = 0;
                         goto post_send_exit0;
                 }
                 wqe_cnt++;
-        } /* eof for cur_send_wr */
+                send_wr = send_wr->next;
+        }
 
 post_send_exit0:
         iosync(); /* serialize GAL register access */
@@ -503,6 +495,10 @@ post_send_exit0:
                          my_qp, qp->qp_num, wqe_cnt, ret);
         my_qp->message_count += wqe_cnt;
         spin_unlock_irqrestore(&my_qp->spinlock_s, flags);
+
+out:
+        if (ret)
+                *bad_send_wr = send_wr;
         return ret;
 }
 
@@ -511,7 +507,6 @@ static int internal_post_recv(struct ehca_qp *my_qp,
                               struct ib_recv_wr *recv_wr,
                               struct ib_recv_wr **bad_recv_wr)
 {
-        struct ib_recv_wr *cur_recv_wr;
         struct ehca_wqe *wqe_p;
         int wqe_cnt = 0;
         int ret = 0;
@@ -522,27 +517,23 @@ static int internal_post_recv(struct ehca_qp *my_qp,
         if (unlikely(!HAS_RQ(my_qp))) {
                 ehca_err(dev, "QP has no RQ  ehca_qp=%p qp_num=%x ext_type=%d",
                          my_qp, my_qp->real_qp_num, my_qp->ext_type);
-                return -ENODEV;
+                ret = -ENODEV;
+                goto out;
         }
 
         /* LOCK the QUEUE */
         spin_lock_irqsave(&my_qp->spinlock_r, flags);
 
-        /* loop processes list of send reqs */
-        for (cur_recv_wr = recv_wr; cur_recv_wr != NULL;
-             cur_recv_wr = cur_recv_wr->next) {
+        /* loop processes list of recv reqs */
+        while (recv_wr) {
                 u64 start_offset = my_qp->ipz_rqueue.current_q_offset;
                 /* get pointer next to free WQE */
                 wqe_p = ipz_qeit_get_inc(&my_qp->ipz_rqueue);
                 if (unlikely(!wqe_p)) {
                         /* too many posted work requests: queue overflow */
-                        if (bad_recv_wr)
-                                *bad_recv_wr = cur_recv_wr;
-                        if (wqe_cnt == 0) {
-                                ret = -ENOMEM;
-                                ehca_err(dev, "Too many posted WQEs "
-                                         "qp_num=%x", my_qp->real_qp_num);
-                        }
+                        ret = -ENOMEM;
+                        ehca_err(dev, "Too many posted WQEs "
+                                "qp_num=%x", my_qp->real_qp_num);
                         goto post_recv_exit0;
                 }
                 /*
@@ -552,7 +543,7 @@ static int internal_post_recv(struct ehca_qp *my_qp,
                 rq_map_idx = start_offset / my_qp->ipz_rqueue.qe_size;
 
                 /* write a RECV WQE into the QUEUE */
-                ret = ehca_write_rwqe(&my_qp->ipz_rqueue, wqe_p, cur_recv_wr,
+                ret = ehca_write_rwqe(&my_qp->ipz_rqueue, wqe_p, recv_wr,
                                 rq_map_idx);
                 /*
                  * if something failed,
@@ -560,22 +551,20 @@ static int internal_post_recv(struct ehca_qp *my_qp,
                  */
                 if (unlikely(ret)) {
                         my_qp->ipz_rqueue.current_q_offset = start_offset;
-                        *bad_recv_wr = cur_recv_wr;
-                        if (wqe_cnt == 0) {
-                                ret = -EINVAL;
-                                ehca_err(dev, "Could not write WQE "
-                                         "qp_num=%x", my_qp->real_qp_num);
-                        }
+                        ret = -EINVAL;
+                        ehca_err(dev, "Could not write WQE "
+                                "qp_num=%x", my_qp->real_qp_num);
                         goto post_recv_exit0;
                 }
 
                 qmap_entry = &my_qp->rq_map.map[rq_map_idx];
-                qmap_entry->app_wr_id = get_app_wr_id(cur_recv_wr->wr_id);
+                qmap_entry->app_wr_id = get_app_wr_id(recv_wr->wr_id);
                 qmap_entry->reported = 0;
                 qmap_entry->cqe_req = 1;
 
                 wqe_cnt++;
-        } /* eof for cur_recv_wr */
+                recv_wr = recv_wr->next;
+        } /* eof for recv_wr */
 
 post_recv_exit0:
         iosync(); /* serialize GAL register access */
@@ -584,6 +573,11 @@ post_recv_exit0:
             ehca_dbg(dev, "ehca_qp=%p qp_num=%x wqe_cnt=%d ret=%i",
                      my_qp, my_qp->real_qp_num, wqe_cnt, ret);
         spin_unlock_irqrestore(&my_qp->spinlock_r, flags);
+
+out:
+        if (ret)
+                *bad_recv_wr = recv_wr;
+
         return ret;
 }
 
@@ -597,6 +591,7 @@ int ehca_post_recv(struct ib_qp *qp,
         if (unlikely(my_qp->state == IB_QPS_RESET)) {
                 ehca_err(qp->device, "Invalid QP state  qp_state=%d qpn=%x",
                          my_qp->state, qp->qp_num);
+                *bad_recv_wr = recv_wr;
                 return -EINVAL;
         }
 
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index 013d1380e77c..d2787fe80304 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -39,6 +39,7 @@
 #include <linux/delay.h>
 #include <linux/netdevice.h>
 #include <linux/vmalloc.h>
+#include <linux/bitmap.h>
 
 #include "ipath_kernel.h"
 #include "ipath_verbs.h"
@@ -1697,7 +1698,7 @@ void ipath_chg_pioavailkernel(struct ipath_devdata *dd, unsigned start,
                               unsigned len, int avail)
 {
         unsigned long flags;
-        unsigned end, cnt = 0, next;
+        unsigned end, cnt = 0;
 
         /* There are two bits per send buffer (busy and generation) */
         start *= 2;
@@ -1748,12 +1749,7 @@ void ipath_chg_pioavailkernel(struct ipath_devdata *dd, unsigned start,
 
         if (dd->ipath_pioupd_thresh) {
                 end = 2 * (dd->ipath_piobcnt2k + dd->ipath_piobcnt4k);
-                next = find_first_bit(dd->ipath_pioavailkernel, end);
-                while (next < end) {
-                        cnt++;
-                        next = find_next_bit(dd->ipath_pioavailkernel, end,
-                                        next + 1);
-                }
+                cnt = bitmap_weight(dd->ipath_pioavailkernel, end);
         }
         spin_unlock_irqrestore(&ipath_pioavail_lock, flags);
 
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 3cb3f47a10b8..e596537ff353 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -103,7 +103,7 @@ static int mlx4_ib_query_device(struct ib_device *ibdev,
                 props->device_cap_flags |= IB_DEVICE_UD_AV_PORT_ENFORCE;
         if (dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_IPOIB_CSUM)
                 props->device_cap_flags |= IB_DEVICE_UD_IP_CSUM;
-        if (dev->dev->caps.max_gso_sz)
+        if (dev->dev->caps.max_gso_sz && dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_BLH)
                 props->device_cap_flags |= IB_DEVICE_UD_TSO;
         if (dev->dev->caps.bmme_flags & MLX4_BMME_FLAG_RESERVED_LKEY)
                 props->device_cap_flags |= IB_DEVICE_LOCAL_DMA_LKEY;
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 256a00c6aeea..989555cee883 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -54,7 +54,8 @@ enum {
         /*
          * Largest possible UD header: send with GRH and immediate data.
          */
-        MLX4_IB_UD_HEADER_SIZE          = 72
+        MLX4_IB_UD_HEADER_SIZE          = 72,
+        MLX4_IB_LSO_HEADER_SPARE        = 128,
 };
 
 struct mlx4_ib_sqp {
@@ -67,7 +68,8 @@ struct mlx4_ib_sqp {
 };
 
 enum {
-        MLX4_IB_MIN_SQ_STRIDE = 6
+        MLX4_IB_MIN_SQ_STRIDE   = 6,
+        MLX4_IB_CACHE_LINE_SIZE = 64,
 };
 
 static const __be32 mlx4_ib_opcode[] = {
@@ -261,7 +263,7 @@ static int send_wqe_overhead(enum ib_qp_type type, u32 flags)
         case IB_QPT_UD:
                 return sizeof (struct mlx4_wqe_ctrl_seg) +
                         sizeof (struct mlx4_wqe_datagram_seg) +
-                        ((flags & MLX4_IB_QP_LSO) ? 64 : 0);
+                        ((flags & MLX4_IB_QP_LSO) ? MLX4_IB_LSO_HEADER_SPARE : 0);
         case IB_QPT_UC:
                 return sizeof (struct mlx4_wqe_ctrl_seg) +
                         sizeof (struct mlx4_wqe_raddr_seg);
@@ -897,7 +899,6 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
 
         context->flags = cpu_to_be32((to_mlx4_state(new_state) << 28) |
                                      (to_mlx4_st(ibqp->qp_type) << 16));
-        context->flags     |= cpu_to_be32(1 << 8); /* DE? */
 
         if (!(attr_mask & IB_QP_PATH_MIG_STATE))
                 context->flags |= cpu_to_be32(MLX4_QP_PM_MIGRATED << 11);
@@ -1467,16 +1468,12 @@ static void __set_data_seg(struct mlx4_wqe_data_seg *dseg, struct ib_sge *sg)
 
 static int build_lso_seg(struct mlx4_wqe_lso_seg *wqe, struct ib_send_wr *wr,
                          struct mlx4_ib_qp *qp, unsigned *lso_seg_len,
-                         __be32 *lso_hdr_sz)
+                         __be32 *lso_hdr_sz, __be32 *blh)
 {
         unsigned halign = ALIGN(sizeof *wqe + wr->wr.ud.hlen, 16);
 
-        /*
-         * This is a temporary limitation and will be removed in
-         * a forthcoming FW release:
-         */
-        if (unlikely(halign > 64))
-                return -EINVAL;
+        if (unlikely(halign > MLX4_IB_CACHE_LINE_SIZE))
+                *blh = cpu_to_be32(1 << 6);
 
         if (unlikely(!(qp->flags & MLX4_IB_QP_LSO) &&
                      wr->num_sge > qp->sq.max_gs - (halign >> 4)))
@@ -1522,6 +1519,7 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
         __be32 dummy;
         __be32 *lso_wqe;
         __be32 uninitialized_var(lso_hdr_sz);
+        __be32 blh;
         int i;
 
         spin_lock_irqsave(&qp->sq.lock, flags);
@@ -1530,6 +1528,7 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
 
         for (nreq = 0; wr; ++nreq, wr = wr->next) {
                 lso_wqe = &dummy;
+                blh = 0;
 
                 if (mlx4_wq_overflow(&qp->sq, nreq, qp->ibqp.send_cq)) {
                         err = -ENOMEM;
@@ -1616,7 +1615,7 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                         size += sizeof (struct mlx4_wqe_datagram_seg) / 16;
 
                         if (wr->opcode == IB_WR_LSO) {
-                                err = build_lso_seg(wqe, wr, qp, &seglen, &lso_hdr_sz);
+                                err = build_lso_seg(wqe, wr, qp, &seglen, &lso_hdr_sz, &blh);
                                 if (unlikely(err)) {
                                         *bad_wr = wr;
                                         goto out;
@@ -1687,7 +1686,7 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                 }
 
                 ctrl->owner_opcode = mlx4_ib_opcode[wr->opcode] |
-                        (ind & qp->sq.wqe_cnt ? cpu_to_be32(1 << 31) : 0);
+                        (ind & qp->sq.wqe_cnt ? cpu_to_be32(1 << 31) : 0) | blh;
 
                 stamp = ind + qp->sq_spare_wqes;
                 ind += DIV_ROUND_UP(size * 16, 1U << qp->sq.wqe_shift);
diff --git a/drivers/infiniband/hw/nes/Kconfig b/drivers/infiniband/hw/nes/Kconfig
index d449eb6ec78e..846dc97cf260 100644
--- a/drivers/infiniband/hw/nes/Kconfig
+++ b/drivers/infiniband/hw/nes/Kconfig
@@ -4,14 +4,13 @@ config INFINIBAND_NES
         select LIBCRC32C
         select INET_LRO
         ---help---
-          This is a low-level driver for NetEffect RDMA enabled
-          Network Interface Cards (RNIC).
+          This is the RDMA Network Interface Card (RNIC) driver for
+          NetEffect Ethernet Cluster Server Adapters.
 
 config INFINIBAND_NES_DEBUG
         bool "Verbose debugging output"
         depends on INFINIBAND_NES
         default n
         ---help---
-          This option causes the NetEffect RNIC driver to produce debug
-          messages.  Select this if you are developing the driver
-          or trying to diagnose a problem.
+          This option enables debug messages from the NetEffect RNIC
+          driver.  Select this if you are diagnosing a problem.
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index cbde0cfe27e0..b9d09bafd6c1 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+ * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
  * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -521,7 +521,8 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i
         spin_lock_init(&nesdev->indexed_regs_lock);
 
         /* Remap the PCI registers in adapter BAR0 to kernel VA space */
-        mmio_regs = ioremap_nocache(pci_resource_start(pcidev, BAR_0), sizeof(mmio_regs));
+        mmio_regs = ioremap_nocache(pci_resource_start(pcidev, BAR_0),
+                                    pci_resource_len(pcidev, BAR_0));
         if (mmio_regs == NULL) {
                 printk(KERN_ERR PFX "Unable to remap BAR0\n");
                 ret = -EIO;
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
index bcc6abc4faff..98840564bb2f 100644
--- a/drivers/infiniband/hw/nes/nes.h
+++ b/drivers/infiniband/hw/nes/nes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+ * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
  * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 73473db19863..39468c277036 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+ * Copyright (c) 2006 - 2009 Intel Corporation.  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
@@ -52,6 +52,7 @@
 #include <linux/random.h>
 #include <linux/list.h>
 #include <linux/threads.h>
+#include <linux/highmem.h>
 #include <net/arp.h>
 #include <net/neighbour.h>
 #include <net/route.h>
@@ -251,6 +252,33 @@ static int parse_mpa(struct nes_cm_node *cm_node, u8 *buffer, u32 *type,
 
         mpa_frame = (struct ietf_mpa_frame *)buffer;
         cm_node->mpa_frame_size = ntohs(mpa_frame->priv_data_len);
+        /* make sure mpa private data len is less than 512 bytes */
+        if (cm_node->mpa_frame_size > IETF_MAX_PRIV_DATA_LEN) {
+                nes_debug(NES_DBG_CM, "The received Length of Private"
+                        " Data field exceeds 512 octets\n");
+                return -EINVAL;
+        }
+        /*
+         * make sure MPA receiver interoperate with the
+         * received MPA version and MPA key information
+         *
+         */
+        if (mpa_frame->rev != mpa_version) {
+                nes_debug(NES_DBG_CM, "The received mpa version"
+                                " can not be interoperated\n");
+                return -EINVAL;
+        }
+        if (cm_node->state != NES_CM_STATE_MPAREQ_SENT) {
+                if (memcmp(mpa_frame->key, IEFT_MPA_KEY_REQ, IETF_MPA_KEY_SIZE)) {
+                        nes_debug(NES_DBG_CM, "Unexpected MPA Key received \n");
+                        return -EINVAL;
+                }
+        } else {
+                if (memcmp(mpa_frame->key, IEFT_MPA_KEY_REP, IETF_MPA_KEY_SIZE)) {
+                        nes_debug(NES_DBG_CM, "Unexpected MPA Key received \n");
+                        return -EINVAL;
+                }
+        }
 
         if (cm_node->mpa_frame_size + sizeof(struct ietf_mpa_frame) != len) {
                 nes_debug(NES_DBG_CM, "The received ietf buffer was not right"
@@ -486,6 +514,8 @@ static void nes_retrans_expired(struct nes_cm_node *cm_node)
                 send_reset(cm_node, NULL);
                 break;
         default:
+                add_ref_cm_node(cm_node);
+                send_reset(cm_node, NULL);
                 create_event(cm_node, NES_CM_EVENT_ABORTED);
         }
 }
@@ -949,6 +979,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
                                 reset_entry);
                 {
                         struct nes_cm_node *loopback = cm_node->loopbackpartner;
+                        enum nes_cm_node_state old_state;
                         if (NES_CM_STATE_FIN_WAIT1 <= cm_node->state) {
                                 rem_ref_cm_node(cm_node->cm_core, cm_node);
                         } else {
@@ -960,11 +991,12 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
                                                          NES_CM_STATE_CLOSED;
                                                 WARN_ON(1);
                                         } else {
-                                                cm_node->state =
-                                                        NES_CM_STATE_CLOSED;
-                                                rem_ref_cm_node(
-                                                        cm_node->cm_core,
-                                                        cm_node);
+                                                old_state = cm_node->state;
+                                                cm_node->state = NES_CM_STATE_LISTENER_DESTROYED;
+                                                if (old_state != NES_CM_STATE_MPAREQ_RCVD)
+                                                        rem_ref_cm_node(
+                                                                cm_node->cm_core,
+                                                                cm_node);
                                         }
                                 } else {
                                         struct nes_cm_event event;
@@ -980,20 +1012,9 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
                                                          loopback->loc_port;
                                         event.cm_info.cm_id = loopback->cm_id;
                                         cm_event_connect_error(&event);
+                                        cm_node->state = NES_CM_STATE_LISTENER_DESTROYED;
                                         loopback->state = NES_CM_STATE_CLOSED;
 
-                                        event.cm_node = cm_node;
-                                        event.cm_info.rem_addr =
-                                                         cm_node->rem_addr;
-                                        event.cm_info.loc_addr =
-                                                         cm_node->loc_addr;
-                                        event.cm_info.rem_port =
-                                                         cm_node->rem_port;
-                                        event.cm_info.loc_port =
-                                                         cm_node->loc_port;
-                                        event.cm_info.cm_id = cm_node->cm_id;
-                                        cm_event_reset(&event);
-
                                         rem_ref_cm_node(cm_node->cm_core,
                                                          cm_node);
 
@@ -1077,12 +1098,13 @@ static inline int mini_cm_accelerated(struct nes_cm_core *cm_core,
 /**
  * nes_addr_resolve_neigh
  */
-static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip)
+static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpindex)
 {
         struct rtable *rt;
         struct flowi fl;
         struct neighbour *neigh;
-        int rc = -1;
+        int rc = arpindex;
+        struct nes_adapter *nesadapter = nesvnic->nesdev->nesadapter;
 
         memset(&fl, 0, sizeof fl);
         fl.nl_u.ip4_u.daddr = htonl(dst_ip);
@@ -1098,6 +1120,21 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip)
                         nes_debug(NES_DBG_CM, "Neighbor MAC address for 0x%08X"
                                   " is %pM, Gateway is 0x%08X \n", dst_ip,
                                   neigh->ha, ntohl(rt->rt_gateway));
+
+                        if (arpindex >= 0) {
+                                if (!memcmp(nesadapter->arp_table[arpindex].mac_addr,
+                                                        neigh->ha, ETH_ALEN)){
+                                        /* Mac address same as in nes_arp_table */
+                                        neigh_release(neigh);
+                                        ip_rt_put(rt);
+                                        return rc;
+                                }
+
+                                nes_manage_arp_cache(nesvnic->netdev,
+                                                nesadapter->arp_table[arpindex].mac_addr,
+                                                dst_ip, NES_ARP_DELETE);
+                        }
+
                         nes_manage_arp_cache(nesvnic->netdev, neigh->ha,
                                              dst_ip, NES_ARP_ADD);
                         rc = nes_arp_table(nesvnic->nesdev, dst_ip, NULL,
@@ -1113,7 +1150,6 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip)
         return rc;
 }
 
-
 /**
  * make_cm_node - create a new instance of a cm node
  */
@@ -1123,6 +1159,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
 {
         struct nes_cm_node *cm_node;
         struct timespec ts;
+        int oldarpindex = 0;
         int arpindex = 0;
         struct nes_device *nesdev;
         struct nes_adapter *nesadapter;
@@ -1176,17 +1213,18 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
         nesadapter = nesdev->nesadapter;
 
         cm_node->loopbackpartner = NULL;
+
         /* get the mac addr for the remote node */
         if (ipv4_is_loopback(htonl(cm_node->rem_addr)))
                 arpindex = nes_arp_table(nesdev, ntohl(nesvnic->local_ipaddr), NULL, NES_ARP_RESOLVE);
-        else
-                arpindex = nes_arp_table(nesdev, cm_node->rem_addr, NULL, NES_ARP_RESOLVE);
+        else {
+                oldarpindex = nes_arp_table(nesdev, cm_node->rem_addr, NULL, NES_ARP_RESOLVE);
+                arpindex = nes_addr_resolve_neigh(nesvnic, cm_info->rem_addr, oldarpindex);
+
+        }
         if (arpindex < 0) {
-                arpindex = nes_addr_resolve_neigh(nesvnic, cm_info->rem_addr);
-                if (arpindex < 0) {
-                        kfree(cm_node);
-                        return NULL;
-                }
+                kfree(cm_node);
+                return NULL;
         }
 
         /* copy the mac addr to node context */
@@ -1333,13 +1371,20 @@ static void handle_fin_pkt(struct nes_cm_node *cm_node)
         case NES_CM_STATE_SYN_RCVD:
         case NES_CM_STATE_SYN_SENT:
         case NES_CM_STATE_ESTABLISHED:
-        case NES_CM_STATE_MPAREQ_SENT:
         case NES_CM_STATE_MPAREJ_RCVD:
                 cm_node->tcp_cntxt.rcv_nxt++;
                 cleanup_retrans_entry(cm_node);
                 cm_node->state = NES_CM_STATE_LAST_ACK;
                 send_fin(cm_node, NULL);
                 break;
+        case NES_CM_STATE_MPAREQ_SENT:
+                create_event(cm_node, NES_CM_EVENT_ABORTED);
+                cm_node->tcp_cntxt.rcv_nxt++;
+                cleanup_retrans_entry(cm_node);
+                cm_node->state = NES_CM_STATE_CLOSED;
+                add_ref_cm_node(cm_node);
+                send_reset(cm_node, NULL);
+                break;
         case NES_CM_STATE_FIN_WAIT1:
                 cm_node->tcp_cntxt.rcv_nxt++;
                 cleanup_retrans_entry(cm_node);
@@ -1590,6 +1635,7 @@ static void handle_syn_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
                 break;
         case NES_CM_STATE_CLOSED:
                 cleanup_retrans_entry(cm_node);
+                add_ref_cm_node(cm_node);
                 send_reset(cm_node, skb);
                 break;
         case NES_CM_STATE_TSA:
@@ -1641,9 +1687,15 @@ static void handle_synack_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
                 passive_open_err(cm_node, skb, 1);
                 break;
         case NES_CM_STATE_LISTENING:
+                cm_node->tcp_cntxt.loc_seq_num = ntohl(tcph->ack_seq);
+                cleanup_retrans_entry(cm_node);
+                cm_node->state = NES_CM_STATE_CLOSED;
+                send_reset(cm_node, skb);
+                break;
         case NES_CM_STATE_CLOSED:
                 cm_node->tcp_cntxt.loc_seq_num = ntohl(tcph->ack_seq);
                 cleanup_retrans_entry(cm_node);
+                add_ref_cm_node(cm_node);
                 send_reset(cm_node, skb);
                 break;
         case NES_CM_STATE_ESTABLISHED:
@@ -1712,8 +1764,13 @@ static int handle_ack_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
                         dev_kfree_skb_any(skb);
                 break;
         case NES_CM_STATE_LISTENING:
+                cleanup_retrans_entry(cm_node);
+                cm_node->state = NES_CM_STATE_CLOSED;
+                send_reset(cm_node, skb);
+                break;
         case NES_CM_STATE_CLOSED:
                 cleanup_retrans_entry(cm_node);
+                add_ref_cm_node(cm_node);
                 send_reset(cm_node, skb);
                 break;
         case NES_CM_STATE_LAST_ACK:
@@ -1974,7 +2031,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
         if (!cm_node)
                 return NULL;
         mpa_frame = &cm_node->mpa_frame;
-        strcpy(mpa_frame->key, IEFT_MPA_KEY_REQ);
+        memcpy(mpa_frame->key, IEFT_MPA_KEY_REQ, IETF_MPA_KEY_SIZE);
         mpa_frame->flags = IETF_MPA_FLAGS_CRC;
         mpa_frame->rev =  IETF_MPA_VERSION;
         mpa_frame->priv_data_len = htons(private_data_len);
@@ -2102,30 +2159,39 @@ static int mini_cm_reject(struct nes_cm_core *cm_core,
                         cm_node->state = NES_CM_STATE_CLOSED;
                         rem_ref_cm_node(cm_core, cm_node);
                 } else {
-                        ret = send_mpa_reject(cm_node);
-                        if (ret) {
-                                cm_node->state = NES_CM_STATE_CLOSED;
-                                err = send_reset(cm_node, NULL);
-                                if (err)
-                                        WARN_ON(1);
-                        } else
-                                cm_id->add_ref(cm_id);
+                        if (cm_node->state == NES_CM_STATE_LISTENER_DESTROYED) {
+                                rem_ref_cm_node(cm_core, cm_node);
+                        } else {
+                                ret = send_mpa_reject(cm_node);
+                                if (ret) {
+                                        cm_node->state = NES_CM_STATE_CLOSED;
+                                        err = send_reset(cm_node, NULL);
+                                        if (err)
+                                                WARN_ON(1);
+                                } else
+                                        cm_id->add_ref(cm_id);
+                        }
                 }
         } else {
                 cm_node->cm_id = NULL;
-                event.cm_node = loopback;
-                event.cm_info.rem_addr = loopback->rem_addr;
-                event.cm_info.loc_addr = loopback->loc_addr;
-                event.cm_info.rem_port = loopback->rem_port;
-                event.cm_info.loc_port = loopback->loc_port;
-                event.cm_info.cm_id = loopback->cm_id;
-                cm_event_mpa_reject(&event);
-                rem_ref_cm_node(cm_core, cm_node);
-                loopback->state = NES_CM_STATE_CLOSING;
+                if (cm_node->state == NES_CM_STATE_LISTENER_DESTROYED) {
+                        rem_ref_cm_node(cm_core, cm_node);
+                        rem_ref_cm_node(cm_core, loopback);
+                } else {
+                        event.cm_node = loopback;
+                        event.cm_info.rem_addr = loopback->rem_addr;
+                        event.cm_info.loc_addr = loopback->loc_addr;
+                        event.cm_info.rem_port = loopback->rem_port;
+                        event.cm_info.loc_port = loopback->loc_port;
+                        event.cm_info.cm_id = loopback->cm_id;
+                        cm_event_mpa_reject(&event);
+                        rem_ref_cm_node(cm_core, cm_node);
+                        loopback->state = NES_CM_STATE_CLOSING;
 
-                cm_id = loopback->cm_id;
-                rem_ref_cm_node(cm_core, loopback);
-                cm_id->rem_ref(cm_id);
+                        cm_id = loopback->cm_id;
+                        rem_ref_cm_node(cm_core, loopback);
+                        cm_id->rem_ref(cm_id);
+                }
         }
 
         return ret;
@@ -2164,11 +2230,15 @@ static int mini_cm_close(struct nes_cm_core *cm_core, struct nes_cm_node *cm_nod
         case NES_CM_STATE_CLOSING:
                 ret = -1;
                 break;
-        case NES_CM_STATE_MPAREJ_RCVD:
         case NES_CM_STATE_LISTENING:
+                cleanup_retrans_entry(cm_node);
+                send_reset(cm_node, NULL);
+                break;
+        case NES_CM_STATE_MPAREJ_RCVD:
         case NES_CM_STATE_UNKNOWN:
         case NES_CM_STATE_INITED:
         case NES_CM_STATE_CLOSED:
+        case NES_CM_STATE_LISTENER_DESTROYED:
                 ret = rem_ref_cm_node(cm_core, cm_node);
                 break;
         case NES_CM_STATE_TSA:
@@ -2687,8 +2757,6 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
         struct nes_pd *nespd;
         u64 tagged_offset;
 
-
-
         ibqp = nes_get_qp(cm_id->device, conn_param->qpn);
         if (!ibqp)
                 return -EINVAL;
@@ -2704,6 +2772,13 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
                 "%s\n", cm_node, nesvnic, nesvnic->netdev,
                 nesvnic->netdev->name);
 
+        if (NES_CM_STATE_LISTENER_DESTROYED == cm_node->state) {
+                if (cm_node->loopbackpartner)
+                        rem_ref_cm_node(cm_node->cm_core, cm_node->loopbackpartner);
+                rem_ref_cm_node(cm_node->cm_core, cm_node);
+                return -EINVAL;
+        }
+
         /* associate the node with the QP */
         nesqp->cm_node = (void *)cm_node;
         cm_node->nesqp = nesqp;
@@ -2786,6 +2861,10 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
                         cpu_to_le32(conn_param->private_data_len +
                         sizeof(struct ietf_mpa_frame));
                 wqe->wqe_words[NES_IWARP_SQ_WQE_STAG0_IDX] = ibmr->lkey;
+                if (nesqp->sq_kmapped) {
+                        nesqp->sq_kmapped = 0;
+                        kunmap(nesqp->page);
+                }
 
                 nesqp->nesqp_context->ird_ord_sizes |=
                         cpu_to_le32(NES_QPCONTEXT_ORDIRD_LSMM_PRESENT |
@@ -2929,7 +3008,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
         if (cm_node->mpa_frame_size > MAX_CM_BUFFER)
                 return -EINVAL;
 
-        strcpy(&cm_node->mpa_frame.key[0], IEFT_MPA_KEY_REP);
+        memcpy(&cm_node->mpa_frame.key[0], IEFT_MPA_KEY_REP, IETF_MPA_KEY_SIZE);
         if (loopback) {
                 memcpy(&loopback->mpa_frame.priv_data, pdata, pdata_len);
                 loopback->mpa_frame.priv_data_len = pdata_len;
@@ -2974,6 +3053,9 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
         if (!nesdev)
                 return -EINVAL;
 
+        if (!(cm_id->local_addr.sin_port) || !(cm_id->remote_addr.sin_port))
+                return -EINVAL;
+
         nes_debug(NES_DBG_CM, "QP%u, current IP = 0x%08X, Destination IP = "
                 "0x%08X:0x%04X, local = 0x%08X:0x%04X.\n", nesqp->hwqp.qp_id,
                 ntohl(nesvnic->local_ipaddr),
@@ -3251,6 +3333,11 @@ static void cm_event_connected(struct nes_cm_event *event)
                 wqe->wqe_words[NES_IWARP_SQ_WQE_LENGTH0_IDX] = 0;
                 wqe->wqe_words[NES_IWARP_SQ_WQE_STAG0_IDX] = 0;
 
+                if (nesqp->sq_kmapped) {
+                        nesqp->sq_kmapped = 0;
+                        kunmap(nesqp->page);
+                }
+
                 /* use the reserved spot on the WQ for the extra first WQE */
                 nesqp->nesqp_context->ird_ord_sizes &=
                         cpu_to_le32(~(NES_QPCONTEXT_ORDIRD_LSMM_PRESENT |
@@ -3346,7 +3433,7 @@ static void cm_event_connect_error(struct nes_cm_event *event)
         nesqp->cm_id = NULL;
         cm_id->provider_data = NULL;
         cm_event.event = IW_CM_EVENT_CONNECT_REPLY;
-        cm_event.status = IW_CM_EVENT_STATUS_REJECTED;
+        cm_event.status = -ECONNRESET;
         cm_event.provider_data = cm_id->provider_data;
         cm_event.local_addr = cm_id->local_addr;
         cm_event.remote_addr = cm_id->remote_addr;
@@ -3390,6 +3477,8 @@ static void cm_event_reset(struct nes_cm_event *event)
 
         nes_debug(NES_DBG_CM, "%p - cm_id = %p\n", event->cm_node, cm_id);
         nesqp = cm_id->provider_data;
+        if (!nesqp)
+                return;
 
         nesqp->cm_id = NULL;
         /* cm_id->provider_data = NULL; */
@@ -3401,8 +3490,8 @@ static void cm_event_reset(struct nes_cm_event *event)
         cm_event.private_data = NULL;
         cm_event.private_data_len = 0;
 
-        ret = cm_id->event_handler(cm_id, &cm_event);
         cm_id->add_ref(cm_id);
+        ret = cm_id->event_handler(cm_id, &cm_event);
         atomic_inc(&cm_closes);
         cm_event.event = IW_CM_EVENT_CLOSE;
         cm_event.status = IW_CM_EVENT_STATUS_OK;
diff --git a/drivers/infiniband/hw/nes/nes_cm.h b/drivers/infiniband/hw/nes/nes_cm.h
index 90e8e4d8a5ce..d9825fda70a1 100644
--- a/drivers/infiniband/hw/nes/nes_cm.h
+++ b/drivers/infiniband/hw/nes/nes_cm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+ * Copyright (c) 2006 - 2009 Intel Corporation.  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
@@ -47,6 +47,8 @@
 #define IEFT_MPA_KEY_REP  "MPA ID Rep Frame"
 #define IETF_MPA_KEY_SIZE 16
 #define IETF_MPA_VERSION  1
+#define IETF_MAX_PRIV_DATA_LEN 512
+#define IETF_MPA_FRAME_SIZE     20
 
 enum ietf_mpa_flags {
         IETF_MPA_FLAGS_MARKERS = 0x80,  /* receive Markers */
@@ -169,7 +171,7 @@ struct nes_timer_entry {
 
 #define NES_CM_DEF_SEQ2      0x18ed5740
 #define NES_CM_DEF_LOCAL_ID2 0xb807
-#define MAX_CM_BUFFER   512
+#define MAX_CM_BUFFER   (IETF_MPA_FRAME_SIZE + IETF_MAX_PRIV_DATA_LEN)
 
 
 typedef u32 nes_addr_t;
@@ -198,6 +200,7 @@ enum nes_cm_node_state {
         NES_CM_STATE_TIME_WAIT,
         NES_CM_STATE_LAST_ACK,
         NES_CM_STATE_CLOSING,
+        NES_CM_STATE_LISTENER_DESTROYED,
         NES_CM_STATE_CLOSED
 };
 
diff --git a/drivers/infiniband/hw/nes/nes_context.h b/drivers/infiniband/hw/nes/nes_context.h
index 0fb8d81d9a62..b4393a16099d 100644
--- a/drivers/infiniband/hw/nes/nes_context.h
+++ b/drivers/infiniband/hw/nes/nes_context.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+ * Copyright (c) 2006 - 2009 Intel Corporation.  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
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 3512d6de3019..b1c2cbb88f09 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+ * Copyright (c) 2006 - 2009 Intel Corporation.  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
@@ -424,8 +424,9 @@ struct nes_adapter *nes_init_adapter(struct nes_device *nesdev, u8 hw_rev) {
 
         nesadapter->base_pd = 1;
 
-        nesadapter->device_cap_flags =
-                IB_DEVICE_LOCAL_DMA_LKEY | IB_DEVICE_MEM_WINDOW;
+        nesadapter->device_cap_flags = IB_DEVICE_LOCAL_DMA_LKEY |
+                                       IB_DEVICE_MEM_WINDOW |
+                                       IB_DEVICE_MEM_MGT_EXTENSIONS;
 
         nesadapter->allocated_qps = (unsigned long *)&(((unsigned char *)nesadapter)
                         [(sizeof(struct nes_adapter)+(sizeof(unsigned long)-1))&(~(sizeof(unsigned long)-1))]);
@@ -436,11 +437,12 @@ struct nes_adapter *nes_init_adapter(struct nes_device *nesdev, u8 hw_rev) {
         nesadapter->qp_table = (struct nes_qp **)(&nesadapter->allocated_arps[BITS_TO_LONGS(arp_table_size)]);
 
 
-        /* mark the usual suspect QPs and CQs as in use */
+        /* mark the usual suspect QPs, MR and CQs as in use */
         for (u32temp = 0; u32temp < NES_FIRST_QPN; u32temp++) {
                 set_bit(u32temp, nesadapter->allocated_qps);
                 set_bit(u32temp, nesadapter->allocated_cqs);
         }
+        set_bit(0, nesadapter->allocated_mrs);
 
         for (u32temp = 0; u32temp < 20; u32temp++)
                 set_bit(u32temp, nesadapter->allocated_pds);
@@ -481,7 +483,7 @@ struct nes_adapter *nes_init_adapter(struct nes_device *nesdev, u8 hw_rev) {
         nesadapter->max_irrq_wr = (u32temp >> 16) & 3;
 
         nesadapter->max_sge = 4;
-        nesadapter->max_cqe = 32767;
+        nesadapter->max_cqe = 32766;
 
         if (nes_read_eeprom_values(nesdev, nesadapter)) {
                 printk(KERN_ERR PFX "Unable to read EEPROM data.\n");
@@ -1355,6 +1357,8 @@ int nes_init_phy(struct nes_device *nesdev)
         }
         if ((phy_type == NES_PHY_TYPE_ARGUS) ||
             (phy_type == NES_PHY_TYPE_SFP_D)) {
+                u32 first_time = 1;
+
                 /* Check firmware heartbeat */
                 nes_read_10G_phy_reg(nesdev, phy_index, 0x3, 0xd7ee);
                 temp_phy_data = (u16)nes_read_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL);
@@ -1362,8 +1366,13 @@ int nes_init_phy(struct nes_device *nesdev)
                 nes_read_10G_phy_reg(nesdev, phy_index, 0x3, 0xd7ee);
                 temp_phy_data2 = (u16)nes_read_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL);
 
-                if (temp_phy_data != temp_phy_data2)
-                        return 0;
+                if (temp_phy_data != temp_phy_data2) {
+                        nes_read_10G_phy_reg(nesdev, phy_index, 0x3, 0xd7fd);
+                        temp_phy_data = (u16)nes_read_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL);
+                        if ((temp_phy_data & 0xff) > 0x20)
+                                return 0;
+                        printk(PFX "Reinitializing PHY\n");
+                }
 
                 /* no heartbeat, configure the PHY */
                 nes_write_10G_phy_reg(nesdev, phy_index, 0x1, 0x0000, 0x8000);
@@ -1399,7 +1408,7 @@ int nes_init_phy(struct nes_device *nesdev)
                 temp_phy_data = (u16)nes_read_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL);
                 do {
                         if (counter++ > 150) {
-                                nes_debug(NES_DBG_PHY, "No PHY heartbeat\n");
+                                printk(PFX "No PHY heartbeat\n");
                                 break;
                         }
                         mdelay(1);
@@ -1413,11 +1422,20 @@ int nes_init_phy(struct nes_device *nesdev)
                         nes_read_10G_phy_reg(nesdev, phy_index, 0x3, 0xd7fd);
                         temp_phy_data = (u16)nes_read_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL);
                         if (counter++ > 300) {
-                                nes_debug(NES_DBG_PHY, "PHY did not track\n");
-                                break;
+                                if (((temp_phy_data & 0xff) == 0x0) && first_time) {
+                                        first_time = 0;
+                                        counter = 0;
+                                        /* reset AMCC PHY and try again */
+                                        nes_write_10G_phy_reg(nesdev, phy_index, 0x3, 0xe854, 0x00c0);
+                                        nes_write_10G_phy_reg(nesdev, phy_index, 0x3, 0xe854, 0x0040);
+                                        continue;
+                                } else {
+                                        printk(PFX "PHY did not track\n");
+                                        break;
+                                }
                         }
                         mdelay(10);
-                } while (((temp_phy_data & 0xff) != 0x50) && ((temp_phy_data & 0xff) != 0x70));
+                } while ((temp_phy_data & 0xff) < 0x30);
 
                 /* setup signal integrity */
                 nes_write_10G_phy_reg(nesdev, phy_index, 0x1, 0xd003, 0x0000);
diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h
index f28a41ba9fa1..084be0ee689b 100644
--- a/drivers/infiniband/hw/nes/nes_hw.h
+++ b/drivers/infiniband/hw/nes/nes_hw.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+* Copyright (c) 2006 - 2009 Intel Corporation.  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
@@ -546,11 +546,23 @@ enum nes_iwarp_sq_fmr_wqe_word_idx {
         NES_IWARP_SQ_FMR_WQE_PBL_LENGTH_IDX = 14,
 };
 
+enum nes_iwarp_sq_fmr_opcodes {
+        NES_IWARP_SQ_FMR_WQE_ZERO_BASED                 = (1<<6),
+        NES_IWARP_SQ_FMR_WQE_PAGE_SIZE_4K               = (0<<7),
+        NES_IWARP_SQ_FMR_WQE_PAGE_SIZE_2M               = (1<<7),
+        NES_IWARP_SQ_FMR_WQE_RIGHTS_ENABLE_LOCAL_READ   = (1<<16),
+        NES_IWARP_SQ_FMR_WQE_RIGHTS_ENABLE_LOCAL_WRITE  = (1<<17),
+        NES_IWARP_SQ_FMR_WQE_RIGHTS_ENABLE_REMOTE_READ  = (1<<18),
+        NES_IWARP_SQ_FMR_WQE_RIGHTS_ENABLE_REMOTE_WRITE = (1<<19),
+        NES_IWARP_SQ_FMR_WQE_RIGHTS_ENABLE_WINDOW_BIND  = (1<<20),
+};
+
+#define NES_IWARP_SQ_FMR_WQE_MR_LENGTH_HIGH_MASK        0xFF;
+
 enum nes_iwarp_sq_locinv_wqe_word_idx {
         NES_IWARP_SQ_LOCINV_WQE_INV_STAG_IDX = 6,
 };
 
-
 enum nes_iwarp_rq_wqe_word_idx {
         NES_IWARP_RQ_WQE_TOTAL_PAYLOAD_IDX = 1,
         NES_IWARP_RQ_WQE_COMP_CTX_LOW_IDX = 2,
@@ -1153,6 +1165,19 @@ struct nes_pbl {
         /* TODO: need to add list for two level tables */
 };
 
+#define NES_4K_PBL_CHUNK_SIZE   4096
+
+struct nes_fast_mr_wqe_pbl {
+        u64             *kva;
+        dma_addr_t      paddr;
+};
+
+struct nes_ib_fast_reg_page_list {
+        struct ib_fast_reg_page_list    ibfrpl;
+        struct nes_fast_mr_wqe_pbl      nes_wqe_pbl;
+        u64                             pbl;
+};
+
 struct nes_listener {
         struct work_struct      work;
         struct workqueue_struct *wq;
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index de18fdfdadf2..ab1102780186 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+ * Copyright (c) 2006 - 2009 Intel Corporation.  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
diff --git a/drivers/infiniband/hw/nes/nes_user.h b/drivers/infiniband/hw/nes/nes_user.h
index cc90c14b49eb..71e133ab209b 100644
--- a/drivers/infiniband/hw/nes/nes_user.h
+++ b/drivers/infiniband/hw/nes/nes_user.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+ * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
  * Copyright (c) 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Cisco Systems.  All rights reserved.
  * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
@@ -86,6 +86,7 @@ enum iwnes_memreg_type {
         IWNES_MEMREG_TYPE_CQ = 0x0002,
         IWNES_MEMREG_TYPE_MW = 0x0003,
         IWNES_MEMREG_TYPE_FMR = 0x0004,
+        IWNES_MEMREG_TYPE_FMEM = 0x0005,
 };
 
 struct nes_mem_reg_req {
diff --git a/drivers/infiniband/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c
index 9687c397ce1a..729d525c5b70 100644
--- a/drivers/infiniband/hw/nes/nes_utils.c
+++ b/drivers/infiniband/hw/nes/nes_utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+ * Copyright (c) 2006 - 2009 Intel Corporation.  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
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index a680c42d6e8c..64d3136e3747 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+ * Copyright (c) 2006 - 2009 Intel Corporation.  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
@@ -275,342 +275,236 @@ static int nes_bind_mw(struct ib_qp *ibqp, struct ib_mw *ibmw,
 }
 
 
-/**
- * nes_alloc_fmr
+/*
+ * nes_alloc_fast_mr
  */
-static struct ib_fmr *nes_alloc_fmr(struct ib_pd *ibpd,
-                int ibmr_access_flags,
-                struct ib_fmr_attr *ibfmr_attr)
+static int alloc_fast_reg_mr(struct nes_device *nesdev, struct nes_pd *nespd,
+                             u32 stag, u32 page_count)
 {
-        unsigned long flags;
-        struct nes_pd *nespd = to_nespd(ibpd);
-        struct nes_vnic *nesvnic = to_nesvnic(ibpd->device);
-        struct nes_device *nesdev = nesvnic->nesdev;
-        struct nes_adapter *nesadapter = nesdev->nesadapter;
-        struct nes_fmr *nesfmr;
-        struct nes_cqp_request *cqp_request;
         struct nes_hw_cqp_wqe *cqp_wqe;
+        struct nes_cqp_request *cqp_request;
+        unsigned long flags;
         int ret;
-        u32 stag;
-        u32 stag_index = 0;
-        u32 next_stag_index = 0;
-        u32 driver_key = 0;
+        struct nes_adapter *nesadapter = nesdev->nesadapter;
         u32 opcode = 0;
-        u8 stag_key = 0;
-        int i=0;
-        struct nes_vpbl vpbl;
-
-        get_random_bytes(&next_stag_index, sizeof(next_stag_index));
-        stag_key = (u8)next_stag_index;
-
-        driver_key = 0;
-
-        next_stag_index >>= 8;
-        next_stag_index %= nesadapter->max_mr;
-
-        ret = nes_alloc_resource(nesadapter, nesadapter->allocated_mrs,
-                        nesadapter->max_mr, &stag_index, &next_stag_index);
-        if (ret) {
-                goto failed_resource_alloc;
-        }
-
-        nesfmr = kzalloc(sizeof(*nesfmr), GFP_KERNEL);
-        if (!nesfmr) {
-                ret = -ENOMEM;
-                goto failed_fmr_alloc;
-        }
-
-        nesfmr->nesmr.mode = IWNES_MEMREG_TYPE_FMR;
-        if (ibfmr_attr->max_pages == 1) {
-                /* use zero length PBL */
-                nesfmr->nesmr.pbl_4k = 0;
-                nesfmr->nesmr.pbls_used = 0;
-        } else if (ibfmr_attr->max_pages <= 32) {
-                /* use PBL 256 */
-                nesfmr->nesmr.pbl_4k = 0;
-                nesfmr->nesmr.pbls_used = 1;
-        } else if (ibfmr_attr->max_pages <= 512) {
-                /* use 4K PBLs */
-                nesfmr->nesmr.pbl_4k = 1;
-                nesfmr->nesmr.pbls_used = 1;
-        } else {
-                /* use two level 4K PBLs */
-                /* add support for two level 256B PBLs */
-                nesfmr->nesmr.pbl_4k = 1;
-                nesfmr->nesmr.pbls_used = 1 + (ibfmr_attr->max_pages >> 9) +
-                                ((ibfmr_attr->max_pages & 511) ? 1 : 0);
-        }
-        /* Register the region with the adapter */
-        spin_lock_irqsave(&nesadapter->pbl_lock, flags);
-
-        /* track PBL resources */
-        if (nesfmr->nesmr.pbls_used != 0) {
-                if (nesfmr->nesmr.pbl_4k) {
-                        if (nesfmr->nesmr.pbls_used > nesadapter->free_4kpbl) {
-                                spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                                ret = -ENOMEM;
-                                goto failed_vpbl_avail;
-                        } else {
-                                nesadapter->free_4kpbl -= nesfmr->nesmr.pbls_used;
-                        }
-                } else {
-                        if (nesfmr->nesmr.pbls_used > nesadapter->free_256pbl) {
-                                spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                                ret = -ENOMEM;
-                                goto failed_vpbl_avail;
-                        } else {
-                                nesadapter->free_256pbl -= nesfmr->nesmr.pbls_used;
-                        }
-                }
-        }
-
-        /* one level pbl */
-        if (nesfmr->nesmr.pbls_used == 0) {
-                nesfmr->root_vpbl.pbl_vbase = NULL;
-                nes_debug(NES_DBG_MR,  "zero level pbl \n");
-        } else if (nesfmr->nesmr.pbls_used == 1) {
-                /* can change it to kmalloc & dma_map_single */
-                nesfmr->root_vpbl.pbl_vbase = pci_alloc_consistent(nesdev->pcidev, 4096,
-                                &nesfmr->root_vpbl.pbl_pbase);
-                if (!nesfmr->root_vpbl.pbl_vbase) {
-                        spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                        ret = -ENOMEM;
-                        goto failed_vpbl_alloc;
-                }
-                nesfmr->leaf_pbl_cnt = 0;
-                nes_debug(NES_DBG_MR, "one level pbl, root_vpbl.pbl_vbase=%p \n",
-                                nesfmr->root_vpbl.pbl_vbase);
-        }
-        /* two level pbl */
-        else {
-                nesfmr->root_vpbl.pbl_vbase = pci_alloc_consistent(nesdev->pcidev, 8192,
-                                &nesfmr->root_vpbl.pbl_pbase);
-                if (!nesfmr->root_vpbl.pbl_vbase) {
-                        spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                        ret = -ENOMEM;
-                        goto failed_vpbl_alloc;
-                }
-
-                nesfmr->leaf_pbl_cnt = nesfmr->nesmr.pbls_used-1;
-                nesfmr->root_vpbl.leaf_vpbl = kzalloc(sizeof(*nesfmr->root_vpbl.leaf_vpbl)*1024, GFP_ATOMIC);
-                if (!nesfmr->root_vpbl.leaf_vpbl) {
-                        spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                        ret = -ENOMEM;
-                        goto failed_leaf_vpbl_alloc;
-                }
-
-                nes_debug(NES_DBG_MR, "two level pbl, root_vpbl.pbl_vbase=%p"
-                                " leaf_pbl_cnt=%d root_vpbl.leaf_vpbl=%p\n",
-                                nesfmr->root_vpbl.pbl_vbase, nesfmr->leaf_pbl_cnt, nesfmr->root_vpbl.leaf_vpbl);
-
-                for (i=0; i<nesfmr->leaf_pbl_cnt; i++)
-                        nesfmr->root_vpbl.leaf_vpbl[i].pbl_vbase = NULL;
-
-                for (i=0; i<nesfmr->leaf_pbl_cnt; i++) {
-                        vpbl.pbl_vbase = pci_alloc_consistent(nesdev->pcidev, 4096,
-                                        &vpbl.pbl_pbase);
-
-                        if (!vpbl.pbl_vbase) {
-                                ret = -ENOMEM;
-                                spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
-                                goto failed_leaf_vpbl_pages_alloc;
-                        }
-
-                        nesfmr->root_vpbl.pbl_vbase[i].pa_low = cpu_to_le32((u32)vpbl.pbl_pbase);
-                        nesfmr->root_vpbl.pbl_vbase[i].pa_high = cpu_to_le32((u32)((((u64)vpbl.pbl_pbase)>>32)));
-                        nesfmr->root_vpbl.leaf_vpbl[i] = vpbl;
-
-                        nes_debug(NES_DBG_MR, "pbase_low=0x%x, pbase_high=0x%x, vpbl=%p\n",
-                                        nesfmr->root_vpbl.pbl_vbase[i].pa_low,
-                                        nesfmr->root_vpbl.pbl_vbase[i].pa_high,
-                                        &nesfmr->root_vpbl.leaf_vpbl[i]);
-                }
-        }
-        nesfmr->ib_qp = NULL;
-        nesfmr->access_rights =0;
+        u16 major_code;
+        u64 region_length = page_count * PAGE_SIZE;
 
-        stag = stag_index << 8;
-        stag |= driver_key;
-        stag += (u32)stag_key;
 
-        spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
         cqp_request = nes_get_cqp_request(nesdev);
         if (cqp_request == NULL) {
                 nes_debug(NES_DBG_MR, "Failed to get a cqp_request.\n");
-                ret = -ENOMEM;
-                goto failed_leaf_vpbl_pages_alloc;
+                return -ENOMEM;
         }
+        nes_debug(NES_DBG_MR, "alloc_fast_reg_mr: page_count = %d, "
+                              "region_length = %llu\n",
+                              page_count, region_length);
         cqp_request->waiting = 1;
         cqp_wqe = &cqp_request->cqp_wqe;
 
-        nes_debug(NES_DBG_MR, "Registering STag 0x%08X, index = 0x%08X\n",
-                        stag, stag_index);
-
-        opcode = NES_CQP_ALLOCATE_STAG | NES_CQP_STAG_VA_TO | NES_CQP_STAG_MR;
-
-        if (nesfmr->nesmr.pbl_4k == 1)
-                opcode |= NES_CQP_STAG_PBL_BLK_SIZE;
-
-        if (ibmr_access_flags & IB_ACCESS_REMOTE_WRITE) {
-                opcode |= NES_CQP_STAG_RIGHTS_REMOTE_WRITE |
-                                NES_CQP_STAG_RIGHTS_LOCAL_WRITE | NES_CQP_STAG_REM_ACC_EN;
-                nesfmr->access_rights |=
-                                NES_CQP_STAG_RIGHTS_REMOTE_WRITE | NES_CQP_STAG_RIGHTS_LOCAL_WRITE |
-                                NES_CQP_STAG_REM_ACC_EN;
+        spin_lock_irqsave(&nesadapter->pbl_lock, flags);
+        if (nesadapter->free_4kpbl > 0) {
+                nesadapter->free_4kpbl--;
+                spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
+        } else {
+                /* No 4kpbl's available: */
+                spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
+                nes_debug(NES_DBG_MR, "Out of Pbls\n");
+                nes_free_cqp_request(nesdev, cqp_request);
+                return -ENOMEM;
         }
 
-        if (ibmr_access_flags & IB_ACCESS_REMOTE_READ) {
-                opcode |= NES_CQP_STAG_RIGHTS_REMOTE_READ |
-                                NES_CQP_STAG_RIGHTS_LOCAL_READ | NES_CQP_STAG_REM_ACC_EN;
-                nesfmr->access_rights |=
-                                NES_CQP_STAG_RIGHTS_REMOTE_READ | NES_CQP_STAG_RIGHTS_LOCAL_READ |
-                                NES_CQP_STAG_REM_ACC_EN;
-        }
+        opcode = NES_CQP_ALLOCATE_STAG | NES_CQP_STAG_MR |
+                 NES_CQP_STAG_PBL_BLK_SIZE | NES_CQP_STAG_VA_TO |
+                 NES_CQP_STAG_REM_ACC_EN;
+        /*
+         * The current OFED API does not support the zero based TO option.
+         * If added then need to changed the NES_CQP_STAG_VA* option.  Also,
+         * the API does not support that ability to have the MR set for local
+         * access only when created and not allow the SQ op to override. Given
+         * this the remote enable must be set here.
+         */
 
         nes_fill_init_cqp_wqe(cqp_wqe, nesdev);
         set_wqe_32bit_value(cqp_wqe->wqe_words, NES_CQP_WQE_OPCODE_IDX, opcode);
-        set_wqe_32bit_value(cqp_wqe->wqe_words, NES_CQP_STAG_WQE_LEN_HIGH_PD_IDX, (nespd->pd_id & 0x00007fff));
-        set_wqe_32bit_value(cqp_wqe->wqe_words, NES_CQP_STAG_WQE_STAG_IDX, stag);
+        set_wqe_32bit_value(cqp_wqe->wqe_words, NES_CQP_STAG_WQE_PBL_BLK_COUNT_IDX, 1);
 
-        cqp_wqe->wqe_words[NES_CQP_STAG_WQE_PBL_BLK_COUNT_IDX] =
-                        cpu_to_le32((nesfmr->nesmr.pbls_used>1) ?
-                        (nesfmr->nesmr.pbls_used-1) : nesfmr->nesmr.pbls_used);
+        cqp_wqe->wqe_words[NES_CQP_STAG_WQE_LEN_HIGH_PD_IDX] =
+                        cpu_to_le32((u32)(region_length >> 8) & 0xff000000);
+        cqp_wqe->wqe_words[NES_CQP_STAG_WQE_LEN_HIGH_PD_IDX] |=
+                        cpu_to_le32(nespd->pd_id & 0x00007fff);
+
+        set_wqe_32bit_value(cqp_wqe->wqe_words, NES_CQP_STAG_WQE_STAG_IDX, stag);
+        set_wqe_64bit_value(cqp_wqe->wqe_words, NES_CQP_STAG_WQE_VA_LOW_IDX, 0);
+        set_wqe_32bit_value(cqp_wqe->wqe_words, NES_CQP_STAG_WQE_LEN_LOW_IDX, 0);
+        set_wqe_64bit_value(cqp_wqe->wqe_words, NES_CQP_STAG_WQE_PA_LOW_IDX, 0);
+        set_wqe_32bit_value(cqp_wqe->wqe_words, NES_CQP_STAG_WQE_PBL_LEN_IDX, (page_count * 8));
+        cqp_wqe->wqe_words[NES_CQP_WQE_OPCODE_IDX] |= cpu_to_le32(NES_CQP_STAG_PBL_BLK_SIZE);
+        barrier();
 
         atomic_set(&cqp_request->refcount, 2);
         nes_post_cqp_request(nesdev, cqp_request);
 
         /* Wait for CQP */
-        ret = wait_event_timeout(cqp_request->waitq, (cqp_request->request_done != 0),
-                        NES_EVENT_TIMEOUT);
-        nes_debug(NES_DBG_MR, "Register STag 0x%08X completed, wait_event_timeout ret = %u,"
-                        " CQP Major:Minor codes = 0x%04X:0x%04X.\n",
-                        stag, ret, cqp_request->major_code, cqp_request->minor_code);
-
-        if ((!ret) || (cqp_request->major_code)) {
-                nes_put_cqp_request(nesdev, cqp_request);
-                ret = (!ret) ? -ETIME : -EIO;
-                goto failed_leaf_vpbl_pages_alloc;
-        }
+        ret = wait_event_timeout(cqp_request->waitq,
+                                 (0 != cqp_request->request_done),
+                                 NES_EVENT_TIMEOUT);
+
+        nes_debug(NES_DBG_MR, "Allocate STag 0x%08X completed, "
+                  "wait_event_timeout ret = %u, CQP Major:Minor codes = "
+                  "0x%04X:0x%04X.\n", stag, ret, cqp_request->major_code,
+                  cqp_request->minor_code);
+        major_code = cqp_request->major_code;
         nes_put_cqp_request(nesdev, cqp_request);
-        nesfmr->nesmr.ibfmr.lkey = stag;
-        nesfmr->nesmr.ibfmr.rkey = stag;
-        nesfmr->attr = *ibfmr_attr;
-
-        return &nesfmr->nesmr.ibfmr;
-
-        failed_leaf_vpbl_pages_alloc:
-        /* unroll all allocated pages */
-        for (i=0; i<nesfmr->leaf_pbl_cnt; i++) {
-                if (nesfmr->root_vpbl.leaf_vpbl[i].pbl_vbase) {
-                        pci_free_consistent(nesdev->pcidev, 4096, nesfmr->root_vpbl.leaf_vpbl[i].pbl_vbase,
-                                        nesfmr->root_vpbl.leaf_vpbl[i].pbl_pbase);
-                }
-        }
-        if (nesfmr->root_vpbl.leaf_vpbl)
-                kfree(nesfmr->root_vpbl.leaf_vpbl);
 
-        failed_leaf_vpbl_alloc:
-        if (nesfmr->leaf_pbl_cnt == 0) {
-                if (nesfmr->root_vpbl.pbl_vbase)
-                        pci_free_consistent(nesdev->pcidev, 4096, nesfmr->root_vpbl.pbl_vbase,
-                                        nesfmr->root_vpbl.pbl_pbase);
-        } else
-                pci_free_consistent(nesdev->pcidev, 8192, nesfmr->root_vpbl.pbl_vbase,
-                                nesfmr->root_vpbl.pbl_pbase);
-
-        failed_vpbl_alloc:
-        if (nesfmr->nesmr.pbls_used != 0) {
+        if (!ret || major_code) {
                 spin_lock_irqsave(&nesadapter->pbl_lock, flags);
-                if (nesfmr->nesmr.pbl_4k)
-                        nesadapter->free_4kpbl += nesfmr->nesmr.pbls_used;
-                else
-                        nesadapter->free_256pbl += nesfmr->nesmr.pbls_used;
+                nesadapter->free_4kpbl++;
                 spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
         }
 
-failed_vpbl_avail:
-        kfree(nesfmr);
-
-        failed_fmr_alloc:
-        nes_free_resource(nesadapter, nesadapter->allocated_mrs, stag_index);
-
-        failed_resource_alloc:
-        return ERR_PTR(ret);
+        if (!ret)
+                return -ETIME;
+        else if (major_code)
+                return -EIO;
+        return 0;
 }
 
-
-/**
- * nes_dealloc_fmr
+/*
+ * nes_alloc_fast_reg_mr
  */
-static int nes_dealloc_fmr(struct ib_fmr *ibfmr)
+struct ib_mr *nes_alloc_fast_reg_mr(struct ib_pd *ibpd, int max_page_list_len)
 {
-        unsigned long flags;
-        struct nes_mr *nesmr = to_nesmr_from_ibfmr(ibfmr);
-        struct nes_fmr *nesfmr = to_nesfmr(nesmr);
-        struct nes_vnic *nesvnic = to_nesvnic(ibfmr->device);
+        struct nes_pd *nespd = to_nespd(ibpd);
+        struct nes_vnic *nesvnic = to_nesvnic(ibpd->device);
         struct nes_device *nesdev = nesvnic->nesdev;
         struct nes_adapter *nesadapter = nesdev->nesadapter;
-        int i = 0;
-        int rc;
 
-        /* free the resources */
-        if (nesfmr->leaf_pbl_cnt == 0) {
-                /* single PBL case */
-                if (nesfmr->root_vpbl.pbl_vbase)
-                        pci_free_consistent(nesdev->pcidev, 4096, nesfmr->root_vpbl.pbl_vbase,
-                                        nesfmr->root_vpbl.pbl_pbase);
-        } else {
-                for (i = 0; i < nesfmr->leaf_pbl_cnt; i++) {
-                        pci_free_consistent(nesdev->pcidev, 4096, nesfmr->root_vpbl.leaf_vpbl[i].pbl_vbase,
-                                        nesfmr->root_vpbl.leaf_vpbl[i].pbl_pbase);
-                }
-                kfree(nesfmr->root_vpbl.leaf_vpbl);
-                pci_free_consistent(nesdev->pcidev, 8192, nesfmr->root_vpbl.pbl_vbase,
-                                nesfmr->root_vpbl.pbl_pbase);
-        }
-        nesmr->ibmw.device = ibfmr->device;
-        nesmr->ibmw.pd = ibfmr->pd;
-        nesmr->ibmw.rkey = ibfmr->rkey;
-        nesmr->ibmw.uobject = NULL;
+        u32 next_stag_index;
+        u8 stag_key = 0;
+        u32 driver_key = 0;
+        int err = 0;
+        u32 stag_index = 0;
+        struct nes_mr *nesmr;
+        u32 stag;
+        int ret;
+        struct ib_mr *ibmr;
+/*
+ * Note:  Set to always use a fixed length single page entry PBL.  This is to allow
+ *       for the fast_reg_mr operation to always know the size of the PBL.
+ */
+        if (max_page_list_len > (NES_4K_PBL_CHUNK_SIZE / sizeof(u64)))
+                return ERR_PTR(-E2BIG);
 
-        rc = nes_dealloc_mw(&nesmr->ibmw);
+        get_random_bytes(&next_stag_index, sizeof(next_stag_index));
+        stag_key = (u8)next_stag_index;
+        next_stag_index >>= 8;
+        next_stag_index %= nesadapter->max_mr;
 
-        if ((rc == 0) && (nesfmr->nesmr.pbls_used != 0)) {
-                spin_lock_irqsave(&nesadapter->pbl_lock, flags);
-                if (nesfmr->nesmr.pbl_4k) {
-                        nesadapter->free_4kpbl += nesfmr->nesmr.pbls_used;
-                        WARN_ON(nesadapter->free_4kpbl > nesadapter->max_4kpbl);
-                } else {
-                        nesadapter->free_256pbl += nesfmr->nesmr.pbls_used;
-                        WARN_ON(nesadapter->free_256pbl > nesadapter->max_256pbl);
-                }
-                spin_unlock_irqrestore(&nesadapter->pbl_lock, flags);
+        err = nes_alloc_resource(nesadapter, nesadapter->allocated_mrs,
+                                 nesadapter->max_mr, &stag_index,
+                                 &next_stag_index);
+        if (err)
+                return ERR_PTR(err);
+
+        nesmr = kzalloc(sizeof(*nesmr), GFP_KERNEL);
+        if (!nesmr) {
+                nes_free_resource(nesadapter, nesadapter->allocated_mrs, stag_index);
+                return ERR_PTR(-ENOMEM);
         }
 
-        return rc;
-}
+        stag = stag_index << 8;
+        stag |= driver_key;
+        stag += (u32)stag_key;
 
+        nes_debug(NES_DBG_MR, "Allocating STag 0x%08X index = 0x%08X\n",
+                  stag, stag_index);
 
-/**
- * nes_map_phys_fmr
+        ret = alloc_fast_reg_mr(nesdev, nespd, stag, max_page_list_len);
+
+        if (ret == 0) {
+                nesmr->ibmr.rkey = stag;
+                nesmr->ibmr.lkey = stag;
+                nesmr->mode = IWNES_MEMREG_TYPE_FMEM;
+                ibmr = &nesmr->ibmr;
+        } else {
+                kfree(nesmr);
+                nes_free_resource(nesadapter, nesadapter->allocated_mrs, stag_index);
+                ibmr = ERR_PTR(-ENOMEM);
+        }
+        return ibmr;
+}
+
+/*
+ * nes_alloc_fast_reg_page_list
  */
-static int nes_map_phys_fmr(struct ib_fmr *ibfmr, u64 *page_list,
-                int list_len, u64 iova)
+static struct ib_fast_reg_page_list *nes_alloc_fast_reg_page_list(
+                                                        struct ib_device *ibdev,
+                                                        int page_list_len)
 {
-        return 0;
-}
+        struct nes_vnic *nesvnic = to_nesvnic(ibdev);
+        struct nes_device *nesdev = nesvnic->nesdev;
+        struct ib_fast_reg_page_list *pifrpl;
+        struct nes_ib_fast_reg_page_list *pnesfrpl;
 
+        if (page_list_len > (NES_4K_PBL_CHUNK_SIZE / sizeof(u64)))
+                return ERR_PTR(-E2BIG);
+        /*
+         * Allocate the ib_fast_reg_page_list structure, the
+         * nes_fast_bpl structure, and the PLB table.
+         */
+        pnesfrpl = kmalloc(sizeof(struct nes_ib_fast_reg_page_list) +
+                           page_list_len * sizeof(u64), GFP_KERNEL);
+
+        if (!pnesfrpl)
+                return ERR_PTR(-ENOMEM);
 
-/**
- * nes_unmap_frm
+        pifrpl = &pnesfrpl->ibfrpl;
+        pifrpl->page_list = &pnesfrpl->pbl;
+        pifrpl->max_page_list_len = page_list_len;
+        /*
+         * Allocate the WQE PBL
+         */
+        pnesfrpl->nes_wqe_pbl.kva = pci_alloc_consistent(nesdev->pcidev,
+                                                         page_list_len * sizeof(u64),
+                                                         &pnesfrpl->nes_wqe_pbl.paddr);
+
+        if (!pnesfrpl->nes_wqe_pbl.kva) {
+                kfree(pnesfrpl);
+                return ERR_PTR(-ENOMEM);
+        }
+        nes_debug(NES_DBG_MR, "nes_alloc_fast_reg_pbl: nes_frpl = %p, "
+                  "ibfrpl = %p, ibfrpl.page_list = %p, pbl.kva = %p, "
+                  "pbl.paddr= %p\n", pnesfrpl, &pnesfrpl->ibfrpl,
+                  pnesfrpl->ibfrpl.page_list, pnesfrpl->nes_wqe_pbl.kva,
+                  (void *)pnesfrpl->nes_wqe_pbl.paddr);
+
+        return pifrpl;
+}
+
+/*
+ * nes_free_fast_reg_page_list
  */
-static int nes_unmap_fmr(struct list_head *ibfmr_list)
+static void nes_free_fast_reg_page_list(struct ib_fast_reg_page_list *pifrpl)
 {
-        return 0;
+        struct nes_vnic *nesvnic = to_nesvnic(pifrpl->device);
+        struct nes_device *nesdev = nesvnic->nesdev;
+        struct nes_ib_fast_reg_page_list *pnesfrpl;
+
+        pnesfrpl = container_of(pifrpl, struct nes_ib_fast_reg_page_list, ibfrpl);
+        /*
+         * Free the WQE PBL.
+         */
+        pci_free_consistent(nesdev->pcidev,
+                            pifrpl->max_page_list_len * sizeof(u64),
+                            pnesfrpl->nes_wqe_pbl.kva,
+                            pnesfrpl->nes_wqe_pbl.paddr);
+        /*
+         * Free the PBL structure
+         */
+        kfree(pnesfrpl);
 }
 
-
-
 /**
  * nes_query_device
  */
@@ -633,23 +527,23 @@ static int nes_query_device(struct ib_device *ibdev, struct ib_device_attr *prop
         props->max_qp_wr = nesdev->nesadapter->max_qp_wr - 2;
         props->max_sge = nesdev->nesadapter->max_sge;
         props->max_cq = nesibdev->max_cq;
-        props->max_cqe = nesdev->nesadapter->max_cqe - 1;
+        props->max_cqe = nesdev->nesadapter->max_cqe;
         props->max_mr = nesibdev->max_mr;
         props->max_mw = nesibdev->max_mr;
         props->max_pd = nesibdev->max_pd;
         props->max_sge_rd = 1;
         switch (nesdev->nesadapter->max_irrq_wr) {
                 case 0:
-                        props->max_qp_rd_atom = 1;
+                        props->max_qp_rd_atom = 2;
                         break;
                 case 1:
-                        props->max_qp_rd_atom = 4;
+                        props->max_qp_rd_atom = 8;
                         break;
                 case 2:
-                        props->max_qp_rd_atom = 16;
+                        props->max_qp_rd_atom = 32;
                         break;
                 case 3:
-                        props->max_qp_rd_atom = 32;
+                        props->max_qp_rd_atom = 64;
                         break;
                 default:
                         props->max_qp_rd_atom = 0;
@@ -1121,6 +1015,7 @@ static int nes_setup_virt_qp(struct nes_qp *nesqp, struct nes_pbl *nespbl,
                 kunmap(nesqp->page);
                 return -ENOMEM;
         }
+        nesqp->sq_kmapped = 1;
         nesqp->hwqp.q2_vbase = mem;
         mem += 256;
         memset(nesqp->hwqp.q2_vbase, 0, 256);
@@ -1198,7 +1093,10 @@ static inline void nes_free_qp_mem(struct nes_device *nesdev,
                 pci_free_consistent(nesdev->pcidev, nesqp->qp_mem_size, nesqp->hwqp.q2_vbase, nesqp->hwqp.q2_pbase);
                 pci_free_consistent(nesdev->pcidev, 256, nesqp->pbl_vbase, nesqp->pbl_pbase );
                 nesqp->pbl_vbase = NULL;
-                kunmap(nesqp->page);
+                if (nesqp->sq_kmapped) {
+                        nesqp->sq_kmapped = 0;
+                        kunmap(nesqp->page);
+                }
         }
 }
 
@@ -1504,8 +1402,6 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
                         nes_debug(NES_DBG_QP, "QP%u structure located @%p.Size = %u.\n",
                                         nesqp->hwqp.qp_id, nesqp, (u32)sizeof(*nesqp));
                         spin_lock_init(&nesqp->lock);
-                        init_waitqueue_head(&nesqp->state_waitq);
-                        init_waitqueue_head(&nesqp->kick_waitq);
                         nes_add_ref(&nesqp->ibqp);
                         break;
                 default:
@@ -1513,6 +1409,8 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
                         return ERR_PTR(-EINVAL);
         }
 
+        nesqp->sig_all = (init_attr->sq_sig_type == IB_SIGNAL_ALL_WR);
+
         /* update the QP table */
         nesdev->nesadapter->qp_table[nesqp->hwqp.qp_id-NES_FIRST_QPN] = nesqp;
         nes_debug(NES_DBG_QP, "netdev refcnt=%u\n",
@@ -1607,8 +1505,10 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
                                 nes_ucontext->first_free_wq = nesqp->mmap_sq_db_index;
                         }
                 }
-                if (nesqp->pbl_pbase)
+                if (nesqp->pbl_pbase && nesqp->sq_kmapped) {
+                        nesqp->sq_kmapped = 0;
                         kunmap(nesqp->page);
+                }
         } else {
                 /* Clean any pending completions from the cq(s) */
                 if (nesqp->nesscq)
@@ -1649,6 +1549,9 @@ static struct ib_cq *nes_create_cq(struct ib_device *ibdev, int entries,
         unsigned long flags;
         int ret;
 
+        if (entries > nesadapter->max_cqe)
+                return ERR_PTR(-EINVAL);
+
         err = nes_alloc_resource(nesadapter, nesadapter->allocated_cqs,
                         nesadapter->max_cq, &cq_num, &nesadapter->next_cq);
         if (err) {
@@ -2606,9 +2509,6 @@ static struct ib_mr *nes_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
                         stag = stag_index << 8;
                         stag |= driver_key;
                         stag += (u32)stag_key;
-                        if (stag == 0) {
-                                stag = 1;
-                        }
 
                         iova_start = virt;
                         /* Make the leaf PBL the root if only one PBL */
@@ -3109,7 +3009,6 @@ int nes_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                                                                 " already done based on hw state.\n",
                                                                 nesqp->hwqp.qp_id);
                                                 issue_modify_qp = 0;
-                                                nesqp->in_disconnect = 0;
                                         }
                                         switch (nesqp->hw_iwarp_state) {
                                                 case NES_AEQE_IWARP_STATE_CLOSING:
@@ -3122,7 +3021,6 @@ int nes_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                                                         break;
                                                 default:
                                                         next_iwarp_state = NES_CQP_QP_IWARP_STATE_CLOSING;
-                                                        nesqp->in_disconnect = 1;
                                                         nesqp->hw_iwarp_state = NES_AEQE_IWARP_STATE_CLOSING;
                                                         break;
                                         }
@@ -3139,7 +3037,6 @@ int nes_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                                 next_iwarp_state = NES_CQP_QP_IWARP_STATE_TERMINATE;
                                 nesqp->hw_iwarp_state = NES_AEQE_IWARP_STATE_TERMINATE;
                                 issue_modify_qp = 1;
-                                nesqp->in_disconnect = 1;
                                 break;
                         case IB_QPS_ERR:
                         case IB_QPS_RESET:
@@ -3162,7 +3059,6 @@ int nes_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                                 if ((nesqp->hw_tcp_state > NES_AEQE_TCP_STATE_CLOSED) &&
                                                 (nesqp->hw_tcp_state != NES_AEQE_TCP_STATE_TIME_WAIT)) {
                                         next_iwarp_state |= NES_CQP_QP_RESET;
-                                        nesqp->in_disconnect = 1;
                                 } else {
                                         nes_debug(NES_DBG_MOD_QP, "QP%u NOT setting NES_CQP_QP_RESET since TCP state = %u\n",
                                                         nesqp->hwqp.qp_id, nesqp->hw_tcp_state);
@@ -3373,21 +3269,17 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
         struct nes_device *nesdev = nesvnic->nesdev;
         struct nes_qp *nesqp = to_nesqp(ibqp);
         struct nes_hw_qp_wqe *wqe;
-        int err;
+        int err = 0;
         u32 qsize = nesqp->hwqp.sq_size;
         u32 head;
-        u32 wqe_misc;
-        u32 wqe_count;
+        u32 wqe_misc = 0;
+        u32 wqe_count = 0;
         u32 counter;
-        u32 total_payload_length;
-
-        err = 0;
-        wqe_misc = 0;
-        wqe_count = 0;
-        total_payload_length = 0;
 
-        if (nesqp->ibqp_state > IB_QPS_RTS)
-                return -EINVAL;
+        if (nesqp->ibqp_state > IB_QPS_RTS) {
+                err = -EINVAL;
+                goto out;
+        }
 
         spin_lock_irqsave(&nesqp->lock, flags);
 
@@ -3413,94 +3305,208 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
                 u64temp = (u64)(ib_wr->wr_id);
                 set_wqe_64bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_COMP_SCRATCH_LOW_IDX,
                                         u64temp);
-                        switch (ib_wr->opcode) {
-                                case IB_WR_SEND:
-                                        if (ib_wr->send_flags & IB_SEND_SOLICITED) {
-                                                wqe_misc = NES_IWARP_SQ_OP_SENDSE;
-                                        } else {
-                                                wqe_misc = NES_IWARP_SQ_OP_SEND;
-                                        }
-                                        if (ib_wr->num_sge > nesdev->nesadapter->max_sge) {
-                                                err = -EINVAL;
-                                                break;
-                                        }
-                                        if (ib_wr->send_flags & IB_SEND_FENCE) {
-                                                wqe_misc |= NES_IWARP_SQ_WQE_LOCAL_FENCE;
-                                        }
-                                        if ((ib_wr->send_flags & IB_SEND_INLINE) &&
-                                                        ((nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) == 0) &&
-                                                        (ib_wr->sg_list[0].length <= 64)) {
-                                                memcpy(&wqe->wqe_words[NES_IWARP_SQ_WQE_IMM_DATA_START_IDX],
-                                                               (void *)(unsigned long)ib_wr->sg_list[0].addr, ib_wr->sg_list[0].length);
-                                                set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_TOTAL_PAYLOAD_IDX,
-                                                                ib_wr->sg_list[0].length);
-                                                wqe_misc |= NES_IWARP_SQ_WQE_IMM_DATA;
-                                        } else {
-                                                fill_wqe_sg_send(wqe, ib_wr, 1);
-                                        }
+                switch (ib_wr->opcode) {
+                case IB_WR_SEND:
+                case IB_WR_SEND_WITH_INV:
+                        if (IB_WR_SEND == ib_wr->opcode) {
+                                if (ib_wr->send_flags & IB_SEND_SOLICITED)
+                                        wqe_misc = NES_IWARP_SQ_OP_SENDSE;
+                                else
+                                        wqe_misc = NES_IWARP_SQ_OP_SEND;
+                        } else {
+                                if (ib_wr->send_flags & IB_SEND_SOLICITED)
+                                        wqe_misc = NES_IWARP_SQ_OP_SENDSEINV;
+                                else
+                                        wqe_misc = NES_IWARP_SQ_OP_SENDINV;
 
-                                        break;
-                                case IB_WR_RDMA_WRITE:
-                                        wqe_misc = NES_IWARP_SQ_OP_RDMAW;
-                                        if (ib_wr->num_sge > nesdev->nesadapter->max_sge) {
-                                                nes_debug(NES_DBG_IW_TX, "Exceeded max sge, ib_wr=%u, max=%u\n",
-                                                                ib_wr->num_sge,
-                                                                nesdev->nesadapter->max_sge);
-                                                err = -EINVAL;
-                                                break;
-                                        }
-                                        if (ib_wr->send_flags & IB_SEND_FENCE) {
-                                                wqe_misc |= NES_IWARP_SQ_WQE_LOCAL_FENCE;
-                                        }
+                                set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_INV_STAG_LOW_IDX,
+                                                    ib_wr->ex.invalidate_rkey);
+                        }
 
-                                        set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_STAG_IDX,
-                                                        ib_wr->wr.rdma.rkey);
-                                        set_wqe_64bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_TO_LOW_IDX,
-                                                        ib_wr->wr.rdma.remote_addr);
-
-                                        if ((ib_wr->send_flags & IB_SEND_INLINE) &&
-                                                        ((nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) == 0) &&
-                                                        (ib_wr->sg_list[0].length <= 64)) {
-                                                memcpy(&wqe->wqe_words[NES_IWARP_SQ_WQE_IMM_DATA_START_IDX],
-                                                               (void *)(unsigned long)ib_wr->sg_list[0].addr, ib_wr->sg_list[0].length);
-                                                set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_TOTAL_PAYLOAD_IDX,
-                                                                ib_wr->sg_list[0].length);
-                                                wqe_misc |= NES_IWARP_SQ_WQE_IMM_DATA;
-                                        } else {
-                                                fill_wqe_sg_send(wqe, ib_wr, 1);
-                                        }
-                                        wqe->wqe_words[NES_IWARP_SQ_WQE_RDMA_LENGTH_IDX] =
-                                                        wqe->wqe_words[NES_IWARP_SQ_WQE_TOTAL_PAYLOAD_IDX];
-                                        break;
-                                case IB_WR_RDMA_READ:
-                                        /* iWARP only supports 1 sge for RDMA reads */
-                                        if (ib_wr->num_sge > 1) {
-                                                nes_debug(NES_DBG_IW_TX, "Exceeded max sge, ib_wr=%u, max=1\n",
-                                                                ib_wr->num_sge);
-                                                err = -EINVAL;
-                                                break;
-                                        }
-                                        wqe_misc = NES_IWARP_SQ_OP_RDMAR;
-                                        set_wqe_64bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_TO_LOW_IDX,
-                                                        ib_wr->wr.rdma.remote_addr);
-                                        set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_STAG_IDX,
-                                                        ib_wr->wr.rdma.rkey);
-                                        set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_LENGTH_IDX,
-                                                        ib_wr->sg_list->length);
-                                        set_wqe_64bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_FRAG0_LOW_IDX,
-                                                        ib_wr->sg_list->addr);
-                                        set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_STAG0_IDX,
-                                                        ib_wr->sg_list->lkey);
-                                        break;
-                                default:
-                                        /* error */
-                                        err = -EINVAL;
-                                        break;
+                        if (ib_wr->num_sge > nesdev->nesadapter->max_sge) {
+                                err = -EINVAL;
+                                break;
                         }
 
-                if (ib_wr->send_flags & IB_SEND_SIGNALED) {
-                        wqe_misc |= NES_IWARP_SQ_WQE_SIGNALED_COMPL;
+                        if (ib_wr->send_flags & IB_SEND_FENCE)
+                                wqe_misc |= NES_IWARP_SQ_WQE_LOCAL_FENCE;
+
+                        if ((ib_wr->send_flags & IB_SEND_INLINE) &&
+                            ((nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) == 0) &&
+                             (ib_wr->sg_list[0].length <= 64)) {
+                                memcpy(&wqe->wqe_words[NES_IWARP_SQ_WQE_IMM_DATA_START_IDX],
+                                       (void *)(unsigned long)ib_wr->sg_list[0].addr, ib_wr->sg_list[0].length);
+                                set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_TOTAL_PAYLOAD_IDX,
+                                                    ib_wr->sg_list[0].length);
+                                wqe_misc |= NES_IWARP_SQ_WQE_IMM_DATA;
+                        } else {
+                                fill_wqe_sg_send(wqe, ib_wr, 1);
+                        }
+
+                        break;
+                case IB_WR_RDMA_WRITE:
+                        wqe_misc = NES_IWARP_SQ_OP_RDMAW;
+                        if (ib_wr->num_sge > nesdev->nesadapter->max_sge) {
+                                nes_debug(NES_DBG_IW_TX, "Exceeded max sge, ib_wr=%u, max=%u\n",
+                                          ib_wr->num_sge, nesdev->nesadapter->max_sge);
+                                err = -EINVAL;
+                                break;
+                        }
+
+                        if (ib_wr->send_flags & IB_SEND_FENCE)
+                                wqe_misc |= NES_IWARP_SQ_WQE_LOCAL_FENCE;
+
+                        set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_STAG_IDX,
+                                            ib_wr->wr.rdma.rkey);
+                        set_wqe_64bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_TO_LOW_IDX,
+                                            ib_wr->wr.rdma.remote_addr);
+
+                        if ((ib_wr->send_flags & IB_SEND_INLINE) &&
+                            ((nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) == 0) &&
+                             (ib_wr->sg_list[0].length <= 64)) {
+                                memcpy(&wqe->wqe_words[NES_IWARP_SQ_WQE_IMM_DATA_START_IDX],
+                                       (void *)(unsigned long)ib_wr->sg_list[0].addr, ib_wr->sg_list[0].length);
+                                set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_TOTAL_PAYLOAD_IDX,
+                                                    ib_wr->sg_list[0].length);
+                                wqe_misc |= NES_IWARP_SQ_WQE_IMM_DATA;
+                        } else {
+                                fill_wqe_sg_send(wqe, ib_wr, 1);
+                        }
+
+                        wqe->wqe_words[NES_IWARP_SQ_WQE_RDMA_LENGTH_IDX] =
+                                wqe->wqe_words[NES_IWARP_SQ_WQE_TOTAL_PAYLOAD_IDX];
+                        break;
+                case IB_WR_RDMA_READ:
+                case IB_WR_RDMA_READ_WITH_INV:
+                        /* iWARP only supports 1 sge for RDMA reads */
+                        if (ib_wr->num_sge > 1) {
+                                nes_debug(NES_DBG_IW_TX, "Exceeded max sge, ib_wr=%u, max=1\n",
+                                          ib_wr->num_sge);
+                                err = -EINVAL;
+                                break;
+                        }
+                        if (ib_wr->opcode == IB_WR_RDMA_READ) {
+                                wqe_misc = NES_IWARP_SQ_OP_RDMAR;
+                        } else {
+                                wqe_misc = NES_IWARP_SQ_OP_RDMAR_LOCINV;
+                                set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_INV_STAG_LOW_IDX,
+                                                    ib_wr->ex.invalidate_rkey);
+                        }
+
+                        set_wqe_64bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_TO_LOW_IDX,
+                                            ib_wr->wr.rdma.remote_addr);
+                        set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_STAG_IDX,
+                                            ib_wr->wr.rdma.rkey);
+                        set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_LENGTH_IDX,
+                                            ib_wr->sg_list->length);
+                        set_wqe_64bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_FRAG0_LOW_IDX,
+                                            ib_wr->sg_list->addr);
+                        set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_STAG0_IDX,
+                                            ib_wr->sg_list->lkey);
+                        break;
+                case IB_WR_LOCAL_INV:
+                        wqe_misc = NES_IWARP_SQ_OP_LOCINV;
+                        set_wqe_32bit_value(wqe->wqe_words,
+                                            NES_IWARP_SQ_LOCINV_WQE_INV_STAG_IDX,
+                                            ib_wr->ex.invalidate_rkey);
+                        break;
+                case IB_WR_FAST_REG_MR:
+                {
+                        int i;
+                        int flags = ib_wr->wr.fast_reg.access_flags;
+                        struct nes_ib_fast_reg_page_list *pnesfrpl =
+                                container_of(ib_wr->wr.fast_reg.page_list,
+                                             struct nes_ib_fast_reg_page_list,
+                                             ibfrpl);
+                        u64 *src_page_list = pnesfrpl->ibfrpl.page_list;
+                        u64 *dst_page_list = pnesfrpl->nes_wqe_pbl.kva;
+
+                        if (ib_wr->wr.fast_reg.page_list_len >
+                            (NES_4K_PBL_CHUNK_SIZE / sizeof(u64))) {
+                                nes_debug(NES_DBG_IW_TX, "SQ_FMR: bad page_list_len\n");
+                                err = -EINVAL;
+                                break;
+                        }
+                        wqe_misc = NES_IWARP_SQ_OP_FAST_REG;
+                        set_wqe_64bit_value(wqe->wqe_words,
+                                            NES_IWARP_SQ_FMR_WQE_VA_FBO_LOW_IDX,
+                                            ib_wr->wr.fast_reg.iova_start);
+                        set_wqe_32bit_value(wqe->wqe_words,
+                                            NES_IWARP_SQ_FMR_WQE_LENGTH_LOW_IDX,
+                                            ib_wr->wr.fast_reg.length);
+                        set_wqe_32bit_value(wqe->wqe_words,
+                                            NES_IWARP_SQ_FMR_WQE_MR_STAG_IDX,
+                                            ib_wr->wr.fast_reg.rkey);
+                        /* Set page size: */
+                        if (ib_wr->wr.fast_reg.page_shift == 12) {
+                                wqe_misc |= NES_IWARP_SQ_FMR_WQE_PAGE_SIZE_4K;
+                        } else if (ib_wr->wr.fast_reg.page_shift == 21) {
+                                wqe_misc |= NES_IWARP_SQ_FMR_WQE_PAGE_SIZE_2M;
+                        } else {
+                                nes_debug(NES_DBG_IW_TX, "Invalid page shift,"
+                                          " ib_wr=%u, max=1\n", ib_wr->num_sge);
+                                err = -EINVAL;
+                                break;
+                        }
+                        /* Set access_flags */
+                        wqe_misc |= NES_IWARP_SQ_FMR_WQE_RIGHTS_ENABLE_LOCAL_READ;
+                        if (flags & IB_ACCESS_LOCAL_WRITE)
+                                wqe_misc |= NES_IWARP_SQ_FMR_WQE_RIGHTS_ENABLE_LOCAL_WRITE;
+
+                        if (flags & IB_ACCESS_REMOTE_WRITE)
+                                wqe_misc |= NES_IWARP_SQ_FMR_WQE_RIGHTS_ENABLE_REMOTE_WRITE;
+
+                        if (flags & IB_ACCESS_REMOTE_READ)
+                                wqe_misc |= NES_IWARP_SQ_FMR_WQE_RIGHTS_ENABLE_REMOTE_READ;
+
+                        if (flags & IB_ACCESS_MW_BIND)
+                                wqe_misc |= NES_IWARP_SQ_FMR_WQE_RIGHTS_ENABLE_WINDOW_BIND;
+
+                        /* Fill in PBL info: */
+                        if (ib_wr->wr.fast_reg.page_list_len >
+                            pnesfrpl->ibfrpl.max_page_list_len) {
+                                nes_debug(NES_DBG_IW_TX, "Invalid page list length,"
+                                          " ib_wr=%p, value=%u, max=%u\n",
+                                          ib_wr, ib_wr->wr.fast_reg.page_list_len,
+                                          pnesfrpl->ibfrpl.max_page_list_len);
+                                err = -EINVAL;
+                                break;
+                        }
+
+                        set_wqe_64bit_value(wqe->wqe_words,
+                                            NES_IWARP_SQ_FMR_WQE_PBL_ADDR_LOW_IDX,
+                                            pnesfrpl->nes_wqe_pbl.paddr);
+
+                        set_wqe_32bit_value(wqe->wqe_words,
+                                            NES_IWARP_SQ_FMR_WQE_PBL_LENGTH_IDX,
+                                            ib_wr->wr.fast_reg.page_list_len * 8);
+
+                        for (i = 0; i < ib_wr->wr.fast_reg.page_list_len; i++)
+                                dst_page_list[i] = cpu_to_le64(src_page_list[i]);
+
+                        nes_debug(NES_DBG_IW_TX, "SQ_FMR: iova_start: %p, "
+                                  "length: %d, rkey: %0x, pgl_paddr: %p, "
+                                  "page_list_len: %u, wqe_misc: %x\n",
+                                  (void *)ib_wr->wr.fast_reg.iova_start,
+                                  ib_wr->wr.fast_reg.length,
+                                  ib_wr->wr.fast_reg.rkey,
+                                  (void *)pnesfrpl->nes_wqe_pbl.paddr,
+                                  ib_wr->wr.fast_reg.page_list_len,
+                                  wqe_misc);
+                        break;
+                }
+                default:
+                        /* error */
+                        err = -EINVAL;
+                        break;
                 }
+
+                if (err)
+                        break;
+
+                if ((ib_wr->send_flags & IB_SEND_SIGNALED) || nesqp->sig_all)
+                        wqe_misc |= NES_IWARP_SQ_WQE_SIGNALED_COMPL;
+
                 wqe->wqe_words[NES_IWARP_SQ_WQE_MISC_IDX] = cpu_to_le32(wqe_misc);
 
                 ib_wr = ib_wr->next;
@@ -3522,6 +3528,7 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
 
         spin_unlock_irqrestore(&nesqp->lock, flags);
 
+out:
         if (err)
                 *bad_wr = ib_wr;
         return err;
@@ -3548,8 +3555,10 @@ static int nes_post_recv(struct ib_qp *ibqp, struct ib_recv_wr *ib_wr,
         u32 counter;
         u32 total_payload_length;
 
-        if (nesqp->ibqp_state > IB_QPS_RTS)
-                return -EINVAL;
+        if (nesqp->ibqp_state > IB_QPS_RTS) {
+                err = -EINVAL;
+                goto out;
+        }
 
         spin_lock_irqsave(&nesqp->lock, flags);
 
@@ -3612,6 +3621,7 @@ static int nes_post_recv(struct ib_qp *ibqp, struct ib_recv_wr *ib_wr,
 
         spin_unlock_irqrestore(&nesqp->lock, flags);
 
+out:
         if (err)
                 *bad_wr = ib_wr;
         return err;
@@ -3720,6 +3730,12 @@ static int nes_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *entry)
                                                 nes_debug(NES_DBG_CQ, "Operation = Send.\n");
                                                 entry->opcode = IB_WC_SEND;
                                                 break;
+                                        case NES_IWARP_SQ_OP_LOCINV:
+                                                entry->opcode = IB_WR_LOCAL_INV;
+                                                break;
+                                        case NES_IWARP_SQ_OP_FAST_REG:
+                                                entry->opcode = IB_WC_FAST_REG_MR;
+                                                break;
                                 }
 
                                 nesqp->hwqp.sq_tail = (wqe_index+1)&(nesqp->hwqp.sq_size - 1);
@@ -3890,10 +3906,9 @@ struct nes_ib_device *nes_init_ofa_device(struct net_device *netdev)
         nesibdev->ibdev.dealloc_mw = nes_dealloc_mw;
         nesibdev->ibdev.bind_mw = nes_bind_mw;
 
-        nesibdev->ibdev.alloc_fmr = nes_alloc_fmr;
-        nesibdev->ibdev.unmap_fmr = nes_unmap_fmr;
-        nesibdev->ibdev.dealloc_fmr = nes_dealloc_fmr;
-        nesibdev->ibdev.map_phys_fmr = nes_map_phys_fmr;
+        nesibdev->ibdev.alloc_fast_reg_mr = nes_alloc_fast_reg_mr;
+        nesibdev->ibdev.alloc_fast_reg_page_list = nes_alloc_fast_reg_page_list;
+        nesibdev->ibdev.free_fast_reg_page_list = nes_free_fast_reg_page_list;
 
         nesibdev->ibdev.attach_mcast = nes_multicast_attach;
         nesibdev->ibdev.detach_mcast = nes_multicast_detach;
diff --git a/drivers/infiniband/hw/nes/nes_verbs.h b/drivers/infiniband/hw/nes/nes_verbs.h
index 89822d75f82e..2df9993e0cac 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.h
+++ b/drivers/infiniband/hw/nes/nes_verbs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+ * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
  * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -135,19 +135,15 @@ struct nes_qp {
         struct ib_qp          ibqp;
         void                  *allocated_buffer;
         struct iw_cm_id       *cm_id;
-        struct workqueue_struct *wq;
         struct nes_cq         *nesscq;
         struct nes_cq         *nesrcq;
         struct nes_pd         *nespd;
         void *cm_node; /* handle of the node this QP is associated with */
         struct ietf_mpa_frame *ietf_frame;
         dma_addr_t            ietf_frame_pbase;
-        wait_queue_head_t     state_waitq;
         struct ib_mr          *lsmm_mr;
-        unsigned long         socket;
         struct nes_hw_qp      hwqp;
         struct work_struct    work;
-        struct work_struct    ae_work;
         enum ib_qp_state      ibqp_state;
         u32                   iwarp_state;
         u32                   hte_index;
@@ -165,19 +161,20 @@ struct nes_qp {
         struct page           *page;
         struct timer_list     terminate_timer;
         enum ib_event_type    terminate_eventtype;
-        wait_queue_head_t     kick_waitq;
-        u16                   in_disconnect;
+        u16                   active_conn:1;
+        u16                   skip_lsmm:1;
+        u16                   user_mode:1;
+        u16                   hte_added:1;
+        u16                   flush_issued:1;
+        u16                   destroyed:1;
+        u16                   sig_all:1;
+        u16                   rsvd:9;
         u16                   private_data_len;
         u16                   term_sq_flush_code;
         u16                   term_rq_flush_code;
-        u8                    active_conn;
-        u8                    skip_lsmm;
-        u8                    user_mode;
-        u8                    hte_added;
         u8                    hw_iwarp_state;
-        u8                    flush_issued;
         u8                    hw_tcp_state;
         u8                    term_flags;
-        u8                    destroyed;
+        u8                    sq_kmapped;
 };
 #endif                  /* NES_VERBS_H */
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 2bf5116deec4..df3eb8c9fd96 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -884,6 +884,7 @@ struct ipoib_neigh *ipoib_neigh_alloc(struct neighbour *neighbour,
 
         neigh->neighbour = neighbour;
         neigh->dev = dev;
+        memset(&neigh->dgid.raw, 0, sizeof (union ib_gid));
         *to_ipoib_neigh(neighbour) = neigh;
         skb_queue_head_init(&neigh->queue);
         ipoib_cm_set(neigh, NULL);
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index b9453d068e9d..274c883ef3ea 100644
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -209,6 +209,8 @@ void iser_finalize_rdma_unaligned_sg(struct iscsi_iser_task *iser_task,
         mem_copy->copy_buf = NULL;
 }
 
+#define IS_4K_ALIGNED(addr)     ((((unsigned long)addr) & ~MASK_4K) == 0)
+
 /**
  * iser_sg_to_page_vec - Translates scatterlist entries to physical addresses
  * and returns the length of resulting physical address array (may be less than
@@ -221,62 +223,52 @@ void iser_finalize_rdma_unaligned_sg(struct iscsi_iser_task *iser_task,
  * where --few fragments of the same page-- are present in the SG as
  * consecutive elements. Also, it handles one entry SG.
  */
+
 static int iser_sg_to_page_vec(struct iser_data_buf *data,
                                struct iser_page_vec *page_vec,
                                struct ib_device *ibdev)
 {
-        struct scatterlist *sgl = (struct scatterlist *)data->buf;
-        struct scatterlist *sg;
-        u64 first_addr, last_addr, page;
-        int end_aligned;
-        unsigned int cur_page = 0;
+        struct scatterlist *sg, *sgl = (struct scatterlist *)data->buf;
+        u64 start_addr, end_addr, page, chunk_start = 0;
         unsigned long total_sz = 0;
-        int i;
+        unsigned int dma_len;
+        int i, new_chunk, cur_page, last_ent = data->dma_nents - 1;
 
         /* compute the offset of first element */
         page_vec->offset = (u64) sgl[0].offset & ~MASK_4K;
 
+        new_chunk = 1;
+        cur_page  = 0;
         for_each_sg(sgl, sg, data->dma_nents, i) {
-                unsigned int dma_len = ib_sg_dma_len(ibdev, sg);
-
+                start_addr = ib_sg_dma_address(ibdev, sg);
+                if (new_chunk)
+                        chunk_start = start_addr;
+                dma_len = ib_sg_dma_len(ibdev, sg);
+                end_addr = start_addr + dma_len;
                 total_sz += dma_len;
 
-                first_addr = ib_sg_dma_address(ibdev, sg);
-                last_addr  = first_addr + dma_len;
-
-                end_aligned   = !(last_addr  & ~MASK_4K);
-
-                /* continue to collect page fragments till aligned or SG ends */
-                while (!end_aligned && (i + 1 < data->dma_nents)) {
-                        sg = sg_next(sg);
-                        i++;
-                        dma_len = ib_sg_dma_len(ibdev, sg);
-                        total_sz += dma_len;
-                        last_addr = ib_sg_dma_address(ibdev, sg) + dma_len;
-                        end_aligned = !(last_addr  & ~MASK_4K);
+                /* collect page fragments until aligned or end of SG list */
+                if (!IS_4K_ALIGNED(end_addr) && i < last_ent) {
+                        new_chunk = 0;
+                        continue;
                 }
-
-                /* handle the 1st page in the 1st DMA element */
-                if (cur_page == 0) {
-                        page = first_addr & MASK_4K;
-                        page_vec->pages[cur_page] = page;
-                        cur_page++;
+                new_chunk = 1;
+
+                /* address of the first page in the contiguous chunk;
+                   masking relevant for the very first SG entry,
+                   which might be unaligned */
+                page = chunk_start & MASK_4K;
+                do {
+                        page_vec->pages[cur_page++] = page;
                         page += SIZE_4K;
-                } else
-                        page = first_addr;
-
-                for (; page < last_addr; page += SIZE_4K) {
-                        page_vec->pages[cur_page] = page;
-                        cur_page++;
-                }
-
+                } while (page < end_addr);
         }
+
         page_vec->data_size = total_sz;
         iser_dbg("page_vec->data_size:%d cur_page %d\n", page_vec->data_size,cur_page);
         return cur_page;
 }
 
-#define IS_4K_ALIGNED(addr)     ((((unsigned long)addr) & ~MASK_4K) == 0)
 
 /**
  * iser_data_buf_aligned_len - Tries to determine the maximal correctly aligned
@@ -284,42 +276,40 @@ static int iser_sg_to_page_vec(struct iser_data_buf *data,
  * the number of entries which are aligned correctly. Supports the case where
  * consecutive SG elements are actually fragments of the same physcial page.
  */
-static unsigned int iser_data_buf_aligned_len(struct iser_data_buf *data,
-                                              struct ib_device *ibdev)
+static int iser_data_buf_aligned_len(struct iser_data_buf *data,
+                                      struct ib_device *ibdev)
 {
-        struct scatterlist *sgl, *sg;
-        u64 end_addr, next_addr;
-        int i, cnt;
-        unsigned int ret_len = 0;
+        struct scatterlist *sgl, *sg, *next_sg = NULL;
+        u64 start_addr, end_addr;
+        int i, ret_len, start_check = 0;
+
+        if (data->dma_nents == 1)
+                return 1;
 
         sgl = (struct scatterlist *)data->buf;
+        start_addr  = ib_sg_dma_address(ibdev, sgl);
 
-        cnt = 0;
         for_each_sg(sgl, sg, data->dma_nents, i) {
-                /* iser_dbg("Checking sg iobuf [%d]: phys=0x%08lX "
-                   "offset: %ld sz: %ld\n", i,
-                   (unsigned long)sg_phys(sg),
-                   (unsigned long)sg->offset,
-                   (unsigned long)sg->length); */
-                end_addr = ib_sg_dma_address(ibdev, sg) +
-                           ib_sg_dma_len(ibdev, sg);
-                /* iser_dbg("Checking sg iobuf end address "
-                       "0x%08lX\n", end_addr); */
-                if (i + 1 < data->dma_nents) {
-                        next_addr = ib_sg_dma_address(ibdev, sg_next(sg));
-                        /* are i, i+1 fragments of the same page? */
-                        if (end_addr == next_addr) {
-                                cnt++;
-                                continue;
-                        } else if (!IS_4K_ALIGNED(end_addr)) {
-                                ret_len = cnt + 1;
-                                break;
-                        }
-                }
-                cnt++;
+                if (start_check && !IS_4K_ALIGNED(start_addr))
+                        break;
+
+                next_sg = sg_next(sg);
+                if (!next_sg)
+                        break;
+
+                end_addr    = start_addr + ib_sg_dma_len(ibdev, sg);
+                start_addr  = ib_sg_dma_address(ibdev, next_sg);
+
+                if (end_addr == start_addr) {
+                        start_check = 0;
+                        continue;
+                } else
+                        start_check = 1;
+
+                if (!IS_4K_ALIGNED(end_addr))
+                        break;
         }
-        if (i == data->dma_nents)
-                ret_len = cnt;  /* loop ended */
+        ret_len = (next_sg) ? i : i+1;
         iser_dbg("Found %d aligned entries out of %d in sg:0x%p\n",
                  ret_len, data->dma_nents, data);
         return ret_len;
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 5c16001959cc..ab060710688f 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -296,9 +296,15 @@ static void input_handle_event(struct input_dev *dev,
  * @value: value of the event
  *
  * This function should be used by drivers implementing various input
- * devices. See also input_inject_event().
+ * devices to report input events. See also input_inject_event().
+ *
+ * NOTE: input_event() may be safely used right after input device was
+ * allocated with input_allocate_device(), even before it is registered
+ * with input_register_device(), but the event will not reach any of the
+ * input handlers. Such early invocation of input_event() may be used
+ * to 'seed' initial state of a switch or initial position of absolute
+ * axis, etc.
  */
-
 void input_event(struct input_dev *dev,
                  unsigned int type, unsigned int code, int value)
 {
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index d48c808d5928..1edb596d927b 100644
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -319,7 +319,7 @@ static int adp5588_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops adp5588_dev_pm_ops = {
+static const struct dev_pm_ops adp5588_dev_pm_ops = {
         .suspend = adp5588_suspend,
         .resume  = adp5588_resume,
 };
diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c
index 181d30e3018e..e45740429f7e 100644
--- a/drivers/input/keyboard/ep93xx_keypad.c
+++ b/drivers/input/keyboard/ep93xx_keypad.c
@@ -22,11 +22,11 @@
 
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
-#include <linux/input.h>
 #include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/input/matrix_keypad.h>
 
 #include <mach/hardware.h>
-#include <mach/gpio.h>
 #include <mach/ep93xx_keypad.h>
 
 /*
@@ -60,38 +60,37 @@
 #define KEY_REG_KEY1_MASK       (0x0000003f)
 #define KEY_REG_KEY1_SHIFT      (0)
 
-#define keypad_readl(off)       __raw_readl(keypad->mmio_base + (off))
-#define keypad_writel(v, off)   __raw_writel((v), keypad->mmio_base + (off))
-
-#define MAX_MATRIX_KEY_NUM      (MAX_MATRIX_KEY_ROWS * MAX_MATRIX_KEY_COLS)
+#define EP93XX_MATRIX_SIZE      (EP93XX_MATRIX_ROWS * EP93XX_MATRIX_COLS)
 
 struct ep93xx_keypad {
         struct ep93xx_keypad_platform_data *pdata;
-
-        struct clk *clk;
         struct input_dev *input_dev;
+        struct clk *clk;
+
         void __iomem *mmio_base;
 
-        int irq;
-        int enabled;
+        unsigned int matrix_keycodes[EP93XX_MATRIX_SIZE];
 
         int key1;
         int key2;
 
-        unsigned int matrix_keycodes[MAX_MATRIX_KEY_NUM];
+        int irq;
+
+        bool enabled;
 };
 
 static void ep93xx_keypad_build_keycode(struct ep93xx_keypad *keypad)
 {
         struct ep93xx_keypad_platform_data *pdata = keypad->pdata;
         struct input_dev *input_dev = keypad->input_dev;
+        unsigned int *key;
         int i;
 
-        for (i = 0; i < pdata->matrix_key_map_size; i++) {
-                unsigned int key = pdata->matrix_key_map[i];
-                int row = (key >> 28) & 0xf;
-                int col = (key >> 24) & 0xf;
-                int code = key & 0xffffff;
+        key = &pdata->matrix_key_map[0];
+        for (i = 0; i < pdata->matrix_key_map_size; i++, key++) {
+                int row = KEY_ROW(*key);
+                int col = KEY_COL(*key);
+                int code = KEY_VAL(*key);
 
                 keypad->matrix_keycodes[(row << 3) + col] = code;
                 __set_bit(code, input_dev->keybit);
@@ -102,9 +101,11 @@ static irqreturn_t ep93xx_keypad_irq_handler(int irq, void *dev_id)
 {
         struct ep93xx_keypad *keypad = dev_id;
         struct input_dev *input_dev = keypad->input_dev;
-        unsigned int status = keypad_readl(KEY_REG);
+        unsigned int status;
         int keycode, key1, key2;
 
+        status = __raw_readl(keypad->mmio_base + KEY_REG);
+
         keycode = (status & KEY_REG_KEY1_MASK) >> KEY_REG_KEY1_SHIFT;
         key1 = keypad->matrix_keycodes[keycode];
 
@@ -152,7 +153,10 @@ static void ep93xx_keypad_config(struct ep93xx_keypad *keypad)
         struct ep93xx_keypad_platform_data *pdata = keypad->pdata;
         unsigned int val = 0;
 
-        clk_set_rate(keypad->clk, pdata->flags & EP93XX_KEYPAD_KDIV);
+        if (pdata->flags & EP93XX_KEYPAD_KDIV)
+                clk_set_rate(keypad->clk, EP93XX_KEYTCHCLK_DIV4);
+        else
+                clk_set_rate(keypad->clk, EP93XX_KEYTCHCLK_DIV16);
 
         if (pdata->flags & EP93XX_KEYPAD_DISABLE_3_KEY)
                 val |= KEY_INIT_DIS3KY;
@@ -167,7 +171,7 @@ static void ep93xx_keypad_config(struct ep93xx_keypad *keypad)
 
         val |= ((pdata->prescale << KEY_INIT_PRSCL_SHIFT) & KEY_INIT_PRSCL_MASK);
 
-        keypad_writel(val, KEY_INIT);
+        __raw_writel(val, keypad->mmio_base + KEY_INIT);
 }
 
 static int ep93xx_keypad_open(struct input_dev *pdev)
@@ -177,7 +181,7 @@ static int ep93xx_keypad_open(struct input_dev *pdev)
         if (!keypad->enabled) {
                 ep93xx_keypad_config(keypad);
                 clk_enable(keypad->clk);
-                keypad->enabled = 1;
+                keypad->enabled = true;
         }
 
         return 0;
@@ -189,7 +193,7 @@ static void ep93xx_keypad_close(struct input_dev *pdev)
 
         if (keypad->enabled) {
                 clk_disable(keypad->clk);
-                keypad->enabled = 0;
+                keypad->enabled = false;
         }
 }
 
@@ -211,7 +215,7 @@ static int ep93xx_keypad_suspend(struct platform_device *pdev,
 
         if (keypad->enabled) {
                 clk_disable(keypad->clk);
-                keypad->enabled = 0;
+                keypad->enabled = false;
         }
 
         mutex_unlock(&input_dev->mutex);
@@ -236,7 +240,7 @@ static int ep93xx_keypad_resume(struct platform_device *pdev)
                 if (!keypad->enabled) {
                         ep93xx_keypad_config(keypad);
                         clk_enable(keypad->clk);
-                        keypad->enabled = 1;
+                        keypad->enabled = true;
                 }
         }
 
@@ -252,88 +256,56 @@ static int ep93xx_keypad_resume(struct platform_device *pdev)
 static int __devinit ep93xx_keypad_probe(struct platform_device *pdev)
 {
         struct ep93xx_keypad *keypad;
-        struct ep93xx_keypad_platform_data *pdata = pdev->dev.platform_data;
         struct input_dev *input_dev;
         struct resource *res;
-        int irq, err, i, gpio;
-
-        if (!pdata ||
-            !pdata->matrix_key_rows ||
-            pdata->matrix_key_rows > MAX_MATRIX_KEY_ROWS ||
-            !pdata->matrix_key_cols ||
-            pdata->matrix_key_cols > MAX_MATRIX_KEY_COLS) {
-                dev_err(&pdev->dev, "invalid or missing platform data\n");
-                return -EINVAL;
-        }
+        int err;
 
         keypad = kzalloc(sizeof(struct ep93xx_keypad), GFP_KERNEL);
-        if (!keypad) {
-                dev_err(&pdev->dev, "failed to allocate driver data\n");
+        if (!keypad)
                 return -ENOMEM;
-        }
 
-        keypad->pdata = pdata;
+        keypad->pdata = pdev->dev.platform_data;
+        if (!keypad->pdata) {
+                err = -EINVAL;
+                goto failed_free;
+        }
 
-        irq = platform_get_irq(pdev, 0);
-        if (irq < 0) {
-                dev_err(&pdev->dev, "failed to get keypad irq\n");
+        keypad->irq = platform_get_irq(pdev, 0);
+        if (!keypad->irq) {
                 err = -ENXIO;
                 goto failed_free;
         }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
-                dev_err(&pdev->dev, "failed to get I/O memory\n");
                 err = -ENXIO;
                 goto failed_free;
         }
 
         res = request_mem_region(res->start, resource_size(res), pdev->name);
         if (!res) {
-                dev_err(&pdev->dev, "failed to request I/O memory\n");
                 err = -EBUSY;
                 goto failed_free;
         }
 
         keypad->mmio_base = ioremap(res->start, resource_size(res));
         if (keypad->mmio_base == NULL) {
-                dev_err(&pdev->dev, "failed to remap I/O memory\n");
                 err = -ENXIO;
                 goto failed_free_mem;
         }
 
-        /* Request the needed GPIO's */
-        gpio = EP93XX_GPIO_LINE_ROW0;
-        for (i = 0; i < keypad->pdata->matrix_key_rows; i++, gpio++) {
-                err = gpio_request(gpio, pdev->name);
-                if (err) {
-                        dev_err(&pdev->dev, "failed to request gpio-%d\n",
-                                gpio);
-                        goto failed_free_rows;
-                }
-        }
-
-        gpio = EP93XX_GPIO_LINE_COL0;
-        for (i = 0; i < keypad->pdata->matrix_key_cols; i++, gpio++) {
-                err = gpio_request(gpio, pdev->name);
-                if (err) {
-                        dev_err(&pdev->dev, "failed to request gpio-%d\n",
-                                gpio);
-                        goto failed_free_cols;
-                }
-        }
+        err = ep93xx_keypad_acquire_gpio(pdev);
+        if (err)
+                goto failed_free_io;
 
-        keypad->clk = clk_get(&pdev->dev, "key_clk");
+        keypad->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(keypad->clk)) {
-                dev_err(&pdev->dev, "failed to get keypad clock\n");
                 err = PTR_ERR(keypad->clk);
-                goto failed_free_io;
+                goto failed_free_gpio;
         }
 
-        /* Create and register the input driver */
         input_dev = input_allocate_device();
         if (!input_dev) {
-                dev_err(&pdev->dev, "failed to allocate input device\n");
                 err = -ENOMEM;
                 goto failed_put_clk;
         }
@@ -358,44 +330,29 @@ static int __devinit ep93xx_keypad_probe(struct platform_device *pdev)
         ep93xx_keypad_build_keycode(keypad);
         platform_set_drvdata(pdev, keypad);
 
-        err = request_irq(irq, ep93xx_keypad_irq_handler, IRQF_DISABLED,
-                                pdev->name, keypad);
-        if (err) {
-                dev_err(&pdev->dev, "failed to request IRQ\n");
+        err = request_irq(keypad->irq, ep93xx_keypad_irq_handler,
+                          IRQF_DISABLED, pdev->name, keypad);
+        if (err)
                 goto failed_free_dev;
-        }
-
-        keypad->irq = irq;
 
-        /* Register the input device */
         err = input_register_device(input_dev);
-        if (err) {
-                dev_err(&pdev->dev, "failed to register input device\n");
+        if (err)
                 goto failed_free_irq;
-        }
 
         device_init_wakeup(&pdev->dev, 1);
 
         return 0;
 
 failed_free_irq:
-        free_irq(irq, pdev);
+        free_irq(keypad->irq, pdev);
         platform_set_drvdata(pdev, NULL);
 failed_free_dev:
         input_free_device(input_dev);
 failed_put_clk:
         clk_put(keypad->clk);
+failed_free_gpio:
+        ep93xx_keypad_release_gpio(pdev);
 failed_free_io:
-        i = keypad->pdata->matrix_key_cols - 1;
-        gpio = EP93XX_GPIO_LINE_COL0 + i;
-failed_free_cols:
-        for ( ; i >= 0; i--, gpio--)
-                gpio_free(gpio);
-        i = keypad->pdata->matrix_key_rows - 1;
-        gpio = EP93XX_GPIO_LINE_ROW0 + i;
-failed_free_rows:
-        for ( ; i >= 0; i--, gpio--)
-                gpio_free(gpio);
         iounmap(keypad->mmio_base);
 failed_free_mem:
         release_mem_region(res->start, resource_size(res));
@@ -408,7 +365,6 @@ static int __devexit ep93xx_keypad_remove(struct platform_device *pdev)
 {
         struct ep93xx_keypad *keypad = platform_get_drvdata(pdev);
         struct resource *res;
-        int i, gpio;
 
         free_irq(keypad->irq, pdev);
 
@@ -420,15 +376,7 @@ static int __devexit ep93xx_keypad_remove(struct platform_device *pdev)
 
         input_unregister_device(keypad->input_dev);
 
-        i = keypad->pdata->matrix_key_cols - 1;
-        gpio = EP93XX_GPIO_LINE_COL0 + i;
-        for ( ; i >= 0; i--, gpio--)
-                gpio_free(gpio);
-
-        i = keypad->pdata->matrix_key_rows - 1;
-        gpio = EP93XX_GPIO_LINE_ROW0 + i;
-        for ( ; i >= 0; i--, gpio--)
-                gpio_free(gpio);
+        ep93xx_keypad_release_gpio(pdev);
 
         iounmap(keypad->mmio_base);
 
diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c
index 076111fc72d2..8e9380bfed40 100644
--- a/drivers/input/keyboard/sh_keysc.c
+++ b/drivers/input/keyboard/sh_keysc.c
@@ -295,7 +295,7 @@ static int sh_keysc_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops sh_keysc_dev_pm_ops = {
+static const struct dev_pm_ops sh_keysc_dev_pm_ops = {
         .suspend = sh_keysc_suspend,
         .resume = sh_keysc_resume,
 };
diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c
index 690f3fafa03b..61d10177fa83 100644
--- a/drivers/input/misc/bfin_rotary.c
+++ b/drivers/input/misc/bfin_rotary.c
@@ -247,7 +247,7 @@ static int bfin_rotary_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops bfin_rotary_pm_ops = {
+static const struct dev_pm_ops bfin_rotary_pm_ops = {
         .suspend        = bfin_rotary_suspend,
         .resume         = bfin_rotary_resume,
 };
diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
index 21cb755a54fb..ea4e1fd12651 100644
--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@ -127,7 +127,7 @@ static void pcspkr_shutdown(struct platform_device *dev)
         pcspkr_event(NULL, EV_SND, SND_BELL, 0);
 }
 
-static struct dev_pm_ops pcspkr_pm_ops = {
+static const struct dev_pm_ops pcspkr_pm_ops = {
         .suspend = pcspkr_suspend,
 };
 
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index a3f492a50850..f93c2c0daf1f 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -5,6 +5,7 @@
  * Copyright (c) 2003-2005 Peter Osterlund <petero2@telia.com>
  * Copyright (c) 2004 Dmitry Torokhov <dtor@mail.ru>
  * Copyright (c) 2005 Vojtech Pavlik <vojtech@suse.cz>
+ * Copyright (c) 2009 Sebastian Kapfer <sebastian_kapfer@gmx.net>
  *
  * ALPS detection, tap switching and status querying info is taken from
  * tpconfig utility (by C. Scott Ananian and Bruce Kall).
@@ -28,7 +29,6 @@
 #define dbg(format, arg...) do {} while (0)
 #endif
 
-
 #define ALPS_OLDPROTO           0x01    /* old style input */
 #define ALPS_DUALPOINT          0x02    /* touchpad has trackstick */
 #define ALPS_PASS               0x04    /* device has a pass-through port */
@@ -37,7 +37,8 @@
 #define ALPS_FW_BK_1            0x10    /* front & back buttons present */
 #define ALPS_FW_BK_2            0x20    /* front & back buttons present */
 #define ALPS_FOUR_BUTTONS       0x40    /* 4 direction button present */
-
+#define ALPS_PS2_INTERLEAVED    0x80    /* 3-byte PS/2 packet interleaved with
+                                           6-byte ALPS packet */
 
 static const struct alps_model_info alps_model_data[] = {
         { { 0x32, 0x02, 0x14 }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* Toshiba Salellite Pro M10 */
@@ -58,7 +59,9 @@ static const struct alps_model_info alps_model_data[] = {
         { { 0x20, 0x02, 0x0e }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* XXX */
         { { 0x22, 0x02, 0x0a }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT },
         { { 0x22, 0x02, 0x14 }, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude D600 */
-        { { 0x62, 0x02, 0x14 }, 0xcf, 0xcf, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude E6500 */
+        /* Dell Latitude E5500, E6400, E6500, Precision M4400 */
+        { { 0x62, 0x02, 0x14 }, 0xcf, 0xcf,
+                ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED },
         { { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FOUR_BUTTONS },          /* Dell Vostro 1400 */
 };
 
@@ -69,20 +72,88 @@ static const struct alps_model_info alps_model_data[] = {
  */
 
 /*
- * ALPS abolute Mode - new format
+ * PS/2 packet format
+ *
+ * byte 0:  0    0 YSGN XSGN    1    M    R    L
+ * byte 1: X7   X6   X5   X4   X3   X2   X1   X0
+ * byte 2: Y7   Y6   Y5   Y4   Y3   Y2   Y1   Y0
+ *
+ * Note that the device never signals overflow condition.
+ *
+ * ALPS absolute Mode - new format
  *
  * byte 0:  1    ?    ?    ?    1    ?    ?    ?
  * byte 1:  0   x6   x5   x4   x3   x2   x1   x0
- * byte 2:  0   x10  x9   x8   x7    ?  fin  ges
+ * byte 2:  0  x10   x9   x8   x7    ?  fin  ges
  * byte 3:  0   y9   y8   y7    1    M    R    L
  * byte 4:  0   y6   y5   y4   y3   y2   y1   y0
  * byte 5:  0   z6   z5   z4   z3   z2   z1   z0
  *
+ * Dualpoint device -- interleaved packet format
+ *
+ * byte 0:    1    1    0    0    1    1    1    1
+ * byte 1:    0   x6   x5   x4   x3   x2   x1   x0
+ * byte 2:    0  x10   x9   x8   x7    0  fin  ges
+ * byte 3:    0    0 YSGN XSGN    1    1    1    1
+ * byte 4:   X7   X6   X5   X4   X3   X2   X1   X0
+ * byte 5:   Y7   Y6   Y5   Y4   Y3   Y2   Y1   Y0
+ * byte 6:    0   y9   y8   y7    1    m    r    l
+ * byte 7:    0   y6   y5   y4   y3   y2   y1   y0
+ * byte 8:    0   z6   z5   z4   z3   z2   z1   z0
+ *
+ * CAPITALS = stick, miniscules = touchpad
+ *
  * ?'s can have different meanings on different models,
  * such as wheel rotation, extra buttons, stick buttons
  * on a dualpoint, etc.
  */
 
+static bool alps_is_valid_first_byte(const struct alps_model_info *model,
+                                     unsigned char data)
+{
+        return (data & model->mask0) == model->byte0;
+}
+
+static void alps_report_buttons(struct psmouse *psmouse,
+                                struct input_dev *dev1, struct input_dev *dev2,
+                                int left, int right, int middle)
+{
+        struct alps_data *priv = psmouse->private;
+        const struct alps_model_info *model = priv->i;
+
+        if (model->flags & ALPS_PS2_INTERLEAVED) {
+                struct input_dev *dev;
+
+                /*
+                 * If shared button has already been reported on the
+                 * other device (dev2) then this event should be also
+                 * sent through that device.
+                 */
+                dev = test_bit(BTN_LEFT, dev2->key) ? dev2 : dev1;
+                input_report_key(dev, BTN_LEFT, left);
+
+                dev = test_bit(BTN_RIGHT, dev2->key) ? dev2 : dev1;
+                input_report_key(dev, BTN_RIGHT, right);
+
+                dev = test_bit(BTN_MIDDLE, dev2->key) ? dev2 : dev1;
+                input_report_key(dev, BTN_MIDDLE, middle);
+
+                /*
+                 * Sync the _other_ device now, we'll do the first
+                 * device later once we report the rest of the events.
+                 */
+                input_sync(dev2);
+        } else {
+                /*
+                 * For devices with non-interleaved packets we know what
+                 * device buttons belong to so we can simply report them.
+                 */
+                input_report_key(dev1, BTN_LEFT, left);
+                input_report_key(dev1, BTN_RIGHT, right);
+                input_report_key(dev1, BTN_MIDDLE, middle);
+        }
+}
+
 static void alps_process_packet(struct psmouse *psmouse)
 {
         struct alps_data *priv = psmouse->private;
@@ -93,18 +164,6 @@ static void alps_process_packet(struct psmouse *psmouse)
         int x, y, z, ges, fin, left, right, middle;
         int back = 0, forward = 0;
 
-        if ((packet[0] & 0xc8) == 0x08) {   /* 3-byte PS/2 packet */
-                input_report_key(dev2, BTN_LEFT,   packet[0] & 1);
-                input_report_key(dev2, BTN_RIGHT,  packet[0] & 2);
-                input_report_key(dev2, BTN_MIDDLE, packet[0] & 4);
-                input_report_rel(dev2, REL_X,
-                        packet[1] ? packet[1] - ((packet[0] << 4) & 0x100) : 0);
-                input_report_rel(dev2, REL_Y,
-                        packet[2] ? ((packet[0] << 3) & 0x100) - packet[2] : 0);
-                input_sync(dev2);
-                return;
-        }
-
         if (model->flags & ALPS_OLDPROTO) {
                 left = packet[2] & 0x10;
                 right = packet[2] & 0x08;
@@ -140,18 +199,13 @@ static void alps_process_packet(struct psmouse *psmouse)
                 input_report_rel(dev2, REL_X,  (x > 383 ? (x - 768) : x));
                 input_report_rel(dev2, REL_Y, -(y > 255 ? (y - 512) : y));
 
-                input_report_key(dev2, BTN_LEFT, left);
-                input_report_key(dev2, BTN_RIGHT, right);
-                input_report_key(dev2, BTN_MIDDLE, middle);
+                alps_report_buttons(psmouse, dev2, dev, left, right, middle);
 
-                input_sync(dev);
                 input_sync(dev2);
                 return;
         }
 
-        input_report_key(dev, BTN_LEFT, left);
-        input_report_key(dev, BTN_RIGHT, right);
-        input_report_key(dev, BTN_MIDDLE, middle);
+        alps_report_buttons(psmouse, dev, dev2, left, right, middle);
 
         /* Convert hardware tap to a reasonable Z value */
         if (ges && !fin)
@@ -202,25 +256,168 @@ static void alps_process_packet(struct psmouse *psmouse)
         input_sync(dev);
 }
 
+static void alps_report_bare_ps2_packet(struct psmouse *psmouse,
+                                        unsigned char packet[],
+                                        bool report_buttons)
+{
+        struct alps_data *priv = psmouse->private;
+        struct input_dev *dev2 = priv->dev2;
+
+        if (report_buttons)
+                alps_report_buttons(psmouse, dev2, psmouse->dev,
+                                packet[0] & 1, packet[0] & 2, packet[0] & 4);
+
+        input_report_rel(dev2, REL_X,
+                packet[1] ? packet[1] - ((packet[0] << 4) & 0x100) : 0);
+        input_report_rel(dev2, REL_Y,
+                packet[2] ? ((packet[0] << 3) & 0x100) - packet[2] : 0);
+
+        input_sync(dev2);
+}
+
+static psmouse_ret_t alps_handle_interleaved_ps2(struct psmouse *psmouse)
+{
+        struct alps_data *priv = psmouse->private;
+
+        if (psmouse->pktcnt < 6)
+                return PSMOUSE_GOOD_DATA;
+
+        if (psmouse->pktcnt == 6) {
+                /*
+                 * Start a timer to flush the packet if it ends up last
+                 * 6-byte packet in the stream. Timer needs to fire
+                 * psmouse core times out itself. 20 ms should be enough
+                 * to decide if we are getting more data or not.
+                 */
+                mod_timer(&priv->timer, jiffies + msecs_to_jiffies(20));
+                return PSMOUSE_GOOD_DATA;
+        }
+
+        del_timer(&priv->timer);
+
+        if (psmouse->packet[6] & 0x80) {
+
+                /*
+                 * Highest bit is set - that means we either had
+                 * complete ALPS packet and this is start of the
+                 * next packet or we got garbage.
+                 */
+
+                if (((psmouse->packet[3] |
+                      psmouse->packet[4] |
+                      psmouse->packet[5]) & 0x80) ||
+                    (!alps_is_valid_first_byte(priv->i, psmouse->packet[6]))) {
+                        dbg("refusing packet %x %x %x %x "
+                            "(suspected interleaved ps/2)\n",
+                            psmouse->packet[3], psmouse->packet[4],
+                            psmouse->packet[5], psmouse->packet[6]);
+                        return PSMOUSE_BAD_DATA;
+                }
+
+                alps_process_packet(psmouse);
+
+                /* Continue with the next packet */
+                psmouse->packet[0] = psmouse->packet[6];
+                psmouse->pktcnt = 1;
+
+        } else {
+
+                /*
+                 * High bit is 0 - that means that we indeed got a PS/2
+                 * packet in the middle of ALPS packet.
+                 *
+                 * There is also possibility that we got 6-byte ALPS
+                 * packet followed  by 3-byte packet from trackpoint. We
+                 * can not distinguish between these 2 scenarios but
+                 * becase the latter is unlikely to happen in course of
+                 * normal operation (user would need to press all
+                 * buttons on the pad and start moving trackpoint
+                 * without touching the pad surface) we assume former.
+                 * Even if we are wrong the wost thing that would happen
+                 * the cursor would jump but we should not get protocol
+                 * desynchronization.
+                 */
+
+                alps_report_bare_ps2_packet(psmouse, &psmouse->packet[3],
+                                            false);
+
+                /*
+                 * Continue with the standard ALPS protocol handling,
+                 * but make sure we won't process it as an interleaved
+                 * packet again, which may happen if all buttons are
+                 * pressed. To avoid this let's reset the 4th bit which
+                 * is normally 1.
+                 */
+                psmouse->packet[3] = psmouse->packet[6] & 0xf7;
+                psmouse->pktcnt = 4;
+        }
+
+        return PSMOUSE_GOOD_DATA;
+}
+
+static void alps_flush_packet(unsigned long data)
+{
+        struct psmouse *psmouse = (struct psmouse *)data;
+
+        serio_pause_rx(psmouse->ps2dev.serio);
+
+        if (psmouse->pktcnt == 6) {
+
+                /*
+                 * We did not any more data in reasonable amount of time.
+                 * Validate the last 3 bytes and process as a standard
+                 * ALPS packet.
+                 */
+                if ((psmouse->packet[3] |
+                     psmouse->packet[4] |
+                     psmouse->packet[5]) & 0x80) {
+                        dbg("refusing packet %x %x %x "
+                            "(suspected interleaved ps/2)\n",
+                            psmouse->packet[3], psmouse->packet[4],
+                            psmouse->packet[5]);
+                } else {
+                        alps_process_packet(psmouse);
+                }
+                psmouse->pktcnt = 0;
+        }
+
+        serio_continue_rx(psmouse->ps2dev.serio);
+}
+
 static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)
 {
         struct alps_data *priv = psmouse->private;
+        const struct alps_model_info *model = priv->i;
 
         if ((psmouse->packet[0] & 0xc8) == 0x08) { /* PS/2 packet */
                 if (psmouse->pktcnt == 3) {
-                        alps_process_packet(psmouse);
+                        alps_report_bare_ps2_packet(psmouse, psmouse->packet,
+                                                    true);
                         return PSMOUSE_FULL_PACKET;
                 }
                 return PSMOUSE_GOOD_DATA;
         }
 
-        if ((psmouse->packet[0] & priv->i->mask0) != priv->i->byte0)
+        /* Check for PS/2 packet stuffed in the middle of ALPS packet. */
+
+        if ((model->flags & ALPS_PS2_INTERLEAVED) &&
+            psmouse->pktcnt >= 4 && (psmouse->packet[3] & 0x0f) == 0x0f) {
+                return alps_handle_interleaved_ps2(psmouse);
+        }
+
+        if (!alps_is_valid_first_byte(model, psmouse->packet[0])) {
+                dbg("refusing packet[0] = %x (mask0 = %x, byte0 = %x)\n",
+                    psmouse->packet[0], model->mask0, model->byte0);
                 return PSMOUSE_BAD_DATA;
+        }
 
         /* Bytes 2 - 6 should have 0 in the highest bit */
         if (psmouse->pktcnt >= 2 && psmouse->pktcnt <= 6 &&
-            (psmouse->packet[psmouse->pktcnt - 1] & 0x80))
+            (psmouse->packet[psmouse->pktcnt - 1] & 0x80)) {
+                dbg("refusing packet[%i] = %x\n",
+                    psmouse->pktcnt - 1, psmouse->packet[psmouse->pktcnt - 1]);
                 return PSMOUSE_BAD_DATA;
+        }
 
         if (psmouse->pktcnt == 6) {
                 alps_process_packet(psmouse);
@@ -459,6 +656,7 @@ static void alps_disconnect(struct psmouse *psmouse)
         struct alps_data *priv = psmouse->private;
 
         psmouse_reset(psmouse);
+        del_timer_sync(&priv->timer);
         input_unregister_device(priv->dev2);
         kfree(priv);
 }
@@ -476,6 +674,8 @@ int alps_init(struct psmouse *psmouse)
                 goto init_fail;
 
         priv->dev2 = dev2;
+        setup_timer(&priv->timer, alps_flush_packet, (unsigned long)psmouse);
+
         psmouse->private = priv;
 
         model = alps_get_model(psmouse, &version);
@@ -487,6 +687,17 @@ int alps_init(struct psmouse *psmouse)
         if (alps_hw_init(psmouse))
                 goto init_fail;
 
+        /*
+         * Undo part of setup done for us by psmouse core since touchpad
+         * is not a relative device.
+         */
+        __clear_bit(EV_REL, dev1->evbit);
+        __clear_bit(REL_X, dev1->relbit);
+        __clear_bit(REL_Y, dev1->relbit);
+
+        /*
+         * Now set up our capabilities.
+         */
         dev1->evbit[BIT_WORD(EV_KEY)] |= BIT_MASK(EV_KEY);
         dev1->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH);
         dev1->keybit[BIT_WORD(BTN_TOOL_FINGER)] |= BIT_MASK(BTN_TOOL_FINGER);
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
index bc87936fee1a..904ed8b3c8be 100644
--- a/drivers/input/mouse/alps.h
+++ b/drivers/input/mouse/alps.h
@@ -23,6 +23,7 @@ struct alps_data {
         char phys[32];                  /* Phys */
         const struct alps_model_info *i;/* Info */
         int prev_fin;                   /* Finger bit from previous packet */
+        struct timer_list timer;
 };
 
 #ifdef CONFIG_MOUSE_PS2_ALPS
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
index f479ea50919f..320b7ca48bf8 100644
--- a/drivers/input/serio/altera_ps2.c
+++ b/drivers/input/serio/altera_ps2.c
@@ -79,11 +79,11 @@ static void altera_ps2_close(struct serio *io)
 /*
  * Add one device to this driver.
  */
-static int altera_ps2_probe(struct platform_device *pdev)
+static int __devinit altera_ps2_probe(struct platform_device *pdev)
 {
         struct ps2if *ps2if;
         struct serio *serio;
-        int error;
+        int error, irq;
 
         ps2if = kzalloc(sizeof(struct ps2if), GFP_KERNEL);
         serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
@@ -108,11 +108,13 @@ static int altera_ps2_probe(struct platform_device *pdev)
                 goto err_free_mem;
         }
 
-        ps2if->irq  = platform_get_irq(pdev, 0);
-        if (ps2if->irq < 0) {
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
                 error = -ENXIO;
                 goto err_free_mem;
         }
+        ps2if->irq = irq;
 
         if (!request_mem_region(ps2if->iomem_res->start,
                                 resource_size(ps2if->iomem_res), pdev->name)) {
@@ -155,7 +157,7 @@ static int altera_ps2_probe(struct platform_device *pdev)
 /*
  * Remove one device from this driver.
  */
-static int altera_ps2_remove(struct platform_device *pdev)
+static int __devexit altera_ps2_remove(struct platform_device *pdev)
 {
         struct ps2if *ps2if = platform_get_drvdata(pdev);
 
@@ -175,9 +177,10 @@ static int altera_ps2_remove(struct platform_device *pdev)
  */
 static struct platform_driver altera_ps2_driver = {
         .probe          = altera_ps2_probe,
-        .remove         = altera_ps2_remove,
+        .remove         = __devexit_p(altera_ps2_remove),
         .driver = {
                 .name   = DRV_NAME,
+                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
index 89b394183a75..92563a681d65 100644
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
@@ -107,7 +107,7 @@ static void amba_kmi_close(struct serio *io)
         clk_disable(kmi->clk);
 }
 
-static int amba_kmi_probe(struct amba_device *dev, struct amba_id *id)
+static int __devinit amba_kmi_probe(struct amba_device *dev, struct amba_id *id)
 {
         struct amba_kmi_port *kmi;
         struct serio *io;
@@ -134,7 +134,7 @@ static int amba_kmi_probe(struct amba_device *dev, struct amba_id *id)
         io->port_data   = kmi;
         io->dev.parent  = &dev->dev;
 
-        kmi->io         = io;
+        kmi->io         = io;
         kmi->base       = ioremap(dev->res.start, resource_size(&dev->res));
         if (!kmi->base) {
                 ret = -ENOMEM;
@@ -162,7 +162,7 @@ static int amba_kmi_probe(struct amba_device *dev, struct amba_id *id)
         return ret;
 }
 
-static int amba_kmi_remove(struct amba_device *dev)
+static int __devexit amba_kmi_remove(struct amba_device *dev)
 {
         struct amba_kmi_port *kmi = amba_get_drvdata(dev);
 
@@ -197,10 +197,11 @@ static struct amba_id amba_kmi_idtable[] = {
 static struct amba_driver ambakmi_driver = {
         .drv            = {
                 .name   = "kmi-pl050",
+                .owner  = THIS_MODULE,
         },
         .id_table       = amba_kmi_idtable,
         .probe          = amba_kmi_probe,
-        .remove         = amba_kmi_remove,
+        .remove         = __devexit_p(amba_kmi_remove),
         .resume         = amba_kmi_resume,
 };
 
diff --git a/drivers/input/serio/at32psif.c b/drivers/input/serio/at32psif.c
index a6fb7a3dcc46..b54452a8c771 100644
--- a/drivers/input/serio/at32psif.c
+++ b/drivers/input/serio/at32psif.c
@@ -137,7 +137,7 @@ static int psif_write(struct serio *io, unsigned char val)
         spin_lock_irqsave(&psif->lock, flags);
 
         while (!(psif_readl(psif, SR) & PSIF_BIT(TXEMPTY)) && timeout--)
-                msleep(10);
+                udelay(50);
 
         if (timeout >= 0) {
                 psif_writel(psif, THR, val);
@@ -352,6 +352,7 @@ static struct platform_driver psif_driver = {
         .remove         = __exit_p(psif_remove),
         .driver         = {
                 .name   = "atmel_psif",
+                .owner  = THIS_MODULE,
         },
         .suspend        = psif_suspend,
         .resume         = psif_resume,
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index bd0f92d9f40f..06addfa7cc47 100644
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2002 Thibaut Varene <varenet@parisc-linux.org>
  *
  * Pieces of code based on linux-2.4's hp_mouse.c & hp_keyb.c
- *      Copyright (c) 1999 Alex deVries <alex@onefishtwo.ca>
+ *      Copyright (c) 1999 Alex deVries <alex@onefishtwo.ca>
  *      Copyright (c) 1999-2000 Philipp Rumpf <prumpf@tux.org>
  *      Copyright (c) 2000 Xavier Debacker <debackex@esiee.fr>
  *      Copyright (c) 2000-2001 Thomas Marteau <marteaut@esiee.fr>
@@ -326,7 +326,7 @@ static void gscps2_close(struct serio *port)
  * @return: success/error report
  */
 
-static int __init gscps2_probe(struct parisc_device *dev)
+static int __devinit gscps2_probe(struct parisc_device *dev)
 {
         struct gscps2port *ps2port;
         struct serio *serio;
@@ -443,7 +443,7 @@ static struct parisc_driver parisc_ps2_driver = {
         .name           = "gsc_ps2",
         .id_table       = gscps2_device_tbl,
         .probe          = gscps2_probe,
-        .remove         = gscps2_remove,
+        .remove         = __devexit_p(gscps2_remove),
 };
 
 static int __init gscps2_init(void)
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c
index 7ba9f2b2c041..6cd03ebaf5fb 100644
--- a/drivers/input/serio/hil_mlc.c
+++ b/drivers/input/serio/hil_mlc.c
@@ -993,10 +993,8 @@ int hil_mlc_unregister(hil_mlc *mlc)
 
 static int __init hil_mlc_init(void)
 {
-        init_timer(&hil_mlcs_kicker);
-        hil_mlcs_kicker.expires = jiffies + HZ;
-        hil_mlcs_kicker.function = &hil_mlcs_timer;
-        add_timer(&hil_mlcs_kicker);
+        setup_timer(&hil_mlcs_kicker, &hil_mlcs_timer, 0);
+        mod_timer(&hil_mlcs_kicker, jiffies + HZ);
 
         tasklet_enable(&hil_mlcs_tasklet);
 
@@ -1005,7 +1003,7 @@ static int __init hil_mlc_init(void)
 
 static void __exit hil_mlc_exit(void)
 {
-        del_timer(&hil_mlcs_kicker);
+        del_timer_sync(&hil_mlcs_kicker);
 
         tasklet_disable(&hil_mlcs_tasklet);
         tasklet_kill(&hil_mlcs_tasklet);
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 7fbffe431bc5..64b688daf48a 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -158,6 +158,14 @@ static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = {
                 },
         },
         {
+                /* Gigabyte M1022M netbook */
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Gigabyte Technology Co.,Ltd."),
+                        DMI_MATCH(DMI_BOARD_NAME, "M1022E"),
+                        DMI_MATCH(DMI_BOARD_VERSION, "1.02"),
+                },
+        },
+        {
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv9700"),
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 1df02d25aca5..d84a36e545f6 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -126,6 +126,8 @@ static unsigned char i8042_suppress_kbd_ack;
 static struct platform_device *i8042_platform_device;
 
 static irqreturn_t i8042_interrupt(int irq, void *dev_id);
+static bool (*i8042_platform_filter)(unsigned char data, unsigned char str,
+                                     struct serio *serio);
 
 void i8042_lock_chip(void)
 {
@@ -139,6 +141,48 @@ void i8042_unlock_chip(void)
 }
 EXPORT_SYMBOL(i8042_unlock_chip);
 
+int i8042_install_filter(bool (*filter)(unsigned char data, unsigned char str,
+                                        struct serio *serio))
+{
+        unsigned long flags;
+        int ret = 0;
+
+        spin_lock_irqsave(&i8042_lock, flags);
+
+        if (i8042_platform_filter) {
+                ret = -EBUSY;
+                goto out;
+        }
+
+        i8042_platform_filter = filter;
+
+out:
+        spin_unlock_irqrestore(&i8042_lock, flags);
+        return ret;
+}
+EXPORT_SYMBOL(i8042_install_filter);
+
+int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str,
+                                       struct serio *port))
+{
+        unsigned long flags;
+        int ret = 0;
+
+        spin_lock_irqsave(&i8042_lock, flags);
+
+        if (i8042_platform_filter != filter) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        i8042_platform_filter = NULL;
+
+out:
+        spin_unlock_irqrestore(&i8042_lock, flags);
+        return ret;
+}
+EXPORT_SYMBOL(i8042_remove_filter);
+
 /*
  * The i8042_wait_read() and i8042_wait_write functions wait for the i8042 to
  * be ready for reading values from it / writing values to it.
@@ -369,6 +413,31 @@ static void i8042_stop(struct serio *serio)
 }
 
 /*
+ * i8042_filter() filters out unwanted bytes from the input data stream.
+ * It is called from i8042_interrupt and thus is running with interrupts
+ * off and i8042_lock held.
+ */
+static bool i8042_filter(unsigned char data, unsigned char str,
+                         struct serio *serio)
+{
+        if (unlikely(i8042_suppress_kbd_ack)) {
+                if ((~str & I8042_STR_AUXDATA) &&
+                    (data == 0xfa || data == 0xfe)) {
+                        i8042_suppress_kbd_ack--;
+                        dbg("Extra keyboard ACK - filtered out\n");
+                        return true;
+                }
+        }
+
+        if (i8042_platform_filter && i8042_platform_filter(data, str, serio)) {
+                dbg("Filtered out by platfrom filter\n");
+                return true;
+        }
+
+        return false;
+}
+
+/*
  * i8042_interrupt() is the most important function in this driver -
  * it handles the interrupts from the i8042, and sends incoming bytes
  * to the upper layers.
@@ -377,13 +446,16 @@ static void i8042_stop(struct serio *serio)
 static irqreturn_t i8042_interrupt(int irq, void *dev_id)
 {
         struct i8042_port *port;
+        struct serio *serio;
         unsigned long flags;
         unsigned char str, data;
         unsigned int dfl;
         unsigned int port_no;
+        bool filtered;
         int ret = 1;
 
         spin_lock_irqsave(&i8042_lock, flags);
+
         str = i8042_read_status();
         if (unlikely(~str & I8042_STR_OBF)) {
                 spin_unlock_irqrestore(&i8042_lock, flags);
@@ -391,8 +463,8 @@ static irqreturn_t i8042_interrupt(int irq, void *dev_id)
                 ret = 0;
                 goto out;
         }
+
         data = i8042_read_data();
-        spin_unlock_irqrestore(&i8042_lock, flags);
 
         if (i8042_mux_present && (str & I8042_STR_AUXDATA)) {
                 static unsigned long last_transmit;
@@ -441,21 +513,19 @@ static irqreturn_t i8042_interrupt(int irq, void *dev_id)
         }
 
         port = &i8042_ports[port_no];
+        serio = port->exists ? port->serio : NULL;
 
         dbg("%02x <- i8042 (interrupt, %d, %d%s%s)",
             data, port_no, irq,
             dfl & SERIO_PARITY ? ", bad parity" : "",
             dfl & SERIO_TIMEOUT ? ", timeout" : "");
 
-        if (unlikely(i8042_suppress_kbd_ack))
-                if (port_no == I8042_KBD_PORT_NO &&
-                    (data == 0xfa || data == 0xfe)) {
-                        i8042_suppress_kbd_ack--;
-                        goto out;
-                }
+        filtered = i8042_filter(data, str, serio);
+
+        spin_unlock_irqrestore(&i8042_lock, flags);
 
-        if (likely(port->exists))
-                serio_interrupt(port->serio, data, dfl);
+        if (likely(port->exists && !filtered))
+                serio_interrupt(serio, data, dfl);
 
  out:
         return IRQ_RETVAL(ret);
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index f412c69478a8..d55874e5d1c2 100644
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -180,8 +180,8 @@ static void __devinit ps2_clear_input(struct ps2if *ps2if)
         }
 }
 
-static inline unsigned int
-ps2_test_one(struct ps2if *ps2if, unsigned int mask)
+static unsigned int __devinit ps2_test_one(struct ps2if *ps2if,
+                                           unsigned int mask)
 {
         unsigned int val;
 
@@ -197,7 +197,7 @@ ps2_test_one(struct ps2if *ps2if, unsigned int mask)
  * Test the keyboard interface.  We basically check to make sure that
  * we can drive each line to the keyboard independently of each other.
  */
-static int __init ps2_test(struct ps2if *ps2if)
+static int __devinit ps2_test(struct ps2if *ps2if)
 {
         unsigned int stat;
         int ret = 0;
@@ -312,7 +312,7 @@ static int __devinit ps2_probe(struct sa1111_dev *dev)
 /*
  * Remove one device from this driver.
  */
-static int ps2_remove(struct sa1111_dev *dev)
+static int __devexit ps2_remove(struct sa1111_dev *dev)
 {
         struct ps2if *ps2if = sa1111_get_drvdata(dev);
 
@@ -335,7 +335,7 @@ static struct sa1111_driver ps2_driver = {
         },
         .devid          = SA1111_DEVID_PS2,
         .probe          = ps2_probe,
-        .remove         = ps2_remove,
+        .remove         = __devexit_p(ps2_remove),
 };
 
 static int __init ps2_init(void)
diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h
index 9114ae1c7488..16310f368dab 100644
--- a/drivers/input/tablet/wacom.h
+++ b/drivers/input/tablet/wacom.h
@@ -1,7 +1,7 @@
 /*
  * drivers/input/tablet/wacom.h
  *
- *  USB Wacom Graphire and Wacom Intuos tablet support
+ *  USB Wacom tablet support
  *
  *  Copyright (c) 2000-2004 Vojtech Pavlik      <vojtech@ucw.cz>
  *  Copyright (c) 2000 Andreas Bach Aaen        <abach@stofanet.dk>
@@ -69,6 +69,9 @@
  *      v1.49 (pc) - Added support for USB Tablet PC (0x90, 0x93, and 0x9A)
  *      v1.50 (pc) - Fixed a TabletPC touch bug in 2.6.28
  *      v1.51 (pc) - Added support for Intuos4
+ *      v1.52 (pc) - Query Wacom data upon system resume
+ *                 - add defines for features->type
+ *                 - add new devices (0x9F, 0xE2, and 0XE3)
  */
 
 /*
@@ -89,9 +92,9 @@
 /*
  * Version Information
  */
-#define DRIVER_VERSION "v1.51"
+#define DRIVER_VERSION "v1.52"
 #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"
-#define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver"
+#define DRIVER_DESC "USB Wacom tablet driver"
 #define DRIVER_LICENSE "GPL"
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
@@ -133,6 +136,8 @@ extern void input_dev_i4s(struct input_dev *input_dev, struct wacom_wac *wacom_w
 extern void input_dev_i4(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
+extern void input_dev_tpc(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
+extern void input_dev_tpc2fg(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern __u16 wacom_le16_to_cpu(unsigned char *data);
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index ea30c983a33e..072f33b3b2b0 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -1,7 +1,7 @@
 /*
  * drivers/input/tablet/wacom_sys.c
  *
- *  USB Wacom Graphire and Wacom Intuos tablet support - system specific code
+ *  USB Wacom tablet support - system specific code
  */
 
 /*
@@ -209,6 +209,7 @@ void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
         input_dev->keybit[BIT_WORD(BTN_MOUSE)] |= BIT_MASK(BTN_LEFT) |
                 BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE);
         input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) |
+                BIT_MASK(BTN_TOOL_PEN) | BIT_MASK(BTN_STYLUS) |
                 BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_STYLUS2);
         input_set_abs_params(input_dev, ABS_DISTANCE, 0, wacom_wac->features->distance_max, 0, 0);
 }
@@ -256,6 +257,7 @@ void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
                 BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE) |
                 BIT_MASK(BTN_SIDE) | BIT_MASK(BTN_EXTRA);
         input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) |
+                BIT_MASK(BTN_TOOL_PEN) | BIT_MASK(BTN_STYLUS) |
                 BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_TOOL_BRUSH) |
                 BIT_MASK(BTN_TOOL_PENCIL) | BIT_MASK(BTN_TOOL_AIRBRUSH) |
                 BIT_MASK(BTN_TOOL_LENS) | BIT_MASK(BTN_STYLUS2);
@@ -269,7 +271,8 @@ void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 
 void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
-        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_STYLUS2);
+        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_PEN) |
+                BIT_MASK(BTN_STYLUS) | BIT_MASK(BTN_STYLUS2);
 }
 
 void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
@@ -277,12 +280,32 @@ void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
         input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER);
 }
 
+void input_dev_tpc(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
+{
+        if (wacom_wac->features->device_type == BTN_TOOL_DOUBLETAP ||
+            wacom_wac->features->device_type == BTN_TOOL_TRIPLETAP) {
+                input_set_abs_params(input_dev, ABS_RX, 0, wacom_wac->features->x_phy, 0, 0);
+                input_set_abs_params(input_dev, ABS_RY, 0, wacom_wac->features->y_phy, 0, 0);
+                input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_DOUBLETAP);
+        }
+}
+
+void input_dev_tpc2fg(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
+{
+        if (wacom_wac->features->device_type == BTN_TOOL_TRIPLETAP) {
+                input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_TRIPLETAP);
+                input_dev->evbit[0] |= BIT_MASK(EV_MSC);
+                input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);
+        }
+}
+
 static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hid_desc,
-                           struct wacom_wac *wacom_wac)
+                           struct wacom_features *features)
 {
         struct usb_device *dev = interface_to_usbdev(intf);
-        struct wacom_features *features = wacom_wac->features;
-        char limit = 0, result = 0;
+        char limit = 0;
+        /* result has to be defined as int for some devices */
+        int result = 0;
         int i = 0, usage = WCM_UNDEFINED, finger = 0, pen = 0;
         unsigned char *report;
 
@@ -328,13 +351,24 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi
                         case HID_USAGE_X:
                                 if (usage == WCM_DESKTOP) {
                                         if (finger) {
-                                                features->touch_x_max =
-                                                        features->touch_y_max =
-                                                        wacom_le16_to_cpu(&report[i + 3]);
+                                                features->device_type = BTN_TOOL_DOUBLETAP;
+                                                if (features->type == TABLETPC2FG) {
+                                                        /* need to reset back */
+                                                        features->pktlen = WACOM_PKGLEN_TPC2FG;
+                                                        features->device_type = BTN_TOOL_TRIPLETAP;
+                                                }
                                                 features->x_max =
+                                                        wacom_le16_to_cpu(&report[i + 3]);
+                                                features->x_phy =
                                                         wacom_le16_to_cpu(&report[i + 6]);
-                                                i += 7;
+                                                features->unit = report[i + 9];
+                                                features->unitExpo = report[i + 11];
+                                                i += 12;
                                         } else if (pen) {
+                                                /* penabled only accepts exact bytes of data */
+                                                if (features->type == TABLETPC2FG)
+                                                        features->pktlen = WACOM_PKGLEN_PENABLED;
+                                                features->device_type = BTN_TOOL_PEN;
                                                 features->x_max =
                                                         wacom_le16_to_cpu(&report[i + 3]);
                                                 i += 4;
@@ -350,10 +384,35 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi
                                 break;
 
                         case HID_USAGE_Y:
-                                if (usage == WCM_DESKTOP)
-                                        features->y_max =
-                                                wacom_le16_to_cpu(&report[i + 3]);
-                                i += 4;
+                                if (usage == WCM_DESKTOP) {
+                                        if (finger) {
+                                                features->device_type = BTN_TOOL_DOUBLETAP;
+                                                if (features->type == TABLETPC2FG) {
+                                                        /* need to reset back */
+                                                        features->pktlen = WACOM_PKGLEN_TPC2FG;
+                                                        features->device_type = BTN_TOOL_TRIPLETAP;
+                                                        features->y_max =
+                                                                wacom_le16_to_cpu(&report[i + 3]);
+                                                        features->y_phy =
+                                                                wacom_le16_to_cpu(&report[i + 6]);
+                                                        i += 7;
+                                                } else {
+                                                        features->y_max =
+                                                                features->x_max;
+                                                        features->y_phy =
+                                                                wacom_le16_to_cpu(&report[i + 3]);
+                                                        i += 4;
+                                                }
+                                        } else if (pen) {
+                                                /* penabled only accepts exact bytes of data */
+                                                if (features->type == TABLETPC2FG)
+                                                        features->pktlen = WACOM_PKGLEN_PENABLED;
+                                                features->device_type = BTN_TOOL_PEN;
+                                                features->y_max =
+                                                        wacom_le16_to_cpu(&report[i + 3]);
+                                                i += 4;
+                                        }
+                                }
                                 break;
 
                         case HID_USAGE_FINGER:
@@ -376,7 +435,7 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi
                         break;
 
                 case HID_COLLECTION:
-                        /* reset UsagePage ans Finger */
+                        /* reset UsagePage and Finger */
                         finger = usage = 0;
                         break;
                 }
@@ -388,43 +447,92 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi
         return result;
 }
 
-static int wacom_query_tablet_data(struct usb_interface *intf)
+static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_features *features)
 {
         unsigned char *rep_data;
-        int limit = 0;
-        int error;
+        int limit = 0, report_id = 2;
+        int error = -ENOMEM;
 
         rep_data = kmalloc(2, GFP_KERNEL);
         if (!rep_data)
-                return -ENOMEM;
-
-        do {
-                rep_data[0] = 2;
-                rep_data[1] = 2;
-                error = usb_set_report(intf, WAC_HID_FEATURE_REPORT,
-                                        2, rep_data, 2);
-                if (error >= 0)
-                        error = usb_get_report(intf,
-                                                WAC_HID_FEATURE_REPORT, 2,
-                                                rep_data, 2);
-        } while ((error < 0 || rep_data[1] != 2) && limit++ < 5);
+                return error;
+
+        /* ask to report tablet data if it is 2FGT or not a Tablet PC */
+        if (features->device_type == BTN_TOOL_TRIPLETAP) {
+                do {
+                        rep_data[0] = 3;
+                        rep_data[1] = 4;
+                        report_id = 3;
+                        error = usb_set_report(intf, WAC_HID_FEATURE_REPORT,
+                                report_id, rep_data, 2);
+                        if (error >= 0)
+                                error = usb_get_report(intf,
+                                        WAC_HID_FEATURE_REPORT, report_id,
+                                        rep_data, 3);
+                } while ((error < 0 || rep_data[1] != 4) && limit++ < 5);
+        } else if (features->type != TABLETPC && features->type != TABLETPC2FG) {
+                do {
+                        rep_data[0] = 2;
+                        rep_data[1] = 2;
+                        error = usb_set_report(intf, WAC_HID_FEATURE_REPORT,
+                                report_id, rep_data, 2);
+                        if (error >= 0)
+                                error = usb_get_report(intf,
+                                        WAC_HID_FEATURE_REPORT, report_id,
+                                        rep_data, 2);
+                } while ((error < 0 || rep_data[1] != 2) && limit++ < 5);
+        }
 
         kfree(rep_data);
 
         return error < 0 ? error : 0;
 }
 
+static int wacom_retrieve_hid_descriptor(struct usb_interface *intf,
+                struct wacom_features *features)
+{
+        int error = 0;
+        struct usb_host_interface *interface = intf->cur_altsetting;
+        struct hid_descriptor *hid_desc;
+
+        /* default device to penabled */
+        features->device_type = BTN_TOOL_PEN;
+
+        /* only Tablet PCs need to retrieve the info */
+        if ((features->type != TABLETPC) && (features->type != TABLETPC2FG))
+                goto out;
+
+        if (usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc)) {
+                if (usb_get_extra_descriptor(&interface->endpoint[0],
+                                HID_DEVICET_REPORT, &hid_desc)) {
+                        printk("wacom: can not retrieve extra class descriptor\n");
+                        error = 1;
+                        goto out;
+                }
+        }
+        error = wacom_parse_hid(intf, hid_desc, features);
+        if (error)
+                goto out;
+
+        /* touch device found but size is not defined. use default */
+        if (features->device_type == BTN_TOOL_DOUBLETAP && !features->x_max) {
+                features->x_max = 1023;
+                features->y_max = 1023;
+        }
+
+ out:
+        return error;
+}
+
 static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
         struct usb_device *dev = interface_to_usbdev(intf);
-        struct usb_host_interface *interface = intf->cur_altsetting;
         struct usb_endpoint_descriptor *endpoint;
         struct wacom *wacom;
         struct wacom_wac *wacom_wac;
         struct wacom_features *features;
         struct input_dev *input_dev;
         int error = -ENOMEM;
-        struct hid_descriptor *hid_desc;
 
         wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL);
         wacom_wac = kzalloc(sizeof(struct wacom_wac), GFP_KERNEL);
@@ -432,7 +540,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         if (!wacom || !input_dev || !wacom_wac)
                 goto fail1;
 
-        wacom_wac->data = usb_buffer_alloc(dev, 10, GFP_KERNEL, &wacom->data_dma);
+        wacom_wac->data = usb_buffer_alloc(dev, WACOM_PKGLEN_MAX, GFP_KERNEL, &wacom->data_dma);
         if (!wacom_wac->data)
                 goto fail1;
 
@@ -448,7 +556,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         strlcat(wacom->phys, "/input0", sizeof(wacom->phys));
 
         wacom_wac->features = features = get_wacom_feature(id);
-        BUG_ON(features->pktlen > 10);
+        BUG_ON(features->pktlen > WACOM_PKGLEN_MAX);
 
         input_dev->name = wacom_wac->features->name;
         wacom->wacom_wac = wacom_wac;
@@ -463,47 +571,24 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
 
         endpoint = &intf->cur_altsetting->endpoint[0].desc;
 
-        /* Initialize touch_x_max and touch_y_max in case it is not defined */
-        if (wacom_wac->features->type == TABLETPC) {
-                features->touch_x_max = 1023;
-                features->touch_y_max = 1023;
-        } else {
-                features->touch_x_max = 0;
-                features->touch_y_max = 0;
-        }
-
-        /* TabletPC need to retrieve the physical and logical maximum from report descriptor */
-        if (wacom_wac->features->type == TABLETPC) {
-                if (usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc)) {
-                        if (usb_get_extra_descriptor(&interface->endpoint[0],
-                                                     HID_DEVICET_REPORT, &hid_desc)) {
-                                printk("wacom: can not retrive extra class descriptor\n");
-                                goto fail2;
-                        }
-                }
-                error = wacom_parse_hid(intf, hid_desc, wacom_wac);
-                if (error)
-                        goto fail2;
-        }
+        /* Retrieve the physical and logical size for OEM devices */
+        error = wacom_retrieve_hid_descriptor(intf, features);
+        if (error)
+                goto fail2;
 
         input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_PEN) |
-                BIT_MASK(BTN_TOUCH) | BIT_MASK(BTN_STYLUS);
+        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOUCH);
+
         input_set_abs_params(input_dev, ABS_X, 0, features->x_max, 4, 0);
         input_set_abs_params(input_dev, ABS_Y, 0, features->y_max, 4, 0);
         input_set_abs_params(input_dev, ABS_PRESSURE, 0, features->pressure_max, 0, 0);
-        if (features->type == TABLETPC) {
-                input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_DOUBLETAP);
-                input_set_abs_params(input_dev, ABS_RX, 0, features->touch_x_max, 4, 0);
-                input_set_abs_params(input_dev, ABS_RY, 0, features->touch_y_max, 4, 0);
-        }
         input_dev->absbit[BIT_WORD(ABS_MISC)] |= BIT_MASK(ABS_MISC);
 
         wacom_init_input_dev(input_dev, wacom_wac);
 
         usb_fill_int_urb(wacom->irq, dev,
                          usb_rcvintpipe(dev, endpoint->bEndpointAddress),
-                         wacom_wac->data, wacom_wac->features->pktlen,
+                         wacom_wac->data, features->pktlen,
                          wacom_sys_irq, wacom, endpoint->bInterval);
         wacom->irq->transfer_dma = wacom->data_dma;
         wacom->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
@@ -512,18 +597,14 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         if (error)
                 goto fail3;
 
-        /*
-         * Ask the tablet to report tablet data if it is not a Tablet PC.
-         * Note that if query fails it is not a hard failure.
-         */
-        if (wacom_wac->features->type != TABLETPC)
-                wacom_query_tablet_data(intf);
+        /* Note that if query fails it is not a hard failure */
+        wacom_query_tablet_data(intf, features);
 
         usb_set_intfdata(intf, wacom);
         return 0;
 
  fail3: usb_free_urb(wacom->irq);
- fail2: usb_buffer_free(dev, 10, wacom_wac->data, wacom->data_dma);
+ fail2: usb_buffer_free(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma);
  fail1: input_free_device(input_dev);
         kfree(wacom);
         kfree(wacom_wac);
@@ -539,7 +620,7 @@ static void wacom_disconnect(struct usb_interface *intf)
         usb_kill_urb(wacom->irq);
         input_unregister_device(wacom->dev);
         usb_free_urb(wacom->irq);
-        usb_buffer_free(interface_to_usbdev(intf), 10,
+        usb_buffer_free(interface_to_usbdev(intf), WACOM_PKGLEN_MAX,
                         wacom->wacom_wac->data, wacom->data_dma);
         kfree(wacom->wacom_wac);
         kfree(wacom);
@@ -559,12 +640,16 @@ static int wacom_suspend(struct usb_interface *intf, pm_message_t message)
 static int wacom_resume(struct usb_interface *intf)
 {
         struct wacom *wacom = usb_get_intfdata(intf);
+        struct wacom_features *features = wacom->wacom_wac->features;
         int rv;
 
         mutex_lock(&wacom->lock);
-        if (wacom->open)
+        if (wacom->open) {
                 rv = usb_submit_urb(wacom->irq, GFP_NOIO);
-        else
+                /* switch to wacom mode if needed */
+                if (!wacom_retrieve_hid_descriptor(intf, features))
+                        wacom_query_tablet_data(intf, features);
+        } else
                 rv = 0;
         mutex_unlock(&wacom->lock);
 
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index c896d6a21b7e..1056f149fe31 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -1,7 +1,7 @@
 /*
  * drivers/input/tablet/wacom_wac.c
  *
- *  USB Wacom Graphire and Wacom Intuos tablet support - Wacom specific code
+ *  USB Wacom tablet support - Wacom specific code
  *
  */
 
@@ -58,16 +58,15 @@ static int wacom_pl_irq(struct wacom_wac *wacom, void *wcombo)
         unsigned char *data = wacom->data;
         int prox, pressure;
 
-        if (data[0] != 2) {
+        if (data[0] != WACOM_REPORT_PENABLED) {
                 dbg("wacom_pl_irq: received unknown report #%d", data[0]);
                 return 0;
         }
 
         prox = data[1] & 0x40;
 
-        wacom->id[0] = ERASER_DEVICE_ID;
         if (prox) {
-
+                wacom->id[0] = ERASER_DEVICE_ID;
                 pressure = (signed char)((data[7] << 1) | ((data[4] >> 2) & 1));
                 if (wacom->features->pressure_max > 255)
                         pressure = (pressure << 1) | ((data[4] >> 6) & 1);
@@ -128,7 +127,7 @@ static int wacom_ptu_irq(struct wacom_wac *wacom, void *wcombo)
 {
         unsigned char *data = wacom->data;
 
-        if (data[0] != 2) {
+        if (data[0] != WACOM_REPORT_PENABLED) {
                 printk(KERN_INFO "wacom_ptu_irq: received unknown report #%d\n", data[0]);
                 return 0;
         }
@@ -155,14 +154,16 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
 {
         unsigned char *data = wacom->data;
         int x, y, rw;
+        static int penData = 0;
 
-        if (data[0] != 2) {
+        if (data[0] != WACOM_REPORT_PENABLED) {
                 dbg("wacom_graphire_irq: received unknown report #%d", data[0]);
                 return 0;
         }
 
         if (data[1] & 0x80) {
                 /* in prox and not a pad data */
+                penData = 1;
 
                 switch ((data[1] >> 5) & 3) {
 
@@ -232,7 +233,11 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
         switch (wacom->features->type) {
             case WACOM_G4:
                 if (data[7] & 0xf8) {
-                        wacom_input_sync(wcombo); /* sync last event */
+                        if (penData) {
+                                wacom_input_sync(wcombo); /* sync last event */
+                                if (!wacom->id[0])
+                                        penData = 0;
+                        }
                         wacom->id[1] = PAD_DEVICE_ID;
                         wacom_report_key(wcombo, BTN_0, (data[7] & 0x40));
                         wacom_report_key(wcombo, BTN_4, (data[7] & 0x80));
@@ -242,10 +247,15 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
                         wacom_report_abs(wcombo, ABS_MISC, wacom->id[1]);
                         wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, 0xf0);
                 } else if (wacom->id[1]) {
-                        wacom_input_sync(wcombo); /* sync last event */
+                        if (penData) {
+                                wacom_input_sync(wcombo); /* sync last event */
+                                if (!wacom->id[0])
+                                        penData = 0;
+                        }
                         wacom->id[1] = 0;
                         wacom_report_key(wcombo, BTN_0, (data[7] & 0x40));
                         wacom_report_key(wcombo, BTN_4, (data[7] & 0x80));
+                        wacom_report_rel(wcombo, REL_WHEEL, 0);
                         wacom_report_key(wcombo, BTN_TOOL_FINGER, 0);
                         wacom_report_abs(wcombo, ABS_MISC, 0);
                         wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, 0xf0);
@@ -253,7 +263,11 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
                 break;
             case WACOM_MO:
                 if ((data[7] & 0xf8) || (data[8] & 0xff)) {
-                        wacom_input_sync(wcombo); /* sync last event */
+                        if (penData) {
+                                wacom_input_sync(wcombo); /* sync last event */
+                                if (!wacom->id[0])
+                                        penData = 0;
+                        }
                         wacom->id[1] = PAD_DEVICE_ID;
                         wacom_report_key(wcombo, BTN_0, (data[7] & 0x08));
                         wacom_report_key(wcombo, BTN_1, (data[7] & 0x20));
@@ -264,7 +278,11 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
                         wacom_report_abs(wcombo, ABS_MISC, wacom->id[1]);
                         wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, 0xf0);
                 } else if (wacom->id[1]) {
-                        wacom_input_sync(wcombo); /* sync last event */
+                        if (penData) {
+                                wacom_input_sync(wcombo); /* sync last event */
+                                if (!wacom->id[0])
+                                        penData = 0;
+                        }
                         wacom->id[1] = 0;
                         wacom_report_key(wcombo, BTN_0, (data[7] & 0x08));
                         wacom_report_key(wcombo, BTN_1, (data[7] & 0x20));
@@ -432,7 +450,8 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
         unsigned int t;
         int idx = 0, result;
 
-        if (data[0] != 2 && data[0] != 5 && data[0] != 6 && data[0] != 12) {
+        if (data[0] != WACOM_REPORT_PENABLED && data[0] != WACOM_REPORT_INTUOSREAD
+                && data[0] != WACOM_REPORT_INTUOSWRITE && data[0] != WACOM_REPORT_INTUOSPAD) {
                 dbg("wacom_intuos_irq: received unknown report #%d", data[0]);
                 return 0;
         }
@@ -442,7 +461,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
                 idx = data[1] & 0x01;
 
         /* pad packets. Works as a second tool and is always in prox */
-        if (data[0] == 12) {
+        if (data[0] == WACOM_REPORT_INTUOSPAD) {
                 /* initiate the pad as a device */
                 if (wacom->tool[1] != BTN_TOOL_FINGER)
                         wacom->tool[1] = BTN_TOOL_FINGER;
@@ -608,95 +627,163 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
         return 1;
 }
 
+
+static void wacom_tpc_finger_in(struct wacom_wac *wacom, void *wcombo, char *data, int idx)
+{
+        wacom_report_abs(wcombo, ABS_X,
+                (data[2 + idx * 2] & 0xff) | ((data[3 + idx * 2] & 0x7f) << 8));
+        wacom_report_abs(wcombo, ABS_Y,
+                (data[6 + idx * 2] & 0xff) | ((data[7 + idx * 2] & 0x7f) << 8));
+        wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]);
+        wacom_report_key(wcombo, wacom->tool[idx], 1);
+        if (idx)
+                wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, 0xf0);
+        else
+                wacom_report_key(wcombo, BTN_TOUCH, 1);
+}
+
+static void wacom_tpc_touch_out(struct wacom_wac *wacom, void *wcombo, int idx)
+{
+        wacom_report_abs(wcombo, ABS_X, 0);
+        wacom_report_abs(wcombo, ABS_Y, 0);
+        wacom_report_abs(wcombo, ABS_MISC, 0);
+        wacom_report_key(wcombo, wacom->tool[idx], 0);
+        if (idx)
+                wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, 0xf0);
+        else
+                wacom_report_key(wcombo, BTN_TOUCH, 0);
+        return;
+}
+
+static void wacom_tpc_touch_in(struct wacom_wac *wacom, void *wcombo)
+{
+        char *data = wacom->data;
+        struct urb *urb = ((struct wacom_combo *)wcombo)->urb;
+        static int firstFinger = 0;
+        static int secondFinger = 0;
+
+        wacom->tool[0] = BTN_TOOL_DOUBLETAP;
+        wacom->id[0] = TOUCH_DEVICE_ID;
+        wacom->tool[1] = BTN_TOOL_TRIPLETAP;
+
+        if (urb->actual_length != WACOM_PKGLEN_TPC1FG) {
+                switch (data[0]) {
+                        case WACOM_REPORT_TPC1FG:
+                                wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[2]));
+                                wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[4]));
+                                wacom_report_abs(wcombo, ABS_PRESSURE, wacom_le16_to_cpu(&data[6]));
+                                wacom_report_key(wcombo, BTN_TOUCH, wacom_le16_to_cpu(&data[6]));
+                                wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]);
+                                wacom_report_key(wcombo, wacom->tool[0], 1);
+                                break;
+                        case WACOM_REPORT_TPC2FG:
+                                /* keep this byte to send proper out-prox event */
+                                wacom->id[1] = data[1] & 0x03;
+
+                                if (data[1] & 0x01) {
+                                        wacom_tpc_finger_in(wacom, wcombo, data, 0);
+                                        firstFinger = 1;
+                                } else if (firstFinger) {
+                                        wacom_tpc_touch_out(wacom, wcombo, 0);
+                                }
+
+                                if (data[1] & 0x02) {
+                                        /* sync first finger data */
+                                        if (firstFinger)
+                                                wacom_input_sync(wcombo);
+
+                                        wacom_tpc_finger_in(wacom, wcombo, data, 1);
+                                        secondFinger = 1;
+                                } else if (secondFinger) {
+                                        /* sync first finger data */
+                                        if (firstFinger)
+                                                wacom_input_sync(wcombo);
+
+                                        wacom_tpc_touch_out(wacom, wcombo, 1);
+                                        secondFinger = 0;
+                                }
+                                if (!(data[1] & 0x01))
+                                        firstFinger = 0;
+                                break;
+                }
+        } else {
+                wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[1]));
+                wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[3]));
+                wacom_report_key(wcombo, BTN_TOUCH, 1);
+                wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]);
+                wacom_report_key(wcombo, wacom->tool[0], 1);
+        }
+        return;
+}
+
 static int wacom_tpc_irq(struct wacom_wac *wacom, void *wcombo)
 {
         char *data = wacom->data;
-        int prox = 0, pressure;
+        int prox = 0, pressure, idx = -1;
         static int stylusInProx, touchInProx = 1, touchOut;
         struct urb *urb = ((struct wacom_combo *)wcombo)->urb;
 
         dbg("wacom_tpc_irq: received report #%d", data[0]);
 
-        if (urb->actual_length == 5 || data[0] == 6) { /* Touch data */
-                if (urb->actual_length == 5) {  /* with touch */
-                        prox = data[0] & 0x03;
+        if (urb->actual_length == WACOM_PKGLEN_TPC1FG || /* single touch */
+            data[0] == WACOM_REPORT_TPC1FG ||            /* single touch */
+            data[0] == WACOM_REPORT_TPC2FG) {            /* 2FG touch */
+                if (urb->actual_length == WACOM_PKGLEN_TPC1FG) {  /* with touch */
+                        prox = data[0] & 0x01;
                 } else {  /* with capacity */
-                        prox = data[1] & 0x03;
+                        if (data[0] == WACOM_REPORT_TPC1FG)
+                                /* single touch */
+                                prox = data[1] & 0x01;
+                        else
+                                /* 2FG touch data */
+                                prox = data[1] & 0x03;
                 }
 
                 if (!stylusInProx) { /* stylus not in prox */
                         if (prox) {
                                 if (touchInProx) {
-                                        wacom->tool[1] = BTN_TOOL_DOUBLETAP;
-                                        wacom->id[0] = TOUCH_DEVICE_ID;
-                                        if (urb->actual_length != 5) {
-                                                wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[2]));
-                                                wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[4]));
-                                                wacom_report_abs(wcombo, ABS_PRESSURE, wacom_le16_to_cpu(&data[6]));
-                                                wacom_report_key(wcombo, BTN_TOUCH, wacom_le16_to_cpu(&data[6]));
-                                        } else {
-                                                wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[1]));
-                                                wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[3]));
-                                                wacom_report_key(wcombo, BTN_TOUCH, 1);
-                                        }
-                                        wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]);
-                                        wacom_report_key(wcombo, wacom->tool[1], prox & 0x01);
+                                        wacom_tpc_touch_in(wacom, wcombo);
                                         touchOut = 1;
                                         return 1;
                                 }
                         } else {
-                                wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]);
-                                wacom_report_key(wcombo, wacom->tool[1], prox & 0x01);
-                                wacom_report_key(wcombo, BTN_TOUCH, 0);
+                                /* 2FGT out-prox */
+                                if (data[0] == WACOM_REPORT_TPC2FG) {
+                                        idx = (wacom->id[1] & 0x01) - 1;
+                                        if (idx == 0) {
+                                                wacom_tpc_touch_out(wacom, wcombo, idx);
+                                                /* sync first finger event */
+                                                if (wacom->id[1] & 0x02)
+                                                        wacom_input_sync(wcombo);
+                                        }
+                                        idx = (wacom->id[1] & 0x02) - 1;
+                                        if (idx == 1)
+                                                wacom_tpc_touch_out(wacom, wcombo, idx);
+                                } else /* one finger touch */
+                                        wacom_tpc_touch_out(wacom, wcombo, 0);
                                 touchOut = 0;
                                 touchInProx = 1;
                                 return 1;
                         }
                 } else if (touchOut || !prox) { /* force touch out-prox */
-                        wacom_report_abs(wcombo, ABS_MISC, TOUCH_DEVICE_ID);
-                        wacom_report_key(wcombo, wacom->tool[1], 0);
-                        wacom_report_key(wcombo, BTN_TOUCH, 0);
+                        wacom_tpc_touch_out(wacom, wcombo, 0);
                         touchOut = 0;
                         touchInProx = 1;
                         return 1;
                 }
-        } else if (data[0] == 2) { /* Penabled */
+        } else if (data[0] == WACOM_REPORT_PENABLED) { /* Penabled */
                 prox = data[1] & 0x20;
 
                 touchInProx = 0;
 
-                wacom->id[0] = ERASER_DEVICE_ID;
-
-                /*
-                 * if going from out of proximity into proximity select between the eraser
-                 * and the pen based on the state of the stylus2 button, choose eraser if
-                 * pressed else choose pen. if not a proximity change from out to in, send
-                 * an out of proximity for previous tool then a in for new tool.
-                 */
                 if (prox) { /* in prox */
-                        if (!wacom->tool[0]) {
+                        if (!wacom->id[0]) {
                                 /* Going into proximity select tool */
-                                wacom->tool[1] = (data[1] & 0x08) ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
-                                if (wacom->tool[1] == BTN_TOOL_PEN)
+                                wacom->tool[0] = (data[1] & 0x0c) ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
+                                if (wacom->tool[0] == BTN_TOOL_PEN)
                                         wacom->id[0] = STYLUS_DEVICE_ID;
-                        } else if (wacom->tool[1] == BTN_TOOL_RUBBER && !(data[1] & 0x08)) {
-                                /*
-                                 * was entered with stylus2 pressed
-                                 * report out proximity for previous tool
-                                */
-                                wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]);
-                                wacom_report_key(wcombo, wacom->tool[1], 0);
-                                wacom_input_sync(wcombo);
-
-                                /* set new tool */
-                                wacom->tool[1] = BTN_TOOL_PEN;
-                                wacom->id[0] = STYLUS_DEVICE_ID;
-                                return 0;
-                        }
-                        if (wacom->tool[1] != BTN_TOOL_RUBBER) {
-                                /* Unknown tool selected default to pen tool */
-                                wacom->tool[1] = BTN_TOOL_PEN;
-                                wacom->id[0] = STYLUS_DEVICE_ID;
+                                else
+                                        wacom->id[0] = ERASER_DEVICE_ID;
                         }
                         wacom_report_key(wcombo, BTN_STYLUS, data[1] & 0x02);
                         wacom_report_key(wcombo, BTN_STYLUS2, data[1] & 0x10);
@@ -706,17 +793,21 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, void *wcombo)
                         if (pressure < 0)
                                 pressure = wacom->features->pressure_max + pressure + 1;
                         wacom_report_abs(wcombo, ABS_PRESSURE, pressure);
-                        wacom_report_key(wcombo, BTN_TOUCH, pressure);
+                        wacom_report_key(wcombo, BTN_TOUCH, data[1] & 0x05);
                 } else {
+                        wacom_report_abs(wcombo, ABS_X, 0);
+                        wacom_report_abs(wcombo, ABS_Y, 0);
                         wacom_report_abs(wcombo, ABS_PRESSURE, 0);
                         wacom_report_key(wcombo, BTN_STYLUS, 0);
                         wacom_report_key(wcombo, BTN_STYLUS2, 0);
                         wacom_report_key(wcombo, BTN_TOUCH, 0);
+                        wacom->id[0] = 0;
+                        /* pen is out so touch can be enabled now */
+                        touchInProx = 1;
                 }
-                wacom_report_key(wcombo, wacom->tool[1], prox);
+                wacom_report_key(wcombo, wacom->tool[0], prox);
                 wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]);
                 stylusInProx = prox;
-                wacom->tool[0] = prox;
                 return 1;
         }
         return 0;
@@ -751,6 +842,7 @@ int wacom_wac_irq(struct wacom_wac *wacom_wac, void *wcombo)
                         return wacom_intuos_irq(wacom_wac, wcombo);
 
                 case TABLETPC:
+                case TABLETPC2FG:
                         return wacom_tpc_irq(wacom_wac, wcombo);
 
                 default:
@@ -791,9 +883,17 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_w
                         input_dev_i4s(input_dev, wacom_wac);
                         input_dev_i(input_dev, wacom_wac);
                         break;
+                case TABLETPC2FG:
+                        input_dev_tpc2fg(input_dev, wacom_wac);
+                        /* fall through */
+                case TABLETPC:
+                        input_dev_tpc(input_dev, wacom_wac);
+                        if (wacom_wac->features->device_type != BTN_TOOL_PEN)
+                                break;  /* no need to process stylus stuff */
+
+                        /* fall through */
                 case PL:
                 case PTU:
-                case TABLETPC:
                         input_dev_pl(input_dev, wacom_wac);
                         /* fall through */
                 case PENPARTNER:
@@ -804,66 +904,69 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_w
 }
 
 static struct wacom_features wacom_features[] = {
-        { "Wacom Penpartner",    7,   5040,  3780,  255,  0, PENPARTNER },
-        { "Wacom Graphire",      8,  10206,  7422,  511, 63, GRAPHIRE },
-        { "Wacom Graphire2 4x5", 8,  10206,  7422,  511, 63, GRAPHIRE },
-        { "Wacom Graphire2 5x7", 8,  13918, 10206,  511, 63, GRAPHIRE },
-        { "Wacom Graphire3",     8,  10208,  7424,  511, 63, GRAPHIRE },
-        { "Wacom Graphire3 6x8", 8,  16704, 12064,  511, 63, GRAPHIRE },
-        { "Wacom Graphire4 4x5", 8,  10208,  7424,  511, 63, WACOM_G4 },
-        { "Wacom Graphire4 6x8", 8,  16704, 12064,  511, 63, WACOM_G4 },
-        { "Wacom BambooFun 4x5", 9,  14760,  9225,  511, 63, WACOM_MO },
-        { "Wacom BambooFun 6x8", 9,  21648, 13530,  511, 63, WACOM_MO },
-        { "Wacom Bamboo1 Medium",8,  16704, 12064,  511, 63, GRAPHIRE },
-        { "Wacom Volito",        8,   5104,  3712,  511, 63, GRAPHIRE },
-        { "Wacom PenStation2",   8,   3250,  2320,  255, 63, GRAPHIRE },
-        { "Wacom Volito2 4x5",   8,   5104,  3712,  511, 63, GRAPHIRE },
-        { "Wacom Volito2 2x3",   8,   3248,  2320,  511, 63, GRAPHIRE },
-        { "Wacom PenPartner2",   8,   3250,  2320,  511, 63, GRAPHIRE },
-        { "Wacom Bamboo",        9,  14760,  9225,  511, 63, WACOM_MO },
-        { "Wacom Bamboo1",       8,   5104,  3712,  511, 63, GRAPHIRE },
-        { "Wacom Intuos 4x5",   10,  12700, 10600, 1023, 31, INTUOS },
-        { "Wacom Intuos 6x8",   10,  20320, 16240, 1023, 31, INTUOS },
-        { "Wacom Intuos 9x12",  10,  30480, 24060, 1023, 31, INTUOS },
-        { "Wacom Intuos 12x12", 10,  30480, 31680, 1023, 31, INTUOS },
-        { "Wacom Intuos 12x18", 10,  45720, 31680, 1023, 31, INTUOS },
-        { "Wacom PL400",         8,   5408,  4056,  255,  0, PL },
-        { "Wacom PL500",         8,   6144,  4608,  255,  0, PL },
-        { "Wacom PL600",         8,   6126,  4604,  255,  0, PL },
-        { "Wacom PL600SX",       8,   6260,  5016,  255,  0, PL },
-        { "Wacom PL550",         8,   6144,  4608,  511,  0, PL },
-        { "Wacom PL800",         8,   7220,  5780,  511,  0, PL },
-        { "Wacom PL700",         8,   6758,  5406,  511,  0, PL },
-        { "Wacom PL510",         8,   6282,  4762,  511,  0, PL },
-        { "Wacom DTU710",        8,  34080, 27660,  511,  0, PL },
-        { "Wacom DTF521",        8,   6282,  4762,  511,  0, PL },
-        { "Wacom DTF720",        8,   6858,  5506,  511,  0, PL },
-        { "Wacom DTF720a",       8,   6858,  5506,  511,  0, PL },
-        { "Wacom Cintiq Partner",8,  20480, 15360,  511,  0, PTU },
-        { "Wacom Intuos2 4x5",   10, 12700, 10600, 1023, 31, INTUOS },
-        { "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 31, INTUOS },
-        { "Wacom Intuos2 9x12",  10, 30480, 24060, 1023, 31, INTUOS },
-        { "Wacom Intuos2 12x12", 10, 30480, 31680, 1023, 31, INTUOS },
-        { "Wacom Intuos2 12x18", 10, 45720, 31680, 1023, 31, INTUOS },
-        { "Wacom Intuos3 4x5",   10, 25400, 20320, 1023, 63, INTUOS3S },
-        { "Wacom Intuos3 6x8",   10, 40640, 30480, 1023, 63, INTUOS3 },
-        { "Wacom Intuos3 9x12",  10, 60960, 45720, 1023, 63, INTUOS3 },
-        { "Wacom Intuos3 12x12", 10, 60960, 60960, 1023, 63, INTUOS3L },
-        { "Wacom Intuos3 12x19", 10, 97536, 60960, 1023, 63, INTUOS3L },
-        { "Wacom Intuos3 6x11",  10, 54204, 31750, 1023, 63, INTUOS3 },
-        { "Wacom Intuos3 4x6",   10, 31496, 19685, 1023, 63, INTUOS3S },
-        { "Wacom Intuos4 4x6",   10, 31496, 19685, 2047, 63, INTUOS4S },
-        { "Wacom Intuos4 6x9",   10, 44704, 27940, 2047, 63, INTUOS4 },
-        { "Wacom Intuos4 8x13",  10, 65024, 40640, 2047, 63, INTUOS4L },
-        { "Wacom Intuos4 12x19", 10, 97536, 60960, 2047, 63, INTUOS4L },
-        { "Wacom Cintiq 21UX",   10, 87200, 65600, 1023, 63, CINTIQ },
-        { "Wacom Cintiq 20WSX",  10, 86680, 54180, 1023, 63, WACOM_BEE },
-        { "Wacom Cintiq 12WX",   10, 53020, 33440, 1023, 63, WACOM_BEE },
-        { "Wacom DTU1931",        8, 37832, 30305,  511,  0, PL },
-        { "Wacom ISDv4 90",       8, 26202, 16325,  255,  0, TABLETPC },
-        { "Wacom ISDv4 93",       8, 26202, 16325,  255,  0, TABLETPC },
-        { "Wacom ISDv4 9A",       8, 26202, 16325,  255,  0, TABLETPC },
-        { "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 31, INTUOS },
+        { "Wacom Penpartner",     WACOM_PKGLEN_PENPRTN,    5040,  3780,  255,  0, PENPARTNER },
+        { "Wacom Graphire",       WACOM_PKGLEN_GRAPHIRE,  10206,  7422,  511, 63, GRAPHIRE },
+        { "Wacom Graphire2 4x5",  WACOM_PKGLEN_GRAPHIRE,  10206,  7422,  511, 63, GRAPHIRE },
+        { "Wacom Graphire2 5x7",  WACOM_PKGLEN_GRAPHIRE,  13918, 10206,  511, 63, GRAPHIRE },
+        { "Wacom Graphire3",      WACOM_PKGLEN_GRAPHIRE,  10208,  7424,  511, 63, GRAPHIRE },
+        { "Wacom Graphire3 6x8",  WACOM_PKGLEN_GRAPHIRE,  16704, 12064,  511, 63, GRAPHIRE },
+        { "Wacom Graphire4 4x5",  WACOM_PKGLEN_GRAPHIRE,  10208,  7424,  511, 63, WACOM_G4 },
+        { "Wacom Graphire4 6x8",  WACOM_PKGLEN_GRAPHIRE,  16704, 12064,  511, 63, WACOM_G4 },
+        { "Wacom BambooFun 4x5",  WACOM_PKGLEN_BBFUN,     14760,  9225,  511, 63, WACOM_MO },
+        { "Wacom BambooFun 6x8",  WACOM_PKGLEN_BBFUN,     21648, 13530,  511, 63, WACOM_MO },
+        { "Wacom Bamboo1 Medium", WACOM_PKGLEN_GRAPHIRE,  16704, 12064,  511, 63, GRAPHIRE },
+        { "Wacom Volito",         WACOM_PKGLEN_GRAPHIRE,   5104,  3712,  511, 63, GRAPHIRE },
+        { "Wacom PenStation2",    WACOM_PKGLEN_GRAPHIRE,   3250,  2320,  255, 63, GRAPHIRE },
+        { "Wacom Volito2 4x5",    WACOM_PKGLEN_GRAPHIRE,   5104,  3712,  511, 63, GRAPHIRE },
+        { "Wacom Volito2 2x3",    WACOM_PKGLEN_GRAPHIRE,   3248,  2320,  511, 63, GRAPHIRE },
+        { "Wacom PenPartner2",    WACOM_PKGLEN_GRAPHIRE,   3250,  2320,  511, 63, GRAPHIRE },
+        { "Wacom Bamboo",         WACOM_PKGLEN_BBFUN,     14760,  9225,  511, 63, WACOM_MO },
+        { "Wacom Bamboo1",        WACOM_PKGLEN_GRAPHIRE,   5104,  3712,  511, 63, GRAPHIRE },
+        { "Wacom Intuos 4x5",     WACOM_PKGLEN_INTUOS,    12700, 10600, 1023, 31, INTUOS },
+        { "Wacom Intuos 6x8",     WACOM_PKGLEN_INTUOS,    20320, 16240, 1023, 31, INTUOS },
+        { "Wacom Intuos 9x12",    WACOM_PKGLEN_INTUOS,    30480, 24060, 1023, 31, INTUOS },
+        { "Wacom Intuos 12x12",   WACOM_PKGLEN_INTUOS,    30480, 31680, 1023, 31, INTUOS },
+        { "Wacom Intuos 12x18",   WACOM_PKGLEN_INTUOS,    45720, 31680, 1023, 31, INTUOS },
+        { "Wacom PL400",          WACOM_PKGLEN_GRAPHIRE,   5408,  4056,  255,  0, PL },
+        { "Wacom PL500",          WACOM_PKGLEN_GRAPHIRE,   6144,  4608,  255,  0, PL },
+        { "Wacom PL600",          WACOM_PKGLEN_GRAPHIRE,   6126,  4604,  255,  0, PL },
+        { "Wacom PL600SX",        WACOM_PKGLEN_GRAPHIRE,   6260,  5016,  255,  0, PL },
+        { "Wacom PL550",          WACOM_PKGLEN_GRAPHIRE,   6144,  4608,  511,  0, PL },
+        { "Wacom PL800",          WACOM_PKGLEN_GRAPHIRE,   7220,  5780,  511,  0, PL },
+        { "Wacom PL700",          WACOM_PKGLEN_GRAPHIRE,   6758,  5406,  511,  0, PL },
+        { "Wacom PL510",          WACOM_PKGLEN_GRAPHIRE,   6282,  4762,  511,  0, PL },
+        { "Wacom DTU710",         WACOM_PKGLEN_GRAPHIRE,  34080, 27660,  511,  0, PL },
+        { "Wacom DTF521",         WACOM_PKGLEN_GRAPHIRE,   6282,  4762,  511,  0, PL },
+        { "Wacom DTF720",         WACOM_PKGLEN_GRAPHIRE,   6858,  5506,  511,  0, PL },
+        { "Wacom DTF720a",        WACOM_PKGLEN_GRAPHIRE,   6858,  5506,  511,  0, PL },
+        { "Wacom Cintiq Partner", WACOM_PKGLEN_GRAPHIRE,  20480, 15360,  511,  0, PTU },
+        { "Wacom Intuos2 4x5",    WACOM_PKGLEN_INTUOS,    12700, 10600, 1023, 31, INTUOS },
+        { "Wacom Intuos2 6x8",    WACOM_PKGLEN_INTUOS,    20320, 16240, 1023, 31, INTUOS },
+        { "Wacom Intuos2 9x12",   WACOM_PKGLEN_INTUOS,    30480, 24060, 1023, 31, INTUOS },
+        { "Wacom Intuos2 12x12",  WACOM_PKGLEN_INTUOS,    30480, 31680, 1023, 31, INTUOS },
+        { "Wacom Intuos2 12x18",  WACOM_PKGLEN_INTUOS,    45720, 31680, 1023, 31, INTUOS },
+        { "Wacom Intuos3 4x5",    WACOM_PKGLEN_INTUOS,    25400, 20320, 1023, 63, INTUOS3S },
+        { "Wacom Intuos3 6x8",    WACOM_PKGLEN_INTUOS,    40640, 30480, 1023, 63, INTUOS3 },
+        { "Wacom Intuos3 9x12",   WACOM_PKGLEN_INTUOS,    60960, 45720, 1023, 63, INTUOS3 },
+        { "Wacom Intuos3 12x12",  WACOM_PKGLEN_INTUOS,    60960, 60960, 1023, 63, INTUOS3L },
+        { "Wacom Intuos3 12x19",  WACOM_PKGLEN_INTUOS,    97536, 60960, 1023, 63, INTUOS3L },
+        { "Wacom Intuos3 6x11",   WACOM_PKGLEN_INTUOS,    54204, 31750, 1023, 63, INTUOS3 },
+        { "Wacom Intuos3 4x6",    WACOM_PKGLEN_INTUOS,    31496, 19685, 1023, 63, INTUOS3S },
+        { "Wacom Intuos4 4x6",    WACOM_PKGLEN_INTUOS,    31496, 19685, 2047, 63, INTUOS4S },
+        { "Wacom Intuos4 6x9",    WACOM_PKGLEN_INTUOS,    44704, 27940, 2047, 63, INTUOS4 },
+        { "Wacom Intuos4 8x13",   WACOM_PKGLEN_INTUOS,    65024, 40640, 2047, 63, INTUOS4L },
+        { "Wacom Intuos4 12x19",  WACOM_PKGLEN_INTUOS,    97536, 60960, 2047, 63, INTUOS4L },
+        { "Wacom Cintiq 21UX",    WACOM_PKGLEN_INTUOS,    87200, 65600, 1023, 63, CINTIQ },
+        { "Wacom Cintiq 20WSX",   WACOM_PKGLEN_INTUOS,    86680, 54180, 1023, 63, WACOM_BEE },
+        { "Wacom Cintiq 12WX",    WACOM_PKGLEN_INTUOS,    53020, 33440, 1023, 63, WACOM_BEE },
+        { "Wacom DTU1931",        WACOM_PKGLEN_GRAPHIRE,  37832, 30305,  511,  0, PL },
+        { "Wacom ISDv4 90",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,  0, TABLETPC },
+        { "Wacom ISDv4 93",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,  0, TABLETPC },
+        { "Wacom ISDv4 9A",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,  0, TABLETPC },
+        { "Wacom ISDv4 9F",       WACOM_PKGLEN_PENABLED,  26202, 16325,  255,  0, TABLETPC },
+        { "Wacom ISDv4 E2",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG },
+        { "Wacom ISDv4 E3",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG },
+        { "Wacom Intuos2 6x8",    WACOM_PKGLEN_INTUOS,    20320, 16240, 1023, 31, INTUOS },
         { }
 };
 
@@ -927,6 +1030,9 @@ static struct usb_device_id wacom_ids[] = {
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x90) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x93) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x9A) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x9F) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xE2) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xE3) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) },
         { }
 };
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index c10235aba7e5..ee01e1902785 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -9,12 +9,33 @@
 #ifndef WACOM_WAC_H
 #define WACOM_WAC_H
 
+/* maximum packet length for USB devices */
+#define WACOM_PKGLEN_MAX        32
+
+/* packet length for individual models */
+#define WACOM_PKGLEN_PENPRTN     7
+#define WACOM_PKGLEN_GRAPHIRE    8
+#define WACOM_PKGLEN_BBFUN       9
+#define WACOM_PKGLEN_INTUOS     10
+#define WACOM_PKGLEN_PENABLED    8
+#define WACOM_PKGLEN_TPC1FG      5
+#define WACOM_PKGLEN_TPC2FG     14
+
+/* device IDs */
 #define STYLUS_DEVICE_ID        0x02
 #define TOUCH_DEVICE_ID         0x03
 #define CURSOR_DEVICE_ID        0x06
 #define ERASER_DEVICE_ID        0x0A
 #define PAD_DEVICE_ID           0x0F
 
+/* wacom data packet report IDs */
+#define WACOM_REPORT_PENABLED           2
+#define WACOM_REPORT_INTUOSREAD         5
+#define WACOM_REPORT_INTUOSWRITE        6
+#define WACOM_REPORT_INTUOSPAD          12
+#define WACOM_REPORT_TPC1FG             6
+#define WACOM_REPORT_TPC2FG             13
+
 enum {
         PENPARTNER = 0,
         GRAPHIRE,
@@ -32,6 +53,7 @@ enum {
         WACOM_BEE,
         WACOM_MO,
         TABLETPC,
+        TABLETPC2FG,
         MAX_TYPE
 };
 
@@ -43,8 +65,11 @@ struct wacom_features {
         int pressure_max;
         int distance_max;
         int type;
-        int touch_x_max;
-        int touch_y_max;
+        int device_type;
+        int x_phy;
+        int y_phy;
+        unsigned char unit;
+        unsigned char unitExpo;
 };
 
 struct wacom_wac {
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 32fc8ba039aa..dfafc76da4fb 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -450,6 +450,18 @@ config TOUCHSCREEN_USB_COMPOSITE
           To compile this driver as a module, choose M here: the
           module will be called usbtouchscreen.
 
+config TOUCHSCREEN_MC13783
+        tristate "Freescale MC13783 touchscreen input driver"
+        depends on MFD_MC13783
+        help
+          Say Y here if you have an Freescale MC13783 PMIC on your
+          board and want to use its touchscreen
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called mc13783_ts.
+
 config TOUCHSCREEN_USB_EGALAX
         default y
         bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index f1f59c9e1211..d61a3b4def9a 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_TOUCHSCREEN_EETI)		+= eeti_ts.o
 obj-$(CONFIG_TOUCHSCREEN_ELO)           += elo.o
 obj-$(CONFIG_TOUCHSCREEN_FUJITSU)       += fujitsu_ts.o
 obj-$(CONFIG_TOUCHSCREEN_INEXIO)        += inexio.o
+obj-$(CONFIG_TOUCHSCREEN_MC13783)       += mc13783_ts.o
 obj-$(CONFIG_TOUCHSCREEN_MCS5000)       += mcs5000_ts.o
 obj-$(CONFIG_TOUCHSCREEN_MIGOR)         += migor_ts.o
 obj-$(CONFIG_TOUCHSCREEN_MTOUCH)        += mtouch.o
diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c
new file mode 100644
index 000000000000..be115b3b65eb
--- /dev/null
+++ b/drivers/input/touchscreen/mc13783_ts.c
@@ -0,0 +1,258 @@
+/*
+ * Driver for the Freescale Semiconductor MC13783 touchscreen.
+ *
+ * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2009 Sascha Hauer, Pengutronix
+ *
+ * Initial development of this code was funded by
+ * Phytec Messtechnik GmbH, http://www.phytec.de/
+ *
+ * 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/platform_device.h>
+#include <linux/mfd/mc13783.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/input.h>
+#include <linux/sched.h>
+#include <linux/init.h>
+
+#define MC13783_TS_NAME "mc13783-ts"
+
+#define DEFAULT_SAMPLE_TOLERANCE 300
+
+static unsigned int sample_tolerance = DEFAULT_SAMPLE_TOLERANCE;
+module_param(sample_tolerance, uint, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(sample_tolerance,
+                "If the minimal and maximal value read out for one axis (out "
+                "of three) differ by this value (default: "
+                __stringify(DEFAULT_SAMPLE_TOLERANCE) ") or more, the reading "
+                "is supposed to be wrong and is discarded.  Set to 0 to "
+                "disable this check.");
+
+struct mc13783_ts_priv {
+        struct input_dev *idev;
+        struct mc13783 *mc13783;
+        struct delayed_work work;
+        struct workqueue_struct *workq;
+        unsigned int sample[4];
+};
+
+static irqreturn_t mc13783_ts_handler(int irq, void *data)
+{
+        struct mc13783_ts_priv *priv = data;
+
+        mc13783_ackirq(priv->mc13783, irq);
+
+        /*
+         * Kick off reading coordinates. Note that if work happens already
+         * be queued for future execution (it rearms itself) it will not
+         * be rescheduled for immediate execution here. However the rearm
+         * delay is HZ / 50 which is acceptable.
+         */
+        queue_delayed_work(priv->workq, &priv->work, 0);
+
+        return IRQ_HANDLED;
+}
+
+#define sort3(a0, a1, a2) ({                                            \
+                if (a0 > a1)                                            \
+                        swap(a0, a1);                                   \
+                if (a1 > a2)                                            \
+                        swap(a1, a2);                                   \
+                if (a0 > a1)                                            \
+                        swap(a0, a1);                                   \
+                })
+
+static void mc13783_ts_report_sample(struct mc13783_ts_priv *priv)
+{
+        struct input_dev *idev = priv->idev;
+        int x0, x1, x2, y0, y1, y2;
+        int cr0, cr1;
+
+        /*
+         * the values are 10-bit wide only, but the two least significant
+         * bits are for future 12 bit use and reading yields 0
+         */
+        x0 = priv->sample[0] & 0xfff;
+        x1 = priv->sample[1] & 0xfff;
+        x2 = priv->sample[2] & 0xfff;
+        y0 = priv->sample[3] & 0xfff;
+        y1 = (priv->sample[0] >> 12) & 0xfff;
+        y2 = (priv->sample[1] >> 12) & 0xfff;
+        cr0 = (priv->sample[2] >> 12) & 0xfff;
+        cr1 = (priv->sample[3] >> 12) & 0xfff;
+
+        dev_dbg(&idev->dev,
+                "x: (% 4d,% 4d,% 4d) y: (% 4d, % 4d,% 4d) cr: (% 4d, % 4d)\n",
+                x0, x1, x2, y0, y1, y2, cr0, cr1);
+
+        sort3(x0, x1, x2);
+        sort3(y0, y1, y2);
+
+        cr0 = (cr0 + cr1) / 2;
+
+        if (!cr0 || !sample_tolerance ||
+                        (x2 - x0 < sample_tolerance &&
+                         y2 - y0 < sample_tolerance)) {
+                /* report the median coordinate and average pressure */
+                if (cr0) {
+                        input_report_abs(idev, ABS_X, x1);
+                        input_report_abs(idev, ABS_Y, y1);
+
+                        dev_dbg(&idev->dev, "report (%d, %d, %d)\n",
+                                        x1, y1, 0x1000 - cr0);
+                        queue_delayed_work(priv->workq, &priv->work, HZ / 50);
+                } else
+                        dev_dbg(&idev->dev, "report release\n");
+
+                input_report_abs(idev, ABS_PRESSURE,
+                                cr0 ? 0x1000 - cr0 : cr0);
+                input_report_key(idev, BTN_TOUCH, cr0);
+                input_sync(idev);
+        } else
+                dev_dbg(&idev->dev, "discard event\n");
+}
+
+static void mc13783_ts_work(struct work_struct *work)
+{
+        struct mc13783_ts_priv *priv =
+                container_of(work, struct mc13783_ts_priv, work.work);
+        unsigned int mode = MC13783_ADC_MODE_TS;
+        unsigned int channel = 12;
+
+        if (mc13783_adc_do_conversion(priv->mc13783,
+                                mode, channel, priv->sample) == 0)
+                mc13783_ts_report_sample(priv);
+}
+
+static int mc13783_ts_open(struct input_dev *dev)
+{
+        struct mc13783_ts_priv *priv = input_get_drvdata(dev);
+        int ret;
+
+        mc13783_lock(priv->mc13783);
+
+        mc13783_ackirq(priv->mc13783, MC13783_IRQ_TS);
+
+        ret = mc13783_irq_request(priv->mc13783, MC13783_IRQ_TS,
+                mc13783_ts_handler, MC13783_TS_NAME, priv);
+        if (ret)
+                goto out;
+
+        ret = mc13783_reg_rmw(priv->mc13783, MC13783_ADC0,
+                        MC13783_ADC0_TSMOD_MASK, MC13783_ADC0_TSMOD0);
+        if (ret)
+                mc13783_irq_free(priv->mc13783, MC13783_IRQ_TS, priv);
+out:
+        mc13783_unlock(priv->mc13783);
+        return ret;
+}
+
+static void mc13783_ts_close(struct input_dev *dev)
+{
+        struct mc13783_ts_priv *priv = input_get_drvdata(dev);
+
+        mc13783_lock(priv->mc13783);
+        mc13783_reg_rmw(priv->mc13783, MC13783_ADC0,
+                        MC13783_ADC0_TSMOD_MASK, 0);
+        mc13783_irq_free(priv->mc13783, MC13783_IRQ_TS, priv);
+        mc13783_unlock(priv->mc13783);
+
+        cancel_delayed_work_sync(&priv->work);
+}
+
+static int __init mc13783_ts_probe(struct platform_device *pdev)
+{
+        struct mc13783_ts_priv *priv;
+        struct input_dev *idev;
+        int ret = -ENOMEM;
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        idev = input_allocate_device();
+        if (!priv || !idev)
+                goto err_free_mem;
+
+        INIT_DELAYED_WORK(&priv->work, mc13783_ts_work);
+        priv->mc13783 = dev_get_drvdata(pdev->dev.parent);
+        priv->idev = idev;
+
+        /*
+         * We need separate workqueue because mc13783_adc_do_conversion
+         * uses keventd and thus would deadlock.
+         */
+        priv->workq = create_singlethread_workqueue("mc13783_ts");
+        if (!priv->workq)
+                goto err_free_mem;
+
+        idev->name = MC13783_TS_NAME;
+        idev->dev.parent = &pdev->dev;
+
+        idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
+        input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0);
+        input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0);
+        input_set_abs_params(idev, ABS_PRESSURE, 0, 0xfff, 0, 0);
+
+        idev->open = mc13783_ts_open;
+        idev->close = mc13783_ts_close;
+
+        input_set_drvdata(idev, priv);
+
+        ret = input_register_device(priv->idev);
+        if (ret) {
+                dev_err(&pdev->dev,
+                        "register input device failed with %d\n", ret);
+                goto err_destroy_wq;
+        }
+
+        platform_set_drvdata(pdev, priv);
+        return 0;
+
+err_destroy_wq:
+        destroy_workqueue(priv->workq);
+err_free_mem:
+        input_free_device(idev);
+        kfree(priv);
+        return ret;
+}
+
+static int __devexit mc13783_ts_remove(struct platform_device *pdev)
+{
+        struct mc13783_ts_priv *priv = platform_get_drvdata(pdev);
+
+        platform_set_drvdata(pdev, NULL);
+
+        destroy_workqueue(priv->workq);
+        input_unregister_device(priv->idev);
+        kfree(priv);
+
+        return 0;
+}
+
+static struct platform_driver mc13783_ts_driver = {
+        .remove         = __devexit_p(mc13783_ts_remove),
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = MC13783_TS_NAME,
+        },
+};
+
+static int __init mc13783_ts_init(void)
+{
+        return platform_driver_probe(&mc13783_ts_driver, &mc13783_ts_probe);
+}
+module_init(mc13783_ts_init);
+
+static void __exit mc13783_ts_exit(void)
+{
+        platform_driver_unregister(&mc13783_ts_driver);
+}
+module_exit(mc13783_ts_exit);
+
+MODULE_DESCRIPTION("MC13783 input touchscreen driver");
+MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" MC13783_TS_NAME);
diff --git a/drivers/input/touchscreen/pcap_ts.c b/drivers/input/touchscreen/pcap_ts.c
index 67fcd33595de..b79097e3028a 100644
--- a/drivers/input/touchscreen/pcap_ts.c
+++ b/drivers/input/touchscreen/pcap_ts.c
@@ -233,7 +233,7 @@ static int pcap_ts_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops pcap_ts_pm_ops = {
+static const struct dev_pm_ops pcap_ts_pm_ops = {
         .suspend        = pcap_ts_suspend,
         .resume         = pcap_ts_resume,
 };
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index f2cc13d76810..782f95822eab 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -50,7 +50,7 @@ static ssize_t led_brightness_store(struct device *dev,
         unsigned long state = simple_strtoul(buf, &after, 10);
         size_t count = after - buf;
 
-        if (*after && isspace(*after))
+        if (isspace(*after))
                 count++;
 
         if (count == size) {
diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c
index 3b83406de752..38b3378be442 100644
--- a/drivers/leds/ledtrig-timer.c
+++ b/drivers/leds/ledtrig-timer.c
@@ -83,7 +83,7 @@ static ssize_t led_delay_on_store(struct device *dev,
         unsigned long state = simple_strtoul(buf, &after, 10);
         size_t count = after - buf;
 
-        if (*after && isspace(*after))
+        if (isspace(*after))
                 count++;
 
         if (count == size) {
@@ -127,7 +127,7 @@ static ssize_t led_delay_off_store(struct device *dev,
         unsigned long state = simple_strtoul(buf, &after, 10);
         size_t count = after - buf;
 
-        if (*after && isspace(*after))
+        if (isspace(*after))
                 count++;
 
         if (count == size) {
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index e412980763bd..a93637223c8d 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2003 Christophe Saout <christophe@saout.de>
  * Copyright (C) 2004 Clemens Fruhwirth <clemens@endorphin.org>
- * Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2006-2009 Red Hat, Inc. All rights reserved.
  *
  * This file is released under the GPL.
  */
@@ -71,10 +71,21 @@ struct crypt_iv_operations {
         int (*ctr)(struct crypt_config *cc, struct dm_target *ti,
                    const char *opts);
         void (*dtr)(struct crypt_config *cc);
-        const char *(*status)(struct crypt_config *cc);
+        int (*init)(struct crypt_config *cc);
+        int (*wipe)(struct crypt_config *cc);
         int (*generator)(struct crypt_config *cc, u8 *iv, sector_t sector);
 };
 
+struct iv_essiv_private {
+        struct crypto_cipher *tfm;
+        struct crypto_hash *hash_tfm;
+        u8 *salt;
+};
+
+struct iv_benbi_private {
+        int shift;
+};
+
 /*
  * Crypt: maps a linear range of a block device
  * and encrypts / decrypts at the same time.
@@ -102,8 +113,8 @@ struct crypt_config {
         struct crypt_iv_operations *iv_gen_ops;
         char *iv_mode;
         union {
-                struct crypto_cipher *essiv_tfm;
-                int benbi_shift;
+                struct iv_essiv_private essiv;
+                struct iv_benbi_private benbi;
         } iv_gen_private;
         sector_t iv_offset;
         unsigned int iv_size;
@@ -147,6 +158,9 @@ static void kcryptd_queue_crypt(struct dm_crypt_io *io);
  * plain: the initial vector is the 32-bit little-endian version of the sector
  *        number, padded with zeros if necessary.
  *
+ * plain64: the initial vector is the 64-bit little-endian version of the sector
+ *        number, padded with zeros if necessary.
+ *
  * essiv: "encrypted sector|salt initial vector", the sector number is
  *        encrypted with the bulk cipher using a salt as key. The salt
  *        should be derived from the bulk cipher's key via hashing.
@@ -169,88 +183,123 @@ static int crypt_iv_plain_gen(struct crypt_config *cc, u8 *iv, sector_t sector)
         return 0;
 }
 
-static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
-                              const char *opts)
+static int crypt_iv_plain64_gen(struct crypt_config *cc, u8 *iv,
+                                sector_t sector)
 {
-        struct crypto_cipher *essiv_tfm;
-        struct crypto_hash *hash_tfm;
+        memset(iv, 0, cc->iv_size);
+        *(u64 *)iv = cpu_to_le64(sector);
+
+        return 0;
+}
+
+/* Initialise ESSIV - compute salt but no local memory allocations */
+static int crypt_iv_essiv_init(struct crypt_config *cc)
+{
+        struct iv_essiv_private *essiv = &cc->iv_gen_private.essiv;
         struct hash_desc desc;
         struct scatterlist sg;
-        unsigned int saltsize;
-        u8 *salt;
         int err;
 
-        if (opts == NULL) {
+        sg_init_one(&sg, cc->key, cc->key_size);
+        desc.tfm = essiv->hash_tfm;
+        desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
+
+        err = crypto_hash_digest(&desc, &sg, cc->key_size, essiv->salt);
+        if (err)
+                return err;
+
+        return crypto_cipher_setkey(essiv->tfm, essiv->salt,
+                                    crypto_hash_digestsize(essiv->hash_tfm));
+}
+
+/* Wipe salt and reset key derived from volume key */
+static int crypt_iv_essiv_wipe(struct crypt_config *cc)
+{
+        struct iv_essiv_private *essiv = &cc->iv_gen_private.essiv;
+        unsigned salt_size = crypto_hash_digestsize(essiv->hash_tfm);
+
+        memset(essiv->salt, 0, salt_size);
+
+        return crypto_cipher_setkey(essiv->tfm, essiv->salt, salt_size);
+}
+
+static void crypt_iv_essiv_dtr(struct crypt_config *cc)
+{
+        struct iv_essiv_private *essiv = &cc->iv_gen_private.essiv;
+
+        crypto_free_cipher(essiv->tfm);
+        essiv->tfm = NULL;
+
+        crypto_free_hash(essiv->hash_tfm);
+        essiv->hash_tfm = NULL;
+
+        kzfree(essiv->salt);
+        essiv->salt = NULL;
+}
+
+static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
+                              const char *opts)
+{
+        struct crypto_cipher *essiv_tfm = NULL;
+        struct crypto_hash *hash_tfm = NULL;
+        u8 *salt = NULL;
+        int err;
+
+        if (!opts) {
                 ti->error = "Digest algorithm missing for ESSIV mode";
                 return -EINVAL;
         }
 
-        /* Hash the cipher key with the given hash algorithm */
+        /* Allocate hash algorithm */
         hash_tfm = crypto_alloc_hash(opts, 0, CRYPTO_ALG_ASYNC);
         if (IS_ERR(hash_tfm)) {
                 ti->error = "Error initializing ESSIV hash";
-                return PTR_ERR(hash_tfm);
+                err = PTR_ERR(hash_tfm);
+                goto bad;
         }
 
-        saltsize = crypto_hash_digestsize(hash_tfm);
-        salt = kmalloc(saltsize, GFP_KERNEL);
-        if (salt == NULL) {
+        salt = kzalloc(crypto_hash_digestsize(hash_tfm), GFP_KERNEL);
+        if (!salt) {
                 ti->error = "Error kmallocing salt storage in ESSIV";
-                crypto_free_hash(hash_tfm);
-                return -ENOMEM;
+                err = -ENOMEM;
+                goto bad;
         }
 
-        sg_init_one(&sg, cc->key, cc->key_size);
-        desc.tfm = hash_tfm;
-        desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
-        err = crypto_hash_digest(&desc, &sg, cc->key_size, salt);
-        crypto_free_hash(hash_tfm);
-
-        if (err) {
-                ti->error = "Error calculating hash in ESSIV";
-                kfree(salt);
-                return err;
-        }
-
-        /* Setup the essiv_tfm with the given salt */
+        /* Allocate essiv_tfm */
         essiv_tfm = crypto_alloc_cipher(cc->cipher, 0, CRYPTO_ALG_ASYNC);
         if (IS_ERR(essiv_tfm)) {
                 ti->error = "Error allocating crypto tfm for ESSIV";
-                kfree(salt);
-                return PTR_ERR(essiv_tfm);
+                err = PTR_ERR(essiv_tfm);
+                goto bad;
         }
         if (crypto_cipher_blocksize(essiv_tfm) !=
             crypto_ablkcipher_ivsize(cc->tfm)) {
                 ti->error = "Block size of ESSIV cipher does "
                             "not match IV size of block cipher";
-                crypto_free_cipher(essiv_tfm);
-                kfree(salt);
-                return -EINVAL;
+                err = -EINVAL;
+                goto bad;
         }
-        err = crypto_cipher_setkey(essiv_tfm, salt, saltsize);
-        if (err) {
-                ti->error = "Failed to set key for ESSIV cipher";
-                crypto_free_cipher(essiv_tfm);
-                kfree(salt);
-                return err;
-        }
-        kfree(salt);
 
-        cc->iv_gen_private.essiv_tfm = essiv_tfm;
+        cc->iv_gen_private.essiv.salt = salt;
+        cc->iv_gen_private.essiv.tfm = essiv_tfm;
+        cc->iv_gen_private.essiv.hash_tfm = hash_tfm;
+
         return 0;
-}
 
-static void crypt_iv_essiv_dtr(struct crypt_config *cc)
-{
-        crypto_free_cipher(cc->iv_gen_private.essiv_tfm);
-        cc->iv_gen_private.essiv_tfm = NULL;
+bad:
+        if (essiv_tfm && !IS_ERR(essiv_tfm))
+                crypto_free_cipher(essiv_tfm);
+        if (hash_tfm && !IS_ERR(hash_tfm))
+                crypto_free_hash(hash_tfm);
+        kfree(salt);
+        return err;
 }
 
 static int crypt_iv_essiv_gen(struct crypt_config *cc, u8 *iv, sector_t sector)
 {
         memset(iv, 0, cc->iv_size);
         *(u64 *)iv = cpu_to_le64(sector);
-        crypto_cipher_encrypt_one(cc->iv_gen_private.essiv_tfm, iv, iv);
+        crypto_cipher_encrypt_one(cc->iv_gen_private.essiv.tfm, iv, iv);
         return 0;
 }
 
@@ -273,7 +322,7 @@ static int crypt_iv_benbi_ctr(struct crypt_config *cc, struct dm_target *ti,
                 return -EINVAL;
         }
 
-        cc->iv_gen_private.benbi_shift = 9 - log;
+        cc->iv_gen_private.benbi.shift = 9 - log;
 
         return 0;
 }
@@ -288,7 +337,7 @@ static int crypt_iv_benbi_gen(struct crypt_config *cc, u8 *iv, sector_t sector)
 
         memset(iv, 0, cc->iv_size - sizeof(u64)); /* rest is cleared below */
 
-        val = cpu_to_be64(((u64)sector << cc->iv_gen_private.benbi_shift) + 1);
+        val = cpu_to_be64(((u64)sector << cc->iv_gen_private.benbi.shift) + 1);
         put_unaligned(val, (__be64 *)(iv + cc->iv_size - sizeof(u64)));
 
         return 0;
@@ -305,9 +354,15 @@ static struct crypt_iv_operations crypt_iv_plain_ops = {
         .generator = crypt_iv_plain_gen
 };
 
+static struct crypt_iv_operations crypt_iv_plain64_ops = {
+        .generator = crypt_iv_plain64_gen
+};
+
 static struct crypt_iv_operations crypt_iv_essiv_ops = {
         .ctr       = crypt_iv_essiv_ctr,
         .dtr       = crypt_iv_essiv_dtr,
+        .init      = crypt_iv_essiv_init,
+        .wipe      = crypt_iv_essiv_wipe,
         .generator = crypt_iv_essiv_gen
 };
 
@@ -934,14 +989,14 @@ static int crypt_set_key(struct crypt_config *cc, char *key)
 
         set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
 
-        return 0;
+        return crypto_ablkcipher_setkey(cc->tfm, cc->key, cc->key_size);
 }
 
 static int crypt_wipe_key(struct crypt_config *cc)
 {
         clear_bit(DM_CRYPT_KEY_VALID, &cc->flags);
         memset(&cc->key, 0, cc->key_size * sizeof(u8));
-        return 0;
+        return crypto_ablkcipher_setkey(cc->tfm, cc->key, cc->key_size);
 }
 
 /*
@@ -983,11 +1038,6 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 return -ENOMEM;
         }
 
-        if (crypt_set_key(cc, argv[1])) {
-                ti->error = "Error decoding key";
-                goto bad_cipher;
-        }
-
         /* Compatibility mode for old dm-crypt cipher strings */
         if (!chainmode || (strcmp(chainmode, "plain") == 0 && !ivmode)) {
                 chainmode = "cbc";
@@ -1015,6 +1065,11 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         strcpy(cc->chainmode, chainmode);
         cc->tfm = tfm;
 
+        if (crypt_set_key(cc, argv[1]) < 0) {
+                ti->error = "Error decoding and setting key";
+                goto bad_ivmode;
+        }
+
         /*
          * Choose ivmode. Valid modes: "plain", "essiv:<esshash>", "benbi".
          * See comments at iv code
@@ -1024,6 +1079,8 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 cc->iv_gen_ops = NULL;
         else if (strcmp(ivmode, "plain") == 0)
                 cc->iv_gen_ops = &crypt_iv_plain_ops;
+        else if (strcmp(ivmode, "plain64") == 0)
+                cc->iv_gen_ops = &crypt_iv_plain64_ops;
         else if (strcmp(ivmode, "essiv") == 0)
                 cc->iv_gen_ops = &crypt_iv_essiv_ops;
         else if (strcmp(ivmode, "benbi") == 0)
@@ -1039,6 +1096,12 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
             cc->iv_gen_ops->ctr(cc, ti, ivopts) < 0)
                 goto bad_ivmode;
 
+        if (cc->iv_gen_ops && cc->iv_gen_ops->init &&
+            cc->iv_gen_ops->init(cc) < 0) {
+                ti->error = "Error initialising IV";
+                goto bad_slab_pool;
+        }
+
         cc->iv_size = crypto_ablkcipher_ivsize(tfm);
         if (cc->iv_size)
                 /* at least a 64 bit sector number should fit in our buffer */
@@ -1085,11 +1148,6 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad_bs;
         }
 
-        if (crypto_ablkcipher_setkey(tfm, cc->key, key_size) < 0) {
-                ti->error = "Error setting key";
-                goto bad_device;
-        }
-
         if (sscanf(argv[2], "%llu", &tmpll) != 1) {
                 ti->error = "Invalid iv_offset sector";
                 goto bad_device;
@@ -1278,6 +1336,7 @@ static void crypt_resume(struct dm_target *ti)
 static int crypt_message(struct dm_target *ti, unsigned argc, char **argv)
 {
         struct crypt_config *cc = ti->private;
+        int ret = -EINVAL;
 
         if (argc < 2)
                 goto error;
@@ -1287,10 +1346,22 @@ static int crypt_message(struct dm_target *ti, unsigned argc, char **argv)
                         DMWARN("not suspended during key manipulation.");
                         return -EINVAL;
                 }
-                if (argc == 3 && !strnicmp(argv[1], MESG_STR("set")))
-                        return crypt_set_key(cc, argv[2]);
-                if (argc == 2 && !strnicmp(argv[1], MESG_STR("wipe")))
+                if (argc == 3 && !strnicmp(argv[1], MESG_STR("set"))) {
+                        ret = crypt_set_key(cc, argv[2]);
+                        if (ret)
+                                return ret;
+                        if (cc->iv_gen_ops && cc->iv_gen_ops->init)
+                                ret = cc->iv_gen_ops->init(cc);
+                        return ret;
+                }
+                if (argc == 2 && !strnicmp(argv[1], MESG_STR("wipe"))) {
+                        if (cc->iv_gen_ops && cc->iv_gen_ops->wipe) {
+                                ret = cc->iv_gen_ops->wipe(cc);
+                                if (ret)
+                                        return ret;
+                        }
                         return crypt_wipe_key(cc);
+                }
         }
 
 error:
diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c
index 7dbe652efb5a..2b7907b6dd09 100644
--- a/drivers/md/dm-exception-store.c
+++ b/drivers/md/dm-exception-store.c
@@ -172,7 +172,8 @@ int dm_exception_store_set_chunk_size(struct dm_exception_store *store,
         }
 
         /* Validate the chunk size against the device block size */
-        if (chunk_size % (bdev_logical_block_size(store->cow->bdev) >> 9)) {
+        if (chunk_size %
+            (bdev_logical_block_size(dm_snap_cow(store->snap)->bdev) >> 9)) {
                 *error = "Chunk size is not a multiple of device blocksize";
                 return -EINVAL;
         }
@@ -190,6 +191,7 @@ int dm_exception_store_set_chunk_size(struct dm_exception_store *store,
 }
 
 int dm_exception_store_create(struct dm_target *ti, int argc, char **argv,
+                              struct dm_snapshot *snap,
                               unsigned *args_used,
                               struct dm_exception_store **store)
 {
@@ -198,7 +200,7 @@ int dm_exception_store_create(struct dm_target *ti, int argc, char **argv,
         struct dm_exception_store *tmp_store;
         char persistent;
 
-        if (argc < 3) {
+        if (argc < 2) {
                 ti->error = "Insufficient exception store arguments";
                 return -EINVAL;
         }
@@ -209,14 +211,15 @@ int dm_exception_store_create(struct dm_target *ti, int argc, char **argv,
                 return -ENOMEM;
         }
 
-        persistent = toupper(*argv[1]);
+        persistent = toupper(*argv[0]);
         if (persistent == 'P')
                 type = get_type("P");
         else if (persistent == 'N')
                 type = get_type("N");
         else {
                 ti->error = "Persistent flag is not P or N";
-                return -EINVAL;
+                r = -EINVAL;
+                goto bad_type;
         }
 
         if (!type) {
@@ -226,32 +229,23 @@ int dm_exception_store_create(struct dm_target *ti, int argc, char **argv,
         }
 
         tmp_store->type = type;
-        tmp_store->ti = ti;
-
-        r = dm_get_device(ti, argv[0], 0, 0,
-                          FMODE_READ | FMODE_WRITE, &tmp_store->cow);
-        if (r) {
-                ti->error = "Cannot get COW device";
-                goto bad_cow;
-        }
+        tmp_store->snap = snap;
 
-        r = set_chunk_size(tmp_store, argv[2], &ti->error);
+        r = set_chunk_size(tmp_store, argv[1], &ti->error);
         if (r)
-                goto bad_ctr;
+                goto bad;
 
         r = type->ctr(tmp_store, 0, NULL);
         if (r) {
                 ti->error = "Exception store type constructor failed";
-                goto bad_ctr;
+                goto bad;
         }
 
-        *args_used = 3;
+        *args_used = 2;
         *store = tmp_store;
         return 0;
 
-bad_ctr:
-        dm_put_device(ti, tmp_store->cow);
-bad_cow:
+bad:
         put_type(type);
 bad_type:
         kfree(tmp_store);
@@ -262,7 +256,6 @@ EXPORT_SYMBOL(dm_exception_store_create);
 void dm_exception_store_destroy(struct dm_exception_store *store)
 {
         store->type->dtr(store);
-        dm_put_device(store->ti, store->cow);
         put_type(store->type);
         kfree(store);
 }
diff --git a/drivers/md/dm-exception-store.h b/drivers/md/dm-exception-store.h
index 8a223a48802c..e8dfa06af3ba 100644
--- a/drivers/md/dm-exception-store.h
+++ b/drivers/md/dm-exception-store.h
@@ -26,7 +26,7 @@ typedef sector_t chunk_t;
  * of chunks that follow contiguously.  Remaining bits hold the number of the
  * chunk within the device.
  */
-struct dm_snap_exception {
+struct dm_exception {
         struct list_head hash_list;
 
         chunk_t old_chunk;
@@ -64,17 +64,34 @@ struct dm_exception_store_type {
          * Find somewhere to store the next exception.
          */
         int (*prepare_exception) (struct dm_exception_store *store,
-                                  struct dm_snap_exception *e);
+                                  struct dm_exception *e);
 
         /*
          * Update the metadata with this exception.
          */
         void (*commit_exception) (struct dm_exception_store *store,
-                                  struct dm_snap_exception *e,
+                                  struct dm_exception *e,
                                   void (*callback) (void *, int success),
                                   void *callback_context);
 
         /*
+         * Returns 0 if the exception store is empty.
+         *
+         * If there are exceptions still to be merged, sets
+         * *last_old_chunk and *last_new_chunk to the most recent
+         * still-to-be-merged chunk and returns the number of
+         * consecutive previous ones.
+         */
+        int (*prepare_merge) (struct dm_exception_store *store,
+                              chunk_t *last_old_chunk, chunk_t *last_new_chunk);
+
+        /*
+         * Clear the last n exceptions.
+         * nr_merged must be <= the value returned by prepare_merge.
+         */
+        int (*commit_merge) (struct dm_exception_store *store, int nr_merged);
+
+        /*
          * The snapshot is invalid, note this in the metadata.
          */
         void (*drop_snapshot) (struct dm_exception_store *store);
@@ -86,19 +103,19 @@ struct dm_exception_store_type {
         /*
          * Return how full the snapshot is.
          */
-        void (*fraction_full) (struct dm_exception_store *store,
-                               sector_t *numerator,
-                               sector_t *denominator);
+        void (*usage) (struct dm_exception_store *store,
+                       sector_t *total_sectors, sector_t *sectors_allocated,
+                       sector_t *metadata_sectors);
 
         /* For internal device-mapper use only. */
         struct list_head list;
 };
 
+struct dm_snapshot;
+
 struct dm_exception_store {
         struct dm_exception_store_type *type;
-        struct dm_target *ti;
-
-        struct dm_dev *cow;
+        struct dm_snapshot *snap;
 
         /* Size of data blocks saved - must be a power of 2 */
         unsigned chunk_size;
@@ -109,6 +126,11 @@ struct dm_exception_store {
 };
 
 /*
+ * Obtain the cow device used by a given snapshot.
+ */
+struct dm_dev *dm_snap_cow(struct dm_snapshot *snap);
+
+/*
  * Funtions to manipulate consecutive chunks
  */
 #  if defined(CONFIG_LBDAF) || (BITS_PER_LONG == 64)
@@ -120,18 +142,25 @@ static inline chunk_t dm_chunk_number(chunk_t chunk)
         return chunk & (chunk_t)((1ULL << DM_CHUNK_NUMBER_BITS) - 1ULL);
 }
 
-static inline unsigned dm_consecutive_chunk_count(struct dm_snap_exception *e)
+static inline unsigned dm_consecutive_chunk_count(struct dm_exception *e)
 {
         return e->new_chunk >> DM_CHUNK_NUMBER_BITS;
 }
 
-static inline void dm_consecutive_chunk_count_inc(struct dm_snap_exception *e)
+static inline void dm_consecutive_chunk_count_inc(struct dm_exception *e)
 {
         e->new_chunk += (1ULL << DM_CHUNK_NUMBER_BITS);
 
         BUG_ON(!dm_consecutive_chunk_count(e));
 }
 
+static inline void dm_consecutive_chunk_count_dec(struct dm_exception *e)
+{
+        BUG_ON(!dm_consecutive_chunk_count(e));
+
+        e->new_chunk -= (1ULL << DM_CHUNK_NUMBER_BITS);
+}
+
 #  else
 #    define DM_CHUNK_CONSECUTIVE_BITS 0
 
@@ -140,12 +169,16 @@ static inline chunk_t dm_chunk_number(chunk_t chunk)
         return chunk;
 }
 
-static inline unsigned dm_consecutive_chunk_count(struct dm_snap_exception *e)
+static inline unsigned dm_consecutive_chunk_count(struct dm_exception *e)
 {
         return 0;
 }
 
-static inline void dm_consecutive_chunk_count_inc(struct dm_snap_exception *e)
+static inline void dm_consecutive_chunk_count_inc(struct dm_exception *e)
+{
+}
+
+static inline void dm_consecutive_chunk_count_dec(struct dm_exception *e)
 {
 }
 
@@ -162,7 +195,7 @@ static inline sector_t get_dev_size(struct block_device *bdev)
 static inline chunk_t sector_to_chunk(struct dm_exception_store *store,
                                       sector_t sector)
 {
-        return (sector & ~store->chunk_mask) >> store->chunk_shift;
+        return sector >> store->chunk_shift;
 }
 
 int dm_exception_store_type_register(struct dm_exception_store_type *type);
@@ -173,6 +206,7 @@ int dm_exception_store_set_chunk_size(struct dm_exception_store *store,
                                       char **error);
 
 int dm_exception_store_create(struct dm_target *ti, int argc, char **argv,
+                              struct dm_snapshot *snap,
                               unsigned *args_used,
                               struct dm_exception_store **store);
 void dm_exception_store_destroy(struct dm_exception_store *store);
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index 3a2e6a2f8bdd..10f457ca6af2 100644
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -5,6 +5,8 @@
  * This file is released under the GPL.
  */
 
+#include "dm.h"
+
 #include <linux/device-mapper.h>
 
 #include <linux/bio.h>
@@ -14,12 +16,19 @@
 #include <linux/slab.h>
 #include <linux/dm-io.h>
 
+#define DM_MSG_PREFIX "io"
+
+#define DM_IO_MAX_REGIONS       BITS_PER_LONG
+
 struct dm_io_client {
         mempool_t *pool;
         struct bio_set *bios;
 };
 
-/* FIXME: can we shrink this ? */
+/*
+ * Aligning 'struct io' reduces the number of bits required to store
+ * its address.  Refer to store_io_and_region_in_bio() below.
+ */
 struct io {
         unsigned long error_bits;
         unsigned long eopnotsupp_bits;
@@ -28,7 +37,9 @@ struct io {
         struct dm_io_client *client;
         io_notify_fn callback;
         void *context;
-};
+} __attribute__((aligned(DM_IO_MAX_REGIONS)));
+
+static struct kmem_cache *_dm_io_cache;
 
 /*
  * io contexts are only dynamically allocated for asynchronous
@@ -53,7 +64,7 @@ struct dm_io_client *dm_io_client_create(unsigned num_pages)
         if (!client)
                 return ERR_PTR(-ENOMEM);
 
-        client->pool = mempool_create_kmalloc_pool(ios, sizeof(struct io));
+        client->pool = mempool_create_slab_pool(ios, _dm_io_cache);
         if (!client->pool)
                 goto bad;
 
@@ -88,18 +99,29 @@ EXPORT_SYMBOL(dm_io_client_destroy);
 
 /*-----------------------------------------------------------------
  * We need to keep track of which region a bio is doing io for.
- * In order to save a memory allocation we store this the last
- * bvec which we know is unused (blech).
- * XXX This is ugly and can OOPS with some configs... find another way.
+ * To avoid a memory allocation to store just 5 or 6 bits, we
+ * ensure the 'struct io' pointer is aligned so enough low bits are
+ * always zero and then combine it with the region number directly in
+ * bi_private.
  *---------------------------------------------------------------*/
-static inline void bio_set_region(struct bio *bio, unsigned region)
+static void store_io_and_region_in_bio(struct bio *bio, struct io *io,
+                                       unsigned region)
 {
-        bio->bi_io_vec[bio->bi_max_vecs].bv_len = region;
+        if (unlikely(!IS_ALIGNED((unsigned long)io, DM_IO_MAX_REGIONS))) {
+                DMCRIT("Unaligned struct io pointer %p", io);
+                BUG();
+        }
+
+        bio->bi_private = (void *)((unsigned long)io | region);
 }
 
-static inline unsigned bio_get_region(struct bio *bio)
+static void retrieve_io_and_region_from_bio(struct bio *bio, struct io **io,
+                                       unsigned *region)
 {
-        return bio->bi_io_vec[bio->bi_max_vecs].bv_len;
+        unsigned long val = (unsigned long)bio->bi_private;
+
+        *io = (void *)(val & -(unsigned long)DM_IO_MAX_REGIONS);
+        *region = val & (DM_IO_MAX_REGIONS - 1);
 }
 
 /*-----------------------------------------------------------------
@@ -140,10 +162,8 @@ static void endio(struct bio *bio, int error)
         /*
          * The bio destructor in bio_put() may use the io object.
          */
-        io = bio->bi_private;
-        region = bio_get_region(bio);
+        retrieve_io_and_region_from_bio(bio, &io, &region);
 
-        bio->bi_max_vecs++;
         bio_put(bio);
 
         dec_count(io, region, error);
@@ -243,7 +263,10 @@ static void vm_dp_init(struct dpages *dp, void *data)
 
 static void dm_bio_destructor(struct bio *bio)
 {
-        struct io *io = bio->bi_private;
+        unsigned region;
+        struct io *io;
+
+        retrieve_io_and_region_from_bio(bio, &io, &region);
 
         bio_free(bio, io->client->bios);
 }
@@ -286,26 +309,23 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where,
         unsigned num_bvecs;
         sector_t remaining = where->count;
 
-        while (remaining) {
+        /*
+         * where->count may be zero if rw holds a write barrier and we
+         * need to send a zero-sized barrier.
+         */
+        do {
                 /*
-                 * Allocate a suitably sized-bio: we add an extra
-                 * bvec for bio_get/set_region() and decrement bi_max_vecs
-                 * to hide it from bio_add_page().
+                 * Allocate a suitably sized-bio.
                  */
                 num_bvecs = dm_sector_div_up(remaining,
                                              (PAGE_SIZE >> SECTOR_SHIFT));
-                num_bvecs = 1 + min_t(int, bio_get_nr_vecs(where->bdev),
-                                      num_bvecs);
-                if (unlikely(num_bvecs > BIO_MAX_PAGES))
-                        num_bvecs = BIO_MAX_PAGES;
+                num_bvecs = min_t(int, bio_get_nr_vecs(where->bdev), num_bvecs);
                 bio = bio_alloc_bioset(GFP_NOIO, num_bvecs, io->client->bios);
                 bio->bi_sector = where->sector + (where->count - remaining);
                 bio->bi_bdev = where->bdev;
                 bio->bi_end_io = endio;
-                bio->bi_private = io;
                 bio->bi_destructor = dm_bio_destructor;
-                bio->bi_max_vecs--;
-                bio_set_region(bio, region);
+                store_io_and_region_in_bio(bio, io, region);
 
                 /*
                  * Try and add as many pages as possible.
@@ -323,7 +343,7 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where,
 
                 atomic_inc(&io->count);
                 submit_bio(rw, bio);
-        }
+        } while (remaining);
 }
 
 static void dispatch_io(int rw, unsigned int num_regions,
@@ -333,6 +353,8 @@ static void dispatch_io(int rw, unsigned int num_regions,
         int i;
         struct dpages old_pages = *dp;
 
+        BUG_ON(num_regions > DM_IO_MAX_REGIONS);
+
         if (sync)
                 rw |= (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG);
 
@@ -342,7 +364,7 @@ static void dispatch_io(int rw, unsigned int num_regions,
          */
         for (i = 0; i < num_regions; i++) {
                 *dp = old_pages;
-                if (where[i].count)
+                if (where[i].count || (rw & (1 << BIO_RW_BARRIER)))
                         do_region(rw, i, where + i, dp, io);
         }
 
@@ -357,7 +379,14 @@ static int sync_io(struct dm_io_client *client, unsigned int num_regions,
                    struct dm_io_region *where, int rw, struct dpages *dp,
                    unsigned long *error_bits)
 {
-        struct io io;
+        /*
+         * gcc <= 4.3 can't do the alignment for stack variables, so we must
+         * align it on our own.
+         * volatile prevents the optimizer from removing or reusing
+         * "io_" field from the stack frame (allowed in ANSI C).
+         */
+        volatile char io_[sizeof(struct io) + __alignof__(struct io) - 1];
+        struct io *io = (struct io *)PTR_ALIGN(&io_, __alignof__(struct io));
 
         if (num_regions > 1 && (rw & RW_MASK) != WRITE) {
                 WARN_ON(1);
@@ -365,33 +394,33 @@ static int sync_io(struct dm_io_client *client, unsigned int num_regions,
         }
 
 retry:
-        io.error_bits = 0;
-        io.eopnotsupp_bits = 0;
-        atomic_set(&io.count, 1); /* see dispatch_io() */
-        io.sleeper = current;
-        io.client = client;
+        io->error_bits = 0;
+        io->eopnotsupp_bits = 0;
+        atomic_set(&io->count, 1); /* see dispatch_io() */
+        io->sleeper = current;
+        io->client = client;
 
-        dispatch_io(rw, num_regions, where, dp, &io, 1);
+        dispatch_io(rw, num_regions, where, dp, io, 1);
 
         while (1) {
                 set_current_state(TASK_UNINTERRUPTIBLE);
 
-                if (!atomic_read(&io.count))
+                if (!atomic_read(&io->count))
                         break;
 
                 io_schedule();
         }
         set_current_state(TASK_RUNNING);
 
-        if (io.eopnotsupp_bits && (rw & (1 << BIO_RW_BARRIER))) {
+        if (io->eopnotsupp_bits && (rw & (1 << BIO_RW_BARRIER))) {
                 rw &= ~(1 << BIO_RW_BARRIER);
                 goto retry;
         }
 
         if (error_bits)
-                *error_bits = io.error_bits;
+                *error_bits = io->error_bits;
 
-        return io.error_bits ? -EIO : 0;
+        return io->error_bits ? -EIO : 0;
 }
 
 static int async_io(struct dm_io_client *client, unsigned int num_regions,
@@ -472,3 +501,18 @@ int dm_io(struct dm_io_request *io_req, unsigned num_regions,
                         &dp, io_req->notify.fn, io_req->notify.context);
 }
 EXPORT_SYMBOL(dm_io);
+
+int __init dm_io_init(void)
+{
+        _dm_io_cache = KMEM_CACHE(io, 0);
+        if (!_dm_io_cache)
+                return -ENOMEM;
+
+        return 0;
+}
+
+void dm_io_exit(void)
+{
+        kmem_cache_destroy(_dm_io_cache);
+        _dm_io_cache = NULL;
+}
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index a67942931582..1d669322b27c 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -56,6 +56,11 @@ static void dm_hash_remove_all(int keep_open_devices);
  */
 static DECLARE_RWSEM(_hash_lock);
 
+/*
+ * Protects use of mdptr to obtain hash cell name and uuid from mapped device.
+ */
+static DEFINE_MUTEX(dm_hash_cells_mutex);
+
 static void init_buckets(struct list_head *buckets)
 {
         unsigned int i;
@@ -206,7 +211,9 @@ static int dm_hash_insert(const char *name, const char *uuid, struct mapped_devi
                 list_add(&cell->uuid_list, _uuid_buckets + hash_str(uuid));
         }
         dm_get(md);
+        mutex_lock(&dm_hash_cells_mutex);
         dm_set_mdptr(md, cell);
+        mutex_unlock(&dm_hash_cells_mutex);
         up_write(&_hash_lock);
 
         return 0;
@@ -224,9 +231,11 @@ static void __hash_remove(struct hash_cell *hc)
         /* remove from the dev hash */
         list_del(&hc->uuid_list);
         list_del(&hc->name_list);
+        mutex_lock(&dm_hash_cells_mutex);
         dm_set_mdptr(hc->md, NULL);
+        mutex_unlock(&dm_hash_cells_mutex);
 
-        table = dm_get_table(hc->md);
+        table = dm_get_live_table(hc->md);
         if (table) {
                 dm_table_event(table);
                 dm_table_put(table);
@@ -321,13 +330,15 @@ static int dm_hash_rename(uint32_t cookie, const char *old, const char *new)
          */
         list_del(&hc->name_list);
         old_name = hc->name;
+        mutex_lock(&dm_hash_cells_mutex);
         hc->name = new_name;
+        mutex_unlock(&dm_hash_cells_mutex);
         list_add(&hc->name_list, _name_buckets + hash_str(new_name));
 
         /*
          * Wake up any dm event waiters.
          */
-        table = dm_get_table(hc->md);
+        table = dm_get_live_table(hc->md);
         if (table) {
                 dm_table_event(table);
                 dm_table_put(table);
@@ -512,8 +523,6 @@ static int list_versions(struct dm_ioctl *param, size_t param_size)
         return 0;
 }
 
-
-
 static int check_name(const char *name)
 {
         if (strchr(name, '/')) {
@@ -525,6 +534,40 @@ static int check_name(const char *name)
 }
 
 /*
+ * On successful return, the caller must not attempt to acquire
+ * _hash_lock without first calling dm_table_put, because dm_table_destroy
+ * waits for this dm_table_put and could be called under this lock.
+ */
+static struct dm_table *dm_get_inactive_table(struct mapped_device *md)
+{
+        struct hash_cell *hc;
+        struct dm_table *table = NULL;
+
+        down_read(&_hash_lock);
+        hc = dm_get_mdptr(md);
+        if (!hc || hc->md != md) {
+                DMWARN("device has been removed from the dev hash table.");
+                goto out;
+        }
+
+        table = hc->new_map;
+        if (table)
+                dm_table_get(table);
+
+out:
+        up_read(&_hash_lock);
+
+        return table;
+}
+
+static struct dm_table *dm_get_live_or_inactive_table(struct mapped_device *md,
+                                                      struct dm_ioctl *param)
+{
+        return (param->flags & DM_QUERY_INACTIVE_TABLE_FLAG) ?
+                dm_get_inactive_table(md) : dm_get_live_table(md);
+}
+
+/*
  * Fills in a dm_ioctl structure, ready for sending back to
  * userland.
  */
@@ -536,7 +579,7 @@ static int __dev_status(struct mapped_device *md, struct dm_ioctl *param)
         param->flags &= ~(DM_SUSPEND_FLAG | DM_READONLY_FLAG |
                           DM_ACTIVE_PRESENT_FLAG);
 
-        if (dm_suspended(md))
+        if (dm_suspended_md(md))
                 param->flags |= DM_SUSPEND_FLAG;
 
         param->dev = huge_encode_dev(disk_devt(disk));
@@ -548,18 +591,30 @@ static int __dev_status(struct mapped_device *md, struct dm_ioctl *param)
          */
         param->open_count = dm_open_count(md);
 
-        if (get_disk_ro(disk))
-                param->flags |= DM_READONLY_FLAG;
-
         param->event_nr = dm_get_event_nr(md);
+        param->target_count = 0;
 
-        table = dm_get_table(md);
+        table = dm_get_live_table(md);
         if (table) {
-                param->flags |= DM_ACTIVE_PRESENT_FLAG;
-                param->target_count = dm_table_get_num_targets(table);
+                if (!(param->flags & DM_QUERY_INACTIVE_TABLE_FLAG)) {
+                        if (get_disk_ro(disk))
+                                param->flags |= DM_READONLY_FLAG;
+                        param->target_count = dm_table_get_num_targets(table);
+                }
                 dm_table_put(table);
-        } else
-                param->target_count = 0;
+
+                param->flags |= DM_ACTIVE_PRESENT_FLAG;
+        }
+
+        if (param->flags & DM_QUERY_INACTIVE_TABLE_FLAG) {
+                table = dm_get_inactive_table(md);
+                if (table) {
+                        if (!(dm_table_get_mode(table) & FMODE_WRITE))
+                                param->flags |= DM_READONLY_FLAG;
+                        param->target_count = dm_table_get_num_targets(table);
+                        dm_table_put(table);
+                }
+        }
 
         return 0;
 }
@@ -634,9 +689,9 @@ static struct mapped_device *find_device(struct dm_ioctl *param)
                  * Sneakily write in both the name and the uuid
                  * while we have the cell.
                  */
-                strncpy(param->name, hc->name, sizeof(param->name));
+                strlcpy(param->name, hc->name, sizeof(param->name));
                 if (hc->uuid)
-                        strncpy(param->uuid, hc->uuid, sizeof(param->uuid)-1);
+                        strlcpy(param->uuid, hc->uuid, sizeof(param->uuid));
                 else
                         param->uuid[0] = '\0';
 
@@ -784,7 +839,7 @@ static int do_suspend(struct dm_ioctl *param)
         if (param->flags & DM_NOFLUSH_FLAG)
                 suspend_flags |= DM_SUSPEND_NOFLUSH_FLAG;
 
-        if (!dm_suspended(md))
+        if (!dm_suspended_md(md))
                 r = dm_suspend(md, suspend_flags);
 
         if (!r)
@@ -800,7 +855,7 @@ static int do_resume(struct dm_ioctl *param)
         unsigned suspend_flags = DM_SUSPEND_LOCKFS_FLAG;
         struct hash_cell *hc;
         struct mapped_device *md;
-        struct dm_table *new_map;
+        struct dm_table *new_map, *old_map = NULL;
 
         down_write(&_hash_lock);
 
@@ -826,14 +881,14 @@ static int do_resume(struct dm_ioctl *param)
                         suspend_flags &= ~DM_SUSPEND_LOCKFS_FLAG;
                 if (param->flags & DM_NOFLUSH_FLAG)
                         suspend_flags |= DM_SUSPEND_NOFLUSH_FLAG;
-                if (!dm_suspended(md))
+                if (!dm_suspended_md(md))
                         dm_suspend(md, suspend_flags);
 
-                r = dm_swap_table(md, new_map);
-                if (r) {
+                old_map = dm_swap_table(md, new_map);
+                if (IS_ERR(old_map)) {
                         dm_table_destroy(new_map);
                         dm_put(md);
-                        return r;
+                        return PTR_ERR(old_map);
                 }
 
                 if (dm_table_get_mode(new_map) & FMODE_WRITE)
@@ -842,9 +897,11 @@ static int do_resume(struct dm_ioctl *param)
                         set_disk_ro(dm_disk(md), 1);
         }
 
-        if (dm_suspended(md))
+        if (dm_suspended_md(md))
                 r = dm_resume(md);
 
+        if (old_map)
+                dm_table_destroy(old_map);
 
         if (!r) {
                 dm_kobject_uevent(md, KOBJ_CHANGE, param->event_nr);
@@ -982,7 +1039,7 @@ static int dev_wait(struct dm_ioctl *param, size_t param_size)
         if (r)
                 goto out;
 
-        table = dm_get_table(md);
+        table = dm_get_live_or_inactive_table(md, param);
         if (table) {
                 retrieve_status(table, param, param_size);
                 dm_table_put(table);
@@ -1215,7 +1272,7 @@ static int table_deps(struct dm_ioctl *param, size_t param_size)
         if (r)
                 goto out;
 
-        table = dm_get_table(md);
+        table = dm_get_live_or_inactive_table(md, param);
         if (table) {
                 retrieve_deps(table, param, param_size);
                 dm_table_put(table);
@@ -1244,13 +1301,13 @@ static int table_status(struct dm_ioctl *param, size_t param_size)
         if (r)
                 goto out;
 
-        table = dm_get_table(md);
+        table = dm_get_live_or_inactive_table(md, param);
         if (table) {
                 retrieve_status(table, param, param_size);
                 dm_table_put(table);
         }
 
- out:
+out:
         dm_put(md);
         return r;
 }
@@ -1288,10 +1345,15 @@ static int target_message(struct dm_ioctl *param, size_t param_size)
                 goto out;
         }
 
-        table = dm_get_table(md);
+        table = dm_get_live_table(md);
         if (!table)
                 goto out_argv;
 
+        if (dm_deleting_md(md)) {
+                r = -ENXIO;
+                goto out_table;
+        }
+
         ti = dm_table_find_target(table, tmsg->sector);
         if (!dm_target_is_valid(ti)) {
                 DMWARN("Target message sector outside device.");
@@ -1303,6 +1365,7 @@ static int target_message(struct dm_ioctl *param, size_t param_size)
                 r = -EINVAL;
         }
 
+ out_table:
         dm_table_put(table);
  out_argv:
         kfree(argv);
@@ -1582,8 +1645,7 @@ int dm_copy_name_and_uuid(struct mapped_device *md, char *name, char *uuid)
         if (!md)
                 return -ENXIO;
 
-        dm_get(md);
-        down_read(&_hash_lock);
+        mutex_lock(&dm_hash_cells_mutex);
         hc = dm_get_mdptr(md);
         if (!hc || hc->md != md) {
                 r = -ENXIO;
@@ -1596,8 +1658,7 @@ int dm_copy_name_and_uuid(struct mapped_device *md, char *name, char *uuid)
                 strcpy(uuid, hc->uuid ? : "");
 
 out:
-        up_read(&_hash_lock);
-        dm_put(md);
+        mutex_unlock(&dm_hash_cells_mutex);
 
         return r;
 }
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c
index 3e3fc06cb861..addf83475040 100644
--- a/drivers/md/dm-kcopyd.c
+++ b/drivers/md/dm-kcopyd.c
@@ -450,7 +450,10 @@ static void dispatch_job(struct kcopyd_job *job)
 {
         struct dm_kcopyd_client *kc = job->kc;
         atomic_inc(&kc->nr_jobs);
-        push(&kc->pages_jobs, job);
+        if (unlikely(!job->source.count))
+                push(&kc->complete_jobs, job);
+        else
+                push(&kc->pages_jobs, job);
         wake(kc);
 }
 
diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index 9443896ede07..7035582786fb 100644
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
@@ -145,8 +145,9 @@ int dm_dirty_log_type_unregister(struct dm_dirty_log_type *type)
 EXPORT_SYMBOL(dm_dirty_log_type_unregister);
 
 struct dm_dirty_log *dm_dirty_log_create(const char *type_name,
-                                         struct dm_target *ti,
-                                         unsigned int argc, char **argv)
+                        struct dm_target *ti,
+                        int (*flush_callback_fn)(struct dm_target *ti),
+                        unsigned int argc, char **argv)
 {
         struct dm_dirty_log_type *type;
         struct dm_dirty_log *log;
@@ -161,6 +162,7 @@ struct dm_dirty_log *dm_dirty_log_create(const char *type_name,
                 return NULL;
         }
 
+        log->flush_callback_fn = flush_callback_fn;
         log->type = type;
         if (type->ctr(log, ti, argc, argv)) {
                 kfree(log);
@@ -208,7 +210,9 @@ struct log_header {
 
 struct log_c {
         struct dm_target *ti;
-        int touched;
+        int touched_dirtied;
+        int touched_cleaned;
+        int flush_failed;
         uint32_t region_size;
         unsigned int region_count;
         region_t sync_count;
@@ -233,6 +237,7 @@ struct log_c {
          * Disk log fields
          */
         int log_dev_failed;
+        int log_dev_flush_failed;
         struct dm_dev *log_dev;
         struct log_header header;
 
@@ -253,14 +258,14 @@ static inline void log_set_bit(struct log_c *l,
                                uint32_t *bs, unsigned bit)
 {
         ext2_set_bit(bit, (unsigned long *) bs);
-        l->touched = 1;
+        l->touched_cleaned = 1;
 }
 
 static inline void log_clear_bit(struct log_c *l,
                                  uint32_t *bs, unsigned bit)
 {
         ext2_clear_bit(bit, (unsigned long *) bs);
-        l->touched = 1;
+        l->touched_dirtied = 1;
 }
 
 /*----------------------------------------------------------------
@@ -287,6 +292,19 @@ static int rw_header(struct log_c *lc, int rw)
         return dm_io(&lc->io_req, 1, &lc->header_location, NULL);
 }
 
+static int flush_header(struct log_c *lc)
+{
+        struct dm_io_region null_location = {
+                .bdev = lc->header_location.bdev,
+                .sector = 0,
+                .count = 0,
+        };
+
+        lc->io_req.bi_rw = WRITE_BARRIER;
+
+        return dm_io(&lc->io_req, 1, &null_location, NULL);
+}
+
 static int read_header(struct log_c *log)
 {
         int r;
@@ -378,7 +396,9 @@ static int create_log_context(struct dm_dirty_log *log, struct dm_target *ti,
         }
 
         lc->ti = ti;
-        lc->touched = 0;
+        lc->touched_dirtied = 0;
+        lc->touched_cleaned = 0;
+        lc->flush_failed = 0;
         lc->region_size = region_size;
         lc->region_count = region_count;
         lc->sync = sync;
@@ -406,6 +426,7 @@ static int create_log_context(struct dm_dirty_log *log, struct dm_target *ti,
         } else {
                 lc->log_dev = dev;
                 lc->log_dev_failed = 0;
+                lc->log_dev_flush_failed = 0;
                 lc->header_location.bdev = lc->log_dev->bdev;
                 lc->header_location.sector = 0;
 
@@ -614,6 +635,11 @@ static int disk_resume(struct dm_dirty_log *log)
 
         /* write the new header */
         r = rw_header(lc, WRITE);
+        if (!r) {
+                r = flush_header(lc);
+                if (r)
+                        lc->log_dev_flush_failed = 1;
+        }
         if (r) {
                 DMWARN("%s: Failed to write header on dirty region log device",
                        lc->log_dev->name);
@@ -656,18 +682,40 @@ static int core_flush(struct dm_dirty_log *log)
 
 static int disk_flush(struct dm_dirty_log *log)
 {
-        int r;
-        struct log_c *lc = (struct log_c *) log->context;
+        int r, i;
+        struct log_c *lc = log->context;
 
         /* only write if the log has changed */
-        if (!lc->touched)
+        if (!lc->touched_cleaned && !lc->touched_dirtied)
                 return 0;
 
+        if (lc->touched_cleaned && log->flush_callback_fn &&
+            log->flush_callback_fn(lc->ti)) {
+                /*
+                 * At this point it is impossible to determine which
+                 * regions are clean and which are dirty (without
+                 * re-reading the log off disk). So mark all of them
+                 * dirty.
+                 */
+                lc->flush_failed = 1;
+                for (i = 0; i < lc->region_count; i++)
+                        log_clear_bit(lc, lc->clean_bits, i);
+        }
+
         r = rw_header(lc, WRITE);
         if (r)
                 fail_log_device(lc);
-        else
-                lc->touched = 0;
+        else {
+                if (lc->touched_dirtied) {
+                        r = flush_header(lc);
+                        if (r) {
+                                lc->log_dev_flush_failed = 1;
+                                fail_log_device(lc);
+                        } else
+                                lc->touched_dirtied = 0;
+                }
+                lc->touched_cleaned = 0;
+        }
 
         return r;
 }
@@ -681,7 +729,8 @@ static void core_mark_region(struct dm_dirty_log *log, region_t region)
 static void core_clear_region(struct dm_dirty_log *log, region_t region)
 {
         struct log_c *lc = (struct log_c *) log->context;
-        log_set_bit(lc, lc->clean_bits, region);
+        if (likely(!lc->flush_failed))
+                log_set_bit(lc, lc->clean_bits, region);
 }
 
 static int core_get_resync_work(struct dm_dirty_log *log, region_t *region)
@@ -762,7 +811,9 @@ static int disk_status(struct dm_dirty_log *log, status_type_t status,
         switch(status) {
         case STATUSTYPE_INFO:
                 DMEMIT("3 %s %s %c", log->type->name, lc->log_dev->name,
-                       lc->log_dev_failed ? 'D' : 'A');
+                       lc->log_dev_flush_failed ? 'F' :
+                       lc->log_dev_failed ? 'D' :
+                       'A');
                 break;
 
         case STATUSTYPE_TABLE:
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index dce971dbdfa3..e81345a1d08f 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -93,6 +93,10 @@ struct multipath {
          * can resubmit bios on error.
          */
         mempool_t *mpio_pool;
+
+        struct mutex work_mutex;
+
+        unsigned suspended;     /* Don't create new I/O internally when set. */
 };
 
 /*
@@ -198,6 +202,7 @@ static struct multipath *alloc_multipath(struct dm_target *ti)
                 m->queue_io = 1;
                 INIT_WORK(&m->process_queued_ios, process_queued_ios);
                 INIT_WORK(&m->trigger_event, trigger_event);
+                mutex_init(&m->work_mutex);
                 m->mpio_pool = mempool_create_slab_pool(MIN_IOS, _mpio_cache);
                 if (!m->mpio_pool) {
                         kfree(m);
@@ -885,13 +890,18 @@ static int multipath_ctr(struct dm_target *ti, unsigned int argc,
         return r;
 }
 
-static void multipath_dtr(struct dm_target *ti)
+static void flush_multipath_work(void)
 {
-        struct multipath *m = (struct multipath *) ti->private;
-
         flush_workqueue(kmpath_handlerd);
         flush_workqueue(kmultipathd);
         flush_scheduled_work();
+}
+
+static void multipath_dtr(struct dm_target *ti)
+{
+        struct multipath *m = ti->private;
+
+        flush_multipath_work();
         free_multipath(m);
 }
 
@@ -1261,6 +1271,16 @@ static void multipath_presuspend(struct dm_target *ti)
         queue_if_no_path(m, 0, 1);
 }
 
+static void multipath_postsuspend(struct dm_target *ti)
+{
+        struct multipath *m = ti->private;
+
+        mutex_lock(&m->work_mutex);
+        m->suspended = 1;
+        flush_multipath_work();
+        mutex_unlock(&m->work_mutex);
+}
+
 /*
  * Restore the queue_if_no_path setting.
  */
@@ -1269,6 +1289,10 @@ static void multipath_resume(struct dm_target *ti)
         struct multipath *m = (struct multipath *) ti->private;
         unsigned long flags;
 
+        mutex_lock(&m->work_mutex);
+        m->suspended = 0;
+        mutex_unlock(&m->work_mutex);
+
         spin_lock_irqsave(&m->lock, flags);
         m->queue_if_no_path = m->saved_queue_if_no_path;
         spin_unlock_irqrestore(&m->lock, flags);
@@ -1397,51 +1421,71 @@ static int multipath_status(struct dm_target *ti, status_type_t type,
 
 static int multipath_message(struct dm_target *ti, unsigned argc, char **argv)
 {
-        int r;
+        int r = -EINVAL;
         struct dm_dev *dev;
         struct multipath *m = (struct multipath *) ti->private;
         action_fn action;
 
+        mutex_lock(&m->work_mutex);
+
+        if (m->suspended) {
+                r = -EBUSY;
+                goto out;
+        }
+
+        if (dm_suspended(ti)) {
+                r = -EBUSY;
+                goto out;
+        }
+
         if (argc == 1) {
-                if (!strnicmp(argv[0], MESG_STR("queue_if_no_path")))
-                        return queue_if_no_path(m, 1, 0);
-                else if (!strnicmp(argv[0], MESG_STR("fail_if_no_path")))
-                        return queue_if_no_path(m, 0, 0);
+                if (!strnicmp(argv[0], MESG_STR("queue_if_no_path"))) {
+                        r = queue_if_no_path(m, 1, 0);
+                        goto out;
+                } else if (!strnicmp(argv[0], MESG_STR("fail_if_no_path"))) {
+                        r = queue_if_no_path(m, 0, 0);
+                        goto out;
+                }
         }
 
-        if (argc != 2)
-                goto error;
+        if (argc != 2) {
+                DMWARN("Unrecognised multipath message received.");
+                goto out;
+        }
 
-        if (!strnicmp(argv[0], MESG_STR("disable_group")))
-                return bypass_pg_num(m, argv[1], 1);
-        else if (!strnicmp(argv[0], MESG_STR("enable_group")))
-                return bypass_pg_num(m, argv[1], 0);
-        else if (!strnicmp(argv[0], MESG_STR("switch_group")))
-                return switch_pg_num(m, argv[1]);
-        else if (!strnicmp(argv[0], MESG_STR("reinstate_path")))
+        if (!strnicmp(argv[0], MESG_STR("disable_group"))) {
+                r = bypass_pg_num(m, argv[1], 1);
+                goto out;
+        } else if (!strnicmp(argv[0], MESG_STR("enable_group"))) {
+                r = bypass_pg_num(m, argv[1], 0);
+                goto out;
+        } else if (!strnicmp(argv[0], MESG_STR("switch_group"))) {
+                r = switch_pg_num(m, argv[1]);
+                goto out;
+        } else if (!strnicmp(argv[0], MESG_STR("reinstate_path")))
                 action = reinstate_path;
         else if (!strnicmp(argv[0], MESG_STR("fail_path")))
                 action = fail_path;
-        else
-                goto error;
+        else {
+                DMWARN("Unrecognised multipath message received.");
+                goto out;
+        }
 
         r = dm_get_device(ti, argv[1], ti->begin, ti->len,
                           dm_table_get_mode(ti->table), &dev);
         if (r) {
                 DMWARN("message: error getting device %s",
                        argv[1]);
-                return -EINVAL;
+                goto out;
         }
 
         r = action_dev(m, dev, action);
 
         dm_put_device(ti, dev);
 
+out:
+        mutex_unlock(&m->work_mutex);
         return r;
-
-error:
-        DMWARN("Unrecognised multipath message received.");
-        return -EINVAL;
 }
 
 static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
@@ -1567,13 +1611,14 @@ out:
  *---------------------------------------------------------------*/
 static struct target_type multipath_target = {
         .name = "multipath",
-        .version = {1, 1, 0},
+        .version = {1, 1, 1},
         .module = THIS_MODULE,
         .ctr = multipath_ctr,
         .dtr = multipath_dtr,
         .map_rq = multipath_map,
         .rq_end_io = multipath_end_io,
         .presuspend = multipath_presuspend,
+        .postsuspend = multipath_postsuspend,
         .resume = multipath_resume,
         .status = multipath_status,
         .message = multipath_message,
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index cc9dc79b0784..ad779bd13aec 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -35,6 +35,7 @@ static DECLARE_WAIT_QUEUE_HEAD(_kmirrord_recovery_stopped);
  *---------------------------------------------------------------*/
 enum dm_raid1_error {
         DM_RAID1_WRITE_ERROR,
+        DM_RAID1_FLUSH_ERROR,
         DM_RAID1_SYNC_ERROR,
         DM_RAID1_READ_ERROR
 };
@@ -57,6 +58,7 @@ struct mirror_set {
         struct bio_list reads;
         struct bio_list writes;
         struct bio_list failures;
+        struct bio_list holds;  /* bios are waiting until suspend */
 
         struct dm_region_hash *rh;
         struct dm_kcopyd_client *kcopyd_client;
@@ -67,6 +69,7 @@ struct mirror_set {
         region_t nr_regions;
         int in_sync;
         int log_failure;
+        int leg_failure;
         atomic_t suspend;
 
         atomic_t default_mirror;        /* Default mirror */
@@ -179,6 +182,17 @@ static void set_default_mirror(struct mirror *m)
         atomic_set(&ms->default_mirror, m - m0);
 }
 
+static struct mirror *get_valid_mirror(struct mirror_set *ms)
+{
+        struct mirror *m;
+
+        for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
+                if (!atomic_read(&m->error_count))
+                        return m;
+
+        return NULL;
+}
+
 /* fail_mirror
  * @m: mirror device to fail
  * @error_type: one of the enum's, DM_RAID1_*_ERROR
@@ -198,6 +212,8 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
         struct mirror_set *ms = m->ms;
         struct mirror *new;
 
+        ms->leg_failure = 1;
+
         /*
          * error_count is used for nothing more than a
          * simple way to tell if a device has encountered
@@ -224,19 +240,50 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
                 goto out;
         }
 
-        for (new = ms->mirror; new < ms->mirror + ms->nr_mirrors; new++)
-                if (!atomic_read(&new->error_count)) {
-                        set_default_mirror(new);
-                        break;
-                }
-
-        if (unlikely(new == ms->mirror + ms->nr_mirrors))
+        new = get_valid_mirror(ms);
+        if (new)
+                set_default_mirror(new);
+        else
                 DMWARN("All sides of mirror have failed.");
 
 out:
         schedule_work(&ms->trigger_event);
 }
 
+static int mirror_flush(struct dm_target *ti)
+{
+        struct mirror_set *ms = ti->private;
+        unsigned long error_bits;
+
+        unsigned int i;
+        struct dm_io_region io[ms->nr_mirrors];
+        struct mirror *m;
+        struct dm_io_request io_req = {
+                .bi_rw = WRITE_BARRIER,
+                .mem.type = DM_IO_KMEM,
+                .mem.ptr.bvec = NULL,
+                .client = ms->io_client,
+        };
+
+        for (i = 0, m = ms->mirror; i < ms->nr_mirrors; i++, m++) {
+                io[i].bdev = m->dev->bdev;
+                io[i].sector = 0;
+                io[i].count = 0;
+        }
+
+        error_bits = -1;
+        dm_io(&io_req, ms->nr_mirrors, io, &error_bits);
+        if (unlikely(error_bits != 0)) {
+                for (i = 0; i < ms->nr_mirrors; i++)
+                        if (test_bit(i, &error_bits))
+                                fail_mirror(ms->mirror + i,
+                                            DM_RAID1_FLUSH_ERROR);
+                return -EIO;
+        }
+
+        return 0;
+}
+
 /*-----------------------------------------------------------------
  * Recovery.
  *
@@ -396,6 +443,8 @@ static int mirror_available(struct mirror_set *ms, struct bio *bio)
  */
 static sector_t map_sector(struct mirror *m, struct bio *bio)
 {
+        if (unlikely(!bio->bi_size))
+                return 0;
         return m->offset + (bio->bi_sector - m->ms->ti->begin);
 }
 
@@ -413,6 +462,27 @@ static void map_region(struct dm_io_region *io, struct mirror *m,
         io->count = bio->bi_size >> 9;
 }
 
+static void hold_bio(struct mirror_set *ms, struct bio *bio)
+{
+        /*
+         * If device is suspended, complete the bio.
+         */
+        if (atomic_read(&ms->suspend)) {
+                if (dm_noflush_suspending(ms->ti))
+                        bio_endio(bio, DM_ENDIO_REQUEUE);
+                else
+                        bio_endio(bio, -EIO);
+                return;
+        }
+
+        /*
+         * Hold bio until the suspend is complete.
+         */
+        spin_lock_irq(&ms->lock);
+        bio_list_add(&ms->holds, bio);
+        spin_unlock_irq(&ms->lock);
+}
+
 /*-----------------------------------------------------------------
  * Reads
  *---------------------------------------------------------------*/
@@ -511,7 +581,6 @@ static void write_callback(unsigned long error, void *context)
         unsigned i, ret = 0;
         struct bio *bio = (struct bio *) context;
         struct mirror_set *ms;
-        int uptodate = 0;
         int should_wake = 0;
         unsigned long flags;
 
@@ -524,36 +593,27 @@ static void write_callback(unsigned long error, void *context)
          * This way we handle both writes to SYNC and NOSYNC
          * regions with the same code.
          */
-        if (likely(!error))
-                goto out;
+        if (likely(!error)) {
+                bio_endio(bio, ret);
+                return;
+        }
 
         for (i = 0; i < ms->nr_mirrors; i++)
                 if (test_bit(i, &error))
                         fail_mirror(ms->mirror + i, DM_RAID1_WRITE_ERROR);
-                else
-                        uptodate = 1;
 
-        if (unlikely(!uptodate)) {
-                DMERR("All replicated volumes dead, failing I/O");
-                /* None of the writes succeeded, fail the I/O. */
-                ret = -EIO;
-        } else if (errors_handled(ms)) {
-                /*
-                 * Need to raise event.  Since raising
-                 * events can block, we need to do it in
-                 * the main thread.
-                 */
-                spin_lock_irqsave(&ms->lock, flags);
-                if (!ms->failures.head)
-                        should_wake = 1;
-                bio_list_add(&ms->failures, bio);
-                spin_unlock_irqrestore(&ms->lock, flags);
-                if (should_wake)
-                        wakeup_mirrord(ms);
-                return;
-        }
-out:
-        bio_endio(bio, ret);
+        /*
+         * Need to raise event.  Since raising
+         * events can block, we need to do it in
+         * the main thread.
+         */
+        spin_lock_irqsave(&ms->lock, flags);
+        if (!ms->failures.head)
+                should_wake = 1;
+        bio_list_add(&ms->failures, bio);
+        spin_unlock_irqrestore(&ms->lock, flags);
+        if (should_wake)
+                wakeup_mirrord(ms);
 }
 
 static void do_write(struct mirror_set *ms, struct bio *bio)
@@ -562,7 +622,7 @@ static void do_write(struct mirror_set *ms, struct bio *bio)
         struct dm_io_region io[ms->nr_mirrors], *dest = io;
         struct mirror *m;
         struct dm_io_request io_req = {
-                .bi_rw = WRITE,
+                .bi_rw = WRITE | (bio->bi_rw & WRITE_BARRIER),
                 .mem.type = DM_IO_BVEC,
                 .mem.ptr.bvec = bio->bi_io_vec + bio->bi_idx,
                 .notify.fn = write_callback,
@@ -603,6 +663,11 @@ static void do_writes(struct mirror_set *ms, struct bio_list *writes)
         bio_list_init(&requeue);
 
         while ((bio = bio_list_pop(writes))) {
+                if (unlikely(bio_empty_barrier(bio))) {
+                        bio_list_add(&sync, bio);
+                        continue;
+                }
+
                 region = dm_rh_bio_to_region(ms->rh, bio);
 
                 if (log->type->is_remote_recovering &&
@@ -672,8 +737,12 @@ static void do_writes(struct mirror_set *ms, struct bio_list *writes)
                 dm_rh_delay(ms->rh, bio);
 
         while ((bio = bio_list_pop(&nosync))) {
-                map_bio(get_default_mirror(ms), bio);
-                generic_make_request(bio);
+                if (unlikely(ms->leg_failure) && errors_handled(ms))
+                        hold_bio(ms, bio);
+                else {
+                        map_bio(get_default_mirror(ms), bio);
+                        generic_make_request(bio);
+                }
         }
 }
 
@@ -681,20 +750,12 @@ static void do_failures(struct mirror_set *ms, struct bio_list *failures)
 {
         struct bio *bio;
 
-        if (!failures->head)
-                return;
-
-        if (!ms->log_failure) {
-                while ((bio = bio_list_pop(failures))) {
-                        ms->in_sync = 0;
-                        dm_rh_mark_nosync(ms->rh, bio, bio->bi_size, 0);
-                }
+        if (likely(!failures->head))
                 return;
-        }
 
         /*
          * If the log has failed, unattempted writes are being
-         * put on the failures list.  We can't issue those writes
+         * put on the holds list.  We can't issue those writes
          * until a log has been marked, so we must store them.
          *
          * If a 'noflush' suspend is in progress, we can requeue
@@ -709,23 +770,27 @@ static void do_failures(struct mirror_set *ms, struct bio_list *failures)
          * for us to treat them the same and requeue them
          * as well.
          */
-        if (dm_noflush_suspending(ms->ti)) {
-                while ((bio = bio_list_pop(failures)))
-                        bio_endio(bio, DM_ENDIO_REQUEUE);
-                return;
-        }
+        while ((bio = bio_list_pop(failures))) {
+                if (!ms->log_failure) {
+                        ms->in_sync = 0;
+                        dm_rh_mark_nosync(ms->rh, bio);
+                }
 
-        if (atomic_read(&ms->suspend)) {
-                while ((bio = bio_list_pop(failures)))
+                /*
+                 * If all the legs are dead, fail the I/O.
+                 * If we have been told to handle errors, hold the bio
+                 * and wait for userspace to deal with the problem.
+                 * Otherwise pretend that the I/O succeeded. (This would
+                 * be wrong if the failed leg returned after reboot and
+                 * got replicated back to the good legs.)
+                 */
+                if (!get_valid_mirror(ms))
                         bio_endio(bio, -EIO);
-                return;
+                else if (errors_handled(ms))
+                        hold_bio(ms, bio);
+                else
+                        bio_endio(bio, 0);
         }
-
-        spin_lock_irq(&ms->lock);
-        bio_list_merge(&ms->failures, failures);
-        spin_unlock_irq(&ms->lock);
-
-        delayed_wake(ms);
 }
 
 static void trigger_event(struct work_struct *work)
@@ -784,12 +849,17 @@ static struct mirror_set *alloc_context(unsigned int nr_mirrors,
         }
 
         spin_lock_init(&ms->lock);
+        bio_list_init(&ms->reads);
+        bio_list_init(&ms->writes);
+        bio_list_init(&ms->failures);
+        bio_list_init(&ms->holds);
 
         ms->ti = ti;
         ms->nr_mirrors = nr_mirrors;
         ms->nr_regions = dm_sector_div_up(ti->len, region_size);
         ms->in_sync = 0;
         ms->log_failure = 0;
+        ms->leg_failure = 0;
         atomic_set(&ms->suspend, 0);
         atomic_set(&ms->default_mirror, DEFAULT_MIRROR);
 
@@ -889,7 +959,8 @@ static struct dm_dirty_log *create_dirty_log(struct dm_target *ti,
                 return NULL;
         }
 
-        dl = dm_dirty_log_create(argv[0], ti, param_count, argv + 2);
+        dl = dm_dirty_log_create(argv[0], ti, mirror_flush, param_count,
+                                 argv + 2);
         if (!dl) {
                 ti->error = "Error creating mirror dirty log";
                 return NULL;
@@ -995,6 +1066,7 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         ti->private = ms;
         ti->split_io = dm_rh_get_region_size(ms->rh);
+        ti->num_flush_requests = 1;
 
         ms->kmirrord_wq = create_singlethread_workqueue("kmirrord");
         if (!ms->kmirrord_wq) {
@@ -1122,7 +1194,8 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio,
          * We need to dec pending if this was a write.
          */
         if (rw == WRITE) {
-                dm_rh_dec(ms->rh, map_context->ll);
+                if (likely(!bio_empty_barrier(bio)))
+                        dm_rh_dec(ms->rh, map_context->ll);
                 return error;
         }
 
@@ -1180,6 +1253,9 @@ static void mirror_presuspend(struct dm_target *ti)
         struct mirror_set *ms = (struct mirror_set *) ti->private;
         struct dm_dirty_log *log = dm_rh_dirty_log(ms->rh);
 
+        struct bio_list holds;
+        struct bio *bio;
+
         atomic_set(&ms->suspend, 1);
 
         /*
@@ -1202,6 +1278,22 @@ static void mirror_presuspend(struct dm_target *ti)
          * we know that all of our I/O has been pushed.
          */
         flush_workqueue(ms->kmirrord_wq);
+
+        /*
+         * Now set ms->suspend is set and the workqueue flushed, no more
+         * entries can be added to ms->hold list, so process it.
+         *
+         * Bios can still arrive concurrently with or after this
+         * presuspend function, but they cannot join the hold list
+         * because ms->suspend is set.
+         */
+        spin_lock_irq(&ms->lock);
+        holds = ms->holds;
+        bio_list_init(&ms->holds);
+        spin_unlock_irq(&ms->lock);
+
+        while ((bio = bio_list_pop(&holds)))
+                hold_bio(ms, bio);
 }
 
 static void mirror_postsuspend(struct dm_target *ti)
@@ -1244,7 +1336,8 @@ static char device_status_char(struct mirror *m)
         if (!atomic_read(&(m->error_count)))
                 return 'A';
 
-        return (test_bit(DM_RAID1_WRITE_ERROR, &(m->error_type))) ? 'D' :
+        return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
+                (test_bit(DM_RAID1_WRITE_ERROR, &(m->error_type))) ? 'D' :
                 (test_bit(DM_RAID1_SYNC_ERROR, &(m->error_type))) ? 'S' :
                 (test_bit(DM_RAID1_READ_ERROR, &(m->error_type))) ? 'R' : 'U';
 }
diff --git a/drivers/md/dm-region-hash.c b/drivers/md/dm-region-hash.c
index 36dbe29f2fd6..5f19ceb6fe91 100644
--- a/drivers/md/dm-region-hash.c
+++ b/drivers/md/dm-region-hash.c
@@ -79,6 +79,11 @@ struct dm_region_hash {
         struct list_head recovered_regions;
         struct list_head failed_recovered_regions;
 
+        /*
+         * If there was a barrier failure no regions can be marked clean.
+         */
+        int barrier_failure;
+
         void *context;
         sector_t target_begin;
 
@@ -211,6 +216,7 @@ struct dm_region_hash *dm_region_hash_create(
         INIT_LIST_HEAD(&rh->quiesced_regions);
         INIT_LIST_HEAD(&rh->recovered_regions);
         INIT_LIST_HEAD(&rh->failed_recovered_regions);
+        rh->barrier_failure = 0;
 
         rh->region_pool = mempool_create_kmalloc_pool(MIN_REGIONS,
                                                       sizeof(struct dm_region));
@@ -377,8 +383,6 @@ static void complete_resync_work(struct dm_region *reg, int success)
 /* dm_rh_mark_nosync
  * @ms
  * @bio
- * @done
- * @error
  *
  * The bio was written on some mirror(s) but failed on other mirror(s).
  * We can successfully endio the bio but should avoid the region being
@@ -386,8 +390,7 @@ static void complete_resync_work(struct dm_region *reg, int success)
  *
  * This function is _not_ safe in interrupt context!
  */
-void dm_rh_mark_nosync(struct dm_region_hash *rh,
-                       struct bio *bio, unsigned done, int error)
+void dm_rh_mark_nosync(struct dm_region_hash *rh, struct bio *bio)
 {
         unsigned long flags;
         struct dm_dirty_log *log = rh->log;
@@ -395,6 +398,11 @@ void dm_rh_mark_nosync(struct dm_region_hash *rh,
         region_t region = dm_rh_bio_to_region(rh, bio);
         int recovering = 0;
 
+        if (bio_empty_barrier(bio)) {
+                rh->barrier_failure = 1;
+                return;
+        }
+
         /* We must inform the log that the sync count has changed. */
         log->type->set_region_sync(log, region, 0);
 
@@ -419,7 +427,6 @@ void dm_rh_mark_nosync(struct dm_region_hash *rh,
         BUG_ON(!list_empty(&reg->list));
         spin_unlock_irqrestore(&rh->region_lock, flags);
 
-        bio_endio(bio, error);
         if (recovering)
                 complete_resync_work(reg, 0);
 }
@@ -515,8 +522,11 @@ void dm_rh_inc_pending(struct dm_region_hash *rh, struct bio_list *bios)
 {
         struct bio *bio;
 
-        for (bio = bios->head; bio; bio = bio->bi_next)
+        for (bio = bios->head; bio; bio = bio->bi_next) {
+                if (bio_empty_barrier(bio))
+                        continue;
                 rh_inc(rh, dm_rh_bio_to_region(rh, bio));
+        }
 }
 EXPORT_SYMBOL_GPL(dm_rh_inc_pending);
 
@@ -544,7 +554,14 @@ void dm_rh_dec(struct dm_region_hash *rh, region_t region)
                  */
 
                 /* do nothing for DM_RH_NOSYNC */
-                if (reg->state == DM_RH_RECOVERING) {
+                if (unlikely(rh->barrier_failure)) {
+                        /*
+                         * If a write barrier failed some time ago, we
+                         * don't know whether or not this write made it
+                         * to the disk, so we must resync the device.
+                         */
+                        reg->state = DM_RH_NOSYNC;
+                } else if (reg->state == DM_RH_RECOVERING) {
                         list_add_tail(&reg->list, &rh->quiesced_regions);
                 } else if (reg->state == DM_RH_DIRTY) {
                         reg->state = DM_RH_CLEAN;
diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c
index 0c746420c008..7d08879689ac 100644
--- a/drivers/md/dm-snap-persistent.c
+++ b/drivers/md/dm-snap-persistent.c
@@ -55,6 +55,8 @@
  */
 #define SNAPSHOT_DISK_VERSION 1
 
+#define NUM_SNAPSHOT_HDR_CHUNKS 1
+
 struct disk_header {
         uint32_t magic;
 
@@ -120,7 +122,22 @@ struct pstore {
 
         /*
          * The next free chunk for an exception.
+         *
+         * When creating exceptions, all the chunks here and above are
+         * free.  It holds the next chunk to be allocated.  On rare
+         * occasions (e.g. after a system crash) holes can be left in
+         * the exception store because chunks can be committed out of
+         * order.
+         *
+         * When merging exceptions, it does not necessarily mean all the
+         * chunks here and above are free.  It holds the value it would
+         * have held if all chunks had been committed in order of
+         * allocation.  Consequently the value may occasionally be
+         * slightly too low, but since it's only used for 'status' and
+         * it can never reach its minimum value too early this doesn't
+         * matter.
          */
+
         chunk_t next_free;
 
         /*
@@ -214,7 +231,7 @@ static int chunk_io(struct pstore *ps, void *area, chunk_t chunk, int rw,
                     int metadata)
 {
         struct dm_io_region where = {
-                .bdev = ps->store->cow->bdev,
+                .bdev = dm_snap_cow(ps->store->snap)->bdev,
                 .sector = ps->store->chunk_size * chunk,
                 .count = ps->store->chunk_size,
         };
@@ -294,7 +311,8 @@ static int read_header(struct pstore *ps, int *new_snapshot)
          */
         if (!ps->store->chunk_size) {
                 ps->store->chunk_size = max(DM_CHUNK_SIZE_DEFAULT_SECTORS,
-                    bdev_logical_block_size(ps->store->cow->bdev) >> 9);
+                    bdev_logical_block_size(dm_snap_cow(ps->store->snap)->
+                                            bdev) >> 9);
                 ps->store->chunk_mask = ps->store->chunk_size - 1;
                 ps->store->chunk_shift = ffs(ps->store->chunk_size) - 1;
                 chunk_size_supplied = 0;
@@ -408,6 +426,15 @@ static void write_exception(struct pstore *ps,
         e->new_chunk = cpu_to_le64(de->new_chunk);
 }
 
+static void clear_exception(struct pstore *ps, uint32_t index)
+{
+        struct disk_exception *e = get_exception(ps, index);
+
+        /* clear it */
+        e->old_chunk = 0;
+        e->new_chunk = 0;
+}
+
 /*
  * Registers the exceptions that are present in the current area.
  * 'full' is filled in to indicate if the area has been
@@ -489,11 +516,23 @@ static struct pstore *get_info(struct dm_exception_store *store)
         return (struct pstore *) store->context;
 }
 
-static void persistent_fraction_full(struct dm_exception_store *store,
-                                     sector_t *numerator, sector_t *denominator)
+static void persistent_usage(struct dm_exception_store *store,
+                             sector_t *total_sectors,
+                             sector_t *sectors_allocated,
+                             sector_t *metadata_sectors)
 {
-        *numerator = get_info(store)->next_free * store->chunk_size;
-        *denominator = get_dev_size(store->cow->bdev);
+        struct pstore *ps = get_info(store);
+
+        *sectors_allocated = ps->next_free * store->chunk_size;
+        *total_sectors = get_dev_size(dm_snap_cow(store->snap)->bdev);
+
+        /*
+         * First chunk is the fixed header.
+         * Then there are (ps->current_area + 1) metadata chunks, each one
+         * separated from the next by ps->exceptions_per_area data chunks.
+         */
+        *metadata_sectors = (ps->current_area + 1 + NUM_SNAPSHOT_HDR_CHUNKS) *
+                            store->chunk_size;
 }
 
 static void persistent_dtr(struct dm_exception_store *store)
@@ -552,44 +591,40 @@ static int persistent_read_metadata(struct dm_exception_store *store,
                 ps->current_area = 0;
                 zero_memory_area(ps);
                 r = zero_disk_area(ps, 0);
-                if (r) {
+                if (r)
                         DMWARN("zero_disk_area(0) failed");
-                        return r;
-                }
-        } else {
-                /*
-                 * Sanity checks.
-                 */
-                if (ps->version != SNAPSHOT_DISK_VERSION) {
-                        DMWARN("unable to handle snapshot disk version %d",
-                               ps->version);
-                        return -EINVAL;
-                }
+                return r;
+        }
+        /*
+         * Sanity checks.
+         */
+        if (ps->version != SNAPSHOT_DISK_VERSION) {
+                DMWARN("unable to handle snapshot disk version %d",
+                       ps->version);
+                return -EINVAL;
+        }
 
-                /*
-                 * Metadata are valid, but snapshot is invalidated
-                 */
-                if (!ps->valid)
-                        return 1;
+        /*
+         * Metadata are valid, but snapshot is invalidated
+         */
+        if (!ps->valid)
+                return 1;
 
-                /*
-                 * Read the metadata.
-                 */
-                r = read_exceptions(ps, callback, callback_context);
-                if (r)
-                        return r;
-        }
+        /*
+         * Read the metadata.
+         */
+        r = read_exceptions(ps, callback, callback_context);
 
-        return 0;
+        return r;
 }
 
 static int persistent_prepare_exception(struct dm_exception_store *store,
-                                        struct dm_snap_exception *e)
+                                        struct dm_exception *e)
 {
         struct pstore *ps = get_info(store);
         uint32_t stride;
         chunk_t next_free;
-        sector_t size = get_dev_size(store->cow->bdev);
+        sector_t size = get_dev_size(dm_snap_cow(store->snap)->bdev);
 
         /* Is there enough room ? */
         if (size < ((ps->next_free + 1) * store->chunk_size))
@@ -611,7 +646,7 @@ static int persistent_prepare_exception(struct dm_exception_store *store,
 }
 
 static void persistent_commit_exception(struct dm_exception_store *store,
-                                        struct dm_snap_exception *e,
+                                        struct dm_exception *e,
                                         void (*callback) (void *, int success),
                                         void *callback_context)
 {
@@ -672,6 +707,85 @@ static void persistent_commit_exception(struct dm_exception_store *store,
         ps->callback_count = 0;
 }
 
+static int persistent_prepare_merge(struct dm_exception_store *store,
+                                    chunk_t *last_old_chunk,
+                                    chunk_t *last_new_chunk)
+{
+        struct pstore *ps = get_info(store);
+        struct disk_exception de;
+        int nr_consecutive;
+        int r;
+
+        /*
+         * When current area is empty, move back to preceding area.
+         */
+        if (!ps->current_committed) {
+                /*
+                 * Have we finished?
+                 */
+                if (!ps->current_area)
+                        return 0;
+
+                ps->current_area--;
+                r = area_io(ps, READ);
+                if (r < 0)
+                        return r;
+                ps->current_committed = ps->exceptions_per_area;
+        }
+
+        read_exception(ps, ps->current_committed - 1, &de);
+        *last_old_chunk = de.old_chunk;
+        *last_new_chunk = de.new_chunk;
+
+        /*
+         * Find number of consecutive chunks within the current area,
+         * working backwards.
+         */
+        for (nr_consecutive = 1; nr_consecutive < ps->current_committed;
+             nr_consecutive++) {
+                read_exception(ps, ps->current_committed - 1 - nr_consecutive,
+                               &de);
+                if (de.old_chunk != *last_old_chunk - nr_consecutive ||
+                    de.new_chunk != *last_new_chunk - nr_consecutive)
+                        break;
+        }
+
+        return nr_consecutive;
+}
+
+static int persistent_commit_merge(struct dm_exception_store *store,
+                                   int nr_merged)
+{
+        int r, i;
+        struct pstore *ps = get_info(store);
+
+        BUG_ON(nr_merged > ps->current_committed);
+
+        for (i = 0; i < nr_merged; i++)
+                clear_exception(ps, ps->current_committed - 1 - i);
+
+        r = area_io(ps, WRITE);
+        if (r < 0)
+                return r;
+
+        ps->current_committed -= nr_merged;
+
+        /*
+         * At this stage, only persistent_usage() uses ps->next_free, so
+         * we make no attempt to keep ps->next_free strictly accurate
+         * as exceptions may have been committed out-of-order originally.
+         * Once a snapshot has become merging, we set it to the value it
+         * would have held had all the exceptions been committed in order.
+         *
+         * ps->current_area does not get reduced by prepare_merge() until
+         * after commit_merge() has removed the nr_merged previous exceptions.
+         */
+        ps->next_free = (area_location(ps, ps->current_area) - 1) +
+                        (ps->current_committed + 1) + NUM_SNAPSHOT_HDR_CHUNKS;
+
+        return 0;
+}
+
 static void persistent_drop_snapshot(struct dm_exception_store *store)
 {
         struct pstore *ps = get_info(store);
@@ -697,7 +811,7 @@ static int persistent_ctr(struct dm_exception_store *store,
         ps->area = NULL;
         ps->zero_area = NULL;
         ps->header_area = NULL;
-        ps->next_free = 2;      /* skipping the header and first area */
+        ps->next_free = NUM_SNAPSHOT_HDR_CHUNKS + 1; /* header and 1st area */
         ps->current_committed = 0;
 
         ps->callback_count = 0;
@@ -726,8 +840,7 @@ static unsigned persistent_status(struct dm_exception_store *store,
         case STATUSTYPE_INFO:
                 break;
         case STATUSTYPE_TABLE:
-                DMEMIT(" %s P %llu", store->cow->name,
-                       (unsigned long long)store->chunk_size);
+                DMEMIT(" P %llu", (unsigned long long)store->chunk_size);
         }
 
         return sz;
@@ -741,8 +854,10 @@ static struct dm_exception_store_type _persistent_type = {
         .read_metadata = persistent_read_metadata,
         .prepare_exception = persistent_prepare_exception,
         .commit_exception = persistent_commit_exception,
+        .prepare_merge = persistent_prepare_merge,
+        .commit_merge = persistent_commit_merge,
         .drop_snapshot = persistent_drop_snapshot,
-        .fraction_full = persistent_fraction_full,
+        .usage = persistent_usage,
         .status = persistent_status,
 };
 
@@ -754,8 +869,10 @@ static struct dm_exception_store_type _persistent_compat_type = {
         .read_metadata = persistent_read_metadata,
         .prepare_exception = persistent_prepare_exception,
         .commit_exception = persistent_commit_exception,
+        .prepare_merge = persistent_prepare_merge,
+        .commit_merge = persistent_commit_merge,
         .drop_snapshot = persistent_drop_snapshot,
-        .fraction_full = persistent_fraction_full,
+        .usage = persistent_usage,
         .status = persistent_status,
 };
 
diff --git a/drivers/md/dm-snap-transient.c b/drivers/md/dm-snap-transient.c
index cde5aa558e6d..a0898a66a2f8 100644
--- a/drivers/md/dm-snap-transient.c
+++ b/drivers/md/dm-snap-transient.c
@@ -36,10 +36,10 @@ static int transient_read_metadata(struct dm_exception_store *store,
 }
 
 static int transient_prepare_exception(struct dm_exception_store *store,
-                                       struct dm_snap_exception *e)
+                                       struct dm_exception *e)
 {
         struct transient_c *tc = store->context;
-        sector_t size = get_dev_size(store->cow->bdev);
+        sector_t size = get_dev_size(dm_snap_cow(store->snap)->bdev);
 
         if (size < (tc->next_free + store->chunk_size))
                 return -1;
@@ -51,7 +51,7 @@ static int transient_prepare_exception(struct dm_exception_store *store,
 }
 
 static void transient_commit_exception(struct dm_exception_store *store,
-                                       struct dm_snap_exception *e,
+                                       struct dm_exception *e,
                                        void (*callback) (void *, int success),
                                        void *callback_context)
 {
@@ -59,11 +59,14 @@ static void transient_commit_exception(struct dm_exception_store *store,
         callback(callback_context, 1);
 }
 
-static void transient_fraction_full(struct dm_exception_store *store,
-                                    sector_t *numerator, sector_t *denominator)
+static void transient_usage(struct dm_exception_store *store,
+                            sector_t *total_sectors,
+                            sector_t *sectors_allocated,
+                            sector_t *metadata_sectors)
 {
-        *numerator = ((struct transient_c *) store->context)->next_free;
-        *denominator = get_dev_size(store->cow->bdev);
+        *sectors_allocated = ((struct transient_c *) store->context)->next_free;
+        *total_sectors = get_dev_size(dm_snap_cow(store->snap)->bdev);
+        *metadata_sectors = 0;
 }
 
 static int transient_ctr(struct dm_exception_store *store,
@@ -91,8 +94,7 @@ static unsigned transient_status(struct dm_exception_store *store,
         case STATUSTYPE_INFO:
                 break;
         case STATUSTYPE_TABLE:
-                DMEMIT(" %s N %llu", store->cow->name,
-                       (unsigned long long)store->chunk_size);
+                DMEMIT(" N %llu", (unsigned long long)store->chunk_size);
         }
 
         return sz;
@@ -106,7 +108,7 @@ static struct dm_exception_store_type _transient_type = {
         .read_metadata = transient_read_metadata,
         .prepare_exception = transient_prepare_exception,
         .commit_exception = transient_commit_exception,
-        .fraction_full = transient_fraction_full,
+        .usage = transient_usage,
         .status = transient_status,
 };
 
@@ -118,7 +120,7 @@ static struct dm_exception_store_type _transient_compat_type = {
         .read_metadata = transient_read_metadata,
         .prepare_exception = transient_prepare_exception,
         .commit_exception = transient_commit_exception,
-        .fraction_full = transient_fraction_full,
+        .usage = transient_usage,
         .status = transient_status,
 };
 
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 3a3ba46e6d4b..ee8eb283650d 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -25,6 +25,11 @@
 
 #define DM_MSG_PREFIX "snapshots"
 
+static const char dm_snapshot_merge_target_name[] = "snapshot-merge";
+
+#define dm_target_is_snapshot_merge(ti) \
+        ((ti)->type->name == dm_snapshot_merge_target_name)
+
 /*
  * The percentage increment we will wake up users at
  */
@@ -49,7 +54,7 @@
 #define DM_TRACKED_CHUNK_HASH(x)        ((unsigned long)(x) & \
                                          (DM_TRACKED_CHUNK_HASH_SIZE - 1))
 
-struct exception_table {
+struct dm_exception_table {
         uint32_t hash_mask;
         unsigned hash_shift;
         struct list_head *table;
@@ -59,22 +64,31 @@ struct dm_snapshot {
         struct rw_semaphore lock;
 
         struct dm_dev *origin;
+        struct dm_dev *cow;
+
+        struct dm_target *ti;
 
         /* List of snapshots per Origin */
         struct list_head list;
 
-        /* You can't use a snapshot if this is 0 (e.g. if full) */
+        /*
+         * You can't use a snapshot if this is 0 (e.g. if full).
+         * A snapshot-merge target never clears this.
+         */
         int valid;
 
         /* Origin writes don't trigger exceptions until this is set */
         int active;
 
+        /* Whether or not owning mapped_device is suspended */
+        int suspended;
+
         mempool_t *pending_pool;
 
         atomic_t pending_exceptions_count;
 
-        struct exception_table pending;
-        struct exception_table complete;
+        struct dm_exception_table pending;
+        struct dm_exception_table complete;
 
         /*
          * pe_lock protects all pending_exception operations and access
@@ -95,8 +109,51 @@ struct dm_snapshot {
         mempool_t *tracked_chunk_pool;
         spinlock_t tracked_chunk_lock;
         struct hlist_head tracked_chunk_hash[DM_TRACKED_CHUNK_HASH_SIZE];
+
+        /*
+         * The merge operation failed if this flag is set.
+         * Failure modes are handled as follows:
+         * - I/O error reading the header
+         *      => don't load the target; abort.
+         * - Header does not have "valid" flag set
+         *      => use the origin; forget about the snapshot.
+         * - I/O error when reading exceptions
+         *      => don't load the target; abort.
+         *         (We can't use the intermediate origin state.)
+         * - I/O error while merging
+         *      => stop merging; set merge_failed; process I/O normally.
+         */
+        int merge_failed;
+
+        /* Wait for events based on state_bits */
+        unsigned long state_bits;
+
+        /* Range of chunks currently being merged. */
+        chunk_t first_merging_chunk;
+        int num_merging_chunks;
+
+        /*
+         * Incoming bios that overlap with chunks being merged must wait
+         * for them to be committed.
+         */
+        struct bio_list bios_queued_during_merge;
 };
 
+/*
+ * state_bits:
+ *   RUNNING_MERGE  - Merge operation is in progress.
+ *   SHUTDOWN_MERGE - Set to signal that merge needs to be stopped;
+ *                    cleared afterwards.
+ */
+#define RUNNING_MERGE          0
+#define SHUTDOWN_MERGE         1
+
+struct dm_dev *dm_snap_cow(struct dm_snapshot *s)
+{
+        return s->cow;
+}
+EXPORT_SYMBOL(dm_snap_cow);
+
 static struct workqueue_struct *ksnapd;
 static void flush_queued_bios(struct work_struct *work);
 
@@ -116,7 +173,7 @@ static int bdev_equal(struct block_device *lhs, struct block_device *rhs)
 }
 
 struct dm_snap_pending_exception {
-        struct dm_snap_exception e;
+        struct dm_exception e;
 
         /*
          * Origin buffers waiting for this to complete are held
@@ -125,28 +182,6 @@ struct dm_snap_pending_exception {
         struct bio_list origin_bios;
         struct bio_list snapshot_bios;
 
-        /*
-         * Short-term queue of pending exceptions prior to submission.
-         */
-        struct list_head list;
-
-        /*
-         * The primary pending_exception is the one that holds
-         * the ref_count and the list of origin_bios for a
-         * group of pending_exceptions.  It is always last to get freed.
-         * These fields get set up when writing to the origin.
-         */
-        struct dm_snap_pending_exception *primary_pe;
-
-        /*
-         * Number of pending_exceptions processing this chunk.
-         * When this drops to zero we must complete the origin bios.
-         * If incrementing or decrementing this, hold pe->snap->lock for
-         * the sibling concerned and not pe->primary_pe->snap->lock unless
-         * they are the same.
-         */
-        atomic_t ref_count;
-
         /* Pointer back to snapshot context */
         struct dm_snapshot *snap;
 
@@ -222,6 +257,16 @@ static int __chunk_is_tracked(struct dm_snapshot *s, chunk_t chunk)
 }
 
 /*
+ * This conflicting I/O is extremely improbable in the caller,
+ * so msleep(1) is sufficient and there is no need for a wait queue.
+ */
+static void __check_for_conflicting_io(struct dm_snapshot *s, chunk_t chunk)
+{
+        while (__chunk_is_tracked(s, chunk))
+                msleep(1);
+}
+
+/*
  * One of these per registered origin, held in the snapshot_origins hash
  */
 struct origin {
@@ -243,6 +288,10 @@ struct origin {
 static struct list_head *_origins;
 static struct rw_semaphore _origins_lock;
 
+static DECLARE_WAIT_QUEUE_HEAD(_pending_exceptions_done);
+static DEFINE_SPINLOCK(_pending_exceptions_done_spinlock);
+static uint64_t _pending_exceptions_done_count;
+
 static int init_origin_hash(void)
 {
         int i;
@@ -291,22 +340,144 @@ static void __insert_origin(struct origin *o)
 }
 
 /*
+ * _origins_lock must be held when calling this function.
+ * Returns number of snapshots registered using the supplied cow device, plus:
+ * snap_src - a snapshot suitable for use as a source of exception handover
+ * snap_dest - a snapshot capable of receiving exception handover.
+ * snap_merge - an existing snapshot-merge target linked to the same origin.
+ *   There can be at most one snapshot-merge target. The parameter is optional.
+ *
+ * Possible return values and states of snap_src and snap_dest.
+ *   0: NULL, NULL  - first new snapshot
+ *   1: snap_src, NULL - normal snapshot
+ *   2: snap_src, snap_dest  - waiting for handover
+ *   2: snap_src, NULL - handed over, waiting for old to be deleted
+ *   1: NULL, snap_dest - source got destroyed without handover
+ */
+static int __find_snapshots_sharing_cow(struct dm_snapshot *snap,
+                                        struct dm_snapshot **snap_src,
+                                        struct dm_snapshot **snap_dest,
+                                        struct dm_snapshot **snap_merge)
+{
+        struct dm_snapshot *s;
+        struct origin *o;
+        int count = 0;
+        int active;
+
+        o = __lookup_origin(snap->origin->bdev);
+        if (!o)
+                goto out;
+
+        list_for_each_entry(s, &o->snapshots, list) {
+                if (dm_target_is_snapshot_merge(s->ti) && snap_merge)
+                        *snap_merge = s;
+                if (!bdev_equal(s->cow->bdev, snap->cow->bdev))
+                        continue;
+
+                down_read(&s->lock);
+                active = s->active;
+                up_read(&s->lock);
+
+                if (active) {
+                        if (snap_src)
+                                *snap_src = s;
+                } else if (snap_dest)
+                        *snap_dest = s;
+
+                count++;
+        }
+
+out:
+        return count;
+}
+
+/*
+ * On success, returns 1 if this snapshot is a handover destination,
+ * otherwise returns 0.
+ */
+static int __validate_exception_handover(struct dm_snapshot *snap)
+{
+        struct dm_snapshot *snap_src = NULL, *snap_dest = NULL;
+        struct dm_snapshot *snap_merge = NULL;
+
+        /* Does snapshot need exceptions handed over to it? */
+        if ((__find_snapshots_sharing_cow(snap, &snap_src, &snap_dest,
+                                          &snap_merge) == 2) ||
+            snap_dest) {
+                snap->ti->error = "Snapshot cow pairing for exception "
+                                  "table handover failed";
+                return -EINVAL;
+        }
+
+        /*
+         * If no snap_src was found, snap cannot become a handover
+         * destination.
+         */
+        if (!snap_src)
+                return 0;
+
+        /*
+         * Non-snapshot-merge handover?
+         */
+        if (!dm_target_is_snapshot_merge(snap->ti))
+                return 1;
+
+        /*
+         * Do not allow more than one merging snapshot.
+         */
+        if (snap_merge) {
+                snap->ti->error = "A snapshot is already merging.";
+                return -EINVAL;
+        }
+
+        if (!snap_src->store->type->prepare_merge ||
+            !snap_src->store->type->commit_merge) {
+                snap->ti->error = "Snapshot exception store does not "
+                                  "support snapshot-merge.";
+                return -EINVAL;
+        }
+
+        return 1;
+}
+
+static void __insert_snapshot(struct origin *o, struct dm_snapshot *s)
+{
+        struct dm_snapshot *l;
+
+        /* Sort the list according to chunk size, largest-first smallest-last */
+        list_for_each_entry(l, &o->snapshots, list)
+                if (l->store->chunk_size < s->store->chunk_size)
+                        break;
+        list_add_tail(&s->list, &l->list);
+}
+
+/*
  * Make a note of the snapshot and its origin so we can look it
  * up when the origin has a write on it.
+ *
+ * Also validate snapshot exception store handovers.
+ * On success, returns 1 if this registration is a handover destination,
+ * otherwise returns 0.
  */
 static int register_snapshot(struct dm_snapshot *snap)
 {
-        struct dm_snapshot *l;
-        struct origin *o, *new_o;
+        struct origin *o, *new_o = NULL;
         struct block_device *bdev = snap->origin->bdev;
+        int r = 0;
 
         new_o = kmalloc(sizeof(*new_o), GFP_KERNEL);
         if (!new_o)
                 return -ENOMEM;
 
         down_write(&_origins_lock);
-        o = __lookup_origin(bdev);
 
+        r = __validate_exception_handover(snap);
+        if (r < 0) {
+                kfree(new_o);
+                goto out;
+        }
+
+        o = __lookup_origin(bdev);
         if (o)
                 kfree(new_o);
         else {
@@ -320,14 +491,27 @@ static int register_snapshot(struct dm_snapshot *snap)
                 __insert_origin(o);
         }
 
-        /* Sort the list according to chunk size, largest-first smallest-last */
-        list_for_each_entry(l, &o->snapshots, list)
-                if (l->store->chunk_size < snap->store->chunk_size)
-                        break;
-        list_add_tail(&snap->list, &l->list);
+        __insert_snapshot(o, snap);
+
+out:
+        up_write(&_origins_lock);
+
+        return r;
+}
+
+/*
+ * Move snapshot to correct place in list according to chunk size.
+ */
+static void reregister_snapshot(struct dm_snapshot *s)
+{
+        struct block_device *bdev = s->origin->bdev;
+
+        down_write(&_origins_lock);
+
+        list_del(&s->list);
+        __insert_snapshot(__lookup_origin(bdev), s);
 
         up_write(&_origins_lock);
-        return 0;
 }
 
 static void unregister_snapshot(struct dm_snapshot *s)
@@ -338,7 +522,7 @@ static void unregister_snapshot(struct dm_snapshot *s)
         o = __lookup_origin(s->origin->bdev);
 
         list_del(&s->list);
-        if (list_empty(&o->snapshots)) {
+        if (o && list_empty(&o->snapshots)) {
                 list_del(&o->hash_list);
                 kfree(o);
         }
@@ -351,8 +535,8 @@ static void unregister_snapshot(struct dm_snapshot *s)
  * The lowest hash_shift bits of the chunk number are ignored, allowing
  * some consecutive chunks to be grouped together.
  */
-static int init_exception_table(struct exception_table *et, uint32_t size,
-                                unsigned hash_shift)
+static int dm_exception_table_init(struct dm_exception_table *et,
+                                   uint32_t size, unsigned hash_shift)
 {
         unsigned int i;
 
@@ -368,10 +552,11 @@ static int init_exception_table(struct exception_table *et, uint32_t size,
         return 0;
 }
 
-static void exit_exception_table(struct exception_table *et, struct kmem_cache *mem)
+static void dm_exception_table_exit(struct dm_exception_table *et,
+                                    struct kmem_cache *mem)
 {
         struct list_head *slot;
-        struct dm_snap_exception *ex, *next;
+        struct dm_exception *ex, *next;
         int i, size;
 
         size = et->hash_mask + 1;
@@ -385,19 +570,12 @@ static void exit_exception_table(struct exception_table *et, struct kmem_cache *
         vfree(et->table);
 }
 
-static uint32_t exception_hash(struct exception_table *et, chunk_t chunk)
+static uint32_t exception_hash(struct dm_exception_table *et, chunk_t chunk)
 {
         return (chunk >> et->hash_shift) & et->hash_mask;
 }
 
-static void insert_exception(struct exception_table *eh,
-                             struct dm_snap_exception *e)
-{
-        struct list_head *l = &eh->table[exception_hash(eh, e->old_chunk)];
-        list_add(&e->hash_list, l);
-}
-
-static void remove_exception(struct dm_snap_exception *e)
+static void dm_remove_exception(struct dm_exception *e)
 {
         list_del(&e->hash_list);
 }
@@ -406,11 +584,11 @@ static void remove_exception(struct dm_snap_exception *e)
  * Return the exception data for a sector, or NULL if not
  * remapped.
  */
-static struct dm_snap_exception *lookup_exception(struct exception_table *et,
-                                                  chunk_t chunk)
+static struct dm_exception *dm_lookup_exception(struct dm_exception_table *et,
+                                                chunk_t chunk)
 {
         struct list_head *slot;
-        struct dm_snap_exception *e;
+        struct dm_exception *e;
 
         slot = &et->table[exception_hash(et, chunk)];
         list_for_each_entry (e, slot, hash_list)
@@ -421,9 +599,9 @@ static struct dm_snap_exception *lookup_exception(struct exception_table *et,
         return NULL;
 }
 
-static struct dm_snap_exception *alloc_exception(void)
+static struct dm_exception *alloc_completed_exception(void)
 {
-        struct dm_snap_exception *e;
+        struct dm_exception *e;
 
         e = kmem_cache_alloc(exception_cache, GFP_NOIO);
         if (!e)
@@ -432,7 +610,7 @@ static struct dm_snap_exception *alloc_exception(void)
         return e;
 }
 
-static void free_exception(struct dm_snap_exception *e)
+static void free_completed_exception(struct dm_exception *e)
 {
         kmem_cache_free(exception_cache, e);
 }
@@ -457,12 +635,11 @@ static void free_pending_exception(struct dm_snap_pending_exception *pe)
         atomic_dec(&s->pending_exceptions_count);
 }
 
-static void insert_completed_exception(struct dm_snapshot *s,
-                                       struct dm_snap_exception *new_e)
+static void dm_insert_exception(struct dm_exception_table *eh,
+                                struct dm_exception *new_e)
 {
-        struct exception_table *eh = &s->complete;
         struct list_head *l;
-        struct dm_snap_exception *e = NULL;
+        struct dm_exception *e = NULL;
 
         l = &eh->table[exception_hash(eh, new_e->old_chunk)];
 
@@ -478,7 +655,7 @@ static void insert_completed_exception(struct dm_snapshot *s,
                     new_e->new_chunk == (dm_chunk_number(e->new_chunk) +
                                          dm_consecutive_chunk_count(e) + 1)) {
                         dm_consecutive_chunk_count_inc(e);
-                        free_exception(new_e);
+                        free_completed_exception(new_e);
                         return;
                 }
 
@@ -488,7 +665,7 @@ static void insert_completed_exception(struct dm_snapshot *s,
                         dm_consecutive_chunk_count_inc(e);
                         e->old_chunk--;
                         e->new_chunk--;
-                        free_exception(new_e);
+                        free_completed_exception(new_e);
                         return;
                 }
 
@@ -507,9 +684,9 @@ out:
 static int dm_add_exception(void *context, chunk_t old, chunk_t new)
 {
         struct dm_snapshot *s = context;
-        struct dm_snap_exception *e;
+        struct dm_exception *e;
 
-        e = alloc_exception();
+        e = alloc_completed_exception();
         if (!e)
                 return -ENOMEM;
 
@@ -518,11 +695,30 @@ static int dm_add_exception(void *context, chunk_t old, chunk_t new)
         /* Consecutive_count is implicitly initialised to zero */
         e->new_chunk = new;
 
-        insert_completed_exception(s, e);
+        dm_insert_exception(&s->complete, e);
 
         return 0;
 }
 
+#define min_not_zero(l, r) (((l) == 0) ? (r) : (((r) == 0) ? (l) : min(l, r)))
+
+/*
+ * Return a minimum chunk size of all snapshots that have the specified origin.
+ * Return zero if the origin has no snapshots.
+ */
+static sector_t __minimum_chunk_size(struct origin *o)
+{
+        struct dm_snapshot *snap;
+        unsigned chunk_size = 0;
+
+        if (o)
+                list_for_each_entry(snap, &o->snapshots, list)
+                        chunk_size = min_not_zero(chunk_size,
+                                                  snap->store->chunk_size);
+
+        return chunk_size;
+}
+
 /*
  * Hard coded magic.
  */
@@ -546,16 +742,18 @@ static int init_hash_tables(struct dm_snapshot *s)
          * Calculate based on the size of the original volume or
          * the COW volume...
          */
-        cow_dev_size = get_dev_size(s->store->cow->bdev);
+        cow_dev_size = get_dev_size(s->cow->bdev);
         origin_dev_size = get_dev_size(s->origin->bdev);
         max_buckets = calc_max_buckets();
 
         hash_size = min(origin_dev_size, cow_dev_size) >> s->store->chunk_shift;
         hash_size = min(hash_size, max_buckets);
 
+        if (hash_size < 64)
+                hash_size = 64;
         hash_size = rounddown_pow_of_two(hash_size);
-        if (init_exception_table(&s->complete, hash_size,
-                                 DM_CHUNK_CONSECUTIVE_BITS))
+        if (dm_exception_table_init(&s->complete, hash_size,
+                                    DM_CHUNK_CONSECUTIVE_BITS))
                 return -ENOMEM;
 
         /*
@@ -566,14 +764,284 @@ static int init_hash_tables(struct dm_snapshot *s)
         if (hash_size < 64)
                 hash_size = 64;
 
-        if (init_exception_table(&s->pending, hash_size, 0)) {
-                exit_exception_table(&s->complete, exception_cache);
+        if (dm_exception_table_init(&s->pending, hash_size, 0)) {
+                dm_exception_table_exit(&s->complete, exception_cache);
                 return -ENOMEM;
         }
 
         return 0;
 }
 
+static void merge_shutdown(struct dm_snapshot *s)
+{
+        clear_bit_unlock(RUNNING_MERGE, &s->state_bits);
+        smp_mb__after_clear_bit();
+        wake_up_bit(&s->state_bits, RUNNING_MERGE);
+}
+
+static struct bio *__release_queued_bios_after_merge(struct dm_snapshot *s)
+{
+        s->first_merging_chunk = 0;
+        s->num_merging_chunks = 0;
+
+        return bio_list_get(&s->bios_queued_during_merge);
+}
+
+/*
+ * Remove one chunk from the index of completed exceptions.
+ */
+static int __remove_single_exception_chunk(struct dm_snapshot *s,
+                                           chunk_t old_chunk)
+{
+        struct dm_exception *e;
+
+        e = dm_lookup_exception(&s->complete, old_chunk);
+        if (!e) {
+                DMERR("Corruption detected: exception for block %llu is "
+                      "on disk but not in memory",
+                      (unsigned long long)old_chunk);
+                return -EINVAL;
+        }
+
+        /*
+         * If this is the only chunk using this exception, remove exception.
+         */
+        if (!dm_consecutive_chunk_count(e)) {
+                dm_remove_exception(e);
+                free_completed_exception(e);
+                return 0;
+        }
+
+        /*
+         * The chunk may be either at the beginning or the end of a
+         * group of consecutive chunks - never in the middle.  We are
+         * removing chunks in the opposite order to that in which they
+         * were added, so this should always be true.
+         * Decrement the consecutive chunk counter and adjust the
+         * starting point if necessary.
+         */
+        if (old_chunk == e->old_chunk) {
+                e->old_chunk++;
+                e->new_chunk++;
+        } else if (old_chunk != e->old_chunk +
+                   dm_consecutive_chunk_count(e)) {
+                DMERR("Attempt to merge block %llu from the "
+                      "middle of a chunk range [%llu - %llu]",
+                      (unsigned long long)old_chunk,
+                      (unsigned long long)e->old_chunk,
+                      (unsigned long long)
+                      e->old_chunk + dm_consecutive_chunk_count(e));
+                return -EINVAL;
+        }
+
+        dm_consecutive_chunk_count_dec(e);
+
+        return 0;
+}
+
+static void flush_bios(struct bio *bio);
+
+static int remove_single_exception_chunk(struct dm_snapshot *s)
+{
+        struct bio *b = NULL;
+        int r;
+        chunk_t old_chunk = s->first_merging_chunk + s->num_merging_chunks - 1;
+
+        down_write(&s->lock);
+
+        /*
+         * Process chunks (and associated exceptions) in reverse order
+         * so that dm_consecutive_chunk_count_dec() accounting works.
+         */
+        do {
+                r = __remove_single_exception_chunk(s, old_chunk);
+                if (r)
+                        goto out;
+        } while (old_chunk-- > s->first_merging_chunk);
+
+        b = __release_queued_bios_after_merge(s);
+
+out:
+        up_write(&s->lock);
+        if (b)
+                flush_bios(b);
+
+        return r;
+}
+
+static int origin_write_extent(struct dm_snapshot *merging_snap,
+                               sector_t sector, unsigned chunk_size);
+
+static void merge_callback(int read_err, unsigned long write_err,
+                           void *context);
+
+static uint64_t read_pending_exceptions_done_count(void)
+{
+        uint64_t pending_exceptions_done;
+
+        spin_lock(&_pending_exceptions_done_spinlock);
+        pending_exceptions_done = _pending_exceptions_done_count;
+        spin_unlock(&_pending_exceptions_done_spinlock);
+
+        return pending_exceptions_done;
+}
+
+static void increment_pending_exceptions_done_count(void)
+{
+        spin_lock(&_pending_exceptions_done_spinlock);
+        _pending_exceptions_done_count++;
+        spin_unlock(&_pending_exceptions_done_spinlock);
+
+        wake_up_all(&_pending_exceptions_done);
+}
+
+static void snapshot_merge_next_chunks(struct dm_snapshot *s)
+{
+        int i, linear_chunks;
+        chunk_t old_chunk, new_chunk;
+        struct dm_io_region src, dest;
+        sector_t io_size;
+        uint64_t previous_count;
+
+        BUG_ON(!test_bit(RUNNING_MERGE, &s->state_bits));
+        if (unlikely(test_bit(SHUTDOWN_MERGE, &s->state_bits)))
+                goto shut;
+
+        /*
+         * valid flag never changes during merge, so no lock required.
+         */
+        if (!s->valid) {
+                DMERR("Snapshot is invalid: can't merge");
+                goto shut;
+        }
+
+        linear_chunks = s->store->type->prepare_merge(s->store, &old_chunk,
+                                                      &new_chunk);
+        if (linear_chunks <= 0) {
+                if (linear_chunks < 0) {
+                        DMERR("Read error in exception store: "
+                              "shutting down merge");
+                        down_write(&s->lock);
+                        s->merge_failed = 1;
+                        up_write(&s->lock);
+                }
+                goto shut;
+        }
+
+        /* Adjust old_chunk and new_chunk to reflect start of linear region */
+        old_chunk = old_chunk + 1 - linear_chunks;
+        new_chunk = new_chunk + 1 - linear_chunks;
+
+        /*
+         * Use one (potentially large) I/O to copy all 'linear_chunks'
+         * from the exception store to the origin
+         */
+        io_size = linear_chunks * s->store->chunk_size;
+
+        dest.bdev = s->origin->bdev;
+        dest.sector = chunk_to_sector(s->store, old_chunk);
+        dest.count = min(io_size, get_dev_size(dest.bdev) - dest.sector);
+
+        src.bdev = s->cow->bdev;
+        src.sector = chunk_to_sector(s->store, new_chunk);
+        src.count = dest.count;
+
+        /*
+         * Reallocate any exceptions needed in other snapshots then
+         * wait for the pending exceptions to complete.
+         * Each time any pending exception (globally on the system)
+         * completes we are woken and repeat the process to find out
+         * if we can proceed.  While this may not seem a particularly
+         * efficient algorithm, it is not expected to have any
+         * significant impact on performance.
+         */
+        previous_count = read_pending_exceptions_done_count();
+        while (origin_write_extent(s, dest.sector, io_size)) {
+                wait_event(_pending_exceptions_done,
+                           (read_pending_exceptions_done_count() !=
+                            previous_count));
+                /* Retry after the wait, until all exceptions are done. */
+                previous_count = read_pending_exceptions_done_count();
+        }
+
+        down_write(&s->lock);
+        s->first_merging_chunk = old_chunk;
+        s->num_merging_chunks = linear_chunks;
+        up_write(&s->lock);
+
+        /* Wait until writes to all 'linear_chunks' drain */
+        for (i = 0; i < linear_chunks; i++)
+                __check_for_conflicting_io(s, old_chunk + i);
+
+        dm_kcopyd_copy(s->kcopyd_client, &src, 1, &dest, 0, merge_callback, s);
+        return;
+
+shut:
+        merge_shutdown(s);
+}
+
+static void error_bios(struct bio *bio);
+
+static void merge_callback(int read_err, unsigned long write_err, void *context)
+{
+        struct dm_snapshot *s = context;
+        struct bio *b = NULL;
+
+        if (read_err || write_err) {
+                if (read_err)
+                        DMERR("Read error: shutting down merge.");
+                else
+                        DMERR("Write error: shutting down merge.");
+                goto shut;
+        }
+
+        if (s->store->type->commit_merge(s->store,
+                                         s->num_merging_chunks) < 0) {
+                DMERR("Write error in exception store: shutting down merge");
+                goto shut;
+        }
+
+        if (remove_single_exception_chunk(s) < 0)
+                goto shut;
+
+        snapshot_merge_next_chunks(s);
+
+        return;
+
+shut:
+        down_write(&s->lock);
+        s->merge_failed = 1;
+        b = __release_queued_bios_after_merge(s);
+        up_write(&s->lock);
+        error_bios(b);
+
+        merge_shutdown(s);
+}
+
+static void start_merge(struct dm_snapshot *s)
+{
+        if (!test_and_set_bit(RUNNING_MERGE, &s->state_bits))
+                snapshot_merge_next_chunks(s);
+}
+
+static int wait_schedule(void *ptr)
+{
+        schedule();
+
+        return 0;
+}
+
+/*
+ * Stop the merging process and wait until it finishes.
+ */
+static void stop_merge(struct dm_snapshot *s)
+{
+        set_bit(SHUTDOWN_MERGE, &s->state_bits);
+        wait_on_bit(&s->state_bits, RUNNING_MERGE, wait_schedule,
+                    TASK_UNINTERRUPTIBLE);
+        clear_bit(SHUTDOWN_MERGE, &s->state_bits);
+}
+
 /*
  * Construct a snapshot mapping: <origin_dev> <COW-dev> <p/n> <chunk-size>
  */
@@ -582,50 +1050,73 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         struct dm_snapshot *s;
         int i;
         int r = -EINVAL;
-        char *origin_path;
-        struct dm_exception_store *store;
-        unsigned args_used;
+        char *origin_path, *cow_path;
+        unsigned args_used, num_flush_requests = 1;
+        fmode_t origin_mode = FMODE_READ;
 
         if (argc != 4) {
                 ti->error = "requires exactly 4 arguments";
                 r = -EINVAL;
-                goto bad_args;
+                goto bad;
+        }
+
+        if (dm_target_is_snapshot_merge(ti)) {
+                num_flush_requests = 2;
+                origin_mode = FMODE_WRITE;
         }
 
         origin_path = argv[0];
         argv++;
         argc--;
 
-        r = dm_exception_store_create(ti, argc, argv, &args_used, &store);
+        s = kmalloc(sizeof(*s), GFP_KERNEL);
+        if (!s) {
+                ti->error = "Cannot allocate snapshot context private "
+                    "structure";
+                r = -ENOMEM;
+                goto bad;
+        }
+
+        cow_path = argv[0];
+        argv++;
+        argc--;
+
+        r = dm_get_device(ti, cow_path, 0, 0,
+                          FMODE_READ | FMODE_WRITE, &s->cow);
+        if (r) {
+                ti->error = "Cannot get COW device";
+                goto bad_cow;
+        }
+
+        r = dm_exception_store_create(ti, argc, argv, s, &args_used, &s->store);
         if (r) {
                 ti->error = "Couldn't create exception store";
                 r = -EINVAL;
-                goto bad_args;
+                goto bad_store;
         }
 
         argv += args_used;
         argc -= args_used;
 
-        s = kmalloc(sizeof(*s), GFP_KERNEL);
-        if (!s) {
-                ti->error = "Cannot allocate snapshot context private "
-                    "structure";
-                r = -ENOMEM;
-                goto bad_snap;
-        }
-
-        r = dm_get_device(ti, origin_path, 0, ti->len, FMODE_READ, &s->origin);
+        r = dm_get_device(ti, origin_path, 0, ti->len, origin_mode, &s->origin);
         if (r) {
                 ti->error = "Cannot get origin device";
                 goto bad_origin;
         }
 
-        s->store = store;
+        s->ti = ti;
         s->valid = 1;
         s->active = 0;
+        s->suspended = 0;
         atomic_set(&s->pending_exceptions_count, 0);
         init_rwsem(&s->lock);
+        INIT_LIST_HEAD(&s->list);
         spin_lock_init(&s->pe_lock);
+        s->state_bits = 0;
+        s->merge_failed = 0;
+        s->first_merging_chunk = 0;
+        s->num_merging_chunks = 0;
+        bio_list_init(&s->bios_queued_during_merge);
 
         /* Allocate hash table for COW data */
         if (init_hash_tables(s)) {
@@ -659,39 +1150,55 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         spin_lock_init(&s->tracked_chunk_lock);
 
-        /* Metadata must only be loaded into one table at once */
+        bio_list_init(&s->queued_bios);
+        INIT_WORK(&s->queued_bios_work, flush_queued_bios);
+
+        ti->private = s;
+        ti->num_flush_requests = num_flush_requests;
+
+        /* Add snapshot to the list of snapshots for this origin */
+        /* Exceptions aren't triggered till snapshot_resume() is called */
+        r = register_snapshot(s);
+        if (r == -ENOMEM) {
+                ti->error = "Snapshot origin struct allocation failed";
+                goto bad_load_and_register;
+        } else if (r < 0) {
+                /* invalid handover, register_snapshot has set ti->error */
+                goto bad_load_and_register;
+        }
+
+        /*
+         * Metadata must only be loaded into one table at once, so skip this
+         * if metadata will be handed over during resume.
+         * Chunk size will be set during the handover - set it to zero to
+         * ensure it's ignored.
+         */
+        if (r > 0) {
+                s->store->chunk_size = 0;
+                return 0;
+        }
+
         r = s->store->type->read_metadata(s->store, dm_add_exception,
                                           (void *)s);
         if (r < 0) {
                 ti->error = "Failed to read snapshot metadata";
-                goto bad_load_and_register;
+                goto bad_read_metadata;
         } else if (r > 0) {
                 s->valid = 0;
                 DMWARN("Snapshot is marked invalid.");
         }
 
-        bio_list_init(&s->queued_bios);
-        INIT_WORK(&s->queued_bios_work, flush_queued_bios);
-
         if (!s->store->chunk_size) {
                 ti->error = "Chunk size not set";
-                goto bad_load_and_register;
-        }
-
-        /* Add snapshot to the list of snapshots for this origin */
-        /* Exceptions aren't triggered till snapshot_resume() is called */
-        if (register_snapshot(s)) {
-                r = -EINVAL;
-                ti->error = "Cannot register snapshot origin";
-                goto bad_load_and_register;
+                goto bad_read_metadata;
         }
-
-        ti->private = s;
         ti->split_io = s->store->chunk_size;
-        ti->num_flush_requests = 1;
 
         return 0;
 
+bad_read_metadata:
+        unregister_snapshot(s);
+
 bad_load_and_register:
         mempool_destroy(s->tracked_chunk_pool);
 
@@ -702,19 +1209,22 @@ bad_pending_pool:
         dm_kcopyd_client_destroy(s->kcopyd_client);
 
 bad_kcopyd:
-        exit_exception_table(&s->pending, pending_cache);
-        exit_exception_table(&s->complete, exception_cache);
+        dm_exception_table_exit(&s->pending, pending_cache);
+        dm_exception_table_exit(&s->complete, exception_cache);
 
 bad_hash_tables:
         dm_put_device(ti, s->origin);
 
 bad_origin:
-        kfree(s);
+        dm_exception_store_destroy(s->store);
 
-bad_snap:
-        dm_exception_store_destroy(store);
+bad_store:
+        dm_put_device(ti, s->cow);
+
+bad_cow:
+        kfree(s);
 
-bad_args:
+bad:
         return r;
 }
 
@@ -723,8 +1233,39 @@ static void __free_exceptions(struct dm_snapshot *s)
         dm_kcopyd_client_destroy(s->kcopyd_client);
         s->kcopyd_client = NULL;
 
-        exit_exception_table(&s->pending, pending_cache);
-        exit_exception_table(&s->complete, exception_cache);
+        dm_exception_table_exit(&s->pending, pending_cache);
+        dm_exception_table_exit(&s->complete, exception_cache);
+}
+
+static void __handover_exceptions(struct dm_snapshot *snap_src,
+                                  struct dm_snapshot *snap_dest)
+{
+        union {
+                struct dm_exception_table table_swap;
+                struct dm_exception_store *store_swap;
+        } u;
+
+        /*
+         * Swap all snapshot context information between the two instances.
+         */
+        u.table_swap = snap_dest->complete;
+        snap_dest->complete = snap_src->complete;
+        snap_src->complete = u.table_swap;
+
+        u.store_swap = snap_dest->store;
+        snap_dest->store = snap_src->store;
+        snap_src->store = u.store_swap;
+
+        snap_dest->store->snap = snap_dest;
+        snap_src->store->snap = snap_src;
+
+        snap_dest->ti->split_io = snap_dest->store->chunk_size;
+        snap_dest->valid = snap_src->valid;
+
+        /*
+         * Set source invalid to ensure it receives no further I/O.
+         */
+        snap_src->valid = 0;
 }
 
 static void snapshot_dtr(struct dm_target *ti)
@@ -733,9 +1274,24 @@ static void snapshot_dtr(struct dm_target *ti)
         int i;
 #endif
         struct dm_snapshot *s = ti->private;
+        struct dm_snapshot *snap_src = NULL, *snap_dest = NULL;
 
         flush_workqueue(ksnapd);
 
+        down_read(&_origins_lock);
+        /* Check whether exception handover must be cancelled */
+        (void) __find_snapshots_sharing_cow(s, &snap_src, &snap_dest, NULL);
+        if (snap_src && snap_dest && (s == snap_src)) {
+                down_write(&snap_dest->lock);
+                snap_dest->valid = 0;
+                up_write(&snap_dest->lock);
+                DMERR("Cancelling snapshot handover.");
+        }
+        up_read(&_origins_lock);
+
+        if (dm_target_is_snapshot_merge(ti))
+                stop_merge(s);
+
         /* Prevent further origin writes from using this snapshot. */
         /* After this returns there can be no new kcopyd jobs. */
         unregister_snapshot(s);
@@ -763,6 +1319,8 @@ static void snapshot_dtr(struct dm_target *ti)
 
         dm_exception_store_destroy(s->store);
 
+        dm_put_device(ti, s->cow);
+
         kfree(s);
 }
 
@@ -795,6 +1353,26 @@ static void flush_queued_bios(struct work_struct *work)
         flush_bios(queued_bios);
 }
 
+static int do_origin(struct dm_dev *origin, struct bio *bio);
+
+/*
+ * Flush a list of buffers.
+ */
+static void retry_origin_bios(struct dm_snapshot *s, struct bio *bio)
+{
+        struct bio *n;
+        int r;
+
+        while (bio) {
+                n = bio->bi_next;
+                bio->bi_next = NULL;
+                r = do_origin(s->origin, bio);
+                if (r == DM_MAPIO_REMAPPED)
+                        generic_make_request(bio);
+                bio = n;
+        }
+}
+
 /*
  * Error a list of buffers.
  */
@@ -825,45 +1403,12 @@ static void __invalidate_snapshot(struct dm_snapshot *s, int err)
 
         s->valid = 0;
 
-        dm_table_event(s->store->ti->table);
-}
-
-static void get_pending_exception(struct dm_snap_pending_exception *pe)
-{
-        atomic_inc(&pe->ref_count);
-}
-
-static struct bio *put_pending_exception(struct dm_snap_pending_exception *pe)
-{
-        struct dm_snap_pending_exception *primary_pe;
-        struct bio *origin_bios = NULL;
-
-        primary_pe = pe->primary_pe;
-
-        /*
-         * If this pe is involved in a write to the origin and
-         * it is the last sibling to complete then release
-         * the bios for the original write to the origin.
-         */
-        if (primary_pe &&
-            atomic_dec_and_test(&primary_pe->ref_count)) {
-                origin_bios = bio_list_get(&primary_pe->origin_bios);
-                free_pending_exception(primary_pe);
-        }
-
-        /*
-         * Free the pe if it's not linked to an origin write or if
-         * it's not itself a primary pe.
-         */
-        if (!primary_pe || primary_pe != pe)
-                free_pending_exception(pe);
-
-        return origin_bios;
+        dm_table_event(s->ti->table);
 }
 
 static void pending_complete(struct dm_snap_pending_exception *pe, int success)
 {
-        struct dm_snap_exception *e;
+        struct dm_exception *e;
         struct dm_snapshot *s = pe->snap;
         struct bio *origin_bios = NULL;
         struct bio *snapshot_bios = NULL;
@@ -877,7 +1422,7 @@ static void pending_complete(struct dm_snap_pending_exception *pe, int success)
                 goto out;
         }
 
-        e = alloc_exception();
+        e = alloc_completed_exception();
         if (!e) {
                 down_write(&s->lock);
                 __invalidate_snapshot(s, -ENOMEM);
@@ -888,28 +1433,27 @@ static void pending_complete(struct dm_snap_pending_exception *pe, int success)
 
         down_write(&s->lock);
         if (!s->valid) {
-                free_exception(e);
+                free_completed_exception(e);
                 error = 1;
                 goto out;
         }
 
-        /*
-         * Check for conflicting reads. This is extremely improbable,
-         * so msleep(1) is sufficient and there is no need for a wait queue.
-         */
-        while (__chunk_is_tracked(s, pe->e.old_chunk))
-                msleep(1);
+        /* Check for conflicting reads */
+        __check_for_conflicting_io(s, pe->e.old_chunk);
 
         /*
          * Add a proper exception, and remove the
          * in-flight exception from the list.
          */
-        insert_completed_exception(s, e);
+        dm_insert_exception(&s->complete, e);
 
  out:
-        remove_exception(&pe->e);
+        dm_remove_exception(&pe->e);
         snapshot_bios = bio_list_get(&pe->snapshot_bios);
-        origin_bios = put_pending_exception(pe);
+        origin_bios = bio_list_get(&pe->origin_bios);
+        free_pending_exception(pe);
+
+        increment_pending_exceptions_done_count();
 
         up_write(&s->lock);
 
@@ -919,7 +1463,7 @@ static void pending_complete(struct dm_snap_pending_exception *pe, int success)
         else
                 flush_bios(snapshot_bios);
 
-        flush_bios(origin_bios);
+        retry_origin_bios(s, origin_bios);
 }
 
 static void commit_callback(void *context, int success)
@@ -963,7 +1507,7 @@ static void start_copy(struct dm_snap_pending_exception *pe)
         src.sector = chunk_to_sector(s->store, pe->e.old_chunk);
         src.count = min((sector_t)s->store->chunk_size, dev_size - src.sector);
 
-        dest.bdev = s->store->cow->bdev;
+        dest.bdev = s->cow->bdev;
         dest.sector = chunk_to_sector(s->store, pe->e.new_chunk);
         dest.count = src.count;
 
@@ -975,7 +1519,7 @@ static void start_copy(struct dm_snap_pending_exception *pe)
 static struct dm_snap_pending_exception *
 __lookup_pending_exception(struct dm_snapshot *s, chunk_t chunk)
 {
-        struct dm_snap_exception *e = lookup_exception(&s->pending, chunk);
+        struct dm_exception *e = dm_lookup_exception(&s->pending, chunk);
 
         if (!e)
                 return NULL;
@@ -1006,8 +1550,6 @@ __find_pending_exception(struct dm_snapshot *s,
         pe->e.old_chunk = chunk;
         bio_list_init(&pe->origin_bios);
         bio_list_init(&pe->snapshot_bios);
-        pe->primary_pe = NULL;
-        atomic_set(&pe->ref_count, 0);
         pe->started = 0;
 
         if (s->store->type->prepare_exception(s->store, &pe->e)) {
@@ -1015,16 +1557,15 @@ __find_pending_exception(struct dm_snapshot *s,
                 return NULL;
         }
 
-        get_pending_exception(pe);
-        insert_exception(&s->pending, &pe->e);
+        dm_insert_exception(&s->pending, &pe->e);
 
         return pe;
 }
 
-static void remap_exception(struct dm_snapshot *s, struct dm_snap_exception *e,
+static void remap_exception(struct dm_snapshot *s, struct dm_exception *e,
                             struct bio *bio, chunk_t chunk)
 {
-        bio->bi_bdev = s->store->cow->bdev;
+        bio->bi_bdev = s->cow->bdev;
         bio->bi_sector = chunk_to_sector(s->store,
                                          dm_chunk_number(e->new_chunk) +
                                          (chunk - e->old_chunk)) +
@@ -1035,14 +1576,14 @@ static void remap_exception(struct dm_snapshot *s, struct dm_snap_exception *e,
 static int snapshot_map(struct dm_target *ti, struct bio *bio,
                         union map_info *map_context)
 {
-        struct dm_snap_exception *e;
+        struct dm_exception *e;
         struct dm_snapshot *s = ti->private;
         int r = DM_MAPIO_REMAPPED;
         chunk_t chunk;
         struct dm_snap_pending_exception *pe = NULL;
 
         if (unlikely(bio_empty_barrier(bio))) {
-                bio->bi_bdev = s->store->cow->bdev;
+                bio->bi_bdev = s->cow->bdev;
                 return DM_MAPIO_REMAPPED;
         }
 
@@ -1063,7 +1604,7 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
         }
 
         /* If the block is already remapped - use that, else remap it */
-        e = lookup_exception(&s->complete, chunk);
+        e = dm_lookup_exception(&s->complete, chunk);
         if (e) {
                 remap_exception(s, e, bio, chunk);
                 goto out_unlock;
@@ -1087,7 +1628,7 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
                                 goto out_unlock;
                         }
 
-                        e = lookup_exception(&s->complete, chunk);
+                        e = dm_lookup_exception(&s->complete, chunk);
                         if (e) {
                                 free_pending_exception(pe);
                                 remap_exception(s, e, bio, chunk);
@@ -1125,6 +1666,78 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
         return r;
 }
 
+/*
+ * A snapshot-merge target behaves like a combination of a snapshot
+ * target and a snapshot-origin target.  It only generates new
+ * exceptions in other snapshots and not in the one that is being
+ * merged.
+ *
+ * For each chunk, if there is an existing exception, it is used to
+ * redirect I/O to the cow device.  Otherwise I/O is sent to the origin,
+ * which in turn might generate exceptions in other snapshots.
+ * If merging is currently taking place on the chunk in question, the
+ * I/O is deferred by adding it to s->bios_queued_during_merge.
+ */
+static int snapshot_merge_map(struct dm_target *ti, struct bio *bio,
+                              union map_info *map_context)
+{
+        struct dm_exception *e;
+        struct dm_snapshot *s = ti->private;
+        int r = DM_MAPIO_REMAPPED;
+        chunk_t chunk;
+
+        if (unlikely(bio_empty_barrier(bio))) {
+                if (!map_context->flush_request)
+                        bio->bi_bdev = s->origin->bdev;
+                else
+                        bio->bi_bdev = s->cow->bdev;
+                map_context->ptr = NULL;
+                return DM_MAPIO_REMAPPED;
+        }
+
+        chunk = sector_to_chunk(s->store, bio->bi_sector);
+
+        down_write(&s->lock);
+
+        /* Full merging snapshots are redirected to the origin */
+        if (!s->valid)
+                goto redirect_to_origin;
+
+        /* If the block is already remapped - use that */
+        e = dm_lookup_exception(&s->complete, chunk);
+        if (e) {
+                /* Queue writes overlapping with chunks being merged */
+                if (bio_rw(bio) == WRITE &&
+                    chunk >= s->first_merging_chunk &&
+                    chunk < (s->first_merging_chunk +
+                             s->num_merging_chunks)) {
+                        bio->bi_bdev = s->origin->bdev;
+                        bio_list_add(&s->bios_queued_during_merge, bio);
+                        r = DM_MAPIO_SUBMITTED;
+                        goto out_unlock;
+                }
+
+                remap_exception(s, e, bio, chunk);
+
+                if (bio_rw(bio) == WRITE)
+                        map_context->ptr = track_chunk(s, chunk);
+                goto out_unlock;
+        }
+
+redirect_to_origin:
+        bio->bi_bdev = s->origin->bdev;
+
+        if (bio_rw(bio) == WRITE) {
+                up_write(&s->lock);
+                return do_origin(s->origin, bio);
+        }
+
+out_unlock:
+        up_write(&s->lock);
+
+        return r;
+}
+
 static int snapshot_end_io(struct dm_target *ti, struct bio *bio,
                            int error, union map_info *map_context)
 {
@@ -1137,40 +1750,135 @@ static int snapshot_end_io(struct dm_target *ti, struct bio *bio,
         return 0;
 }
 
+static void snapshot_merge_presuspend(struct dm_target *ti)
+{
+        struct dm_snapshot *s = ti->private;
+
+        stop_merge(s);
+}
+
+static void snapshot_postsuspend(struct dm_target *ti)
+{
+        struct dm_snapshot *s = ti->private;
+
+        down_write(&s->lock);
+        s->suspended = 1;
+        up_write(&s->lock);
+}
+
+static int snapshot_preresume(struct dm_target *ti)
+{
+        int r = 0;
+        struct dm_snapshot *s = ti->private;
+        struct dm_snapshot *snap_src = NULL, *snap_dest = NULL;
+
+        down_read(&_origins_lock);
+        (void) __find_snapshots_sharing_cow(s, &snap_src, &snap_dest, NULL);
+        if (snap_src && snap_dest) {
+                down_read(&snap_src->lock);
+                if (s == snap_src) {
+                        DMERR("Unable to resume snapshot source until "
+                              "handover completes.");
+                        r = -EINVAL;
+                } else if (!snap_src->suspended) {
+                        DMERR("Unable to perform snapshot handover until "
+                              "source is suspended.");
+                        r = -EINVAL;
+                }
+                up_read(&snap_src->lock);
+        }
+        up_read(&_origins_lock);
+
+        return r;
+}
+
 static void snapshot_resume(struct dm_target *ti)
 {
         struct dm_snapshot *s = ti->private;
+        struct dm_snapshot *snap_src = NULL, *snap_dest = NULL;
+
+        down_read(&_origins_lock);
+        (void) __find_snapshots_sharing_cow(s, &snap_src, &snap_dest, NULL);
+        if (snap_src && snap_dest) {
+                down_write(&snap_src->lock);
+                down_write_nested(&snap_dest->lock, SINGLE_DEPTH_NESTING);
+                __handover_exceptions(snap_src, snap_dest);
+                up_write(&snap_dest->lock);
+                up_write(&snap_src->lock);
+        }
+        up_read(&_origins_lock);
+
+        /* Now we have correct chunk size, reregister */
+        reregister_snapshot(s);
 
         down_write(&s->lock);
         s->active = 1;
+        s->suspended = 0;
         up_write(&s->lock);
 }
 
+static sector_t get_origin_minimum_chunksize(struct block_device *bdev)
+{
+        sector_t min_chunksize;
+
+        down_read(&_origins_lock);
+        min_chunksize = __minimum_chunk_size(__lookup_origin(bdev));
+        up_read(&_origins_lock);
+
+        return min_chunksize;
+}
+
+static void snapshot_merge_resume(struct dm_target *ti)
+{
+        struct dm_snapshot *s = ti->private;
+
+        /*
+         * Handover exceptions from existing snapshot.
+         */
+        snapshot_resume(ti);
+
+        /*
+         * snapshot-merge acts as an origin, so set ti->split_io
+         */
+        ti->split_io = get_origin_minimum_chunksize(s->origin->bdev);
+
+        start_merge(s);
+}
+
 static int snapshot_status(struct dm_target *ti, status_type_t type,
                            char *result, unsigned int maxlen)
 {
         unsigned sz = 0;
         struct dm_snapshot *snap = ti->private;
 
-        down_write(&snap->lock);
-
         switch (type) {
         case STATUSTYPE_INFO:
+
+                down_write(&snap->lock);
+
                 if (!snap->valid)
                         DMEMIT("Invalid");
+                else if (snap->merge_failed)
+                        DMEMIT("Merge failed");
                 else {
-                        if (snap->store->type->fraction_full) {
-                                sector_t numerator, denominator;
-                                snap->store->type->fraction_full(snap->store,
-                                                                 &numerator,
-                                                                 &denominator);
-                                DMEMIT("%llu/%llu",
-                                       (unsigned long long)numerator,
-                                       (unsigned long long)denominator);
+                        if (snap->store->type->usage) {
+                                sector_t total_sectors, sectors_allocated,
+                                         metadata_sectors;
+                                snap->store->type->usage(snap->store,
+                                                         &total_sectors,
+                                                         &sectors_allocated,
+                                                         &metadata_sectors);
+                                DMEMIT("%llu/%llu %llu",
+                                       (unsigned long long)sectors_allocated,
+                                       (unsigned long long)total_sectors,
+                                       (unsigned long long)metadata_sectors);
                         }
                         else
                                 DMEMIT("Unknown");
                 }
+
+                up_write(&snap->lock);
+
                 break;
 
         case STATUSTYPE_TABLE:
@@ -1179,14 +1887,12 @@ static int snapshot_status(struct dm_target *ti, status_type_t type,
                  * to make private copies if the output is to
                  * make sense.
                  */
-                DMEMIT("%s", snap->origin->name);
+                DMEMIT("%s %s", snap->origin->name, snap->cow->name);
                 snap->store->type->status(snap->store, type, result + sz,
                                           maxlen - sz);
                 break;
         }
 
-        up_write(&snap->lock);
-
         return 0;
 }
 
@@ -1202,17 +1908,36 @@ static int snapshot_iterate_devices(struct dm_target *ti,
 /*-----------------------------------------------------------------
  * Origin methods
  *---------------------------------------------------------------*/
-static int __origin_write(struct list_head *snapshots, struct bio *bio)
+
+/*
+ * If no exceptions need creating, DM_MAPIO_REMAPPED is returned and any
+ * supplied bio was ignored.  The caller may submit it immediately.
+ * (No remapping actually occurs as the origin is always a direct linear
+ * map.)
+ *
+ * If further exceptions are required, DM_MAPIO_SUBMITTED is returned
+ * and any supplied bio is added to a list to be submitted once all
+ * the necessary exceptions exist.
+ */
+static int __origin_write(struct list_head *snapshots, sector_t sector,
+                          struct bio *bio)
 {
-        int r = DM_MAPIO_REMAPPED, first = 0;
+        int r = DM_MAPIO_REMAPPED;
         struct dm_snapshot *snap;
-        struct dm_snap_exception *e;
-        struct dm_snap_pending_exception *pe, *next_pe, *primary_pe = NULL;
+        struct dm_exception *e;
+        struct dm_snap_pending_exception *pe;
+        struct dm_snap_pending_exception *pe_to_start_now = NULL;
+        struct dm_snap_pending_exception *pe_to_start_last = NULL;
         chunk_t chunk;
-        LIST_HEAD(pe_queue);
 
         /* Do all the snapshots on this origin */
         list_for_each_entry (snap, snapshots, list) {
+                /*
+                 * Don't make new exceptions in a merging snapshot
+                 * because it has effectively been deleted
+                 */
+                if (dm_target_is_snapshot_merge(snap->ti))
+                        continue;
 
                 down_write(&snap->lock);
 
@@ -1221,24 +1946,21 @@ static int __origin_write(struct list_head *snapshots, struct bio *bio)
                         goto next_snapshot;
 
                 /* Nothing to do if writing beyond end of snapshot */
-                if (bio->bi_sector >= dm_table_get_size(snap->store->ti->table))
+                if (sector >= dm_table_get_size(snap->ti->table))
                         goto next_snapshot;
 
                 /*
                  * Remember, different snapshots can have
                  * different chunk sizes.
                  */
-                chunk = sector_to_chunk(snap->store, bio->bi_sector);
+                chunk = sector_to_chunk(snap->store, sector);
 
                 /*
                  * Check exception table to see if block
                  * is already remapped in this snapshot
                  * and trigger an exception if not.
-                 *
-                 * ref_count is initialised to 1 so pending_complete()
-                 * won't destroy the primary_pe while we're inside this loop.
                  */
-                e = lookup_exception(&snap->complete, chunk);
+                e = dm_lookup_exception(&snap->complete, chunk);
                 if (e)
                         goto next_snapshot;
 
@@ -1253,7 +1975,7 @@ static int __origin_write(struct list_head *snapshots, struct bio *bio)
                                 goto next_snapshot;
                         }
 
-                        e = lookup_exception(&snap->complete, chunk);
+                        e = dm_lookup_exception(&snap->complete, chunk);
                         if (e) {
                                 free_pending_exception(pe);
                                 goto next_snapshot;
@@ -1266,59 +1988,43 @@ static int __origin_write(struct list_head *snapshots, struct bio *bio)
                         }
                 }
 
-                if (!primary_pe) {
-                        /*
-                         * Either every pe here has same
-                         * primary_pe or none has one yet.
-                         */
-                        if (pe->primary_pe)
-                                primary_pe = pe->primary_pe;
-                        else {
-                                primary_pe = pe;
-                                first = 1;
-                        }
-
-                        bio_list_add(&primary_pe->origin_bios, bio);
+                r = DM_MAPIO_SUBMITTED;
 
-                        r = DM_MAPIO_SUBMITTED;
-                }
+                /*
+                 * If an origin bio was supplied, queue it to wait for the
+                 * completion of this exception, and start this one last,
+                 * at the end of the function.
+                 */
+                if (bio) {
+                        bio_list_add(&pe->origin_bios, bio);
+                        bio = NULL;
 
-                if (!pe->primary_pe) {
-                        pe->primary_pe = primary_pe;
-                        get_pending_exception(primary_pe);
+                        if (!pe->started) {
+                                pe->started = 1;
+                                pe_to_start_last = pe;
+                        }
                 }
 
                 if (!pe->started) {
                         pe->started = 1;
-                        list_add_tail(&pe->list, &pe_queue);
+                        pe_to_start_now = pe;
                 }
 
  next_snapshot:
                 up_write(&snap->lock);
-        }
 
-        if (!primary_pe)
-                return r;
-
-        /*
-         * If this is the first time we're processing this chunk and
-         * ref_count is now 1 it means all the pending exceptions
-         * got completed while we were in the loop above, so it falls to
-         * us here to remove the primary_pe and submit any origin_bios.
-         */
-
-        if (first && atomic_dec_and_test(&primary_pe->ref_count)) {
-                flush_bios(bio_list_get(&primary_pe->origin_bios));
-                free_pending_exception(primary_pe);
-                /* If we got here, pe_queue is necessarily empty. */
-                return r;
+                if (pe_to_start_now) {
+                        start_copy(pe_to_start_now);
+                        pe_to_start_now = NULL;
+                }
         }
 
         /*
-         * Now that we have a complete pe list we can start the copying.
+         * Submit the exception against which the bio is queued last,
+         * to give the other exceptions a head start.
          */
-        list_for_each_entry_safe(pe, next_pe, &pe_queue, list)
-                start_copy(pe);
+        if (pe_to_start_last)
+                start_copy(pe_to_start_last);
 
         return r;
 }
@@ -1334,13 +2040,48 @@ static int do_origin(struct dm_dev *origin, struct bio *bio)
         down_read(&_origins_lock);
         o = __lookup_origin(origin->bdev);
         if (o)
-                r = __origin_write(&o->snapshots, bio);
+                r = __origin_write(&o->snapshots, bio->bi_sector, bio);
         up_read(&_origins_lock);
 
         return r;
 }
 
 /*
+ * Trigger exceptions in all non-merging snapshots.
+ *
+ * The chunk size of the merging snapshot may be larger than the chunk
+ * size of some other snapshot so we may need to reallocate multiple
+ * chunks in other snapshots.
+ *
+ * We scan all the overlapping exceptions in the other snapshots.
+ * Returns 1 if anything was reallocated and must be waited for,
+ * otherwise returns 0.
+ *
+ * size must be a multiple of merging_snap's chunk_size.
+ */
+static int origin_write_extent(struct dm_snapshot *merging_snap,
+                               sector_t sector, unsigned size)
+{
+        int must_wait = 0;
+        sector_t n;
+        struct origin *o;
+
+        /*
+         * The origin's __minimum_chunk_size() got stored in split_io
+         * by snapshot_merge_resume().
+         */
+        down_read(&_origins_lock);
+        o = __lookup_origin(merging_snap->origin->bdev);
+        for (n = 0; n < size; n += merging_snap->ti->split_io)
+                if (__origin_write(&o->snapshots, sector + n, NULL) ==
+                    DM_MAPIO_SUBMITTED)
+                        must_wait = 1;
+        up_read(&_origins_lock);
+
+        return must_wait;
+}
+
+/*
  * Origin: maps a linear range of a device, with hooks for snapshotting.
  */
 
@@ -1391,8 +2132,6 @@ static int origin_map(struct dm_target *ti, struct bio *bio,
         return (bio_rw(bio) == WRITE) ? do_origin(dev, bio) : DM_MAPIO_REMAPPED;
 }
 
-#define min_not_zero(l, r) (l == 0) ? r : ((r == 0) ? l : min(l, r))
-
 /*
  * Set the target "split_io" field to the minimum of all the snapshots'
  * chunk sizes.
@@ -1400,19 +2139,8 @@ static int origin_map(struct dm_target *ti, struct bio *bio,
 static void origin_resume(struct dm_target *ti)
 {
         struct dm_dev *dev = ti->private;
-        struct dm_snapshot *snap;
-        struct origin *o;
-        unsigned chunk_size = 0;
-
-        down_read(&_origins_lock);
-        o = __lookup_origin(dev->bdev);
-        if (o)
-                list_for_each_entry (snap, &o->snapshots, list)
-                        chunk_size = min_not_zero(chunk_size,
-                                                  snap->store->chunk_size);
-        up_read(&_origins_lock);
 
-        ti->split_io = chunk_size;
+        ti->split_io = get_origin_minimum_chunksize(dev->bdev);
 }
 
 static int origin_status(struct dm_target *ti, status_type_t type, char *result,
@@ -1455,17 +2183,35 @@ static struct target_type origin_target = {
 
 static struct target_type snapshot_target = {
         .name    = "snapshot",
-        .version = {1, 7, 0},
+        .version = {1, 9, 0},
         .module  = THIS_MODULE,
         .ctr     = snapshot_ctr,
         .dtr     = snapshot_dtr,
         .map     = snapshot_map,
         .end_io  = snapshot_end_io,
+        .postsuspend = snapshot_postsuspend,
+        .preresume  = snapshot_preresume,
         .resume  = snapshot_resume,
         .status  = snapshot_status,
         .iterate_devices = snapshot_iterate_devices,
 };
 
+static struct target_type merge_target = {
+        .name    = dm_snapshot_merge_target_name,
+        .version = {1, 0, 0},
+        .module  = THIS_MODULE,
+        .ctr     = snapshot_ctr,
+        .dtr     = snapshot_dtr,
+        .map     = snapshot_merge_map,
+        .end_io  = snapshot_end_io,
+        .presuspend = snapshot_merge_presuspend,
+        .postsuspend = snapshot_postsuspend,
+        .preresume  = snapshot_preresume,
+        .resume  = snapshot_merge_resume,
+        .status  = snapshot_status,
+        .iterate_devices = snapshot_iterate_devices,
+};
+
 static int __init dm_snapshot_init(void)
 {
         int r;
@@ -1477,7 +2223,7 @@ static int __init dm_snapshot_init(void)
         }
 
         r = dm_register_target(&snapshot_target);
-        if (r) {
+        if (r < 0) {
                 DMERR("snapshot target register failed %d", r);
                 goto bad_register_snapshot_target;
         }
@@ -1485,34 +2231,40 @@ static int __init dm_snapshot_init(void)
         r = dm_register_target(&origin_target);
         if (r < 0) {
                 DMERR("Origin target register failed %d", r);
-                goto bad1;
+                goto bad_register_origin_target;
+        }
+
+        r = dm_register_target(&merge_target);
+        if (r < 0) {
+                DMERR("Merge target register failed %d", r);
+                goto bad_register_merge_target;
         }
 
         r = init_origin_hash();
         if (r) {
                 DMERR("init_origin_hash failed.");
-                goto bad2;
+                goto bad_origin_hash;
         }
 
-        exception_cache = KMEM_CACHE(dm_snap_exception, 0);
+        exception_cache = KMEM_CACHE(dm_exception, 0);
         if (!exception_cache) {
                 DMERR("Couldn't create exception cache.");
                 r = -ENOMEM;
-                goto bad3;
+                goto bad_exception_cache;
         }
 
         pending_cache = KMEM_CACHE(dm_snap_pending_exception, 0);
         if (!pending_cache) {
                 DMERR("Couldn't create pending cache.");
                 r = -ENOMEM;
-                goto bad4;
+                goto bad_pending_cache;
         }
 
         tracked_chunk_cache = KMEM_CACHE(dm_snap_tracked_chunk, 0);
         if (!tracked_chunk_cache) {
                 DMERR("Couldn't create cache to track chunks in use.");
                 r = -ENOMEM;
-                goto bad5;
+                goto bad_tracked_chunk_cache;
         }
 
         ksnapd = create_singlethread_workqueue("ksnapd");
@@ -1526,19 +2278,21 @@ static int __init dm_snapshot_init(void)
 
 bad_pending_pool:
         kmem_cache_destroy(tracked_chunk_cache);
-bad5:
+bad_tracked_chunk_cache:
         kmem_cache_destroy(pending_cache);
-bad4:
+bad_pending_cache:
         kmem_cache_destroy(exception_cache);
-bad3:
+bad_exception_cache:
         exit_origin_hash();
-bad2:
+bad_origin_hash:
+        dm_unregister_target(&merge_target);
+bad_register_merge_target:
         dm_unregister_target(&origin_target);
-bad1:
+bad_register_origin_target:
         dm_unregister_target(&snapshot_target);
-
 bad_register_snapshot_target:
         dm_exception_store_exit();
+
         return r;
 }
 
@@ -1548,6 +2302,7 @@ static void __exit dm_snapshot_exit(void)
 
         dm_unregister_target(&snapshot_target);
         dm_unregister_target(&origin_target);
+        dm_unregister_target(&merge_target);
 
         exit_origin_hash();
         kmem_cache_destroy(pending_cache);
diff --git a/drivers/md/dm-sysfs.c b/drivers/md/dm-sysfs.c
index 4b045903a4e2..f53392df7b97 100644
--- a/drivers/md/dm-sysfs.c
+++ b/drivers/md/dm-sysfs.c
@@ -59,7 +59,7 @@ static ssize_t dm_attr_uuid_show(struct mapped_device *md, char *buf)
 
 static ssize_t dm_attr_suspended_show(struct mapped_device *md, char *buf)
 {
-        sprintf(buf, "%d\n", dm_suspended(md));
+        sprintf(buf, "%d\n", dm_suspended_md(md));
 
         return strlen(buf);
 }
@@ -80,12 +80,20 @@ static struct sysfs_ops dm_sysfs_ops = {
 };
 
 /*
+ * The sysfs structure is embedded in md struct, nothing to do here
+ */
+static void dm_sysfs_release(struct kobject *kobj)
+{
+}
+
+/*
  * dm kobject is embedded in mapped_device structure
  * no need to define release function here
  */
 static struct kobj_type dm_ktype = {
         .sysfs_ops      = &dm_sysfs_ops,
         .default_attrs  = dm_attrs,
+        .release        = dm_sysfs_release
 };
 
 /*
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 1a6cb3c7822e..be625475cf6d 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -12,6 +12,7 @@
 #include <linux/blkdev.h>
 #include <linux/namei.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
@@ -237,6 +238,9 @@ void dm_table_destroy(struct dm_table *t)
 {
         unsigned int i;
 
+        if (!t)
+                return;
+
         while (atomic_read(&t->holders))
                 msleep(1);
         smp_mb();
@@ -600,11 +604,8 @@ int dm_split_args(int *argc, char ***argvp, char *input)
                 return -ENOMEM;
 
         while (1) {
-                start = end;
-
                 /* Skip whitespace */
-                while (*start && isspace(*start))
-                        start++;
+                start = skip_spaces(end);
 
                 if (!*start)
                         break;  /* success, we hit the end */
diff --git a/drivers/md/dm-uevent.c b/drivers/md/dm-uevent.c
index 6f65883aef12..c7c555a8c7b2 100644
--- a/drivers/md/dm-uevent.c
+++ b/drivers/md/dm-uevent.c
@@ -139,14 +139,13 @@ void dm_send_uevents(struct list_head *events, struct kobject *kobj)
                 list_del_init(&event->elist);
 
                 /*
-                 * Need to call dm_copy_name_and_uuid from here for now.
-                 * Context of previous var adds and locking used for
-                 * hash_cell not compatable.
+                 * When a device is being removed this copy fails and we
+                 * discard these unsent events.
                  */
                 if (dm_copy_name_and_uuid(event->md, event->name,
                                           event->uuid)) {
-                        DMERR("%s: dm_copy_name_and_uuid() failed",
-                              __func__);
+                        DMINFO("%s: skipping sending uevent for lost device",
+                               __func__);
                         goto uevent_free;
                 }
 
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 724efc63904d..3167480b532c 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -143,9 +143,19 @@ struct mapped_device {
         int barrier_error;
 
         /*
+         * Protect barrier_error from concurrent endio processing
+         * in request-based dm.
+         */
+        spinlock_t barrier_error_lock;
+
+        /*
          * Processing queue (flush/barriers)
          */
         struct workqueue_struct *wq;
+        struct work_struct barrier_work;
+
+        /* A pointer to the currently processing pre/post flush request */
+        struct request *flush_request;
 
         /*
          * The current mapping.
@@ -178,9 +188,6 @@ struct mapped_device {
         /* forced geometry settings */
         struct hd_geometry geometry;
 
-        /* marker of flush suspend for request-based dm */
-        struct request suspend_rq;
-
         /* For saving the address of __make_request for request based dm */
         make_request_fn *saved_make_request_fn;
 
@@ -275,6 +282,7 @@ static int (*_inits[])(void) __initdata = {
         dm_target_init,
         dm_linear_init,
         dm_stripe_init,
+        dm_io_init,
         dm_kcopyd_init,
         dm_interface_init,
 };
@@ -284,6 +292,7 @@ static void (*_exits[])(void) = {
         dm_target_exit,
         dm_linear_exit,
         dm_stripe_exit,
+        dm_io_exit,
         dm_kcopyd_exit,
         dm_interface_exit,
 };
@@ -320,6 +329,11 @@ static void __exit dm_exit(void)
 /*
  * Block device functions
  */
+int dm_deleting_md(struct mapped_device *md)
+{
+        return test_bit(DMF_DELETING, &md->flags);
+}
+
 static int dm_blk_open(struct block_device *bdev, fmode_t mode)
 {
         struct mapped_device *md;
@@ -331,7 +345,7 @@ static int dm_blk_open(struct block_device *bdev, fmode_t mode)
                 goto out;
 
         if (test_bit(DMF_FREEING, &md->flags) ||
-            test_bit(DMF_DELETING, &md->flags)) {
+            dm_deleting_md(md)) {
                 md = NULL;
                 goto out;
         }
@@ -388,7 +402,7 @@ static int dm_blk_ioctl(struct block_device *bdev, fmode_t mode,
                         unsigned int cmd, unsigned long arg)
 {
         struct mapped_device *md = bdev->bd_disk->private_data;
-        struct dm_table *map = dm_get_table(md);
+        struct dm_table *map = dm_get_live_table(md);
         struct dm_target *tgt;
         int r = -ENOTTY;
 
@@ -401,7 +415,7 @@ static int dm_blk_ioctl(struct block_device *bdev, fmode_t mode,
 
         tgt = dm_table_get_target(map, 0);
 
-        if (dm_suspended(md)) {
+        if (dm_suspended_md(md)) {
                 r = -EAGAIN;
                 goto out;
         }
@@ -430,9 +444,10 @@ static void free_tio(struct mapped_device *md, struct dm_target_io *tio)
         mempool_free(tio, md->tio_pool);
 }
 
-static struct dm_rq_target_io *alloc_rq_tio(struct mapped_device *md)
+static struct dm_rq_target_io *alloc_rq_tio(struct mapped_device *md,
+                                            gfp_t gfp_mask)
 {
-        return mempool_alloc(md->tio_pool, GFP_ATOMIC);
+        return mempool_alloc(md->tio_pool, gfp_mask);
 }
 
 static void free_rq_tio(struct dm_rq_target_io *tio)
@@ -450,6 +465,12 @@ static void free_bio_info(struct dm_rq_clone_bio_info *info)
         mempool_free(info, info->tio->md->io_pool);
 }
 
+static int md_in_flight(struct mapped_device *md)
+{
+        return atomic_read(&md->pending[READ]) +
+               atomic_read(&md->pending[WRITE]);
+}
+
 static void start_io_acct(struct dm_io *io)
 {
         struct mapped_device *md = io->md;
@@ -512,7 +533,7 @@ static void queue_io(struct mapped_device *md, struct bio *bio)
  * function to access the md->map field, and make sure they call
  * dm_table_put() when finished.
  */
-struct dm_table *dm_get_table(struct mapped_device *md)
+struct dm_table *dm_get_live_table(struct mapped_device *md)
 {
         struct dm_table *t;
         unsigned long flags;
@@ -716,28 +737,38 @@ static void end_clone_bio(struct bio *clone, int error)
         blk_update_request(tio->orig, 0, nr_bytes);
 }
 
+static void store_barrier_error(struct mapped_device *md, int error)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&md->barrier_error_lock, flags);
+        /*
+         * Basically, the first error is taken, but:
+         *   -EOPNOTSUPP supersedes any I/O error.
+         *   Requeue request supersedes any I/O error but -EOPNOTSUPP.
+         */
+        if (!md->barrier_error || error == -EOPNOTSUPP ||
+            (md->barrier_error != -EOPNOTSUPP &&
+             error == DM_ENDIO_REQUEUE))
+                md->barrier_error = error;
+        spin_unlock_irqrestore(&md->barrier_error_lock, flags);
+}
+
 /*
  * Don't touch any member of the md after calling this function because
  * the md may be freed in dm_put() at the end of this function.
  * Or do dm_get() before calling this function and dm_put() later.
  */
-static void rq_completed(struct mapped_device *md, int run_queue)
+static void rq_completed(struct mapped_device *md, int rw, int run_queue)
 {
-        int wakeup_waiters = 0;
-        struct request_queue *q = md->queue;
-        unsigned long flags;
-
-        spin_lock_irqsave(q->queue_lock, flags);
-        if (!queue_in_flight(q))
-                wakeup_waiters = 1;
-        spin_unlock_irqrestore(q->queue_lock, flags);
+        atomic_dec(&md->pending[rw]);
 
         /* nudge anyone waiting on suspend queue */
-        if (wakeup_waiters)
+        if (!md_in_flight(md))
                 wake_up(&md->wait);
 
         if (run_queue)
-                blk_run_queue(q);
+                blk_run_queue(md->queue);
 
         /*
          * dm_put() must be at the end of this function. See the comment above
@@ -753,6 +784,44 @@ static void free_rq_clone(struct request *clone)
         free_rq_tio(tio);
 }
 
+/*
+ * Complete the clone and the original request.
+ * Must be called without queue lock.
+ */
+static void dm_end_request(struct request *clone, int error)
+{
+        int rw = rq_data_dir(clone);
+        int run_queue = 1;
+        bool is_barrier = blk_barrier_rq(clone);
+        struct dm_rq_target_io *tio = clone->end_io_data;
+        struct mapped_device *md = tio->md;
+        struct request *rq = tio->orig;
+
+        if (blk_pc_request(rq) && !is_barrier) {
+                rq->errors = clone->errors;
+                rq->resid_len = clone->resid_len;
+
+                if (rq->sense)
+                        /*
+                         * We are using the sense buffer of the original
+                         * request.
+                         * So setting the length of the sense data is enough.
+                         */
+                        rq->sense_len = clone->sense_len;
+        }
+
+        free_rq_clone(clone);
+
+        if (unlikely(is_barrier)) {
+                if (unlikely(error))
+                        store_barrier_error(md, error);
+                run_queue = 0;
+        } else
+                blk_end_request_all(rq, error);
+
+        rq_completed(md, rw, run_queue);
+}
+
 static void dm_unprep_request(struct request *rq)
 {
         struct request *clone = rq->special;
@@ -768,12 +837,23 @@ static void dm_unprep_request(struct request *rq)
  */
 void dm_requeue_unmapped_request(struct request *clone)
 {
+        int rw = rq_data_dir(clone);
         struct dm_rq_target_io *tio = clone->end_io_data;
         struct mapped_device *md = tio->md;
         struct request *rq = tio->orig;
         struct request_queue *q = rq->q;
         unsigned long flags;
 
+        if (unlikely(blk_barrier_rq(clone))) {
+                /*
+                 * Barrier clones share an original request.
+                 * Leave it to dm_end_request(), which handles this special
+                 * case.
+                 */
+                dm_end_request(clone, DM_ENDIO_REQUEUE);
+                return;
+        }
+
         dm_unprep_request(rq);
 
         spin_lock_irqsave(q->queue_lock, flags);
@@ -782,7 +862,7 @@ void dm_requeue_unmapped_request(struct request *clone)
         blk_requeue_request(q, rq);
         spin_unlock_irqrestore(q->queue_lock, flags);
 
-        rq_completed(md, 0);
+        rq_completed(md, rw, 0);
 }
 EXPORT_SYMBOL_GPL(dm_requeue_unmapped_request);
 
@@ -815,34 +895,28 @@ static void start_queue(struct request_queue *q)
         spin_unlock_irqrestore(q->queue_lock, flags);
 }
 
-/*
- * Complete the clone and the original request.
- * Must be called without queue lock.
- */
-static void dm_end_request(struct request *clone, int error)
+static void dm_done(struct request *clone, int error, bool mapped)
 {
+        int r = error;
         struct dm_rq_target_io *tio = clone->end_io_data;
-        struct mapped_device *md = tio->md;
-        struct request *rq = tio->orig;
+        dm_request_endio_fn rq_end_io = tio->ti->type->rq_end_io;
 
-        if (blk_pc_request(rq)) {
-                rq->errors = clone->errors;
-                rq->resid_len = clone->resid_len;
+        if (mapped && rq_end_io)
+                r = rq_end_io(tio->ti, clone, error, &tio->info);
 
-                if (rq->sense)
-                        /*
-                         * We are using the sense buffer of the original
-                         * request.
-                         * So setting the length of the sense data is enough.
-                         */
-                        rq->sense_len = clone->sense_len;
+        if (r <= 0)
+                /* The target wants to complete the I/O */
+                dm_end_request(clone, r);
+        else if (r == DM_ENDIO_INCOMPLETE)
+                /* The target will handle the I/O */
+                return;
+        else if (r == DM_ENDIO_REQUEUE)
+                /* The target wants to requeue the I/O */
+                dm_requeue_unmapped_request(clone);
+        else {
+                DMWARN("unimplemented target endio return value: %d", r);
+                BUG();
         }
-
-        free_rq_clone(clone);
-
-        blk_end_request_all(rq, error);
-
-        rq_completed(md, 1);
 }
 
 /*
@@ -850,27 +924,14 @@ static void dm_end_request(struct request *clone, int error)
  */
 static void dm_softirq_done(struct request *rq)
 {
+        bool mapped = true;
         struct request *clone = rq->completion_data;
         struct dm_rq_target_io *tio = clone->end_io_data;
-        dm_request_endio_fn rq_end_io = tio->ti->type->rq_end_io;
-        int error = tio->error;
 
-        if (!(rq->cmd_flags & REQ_FAILED) && rq_end_io)
-                error = rq_end_io(tio->ti, clone, error, &tio->info);
+        if (rq->cmd_flags & REQ_FAILED)
+                mapped = false;
 
-        if (error <= 0)
-                /* The target wants to complete the I/O */
-                dm_end_request(clone, error);
-        else if (error == DM_ENDIO_INCOMPLETE)
-                /* The target will handle the I/O */
-                return;
-        else if (error == DM_ENDIO_REQUEUE)
-                /* The target wants to requeue the I/O */
-                dm_requeue_unmapped_request(clone);
-        else {
-                DMWARN("unimplemented target endio return value: %d", error);
-                BUG();
-        }
+        dm_done(clone, tio->error, mapped);
 }
 
 /*
@@ -882,6 +943,19 @@ static void dm_complete_request(struct request *clone, int error)
         struct dm_rq_target_io *tio = clone->end_io_data;
         struct request *rq = tio->orig;
 
+        if (unlikely(blk_barrier_rq(clone))) {
+                /*
+                 * Barrier clones share an original request.  So can't use
+                 * softirq_done with the original.
+                 * Pass the clone to dm_done() directly in this special case.
+                 * It is safe (even if clone->q->queue_lock is held here)
+                 * because there is no I/O dispatching during the completion
+                 * of barrier clone.
+                 */
+                dm_done(clone, error, true);
+                return;
+        }
+
         tio->error = error;
         rq->completion_data = clone;
         blk_complete_request(rq);
@@ -898,6 +972,17 @@ void dm_kill_unmapped_request(struct request *clone, int error)
         struct dm_rq_target_io *tio = clone->end_io_data;
         struct request *rq = tio->orig;
 
+        if (unlikely(blk_barrier_rq(clone))) {
+                /*
+                 * Barrier clones share an original request.
+                 * Leave it to dm_end_request(), which handles this special
+                 * case.
+                 */
+                BUG_ON(error > 0);
+                dm_end_request(clone, error);
+                return;
+        }
+
         rq->cmd_flags |= REQ_FAILED;
         dm_complete_request(clone, error);
 }
@@ -1214,7 +1299,7 @@ static void __split_and_process_bio(struct mapped_device *md, struct bio *bio)
         struct clone_info ci;
         int error = 0;
 
-        ci.map = dm_get_table(md);
+        ci.map = dm_get_live_table(md);
         if (unlikely(!ci.map)) {
                 if (!bio_rw_flagged(bio, BIO_RW_BARRIER))
                         bio_io_error(bio);
@@ -1255,7 +1340,7 @@ static int dm_merge_bvec(struct request_queue *q,
                          struct bio_vec *biovec)
 {
         struct mapped_device *md = q->queuedata;
-        struct dm_table *map = dm_get_table(md);
+        struct dm_table *map = dm_get_live_table(md);
         struct dm_target *ti;
         sector_t max_sectors;
         int max_size = 0;
@@ -1352,11 +1437,6 @@ static int dm_make_request(struct request_queue *q, struct bio *bio)
 {
         struct mapped_device *md = q->queuedata;
 
-        if (unlikely(bio_rw_flagged(bio, BIO_RW_BARRIER))) {
-                bio_endio(bio, -EOPNOTSUPP);
-                return 0;
-        }
-
         return md->saved_make_request_fn(q, bio); /* call __make_request() */
 }
 
@@ -1375,6 +1455,25 @@ static int dm_request(struct request_queue *q, struct bio *bio)
         return _dm_request(q, bio);
 }
 
+/*
+ * Mark this request as flush request, so that dm_request_fn() can
+ * recognize.
+ */
+static void dm_rq_prepare_flush(struct request_queue *q, struct request *rq)
+{
+        rq->cmd_type = REQ_TYPE_LINUX_BLOCK;
+        rq->cmd[0] = REQ_LB_OP_FLUSH;
+}
+
+static bool dm_rq_is_flush_request(struct request *rq)
+{
+        if (rq->cmd_type == REQ_TYPE_LINUX_BLOCK &&
+            rq->cmd[0] == REQ_LB_OP_FLUSH)
+                return true;
+        else
+                return false;
+}
+
 void dm_dispatch_request(struct request *rq)
 {
         int r;
@@ -1420,25 +1519,54 @@ static int dm_rq_bio_constructor(struct bio *bio, struct bio *bio_orig,
 static int setup_clone(struct request *clone, struct request *rq,
                        struct dm_rq_target_io *tio)
 {
-        int r = blk_rq_prep_clone(clone, rq, tio->md->bs, GFP_ATOMIC,
-                                  dm_rq_bio_constructor, tio);
+        int r;
 
-        if (r)
-                return r;
+        if (dm_rq_is_flush_request(rq)) {
+                blk_rq_init(NULL, clone);
+                clone->cmd_type = REQ_TYPE_FS;
+                clone->cmd_flags |= (REQ_HARDBARRIER | WRITE);
+        } else {
+                r = blk_rq_prep_clone(clone, rq, tio->md->bs, GFP_ATOMIC,
+                                      dm_rq_bio_constructor, tio);
+                if (r)
+                        return r;
+
+                clone->cmd = rq->cmd;
+                clone->cmd_len = rq->cmd_len;
+                clone->sense = rq->sense;
+                clone->buffer = rq->buffer;
+        }
 
-        clone->cmd = rq->cmd;
-        clone->cmd_len = rq->cmd_len;
-        clone->sense = rq->sense;
-        clone->buffer = rq->buffer;
         clone->end_io = end_clone_request;
         clone->end_io_data = tio;
 
         return 0;
 }
 
-static int dm_rq_flush_suspending(struct mapped_device *md)
+static struct request *clone_rq(struct request *rq, struct mapped_device *md,
+                                gfp_t gfp_mask)
 {
-        return !md->suspend_rq.special;
+        struct request *clone;
+        struct dm_rq_target_io *tio;
+
+        tio = alloc_rq_tio(md, gfp_mask);
+        if (!tio)
+                return NULL;
+
+        tio->md = md;
+        tio->ti = NULL;
+        tio->orig = rq;
+        tio->error = 0;
+        memset(&tio->info, 0, sizeof(tio->info));
+
+        clone = &tio->clone;
+        if (setup_clone(clone, rq, tio)) {
+                /* -ENOMEM */
+                free_rq_tio(tio);
+                return NULL;
+        }
+
+        return clone;
 }
 
 /*
@@ -1447,39 +1575,19 @@ static int dm_rq_flush_suspending(struct mapped_device *md)
 static int dm_prep_fn(struct request_queue *q, struct request *rq)
 {
         struct mapped_device *md = q->queuedata;
-        struct dm_rq_target_io *tio;
         struct request *clone;
 
-        if (unlikely(rq == &md->suspend_rq)) {
-                if (dm_rq_flush_suspending(md))
-                        return BLKPREP_OK;
-                else
-                        /* The flush suspend was interrupted */
-                        return BLKPREP_KILL;
-        }
+        if (unlikely(dm_rq_is_flush_request(rq)))
+                return BLKPREP_OK;
 
         if (unlikely(rq->special)) {
                 DMWARN("Already has something in rq->special.");
                 return BLKPREP_KILL;
         }
 
-        tio = alloc_rq_tio(md); /* Only one for each original request */
-        if (!tio)
-                /* -ENOMEM */
-                return BLKPREP_DEFER;
-
-        tio->md = md;
-        tio->ti = NULL;
-        tio->orig = rq;
-        tio->error = 0;
-        memset(&tio->info, 0, sizeof(tio->info));
-
-        clone = &tio->clone;
-        if (setup_clone(clone, rq, tio)) {
-                /* -ENOMEM */
-                free_rq_tio(tio);
+        clone = clone_rq(rq, md, GFP_ATOMIC);
+        if (!clone)
                 return BLKPREP_DEFER;
-        }
 
         rq->special = clone;
         rq->cmd_flags |= REQ_DONTPREP;
@@ -1487,11 +1595,10 @@ static int dm_prep_fn(struct request_queue *q, struct request *rq)
         return BLKPREP_OK;
 }
 
-static void map_request(struct dm_target *ti, struct request *rq,
+static void map_request(struct dm_target *ti, struct request *clone,
                         struct mapped_device *md)
 {
         int r;
-        struct request *clone = rq->special;
         struct dm_rq_target_io *tio = clone->end_io_data;
 
         /*
@@ -1511,6 +1618,8 @@ static void map_request(struct dm_target *ti, struct request *rq,
                 break;
         case DM_MAPIO_REMAPPED:
                 /* The target has remapped the I/O so dispatch it */
+                trace_block_rq_remap(clone->q, clone, disk_devt(dm_disk(md)),
+                                     blk_rq_pos(tio->orig));
                 dm_dispatch_request(clone);
                 break;
         case DM_MAPIO_REQUEUE:
@@ -1536,29 +1645,26 @@ static void map_request(struct dm_target *ti, struct request *rq,
 static void dm_request_fn(struct request_queue *q)
 {
         struct mapped_device *md = q->queuedata;
-        struct dm_table *map = dm_get_table(md);
+        struct dm_table *map = dm_get_live_table(md);
         struct dm_target *ti;
-        struct request *rq;
+        struct request *rq, *clone;
 
         /*
-         * For noflush suspend, check blk_queue_stopped() to immediately
-         * quit I/O dispatching.
+         * For suspend, check blk_queue_stopped() and increment
+         * ->pending within a single queue_lock not to increment the
+         * number of in-flight I/Os after the queue is stopped in
+         * dm_suspend().
          */
         while (!blk_queue_plugged(q) && !blk_queue_stopped(q)) {
                 rq = blk_peek_request(q);
                 if (!rq)
                         goto plug_and_out;
 
-                if (unlikely(rq == &md->suspend_rq)) { /* Flush suspend maker */
-                        if (queue_in_flight(q))
-                                /* Not quiet yet.  Wait more */
-                                goto plug_and_out;
-
-                        /* This device should be quiet now */
-                        __stop_queue(q);
+                if (unlikely(dm_rq_is_flush_request(rq))) {
+                        BUG_ON(md->flush_request);
+                        md->flush_request = rq;
                         blk_start_request(rq);
-                        __blk_end_request_all(rq, 0);
-                        wake_up(&md->wait);
+                        queue_work(md->wq, &md->barrier_work);
                         goto out;
                 }
 
@@ -1567,8 +1673,11 @@ static void dm_request_fn(struct request_queue *q)
                         goto plug_and_out;
 
                 blk_start_request(rq);
+                clone = rq->special;
+                atomic_inc(&md->pending[rq_data_dir(clone)]);
+
                 spin_unlock(q->queue_lock);
-                map_request(ti, rq, md);
+                map_request(ti, clone, md);
                 spin_lock_irq(q->queue_lock);
         }
 
@@ -1595,7 +1704,7 @@ static int dm_lld_busy(struct request_queue *q)
 {
         int r;
         struct mapped_device *md = q->queuedata;
-        struct dm_table *map = dm_get_table(md);
+        struct dm_table *map = dm_get_live_table(md);
 
         if (!map || test_bit(DMF_BLOCK_IO_FOR_SUSPEND, &md->flags))
                 r = 1;
@@ -1610,7 +1719,7 @@ static int dm_lld_busy(struct request_queue *q)
 static void dm_unplug_all(struct request_queue *q)
 {
         struct mapped_device *md = q->queuedata;
-        struct dm_table *map = dm_get_table(md);
+        struct dm_table *map = dm_get_live_table(md);
 
         if (map) {
                 if (dm_request_based(md))
@@ -1628,7 +1737,7 @@ static int dm_any_congested(void *congested_data, int bdi_bits)
         struct dm_table *map;
 
         if (!test_bit(DMF_BLOCK_IO_FOR_SUSPEND, &md->flags)) {
-                map = dm_get_table(md);
+                map = dm_get_live_table(md);
                 if (map) {
                         /*
                          * Request-based dm cares about only own queue for
@@ -1725,6 +1834,7 @@ out:
 static const struct block_device_operations dm_blk_dops;
 
 static void dm_wq_work(struct work_struct *work);
+static void dm_rq_barrier_work(struct work_struct *work);
 
 /*
  * Allocate and initialise a blank device with a given minor.
@@ -1754,6 +1864,7 @@ static struct mapped_device *alloc_dev(int minor)
         init_rwsem(&md->io_lock);
         mutex_init(&md->suspend_lock);
         spin_lock_init(&md->deferred_lock);
+        spin_lock_init(&md->barrier_error_lock);
         rwlock_init(&md->map_lock);
         atomic_set(&md->holders, 1);
         atomic_set(&md->open_count, 0);
@@ -1788,6 +1899,8 @@ static struct mapped_device *alloc_dev(int minor)
         blk_queue_softirq_done(md->queue, dm_softirq_done);
         blk_queue_prep_rq(md->queue, dm_prep_fn);
         blk_queue_lld_busy(md->queue, dm_lld_busy);
+        blk_queue_ordered(md->queue, QUEUE_ORDERED_DRAIN_FLUSH,
+                          dm_rq_prepare_flush);
 
         md->disk = alloc_disk(1);
         if (!md->disk)
@@ -1797,6 +1910,7 @@ static struct mapped_device *alloc_dev(int minor)
         atomic_set(&md->pending[1], 0);
         init_waitqueue_head(&md->wait);
         INIT_WORK(&md->work, dm_wq_work);
+        INIT_WORK(&md->barrier_work, dm_rq_barrier_work);
         init_waitqueue_head(&md->eventq);
 
         md->disk->major = _major;
@@ -1921,9 +2035,13 @@ static void __set_size(struct mapped_device *md, sector_t size)
         mutex_unlock(&md->bdev->bd_inode->i_mutex);
 }
 
-static int __bind(struct mapped_device *md, struct dm_table *t,
-                  struct queue_limits *limits)
+/*
+ * Returns old map, which caller must destroy.
+ */
+static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t,
+                               struct queue_limits *limits)
 {
+        struct dm_table *old_map;
         struct request_queue *q = md->queue;
         sector_t size;
         unsigned long flags;
@@ -1938,11 +2056,6 @@ static int __bind(struct mapped_device *md, struct dm_table *t,
 
         __set_size(md, size);
 
-        if (!size) {
-                dm_table_destroy(t);
-                return 0;
-        }
-
         dm_table_event_callback(t, event_callback, md);
 
         /*
@@ -1958,26 +2071,31 @@ static int __bind(struct mapped_device *md, struct dm_table *t,
         __bind_mempools(md, t);
 
         write_lock_irqsave(&md->map_lock, flags);
+        old_map = md->map;
         md->map = t;
         dm_table_set_restrictions(t, q, limits);
         write_unlock_irqrestore(&md->map_lock, flags);
 
-        return 0;
+        return old_map;
 }
 
-static void __unbind(struct mapped_device *md)
+/*
+ * Returns unbound table for the caller to free.
+ */
+static struct dm_table *__unbind(struct mapped_device *md)
 {
         struct dm_table *map = md->map;
         unsigned long flags;
 
         if (!map)
-                return;
+                return NULL;
 
         dm_table_event_callback(map, NULL, NULL);
         write_lock_irqsave(&md->map_lock, flags);
         md->map = NULL;
         write_unlock_irqrestore(&md->map_lock, flags);
-        dm_table_destroy(map);
+
+        return map;
 }
 
 /*
@@ -2059,18 +2177,18 @@ void dm_put(struct mapped_device *md)
         BUG_ON(test_bit(DMF_FREEING, &md->flags));
 
         if (atomic_dec_and_lock(&md->holders, &_minor_lock)) {
-                map = dm_get_table(md);
+                map = dm_get_live_table(md);
                 idr_replace(&_minor_idr, MINOR_ALLOCED,
                             MINOR(disk_devt(dm_disk(md))));
                 set_bit(DMF_FREEING, &md->flags);
                 spin_unlock(&_minor_lock);
-                if (!dm_suspended(md)) {
+                if (!dm_suspended_md(md)) {
                         dm_table_presuspend_targets(map);
                         dm_table_postsuspend_targets(map);
                 }
                 dm_sysfs_exit(md);
                 dm_table_put(map);
-                __unbind(md);
+                dm_table_destroy(__unbind(md));
                 free_dev(md);
         }
 }
@@ -2080,8 +2198,6 @@ static int dm_wait_for_completion(struct mapped_device *md, int interruptible)
 {
         int r = 0;
         DECLARE_WAITQUEUE(wait, current);
-        struct request_queue *q = md->queue;
-        unsigned long flags;
 
         dm_unplug_all(md->queue);
 
@@ -2091,15 +2207,7 @@ static int dm_wait_for_completion(struct mapped_device *md, int interruptible)
                 set_current_state(interruptible);
 
                 smp_mb();
-                if (dm_request_based(md)) {
-                        spin_lock_irqsave(q->queue_lock, flags);
-                        if (!queue_in_flight(q) && blk_queue_stopped(q)) {
-                                spin_unlock_irqrestore(q->queue_lock, flags);
-                                break;
-                        }
-                        spin_unlock_irqrestore(q->queue_lock, flags);
-                } else if (!atomic_read(&md->pending[0]) &&
-                                        !atomic_read(&md->pending[1]))
+                if (!md_in_flight(md))
                         break;
 
                 if (interruptible == TASK_INTERRUPTIBLE &&
@@ -2194,98 +2302,106 @@ static void dm_queue_flush(struct mapped_device *md)
         queue_work(md->wq, &md->work);
 }
 
-/*
- * Swap in a new table (destroying old one).
- */
-int dm_swap_table(struct mapped_device *md, struct dm_table *table)
+static void dm_rq_set_flush_nr(struct request *clone, unsigned flush_nr)
 {
-        struct queue_limits limits;
-        int r = -EINVAL;
+        struct dm_rq_target_io *tio = clone->end_io_data;
 
-        mutex_lock(&md->suspend_lock);
+        tio->info.flush_request = flush_nr;
+}
 
-        /* device must be suspended */
-        if (!dm_suspended(md))
-                goto out;
+/* Issue barrier requests to targets and wait for their completion. */
+static int dm_rq_barrier(struct mapped_device *md)
+{
+        int i, j;
+        struct dm_table *map = dm_get_live_table(md);
+        unsigned num_targets = dm_table_get_num_targets(map);
+        struct dm_target *ti;
+        struct request *clone;
 
-        r = dm_calculate_queue_limits(table, &limits);
-        if (r)
-                goto out;
+        md->barrier_error = 0;
 
-        /* cannot change the device type, once a table is bound */
-        if (md->map &&
-            (dm_table_get_type(md->map) != dm_table_get_type(table))) {
-                DMWARN("can't change the device type after a table is bound");
-                goto out;
+        for (i = 0; i < num_targets; i++) {
+                ti = dm_table_get_target(map, i);
+                for (j = 0; j < ti->num_flush_requests; j++) {
+                        clone = clone_rq(md->flush_request, md, GFP_NOIO);
+                        dm_rq_set_flush_nr(clone, j);
+                        atomic_inc(&md->pending[rq_data_dir(clone)]);
+                        map_request(ti, clone, md);
+                }
         }
 
-        __unbind(md);
-        r = __bind(md, table, &limits);
-
-out:
-        mutex_unlock(&md->suspend_lock);
-        return r;
-}
+        dm_wait_for_completion(md, TASK_UNINTERRUPTIBLE);
+        dm_table_put(map);
 
-static void dm_rq_invalidate_suspend_marker(struct mapped_device *md)
-{
-        md->suspend_rq.special = (void *)0x1;
+        return md->barrier_error;
 }
 
-static void dm_rq_abort_suspend(struct mapped_device *md, int noflush)
+static void dm_rq_barrier_work(struct work_struct *work)
 {
+        int error;
+        struct mapped_device *md = container_of(work, struct mapped_device,
+                                                barrier_work);
         struct request_queue *q = md->queue;
+        struct request *rq;
         unsigned long flags;
 
-        spin_lock_irqsave(q->queue_lock, flags);
-        if (!noflush)
-                dm_rq_invalidate_suspend_marker(md);
-        __start_queue(q);
-        spin_unlock_irqrestore(q->queue_lock, flags);
-}
+        /*
+         * Hold the md reference here and leave it at the last part so that
+         * the md can't be deleted by device opener when the barrier request
+         * completes.
+         */
+        dm_get(md);
 
-static void dm_rq_start_suspend(struct mapped_device *md, int noflush)
-{
-        struct request *rq = &md->suspend_rq;
-        struct request_queue *q = md->queue;
+        error = dm_rq_barrier(md);
 
-        if (noflush)
-                stop_queue(q);
-        else {
-                blk_rq_init(q, rq);
-                blk_insert_request(q, rq, 0, NULL);
-        }
+        rq = md->flush_request;
+        md->flush_request = NULL;
+
+        if (error == DM_ENDIO_REQUEUE) {
+                spin_lock_irqsave(q->queue_lock, flags);
+                blk_requeue_request(q, rq);
+                spin_unlock_irqrestore(q->queue_lock, flags);
+        } else
+                blk_end_request_all(rq, error);
+
+        blk_run_queue(q);
+
+        dm_put(md);
 }
 
-static int dm_rq_suspend_available(struct mapped_device *md, int noflush)
+/*
+ * Swap in a new table, returning the old one for the caller to destroy.
+ */
+struct dm_table *dm_swap_table(struct mapped_device *md, struct dm_table *table)
 {
-        int r = 1;
-        struct request *rq = &md->suspend_rq;
-        struct request_queue *q = md->queue;
-        unsigned long flags;
+        struct dm_table *map = ERR_PTR(-EINVAL);
+        struct queue_limits limits;
+        int r;
 
-        if (noflush)
-                return r;
+        mutex_lock(&md->suspend_lock);
 
-        /* The marker must be protected by queue lock if it is in use */
-        spin_lock_irqsave(q->queue_lock, flags);
-        if (unlikely(rq->ref_count)) {
-                /*
-                 * This can happen, when the previous flush suspend was
-                 * interrupted, the marker is still in the queue and
-                 * this flush suspend has been invoked, because we don't
-                 * remove the marker at the time of suspend interruption.
-                 * We have only one marker per mapped_device, so we can't
-                 * start another flush suspend while it is in use.
-                 */
-                BUG_ON(!rq->special); /* The marker should be invalidated */
-                DMWARN("Invalidating the previous flush suspend is still in"
-                       " progress.  Please retry later.");
-                r = 0;
+        /* device must be suspended */
+        if (!dm_suspended_md(md))
+                goto out;
+
+        r = dm_calculate_queue_limits(table, &limits);
+        if (r) {
+                map = ERR_PTR(r);
+                goto out;
         }
-        spin_unlock_irqrestore(q->queue_lock, flags);
 
-        return r;
+        /* cannot change the device type, once a table is bound */
+        if (md->map &&
+            (dm_table_get_type(md->map) != dm_table_get_type(table))) {
+                DMWARN("can't change the device type after a table is bound");
+                goto out;
+        }
+
+        map = __bind(md, table, &limits);
+
+out:
+        mutex_unlock(&md->suspend_lock);
+        return map;
 }
 
 /*
@@ -2330,49 +2446,11 @@ static void unlock_fs(struct mapped_device *md)
 /*
  * Suspend mechanism in request-based dm.
  *
- * After the suspend starts, further incoming requests are kept in
- * the request_queue and deferred.
- * Remaining requests in the request_queue at the start of suspend are flushed
- * if it is flush suspend.
- * The suspend completes when the following conditions have been satisfied,
- * so wait for it:
- *    1. q->in_flight is 0 (which means no in_flight request)
- *    2. queue has been stopped (which means no request dispatching)
- *
+ * 1. Flush all I/Os by lock_fs() if needed.
+ * 2. Stop dispatching any I/O by stopping the request_queue.
+ * 3. Wait for all in-flight I/Os to be completed or requeued.
  *
- * Noflush suspend
- * ---------------
- * Noflush suspend doesn't need to dispatch remaining requests.
- * So stop the queue immediately.  Then, wait for all in_flight requests
- * to be completed or requeued.
- *
- * To abort noflush suspend, start the queue.
- *
- *
- * Flush suspend
- * -------------
- * Flush suspend needs to dispatch remaining requests.  So stop the queue
- * after the remaining requests are completed. (Requeued request must be also
- * re-dispatched and completed.  Until then, we can't stop the queue.)
- *
- * During flushing the remaining requests, further incoming requests are also
- * inserted to the same queue.  To distinguish which requests are to be
- * flushed, we insert a marker request to the queue at the time of starting
- * flush suspend, like a barrier.
- * The dispatching is blocked when the marker is found on the top of the queue.
- * And the queue is stopped when all in_flight requests are completed, since
- * that means the remaining requests are completely flushed.
- * Then, the marker is removed from the queue.
- *
- * To abort flush suspend, we also need to take care of the marker, not only
- * starting the queue.
- * We don't remove the marker forcibly from the queue since it's against
- * the block-layer manner.  Instead, we put a invalidated mark on the marker.
- * When the invalidated marker is found on the top of the queue, it is
- * immediately removed from the queue, so it doesn't block dispatching.
- * Because we have only one marker per mapped_device, we can't start another
- * flush suspend until the invalidated marker is removed from the queue.
- * So fail and return with -EBUSY in such a case.
+ * To abort suspend, start the request_queue.
  */
 int dm_suspend(struct mapped_device *md, unsigned suspend_flags)
 {
@@ -2383,17 +2461,12 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags)
 
         mutex_lock(&md->suspend_lock);
 
-        if (dm_suspended(md)) {
+        if (dm_suspended_md(md)) {
                 r = -EINVAL;
                 goto out_unlock;
         }
 
-        if (dm_request_based(md) && !dm_rq_suspend_available(md, noflush)) {
-                r = -EBUSY;
-                goto out_unlock;
-        }
-
-        map = dm_get_table(md);
+        map = dm_get_live_table(md);
 
         /*
          * DMF_NOFLUSH_SUSPENDING must be set before presuspend.
@@ -2406,8 +2479,10 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags)
         dm_table_presuspend_targets(map);
 
         /*
-         * Flush I/O to the device. noflush supersedes do_lockfs,
-         * because lock_fs() needs to flush I/Os.
+         * Flush I/O to the device.
+         * Any I/O submitted after lock_fs() may not be flushed.
+         * noflush takes precedence over do_lockfs.
+         * (lock_fs() flushes I/Os and waits for them to complete.)
          */
         if (!noflush && do_lockfs) {
                 r = lock_fs(md);
@@ -2436,10 +2511,15 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags)
         set_bit(DMF_QUEUE_IO_TO_THREAD, &md->flags);
         up_write(&md->io_lock);
 
-        flush_workqueue(md->wq);
-
+        /*
+         * Request-based dm uses md->wq for barrier (dm_rq_barrier_work) which
+         * can be kicked until md->queue is stopped.  So stop md->queue before
+         * flushing md->wq.
+         */
         if (dm_request_based(md))
-                dm_rq_start_suspend(md, noflush);
+                stop_queue(md->queue);
+
+        flush_workqueue(md->wq);
 
         /*
          * At this point no more requests are entering target request routines.
@@ -2458,7 +2538,7 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags)
                 dm_queue_flush(md);
 
                 if (dm_request_based(md))
-                        dm_rq_abort_suspend(md, noflush);
+                        start_queue(md->queue);
 
                 unlock_fs(md);
                 goto out; /* pushback list is already flushed, so skip flush */
@@ -2470,10 +2550,10 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags)
          * requests are being added to md->deferred list.
          */
 
-        dm_table_postsuspend_targets(map);
-
         set_bit(DMF_SUSPENDED, &md->flags);
 
+        dm_table_postsuspend_targets(map);
+
 out:
         dm_table_put(map);
 
@@ -2488,10 +2568,10 @@ int dm_resume(struct mapped_device *md)
         struct dm_table *map = NULL;
 
         mutex_lock(&md->suspend_lock);
-        if (!dm_suspended(md))
+        if (!dm_suspended_md(md))
                 goto out;
 
-        map = dm_get_table(md);
+        map = dm_get_live_table(md);
         if (!map || !dm_table_get_size(map))
                 goto out;
 
@@ -2592,18 +2672,29 @@ struct mapped_device *dm_get_from_kobject(struct kobject *kobj)
                 return NULL;
 
         if (test_bit(DMF_FREEING, &md->flags) ||
-            test_bit(DMF_DELETING, &md->flags))
+            dm_deleting_md(md))
                 return NULL;
 
         dm_get(md);
         return md;
 }
 
-int dm_suspended(struct mapped_device *md)
+int dm_suspended_md(struct mapped_device *md)
 {
         return test_bit(DMF_SUSPENDED, &md->flags);
 }
 
+int dm_suspended(struct dm_target *ti)
+{
+        struct mapped_device *md = dm_table_get_md(ti->table);
+        int r = dm_suspended_md(md);
+
+        dm_put(md);
+
+        return r;
+}
+EXPORT_SYMBOL_GPL(dm_suspended);
+
 int dm_noflush_suspending(struct dm_target *ti)
 {
         struct mapped_device *md = dm_table_get_md(ti->table);
diff --git a/drivers/md/dm.h b/drivers/md/dm.h
index a7663eba17e2..8dadaa5bc396 100644
--- a/drivers/md/dm.h
+++ b/drivers/md/dm.h
@@ -89,6 +89,16 @@ int dm_target_iterate(void (*iter_func)(struct target_type *tt,
 int dm_split_args(int *argc, char ***argvp, char *input);
 
 /*
+ * Is this mapped_device being deleted?
+ */
+int dm_deleting_md(struct mapped_device *md);
+
+/*
+ * Is this mapped_device suspended?
+ */
+int dm_suspended_md(struct mapped_device *md);
+
+/*
  * The device-mapper can be driven through one of two interfaces;
  * ioctl or filesystem, depending which patch you have applied.
  */
@@ -118,6 +128,9 @@ int dm_lock_for_deletion(struct mapped_device *md);
 void dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
                        unsigned cookie);
 
+int dm_io_init(void);
+void dm_io_exit(void);
+
 int dm_kcopyd_init(void);
 void dm_kcopyd_exit(void);
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index e1f3c1715cca..f4f5f82f9f53 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -39,6 +39,7 @@
 #include <linux/buffer_head.h> /* for invalidate_bdev */
 #include <linux/poll.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/hdreg.h>
 #include <linux/proc_fs.h>
 #include <linux/random.h>
@@ -1935,15 +1936,11 @@ static void print_sb_1(struct mdp_superblock_1 *sb)
 
         uuid = sb->set_uuid;
         printk(KERN_INFO
-               "md:  SB: (V:%u) (F:0x%08x) Array-ID:<%02x%02x%02x%02x"
-               ":%02x%02x:%02x%02x:%02x%02x:%02x%02x%02x%02x%02x%02x>\n"
+               "md:  SB: (V:%u) (F:0x%08x) Array-ID:<%pU>\n"
                "md:    Name: \"%s\" CT:%llu\n",
                 le32_to_cpu(sb->major_version),
                 le32_to_cpu(sb->feature_map),
-                uuid[0], uuid[1], uuid[2], uuid[3],
-                uuid[4], uuid[5], uuid[6], uuid[7],
-                uuid[8], uuid[9], uuid[10], uuid[11],
-                uuid[12], uuid[13], uuid[14], uuid[15],
+                uuid,
                 sb->set_name,
                 (unsigned long long)le64_to_cpu(sb->ctime)
                        & MD_SUPERBLOCK_1_TIME_SEC_MASK);
@@ -1952,8 +1949,7 @@ static void print_sb_1(struct mdp_superblock_1 *sb)
         printk(KERN_INFO
                "md:       L%u SZ%llu RD:%u LO:%u CS:%u DO:%llu DS:%llu SO:%llu"
                         " RO:%llu\n"
-               "md:     Dev:%08x UUID: %02x%02x%02x%02x:%02x%02x:%02x%02x:%02x%02x"
-                        ":%02x%02x%02x%02x%02x%02x\n"
+               "md:     Dev:%08x UUID: %pU\n"
                "md:       (F:0x%08x) UT:%llu Events:%llu ResyncOffset:%llu CSUM:0x%08x\n"
                "md:         (MaxDev:%u) \n",
                 le32_to_cpu(sb->level),
@@ -1966,10 +1962,7 @@ static void print_sb_1(struct mdp_superblock_1 *sb)
                 (unsigned long long)le64_to_cpu(sb->super_offset),
                 (unsigned long long)le64_to_cpu(sb->recovery_offset),
                 le32_to_cpu(sb->dev_number),
-                uuid[0], uuid[1], uuid[2], uuid[3],
-                uuid[4], uuid[5], uuid[6], uuid[7],
-                uuid[8], uuid[9], uuid[10], uuid[11],
-                uuid[12], uuid[13], uuid[14], uuid[15],
+                uuid,
                 sb->devflags,
                 (unsigned long long)le64_to_cpu(sb->utime) & MD_SUPERBLOCK_1_TIME_SEC_MASK,
                 (unsigned long long)le64_to_cpu(sb->events),
@@ -3439,8 +3432,7 @@ bitmap_store(mddev_t *mddev, const char *buf, size_t len)
                 }
                 if (*end && !isspace(*end)) break;
                 bitmap_dirty_bits(mddev->bitmap, chunk, end_chunk);
-                buf = end;
-                while (isspace(*buf)) buf++;
+                buf = skip_spaces(end);
         }
         bitmap_unplug(mddev->bitmap); /* flush the bits to disk */
 out:
diff --git a/drivers/media/IR/Kconfig b/drivers/media/IR/Kconfig
new file mode 100644
index 000000000000..4dde7d180a32
--- /dev/null
+++ b/drivers/media/IR/Kconfig
@@ -0,0 +1,9 @@
+config IR_CORE
+        tristate
+        depends on INPUT
+        default INPUT
+
+config VIDEO_IR
+        tristate
+        depends on IR_CORE
+        default IR_CORE
diff --git a/drivers/media/IR/Makefile b/drivers/media/IR/Makefile
new file mode 100644
index 000000000000..df5ddb4bbbf7
--- /dev/null
+++ b/drivers/media/IR/Makefile
@@ -0,0 +1,5 @@
+ir-common-objs  := ir-functions.o ir-keymaps.o
+ir-core-objs    := ir-keytable.o
+
+obj-$(CONFIG_IR_CORE) += ir-core.o
+obj-$(CONFIG_VIDEO_IR) += ir-common.o
diff --git a/drivers/media/common/ir-functions.c b/drivers/media/IR/ir-functions.c
index e616f624ceaa..776a136616d6 100644
--- a/drivers/media/common/ir-functions.c
+++ b/drivers/media/IR/ir-functions.c
@@ -34,9 +34,6 @@ static int repeat = 1;
 module_param(repeat, int, 0444);
 MODULE_PARM_DESC(repeat,"auto-repeat for IR keys (default: on)");
 
-int media_ir_debug;    /* media_ir_debug level (0,1,2) */
-module_param_named(debug, media_ir_debug, int, 0644);
-
 /* -------------------------------------------------------------------------- */
 
 static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir)
@@ -55,25 +52,10 @@ static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir)
 /* -------------------------------------------------------------------------- */
 
 int ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
-                   int ir_type, struct ir_scancode_table *ir_codes)
+                   int ir_type)
 {
         ir->ir_type = ir_type;
 
-        ir->keytable.size = ir_roundup_tablesize(ir_codes->size);
-        ir->keytable.scan = kzalloc(ir->keytable.size *
-                                    sizeof(struct ir_scancode), GFP_KERNEL);
-        if (!ir->keytable.scan)
-                return -ENOMEM;
-
-        IR_dprintk(1, "Allocated space for %d keycode entries (%zd bytes)\n",
-                ir->keytable.size,
-                ir->keytable.size * sizeof(ir->keytable.scan));
-
-        ir_copy_table(&ir->keytable, ir_codes);
-        ir_set_keycode_table(dev, &ir->keytable);
-
-        clear_bit(0, dev->keybit);
-        set_bit(EV_KEY, dev->evbit);
         if (repeat)
                 set_bit(EV_REP, dev->evbit);
 
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/IR/ir-keymaps.c
index 328c973a0838..9bbe6b1e9871 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/IR/ir-keymaps.c
@@ -1847,76 +1847,6 @@ struct ir_scancode_table ir_codes_hauppauge_new_table = {
 };
 EXPORT_SYMBOL_GPL(ir_codes_hauppauge_new_table);
 
-/*
- * Hauppauge:the newer, gray remotes (seems there are multiple
- * slightly different versions), shipped with cx88+ivtv cards.
- *
- * This table contains the complete RC5 code, instead of just the data part
- */
-static struct ir_scancode ir_codes_rc5_hauppauge_new[] = {
-        /* Keys 0 to 9 */
-        { 0x1e00, KEY_0 },
-        { 0x1e01, KEY_1 },
-        { 0x1e02, KEY_2 },
-        { 0x1e03, KEY_3 },
-        { 0x1e04, KEY_4 },
-        { 0x1e05, KEY_5 },
-        { 0x1e06, KEY_6 },
-        { 0x1e07, KEY_7 },
-        { 0x1e08, KEY_8 },
-        { 0x1e09, KEY_9 },
-
-        { 0x1e0a, KEY_TEXT },           /* keypad asterisk as well */
-        { 0x1e0b, KEY_RED },            /* red button */
-        { 0x1e0c, KEY_RADIO },
-        { 0x1e0d, KEY_MENU },
-        { 0x1e0e, KEY_SUBTITLE },               /* also the # key */
-        { 0x1e0f, KEY_MUTE },
-        { 0x1e10, KEY_VOLUMEUP },
-        { 0x1e11, KEY_VOLUMEDOWN },
-        { 0x1e12, KEY_PREVIOUS },               /* previous channel */
-        { 0x1e14, KEY_UP },
-        { 0x1e15, KEY_DOWN },
-        { 0x1e16, KEY_LEFT },
-        { 0x1e17, KEY_RIGHT },
-        { 0x1e18, KEY_VIDEO },          /* Videos */
-        { 0x1e19, KEY_AUDIO },          /* Music */
-        /* 0x1e1a: Pictures - presume this means
-           "Multimedia Home Platform" -
-           no "PICTURES" key in input.h
-         */
-        { 0x1e1a, KEY_MHP },
-
-        { 0x1e1b, KEY_EPG },            /* Guide */
-        { 0x1e1c, KEY_TV },
-        { 0x1e1e, KEY_NEXTSONG },               /* skip >| */
-        { 0x1e1f, KEY_EXIT },           /* back/exit */
-        { 0x1e20, KEY_CHANNELUP },      /* channel / program + */
-        { 0x1e21, KEY_CHANNELDOWN },    /* channel / program - */
-        { 0x1e22, KEY_CHANNEL },                /* source (old black remote) */
-        { 0x1e24, KEY_PREVIOUSSONG },   /* replay |< */
-        { 0x1e25, KEY_ENTER },          /* OK */
-        { 0x1e26, KEY_SLEEP },          /* minimize (old black remote) */
-        { 0x1e29, KEY_BLUE },           /* blue key */
-        { 0x1e2e, KEY_GREEN },          /* green button */
-        { 0x1e30, KEY_PAUSE },          /* pause */
-        { 0x1e32, KEY_REWIND },         /* backward << */
-        { 0x1e34, KEY_FASTFORWARD },    /* forward >> */
-        { 0x1e35, KEY_PLAY },
-        { 0x1e36, KEY_STOP },
-        { 0x1e37, KEY_RECORD },         /* recording */
-        { 0x1e38, KEY_YELLOW },         /* yellow key */
-        { 0x1e3b, KEY_SELECT },         /* top right button */
-        { 0x1e3c, KEY_ZOOM },           /* full */
-        { 0x1e3d, KEY_POWER },          /* system power (green button) */
-};
-
-struct ir_scancode_table ir_codes_rc5_hauppauge_new_table = {
-        .scan = ir_codes_rc5_hauppauge_new,
-        .size = ARRAY_SIZE(ir_codes_rc5_hauppauge_new),
-};
-EXPORT_SYMBOL_GPL(ir_codes_rc5_hauppauge_new_table);
-
 static struct ir_scancode ir_codes_npgtech[] = {
         { 0x1d, KEY_SWITCHVIDEOMODE },  /* switch inputs */
         { 0x2a, KEY_FRONT },
@@ -3314,3 +3244,152 @@ struct ir_scancode_table ir_codes_gadmei_rm008z_table = {
 };
 EXPORT_SYMBOL_GPL(ir_codes_gadmei_rm008z_table);
 
+/*************************************************************
+ *              COMPLETE SCANCODE TABLES
+ * Instead of just a partial scancode, the tables bellow
+ * contains the complete scancode and the receiver protocol
+ *************************************************************/
+
+/*
+ * Hauppauge:the newer, gray remotes (seems there are multiple
+ * slightly different versions), shipped with cx88+ivtv cards.
+ *
+ * This table contains the complete RC5 code, instead of just the data part
+ */
+static struct ir_scancode ir_codes_rc5_hauppauge_new[] = {
+        /* Keys 0 to 9 */
+        { 0x1e00, KEY_0 },
+        { 0x1e01, KEY_1 },
+        { 0x1e02, KEY_2 },
+        { 0x1e03, KEY_3 },
+        { 0x1e04, KEY_4 },
+        { 0x1e05, KEY_5 },
+        { 0x1e06, KEY_6 },
+        { 0x1e07, KEY_7 },
+        { 0x1e08, KEY_8 },
+        { 0x1e09, KEY_9 },
+
+        { 0x1e0a, KEY_TEXT },           /* keypad asterisk as well */
+        { 0x1e0b, KEY_RED },            /* red button */
+        { 0x1e0c, KEY_RADIO },
+        { 0x1e0d, KEY_MENU },
+        { 0x1e0e, KEY_SUBTITLE },               /* also the # key */
+        { 0x1e0f, KEY_MUTE },
+        { 0x1e10, KEY_VOLUMEUP },
+        { 0x1e11, KEY_VOLUMEDOWN },
+        { 0x1e12, KEY_PREVIOUS },               /* previous channel */
+        { 0x1e14, KEY_UP },
+        { 0x1e15, KEY_DOWN },
+        { 0x1e16, KEY_LEFT },
+        { 0x1e17, KEY_RIGHT },
+        { 0x1e18, KEY_VIDEO },          /* Videos */
+        { 0x1e19, KEY_AUDIO },          /* Music */
+        /* 0x1e1a: Pictures - presume this means
+           "Multimedia Home Platform" -
+           no "PICTURES" key in input.h
+         */
+        { 0x1e1a, KEY_MHP },
+
+        { 0x1e1b, KEY_EPG },            /* Guide */
+        { 0x1e1c, KEY_TV },
+        { 0x1e1e, KEY_NEXTSONG },               /* skip >| */
+        { 0x1e1f, KEY_EXIT },           /* back/exit */
+        { 0x1e20, KEY_CHANNELUP },      /* channel / program + */
+        { 0x1e21, KEY_CHANNELDOWN },    /* channel / program - */
+        { 0x1e22, KEY_CHANNEL },                /* source (old black remote) */
+        { 0x1e24, KEY_PREVIOUSSONG },   /* replay |< */
+        { 0x1e25, KEY_ENTER },          /* OK */
+        { 0x1e26, KEY_SLEEP },          /* minimize (old black remote) */
+        { 0x1e29, KEY_BLUE },           /* blue key */
+        { 0x1e2e, KEY_GREEN },          /* green button */
+        { 0x1e30, KEY_PAUSE },          /* pause */
+        { 0x1e32, KEY_REWIND },         /* backward << */
+        { 0x1e34, KEY_FASTFORWARD },    /* forward >> */
+        { 0x1e35, KEY_PLAY },
+        { 0x1e36, KEY_STOP },
+        { 0x1e37, KEY_RECORD },         /* recording */
+        { 0x1e38, KEY_YELLOW },         /* yellow key */
+        { 0x1e3b, KEY_SELECT },         /* top right button */
+        { 0x1e3c, KEY_ZOOM },           /* full */
+        { 0x1e3d, KEY_POWER },          /* system power (green button) */
+};
+
+struct ir_scancode_table ir_codes_rc5_hauppauge_new_table = {
+        .scan = ir_codes_rc5_hauppauge_new,
+        .size = ARRAY_SIZE(ir_codes_rc5_hauppauge_new),
+        .ir_type = IR_TYPE_RC5,
+};
+EXPORT_SYMBOL_GPL(ir_codes_rc5_hauppauge_new_table);
+
+/* Terratec Cinergy Hybrid T USB XS FM
+   Mauro Carvalho Chehab <mchehab@redhat.com>
+ */
+static struct ir_scancode ir_codes_nec_terratec_cinergy_xs[] = {
+        { 0x1441, KEY_HOME},
+        { 0x1401, KEY_POWER2},
+
+        { 0x1442, KEY_MENU},            /* DVD menu */
+        { 0x1443, KEY_SUBTITLE},
+        { 0x1444, KEY_TEXT},            /* Teletext */
+        { 0x1445, KEY_DELETE},
+
+        { 0x1402, KEY_1},
+        { 0x1403, KEY_2},
+        { 0x1404, KEY_3},
+        { 0x1405, KEY_4},
+        { 0x1406, KEY_5},
+        { 0x1407, KEY_6},
+        { 0x1408, KEY_7},
+        { 0x1409, KEY_8},
+        { 0x140a, KEY_9},
+        { 0x140c, KEY_0},
+
+        { 0x140b, KEY_TUNER},           /* AV */
+        { 0x140d, KEY_MODE},            /* A.B */
+
+        { 0x1446, KEY_TV},
+        { 0x1447, KEY_DVD},
+        { 0x1449, KEY_VIDEO},
+        { 0x144a, KEY_RADIO},           /* Music */
+        { 0x144b, KEY_CAMERA},          /* PIC */
+
+        { 0x1410, KEY_UP},
+        { 0x1411, KEY_LEFT},
+        { 0x1412, KEY_OK},
+        { 0x1413, KEY_RIGHT},
+        { 0x1414, KEY_DOWN},
+
+        { 0x140f, KEY_EPG},
+        { 0x1416, KEY_INFO},
+        { 0x144d, KEY_BACKSPACE},
+
+        { 0x141c, KEY_VOLUMEUP},
+        { 0x141e, KEY_VOLUMEDOWN},
+
+        { 0x144c, KEY_PLAY},
+        { 0x141d, KEY_MUTE},
+
+        { 0x141b, KEY_CHANNELUP},
+        { 0x141f, KEY_CHANNELDOWN},
+
+        { 0x1417, KEY_RED},
+        { 0x1418, KEY_GREEN},
+        { 0x1419, KEY_YELLOW},
+        { 0x141a, KEY_BLUE},
+
+        { 0x1458, KEY_RECORD},
+        { 0x1448, KEY_STOP},
+        { 0x1440, KEY_PAUSE},
+
+        { 0x1454, KEY_LAST},
+        { 0x144e, KEY_REWIND},
+        { 0x144f, KEY_FASTFORWARD},
+        { 0x145c, KEY_NEXT},
+};
+struct ir_scancode_table ir_codes_nec_terratec_cinergy_xs_table = {
+        .scan = ir_codes_nec_terratec_cinergy_xs,
+        .size = ARRAY_SIZE(ir_codes_nec_terratec_cinergy_xs),
+        .ir_type = IR_TYPE_NEC,
+};
+EXPORT_SYMBOL_GPL(ir_codes_nec_terratec_cinergy_xs_table);
+
diff --git a/drivers/media/common/ir-keytable.c b/drivers/media/IR/ir-keytable.c
index 26ce5bc2fdd5..bff7a5356037 100644
--- a/drivers/media/common/ir-keytable.c
+++ b/drivers/media/IR/ir-keytable.c
@@ -1,10 +1,19 @@
 /* ir-register.c - handle IR scancode->keycode tables
  *
  * Copyright (C) 2009 by Mauro Carvalho Chehab <mchehab@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 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.
  */
 
-#include <linux/usb/input.h>
 
+#include <linux/usb/input.h>
 #include <media/ir-common.h>
 
 #define IR_TAB_MIN_SIZE 32
@@ -72,6 +81,7 @@ int ir_roundup_tablesize(int n_elems)
 
         return n_elems;
 }
+EXPORT_SYMBOL_GPL(ir_roundup_tablesize);
 
 /**
  * ir_copy_table() - copies a keytable, discarding the unused entries
@@ -100,6 +110,7 @@ int ir_copy_table(struct ir_scancode_table *destin,
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(ir_copy_table);
 
 /**
  * ir_getkeycode() - get a keycode at the evdev scancode ->keycode table
@@ -114,7 +125,8 @@ static int ir_getkeycode(struct input_dev *dev,
                          int scancode, int *keycode)
 {
         int elem;
-        struct ir_scancode_table *rc_tab = input_get_drvdata(dev);
+        struct ir_input_dev *ir_dev = input_get_drvdata(dev);
+        struct ir_scancode_table *rc_tab = &ir_dev->rc_tab;
 
         elem = ir_seek_table(rc_tab, scancode);
         if (elem >= 0) {
@@ -136,7 +148,6 @@ static int ir_getkeycode(struct input_dev *dev,
         return 0;
 }
 
-
 /**
  * ir_is_resize_needed() - Check if the table needs rezise
  * @table:              keycode table that may need to resize
@@ -286,7 +297,8 @@ static int ir_setkeycode(struct input_dev *dev,
                          int scancode, int keycode)
 {
         int rc = 0;
-        struct ir_scancode_table *rc_tab = input_get_drvdata(dev);
+        struct ir_input_dev *ir_dev = input_get_drvdata(dev);
+        struct ir_scancode_table *rc_tab = &ir_dev->rc_tab;
         struct ir_scancode *keymap = rc_tab->scan;
         unsigned long flags;
 
@@ -360,7 +372,8 @@ static int ir_setkeycode(struct input_dev *dev,
  */
 u32 ir_g_keycode_from_table(struct input_dev *dev, u32 scancode)
 {
-        struct ir_scancode_table *rc_tab = input_get_drvdata(dev);
+        struct ir_input_dev *ir_dev = input_get_drvdata(dev);
+        struct ir_scancode_table *rc_tab = &ir_dev->rc_tab;
         struct ir_scancode *keymap = rc_tab->scan;
         int elem;
 
@@ -378,9 +391,10 @@ u32 ir_g_keycode_from_table(struct input_dev *dev, u32 scancode)
         /* Reports userspace that an unknown keycode were got */
         return KEY_RESERVED;
 }
+EXPORT_SYMBOL_GPL(ir_g_keycode_from_table);
 
 /**
- * ir_set_keycode_table() - sets the IR keycode table and add the handlers
+ * ir_input_register() - sets the IR keycode table and add the handlers
  *                          for keymap table get/set
  * @input_dev:  the struct input_dev descriptor of the device
  * @rc_tab:     the struct ir_scancode_table table of scancode/keymap
@@ -389,17 +403,34 @@ u32 ir_g_keycode_from_table(struct input_dev *dev, u32 scancode)
  * an IR.
  * It should be called before registering the IR device.
  */
-int ir_set_keycode_table(struct input_dev *input_dev,
-                         struct ir_scancode_table *rc_tab)
+int ir_input_register(struct input_dev *input_dev,
+                      struct ir_scancode_table *rc_tab)
 {
-        struct ir_scancode *keymap = rc_tab->scan;
-        int i;
-
-        spin_lock_init(&rc_tab->lock);
+        struct ir_input_dev *ir_dev;
+        struct ir_scancode  *keymap    = rc_tab->scan;
+        int i, rc;
 
         if (rc_tab->scan == NULL || !rc_tab->size)
                 return -EINVAL;
 
+        ir_dev = kzalloc(sizeof(*ir_dev), GFP_KERNEL);
+        if (!ir_dev)
+                return -ENOMEM;
+
+        spin_lock_init(&rc_tab->lock);
+
+        ir_dev->rc_tab.size = ir_roundup_tablesize(rc_tab->size);
+        ir_dev->rc_tab.scan = kzalloc(ir_dev->rc_tab.size *
+                                    sizeof(struct ir_scancode), GFP_KERNEL);
+        if (!ir_dev->rc_tab.scan)
+                return -ENOMEM;
+
+        IR_dprintk(1, "Allocated space for %d keycode entries (%zd bytes)\n",
+                ir_dev->rc_tab.size,
+                ir_dev->rc_tab.size * sizeof(ir_dev->rc_tab.scan));
+
+        ir_copy_table(&ir_dev->rc_tab, rc_tab);
+
         /* set the bits for the keys */
         IR_dprintk(1, "key map size: %d\n", rc_tab->size);
         for (i = 0; i < rc_tab->size; i++) {
@@ -407,23 +438,48 @@ int ir_set_keycode_table(struct input_dev *input_dev,
                         i, keymap[i].keycode);
                 set_bit(keymap[i].keycode, input_dev->keybit);
         }
+        clear_bit(0, input_dev->keybit);
+
+        set_bit(EV_KEY, input_dev->evbit);
 
         input_dev->getkeycode = ir_getkeycode;
         input_dev->setkeycode = ir_setkeycode;
-        input_set_drvdata(input_dev, rc_tab);
+        input_set_drvdata(input_dev, ir_dev);
 
-        return 0;
+        rc = input_register_device(input_dev);
+        if (rc < 0) {
+                kfree(rc_tab->scan);
+                kfree(ir_dev);
+                input_set_drvdata(input_dev, NULL);
+        }
+
+        return rc;
 }
+EXPORT_SYMBOL_GPL(ir_input_register);
 
-void ir_input_free(struct input_dev *dev)
+void ir_input_unregister(struct input_dev *dev)
 {
-        struct ir_scancode_table *rc_tab = input_get_drvdata(dev);
+        struct ir_input_dev *ir_dev = input_get_drvdata(dev);
+        struct ir_scancode_table *rc_tab;
+
+        if (!ir_dev)
+                return;
 
         IR_dprintk(1, "Freed keycode table\n");
 
+        rc_tab = &ir_dev->rc_tab;
         rc_tab->size = 0;
         kfree(rc_tab->scan);
         rc_tab->scan = NULL;
+
+        kfree(ir_dev);
+        input_unregister_device(dev);
 }
-EXPORT_SYMBOL_GPL(ir_input_free);
+EXPORT_SYMBOL_GPL(ir_input_unregister);
+
+int ir_core_debug;    /* ir_debug level (0,1,2) */
+EXPORT_SYMBOL_GPL(ir_core_debug);
+module_param_named(debug, ir_core_debug, int, 0644);
 
+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index ba69beeb0e21..a28541b2b1a2 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -99,6 +99,7 @@ config VIDEO_MEDIA
 comment "Multimedia drivers"
 
 source "drivers/media/common/Kconfig"
+source "drivers/media/IR/Kconfig"
 
 #
 # Tuner drivers for DVB and V4L
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 09a829d8a7e7..499b0810d019 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-obj-y += common/ video/
+obj-y += common/ IR/ video/
 
 obj-$(CONFIG_VIDEO_DEV) += radio/
 obj-$(CONFIG_DVB_CORE)  += dvb/
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index 169b337b7c9d..e3ec9639321b 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,8 +1,6 @@
 saa7146-objs    := saa7146_i2c.o saa7146_core.o
 saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
-ir-common-objs  := ir-functions.o ir-keymaps.o ir-keytable.o
 
 obj-y += tuners/
 obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
 obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
-obj-$(CONFIG_VIDEO_IR) += ir-common.o
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 620f655fa9c5..7364b9642d00 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -1,7 +1,5 @@
 #include <media/saa7146_vv.h>
 
-#define BOARD_CAN_DO_VBI(dev)   (dev->revision != 0 && dev->vv_data->vbi_minor != -1)
-
 /****************************************************************************/
 /* resource management functions, shamelessly stolen from saa7134 driver */
 
@@ -194,43 +192,24 @@ void saa7146_buffer_timeout(unsigned long data)
 
 static int fops_open(struct file *file)
 {
-        unsigned int minor = video_devdata(file)->minor;
-        struct saa7146_dev *h = NULL, *dev = NULL;
-        struct list_head *list;
+        struct video_device *vdev = video_devdata(file);
+        struct saa7146_dev *dev = video_drvdata(file);
         struct saa7146_fh *fh = NULL;
         int result = 0;
 
-        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        enum v4l2_buf_type type;
 
-        DEB_EE(("file:%p, minor:%d\n", file, minor));
+        DEB_EE(("file:%p, dev:%s\n", file, video_device_node_name(vdev)));
 
         if (mutex_lock_interruptible(&saa7146_devices_lock))
                 return -ERESTARTSYS;
 
-        list_for_each(list,&saa7146_devices) {
-                h = list_entry(list, struct saa7146_dev, item);
-                if( NULL == h->vv_data ) {
-                        DEB_D(("device %p has not registered video devices.\n",h));
-                        continue;
-                }
-                DEB_D(("trying: %p @ major %d,%d\n",h,h->vv_data->video_minor,h->vv_data->vbi_minor));
-
-                if (h->vv_data->video_minor == minor) {
-                        dev = h;
-                }
-                if (h->vv_data->vbi_minor == minor) {
-                        type = V4L2_BUF_TYPE_VBI_CAPTURE;
-                        dev = h;
-                }
-        }
-        if (NULL == dev) {
-                DEB_S(("no such video device.\n"));
-                result = -ENODEV;
-                goto out;
-        }
-
         DEB_D(("using: %p\n",dev));
 
+        type = vdev->vfl_type == VFL_TYPE_GRABBER
+             ? V4L2_BUF_TYPE_VIDEO_CAPTURE
+             : V4L2_BUF_TYPE_VBI_CAPTURE;
+
         /* check if an extension is registered */
         if( NULL == dev->ext ) {
                 DEB_S(("no extension registered for this device.\n"));
@@ -474,9 +453,6 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
            configuration data) */
         dev->ext_vv_data = ext_vv;
 
-        vv->video_minor = -1;
-        vv->vbi_minor = -1;
-
         vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);
         if( NULL == vv->d_clipping.cpu_addr ) {
                 ERR(("out of memory. aborting.\n"));
@@ -515,7 +491,6 @@ EXPORT_SYMBOL_GPL(saa7146_vv_release);
 int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
                             char *name, int type)
 {
-        struct saa7146_vv *vv = dev->vv_data;
         struct video_device *vfd;
         int err;
         int i;
@@ -543,15 +518,8 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
                 return err;
         }
 
-        if( VFL_TYPE_GRABBER == type ) {
-                vv->video_minor = vfd->minor;
-                INFO(("%s: registered device video%d [v4l2]\n",
-                        dev->name, vfd->num));
-        } else {
-                vv->vbi_minor = vfd->minor;
-                INFO(("%s: registered device vbi%d [v4l2]\n",
-                        dev->name, vfd->num));
-        }
+        INFO(("%s: registered device %s [v4l2]\n",
+                dev->name, video_device_node_name(vfd)));
 
         *vid = vfd;
         return 0;
@@ -560,16 +528,8 @@ EXPORT_SYMBOL_GPL(saa7146_register_device);
 
 int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev)
 {
-        struct saa7146_vv *vv = dev->vv_data;
-
         DEB_EE(("dev:%p\n",dev));
 
-        if ((*vid)->vfl_type == VFL_TYPE_GRABBER) {
-                vv->video_minor = -1;
-        } else {
-                vv->vbi_minor = -1;
-        }
-
         video_unregister_device(*vid);
         *vid = NULL;
 
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index 53e3f2a7d31a..f0f483ac8b89 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -589,7 +589,7 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105)
         snprintf(dm1105->ir.input_phys, sizeof(dm1105->ir.input_phys),
                 "pci-%s/ir0", pci_name(dm1105->pdev));
 
-        err = ir_input_init(input_dev, &dm1105->ir.ir, ir_type, ir_codes);
+        err = ir_input_init(input_dev, &dm1105->ir.ir, ir_type);
         if (err < 0) {
                 input_free_device(input_dev);
                 return err;
@@ -611,20 +611,14 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105)
 
         INIT_WORK(&dm1105->ir.work, dm1105_emit_key);
 
-        err = input_register_device(input_dev);
-        if (err) {
-                ir_input_free(input_dev);
-                input_free_device(input_dev);
-                return err;
-        }
+        err = ir_input_register(input_dev, ir_codes);
 
-        return 0;
+        return err;
 }
 
 void __devexit dm1105_ir_exit(struct dm1105dvb *dm1105)
 {
-        ir_input_free(dm1105->ir.input_dev);
-        input_unregister_device(dm1105->ir.input_dev);
+        ir_input_unregister(dm1105->ir.input_dev);
 }
 
 static int __devinit dm1105dvb_hw_init(struct dm1105dvb *dm1105dvb)
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 2dee1bf73577..1b249897c9fb 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -265,9 +265,13 @@ config DVB_USB_DW2102
         select DVB_TDA10021 if !DVB_FE_CUSTOMISE
         select DVB_MT312 if !DVB_FE_CUSTOMISE
         select DVB_ZL10039 if !DVB_FE_CUSTOMISE
+        select DVB_DS3000 if !DVB_FE_CUSTOMISE
+        select DVB_STB6100 if !DVB_FE_CUSTOMISE
+        select DVB_STV6110 if !DVB_FE_CUSTOMISE
+        select DVB_STV0900 if !DVB_FE_CUSTOMISE
         help
-          Say Y here to support the DvbWorld DVB-S/S2 USB2.0 receivers
-          and the TeVii S650, S630.
+          Say Y here to support the DvbWorld, TeVii, Prof DVB-S/S2 USB2.0
+          receivers.
 
 config DVB_USB_CINERGY_T2
         tristate "Terratec CinergyT2/qanu USB 2.0 DVB-T receiver"
diff --git a/drivers/media/dvb/dvb-usb/dib0700.h b/drivers/media/dvb/dvb-usb/dib0700.h
index 8b544fe79b0d..495a90577c5f 100644
--- a/drivers/media/dvb/dvb-usb/dib0700.h
+++ b/drivers/media/dvb/dvb-usb/dib0700.h
@@ -20,20 +20,22 @@ extern int dvb_usb_dib0700_debug;
 #define deb_fwdata(args...) dprintk(dvb_usb_dib0700_debug,0x04,args)
 #define deb_data(args...)   dprintk(dvb_usb_dib0700_debug,0x08,args)
 
-#define REQUEST_I2C_READ     0x2
-#define REQUEST_I2C_WRITE    0x3
-#define REQUEST_POLL_RC      0x4 /* deprecated in firmware v1.20 */
-#define REQUEST_JUMPRAM      0x8
-#define REQUEST_SET_CLOCK    0xB
-#define REQUEST_SET_GPIO     0xC
-#define REQUEST_ENABLE_VIDEO 0xF
+#define REQUEST_SET_USB_XFER_LEN    0x0 /* valid only for firmware version */
+                                        /* higher than 1.21 */
+#define REQUEST_I2C_READ            0x2
+#define REQUEST_I2C_WRITE           0x3
+#define REQUEST_POLL_RC             0x4 /* deprecated in firmware v1.20 */
+#define REQUEST_JUMPRAM             0x8
+#define REQUEST_SET_CLOCK           0xB
+#define REQUEST_SET_GPIO            0xC
+#define REQUEST_ENABLE_VIDEO        0xF
         // 1 Byte: 4MSB(1 = enable streaming, 0 = disable streaming) 4LSB(Video Mode: 0 = MPEG2 188Bytes, 1 = Analog)
         // 2 Byte: MPEG2 mode:  4MSB(1 = Master Mode, 0 = Slave Mode) 4LSB(Channel 1 = bit0, Channel 2 = bit1)
         // 2 Byte: Analog mode: 4MSB(0 = 625 lines, 1 = 525 lines)    4LSB(     "                "           )
-#define REQUEST_SET_RC       0x11
-#define REQUEST_NEW_I2C_READ 0x12
-#define REQUEST_NEW_I2C_WRITE 0x13
-#define REQUEST_GET_VERSION  0x15
+#define REQUEST_SET_RC              0x11
+#define REQUEST_NEW_I2C_READ        0x12
+#define REQUEST_NEW_I2C_WRITE       0x13
+#define REQUEST_GET_VERSION         0x15
 
 struct dib0700_state {
         u8 channel_state;
@@ -44,6 +46,8 @@ struct dib0700_state {
         u8 is_dib7000pc;
         u8 fw_use_new_i2c_api;
         u8 disable_streaming_master_mode;
+    u32 fw_version;
+    u32 nb_packet_buffer_size;
 };
 
 extern int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
index db7f7f79a66c..0d3c9a9a33be 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_core.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
@@ -17,6 +17,14 @@ int dvb_usb_dib0700_ir_proto = 1;
 module_param(dvb_usb_dib0700_ir_proto, int, 0644);
 MODULE_PARM_DESC(dvb_usb_dib0700_ir_proto, "set ir protocol (0=NEC, 1=RC5 (default), 2=RC6).");
 
+static int nb_packet_buffer_size = 21;
+module_param(nb_packet_buffer_size, int, 0644);
+MODULE_PARM_DESC(nb_packet_buffer_size,
+        "Set the dib0700 driver data buffer size. This parameter "
+        "corresponds to the number of TS packets. The actual size of "
+        "the data buffer corresponds to this parameter "
+        "multiplied by 188 (default: 21)");
+
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 
@@ -28,10 +36,14 @@ int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,
                                   REQUEST_GET_VERSION,
                                   USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
                                   b, sizeof(b), USB_CTRL_GET_TIMEOUT);
-        *hwversion  = (b[0] << 24)  | (b[1] << 16)  | (b[2] << 8)  | b[3];
-        *romversion = (b[4] << 24)  | (b[5] << 16)  | (b[6] << 8)  | b[7];
-        *ramversion = (b[8] << 24)  | (b[9] << 16)  | (b[10] << 8) | b[11];
-        *fwtype     = (b[12] << 24) | (b[13] << 16) | (b[14] << 8) | b[15];
+        if (hwversion != NULL)
+                *hwversion  = (b[0] << 24)  | (b[1] << 16)  | (b[2] << 8)  | b[3];
+        if (romversion != NULL)
+                *romversion = (b[4] << 24)  | (b[5] << 16)  | (b[6] << 8)  | b[7];
+        if (ramversion != NULL)
+                *ramversion = (b[8] << 24)  | (b[9] << 16)  | (b[10] << 8) | b[11];
+        if (fwtype != NULL)
+                *fwtype     = (b[12] << 24) | (b[13] << 16) | (b[14] << 8) | b[15];
         return ret;
 }
 
@@ -97,6 +109,27 @@ int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_
         return dib0700_ctrl_wr(d,buf,3);
 }
 
+static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets)
+{
+    struct dib0700_state *st = d->priv;
+    u8 b[3];
+    int ret;
+
+    if (st->fw_version >= 0x10201) {
+        b[0] = REQUEST_SET_USB_XFER_LEN;
+        b[1] = (nb_ts_packets >> 8)&0xff;
+        b[2] = nb_ts_packets & 0xff;
+
+        deb_info("set the USB xfer len to %i Ts packet\n", nb_ts_packets);
+
+        ret = dib0700_ctrl_wr(d, b, 3);
+    } else {
+        deb_info("this firmware does not allow to change the USB xfer len\n");
+        ret = -EIO;
+    }
+    return ret;
+}
+
 /*
  * I2C master xfer function (supported in 1.20 firmware)
  */
@@ -328,7 +361,9 @@ static int dib0700_jumpram(struct usb_device *udev, u32 address)
 int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw)
 {
         struct hexline hx;
-        int pos = 0, ret, act_len;
+        int pos = 0, ret, act_len, i, adap_num;
+        u8 b[16];
+        u32 fw_version;
 
         u8 buf[260];
 
@@ -364,6 +399,34 @@ int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw
         } else
                 ret = -EIO;
 
+        /* the number of ts packet has to be at least 1 */
+        if (nb_packet_buffer_size < 1)
+                nb_packet_buffer_size = 1;
+
+        /* get the fimware version */
+        usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+                                  REQUEST_GET_VERSION,
+                                  USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
+                                  b, sizeof(b), USB_CTRL_GET_TIMEOUT);
+        fw_version = (b[8] << 24)  | (b[9] << 16)  | (b[10] << 8) | b[11];
+
+        /* set the buffer size - DVB-USB is allocating URB buffers
+         * only after the firwmare download was successful */
+        for (i = 0; i < dib0700_device_count; i++) {
+                for (adap_num = 0; adap_num < dib0700_devices[i].num_adapters;
+                                adap_num++) {
+                        if (fw_version >= 0x10201)
+                                dib0700_devices[i].adapter[adap_num].stream.u.bulk.buffersize = 188*nb_packet_buffer_size;
+                        else {
+                                /* for fw version older than 1.20.1,
+                                 * the buffersize has to be n times 512 */
+                                dib0700_devices[i].adapter[adap_num].stream.u.bulk.buffersize = ((188*nb_packet_buffer_size+188/2)/512)*512;
+                                if (dib0700_devices[i].adapter[adap_num].stream.u.bulk.buffersize < 512)
+                                        dib0700_devices[i].adapter[adap_num].stream.u.bulk.buffersize = 512;
+                        }
+                }
+        }
+
         return ret;
 }
 
@@ -371,6 +434,18 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
 {
         struct dib0700_state *st = adap->dev->priv;
         u8 b[4];
+        int ret;
+
+        if ((onoff != 0) && (st->fw_version >= 0x10201)) {
+                /* for firmware later than 1.20.1,
+                 * the USB xfer length can be set  */
+                ret = dib0700_set_usb_xfer_len(adap->dev,
+                        st->nb_packet_buffer_size);
+                if (ret < 0) {
+                        deb_info("can not set the USB xfer len\n");
+                        return ret;
+                }
+        }
 
         b[0] = REQUEST_ENABLE_VIDEO;
         b[1] = (onoff << 4) | 0x00; /* this bit gives a kind of command, rather than enabling something or not */
@@ -415,9 +490,21 @@ static int dib0700_probe(struct usb_interface *intf,
 
         for (i = 0; i < dib0700_device_count; i++)
                 if (dvb_usb_device_init(intf, &dib0700_devices[i], THIS_MODULE,
-                                        &dev, adapter_nr) == 0)
-                {
+                    &dev, adapter_nr) == 0) {
+                        struct dib0700_state *st = dev->priv;
+                        u32 hwversion, romversion, fw_version, fwtype;
+
+                        dib0700_get_version(dev, &hwversion, &romversion,
+                                &fw_version, &fwtype);
+
+                        deb_info("Firmware version: %x, %d, 0x%x, %d\n",
+                                hwversion, romversion, fw_version, fwtype);
+
+                        st->fw_version = fw_version;
+                        st->nb_packet_buffer_size = (u32)nb_packet_buffer_size;
+
                         dib0700_rc_setup(dev);
+
                         return 0;
                 }
 
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 684146f98eb7..44972d01bbd0 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -18,6 +18,7 @@
 #include "xc5000.h"
 #include "s5h1411.h"
 #include "dib0070.h"
+#include "dib0090.h"
 #include "lgdt3305.h"
 #include "mxl5007t.h"
 
@@ -130,93 +131,95 @@ static int bristol_tuner_attach(struct dvb_usb_adapter *adap)
 /* MT226x */
 static struct dibx000_agc_config stk7700d_7000p_mt2266_agc_config[2] = {
         {
-                BAND_UHF, // band_caps
+                BAND_UHF,
 
                 /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=1, P_agc_inv_pwm1=1, P_agc_inv_pwm2=1,
                 * P_agc_inh_dc_rv_est=0, P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=2, P_agc_write=0 */
-                (0 << 15) | (0 << 14) | (1 << 11) | (1 << 10) | (1 << 9) | (0 << 8) | (3 << 5) | (0 << 4) | (5 << 1) | (0 << 0), // setup
-
-                1130,  // inv_gain
-                21,  // time_stabiliz
-
-                0,  // alpha_level
-                118,  // thlock
-
-                0,     // wbd_inv
-                3530,  // wbd_ref
-                1,     // wbd_sel
-                0,     // wbd_alpha
-
-                65535,  // agc1_max
-                33770,  // agc1_min
-                65535,  // agc2_max
-                23592,  // agc2_min
-
-                0,    // agc1_pt1
-                62,   // agc1_pt2
-                255,  // agc1_pt3
-                64,   // agc1_slope1
-                64,   // agc1_slope2
-                132,  // agc2_pt1
-                192,  // agc2_pt2
-                80,   // agc2_slope1
-                80,   // agc2_slope2
-
-                17,  // alpha_mant
-                27,  // alpha_exp
-                23,  // beta_mant
-                51,  // beta_exp
-
-                1,  // perform_agc_softsplit
+                (0 << 15) | (0 << 14) | (1 << 11) | (1 << 10) | (1 << 9) | (0 << 8)
+            | (3 << 5) | (0 << 4) | (5 << 1) | (0 << 0),
+
+                1130,
+                21,
+
+                0,
+                118,
+
+                0,
+                3530,
+                1,
+                0,
+
+                65535,
+                33770,
+                65535,
+                23592,
+
+                0,
+                62,
+                255,
+                64,
+                64,
+                132,
+                192,
+                80,
+                80,
+
+                17,
+                27,
+                23,
+                51,
+
+                1,
         }, {
-                BAND_VHF | BAND_LBAND, // band_caps
+                BAND_VHF | BAND_LBAND,
 
                 /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=1, P_agc_inv_pwm1=1, P_agc_inv_pwm2=1,
                 * P_agc_inh_dc_rv_est=0, P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=2, P_agc_write=0 */
-                (0 << 15) | (0 << 14) | (1 << 11) | (1 << 10) | (1 << 9) | (0 << 8) | (3 << 5) | (0 << 4) | (2 << 1) | (0 << 0), // setup
-
-                2372, // inv_gain
-                21,   // time_stabiliz
-
-                0,    // alpha_level
-                118,  // thlock
-
-                0,    // wbd_inv
-                3530, // wbd_ref
-                1,     // wbd_sel
-                0,    // wbd_alpha
-
-                65535, // agc1_max
-                0,     // agc1_min
-                65535, // agc2_max
-                23592, // agc2_min
-
-                0,    // agc1_pt1
-                128,  // agc1_pt2
-                128,  // agc1_pt3
-                128,  // agc1_slope1
-                0,    // agc1_slope2
-                128,  // agc2_pt1
-                253,  // agc2_pt2
-                81,   // agc2_slope1
-                0,    // agc2_slope2
-
-                17,  // alpha_mant
-                27,  // alpha_exp
-                23,  // beta_mant
-                51,  // beta_exp
-
-                1,  // perform_agc_softsplit
+                (0 << 15) | (0 << 14) | (1 << 11) | (1 << 10) | (1 << 9) | (0 << 8)
+            | (3 << 5) | (0 << 4) | (2 << 1) | (0 << 0),
+
+                2372,
+                21,
+
+                0,
+                118,
+
+                0,
+                3530,
+                1,
+                0,
+
+                65535,
+                0,
+                65535,
+                23592,
+
+                0,
+                128,
+                128,
+                128,
+                0,
+                128,
+                253,
+                81,
+                0,
+
+                17,
+                27,
+                23,
+                51,
+
+                1,
         }
 };
 
 static struct dibx000_bandwidth_config stk7700d_mt2266_pll_config = {
-        60000, 30000, // internal, sampling
-        1, 8, 3, 1, 0, // pll_cfg: prediv, ratio, range, reset, bypass
-        0, 0, 1, 1, 2, // misc: refdiv, bypclk_div, IO_CLK_en_core, ADClkSrc, modulo
-        (3 << 14) | (1 << 12) | (524 << 0), // sad_cfg: refsel, sel, freq_15k
-        0, // ifreq
-        20452225, // timf
+        60000, 30000,
+        1, 8, 3, 1, 0,
+        0, 0, 1, 1, 2,
+        (3 << 14) | (1 << 12) | (524 << 0),
+        0,
+        20452225,
 };
 
 static struct dib7000p_config stk7700d_dib7000p_mt2266_config[] = {
@@ -605,17 +608,17 @@ static int dib0700_rc_query_v1_20(struct dvb_usb_device *d, u32 *event,
                 }
                 break;
         default:
-                if (actlen != sizeof(buf)) {
-                        /* We didn't get back the 6 byte message we expected */
-                        err("Unexpected RC response size [%d]", actlen);
-                        return -1;
-                }
+        if (actlen != sizeof(buf)) {
+                /* We didn't get back the 6 byte message we expected */
+                err("Unexpected RC response size [%d]", actlen);
+                return -1;
+        }
 
-                poll_reply.report_id  = buf[0];
-                poll_reply.data_state = buf[1];
+        poll_reply.report_id  = buf[0];
+        poll_reply.data_state = buf[1];
                 poll_reply.system     = (buf[2] << 8) | buf[3];
-                poll_reply.data       = buf[4];
-                poll_reply.not_data   = buf[5];
+        poll_reply.data       = buf[4];
+        poll_reply.not_data   = buf[5];
 
                 break;
         }
@@ -632,7 +635,7 @@ static int dib0700_rc_query_v1_20(struct dvb_usb_device *d, u32 *event,
         /* Find the key in the map */
         for (i = 0; i < d->props.rc_key_map_size; i++) {
                 if (rc5_custom(&keymap[i]) == (poll_reply.system & 0xff) &&
-                    rc5_data(&keymap[i]) == poll_reply.data) {
+                        rc5_data(&keymap[i]) == poll_reply.data) {
                         *event = keymap[i].event;
                         found = 1;
                         break;
@@ -641,8 +644,8 @@ static int dib0700_rc_query_v1_20(struct dvb_usb_device *d, u32 *event,
 
         if (found == 0) {
                 err("Unknown remote controller key: %04x %02x %02x",
-                    poll_reply.system,
-                    poll_reply.data, poll_reply.not_data);
+                        poll_reply.system,
+                        poll_reply.data, poll_reply.not_data);
                 d->last_event = 0;
                 return 0;
         }
@@ -933,47 +936,48 @@ static struct dvb_usb_rc_key dib0700_rc_keys[] = {
 
 /* STK7700P: Hauppauge Nova-T Stick, AVerMedia Volar */
 static struct dibx000_agc_config stk7700p_7000m_mt2060_agc_config = {
-        BAND_UHF | BAND_VHF,       // band_caps
+        BAND_UHF | BAND_VHF,
 
         /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=5, P_agc_inv_pwm1=0, P_agc_inv_pwm2=0,
          * P_agc_inh_dc_rv_est=0, P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=2, P_agc_write=0 */
-        (0 << 15) | (0 << 14) | (5 << 11) | (0 << 10) | (0 << 9) | (0 << 8) | (3 << 5) | (0 << 4) | (2 << 1) | (0 << 0), // setup
-
-        712,  // inv_gain
-        41,  // time_stabiliz
-
-        0,  // alpha_level
-        118,  // thlock
-
-        0,     // wbd_inv
-        4095,  // wbd_ref
-        0,     // wbd_sel
-        0,     // wbd_alpha
-
-        42598,  // agc1_max
-        17694,  // agc1_min
-        45875,  // agc2_max
-        2621,  // agc2_min
-        0,  // agc1_pt1
-        76,  // agc1_pt2
-        139,  // agc1_pt3
-        52,  // agc1_slope1
-        59,  // agc1_slope2
-        107,  // agc2_pt1
-        172,  // agc2_pt2
-        57,  // agc2_slope1
-        70,  // agc2_slope2
-
-        21,  // alpha_mant
-        25,  // alpha_exp
-        28,  // beta_mant
-        48,  // beta_exp
-
-        1,  // perform_agc_softsplit
-        {  0,     // split_min
-           107,   // split_max
-           51800, // global_split_min
-           24700  // global_split_max
+        (0 << 15) | (0 << 14) | (5 << 11) | (0 << 10) | (0 << 9) | (0 << 8)
+        | (3 << 5) | (0 << 4) | (2 << 1) | (0 << 0),
+
+        712,
+        41,
+
+        0,
+        118,
+
+        0,
+        4095,
+        0,
+        0,
+
+        42598,
+        17694,
+        45875,
+        2621,
+        0,
+        76,
+        139,
+        52,
+        59,
+        107,
+        172,
+        57,
+        70,
+
+        21,
+        25,
+        28,
+        48,
+
+        1,
+        {  0,
+           107,
+           51800,
+           24700
         },
 };
 
@@ -982,54 +986,55 @@ static struct dibx000_agc_config stk7700p_7000p_mt2060_agc_config = {
 
         /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=5, P_agc_inv_pwm1=0, P_agc_inv_pwm2=0,
          * P_agc_inh_dc_rv_est=0, P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=2, P_agc_write=0 */
-        (0 << 15) | (0 << 14) | (5 << 11) | (0 << 10) | (0 << 9) | (0 << 8) | (3 << 5) | (0 << 4) | (2 << 1) | (0 << 0), // setup
+        (0 << 15) | (0 << 14) | (5 << 11) | (0 << 10) | (0 << 9) | (0 << 8)
+        | (3 << 5) | (0 << 4) | (2 << 1) | (0 << 0),
 
-        712, // inv_gain
-        41,  // time_stabiliz
+        712,
+        41,
 
-        0,   // alpha_level
-        118, // thlock
+        0,
+        118,
 
-        0,    // wbd_inv
-        4095, // wbd_ref
-        0,    // wbd_sel
-        0,    // wbd_alpha
+        0,
+        4095,
+        0,
+        0,
 
-        42598, // agc1_max
-        16384, // agc1_min
-        42598, // agc2_max
-            0, // agc2_min
+        42598,
+        16384,
+        42598,
+            0,
 
-          0,   // agc1_pt1
-        137,   // agc1_pt2
-        255,   // agc1_pt3
+          0,
+        137,
+        255,
 
-          0,   // agc1_slope1
-        255,   // agc1_slope2
+          0,
+        255,
 
-        0,     // agc2_pt1
-        0,     // agc2_pt2
+        0,
+        0,
 
-         0,    // agc2_slope1
-        41,    // agc2_slope2
+         0,
+        41,
 
-        15, // alpha_mant
-        25, // alpha_exp
+        15,
+        25,
 
-        28, // beta_mant
-        48, // beta_exp
+        28,
+        48,
 
-        0, // perform_agc_softsplit
+        0,
 };
 
 static struct dibx000_bandwidth_config stk7700p_pll_config = {
-        60000, 30000, // internal, sampling
-        1, 8, 3, 1, 0, // pll_cfg: prediv, ratio, range, reset, bypass
-        0, 0, 1, 1, 0, // misc: refdiv, bypclk_div, IO_CLK_en_core, ADClkSrc, modulo
-        (3 << 14) | (1 << 12) | (524 << 0), // sad_cfg: refsel, sel, freq_15k
-        60258167, // ifreq
-        20452225, // timf
-        30000000, // xtal
+        60000, 30000,
+        1, 8, 3, 1, 0,
+        0, 0, 1, 1, 0,
+        (3 << 14) | (1 << 12) | (524 << 0),
+        60258167,
+        20452225,
+        30000000,
 };
 
 static struct dib7000m_config stk7700p_dib7000m_config = {
@@ -1115,41 +1120,42 @@ static struct dibx000_agc_config dib7070_agc_config = {
         BAND_UHF | BAND_VHF | BAND_LBAND | BAND_SBAND,
         /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=5, P_agc_inv_pwm1=0, P_agc_inv_pwm2=0,
          * P_agc_inh_dc_rv_est=0, P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=5, P_agc_write=0 */
-        (0 << 15) | (0 << 14) | (5 << 11) | (0 << 10) | (0 << 9) | (0 << 8) | (3 << 5) | (0 << 4) | (5 << 1) | (0 << 0), // setup
-
-        600, // inv_gain
-        10,  // time_stabiliz
-
-        0,  // alpha_level
-        118,  // thlock
-
-        0,     // wbd_inv
-        3530,  // wbd_ref
-        1,     // wbd_sel
-        5,     // wbd_alpha
-
-        65535,  // agc1_max
-                0,  // agc1_min
-
-        65535,  // agc2_max
-        0,      // agc2_min
-
-        0,      // agc1_pt1
-        40,     // agc1_pt2
-        183,    // agc1_pt3
-        206,    // agc1_slope1
-        255,    // agc1_slope2
-        72,     // agc2_pt1
-        152,    // agc2_pt2
-        88,     // agc2_slope1
-        90,     // agc2_slope2
-
-        17,  // alpha_mant
-        27,  // alpha_exp
-        23,  // beta_mant
-        51,  // beta_exp
-
-        0,  // perform_agc_softsplit
+        (0 << 15) | (0 << 14) | (5 << 11) | (0 << 10) | (0 << 9) | (0 << 8)
+        | (3 << 5) | (0 << 4) | (5 << 1) | (0 << 0),
+
+        600,
+        10,
+
+        0,
+        118,
+
+        0,
+        3530,
+        1,
+        5,
+
+        65535,
+                0,
+
+        65535,
+        0,
+
+        0,
+        40,
+        183,
+        206,
+        255,
+        72,
+        152,
+        88,
+        90,
+
+        17,
+        27,
+        23,
+        51,
+
+        0,
 };
 
 static int dib7070_tuner_reset(struct dvb_frontend *fe, int onoff)
@@ -1276,13 +1282,13 @@ static int stk70x0p_pid_filter_ctrl(struct dvb_usb_adapter *adapter, int onoff)
 }
 
 static struct dibx000_bandwidth_config dib7070_bw_config_12_mhz = {
-        60000, 15000, // internal, sampling
-        1, 20, 3, 1, 0, // pll_cfg: prediv, ratio, range, reset, bypass
-        0, 0, 1, 1, 2, // misc: refdiv, bypclk_div, IO_CLK_en_core, ADClkSrc, modulo
-        (3 << 14) | (1 << 12) | (524 << 0), // sad_cfg: refsel, sel, freq_15k
-        (0 << 25) | 0, // ifreq = 0.000000 MHz
-        20452225, // timf
-        12000000, // xtal_hz
+        60000, 15000,
+        1, 20, 3, 1, 0,
+        0, 0, 1, 1, 2,
+        (3 << 14) | (1 << 12) | (524 << 0),
+        (0 << 25) | 0,
+        20452225,
+        12000000,
 };
 
 static struct dib7000p_config dib7070p_dib7000p_config = {
@@ -1476,12 +1482,12 @@ static struct dib8000_config dib807x_dib8000_config[2] = {
         }
 };
 
-static int dib807x_tuner_reset(struct dvb_frontend *fe, int onoff)
+static int dib80xx_tuner_reset(struct dvb_frontend *fe, int onoff)
 {
         return dib8000_set_gpio(fe, 5, 0, !onoff);
 }
 
-static int dib807x_tuner_sleep(struct dvb_frontend *fe, int onoff)
+static int dib80xx_tuner_sleep(struct dvb_frontend *fe, int onoff)
 {
         return dib8000_set_gpio(fe, 0, 0, onoff);
 }
@@ -1494,8 +1500,8 @@ static const struct dib0070_wbd_gain_cfg dib8070_wbd_gain_cfg[] = {
 static struct dib0070_config dib807x_dib0070_config[2] = {
         {
                 .i2c_address = DEFAULT_DIB0070_I2C_ADDRESS,
-                .reset = dib807x_tuner_reset,
-                .sleep = dib807x_tuner_sleep,
+                .reset = dib80xx_tuner_reset,
+                .sleep = dib80xx_tuner_sleep,
                 .clock_khz = 12000,
                 .clock_pad_drive = 4,
                 .vga_filter = 1,
@@ -1508,8 +1514,8 @@ static struct dib0070_config dib807x_dib0070_config[2] = {
                 .freq_offset_khz_vhf = -100,
         }, {
                 .i2c_address = DEFAULT_DIB0070_I2C_ADDRESS,
-                .reset = dib807x_tuner_reset,
-                .sleep = dib807x_tuner_sleep,
+                .reset = dib80xx_tuner_reset,
+                .sleep = dib80xx_tuner_sleep,
                 .clock_khz = 12000,
                 .clock_pad_drive = 2,
                 .vga_filter = 1,
@@ -1566,12 +1572,14 @@ static int dib807x_tuner_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
-static int stk807x_pid_filter(struct dvb_usb_adapter *adapter, int index, u16 pid, int onoff)
+static int stk80xx_pid_filter(struct dvb_usb_adapter *adapter, int index,
+        u16 pid, int onoff)
 {
     return dib8000_pid_filter(adapter->fe, index, pid, onoff);
 }
 
-static int stk807x_pid_filter_ctrl(struct dvb_usb_adapter *adapter, int onoff)
+static int stk80xx_pid_filter_ctrl(struct dvb_usb_adapter *adapter,
+        int onoff)
 {
     return dib8000_pid_filter_ctrl(adapter->fe, onoff);
 }
@@ -1624,7 +1632,7 @@ static int stk807xpvr_frontend_attach0(struct dvb_usb_adapter *adap)
         dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);
 
         /* initialize IC 0 */
-        dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x12, 0x80);
+        dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x22, 0x80);
 
         adap->fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x80,
                               &dib807x_dib8000_config[0]);
@@ -1635,7 +1643,7 @@ static int stk807xpvr_frontend_attach0(struct dvb_usb_adapter *adap)
 static int stk807xpvr_frontend_attach1(struct dvb_usb_adapter *adap)
 {
         /* initialize IC 1 */
-        dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x22, 0x82);
+        dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x12, 0x82);
 
         adap->fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x82,
                               &dib807x_dib8000_config[1]);
@@ -1643,6 +1651,245 @@ static int stk807xpvr_frontend_attach1(struct dvb_usb_adapter *adap)
         return adap->fe == NULL ? -ENODEV : 0;
 }
 
+/* STK8096GP */
+struct dibx000_agc_config dib8090_agc_config[2] = {
+    {
+        BAND_UHF | BAND_VHF | BAND_LBAND | BAND_SBAND,
+        /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=1,
+     * P_agc_inv_pwm1=0, P_agc_inv_pwm2=0, P_agc_inh_dc_rv_est=0,
+     * P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=5, P_agc_write=0 */
+        (0 << 15) | (0 << 14) | (5 << 11) | (0 << 10) | (0 << 9) | (0 << 8)
+        | (3 << 5) | (0 << 4) | (5 << 1) | (0 << 0),
+
+        787,
+        10,
+
+        0,
+        118,
+
+        0,
+        3530,
+        1,
+        5,
+
+        65535,
+        0,
+
+        65535,
+        0,
+
+        0,
+        32,
+        114,
+        143,
+        144,
+        114,
+        227,
+        116,
+        117,
+
+        28,
+        26,
+        31,
+        51,
+
+        0,
+    },
+    {
+        BAND_CBAND,
+        /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=1,
+     * P_agc_inv_pwm1=0, P_agc_inv_pwm2=0, P_agc_inh_dc_rv_est=0,
+     * P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=5, P_agc_write=0 */
+        (0 << 15) | (0 << 14) | (5 << 11) | (0 << 10) | (0 << 9) | (0 << 8)
+        | (3 << 5) | (0 << 4) | (5 << 1) | (0 << 0),
+
+        787,
+        10,
+
+        0,
+        118,
+
+        0,
+        3530,
+        1,
+        5,
+
+        0,
+        0,
+
+        65535,
+        0,
+
+        0,
+        32,
+        114,
+        143,
+        144,
+        114,
+        227,
+        116,
+        117,
+
+        28,
+        26,
+        31,
+        51,
+
+        0,
+    }
+};
+
+static struct dibx000_bandwidth_config dib8090_pll_config_12mhz = {
+    54000, 13500,
+    1, 18, 3, 1, 0,
+    0, 0, 1, 1, 2,
+    (3 << 14) | (1 << 12) | (599 << 0),
+    (0 << 25) | 0,
+    20199727,
+    12000000,
+};
+
+static int dib8090_get_adc_power(struct dvb_frontend *fe)
+{
+    return dib8000_get_adc_power(fe, 1);
+}
+
+static struct dib8000_config dib809x_dib8000_config = {
+    .output_mpeg2_in_188_bytes = 1,
+
+    .agc_config_count = 2,
+    .agc = dib8090_agc_config,
+    .agc_control = dib0090_dcc_freq,
+    .pll = &dib8090_pll_config_12mhz,
+    .tuner_is_baseband = 1,
+
+    .gpio_dir = DIB8000_GPIO_DEFAULT_DIRECTIONS,
+    .gpio_val = DIB8000_GPIO_DEFAULT_VALUES,
+    .gpio_pwm_pos = DIB8000_GPIO_DEFAULT_PWM_POS,
+
+    .hostbus_diversity = 1,
+    .div_cfg = 0x31,
+    .output_mode = OUTMODE_MPEG2_FIFO,
+    .drives = 0x2d98,
+    .diversity_delay = 144,
+    .refclksel = 3,
+};
+
+static struct dib0090_config dib809x_dib0090_config = {
+    .io.pll_bypass = 1,
+    .io.pll_range = 1,
+    .io.pll_prediv = 1,
+    .io.pll_loopdiv = 20,
+    .io.adc_clock_ratio = 8,
+    .io.pll_int_loop_filt = 0,
+    .io.clock_khz = 12000,
+    .reset = dib80xx_tuner_reset,
+    .sleep = dib80xx_tuner_sleep,
+    .clkouttobamse = 1,
+    .analog_output = 1,
+    .i2c_address = DEFAULT_DIB0090_I2C_ADDRESS,
+    .wbd_vhf_offset = 100,
+    .wbd_cband_offset = 450,
+    .use_pwm_agc = 1,
+    .clkoutdrive = 1,
+    .get_adc_power = dib8090_get_adc_power,
+        .freq_offset_khz_uhf = 0,
+        .freq_offset_khz_vhf = -143,
+};
+
+static int dib8096_set_param_override(struct dvb_frontend *fe,
+                struct dvb_frontend_parameters *fep)
+{
+    struct dvb_usb_adapter *adap = fe->dvb->priv;
+    struct dib0700_adapter_state *state = adap->priv;
+    u8 band = BAND_OF_FREQUENCY(fep->frequency/1000);
+    u16 offset;
+    int ret = 0;
+    enum frontend_tune_state tune_state = CT_SHUTDOWN;
+    u16 ltgain, rf_gain_limit;
+
+    ret = state->set_param_save(fe, fep);
+    if (ret < 0)
+        return ret;
+
+    switch (band) {
+    case BAND_VHF:
+            offset = 100;
+            break;
+    case BAND_UHF:
+            offset = 550;
+            break;
+    default:
+            offset = 0;
+            break;
+    }
+    offset += (dib0090_get_wbd_offset(fe) * 8 * 18 / 33 + 1) / 2;
+    dib8000_set_wbd_ref(fe, offset);
+
+
+    if (band == BAND_CBAND) {
+        deb_info("tuning in CBAND - soft-AGC startup\n");
+        /* TODO specific wbd target for dib0090 - needed for startup ? */
+        dib0090_set_tune_state(fe, CT_AGC_START);
+        do {
+                ret = dib0090_gain_control(fe);
+                msleep(ret);
+                tune_state = dib0090_get_tune_state(fe);
+                if (tune_state == CT_AGC_STEP_0)
+                        dib8000_set_gpio(fe, 6, 0, 1);
+                else if (tune_state == CT_AGC_STEP_1) {
+                        dib0090_get_current_gain(fe, NULL, NULL, &rf_gain_limit, &ltgain);
+                        if (rf_gain_limit == 0)
+                                dib8000_set_gpio(fe, 6, 0, 0);
+                }
+        } while (tune_state < CT_AGC_STOP);
+        dib0090_pwm_gain_reset(fe);
+        dib8000_pwm_agc_reset(fe);
+        dib8000_set_tune_state(fe, CT_DEMOD_START);
+    } else {
+        deb_info("not tuning in CBAND - standard AGC startup\n");
+        dib0090_pwm_gain_reset(fe);
+    }
+
+    return 0;
+}
+
+static int dib809x_tuner_attach(struct dvb_usb_adapter *adap)
+{
+    struct dib0700_adapter_state *st = adap->priv;
+    struct i2c_adapter *tun_i2c = dib8000_get_i2c_master(adap->fe, DIBX000_I2C_INTERFACE_TUNER, 1);
+
+    if (dvb_attach(dib0090_register, adap->fe, tun_i2c, &dib809x_dib0090_config) == NULL)
+        return -ENODEV;
+
+    st->set_param_save = adap->fe->ops.tuner_ops.set_params;
+    adap->fe->ops.tuner_ops.set_params = dib8096_set_param_override;
+    return 0;
+}
+
+static int stk809x_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        dib0700_set_gpio(adap->dev, GPIO6, GPIO_OUT, 1);
+        msleep(10);
+        dib0700_set_gpio(adap->dev, GPIO9, GPIO_OUT, 1);
+        dib0700_set_gpio(adap->dev, GPIO4, GPIO_OUT, 1);
+        dib0700_set_gpio(adap->dev, GPIO7, GPIO_OUT, 1);
+
+        dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 0);
+
+        dib0700_ctrl_clock(adap->dev, 72, 1);
+
+        msleep(10);
+        dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 1);
+        msleep(10);
+        dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);
+
+        dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 18, 0x80);
+
+        adap->fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x80, &dib809x_dib8000_config);
+
+        return adap->fe == NULL ?  -ENODEV : 0;
+}
 
 /* STK7070PD */
 static struct dib7000p_config stk7070pd_dib7000p_config[2] = {
@@ -1929,14 +2176,17 @@ struct usb_device_id dib0700_usb_id_table[] = {
         { USB_DEVICE(USB_VID_YUAN,      USB_PID_YUAN_STK7700D) },
 /* 55 */{ USB_DEVICE(USB_VID_YUAN,      USB_PID_YUAN_STK7700D_2) },
         { USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV73A) },
-        { USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV73ESE) },
-        { USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV282E) },
+        { USB_DEVICE(USB_VID_PCTV,      USB_PID_PINNACLE_PCTV73ESE) },
+        { USB_DEVICE(USB_VID_PCTV,      USB_PID_PINNACLE_PCTV282E) },
         { USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK7770P) },
 /* 60 */{ USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_CINERGY_T_XXS_2) },
         { USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK807XPVR) },
         { USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK807XP) },
         { USB_DEVICE(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD) },
         { USB_DEVICE(USB_VID_EVOLUTEPC, USB_PID_TVWAY_PLUS) },
+/* 65 */{ USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV73ESE) },
+        { USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV282E) },
+        { USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK8096GP) },
         { 0 }           /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -2238,11 +2488,11 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                 { NULL },
                         },
                         {   "Pinnacle PCTV 73e SE",
-                                { &dib0700_usb_id_table[57], NULL },
+                                { &dib0700_usb_id_table[57], &dib0700_usb_id_table[65], NULL },
                                 { NULL },
                         },
                         {   "Pinnacle PCTV 282e",
-                                { &dib0700_usb_id_table[58], NULL },
+                                { &dib0700_usb_id_table[58], &dib0700_usb_id_table[66], NULL },
                                 { NULL },
                         },
                 },
@@ -2471,8 +2721,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         {
                                 .caps  = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
                                 .pid_filter_count = 32,
-                                .pid_filter = stk807x_pid_filter,
-                                .pid_filter_ctrl = stk807x_pid_filter_ctrl,
+                                .pid_filter = stk80xx_pid_filter,
+                                .pid_filter_ctrl = stk80xx_pid_filter_ctrl,
                                 .frontend_attach  = stk807x_frontend_attach,
                                 .tuner_attach     = dib807x_tuner_attach,
 
@@ -2510,8 +2760,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         {
                                 .caps  = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
                                 .pid_filter_count = 32,
-                                .pid_filter = stk807x_pid_filter,
-                                .pid_filter_ctrl = stk807x_pid_filter_ctrl,
+                                .pid_filter = stk80xx_pid_filter,
+                                .pid_filter_ctrl = stk80xx_pid_filter_ctrl,
                                 .frontend_attach  = stk807xpvr_frontend_attach0,
                                 .tuner_attach     = dib807x_tuner_attach,
 
@@ -2523,8 +2773,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         {
                                 .caps  = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
                                 .pid_filter_count = 32,
-                                .pid_filter = stk807x_pid_filter,
-                                .pid_filter_ctrl = stk807x_pid_filter_ctrl,
+                                .pid_filter = stk80xx_pid_filter,
+                                .pid_filter_ctrl = stk80xx_pid_filter_ctrl,
                                 .frontend_attach  = stk807xpvr_frontend_attach1,
                                 .tuner_attach     = dib807x_tuner_attach,
 
@@ -2547,6 +2797,37 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                 .rc_key_map       = dib0700_rc_keys,
                 .rc_key_map_size  = ARRAY_SIZE(dib0700_rc_keys),
                 .rc_query         = dib0700_rc_query
+        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
+                .num_adapters = 1,
+                .adapter = {
+                        {
+                                .caps  = DVB_USB_ADAP_HAS_PID_FILTER |
+                                        DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+                                .pid_filter_count = 32,
+                                .pid_filter = stk80xx_pid_filter,
+                                .pid_filter_ctrl = stk80xx_pid_filter_ctrl,
+                                .frontend_attach  = stk809x_frontend_attach,
+                                .tuner_attach     = dib809x_tuner_attach,
+
+                                DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+
+                                .size_of_priv =
+                                        sizeof(struct dib0700_adapter_state),
+                        },
+                },
+
+                .num_device_descs = 1,
+                .devices = {
+                        {   "DiBcom STK8096GP reference design",
+                                { &dib0700_usb_id_table[67], NULL },
+                                { NULL },
+                        },
+                },
+
+                .rc_interval      = DEFAULT_RC_INTERVAL,
+                .rc_key_map       = dib0700_rc_keys,
+                .rc_key_map_size  = ARRAY_SIZE(dib0700_rc_keys),
+                .rc_query         = dib0700_rc_query
         },
 };
 
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index da34979b5337..9143b5631e88 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -142,8 +142,13 @@ static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num
                 } else if ((msg[i].flags & I2C_M_RD) == 0) {
                         if (dibusb_i2c_msg(d, msg[i].addr, msg[i].buf,msg[i].len,NULL,0) < 0)
                                 break;
-                } else
-                        break;
+                } else if (msg[i].addr != 0x50) {
+                        /* 0x50 is the address of the eeprom - we need to protect it
+                         * from dibusb's bad i2c implementation: reads without
+                         * writing the offset before are forbidden */
+                        if (dibusb_i2c_msg(d, msg[i].addr, NULL, 0, msg[i].buf, msg[i].len) < 0)
+                                break;
+                }
         }
 
         mutex_unlock(&d->i2c_mutex);
@@ -243,6 +248,12 @@ static struct dib3000mc_config mod3000p_dib3000p_config = {
 
 int dibusb_dib3000mc_frontend_attach(struct dvb_usb_adapter *adap)
 {
+        if (adap->dev->udev->descriptor.idVendor  == USB_VID_LITEON &&
+                        adap->dev->udev->descriptor.idProduct ==
+                        USB_PID_LITEON_DVB_T_WARM) {
+                msleep(1000);
+        }
+
         if ((adap->fe = dvb_attach(dib3000mc_attach, &adap->dev->i2c_adap, DEFAULT_DIB3000P_I2C_ADDRESS,  &mod3000p_dib3000p_config)) != NULL ||
                 (adap->fe = dvb_attach(dib3000mc_attach, &adap->dev->i2c_adap, DEFAULT_DIB3000MC_I2C_ADDRESS, &mod3000p_dib3000p_config)) != NULL) {
                 if (adap->priv != NULL) {
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index f1602d4ace6d..bc3581d58ced 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -47,6 +47,7 @@
 #define USB_VID_MSI_2                           0x1462
 #define USB_VID_OPERA1                          0x695c
 #define USB_VID_PINNACLE                        0x2304
+#define USB_VID_PCTV                            0x2013
 #define USB_VID_PIXELVIEW                       0x1554
 #define USB_VID_TECHNOTREND                     0x0b48
 #define USB_VID_TERRATEC                        0x0ccd
@@ -101,6 +102,7 @@
 #define USB_PID_DIBCOM_STK7070PD                        0x1ebe
 #define USB_PID_DIBCOM_STK807XP                         0x1f90
 #define USB_PID_DIBCOM_STK807XPVR                       0x1f98
+#define USB_PID_DIBCOM_STK8096GP                        0x1fa0
 #define USB_PID_DIBCOM_ANCHOR_2135_COLD                 0x2131
 #define USB_PID_DIBCOM_STK7770P                         0x1e80
 #define USB_PID_DPOSH_M9206_COLD                        0x9206
@@ -211,6 +213,7 @@
 #define USB_PID_PINNACLE_PCTV801E_SE                    0x023b
 #define USB_PID_PINNACLE_PCTV73A                        0x0243
 #define USB_PID_PINNACLE_PCTV73ESE                      0x0245
+#define USB_PID_PINNACLE_PCTV74E                        0x0246
 #define USB_PID_PINNACLE_PCTV282E                       0x0248
 #define USB_PID_PIXELVIEW_SBTVD                         0x5010
 #define USB_PID_PCTV_200E                               0x020e
diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
index 5bb9479d154e..64132c0cf80d 100644
--- a/drivers/media/dvb/dvb-usb/dw2102.c
+++ b/drivers/media/dvb/dvb-usb/dw2102.c
@@ -20,6 +20,11 @@
 #include "tda1002x.h"
 #include "mt312.h"
 #include "zl10039.h"
+#include "ds3000.h"
+#include "stv0900.h"
+#include "stv6110.h"
+#include "stb6100.h"
+#include "stb6100_proc.h"
 
 #ifndef USB_PID_DW2102
 #define USB_PID_DW2102 0x2102
@@ -37,12 +42,20 @@
 #define USB_PID_CINERGY_S 0x0064
 #endif
 
+#ifndef USB_PID_TEVII_S630
+#define USB_PID_TEVII_S630 0xd630
+#endif
+
 #ifndef USB_PID_TEVII_S650
 #define USB_PID_TEVII_S650 0xd650
 #endif
 
-#ifndef USB_PID_TEVII_S630
-#define USB_PID_TEVII_S630 0xd630
+#ifndef USB_PID_TEVII_S660
+#define USB_PID_TEVII_S660 0xd660
+#endif
+
+#ifndef USB_PID_PROF_1100
+#define USB_PID_PROF_1100 0xb012
 #endif
 
 #define DW210X_READ_MSG 0
@@ -55,6 +68,10 @@
 #define DW2102_VOLTAGE_CTRL (0x1800)
 #define DW2102_RC_QUERY (0x1a00)
 
+#define err_str "did not find the firmware file. (%s) " \
+                "Please see linux/Documentation/dvb/ for more details " \
+                "on firmware-problems."
+
 struct dvb_usb_rc_keys_table {
         struct dvb_usb_rc_key *rc_keys;
         int rc_keys_size;
@@ -71,6 +88,12 @@ static int ir_keymap;
 module_param_named(keymap, ir_keymap, int, 0644);
 MODULE_PARM_DESC(keymap, "set keymap 0=default 1=dvbworld 2=tevii 3=tbs  ...");
 
+/* demod probe */
+static int demod_probe = 1;
+module_param_named(demod, demod_probe, int, 0644);
+MODULE_PARM_DESC(demod, "demod to probe (1=cx24116 2=stv0903+stv6110 "
+                        "4=stv0903+stb6100(or-able)).");
+
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 static int dw210x_op_rw(struct usb_device *dev, u8 request, u16 value,
@@ -183,7 +206,7 @@ static int dw2102_serit_i2c_transfer(struct i2c_adapter *adap,
         switch (num) {
         case 2:
                 /* read si2109 register by number */
-                buf6[0] = 0xd0;
+                buf6[0] = msg[0].addr << 1;
                 buf6[1] = msg[0].len;
                 buf6[2] = msg[0].buf[0];
                 ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
@@ -198,7 +221,7 @@ static int dw2102_serit_i2c_transfer(struct i2c_adapter *adap,
                 switch (msg[0].addr) {
                 case 0x68:
                         /* write to si2109 register */
-                        buf6[0] = 0xd0;
+                        buf6[0] = msg[0].addr << 1;
                         buf6[1] = msg[0].len;
                         memcpy(buf6 + 2, msg[0].buf, msg[0].len);
                         ret = dw210x_op_rw(d->udev, 0xc2, 0, 0, buf6,
@@ -239,7 +262,7 @@ static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg ms
                 /* read */
                 /* first write first register number */
                 u8 ibuf[msg[1].len + 2], obuf[3];
-                obuf[0] = 0xd0;
+                obuf[0] = msg[0].addr << 1;
                 obuf[1] = msg[0].len;
                 obuf[2] = msg[0].buf[0];
                 ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
@@ -256,7 +279,7 @@ static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg ms
                 case 0x68: {
                         /* write to register */
                         u8 obuf[msg[0].len + 2];
-                        obuf[0] = 0xd0;
+                        obuf[0] = msg[0].addr << 1;
                         obuf[1] = msg[0].len;
                         memcpy(obuf + 2, msg[0].buf, msg[0].len);
                         ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
@@ -266,7 +289,7 @@ static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg ms
                 case 0x61: {
                         /* write to tuner */
                         u8 obuf[msg[0].len + 2];
-                        obuf[0] = 0xc2;
+                        obuf[0] = msg[0].addr << 1;
                         obuf[1] = msg[0].len;
                         memcpy(obuf + 2, msg[0].buf, msg[0].len);
                         ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
@@ -301,78 +324,78 @@ static int dw2104_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], i
 {
         struct dvb_usb_device *d = i2c_get_adapdata(adap);
         int ret = 0;
-        int len, i;
+        int len, i, j;
 
         if (!d)
                 return -ENODEV;
         if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
                 return -EAGAIN;
 
-        switch (num) {
-        case 2: {
-                /* read */
-                /* first write first register number */
-                u8 ibuf[msg[1].len + 2], obuf[3];
-                obuf[0] = 0xaa;
-                obuf[1] = msg[0].len;
-                obuf[2] = msg[0].buf[0];
-                ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
-                                obuf, msg[0].len + 2, DW210X_WRITE_MSG);
-                /* second read registers */
-                ret = dw210x_op_rw(d->udev, 0xc3, 0xab , 0,
-                                ibuf, msg[1].len + 2, DW210X_READ_MSG);
-                memcpy(msg[1].buf, ibuf + 2, msg[1].len);
-
-                break;
-        }
-        case 1:
-                switch (msg[0].addr) {
-                case 0x55: {
-                        if (msg[0].buf[0] == 0xf7) {
-                                /* firmware */
-                                /* Write in small blocks */
-                                u8 obuf[19];
-                                obuf[0] = 0xaa;
-                                obuf[1] = 0x11;
-                                obuf[2] = 0xf7;
-                                len = msg[0].len - 1;
-                                i = 1;
-                                do {
-                                        memcpy(obuf + 3, msg[0].buf + i, (len > 16 ? 16 : len));
-                                        ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
-                                                obuf, (len > 16 ? 16 : len) + 3, DW210X_WRITE_MSG);
-                                        i += 16;
-                                        len -= 16;
-                                } while (len > 0);
-                        } else {
-                                /* write to register */
-                                u8 obuf[msg[0].len + 2];
-                                obuf[0] = 0xaa;
-                                obuf[1] = msg[0].len;
-                                memcpy(obuf + 2, msg[0].buf, msg[0].len);
-                                ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
-                                                obuf, msg[0].len + 2, DW210X_WRITE_MSG);
-                        }
-                        break;
-                }
+        for (j = 0; j < num; j++) {
+                switch (msg[j].addr) {
                 case(DW2102_RC_QUERY): {
                         u8 ibuf[2];
                         ret  = dw210x_op_rw(d->udev, 0xb8, 0, 0,
                                         ibuf, 2, DW210X_READ_MSG);
-                        memcpy(msg[0].buf, ibuf , 2);
+                        memcpy(msg[j].buf, ibuf , 2);
                         break;
                 }
                 case(DW2102_VOLTAGE_CTRL): {
                         u8 obuf[2];
                         obuf[0] = 0x30;
-                        obuf[1] = msg[0].buf[0];
+                        obuf[1] = msg[j].buf[0];
                         ret = dw210x_op_rw(d->udev, 0xb2, 0, 0,
                                         obuf, 2, DW210X_WRITE_MSG);
                         break;
                 }
+                /*case 0x55: cx24116
+                case 0x6a: stv0903
+                case 0x68: ds3000, stv0903
+                case 0x60: ts2020, stv6110, stb6100 */
+                default: {
+                        if (msg[j].flags == I2C_M_RD) {
+                                /* read registers */
+                                u8  ibuf[msg[j].len + 2];
+                                ret = dw210x_op_rw(d->udev, 0xc3,
+                                                (msg[j].addr << 1) + 1, 0,
+                                                ibuf, msg[j].len + 2,
+                                                DW210X_READ_MSG);
+                                memcpy(msg[j].buf, ibuf + 2, msg[j].len);
+                        mdelay(10);
+                        } else if (((msg[j].buf[0] == 0xb0) &&
+                                                (msg[j].addr == 0x68)) ||
+                                                ((msg[j].buf[0] == 0xf7) &&
+                                                (msg[j].addr == 0x55))) {
+                                /* write firmware */
+                                u8 obuf[19];
+                                obuf[0] = msg[j].addr << 1;
+                                obuf[1] = (msg[j].len > 15 ? 17 : msg[j].len);
+                                obuf[2] = msg[j].buf[0];
+                                len = msg[j].len - 1;
+                                i = 1;
+                                do {
+                                        memcpy(obuf + 3, msg[j].buf + i,
+                                                        (len > 16 ? 16 : len));
+                                        ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
+                                                obuf, (len > 16 ? 16 : len) + 3,
+                                                DW210X_WRITE_MSG);
+                                        i += 16;
+                                        len -= 16;
+                                } while (len > 0);
+                        } else {
+                                /* write registers */
+                                u8 obuf[msg[j].len + 2];
+                                obuf[0] = msg[j].addr << 1;
+                                obuf[1] = msg[j].len;
+                                memcpy(obuf + 2, msg[j].buf, msg[j].len);
+                                ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
+                                                obuf, msg[j].len + 2,
+                                                DW210X_WRITE_MSG);
+                        }
+                        break;
+                }
                 }
 
-                break;
         }
 
         mutex_unlock(&d->i2c_mutex);
@@ -442,63 +465,85 @@ static int dw3101_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
         return num;
 }
 
-static int s630_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+static int s6x0_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                                                                 int num)
 {
         struct dvb_usb_device *d = i2c_get_adapdata(adap);
         int ret = 0;
+        int len, i, j;
 
         if (!d)
                 return -ENODEV;
         if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
                 return -EAGAIN;
 
-        switch (num) {
-        case 2: { /* read */
-                u8 ibuf[msg[1].len], obuf[3];
-                obuf[0] = msg[1].len;
-                obuf[1] = (msg[0].addr << 1);
-                obuf[2] = msg[0].buf[0];
-
-                ret = dw210x_op_rw(d->udev, 0x90, 0, 0,
-                                        obuf, 3, DW210X_WRITE_MSG);
-                msleep(5);
-                ret = dw210x_op_rw(d->udev, 0x91, 0, 0,
-                                        ibuf, msg[1].len, DW210X_READ_MSG);
-                memcpy(msg[1].buf, ibuf, msg[1].len);
-                break;
-        }
-        case 1:
-                switch (msg[0].addr) {
-                case 0x60:
-                case 0x0e: {
-                        /* write to zl10313, zl10039 register, */
-                        u8 obuf[msg[0].len + 2];
-                        obuf[0] = msg[0].len + 1;
-                        obuf[1] = (msg[0].addr << 1);
-                        memcpy(obuf + 2, msg[0].buf, msg[0].len);
-                        ret = dw210x_op_rw(d->udev, 0x80, 0, 0,
-                                        obuf, msg[0].len + 2, DW210X_WRITE_MSG);
-                        break;
-                }
+        for (j = 0; j < num; j++) {
+                switch (msg[j].addr) {
                 case (DW2102_RC_QUERY): {
                         u8 ibuf[4];
                         ret  = dw210x_op_rw(d->udev, 0xb8, 0, 0,
                                         ibuf, 4, DW210X_READ_MSG);
-                        msg[0].buf[0] = ibuf[3];
+                        memcpy(msg[j].buf, ibuf + 1, 2);
                         break;
                 }
                 case (DW2102_VOLTAGE_CTRL): {
                         u8 obuf[2];
-                        obuf[0] = 0x03;
-                        obuf[1] = msg[0].buf[0];
+                        obuf[0] = 3;
+                        obuf[1] = msg[j].buf[0];
                         ret = dw210x_op_rw(d->udev, 0x8a, 0, 0,
                                         obuf, 2, DW210X_WRITE_MSG);
                         break;
                 }
+                /*case 0x55: cx24116
+                case 0x6a: stv0903
+                case 0x68: ds3000, stv0903
+                case 0x60: ts2020, stv6110, stb6100
+                case 0xa0: eeprom */
+                default: {
+                        if (msg[j].flags == I2C_M_RD) {
+                                /* read registers */
+                                u8 ibuf[msg[j].len];
+                                ret = dw210x_op_rw(d->udev, 0x91, 0, 0,
+                                                ibuf, msg[j].len,
+                                                DW210X_READ_MSG);
+                                memcpy(msg[j].buf, ibuf, msg[j].len);
+                                break;
+                        } else if ((msg[j].buf[0] == 0xb0) &&
+                                                (msg[j].addr == 0x68)) {
+                                /* write firmware */
+                                u8 obuf[19];
+                                obuf[0] = (msg[j].len > 16 ?
+                                                18 : msg[j].len + 1);
+                                obuf[1] = msg[j].addr << 1;
+                                obuf[2] = msg[j].buf[0];
+                                len = msg[j].len - 1;
+                                i = 1;
+                                do {
+                                        memcpy(obuf + 3, msg[j].buf + i,
+                                                        (len > 16 ? 16 : len));
+                                        ret = dw210x_op_rw(d->udev, 0x80, 0, 0,
+                                                obuf, (len > 16 ? 16 : len) + 3,
+                                                DW210X_WRITE_MSG);
+                                        i += 16;
+                                        len -= 16;
+                                } while (len > 0);
+                        } else {
+                                /* write registers */
+                                u8 obuf[msg[j].len + 2];
+                                obuf[0] = msg[j].len + 1;
+                                obuf[1] = (msg[j].addr << 1);
+                                memcpy(obuf + 2, msg[j].buf, msg[j].len);
+                                ret = dw210x_op_rw(d->udev,
+                                                (num > 1 ? 0x90 : 0x80), 0, 0,
+                                                obuf, msg[j].len + 2,
+                                                DW210X_WRITE_MSG);
+                                break;
+                        }
+                        break;
+                }
                 }
 
-                break;
+                msleep(3);
         }
 
         mutex_unlock(&d->i2c_mutex);
@@ -535,8 +580,8 @@ static struct i2c_algorithm dw3101_i2c_algo = {
         .functionality = dw210x_i2c_func,
 };
 
-static struct i2c_algorithm s630_i2c_algo = {
-        .master_xfer = s630_i2c_transfer,
+static struct i2c_algorithm s6x0_i2c_algo = {
+        .master_xfer = s6x0_i2c_transfer,
         .functionality = dw210x_i2c_func,
 };
 
@@ -564,25 +609,34 @@ static int dw210x_read_mac_address(struct dvb_usb_device *d, u8 mac[6])
         return 0;
 };
 
-static int s630_read_mac_address(struct dvb_usb_device *d, u8 mac[6])
+static int s6x0_read_mac_address(struct dvb_usb_device *d, u8 mac[6])
 {
         int i, ret;
-        u8 buf[3], eeprom[256], eepromline[16];
+        u8 ibuf[] = { 0 }, obuf[] = { 0 };
+        u8 eeprom[256], eepromline[16];
+        struct i2c_msg msg[] = {
+                {
+                        .addr = 0xa0 >> 1,
+                        .flags = 0,
+                        .buf = obuf,
+                        .len = 1,
+                }, {
+                        .addr = 0xa0 >> 1,
+                        .flags = I2C_M_RD,
+                        .buf = ibuf,
+                        .len = 1,
+                }
+        };
 
         for (i = 0; i < 256; i++) {
-                buf[0] = 1;
-                buf[1] = 0xa0;
-                buf[2] = i;
-                ret = dw210x_op_rw(d->udev, 0x90, 0, 0,
-                                        buf, 3, DW210X_WRITE_MSG);
-                ret = dw210x_op_rw(d->udev, 0x91, 0, 0,
-                                        buf, 1, DW210X_READ_MSG);
-                if (ret < 0) {
+                obuf[0] = i;
+                ret = s6x0_i2c_transfer(&d->i2c_adap, msg, 2);
+                if (ret != 2) {
                         err("read eeprom failed.");
                         return -1;
                 } else {
-                        eepromline[i % 16] = buf[0];
-                        eeprom[i] = buf[0];
+                        eepromline[i % 16] = ibuf[0];
+                        eeprom[i] = ibuf[0];
                 }
 
                 if ((i % 16) == 15) {
@@ -644,19 +698,104 @@ static struct mt312_config zl313_config = {
         .demod_address = 0x0e,
 };
 
+static struct ds3000_config dw2104_ds3000_config = {
+        .demod_address = 0x68,
+};
+
+static struct stv0900_config dw2104a_stv0900_config = {
+        .demod_address = 0x6a,
+        .demod_mode = 0,
+        .xtal = 27000000,
+        .clkmode = 3,/* 0-CLKI, 2-XTALI, else AUTO */
+        .diseqc_mode = 2,/* 2/3 PWM */
+        .tun1_maddress = 0,/* 0x60 */
+        .tun1_adc = 0,/* 2 Vpp */
+        .path1_mode = 3,
+};
+
+static struct stb6100_config dw2104a_stb6100_config = {
+        .tuner_address = 0x60,
+        .refclock = 27000000,
+};
+
+static struct stv0900_config dw2104_stv0900_config = {
+        .demod_address = 0x68,
+        .demod_mode = 0,
+        .xtal = 8000000,
+        .clkmode = 3,
+        .diseqc_mode = 2,
+        .tun1_maddress = 0,
+        .tun1_adc = 1,/* 1 Vpp */
+        .path1_mode = 3,
+};
+
+static struct stv6110_config dw2104_stv6110_config = {
+        .i2c_address = 0x60,
+        .mclk = 16000000,
+        .clk_div = 1,
+};
+
 static int dw2104_frontend_attach(struct dvb_usb_adapter *d)
 {
-        if ((d->fe = dvb_attach(cx24116_attach, &dw2104_config,
-                        &d->dev->i2c_adap)) != NULL) {
+        struct dvb_tuner_ops *tuner_ops = NULL;
+
+        if (demod_probe & 4) {
+                d->fe = dvb_attach(stv0900_attach, &dw2104a_stv0900_config,
+                                &d->dev->i2c_adap, 0);
+                if (d->fe != NULL) {
+                        if (dvb_attach(stb6100_attach, d->fe,
+                                        &dw2104a_stb6100_config,
+                                        &d->dev->i2c_adap)) {
+                                tuner_ops = &d->fe->ops.tuner_ops;
+                                tuner_ops->set_frequency = stb6100_set_freq;
+                                tuner_ops->get_frequency = stb6100_get_freq;
+                                tuner_ops->set_bandwidth = stb6100_set_bandw;
+                                tuner_ops->get_bandwidth = stb6100_get_bandw;
+                                d->fe->ops.set_voltage = dw210x_set_voltage;
+                                info("Attached STV0900+STB6100!\n");
+                                return 0;
+                        }
+                }
+        }
+
+        if (demod_probe & 2) {
+                d->fe = dvb_attach(stv0900_attach, &dw2104_stv0900_config,
+                                &d->dev->i2c_adap, 0);
+                if (d->fe != NULL) {
+                        if (dvb_attach(stv6110_attach, d->fe,
+                                        &dw2104_stv6110_config,
+                                        &d->dev->i2c_adap)) {
+                                d->fe->ops.set_voltage = dw210x_set_voltage;
+                                info("Attached STV0900+STV6110A!\n");
+                                return 0;
+                        }
+                }
+        }
+
+        if (demod_probe & 1) {
+                d->fe = dvb_attach(cx24116_attach, &dw2104_config,
+                                &d->dev->i2c_adap);
+                if (d->fe != NULL) {
+                        d->fe->ops.set_voltage = dw210x_set_voltage;
+                        info("Attached cx24116!\n");
+                        return 0;
+                }
+        }
+
+        d->fe = dvb_attach(ds3000_attach, &dw2104_ds3000_config,
+                        &d->dev->i2c_adap);
+        if (d->fe != NULL) {
                 d->fe->ops.set_voltage = dw210x_set_voltage;
-                info("Attached cx24116!\n");
+                info("Attached DS3000!\n");
                 return 0;
         }
+
         return -EIO;
 }
 
 static struct dvb_usb_device_properties dw2102_properties;
 static struct dvb_usb_device_properties dw2104_properties;
+static struct dvb_usb_device_properties s6x0_properties;
 
 static int dw2102_frontend_attach(struct dvb_usb_adapter *d)
 {
@@ -670,14 +809,17 @@ static int dw2102_frontend_attach(struct dvb_usb_adapter *d)
                         return 0;
                 }
         }
+
         if (dw2102_properties.i2c_algo == &dw2102_earda_i2c_algo) {
-                /*dw2102_properties.adapter->tuner_attach = dw2102_tuner_attach;*/
                 d->fe = dvb_attach(stv0288_attach, &earda_config,
                                         &d->dev->i2c_adap);
                 if (d->fe != NULL) {
-                        d->fe->ops.set_voltage = dw210x_set_voltage;
-                        info("Attached stv0288!\n");
-                        return 0;
+                        if (dvb_attach(stb6000_attach, d->fe, 0x61,
+                                        &d->dev->i2c_adap)) {
+                                d->fe->ops.set_voltage = dw210x_set_voltage;
+                                info("Attached stv0288!\n");
+                                return 0;
+                        }
                 }
         }
 
@@ -705,15 +847,38 @@ static int dw3101_frontend_attach(struct dvb_usb_adapter *d)
         return -EIO;
 }
 
-static int s630_frontend_attach(struct dvb_usb_adapter *d)
+static int s6x0_frontend_attach(struct dvb_usb_adapter *d)
 {
         d->fe = dvb_attach(mt312_attach, &zl313_config,
-                                &d->dev->i2c_adap);
+                        &d->dev->i2c_adap);
+        if (d->fe != NULL) {
+                if (dvb_attach(zl10039_attach, d->fe, 0x60,
+                                &d->dev->i2c_adap)) {
+                        d->fe->ops.set_voltage = dw210x_set_voltage;
+                        info("Attached zl100313+zl10039!\n");
+                        return 0;
+                }
+        }
+
+        d->fe = dvb_attach(stv0288_attach, &earda_config,
+                        &d->dev->i2c_adap);
+        if (d->fe != NULL) {
+                if (dvb_attach(stb6000_attach, d->fe, 0x61,
+                                &d->dev->i2c_adap)) {
+                        d->fe->ops.set_voltage = dw210x_set_voltage;
+                        info("Attached stv0288+stb6000!\n");
+                        return 0;
+                }
+        }
+
+        d->fe = dvb_attach(ds3000_attach, &dw2104_ds3000_config,
+                        &d->dev->i2c_adap);
         if (d->fe != NULL) {
                 d->fe->ops.set_voltage = dw210x_set_voltage;
-                info("Attached zl10313!\n");
+                info("Attached ds3000+ds2020!\n");
                 return 0;
         }
+
         return -EIO;
 }
 
@@ -724,14 +889,6 @@ static int dw2102_tuner_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
-static int dw2102_earda_tuner_attach(struct dvb_usb_adapter *adap)
-{
-        dvb_attach(stb6000_attach, adap->fe, 0x61,
-                &adap->dev->i2c_adap);
-
-        return 0;
-}
-
 static int dw3101_tuner_attach(struct dvb_usb_adapter *adap)
 {
         dvb_attach(dvb_pll_attach, adap->fe, 0x60,
@@ -740,14 +897,6 @@ static int dw3101_tuner_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
-static int s630_zl10039_tuner_attach(struct dvb_usb_adapter *adap)
-{
-        dvb_attach(zl10039_attach, adap->fe, 0x60,
-                &adap->dev->i2c_adap);
-
-        return 0;
-}
-
 static struct dvb_usb_rc_key dw210x_rc_keys[] = {
         { 0xf80a, KEY_Q },              /*power*/
         { 0xf80c, KEY_M },              /*mute*/
@@ -922,6 +1071,8 @@ static struct usb_device_id dw2102_table[] = {
         {USB_DEVICE(USB_VID_TERRATEC, USB_PID_CINERGY_S)},
         {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW3101)},
         {USB_DEVICE(0x9022, USB_PID_TEVII_S630)},
+        {USB_DEVICE(0x3011, USB_PID_PROF_1100)},
+        {USB_DEVICE(0x9022, USB_PID_TEVII_S660)},
         { }
 };
 
@@ -935,15 +1086,13 @@ static int dw2102_load_firmware(struct usb_device *dev,
         u8 reset;
         u8 reset16[] = {0, 0, 0, 0, 0, 0, 0};
         const struct firmware *fw;
-        const char *filename = "dvb-usb-dw2101.fw";
+        const char *fw_2101 = "dvb-usb-dw2101.fw";
 
         switch (dev->descriptor.idProduct) {
         case 0x2101:
-                ret = request_firmware(&fw, filename, &dev->dev);
+                ret = request_firmware(&fw, fw_2101, &dev->dev);
                 if (ret != 0) {
-                        err("did not find the firmware file. (%s) "
-                        "Please see linux/Documentation/dvb/ for more details "
-                        "on firmware-problems.", filename);
+                        err(err_str, fw_2101);
                         return ret;
                 }
                 break;
@@ -983,6 +1132,11 @@ static int dw2102_load_firmware(struct usb_device *dev,
                 }
                 /* init registers */
                 switch (dev->descriptor.idProduct) {
+                case USB_PID_PROF_1100:
+                        s6x0_properties.rc_key_map = tbs_rc_keys;
+                        s6x0_properties.rc_key_map_size =
+                                        ARRAY_SIZE(tbs_rc_keys);
+                        break;
                 case USB_PID_TEVII_S650:
                         dw2104_properties.rc_key_map = tevii_rc_keys;
                         dw2104_properties.rc_key_map_size =
@@ -1021,7 +1175,6 @@ static int dw2102_load_firmware(struct usb_device *dev,
                                                 DW210X_READ_MSG);
                                 if (reset16[2] == 0x11) {
                                         dw2102_properties.i2c_algo = &dw2102_earda_i2c_algo;
-                                        dw2102_properties.adapter->tuner_attach = &dw2102_earda_tuner_attach;
                                         break;
                                 }
                         }
@@ -1184,13 +1337,13 @@ static struct dvb_usb_device_properties dw3101_properties = {
         }
 };
 
-static struct dvb_usb_device_properties s630_properties = {
+static struct dvb_usb_device_properties s6x0_properties = {
         .caps = DVB_USB_IS_AN_I2C_ADAPTER,
         .usb_ctrl = DEVICE_SPECIFIC,
         .firmware = "dvb-usb-s630.fw",
         .no_reconnect = 1,
 
-        .i2c_algo = &s630_i2c_algo,
+        .i2c_algo = &s6x0_i2c_algo,
         .rc_key_map = tevii_rc_keys,
         .rc_key_map_size = ARRAY_SIZE(tevii_rc_keys),
         .rc_interval = 150,
@@ -1199,12 +1352,12 @@ static struct dvb_usb_device_properties s630_properties = {
         .generic_bulk_ctrl_endpoint = 0x81,
         .num_adapters = 1,
         .download_firmware = dw2102_load_firmware,
-        .read_mac_address = s630_read_mac_address,
+        .read_mac_address = s6x0_read_mac_address,
         .adapter = {
                 {
-                        .frontend_attach = s630_frontend_attach,
+                        .frontend_attach = s6x0_frontend_attach,
                         .streaming_ctrl = NULL,
-                        .tuner_attach = s630_zl10039_tuner_attach,
+                        .tuner_attach = NULL,
                         .stream = {
                                 .type = USB_BULK,
                                 .count = 8,
@@ -1217,12 +1370,20 @@ static struct dvb_usb_device_properties s630_properties = {
                         },
                 }
         },
-        .num_device_descs = 1,
+        .num_device_descs = 3,
         .devices = {
                 {"TeVii S630 USB",
                         {&dw2102_table[6], NULL},
                         {NULL},
                 },
+                {"Prof 1100 USB ",
+                        {&dw2102_table[7], NULL},
+                        {NULL},
+                },
+                {"TeVii S660 USB",
+                        {&dw2102_table[8], NULL},
+                        {NULL},
+                },
         }
 };
 
@@ -1235,10 +1396,10 @@ static int dw2102_probe(struct usb_interface *intf,
                         THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &dw3101_properties,
                         THIS_MODULE, NULL, adapter_nr) ||
-            0 == dvb_usb_device_init(intf, &s630_properties,
-                        THIS_MODULE, NULL, adapter_nr)) {
+            0 == dvb_usb_device_init(intf, &s6x0_properties,
+                        THIS_MODULE, NULL, adapter_nr))
                 return 0;
-        }
+
         return -ENODEV;
 }
 
@@ -1269,6 +1430,7 @@ module_exit(dw2102_module_exit);
 MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by");
 MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104,"
                                 " DVB-C 3101 USB2.0,"
-                                " TeVii S600, S630, S650 USB2.0 devices");
+                                " TeVii S600, S630, S650, S660 USB2.0,"
+                                " Prof 1100 USB2.0 devices");
 MODULE_VERSION("0.1");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/friio-fe.c b/drivers/media/dvb/dvb-usb/friio-fe.c
index 9cbbe42ca44b..ebb7b9fd115b 100644
--- a/drivers/media/dvb/dvb-usb/friio-fe.c
+++ b/drivers/media/dvb/dvb-usb/friio-fe.c
@@ -134,11 +134,13 @@ static int jdvbt90502_pll_set_freq(struct jdvbt90502_state *state, u32 freq)
         deb_fe("%s: freq=%d, step=%d\n", __func__, freq,
                state->frontend.ops.info.frequency_stepsize);
         /* freq -> oscilator frequency conversion. */
-        /* freq: 473,000,000 + n*6,000,000 (no 1/7MHz shift to center freq) */
-        /* add 400[1/7 MHZ] = 57.142857MHz.   57MHz for the IF,  */
-        /*                                   1/7MHz for center freq shift */
+        /* freq: 473,000,000 + n*6,000,000 [+ 142857 (center freq. shift)] */
         f = freq / state->frontend.ops.info.frequency_stepsize;
-        f += 400;
+        /* add 399[1/7 MHZ] = 57MHz for the IF  */
+        f += 399;
+        /* add center frequency shift if necessary */
+        if (f % 7 == 0)
+                f++;
         pll_freq_cmd[DEMOD_REDIRECT_REG] = JDVBT90502_2ND_I2C_REG; /* 0xFE */
         pll_freq_cmd[ADDRESS_BYTE] = state->config.pll_address << 1;
         pll_freq_cmd[DIVIDER_BYTE1] = (f >> 8) & 0x7F;
diff --git a/drivers/media/dvb/dvb-usb/gp8psk-fe.c b/drivers/media/dvb/dvb-usb/gp8psk-fe.c
index 20eadf9318e0..7a7f1b2b681c 100644
--- a/drivers/media/dvb/dvb-usb/gp8psk-fe.c
+++ b/drivers/media/dvb/dvb-usb/gp8psk-fe.c
@@ -146,8 +146,8 @@ static int gp8psk_fe_set_frontend(struct dvb_frontend* fe,
 
         switch (c->delivery_system) {
         case SYS_DVBS:
-                /* Only QPSK is supported for DVB-S */
-                if (c->modulation != QPSK) {
+                /* Allow QPSK and 8PSK (even for DVB-S) */
+                if (c->modulation != QPSK && c->modulation != PSK_8) {
                         deb_fe("%s: unsupported modulation selected (%d)\n",
                                 __func__, c->modulation);
                         return -EOPNOTSUPP;
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 58aac018f109..a3b8b697349b 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -526,6 +526,15 @@ config DVB_TUNER_DIB0070
           This device is only used inside a SiP called together with a
           demodulator for now.
 
+config DVB_TUNER_DIB0090
+        tristate "DiBcom DiB0090 silicon base-band tuner"
+        depends on I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A driver for the silicon baseband tuner DiB0090 from DiBcom.
+          This device is only used inside a SiP called together with a
+          demodulator for now.
+
 comment "SEC control devices for DVB-S"
         depends on DVB_CORE
 
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
index 823482535d11..47575cc7b699 100644
--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_DVB_TDA10086) += tda10086.o
 obj-$(CONFIG_DVB_TDA826X) += tda826x.o
 obj-$(CONFIG_DVB_TDA8261) += tda8261.o
 obj-$(CONFIG_DVB_TUNER_DIB0070) += dib0070.o
+obj-$(CONFIG_DVB_TUNER_DIB0090) += dib0090.o
 obj-$(CONFIG_DVB_TUA6100) += tua6100.o
 obj-$(CONFIG_DVB_S5H1409) += s5h1409.o
 obj-$(CONFIG_DVB_TUNER_ITD1000) += itd1000.o
diff --git a/drivers/media/dvb/frontends/au8522_decoder.c b/drivers/media/dvb/frontends/au8522_decoder.c
index 2dc2723b724a..24268ef2753d 100644
--- a/drivers/media/dvb/frontends/au8522_decoder.c
+++ b/drivers/media/dvb/frontends/au8522_decoder.c
@@ -62,7 +62,7 @@ struct au8522_register_config {
    The values are as follows from left to right
    0="ATV RF" 1="ATV RF13" 2="CVBS" 3="S-Video" 4="PAL" 5=CVBS13" 6="SVideo13"
 */
-struct au8522_register_config filter_coef[] = {
+static const struct au8522_register_config filter_coef[] = {
         {AU8522_FILTER_COEF_R410, {0x25, 0x00, 0x25, 0x25, 0x00, 0x00, 0x00} },
         {AU8522_FILTER_COEF_R411, {0x20, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00} },
         {AU8522_FILTER_COEF_R412, {0x03, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00} },
@@ -104,7 +104,7 @@ struct au8522_register_config filter_coef[] = {
    0="SIF" 1="ATVRF/ATVRF13"
    Note: the "ATVRF/ATVRF13" mode has never been tested
 */
-struct au8522_register_config lpfilter_coef[] = {
+static const struct au8522_register_config lpfilter_coef[] = {
         {0x060b, {0x21, 0x0b} },
         {0x060c, {0xad, 0xad} },
         {0x060d, {0x70, 0xf0} },
diff --git a/drivers/media/dvb/frontends/dib0070.c b/drivers/media/dvb/frontends/dib0070.c
index 2be17b93e0bd..0d12763603b4 100644
--- a/drivers/media/dvb/frontends/dib0070.c
+++ b/drivers/media/dvb/frontends/dib0070.c
@@ -49,21 +49,6 @@ MODULE_PARM_DESC(debug, "turn on debugging (default: 0)");
 #define DIB0070_P1G  0x03
 #define DIB0070S_P1A 0x02
 
-enum frontend_tune_state {
-        CT_TUNER_START = 10,
-        CT_TUNER_STEP_0,
-        CT_TUNER_STEP_1,
-        CT_TUNER_STEP_2,
-        CT_TUNER_STEP_3,
-        CT_TUNER_STEP_4,
-        CT_TUNER_STEP_5,
-        CT_TUNER_STEP_6,
-        CT_TUNER_STEP_7,
-        CT_TUNER_STOP,
-};
-
-#define FE_CALLBACK_TIME_NEVER 0xffffffff
-
 struct dib0070_state {
         struct i2c_adapter *i2c;
         struct dvb_frontend *fe;
@@ -71,10 +56,10 @@ struct dib0070_state {
         u16 wbd_ff_offset;
         u8 revision;
 
-        enum frontend_tune_state tune_state;
-        u32 current_rf;
+    enum frontend_tune_state tune_state;
+    u32 current_rf;
 
-        /* for the captrim binary search */
+    /* for the captrim binary search */
         s8 step;
         u16 adc_diff;
 
@@ -85,7 +70,7 @@ struct dib0070_state {
         const struct dib0070_tuning *current_tune_table_index;
         const struct dib0070_lna_match *lna_match;
 
-        u8 wbd_gain_current;
+    u8  wbd_gain_current;
         u16 wbd_offset_3_3[2];
 };
 
@@ -93,8 +78,8 @@ static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg)
 {
         u8 b[2];
         struct i2c_msg msg[2] = {
-                {.addr = state->cfg->i2c_address,.flags = 0,.buf = &reg,.len = 1},
-                {.addr = state->cfg->i2c_address,.flags = I2C_M_RD,.buf = b,.len = 2},
+                { .addr = state->cfg->i2c_address, .flags = 0,        .buf = &reg, .len = 1 },
+                { .addr = state->cfg->i2c_address, .flags = I2C_M_RD, .buf = b,  .len = 2 },
         };
         if (i2c_transfer(state->i2c, msg, 2) != 2) {
                 printk(KERN_WARNING "DiB0070 I2C read failed\n");
@@ -106,7 +91,7 @@ static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg)
 static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val)
 {
         u8 b[3] = { reg, val >> 8, val & 0xff };
-        struct i2c_msg msg = {.addr = state->cfg->i2c_address,.flags = 0,.buf = b,.len = 3 };
+        struct i2c_msg msg = { .addr = state->cfg->i2c_address, .flags = 0, .buf = b, .len = 3 };
         if (i2c_transfer(state->i2c, &msg, 1) != 1) {
                 printk(KERN_WARNING "DiB0070 I2C write failed\n");
                 return -EREMOTEIO;
@@ -124,30 +109,30 @@ static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val)
 
 static int dib0070_set_bandwidth(struct dvb_frontend *fe, struct dvb_frontend_parameters *ch)
 {
-        struct dib0070_state *state = fe->tuner_priv;
-        u16 tmp = dib0070_read_reg(state, 0x02) & 0x3fff;
-
-        if (state->fe->dtv_property_cache.bandwidth_hz / 1000 > 7000)
-                tmp |= (0 << 14);
-        else if (state->fe->dtv_property_cache.bandwidth_hz / 1000 > 6000)
-                tmp |= (1 << 14);
-        else if (state->fe->dtv_property_cache.bandwidth_hz / 1000 > 5000)
-                tmp |= (2 << 14);
-        else
-                tmp |= (3 << 14);
-
-        dib0070_write_reg(state, 0x02, tmp);
-
-        /* sharpen the BB filter in ISDB-T to have higher immunity to adjacent channels */
-        if (state->fe->dtv_property_cache.delivery_system == SYS_ISDBT) {
-                u16 value = dib0070_read_reg(state, 0x17);
-
-                dib0070_write_reg(state, 0x17, value & 0xfffc);
-                tmp = dib0070_read_reg(state, 0x01) & 0x01ff;
-                dib0070_write_reg(state, 0x01, tmp | (60 << 9));
-
-                dib0070_write_reg(state, 0x17, value);
-        }
+    struct dib0070_state *state = fe->tuner_priv;
+    u16 tmp = dib0070_read_reg(state, 0x02) & 0x3fff;
+
+    if (state->fe->dtv_property_cache.bandwidth_hz/1000 > 7000)
+        tmp |= (0 << 14);
+    else if (state->fe->dtv_property_cache.bandwidth_hz/1000 > 6000)
+        tmp |= (1 << 14);
+    else if (state->fe->dtv_property_cache.bandwidth_hz/1000 > 5000)
+        tmp |= (2 << 14);
+    else
+        tmp |= (3 << 14);
+
+    dib0070_write_reg(state, 0x02, tmp);
+
+    /* sharpen the BB filter in ISDB-T to have higher immunity to adjacent channels */
+    if (state->fe->dtv_property_cache.delivery_system == SYS_ISDBT) {
+        u16 value = dib0070_read_reg(state, 0x17);
+
+        dib0070_write_reg(state, 0x17, value & 0xfffc);
+        tmp = dib0070_read_reg(state, 0x01) & 0x01ff;
+        dib0070_write_reg(state, 0x01, tmp | (60 << 9));
+
+        dib0070_write_reg(state, 0x17, value);
+    }
         return 0;
 }
 
@@ -160,14 +145,14 @@ static int dib0070_captrim(struct dib0070_state *state, enum frontend_tune_state
         if (*tune_state == CT_TUNER_STEP_0) {
 
                 dib0070_write_reg(state, 0x0f, 0xed10);
-                dib0070_write_reg(state, 0x17, 0x0034);
+                dib0070_write_reg(state, 0x17,    0x0034);
 
                 dib0070_write_reg(state, 0x18, 0x0032);
                 state->step = state->captrim = state->fcaptrim = 64;
                 state->adc_diff = 3000;
                 ret = 20;
 
-                *tune_state = CT_TUNER_STEP_1;
+        *tune_state = CT_TUNER_STEP_1;
         } else if (*tune_state == CT_TUNER_STEP_1) {
                 state->step /= 2;
                 dib0070_write_reg(state, 0x14, state->lo4 | state->captrim);
@@ -178,7 +163,7 @@ static int dib0070_captrim(struct dib0070_state *state, enum frontend_tune_state
 
                 adc = dib0070_read_reg(state, 0x19);
 
-                dprintk("CAPTRIM=%hd; ADC = %hd (ADC) & %dmV", state->captrim, adc, (u32) adc * (u32) 1800 / (u32) 1024);
+                dprintk("CAPTRIM=%hd; ADC = %hd (ADC) & %dmV", state->captrim, adc, (u32) adc*(u32)1800/(u32)1024);
 
                 if (adc >= 400) {
                         adc -= 400;
@@ -193,6 +178,8 @@ static int dib0070_captrim(struct dib0070_state *state, enum frontend_tune_state
                         state->adc_diff = adc;
                         state->fcaptrim = state->captrim;
 
+
+
                 }
                 state->captrim += (step_sign * state->step);
 
@@ -213,7 +200,7 @@ static int dib0070_captrim(struct dib0070_state *state, enum frontend_tune_state
 static int dib0070_set_ctrl_lo5(struct dvb_frontend *fe, u8 vco_bias_trim, u8 hf_div_trim, u8 cp_current, u8 third_order_filt)
 {
         struct dib0070_state *state = fe->tuner_priv;
-        u16 lo5 = (third_order_filt << 14) | (0 << 13) | (1 << 12) | (3 << 9) | (cp_current << 6) | (hf_div_trim << 3) | (vco_bias_trim << 0);
+    u16 lo5 = (third_order_filt << 14) | (0 << 13) | (1 << 12) | (3 << 9) | (cp_current << 6) | (hf_div_trim << 3) | (vco_bias_trim << 0);
         dprintk("CTRL_LO5: 0x%x", lo5);
         return dib0070_write_reg(state, 0x15, lo5);
 }
@@ -227,99 +214,99 @@ void dib0070_ctrl_agc_filter(struct dvb_frontend *fe, u8 open)
                 dib0070_write_reg(state, 0x1a, 0x0000);
         } else {
                 dib0070_write_reg(state, 0x1b, 0x4112);
-                if (state->cfg->vga_filter != 0) {
-                        dib0070_write_reg(state, 0x1a, state->cfg->vga_filter);
-                        dprintk("vga filter register is set to %x", state->cfg->vga_filter);
-                } else
-                        dib0070_write_reg(state, 0x1a, 0x0009);
+        if (state->cfg->vga_filter != 0) {
+                dib0070_write_reg(state, 0x1a, state->cfg->vga_filter);
+                dprintk("vga filter register is set to %x", state->cfg->vga_filter);
+        } else
+                dib0070_write_reg(state, 0x1a, 0x0009);
         }
 }
 
 EXPORT_SYMBOL(dib0070_ctrl_agc_filter);
 struct dib0070_tuning {
-        u32 max_freq;           /* for every frequency less than or equal to that field: this information is correct */
-        u8 switch_trim;
-        u8 vco_band;
-        u8 hfdiv;
-        u8 vco_multi;
-        u8 presc;
-        u8 wbdmux;
-        u16 tuner_enable;
+    u32 max_freq; /* for every frequency less than or equal to that field: this information is correct */
+    u8 switch_trim;
+    u8 vco_band;
+    u8 hfdiv;
+    u8 vco_multi;
+    u8 presc;
+    u8 wbdmux;
+    u16 tuner_enable;
 };
 
 struct dib0070_lna_match {
-        u32 max_freq;           /* for every frequency less than or equal to that field: this information is correct */
-        u8 lna_band;
+    u32 max_freq; /* for every frequency less than or equal to that field: this information is correct */
+    u8 lna_band;
 };
 
 static const struct dib0070_tuning dib0070s_tuning_table[] = {
-        {570000, 2, 1, 3, 6, 6, 2, 0x4000 | 0x0800},    /* UHF */
-        {700000, 2, 0, 2, 4, 2, 2, 0x4000 | 0x0800},
-        {863999, 2, 1, 2, 4, 2, 2, 0x4000 | 0x0800},
-        {1500000, 0, 1, 1, 2, 2, 4, 0x2000 | 0x0400},   /* LBAND */
-        {1600000, 0, 1, 1, 2, 2, 4, 0x2000 | 0x0400},
-        {2000000, 0, 1, 1, 2, 2, 4, 0x2000 | 0x0400},
-        {0xffffffff, 0, 0, 8, 1, 2, 1, 0x8000 | 0x1000},        /* SBAND */
+    {     570000, 2, 1, 3, 6, 6, 2, 0x4000 | 0x0800 }, /* UHF */
+    {     700000, 2, 0, 2, 4, 2, 2, 0x4000 | 0x0800 },
+    {     863999, 2, 1, 2, 4, 2, 2, 0x4000 | 0x0800 },
+    {    1500000, 0, 1, 1, 2, 2, 4, 0x2000 | 0x0400 }, /* LBAND */
+    {    1600000, 0, 1, 1, 2, 2, 4, 0x2000 | 0x0400 },
+    {    2000000, 0, 1, 1, 2, 2, 4, 0x2000 | 0x0400 },
+    { 0xffffffff, 0, 0, 8, 1, 2, 1, 0x8000 | 0x1000 }, /* SBAND */
 };
 
 static const struct dib0070_tuning dib0070_tuning_table[] = {
-        {115000, 1, 0, 7, 24, 2, 1, 0x8000 | 0x1000},   /* FM below 92MHz cannot be tuned */
-        {179500, 1, 0, 3, 16, 2, 1, 0x8000 | 0x1000},   /* VHF */
-        {189999, 1, 1, 3, 16, 2, 1, 0x8000 | 0x1000},
-        {250000, 1, 0, 6, 12, 2, 1, 0x8000 | 0x1000},
-        {569999, 2, 1, 5, 6, 2, 2, 0x4000 | 0x0800},    /* UHF */
-        {699999, 2, 0, 1, 4, 2, 2, 0x4000 | 0x0800},
-        {863999, 2, 1, 1, 4, 2, 2, 0x4000 | 0x0800},
-        {0xffffffff, 0, 1, 0, 2, 2, 4, 0x2000 | 0x0400},        /* LBAND or everything higher than UHF */
+    {     115000, 1, 0, 7, 24, 2, 1, 0x8000 | 0x1000 }, /* FM below 92MHz cannot be tuned */
+    {     179500, 1, 0, 3, 16, 2, 1, 0x8000 | 0x1000 }, /* VHF */
+    {     189999, 1, 1, 3, 16, 2, 1, 0x8000 | 0x1000 },
+    {     250000, 1, 0, 6, 12, 2, 1, 0x8000 | 0x1000 },
+    {     569999, 2, 1, 5,  6, 2, 2, 0x4000 | 0x0800 }, /* UHF */
+    {     699999, 2, 0, 1,  4, 2, 2, 0x4000 | 0x0800 },
+    {     863999, 2, 1, 1,  4, 2, 2, 0x4000 | 0x0800 },
+    { 0xffffffff, 0, 1, 0,  2, 2, 4, 0x2000 | 0x0400 }, /* LBAND or everything higher than UHF */
 };
 
 static const struct dib0070_lna_match dib0070_lna_flip_chip[] = {
-        {180000, 0},            /* VHF */
-        {188000, 1},
-        {196400, 2},
-        {250000, 3},
-        {550000, 0},            /* UHF */
-        {590000, 1},
-        {666000, 3},
-        {864000, 5},
-        {1500000, 0},           /* LBAND or everything higher than UHF */
-        {1600000, 1},
-        {2000000, 3},
-        {0xffffffff, 7},
+    {     180000, 0 }, /* VHF */
+    {     188000, 1 },
+    {     196400, 2 },
+    {     250000, 3 },
+    {     550000, 0 }, /* UHF */
+    {     590000, 1 },
+    {     666000, 3 },
+    {     864000, 5 },
+    {    1500000, 0 }, /* LBAND or everything higher than UHF */
+    {    1600000, 1 },
+    {    2000000, 3 },
+    { 0xffffffff, 7 },
 };
 
 static const struct dib0070_lna_match dib0070_lna[] = {
-        {180000, 0},            /* VHF */
-        {188000, 1},
-        {196400, 2},
-        {250000, 3},
-        {550000, 2},            /* UHF */
-        {650000, 3},
-        {750000, 5},
-        {850000, 6},
-        {864000, 7},
-        {1500000, 0},           /* LBAND or everything higher than UHF */
-        {1600000, 1},
-        {2000000, 3},
-        {0xffffffff, 7},
+    {     180000, 0 }, /* VHF */
+    {     188000, 1 },
+    {     196400, 2 },
+    {     250000, 3 },
+    {     550000, 2 }, /* UHF */
+    {     650000, 3 },
+    {     750000, 5 },
+    {     850000, 6 },
+    {     864000, 7 },
+    {    1500000, 0 }, /* LBAND or everything higher than UHF */
+    {    1600000, 1 },
+    {    2000000, 3 },
+    { 0xffffffff, 7 },
 };
 
-#define LPF     100             // define for the loop filter 100kHz by default 16-07-06
+#define LPF     100
 static int dib0070_tune_digital(struct dvb_frontend *fe, struct dvb_frontend_parameters *ch)
 {
-        struct dib0070_state *state = fe->tuner_priv;
+    struct dib0070_state *state = fe->tuner_priv;
 
-        const struct dib0070_tuning *tune;
-        const struct dib0070_lna_match *lna_match;
+    const struct dib0070_tuning *tune;
+    const struct dib0070_lna_match *lna_match;
 
-        enum frontend_tune_state *tune_state = &state->tune_state;
-        int ret = 10;           /* 1ms is the default delay most of the time */
+    enum frontend_tune_state *tune_state = &state->tune_state;
+    int ret = 10; /* 1ms is the default delay most of the time */
 
-        u8 band = (u8) BAND_OF_FREQUENCY(fe->dtv_property_cache.frequency / 1000);
-        u32 freq = fe->dtv_property_cache.frequency / 1000 + (band == BAND_VHF ? state->cfg->freq_offset_khz_vhf : state->cfg->freq_offset_khz_uhf);
+    u8  band = (u8)BAND_OF_FREQUENCY(fe->dtv_property_cache.frequency/1000);
+    u32 freq = fe->dtv_property_cache.frequency/1000 + (band == BAND_VHF ? state->cfg->freq_offset_khz_vhf : state->cfg->freq_offset_khz_uhf);
 
 #ifdef CONFIG_SYS_ISDBT
-        if (state->fe->dtv_property_cache.delivery_system == SYS_ISDBT && state->fe->dtv_property_cache.isdbt_sb_mode == 1)
+    if (state->fe->dtv_property_cache.delivery_system == SYS_ISDBT && state->fe->dtv_property_cache.isdbt_sb_mode == 1)
                 if (((state->fe->dtv_property_cache.isdbt_sb_segment_count % 2)
                      && (state->fe->dtv_property_cache.isdbt_sb_segment_idx == ((state->fe->dtv_property_cache.isdbt_sb_segment_count / 2) + 1)))
                     || (((state->fe->dtv_property_cache.isdbt_sb_segment_count % 2) == 0)
@@ -328,172 +315,180 @@ static int dib0070_tune_digital(struct dvb_frontend *fe, struct dvb_frontend_par
                         && (state->fe->dtv_property_cache.isdbt_sb_segment_idx == ((state->fe->dtv_property_cache.isdbt_sb_segment_count / 2) + 1))))
                         freq += 850;
 #endif
+    if (state->current_rf != freq) {
+
+        switch (state->revision) {
+        case DIB0070S_P1A:
+            tune = dib0070s_tuning_table;
+            lna_match = dib0070_lna;
+            break;
+        default:
+            tune = dib0070_tuning_table;
+            if (state->cfg->flip_chip)
+                lna_match = dib0070_lna_flip_chip;
+            else
+                lna_match = dib0070_lna;
+            break;
+        }
+        while (freq > tune->max_freq) /* find the right one */
+            tune++;
+        while (freq > lna_match->max_freq) /* find the right one */
+            lna_match++;
+
+        state->current_tune_table_index = tune;
+        state->lna_match = lna_match;
+    }
+
+    if (*tune_state == CT_TUNER_START) {
+        dprintk("Tuning for Band: %hd (%d kHz)", band, freq);
         if (state->current_rf != freq) {
+                u8 REFDIV;
+                u32 FBDiv, Rest, FREF, VCOF_kHz;
+                u8 Den;
+
+                state->current_rf = freq;
+                state->lo4 = (state->current_tune_table_index->vco_band << 11) | (state->current_tune_table_index->hfdiv << 7);
+
+
+                dib0070_write_reg(state, 0x17, 0x30);
+
+
+                VCOF_kHz = state->current_tune_table_index->vco_multi * freq * 2;
+
+                switch (band) {
+                case BAND_VHF:
+                        REFDIV = (u8) ((state->cfg->clock_khz + 9999) / 10000);
+                        break;
+                case BAND_FM:
+                        REFDIV = (u8) ((state->cfg->clock_khz) / 1000);
+                        break;
+                default:
+                        REFDIV = (u8) (state->cfg->clock_khz  / 10000);
+                        break;
+                }
+                FREF = state->cfg->clock_khz / REFDIV;
+
+
 
                 switch (state->revision) {
                 case DIB0070S_P1A:
-                        tune = dib0070s_tuning_table;
-                        lna_match = dib0070_lna;
+                        FBDiv = (VCOF_kHz / state->current_tune_table_index->presc / FREF);
+                        Rest  = (VCOF_kHz / state->current_tune_table_index->presc) - FBDiv * FREF;
                         break;
+
+                case DIB0070_P1G:
+                case DIB0070_P1F:
                 default:
-                        tune = dib0070_tuning_table;
-                        if (state->cfg->flip_chip)
-                                lna_match = dib0070_lna_flip_chip;
-                        else
-                                lna_match = dib0070_lna;
+                        FBDiv = (freq / (FREF / 2));
+                        Rest  = 2 * freq - FBDiv * FREF;
                         break;
                 }
-                while (freq > tune->max_freq)   /* find the right one */
-                        tune++;
-                while (freq > lna_match->max_freq)      /* find the right one */
-                        lna_match++;
 
-                state->current_tune_table_index = tune;
-                state->lna_match = lna_match;
-        }
+                if (Rest < LPF)
+                        Rest = 0;
+                else if (Rest < 2 * LPF)
+                        Rest = 2 * LPF;
+                else if (Rest > (FREF - LPF)) {
+                        Rest = 0;
+                        FBDiv += 1;
+                } else if (Rest > (FREF - 2 * LPF))
+                        Rest = FREF - 2 * LPF;
+                Rest = (Rest * 6528) / (FREF / 10);
+
+                Den = 1;
+                if (Rest > 0) {
+                        state->lo4 |= (1 << 14) | (1 << 12);
+                        Den = 255;
+                }
+
 
-        if (*tune_state == CT_TUNER_START) {
-                dprintk("Tuning for Band: %hd (%d kHz)", band, freq);
-                if (state->current_rf != freq) {
-                        u8 REFDIV;
-                        u32 FBDiv, Rest, FREF, VCOF_kHz;
-                        u8 Den;
-
-                        state->current_rf = freq;
-                        state->lo4 = (state->current_tune_table_index->vco_band << 11) | (state->current_tune_table_index->hfdiv << 7);
-
-                        dib0070_write_reg(state, 0x17, 0x30);
-
-                        VCOF_kHz = state->current_tune_table_index->vco_multi * freq * 2;
-
-                        switch (band) {
-                        case BAND_VHF:
-                                REFDIV = (u8) ((state->cfg->clock_khz + 9999) / 10000);
-                                break;
-                        case BAND_FM:
-                                REFDIV = (u8) ((state->cfg->clock_khz) / 1000);
-                                break;
-                        default:
-                                REFDIV = (u8) (state->cfg->clock_khz / 10000);
-                                break;
-                        }
-                        FREF = state->cfg->clock_khz / REFDIV;
-
-                        switch (state->revision) {
-                        case DIB0070S_P1A:
-                                FBDiv = (VCOF_kHz / state->current_tune_table_index->presc / FREF);
-                                Rest = (VCOF_kHz / state->current_tune_table_index->presc) - FBDiv * FREF;
-                                break;
-
-                        case DIB0070_P1G:
-                        case DIB0070_P1F:
-                        default:
-                                FBDiv = (freq / (FREF / 2));
-                                Rest = 2 * freq - FBDiv * FREF;
-                                break;
-                        }
-
-                        if (Rest < LPF)
-                                Rest = 0;
-                        else if (Rest < 2 * LPF)
-                                Rest = 2 * LPF;
-                        else if (Rest > (FREF - LPF)) {
-                                Rest = 0;
-                                FBDiv += 1;
-                        } else if (Rest > (FREF - 2 * LPF))
-                                Rest = FREF - 2 * LPF;
-                        Rest = (Rest * 6528) / (FREF / 10);
-
-                        Den = 1;
-                        if (Rest > 0) {
-                                state->lo4 |= (1 << 14) | (1 << 12);
-                                Den = 255;
-                        }
-
-                        dib0070_write_reg(state, 0x11, (u16) FBDiv);
-                        dib0070_write_reg(state, 0x12, (Den << 8) | REFDIV);
-                        dib0070_write_reg(state, 0x13, (u16) Rest);
-
-                        if (state->revision == DIB0070S_P1A) {
-
-                                if (band == BAND_SBAND) {
-                                        dib0070_set_ctrl_lo5(fe, 2, 4, 3, 0);
-                                        dib0070_write_reg(state, 0x1d, 0xFFFF);
-                                } else
-                                        dib0070_set_ctrl_lo5(fe, 5, 4, 3, 1);
-                        }
-
-                        dib0070_write_reg(state, 0x20,
-                                          0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001 | state->current_tune_table_index->tuner_enable);
-
-                        dprintk("REFDIV: %hd, FREF: %d", REFDIV, FREF);
-                        dprintk("FBDIV: %d, Rest: %d", FBDiv, Rest);
-                        dprintk("Num: %hd, Den: %hd, SD: %hd", (u16) Rest, Den, (state->lo4 >> 12) & 0x1);
-                        dprintk("HFDIV code: %hd", state->current_tune_table_index->hfdiv);
-                        dprintk("VCO = %hd", state->current_tune_table_index->vco_band);
-                        dprintk("VCOF: ((%hd*%d) << 1))", state->current_tune_table_index->vco_multi, freq);
-
-                        *tune_state = CT_TUNER_STEP_0;
-                } else {        /* we are already tuned to this frequency - the configuration is correct  */
-                        ret = 50;       /* wakeup time */
-                        *tune_state = CT_TUNER_STEP_5;
+                dib0070_write_reg(state, 0x11, (u16)FBDiv);
+                dib0070_write_reg(state, 0x12, (Den << 8) | REFDIV);
+                dib0070_write_reg(state, 0x13, (u16) Rest);
+
+                if (state->revision == DIB0070S_P1A) {
+
+                        if (band == BAND_SBAND) {
+                                dib0070_set_ctrl_lo5(fe, 2, 4, 3, 0);
+                                dib0070_write_reg(state, 0x1d, 0xFFFF);
+                        } else
+                                dib0070_set_ctrl_lo5(fe, 5, 4, 3, 1);
                 }
-        } else if ((*tune_state > CT_TUNER_START) && (*tune_state < CT_TUNER_STEP_4)) {
 
-                ret = dib0070_captrim(state, tune_state);
+                dib0070_write_reg(state, 0x20,
+                        0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001 | state->current_tune_table_index->tuner_enable);
 
-        } else if (*tune_state == CT_TUNER_STEP_4) {
-                const struct dib0070_wbd_gain_cfg *tmp = state->cfg->wbd_gain;
-                if (tmp != NULL) {
-                        while (freq / 1000 > tmp->freq) /* find the right one */
-                                tmp++;
-                        dib0070_write_reg(state, 0x0f,
-                                          (0 << 15) | (1 << 14) | (3 << 12) | (tmp->wbd_gain_val << 9) | (0 << 8) | (1 << 7) | (state->
-                                                                                                                                current_tune_table_index->
-                                                                                                                                wbdmux << 0));
-                        state->wbd_gain_current = tmp->wbd_gain_val;
-                } else {
+                dprintk("REFDIV: %hd, FREF: %d", REFDIV, FREF);
+                dprintk("FBDIV: %d, Rest: %d", FBDiv, Rest);
+                dprintk("Num: %hd, Den: %hd, SD: %hd", (u16) Rest, Den, (state->lo4 >> 12) & 0x1);
+                dprintk("HFDIV code: %hd", state->current_tune_table_index->hfdiv);
+                dprintk("VCO = %hd", state->current_tune_table_index->vco_band);
+                dprintk("VCOF: ((%hd*%d) << 1))", state->current_tune_table_index->vco_multi, freq);
+
+                *tune_state = CT_TUNER_STEP_0;
+        } else { /* we are already tuned to this frequency - the configuration is correct  */
+                ret = 50; /* wakeup time */
+                *tune_state = CT_TUNER_STEP_5;
+        }
+    } else if ((*tune_state > CT_TUNER_START) && (*tune_state < CT_TUNER_STEP_4)) {
+
+        ret = dib0070_captrim(state, tune_state);
+
+    } else if (*tune_state == CT_TUNER_STEP_4) {
+        const struct dib0070_wbd_gain_cfg *tmp = state->cfg->wbd_gain;
+        if (tmp != NULL) {
+                while (freq/1000 > tmp->freq) /* find the right one */
+                        tmp++;
+                dib0070_write_reg(state, 0x0f,
+                        (0 << 15) | (1 << 14) | (3 << 12)
+                        | (tmp->wbd_gain_val << 9) | (0 << 8) | (1 << 7)
+                        | (state->current_tune_table_index->wbdmux << 0));
+                state->wbd_gain_current = tmp->wbd_gain_val;
+        } else {
                         dib0070_write_reg(state, 0x0f,
                                           (0 << 15) | (1 << 14) | (3 << 12) | (6 << 9) | (0 << 8) | (1 << 7) | (state->current_tune_table_index->
                                                                                                                 wbdmux << 0));
-                        state->wbd_gain_current = 6;
-                }
+            state->wbd_gain_current = 6;
+        }
 
-                dib0070_write_reg(state, 0x06, 0x3fff);
+        dib0070_write_reg(state, 0x06, 0x3fff);
                 dib0070_write_reg(state, 0x07,
                                   (state->current_tune_table_index->switch_trim << 11) | (7 << 8) | (state->lna_match->lna_band << 3) | (3 << 0));
-                dib0070_write_reg(state, 0x08, (state->lna_match->lna_band << 10) | (3 << 7) | (127));
-                dib0070_write_reg(state, 0x0d, 0x0d80);
+        dib0070_write_reg(state, 0x08, (state->lna_match->lna_band << 10) | (3 << 7) | (127));
+        dib0070_write_reg(state, 0x0d, 0x0d80);
 
-                dib0070_write_reg(state, 0x18, 0x07ff);
-                dib0070_write_reg(state, 0x17, 0x0033);
 
-                *tune_state = CT_TUNER_STEP_5;
-        } else if (*tune_state == CT_TUNER_STEP_5) {
-                dib0070_set_bandwidth(fe, ch);
-                *tune_state = CT_TUNER_STOP;
-        } else {
-                ret = FE_CALLBACK_TIME_NEVER;   /* tuner finished, time to call again infinite */
-        }
-        return ret;
+        dib0070_write_reg(state, 0x18,   0x07ff);
+        dib0070_write_reg(state, 0x17, 0x0033);
+
+
+        *tune_state = CT_TUNER_STEP_5;
+    } else if (*tune_state == CT_TUNER_STEP_5) {
+        dib0070_set_bandwidth(fe, ch);
+        *tune_state = CT_TUNER_STOP;
+    } else {
+        ret = FE_CALLBACK_TIME_NEVER; /* tuner finished, time to call again infinite */
+    }
+    return ret;
 }
 
+
 static int dib0070_tune(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)
 {
-        struct dib0070_state *state = fe->tuner_priv;
-        uint32_t ret;
+    struct dib0070_state *state = fe->tuner_priv;
+    uint32_t ret;
 
-        state->tune_state = CT_TUNER_START;
+    state->tune_state = CT_TUNER_START;
 
-        do {
-                ret = dib0070_tune_digital(fe, p);
-                if (ret != FE_CALLBACK_TIME_NEVER)
-                        msleep(ret / 10);
-                else
-                        break;
-        } while (state->tune_state != CT_TUNER_STOP);
+    do {
+        ret = dib0070_tune_digital(fe, p);
+        if (ret != FE_CALLBACK_TIME_NEVER)
+                msleep(ret/10);
+        else
+            break;
+    } while (state->tune_state != CT_TUNER_STOP);
 
-        return 0;
+    return 0;
 }
 
 static int dib0070_wakeup(struct dvb_frontend *fe)
@@ -512,92 +507,113 @@ static int dib0070_sleep(struct dvb_frontend *fe)
         return 0;
 }
 
-static const u16 dib0070_p1f_defaults[] = {
+u8 dib0070_get_rf_output(struct dvb_frontend *fe)
+{
+        struct dib0070_state *state = fe->tuner_priv;
+        return (dib0070_read_reg(state, 0x07) >> 11) & 0x3;
+}
+EXPORT_SYMBOL(dib0070_get_rf_output);
+
+int dib0070_set_rf_output(struct dvb_frontend *fe, u8 no)
+{
+        struct dib0070_state *state = fe->tuner_priv;
+        u16 rxrf2 = dib0070_read_reg(state, 0x07) & 0xfe7ff;
+        if (no > 3)
+                no = 3;
+        if (no < 1)
+                no = 1;
+        return dib0070_write_reg(state, 0x07, rxrf2 | (no << 11));
+}
+EXPORT_SYMBOL(dib0070_set_rf_output);
+
+static const u16 dib0070_p1f_defaults[] =
+
+{
         7, 0x02,
-        0x0008,
-        0x0000,
-        0x0000,
-        0x0000,
-        0x0000,
-        0x0002,
-        0x0100,
+                0x0008,
+                0x0000,
+                0x0000,
+                0x0000,
+                0x0000,
+                0x0002,
+                0x0100,
 
         3, 0x0d,
-        0x0d80,
-        0x0001,
-        0x0000,
+                0x0d80,
+                0x0001,
+                0x0000,
 
         4, 0x11,
-        0x0000,
-        0x0103,
-        0x0000,
-        0x0000,
+                0x0000,
+                0x0103,
+                0x0000,
+                0x0000,
 
         3, 0x16,
-        0x0004 | 0x0040,
-        0x0030,
-        0x07ff,
+                0x0004 | 0x0040,
+                0x0030,
+                0x07ff,
 
         6, 0x1b,
-        0x4112,
-        0xff00,
-        0xc07f,
-        0x0000,
-        0x0180,
-        0x4000 | 0x0800 | 0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001,
+                0x4112,
+                0xff00,
+                0xc07f,
+                0x0000,
+                0x0180,
+                0x4000 | 0x0800 | 0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001,
 
         0,
 };
 
 static u16 dib0070_read_wbd_offset(struct dib0070_state *state, u8 gain)
 {
-        u16 tuner_en = dib0070_read_reg(state, 0x20);
-        u16 offset;
-
-        dib0070_write_reg(state, 0x18, 0x07ff);
-        dib0070_write_reg(state, 0x20, 0x0800 | 0x4000 | 0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001);
-        dib0070_write_reg(state, 0x0f, (1 << 14) | (2 << 12) | (gain << 9) | (1 << 8) | (1 << 7) | (0 << 0));
-        msleep(9);
-        offset = dib0070_read_reg(state, 0x19);
-        dib0070_write_reg(state, 0x20, tuner_en);
-        return offset;
+    u16 tuner_en = dib0070_read_reg(state, 0x20);
+    u16 offset;
+
+    dib0070_write_reg(state, 0x18, 0x07ff);
+    dib0070_write_reg(state, 0x20, 0x0800 | 0x4000 | 0x0040 | 0x0020 | 0x0010 | 0x0008 | 0x0002 | 0x0001);
+    dib0070_write_reg(state, 0x0f, (1 << 14) | (2 << 12) | (gain << 9) | (1 << 8) | (1 << 7) | (0 << 0));
+    msleep(9);
+    offset = dib0070_read_reg(state, 0x19);
+    dib0070_write_reg(state, 0x20, tuner_en);
+    return offset;
 }
 
 static void dib0070_wbd_offset_calibration(struct dib0070_state *state)
 {
-        u8 gain;
-        for (gain = 6; gain < 8; gain++) {
-                state->wbd_offset_3_3[gain - 6] = ((dib0070_read_wbd_offset(state, gain) * 8 * 18 / 33 + 1) / 2);
-                dprintk("Gain: %d, WBDOffset (3.3V) = %hd", gain, state->wbd_offset_3_3[gain - 6]);
-        }
+    u8 gain;
+    for (gain = 6; gain < 8; gain++) {
+        state->wbd_offset_3_3[gain - 6] = ((dib0070_read_wbd_offset(state, gain) * 8 * 18 / 33 + 1) / 2);
+        dprintk("Gain: %d, WBDOffset (3.3V) = %hd", gain, state->wbd_offset_3_3[gain-6]);
+    }
 }
 
 u16 dib0070_wbd_offset(struct dvb_frontend *fe)
 {
-        struct dib0070_state *state = fe->tuner_priv;
-        const struct dib0070_wbd_gain_cfg *tmp = state->cfg->wbd_gain;
-        u32 freq = fe->dtv_property_cache.frequency / 1000;
-
-        if (tmp != NULL) {
-                while (freq / 1000 > tmp->freq) /* find the right one */
-                        tmp++;
-                state->wbd_gain_current = tmp->wbd_gain_val;
+    struct dib0070_state *state = fe->tuner_priv;
+    const struct dib0070_wbd_gain_cfg *tmp = state->cfg->wbd_gain;
+    u32 freq = fe->dtv_property_cache.frequency/1000;
+
+    if (tmp != NULL) {
+        while (freq/1000 > tmp->freq) /* find the right one */
+            tmp++;
+        state->wbd_gain_current = tmp->wbd_gain_val;
         } else
-                state->wbd_gain_current = 6;
+        state->wbd_gain_current = 6;
 
-        return state->wbd_offset_3_3[state->wbd_gain_current - 6];
+    return state->wbd_offset_3_3[state->wbd_gain_current - 6];
 }
-
 EXPORT_SYMBOL(dib0070_wbd_offset);
 
 #define pgm_read_word(w) (*w)
 static int dib0070_reset(struct dvb_frontend *fe)
 {
-        struct dib0070_state *state = fe->tuner_priv;
+    struct dib0070_state *state = fe->tuner_priv;
         u16 l, r, *n;
 
         HARD_RESET(state);
 
+
 #ifndef FORCE_SBAND_TUNER
         if ((dib0070_read_reg(state, 0x22) >> 9) & 0x1)
                 state->revision = (dib0070_read_reg(state, 0x1f) >> 8) & 0xff;
@@ -605,7 +621,7 @@ static int dib0070_reset(struct dvb_frontend *fe)
 #else
 #warning forcing SBAND
 #endif
-        state->revision = DIB0070S_P1A;
+                state->revision = DIB0070S_P1A;
 
         /* P1F or not */
         dprintk("Revision: %x", state->revision);
@@ -620,7 +636,7 @@ static int dib0070_reset(struct dvb_frontend *fe)
         while (l) {
                 r = pgm_read_word(n++);
                 do {
-                        dib0070_write_reg(state, (u8) r, pgm_read_word(n++));
+                        dib0070_write_reg(state, (u8)r, pgm_read_word(n++));
                         r++;
                 } while (--l);
                 l = pgm_read_word(n++);
@@ -633,6 +649,7 @@ static int dib0070_reset(struct dvb_frontend *fe)
         else
                 r = 2;
 
+
         r |= state->cfg->osc_buffer_state << 3;
 
         dib0070_write_reg(state, 0x10, r);
@@ -643,16 +660,24 @@ static int dib0070_reset(struct dvb_frontend *fe)
                 dib0070_write_reg(state, 0x02, r | (1 << 5));
         }
 
-        if (state->revision == DIB0070S_P1A)
-                dib0070_set_ctrl_lo5(fe, 2, 4, 3, 0);
-        else
+    if (state->revision == DIB0070S_P1A)
+        dib0070_set_ctrl_lo5(fe, 2, 4, 3, 0);
+    else
                 dib0070_set_ctrl_lo5(fe, 5, 4, state->cfg->charge_pump, state->cfg->enable_third_order_filter);
 
         dib0070_write_reg(state, 0x01, (54 << 9) | 0xc8);
 
-        dib0070_wbd_offset_calibration(state);
+    dib0070_wbd_offset_calibration(state);
 
-        return 0;
+    return 0;
+}
+
+static int dib0070_get_frequency(struct dvb_frontend *fe, u32 *frequency)
+{
+    struct dib0070_state *state = fe->tuner_priv;
+
+    *frequency = 1000 * state->current_rf;
+    return 0;
 }
 
 static int dib0070_release(struct dvb_frontend *fe)
@@ -664,18 +689,18 @@ static int dib0070_release(struct dvb_frontend *fe)
 
 static const struct dvb_tuner_ops dib0070_ops = {
         .info = {
-                 .name = "DiBcom DiB0070",
-                 .frequency_min = 45000000,
-                 .frequency_max = 860000000,
-                 .frequency_step = 1000,
-                 },
-        .release = dib0070_release,
-
-        .init = dib0070_wakeup,
-        .sleep = dib0070_sleep,
-        .set_params = dib0070_tune,
-
-//      .get_frequency = dib0070_get_frequency,
+                .name           = "DiBcom DiB0070",
+                .frequency_min  =  45000000,
+                .frequency_max  = 860000000,
+                .frequency_step =      1000,
+        },
+        .release       = dib0070_release,
+
+        .init          = dib0070_wakeup,
+        .sleep         = dib0070_sleep,
+        .set_params    = dib0070_tune,
+
+        .get_frequency = dib0070_get_frequency,
 //      .get_bandwidth = dib0070_get_bandwidth
 };
 
@@ -687,7 +712,7 @@ struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter
 
         state->cfg = cfg;
         state->i2c = i2c;
-        state->fe = fe;
+        state->fe  = fe;
         fe->tuner_priv = state;
 
         if (dib0070_reset(fe) != 0)
@@ -699,12 +724,11 @@ struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter
         fe->tuner_priv = state;
         return fe;
 
- free_mem:
+free_mem:
         kfree(state);
         fe->tuner_priv = NULL;
         return NULL;
 }
-
 EXPORT_SYMBOL(dib0070_attach);
 
 MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
diff --git a/drivers/media/dvb/frontends/dib0070.h b/drivers/media/dvb/frontends/dib0070.h
index eec9e52ffa75..45c31fae3967 100644
--- a/drivers/media/dvb/frontends/dib0070.h
+++ b/drivers/media/dvb/frontends/dib0070.h
@@ -52,6 +52,8 @@ struct dib0070_config {
 extern struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dib0070_config *cfg);
 extern u16 dib0070_wbd_offset(struct dvb_frontend *);
 extern void dib0070_ctrl_agc_filter(struct dvb_frontend *, u8 open);
+extern u8 dib0070_get_rf_output(struct dvb_frontend *fe);
+extern int dib0070_set_rf_output(struct dvb_frontend *fe, u8 no);
 #else
 static inline struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dib0070_config *cfg)
 {
@@ -62,7 +64,7 @@ static inline struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struc
 static inline u16 dib0070_wbd_offset(struct dvb_frontend *fe)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
-        return -ENODEV;
+        return 0;
 }
 
 static inline void dib0070_ctrl_agc_filter(struct dvb_frontend *fe, u8 open)
diff --git a/drivers/media/dvb/frontends/dib0090.c b/drivers/media/dvb/frontends/dib0090.c
new file mode 100644
index 000000000000..614552709a6f
--- /dev/null
+++ b/drivers/media/dvb/frontends/dib0090.c
@@ -0,0 +1,1522 @@
+/*
+ * Linux-DVB Driver for DiBcom's DiB0090 base-band RF Tuner.
+ *
+ * Copyright (C) 2005-9 DiBcom (http://www.dibcom.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 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.
+ *
+ *
+ * This code is more or less generated from another driver, please
+ * excuse some codingstyle oddities.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/i2c.h>
+
+#include "dvb_frontend.h"
+
+#include "dib0090.h"
+#include "dibx000_common.h"
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "turn on debugging (default: 0)");
+
+#define dprintk(args...) do { \
+        if (debug) { \
+                printk(KERN_DEBUG "DiB0090: "); \
+                printk(args); \
+                printk("\n"); \
+        } \
+} while (0)
+
+#define CONFIG_SYS_ISDBT
+#define CONFIG_BAND_CBAND
+#define CONFIG_BAND_VHF
+#define CONFIG_BAND_UHF
+#define CONFIG_DIB0090_USE_PWM_AGC
+
+#define EN_LNA0      0x8000
+#define EN_LNA1      0x4000
+#define EN_LNA2      0x2000
+#define EN_LNA3      0x1000
+#define EN_MIX0      0x0800
+#define EN_MIX1      0x0400
+#define EN_MIX2      0x0200
+#define EN_MIX3      0x0100
+#define EN_IQADC     0x0040
+#define EN_PLL       0x0020
+#define EN_TX        0x0010
+#define EN_BB        0x0008
+#define EN_LO        0x0004
+#define EN_BIAS      0x0001
+
+#define EN_IQANA     0x0002
+#define EN_DIGCLK    0x0080     /* not in the 0x24 reg, only in 0x1b */
+#define EN_CRYSTAL   0x0002
+
+#define EN_UHF           0x22E9
+#define EN_VHF           0x44E9
+#define EN_LBD           0x11E9
+#define EN_SBD           0x44E9
+#define EN_CAB           0x88E9
+
+#define pgm_read_word(w) (*w)
+
+struct dc_calibration;
+
+struct dib0090_tuning {
+        u32 max_freq;           /* for every frequency less than or equal to that field: this information is correct */
+        u8 switch_trim;
+        u8 lna_tune;
+        u8 lna_bias;
+        u16 v2i;
+        u16 mix;
+        u16 load;
+        u16 tuner_enable;
+};
+
+struct dib0090_pll {
+        u32 max_freq;           /* for every frequency less than or equal to that field: this information is correct */
+        u8 vco_band;
+        u8 hfdiv_code;
+        u8 hfdiv;
+        u8 topresc;
+};
+
+struct dib0090_state {
+        struct i2c_adapter *i2c;
+        struct dvb_frontend *fe;
+        const struct dib0090_config *config;
+
+        u8 current_band;
+        u16 revision;
+        enum frontend_tune_state tune_state;
+        u32 current_rf;
+
+        u16 wbd_offset;
+        s16 wbd_target;         /* in dB */
+
+        s16 rf_gain_limit;      /* take-over-point: where to split between bb and rf gain */
+        s16 current_gain;       /* keeps the currently programmed gain */
+        u8 agc_step;            /* new binary search */
+
+        u16 gain[2];            /* for channel monitoring */
+
+        const u16 *rf_ramp;
+        const u16 *bb_ramp;
+
+        /* for the software AGC ramps */
+        u16 bb_1_def;
+        u16 rf_lt_def;
+        u16 gain_reg[4];
+
+        /* for the captrim/dc-offset search */
+        s8 step;
+        s16 adc_diff;
+        s16 min_adc_diff;
+
+        s8 captrim;
+        s8 fcaptrim;
+
+        const struct dc_calibration *dc;
+        u16 bb6, bb7;
+
+        const struct dib0090_tuning *current_tune_table_index;
+        const struct dib0090_pll *current_pll_table_index;
+
+        u8 tuner_is_tuned;
+        u8 agc_freeze;
+
+        u8 reset;
+};
+
+static u16 dib0090_read_reg(struct dib0090_state *state, u8 reg)
+{
+        u8 b[2];
+        struct i2c_msg msg[2] = {
+                {.addr = state->config->i2c_address, .flags = 0, .buf = &reg, .len = 1},
+                {.addr = state->config->i2c_address, .flags = I2C_M_RD, .buf = b, .len = 2},
+        };
+        if (i2c_transfer(state->i2c, msg, 2) != 2) {
+                printk(KERN_WARNING "DiB0090 I2C read failed\n");
+                return 0;
+        }
+        return (b[0] << 8) | b[1];
+}
+
+static int dib0090_write_reg(struct dib0090_state *state, u32 reg, u16 val)
+{
+        u8 b[3] = { reg & 0xff, val >> 8, val & 0xff };
+        struct i2c_msg msg = {.addr = state->config->i2c_address, .flags = 0, .buf = b, .len = 3 };
+        if (i2c_transfer(state->i2c, &msg, 1) != 1) {
+                printk(KERN_WARNING "DiB0090 I2C write failed\n");
+                return -EREMOTEIO;
+        }
+        return 0;
+}
+
+#define HARD_RESET(state) do {  if (cfg->reset) {  if (cfg->sleep) cfg->sleep(fe, 0); msleep(10);  cfg->reset(fe, 1); msleep(10);  cfg->reset(fe, 0); msleep(10);  }  } while (0)
+#define ADC_TARGET -220
+#define GAIN_ALPHA 5
+#define WBD_ALPHA 6
+#define LPF     100
+static void dib0090_write_regs(struct dib0090_state *state, u8 r, const u16 * b, u8 c)
+{
+        do {
+                dib0090_write_reg(state, r++, *b++);
+        } while (--c);
+}
+
+static u16 dib0090_identify(struct dvb_frontend *fe)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+        u16 v;
+
+        v = dib0090_read_reg(state, 0x1a);
+
+#ifdef FIRMWARE_FIREFLY
+        /* pll is not locked locked */
+        if (!(v & 0x800))
+                dprintk("FE%d : Identification : pll is not yet locked", fe->id);
+#endif
+
+        /* without PLL lock info */
+        v &= 0x3ff;
+        dprintk("P/V: %04x:", v);
+
+        if ((v >> 8) & 0xf)
+                dprintk("FE%d : Product ID = 0x%x : KROSUS", fe->id, (v >> 8) & 0xf);
+        else
+                return 0xff;
+
+        v &= 0xff;
+        if (((v >> 5) & 0x7) == 0x1)
+                dprintk("FE%d : MP001 : 9090/8096", fe->id);
+        else if (((v >> 5) & 0x7) == 0x4)
+                dprintk("FE%d : MP005 : Single Sband", fe->id);
+        else if (((v >> 5) & 0x7) == 0x6)
+                dprintk("FE%d : MP008 : diversity VHF-UHF-LBAND", fe->id);
+        else if (((v >> 5) & 0x7) == 0x7)
+                dprintk("FE%d : MP009 : diversity 29098 CBAND-UHF-LBAND-SBAND", fe->id);
+        else
+                return 0xff;
+
+        /* revision only */
+        if ((v & 0x1f) == 0x3)
+                dprintk("FE%d : P1-D/E/F detected", fe->id);
+        else if ((v & 0x1f) == 0x1)
+                dprintk("FE%d : P1C detected", fe->id);
+        else if ((v & 0x1f) == 0x0) {
+#ifdef CONFIG_TUNER_DIB0090_P1B_SUPPORT
+                dprintk("FE%d : P1-A/B detected: using previous driver - support will be removed soon", fe->id);
+                dib0090_p1b_register(fe);
+#else
+                dprintk("FE%d : P1-A/B detected: driver is deactivated - not available", fe->id);
+                return 0xff;
+#endif
+        }
+
+        return v;
+}
+
+static void dib0090_reset_digital(struct dvb_frontend *fe, const struct dib0090_config *cfg)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+
+        HARD_RESET(state);
+
+        dib0090_write_reg(state, 0x24, EN_PLL);
+        dib0090_write_reg(state, 0x1b, EN_DIGCLK | EN_PLL | EN_CRYSTAL);        /* PLL, DIG_CLK and CRYSTAL remain */
+
+        /* adcClkOutRatio=8->7, release reset */
+        dib0090_write_reg(state, 0x20, ((cfg->io.adc_clock_ratio - 1) << 11) | (0 << 10) | (1 << 9) | (1 << 8) | (0 << 4) | 0);
+        if (cfg->clkoutdrive != 0)
+                dib0090_write_reg(state, 0x23,
+                                  (0 << 15) | ((!cfg->analog_output) << 14) | (1 << 10) | (1 << 9) | (0 << 8) | (cfg->clkoutdrive << 5) | (cfg->
+                                                                                                                                           clkouttobamse
+                                                                                                                                           << 4) | (0
+                                                                                                                                                    <<
+                                                                                                                                                    2)
+                                  | (0));
+        else
+                dib0090_write_reg(state, 0x23,
+                                  (0 << 15) | ((!cfg->analog_output) << 14) | (1 << 10) | (1 << 9) | (0 << 8) | (7 << 5) | (cfg->
+                                                                                                                            clkouttobamse << 4) | (0
+                                                                                                                                                   <<
+                                                                                                                                                   2)
+                                  | (0));
+
+        /* enable pll, de-activate reset, ratio: 2/1 = 60MHz */
+        dib0090_write_reg(state, 0x21,
+                          (cfg->io.pll_bypass << 15) | (1 << 13) | (cfg->io.pll_range << 12) | (cfg->io.pll_loopdiv << 6) | (cfg->io.pll_prediv));
+
+}
+
+static int dib0090_wakeup(struct dvb_frontend *fe)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+        if (state->config->sleep)
+                state->config->sleep(fe, 0);
+        return 0;
+}
+
+static int dib0090_sleep(struct dvb_frontend *fe)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+        if (state->config->sleep)
+                state->config->sleep(fe, 1);
+        return 0;
+}
+
+extern void dib0090_dcc_freq(struct dvb_frontend *fe, u8 fast)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+        if (fast)
+                dib0090_write_reg(state, 0x04, 0);
+        else
+                dib0090_write_reg(state, 0x04, 1);
+}
+EXPORT_SYMBOL(dib0090_dcc_freq);
+
+static const u16 rf_ramp_pwm_cband[] = {
+        0,                      /* max RF gain in 10th of dB */
+        0,                      /* ramp_slope = 1dB of gain -> clock_ticks_per_db = clk_khz / ramp_slope -> 0x2b */
+        0,                      /* ramp_max = maximum X used on the ramp */
+        (0 << 10) | 0,          /* 0x2c, LNA 1 = 0dB */
+        (0 << 10) | 0,          /* 0x2d, LNA 1 */
+        (0 << 10) | 0,          /* 0x2e, LNA 2 = 0dB */
+        (0 << 10) | 0,          /* 0x2f, LNA 2 */
+        (0 << 10) | 0,          /* 0x30, LNA 3 = 0dB */
+        (0 << 10) | 0,          /* 0x31, LNA 3 */
+        (0 << 10) | 0,          /* GAIN_4_1, LNA 4 = 0dB */
+        (0 << 10) | 0,          /* GAIN_4_2, LNA 4 */
+};
+
+static const u16 rf_ramp_vhf[] = {
+        412,                    /* max RF gain in 10th of dB */
+        132, 307, 127,          /* LNA1,  13.2dB */
+        105, 412, 255,          /* LNA2,  10.5dB */
+        50, 50, 127,            /* LNA3,  5dB */
+        125, 175, 127,          /* LNA4,  12.5dB */
+        0, 0, 127,              /* CBAND, 0dB */
+};
+
+static const u16 rf_ramp_uhf[] = {
+        412,                    /* max RF gain in 10th of dB */
+        132, 307, 127,          /* LNA1  : total gain = 13.2dB, point on the ramp where this amp is full gain, value to write to get full gain */
+        105, 412, 255,          /* LNA2  : 10.5 dB */
+        50, 50, 127,            /* LNA3  :  5.0 dB */
+        125, 175, 127,          /* LNA4  : 12.5 dB */
+        0, 0, 127,              /* CBAND :  0.0 dB */
+};
+
+static const u16 rf_ramp_cband[] = {
+        332,                    /* max RF gain in 10th of dB */
+        132, 252, 127,          /* LNA1,  dB */
+        80, 332, 255,           /* LNA2,  dB */
+        0, 0, 127,              /* LNA3,  dB */
+        0, 0, 127,              /* LNA4,  dB */
+        120, 120, 127,          /* LT1 CBAND */
+};
+
+static const u16 rf_ramp_pwm_vhf[] = {
+        404,                    /* max RF gain in 10th of dB */
+        25,                     /* ramp_slope = 1dB of gain -> clock_ticks_per_db = clk_khz / ramp_slope -> 0x2b */
+        1011,                   /* ramp_max = maximum X used on the ramp */
+        (6 << 10) | 417,        /* 0x2c, LNA 1 = 13.2dB */
+        (0 << 10) | 756,        /* 0x2d, LNA 1 */
+        (16 << 10) | 756,       /* 0x2e, LNA 2 = 10.5dB */
+        (0 << 10) | 1011,       /* 0x2f, LNA 2 */
+        (16 << 10) | 290,       /* 0x30, LNA 3 = 5dB */
+        (0 << 10) | 417,        /* 0x31, LNA 3 */
+        (7 << 10) | 0,          /* GAIN_4_1, LNA 4 = 12.5dB */
+        (0 << 10) | 290,        /* GAIN_4_2, LNA 4 */
+};
+
+static const u16 rf_ramp_pwm_uhf[] = {
+        404,                    /* max RF gain in 10th of dB */
+        25,                     /* ramp_slope = 1dB of gain -> clock_ticks_per_db = clk_khz / ramp_slope -> 0x2b */
+        1011,                   /* ramp_max = maximum X used on the ramp */
+        (6 << 10) | 417,        /* 0x2c, LNA 1 = 13.2dB */
+        (0 << 10) | 756,        /* 0x2d, LNA 1 */
+        (16 << 10) | 756,       /* 0x2e, LNA 2 = 10.5dB */
+        (0 << 10) | 1011,       /* 0x2f, LNA 2 */
+        (16 << 10) | 0,         /* 0x30, LNA 3 = 5dB */
+        (0 << 10) | 127,        /* 0x31, LNA 3 */
+        (7 << 10) | 127,        /* GAIN_4_1, LNA 4 = 12.5dB */
+        (0 << 10) | 417,        /* GAIN_4_2, LNA 4 */
+};
+
+static const u16 bb_ramp_boost[] = {
+        550,                    /* max BB gain in 10th of dB */
+        260, 260, 26,           /* BB1, 26dB */
+        290, 550, 29,           /* BB2, 29dB */
+};
+
+static const u16 bb_ramp_pwm_normal[] = {
+        500,                    /* max RF gain in 10th of dB */
+        8,                      /* ramp_slope = 1dB of gain -> clock_ticks_per_db = clk_khz / ramp_slope -> 0x34 */
+        400,
+        (2 << 9) | 0,           /* 0x35 = 21dB */
+        (0 << 9) | 168,         /* 0x36 */
+        (2 << 9) | 168,         /* 0x37 = 29dB */
+        (0 << 9) | 400,         /* 0x38 */
+};
+
+struct slope {
+        int16_t range;
+        int16_t slope;
+};
+static u16 slopes_to_scale(const struct slope *slopes, u8 num, s16 val)
+{
+        u8 i;
+        u16 rest;
+        u16 ret = 0;
+        for (i = 0; i < num; i++) {
+                if (val > slopes[i].range)
+                        rest = slopes[i].range;
+                else
+                        rest = val;
+                ret += (rest * slopes[i].slope) / slopes[i].range;
+                val -= rest;
+        }
+        return ret;
+}
+
+static const struct slope dib0090_wbd_slopes[3] = {
+        {66, 120},              /* -64,-52: offset -   65 */
+        {600, 170},             /* -52,-35: 65     -  665 */
+        {170, 250},             /* -45,-10: 665    - 835 */
+};
+
+static s16 dib0090_wbd_to_db(struct dib0090_state *state, u16 wbd)
+{
+        wbd &= 0x3ff;
+        if (wbd < state->wbd_offset)
+                wbd = 0;
+        else
+                wbd -= state->wbd_offset;
+        /* -64dB is the floor */
+        return -640 + (s16) slopes_to_scale(dib0090_wbd_slopes, ARRAY_SIZE(dib0090_wbd_slopes), wbd);
+}
+
+static void dib0090_wbd_target(struct dib0090_state *state, u32 rf)
+{
+        u16 offset = 250;
+
+        /* TODO : DAB digital N+/-1 interferer perfs : offset = 10 */
+
+        if (state->current_band == BAND_VHF)
+                offset = 650;
+#ifndef FIRMWARE_FIREFLY
+        if (state->current_band == BAND_VHF)
+                offset = state->config->wbd_vhf_offset;
+        if (state->current_band == BAND_CBAND)
+                offset = state->config->wbd_cband_offset;
+#endif
+
+        state->wbd_target = dib0090_wbd_to_db(state, state->wbd_offset + offset);
+        dprintk("wbd-target: %d dB", (u32) state->wbd_target);
+}
+
+static const int gain_reg_addr[4] = {
+        0x08, 0x0a, 0x0f, 0x01
+};
+
+static void dib0090_gain_apply(struct dib0090_state *state, s16 gain_delta, s16 top_delta, u8 force)
+{
+        u16 rf, bb, ref;
+        u16 i, v, gain_reg[4] = { 0 }, gain;
+        const u16 *g;
+
+        if (top_delta < -511)
+                top_delta = -511;
+        if (top_delta > 511)
+                top_delta = 511;
+
+        if (force) {
+                top_delta *= (1 << WBD_ALPHA);
+                gain_delta *= (1 << GAIN_ALPHA);
+        }
+
+        if (top_delta >= ((s16) (state->rf_ramp[0] << WBD_ALPHA) - state->rf_gain_limit))       /* overflow */
+                state->rf_gain_limit = state->rf_ramp[0] << WBD_ALPHA;
+        else
+                state->rf_gain_limit += top_delta;
+
+        if (state->rf_gain_limit < 0)   /*underflow */
+                state->rf_gain_limit = 0;
+
+        /* use gain as a temporary variable and correct current_gain */
+        gain = ((state->rf_gain_limit >> WBD_ALPHA) + state->bb_ramp[0]) << GAIN_ALPHA;
+        if (gain_delta >= ((s16) gain - state->current_gain))   /* overflow */
+                state->current_gain = gain;
+        else
+                state->current_gain += gain_delta;
+        /* cannot be less than 0 (only if gain_delta is less than 0 we can have current_gain < 0) */
+        if (state->current_gain < 0)
+                state->current_gain = 0;
+
+        /* now split total gain to rf and bb gain */
+        gain = state->current_gain >> GAIN_ALPHA;
+
+        /* requested gain is bigger than rf gain limit - ACI/WBD adjustment */
+        if (gain > (state->rf_gain_limit >> WBD_ALPHA)) {
+                rf = state->rf_gain_limit >> WBD_ALPHA;
+                bb = gain - rf;
+                if (bb > state->bb_ramp[0])
+                        bb = state->bb_ramp[0];
+        } else {                /* high signal level -> all gains put on RF */
+                rf = gain;
+                bb = 0;
+        }
+
+        state->gain[0] = rf;
+        state->gain[1] = bb;
+
+        /* software ramp */
+        /* Start with RF gains */
+        g = state->rf_ramp + 1; /* point on RF LNA1 max gain */
+        ref = rf;
+        for (i = 0; i < 7; i++) {       /* Go over all amplifiers => 5RF amps + 2 BB amps = 7 amps */
+                if (g[0] == 0 || ref < (g[1] - g[0]))   /* if total gain of the current amp is null or this amp is not concerned because it starts to work from an higher gain value */
+                        v = 0;  /* force the gain to write for the current amp to be null */
+                else if (ref >= g[1])   /* Gain to set is higher than the high working point of this amp */
+                        v = g[2];       /* force this amp to be full gain */
+                else            /* compute the value to set to this amp because we are somewhere in his range */
+                        v = ((ref - (g[1] - g[0])) * g[2]) / g[0];
+
+                if (i == 0)     /* LNA 1 reg mapping */
+                        gain_reg[0] = v;
+                else if (i == 1)        /* LNA 2 reg mapping */
+                        gain_reg[0] |= v << 7;
+                else if (i == 2)        /* LNA 3 reg mapping */
+                        gain_reg[1] = v;
+                else if (i == 3)        /* LNA 4 reg mapping */
+                        gain_reg[1] |= v << 7;
+                else if (i == 4)        /* CBAND LNA reg mapping */
+                        gain_reg[2] = v | state->rf_lt_def;
+                else if (i == 5)        /* BB gain 1 reg mapping */
+                        gain_reg[3] = v << 3;
+                else if (i == 6)        /* BB gain 2 reg mapping */
+                        gain_reg[3] |= v << 8;
+
+                g += 3;         /* go to next gain bloc */
+
+                /* When RF is finished, start with BB */
+                if (i == 4) {
+                        g = state->bb_ramp + 1; /* point on BB gain 1 max gain */
+                        ref = bb;
+                }
+        }
+        gain_reg[3] |= state->bb_1_def;
+        gain_reg[3] |= ((bb % 10) * 100) / 125;
+
+#ifdef DEBUG_AGC
+        dprintk("GA CALC: DB: %3d(rf) + %3d(bb) = %3d gain_reg[0]=%04x gain_reg[1]=%04x gain_reg[2]=%04x gain_reg[0]=%04x", rf, bb, rf + bb,
+                gain_reg[0], gain_reg[1], gain_reg[2], gain_reg[3]);
+#endif
+
+        /* Write the amplifier regs */
+        for (i = 0; i < 4; i++) {
+                v = gain_reg[i];
+                if (force || state->gain_reg[i] != v) {
+                        state->gain_reg[i] = v;
+                        dib0090_write_reg(state, gain_reg_addr[i], v);
+                }
+        }
+}
+
+static void dib0090_set_boost(struct dib0090_state *state, int onoff)
+{
+        state->bb_1_def &= 0xdfff;
+        state->bb_1_def |= onoff << 13;
+}
+
+static void dib0090_set_rframp(struct dib0090_state *state, const u16 * cfg)
+{
+        state->rf_ramp = cfg;
+}
+
+static void dib0090_set_rframp_pwm(struct dib0090_state *state, const u16 * cfg)
+{
+        state->rf_ramp = cfg;
+
+        dib0090_write_reg(state, 0x2a, 0xffff);
+
+        dprintk("total RF gain: %ddB, step: %d", (u32) cfg[0], dib0090_read_reg(state, 0x2a));
+
+        dib0090_write_regs(state, 0x2c, cfg + 3, 6);
+        dib0090_write_regs(state, 0x3e, cfg + 9, 2);
+}
+
+static void dib0090_set_bbramp(struct dib0090_state *state, const u16 * cfg)
+{
+        state->bb_ramp = cfg;
+        dib0090_set_boost(state, cfg[0] > 500); /* we want the boost if the gain is higher that 50dB */
+}
+
+static void dib0090_set_bbramp_pwm(struct dib0090_state *state, const u16 * cfg)
+{
+        state->bb_ramp = cfg;
+
+        dib0090_set_boost(state, cfg[0] > 500); /* we want the boost if the gain is higher that 50dB */
+
+        dib0090_write_reg(state, 0x33, 0xffff);
+        dprintk("total BB gain: %ddB, step: %d", (u32) cfg[0], dib0090_read_reg(state, 0x33));
+        dib0090_write_regs(state, 0x35, cfg + 3, 4);
+}
+
+void dib0090_pwm_gain_reset(struct dvb_frontend *fe)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+        /* reset the AGC */
+
+        if (state->config->use_pwm_agc) {
+#ifdef CONFIG_BAND_SBAND
+                if (state->current_band == BAND_SBAND) {
+                        dib0090_set_rframp_pwm(state, rf_ramp_pwm_sband);
+                        dib0090_set_bbramp_pwm(state, bb_ramp_pwm_boost);
+                } else
+#endif
+#ifdef CONFIG_BAND_CBAND
+                if (state->current_band == BAND_CBAND) {
+                        dib0090_set_rframp_pwm(state, rf_ramp_pwm_cband);
+                        dib0090_set_bbramp_pwm(state, bb_ramp_pwm_normal);
+                } else
+#endif
+#ifdef CONFIG_BAND_VHF
+                if (state->current_band == BAND_VHF) {
+                        dib0090_set_rframp_pwm(state, rf_ramp_pwm_vhf);
+                        dib0090_set_bbramp_pwm(state, bb_ramp_pwm_normal);
+                } else
+#endif
+                {
+                        dib0090_set_rframp_pwm(state, rf_ramp_pwm_uhf);
+                        dib0090_set_bbramp_pwm(state, bb_ramp_pwm_normal);
+                }
+
+                if (state->rf_ramp[0] != 0)
+                        dib0090_write_reg(state, 0x32, (3 << 11));
+                else
+                        dib0090_write_reg(state, 0x32, (0 << 11));
+
+                dib0090_write_reg(state, 0x39, (1 << 10));
+        }
+}
+EXPORT_SYMBOL(dib0090_pwm_gain_reset);
+
+int dib0090_gain_control(struct dvb_frontend *fe)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+        enum frontend_tune_state *tune_state = &state->tune_state;
+        int ret = 10;
+
+        u16 wbd_val = 0;
+        u8 apply_gain_immediatly = 1;
+        s16 wbd_error = 0, adc_error = 0;
+
+        if (*tune_state == CT_AGC_START) {
+                state->agc_freeze = 0;
+                dib0090_write_reg(state, 0x04, 0x0);
+
+#ifdef CONFIG_BAND_SBAND
+                if (state->current_band == BAND_SBAND) {
+                        dib0090_set_rframp(state, rf_ramp_sband);
+                        dib0090_set_bbramp(state, bb_ramp_boost);
+                } else
+#endif
+#ifdef CONFIG_BAND_VHF
+                if (state->current_band == BAND_VHF) {
+                        dib0090_set_rframp(state, rf_ramp_vhf);
+                        dib0090_set_bbramp(state, bb_ramp_boost);
+                } else
+#endif
+#ifdef CONFIG_BAND_CBAND
+                if (state->current_band == BAND_CBAND) {
+                        dib0090_set_rframp(state, rf_ramp_cband);
+                        dib0090_set_bbramp(state, bb_ramp_boost);
+                } else
+#endif
+                {
+                        dib0090_set_rframp(state, rf_ramp_uhf);
+                        dib0090_set_bbramp(state, bb_ramp_boost);
+                }
+
+                dib0090_write_reg(state, 0x32, 0);
+                dib0090_write_reg(state, 0x39, 0);
+
+                dib0090_wbd_target(state, state->current_rf);
+
+                state->rf_gain_limit = state->rf_ramp[0] << WBD_ALPHA;
+                state->current_gain = ((state->rf_ramp[0] + state->bb_ramp[0]) / 2) << GAIN_ALPHA;
+
+                *tune_state = CT_AGC_STEP_0;
+        } else if (!state->agc_freeze) {
+                s16 wbd;
+
+                int adc;
+                wbd_val = dib0090_read_reg(state, 0x1d);
+
+                /* read and calc the wbd power */
+                wbd = dib0090_wbd_to_db(state, wbd_val);
+                wbd_error = state->wbd_target - wbd;
+
+                if (*tune_state == CT_AGC_STEP_0) {
+                        if (wbd_error < 0 && state->rf_gain_limit > 0) {
+#ifdef CONFIG_BAND_CBAND
+                                /* in case of CBAND tune reduce first the lt_gain2 before adjusting the RF gain */
+                                u8 ltg2 = (state->rf_lt_def >> 10) & 0x7;
+                                if (state->current_band == BAND_CBAND && ltg2) {
+                                        ltg2 >>= 1;
+                                        state->rf_lt_def &= ltg2 << 10; /* reduce in 3 steps from 7 to 0 */
+                                }
+#endif
+                        } else {
+                                state->agc_step = 0;
+                                *tune_state = CT_AGC_STEP_1;
+                        }
+                } else {
+                        /* calc the adc power */
+                        adc = state->config->get_adc_power(fe);
+                        adc = (adc * ((s32) 355774) + (((s32) 1) << 20)) >> 21; /* included in [0:-700] */
+
+                        adc_error = (s16) (((s32) ADC_TARGET) - adc);
+#ifdef CONFIG_STANDARD_DAB
+                        if (state->fe->dtv_property_cache.delivery_system == STANDARD_DAB)
+                                adc_error += 130;
+#endif
+#ifdef CONFIG_STANDARD_DVBT
+                        if (state->fe->dtv_property_cache.delivery_system == STANDARD_DVBT &&
+                            (state->fe->dtv_property_cache.modulation == QAM_64 || state->fe->dtv_property_cache.modulation == QAM_16))
+                                adc_error += 60;
+#endif
+#ifdef CONFIG_SYS_ISDBT
+                        if ((state->fe->dtv_property_cache.delivery_system == SYS_ISDBT) && (((state->fe->dtv_property_cache.layer[0].segment_count >
+                                                                                               0)
+                                                                                              &&
+                                                                                              ((state->fe->dtv_property_cache.layer[0].modulation ==
+                                                                                                QAM_64)
+                                                                                               || (state->fe->dtv_property_cache.layer[0].
+                                                                                                   modulation == QAM_16)))
+                                                                                             ||
+                                                                                             ((state->fe->dtv_property_cache.layer[1].segment_count >
+                                                                                               0)
+                                                                                              &&
+                                                                                              ((state->fe->dtv_property_cache.layer[1].modulation ==
+                                                                                                QAM_64)
+                                                                                               || (state->fe->dtv_property_cache.layer[1].
+                                                                                                   modulation == QAM_16)))
+                                                                                             ||
+                                                                                             ((state->fe->dtv_property_cache.layer[2].segment_count >
+                                                                                               0)
+                                                                                              &&
+                                                                                              ((state->fe->dtv_property_cache.layer[2].modulation ==
+                                                                                                QAM_64)
+                                                                                               || (state->fe->dtv_property_cache.layer[2].
+                                                                                                   modulation == QAM_16)))
+                            )
+                            )
+                                adc_error += 60;
+#endif
+
+                        if (*tune_state == CT_AGC_STEP_1) {     /* quickly go to the correct range of the ADC power */
+                                if (ABS(adc_error) < 50 || state->agc_step++ > 5) {
+
+#ifdef CONFIG_STANDARD_DAB
+                                        if (state->fe->dtv_property_cache.delivery_system == STANDARD_DAB) {
+                                                dib0090_write_reg(state, 0x02, (1 << 15) | (15 << 11) | (31 << 6) | (63));      /* cap value = 63 : narrow BB filter : Fc = 1.8MHz */
+                                                dib0090_write_reg(state, 0x04, 0x0);
+                                        } else
+#endif
+                                        {
+                                                dib0090_write_reg(state, 0x02, (1 << 15) | (3 << 11) | (6 << 6) | (32));
+                                                dib0090_write_reg(state, 0x04, 0x01);   /*0 = 1KHz ; 1 = 150Hz ; 2 = 50Hz ; 3 = 50KHz ; 4 = servo fast */
+                                        }
+
+                                        *tune_state = CT_AGC_STOP;
+                                }
+                        } else {
+                                /* everything higher than or equal to CT_AGC_STOP means tracking */
+                                ret = 100;      /* 10ms interval */
+                                apply_gain_immediatly = 0;
+                        }
+                }
+#ifdef DEBUG_AGC
+                dprintk
+                    ("FE: %d, tune state %d, ADC = %3ddB (ADC err %3d) WBD %3ddB (WBD err %3d, WBD val SADC: %4d), RFGainLimit (TOP): %3d, signal: %3ddBm",
+                     (u32) fe->id, (u32) *tune_state, (u32) adc, (u32) adc_error, (u32) wbd, (u32) wbd_error, (u32) wbd_val,
+                     (u32) state->rf_gain_limit >> WBD_ALPHA, (s32) 200 + adc - (state->current_gain >> GAIN_ALPHA));
+#endif
+        }
+
+        /* apply gain */
+        if (!state->agc_freeze)
+                dib0090_gain_apply(state, adc_error, wbd_error, apply_gain_immediatly);
+        return ret;
+}
+EXPORT_SYMBOL(dib0090_gain_control);
+
+void dib0090_get_current_gain(struct dvb_frontend *fe, u16 * rf, u16 * bb, u16 * rf_gain_limit, u16 * rflt)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+        if (rf)
+                *rf = state->gain[0];
+        if (bb)
+                *bb = state->gain[1];
+        if (rf_gain_limit)
+                *rf_gain_limit = state->rf_gain_limit;
+        if (rflt)
+                *rflt = (state->rf_lt_def >> 10) & 0x7;
+}
+EXPORT_SYMBOL(dib0090_get_current_gain);
+
+u16 dib0090_get_wbd_offset(struct dvb_frontend *tuner)
+{
+        struct dib0090_state *st = tuner->tuner_priv;
+        return st->wbd_offset;
+}
+EXPORT_SYMBOL(dib0090_get_wbd_offset);
+
+static const u16 dib0090_defaults[] = {
+
+        25, 0x01,
+        0x0000,
+        0x99a0,
+        0x6008,
+        0x0000,
+        0x8acb,
+        0x0000,
+        0x0405,
+        0x0000,
+        0x0000,
+        0x0000,
+        0xb802,
+        0x0300,
+        0x2d12,
+        0xbac0,
+        0x7c00,
+        0xdbb9,
+        0x0954,
+        0x0743,
+        0x8000,
+        0x0001,
+        0x0040,
+        0x0100,
+        0x0000,
+        0xe910,
+        0x149e,
+
+        1, 0x1c,
+        0xff2d,
+
+        1, 0x39,
+        0x0000,
+
+        1, 0x1b,
+        EN_IQADC | EN_BB | EN_BIAS | EN_DIGCLK | EN_PLL | EN_CRYSTAL,
+        2, 0x1e,
+        0x07FF,
+        0x0007,
+
+        1, 0x24,
+        EN_UHF | EN_CRYSTAL,
+
+        2, 0x3c,
+        0x3ff,
+        0x111,
+        0
+};
+
+static int dib0090_reset(struct dvb_frontend *fe)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+        u16 l, r, *n;
+
+        dib0090_reset_digital(fe, state->config);
+        state->revision = dib0090_identify(fe);
+
+        /* Revision definition */
+        if (state->revision == 0xff)
+                return -EINVAL;
+#ifdef EFUSE
+        else if ((state->revision & 0x1f) >= 3) /* Update the efuse : Only available for KROSUS > P1C */
+                dib0090_set_EFUSE(state);
+#endif
+
+#ifdef CONFIG_TUNER_DIB0090_P1B_SUPPORT
+        if (!(state->revision & 0x1))   /* it is P1B - reset is already done */
+                return 0;
+#endif
+
+        /* Upload the default values */
+        n = (u16 *) dib0090_defaults;
+        l = pgm_read_word(n++);
+        while (l) {
+                r = pgm_read_word(n++);
+                do {
+                        /* DEBUG_TUNER */
+                        /* dprintk("%d, %d, %d", l, r, pgm_read_word(n)); */
+                        dib0090_write_reg(state, r, pgm_read_word(n++));
+                        r++;
+                } while (--l);
+                l = pgm_read_word(n++);
+        }
+
+        /* Congigure in function of the crystal */
+        if (state->config->io.clock_khz >= 24000)
+                l = 1;
+        else
+                l = 2;
+        dib0090_write_reg(state, 0x14, l);
+        dprintk("Pll lock : %d", (dib0090_read_reg(state, 0x1a) >> 11) & 0x1);
+
+        state->reset = 3;       /* enable iq-offset-calibration and wbd-calibration when tuning next time */
+
+        return 0;
+}
+
+#define steps(u) (((u) > 15) ? ((u)-16) : (u))
+#define INTERN_WAIT 10
+static int dib0090_get_offset(struct dib0090_state *state, enum frontend_tune_state *tune_state)
+{
+        int ret = INTERN_WAIT * 10;
+
+        switch (*tune_state) {
+        case CT_TUNER_STEP_2:
+                /* Turns to positive */
+                dib0090_write_reg(state, 0x1f, 0x7);
+                *tune_state = CT_TUNER_STEP_3;
+                break;
+
+        case CT_TUNER_STEP_3:
+                state->adc_diff = dib0090_read_reg(state, 0x1d);
+
+                /* Turns to negative */
+                dib0090_write_reg(state, 0x1f, 0x4);
+                *tune_state = CT_TUNER_STEP_4;
+                break;
+
+        case CT_TUNER_STEP_4:
+                state->adc_diff -= dib0090_read_reg(state, 0x1d);
+                *tune_state = CT_TUNER_STEP_5;
+                ret = 0;
+                break;
+
+        default:
+                break;
+        }
+
+        return ret;
+}
+
+struct dc_calibration {
+        uint8_t addr;
+        uint8_t offset;
+        uint8_t pga:1;
+        uint16_t bb1;
+        uint8_t i:1;
+};
+
+static const struct dc_calibration dc_table[] = {
+        /* Step1 BB gain1= 26 with boost 1, gain 2 = 0 */
+        {0x06, 5, 1, (1 << 13) | (0 << 8) | (26 << 3), 1},
+        {0x07, 11, 1, (1 << 13) | (0 << 8) | (26 << 3), 0},
+        /* Step 2 BB gain 1 = 26 with boost = 1 & gain 2 = 29 */
+        {0x06, 0, 0, (1 << 13) | (29 << 8) | (26 << 3), 1},
+        {0x06, 10, 0, (1 << 13) | (29 << 8) | (26 << 3), 0},
+        {0},
+};
+
+static void dib0090_set_trim(struct dib0090_state *state)
+{
+        u16 *val;
+
+        if (state->dc->addr == 0x07)
+                val = &state->bb7;
+        else
+                val = &state->bb6;
+
+        *val &= ~(0x1f << state->dc->offset);
+        *val |= state->step << state->dc->offset;
+
+        dib0090_write_reg(state, state->dc->addr, *val);
+}
+
+static int dib0090_dc_offset_calibration(struct dib0090_state *state, enum frontend_tune_state *tune_state)
+{
+        int ret = 0;
+
+        switch (*tune_state) {
+
+        case CT_TUNER_START:
+                /* init */
+                dprintk("Internal DC calibration");
+
+                /* the LNA is off */
+                dib0090_write_reg(state, 0x24, 0x02ed);
+
+                /* force vcm2 = 0.8V */
+                state->bb6 = 0;
+                state->bb7 = 0x040d;
+
+                state->dc = dc_table;
+
+                *tune_state = CT_TUNER_STEP_0;
+
+                /* fall through */
+
+        case CT_TUNER_STEP_0:
+                dib0090_write_reg(state, 0x01, state->dc->bb1);
+                dib0090_write_reg(state, 0x07, state->bb7 | (state->dc->i << 7));
+
+                state->step = 0;
+
+                state->min_adc_diff = 1023;
+
+                *tune_state = CT_TUNER_STEP_1;
+                ret = 50;
+                break;
+
+        case CT_TUNER_STEP_1:
+                dib0090_set_trim(state);
+
+                *tune_state = CT_TUNER_STEP_2;
+                break;
+
+        case CT_TUNER_STEP_2:
+        case CT_TUNER_STEP_3:
+        case CT_TUNER_STEP_4:
+                ret = dib0090_get_offset(state, tune_state);
+                break;
+
+        case CT_TUNER_STEP_5:   /* found an offset */
+                dprintk("FE%d: IQC read=%d, current=%x", state->fe->id, (u32) state->adc_diff, state->step);
+
+                /* first turn for this frequency */
+                if (state->step == 0) {
+                        if (state->dc->pga && state->adc_diff < 0)
+                                state->step = 0x10;
+                        if (state->dc->pga == 0 && state->adc_diff > 0)
+                                state->step = 0x10;
+                }
+
+                state->adc_diff = ABS(state->adc_diff);
+
+                if (state->adc_diff < state->min_adc_diff && steps(state->step) < 15) { /* stop search when the delta to 0 is increasing */
+                        state->step++;
+                        state->min_adc_diff = state->adc_diff;
+                        *tune_state = CT_TUNER_STEP_1;
+                } else {
+
+                        /* the minimum was what we have seen in the step before */
+                        state->step--;
+                        dib0090_set_trim(state);
+
+                        dprintk("FE%d: BB Offset Cal, BBreg=%hd,Offset=%hd,Value Set=%hd", state->fe->id, state->dc->addr, state->adc_diff,
+                                state->step);
+
+                        state->dc++;
+                        if (state->dc->addr == 0)       /* done */
+                                *tune_state = CT_TUNER_STEP_6;
+                        else
+                                *tune_state = CT_TUNER_STEP_0;
+
+                }
+                break;
+
+        case CT_TUNER_STEP_6:
+                dib0090_write_reg(state, 0x07, state->bb7 & ~0x0008);
+                dib0090_write_reg(state, 0x1f, 0x7);
+                *tune_state = CT_TUNER_START;   /* reset done -> real tuning can now begin */
+                state->reset &= ~0x1;
+        default:
+                break;
+        }
+        return ret;
+}
+
+static int dib0090_wbd_calibration(struct dib0090_state *state, enum frontend_tune_state *tune_state)
+{
+        switch (*tune_state) {
+        case CT_TUNER_START:
+                /* WBD-mode=log, Bias=2, Gain=6, Testmode=1, en=1, WBDMUX=1 */
+                dib0090_write_reg(state, 0x10, 0xdb09 | (1 << 10));
+                dib0090_write_reg(state, 0x24, EN_UHF & 0x0fff);
+
+                *tune_state = CT_TUNER_STEP_0;
+                return 90;      /* wait for the WBDMUX to switch and for the ADC to sample */
+        case CT_TUNER_STEP_0:
+                state->wbd_offset = dib0090_read_reg(state, 0x1d);
+                dprintk("WBD calibration offset = %d", state->wbd_offset);
+
+                *tune_state = CT_TUNER_START;   /* reset done -> real tuning can now begin */
+                state->reset &= ~0x2;
+                break;
+        default:
+                break;
+        }
+        return 0;
+}
+
+static void dib0090_set_bandwidth(struct dib0090_state *state)
+{
+        u16 tmp;
+
+        if (state->fe->dtv_property_cache.bandwidth_hz / 1000 <= 5000)
+                tmp = (3 << 14);
+        else if (state->fe->dtv_property_cache.bandwidth_hz / 1000 <= 6000)
+                tmp = (2 << 14);
+        else if (state->fe->dtv_property_cache.bandwidth_hz / 1000 <= 7000)
+                tmp = (1 << 14);
+        else
+                tmp = (0 << 14);
+
+        state->bb_1_def &= 0x3fff;
+        state->bb_1_def |= tmp;
+
+        dib0090_write_reg(state, 0x01, state->bb_1_def);        /* be sure that we have the right bb-filter */
+}
+
+static const struct dib0090_pll dib0090_pll_table[] = {
+#ifdef CONFIG_BAND_CBAND
+        {56000, 0, 9, 48, 6},
+        {70000, 1, 9, 48, 6},
+        {87000, 0, 8, 32, 4},
+        {105000, 1, 8, 32, 4},
+        {115000, 0, 7, 24, 6},
+        {140000, 1, 7, 24, 6},
+        {170000, 0, 6, 16, 4},
+#endif
+#ifdef CONFIG_BAND_VHF
+        {200000, 1, 6, 16, 4},
+        {230000, 0, 5, 12, 6},
+        {280000, 1, 5, 12, 6},
+        {340000, 0, 4, 8, 4},
+        {380000, 1, 4, 8, 4},
+        {450000, 0, 3, 6, 6},
+#endif
+#ifdef CONFIG_BAND_UHF
+        {580000, 1, 3, 6, 6},
+        {700000, 0, 2, 4, 4},
+        {860000, 1, 2, 4, 4},
+#endif
+#ifdef CONFIG_BAND_LBAND
+        {1800000, 1, 0, 2, 4},
+#endif
+#ifdef CONFIG_BAND_SBAND
+        {2900000, 0, 14, 1, 4},
+#endif
+};
+
+static const struct dib0090_tuning dib0090_tuning_table_fm_vhf_on_cband[] = {
+
+#ifdef CONFIG_BAND_CBAND
+        {184000, 4, 1, 15, 0x280, 0x2912, 0xb94e, EN_CAB},
+        {227000, 4, 3, 15, 0x280, 0x2912, 0xb94e, EN_CAB},
+        {380000, 4, 7, 15, 0x280, 0x2912, 0xb94e, EN_CAB},
+#endif
+#ifdef CONFIG_BAND_UHF
+        {520000, 2, 0, 15, 0x300, 0x1d12, 0xb9ce, EN_UHF},
+        {550000, 2, 2, 15, 0x300, 0x1d12, 0xb9ce, EN_UHF},
+        {650000, 2, 3, 15, 0x300, 0x1d12, 0xb9ce, EN_UHF},
+        {750000, 2, 5, 15, 0x300, 0x1d12, 0xb9ce, EN_UHF},
+        {850000, 2, 6, 15, 0x300, 0x1d12, 0xb9ce, EN_UHF},
+        {900000, 2, 7, 15, 0x300, 0x1d12, 0xb9ce, EN_UHF},
+#endif
+#ifdef CONFIG_BAND_LBAND
+        {1500000, 4, 0, 20, 0x300, 0x1912, 0x82c9, EN_LBD},
+        {1600000, 4, 1, 20, 0x300, 0x1912, 0x82c9, EN_LBD},
+        {1800000, 4, 3, 20, 0x300, 0x1912, 0x82c9, EN_LBD},
+#endif
+#ifdef CONFIG_BAND_SBAND
+        {2300000, 1, 4, 20, 0x300, 0x2d2A, 0x82c7, EN_SBD},
+        {2900000, 1, 7, 20, 0x280, 0x2deb, 0x8347, EN_SBD},
+#endif
+};
+
+static const struct dib0090_tuning dib0090_tuning_table[] = {
+
+#ifdef CONFIG_BAND_CBAND
+        {170000, 4, 1, 15, 0x280, 0x2912, 0xb94e, EN_CAB},
+#endif
+#ifdef CONFIG_BAND_VHF
+        {184000, 1, 1, 15, 0x300, 0x4d12, 0xb94e, EN_VHF},
+        {227000, 1, 3, 15, 0x300, 0x4d12, 0xb94e, EN_VHF},
+        {380000, 1, 7, 15, 0x300, 0x4d12, 0xb94e, EN_VHF},
+#endif
+#ifdef CONFIG_BAND_UHF
+        {520000, 2, 0, 15, 0x300, 0x1d12, 0xb9ce, EN_UHF},
+        {550000, 2, 2, 15, 0x300, 0x1d12, 0xb9ce, EN_UHF},
+        {650000, 2, 3, 15, 0x300, 0x1d12, 0xb9ce, EN_UHF},
+        {750000, 2, 5, 15, 0x300, 0x1d12, 0xb9ce, EN_UHF},
+        {850000, 2, 6, 15, 0x300, 0x1d12, 0xb9ce, EN_UHF},
+        {900000, 2, 7, 15, 0x300, 0x1d12, 0xb9ce, EN_UHF},
+#endif
+#ifdef CONFIG_BAND_LBAND
+        {1500000, 4, 0, 20, 0x300, 0x1912, 0x82c9, EN_LBD},
+        {1600000, 4, 1, 20, 0x300, 0x1912, 0x82c9, EN_LBD},
+        {1800000, 4, 3, 20, 0x300, 0x1912, 0x82c9, EN_LBD},
+#endif
+#ifdef CONFIG_BAND_SBAND
+        {2300000, 1, 4, 20, 0x300, 0x2d2A, 0x82c7, EN_SBD},
+        {2900000, 1, 7, 20, 0x280, 0x2deb, 0x8347, EN_SBD},
+#endif
+};
+
+#define WBD     0x781           /* 1 1 1 1 0000 0 0 1 */
+static int dib0090_tune(struct dvb_frontend *fe)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+        const struct dib0090_tuning *tune = state->current_tune_table_index;
+        const struct dib0090_pll *pll = state->current_pll_table_index;
+        enum frontend_tune_state *tune_state = &state->tune_state;
+
+        u32 rf;
+        u16 lo4 = 0xe900, lo5, lo6, Den;
+        u32 FBDiv, Rest, FREF, VCOF_kHz = 0;
+        u16 tmp, adc;
+        int8_t step_sign;
+        int ret = 10;           /* 1ms is the default delay most of the time */
+        u8 c, i;
+
+        state->current_band = (u8) BAND_OF_FREQUENCY(fe->dtv_property_cache.frequency / 1000);
+        rf = fe->dtv_property_cache.frequency / 1000 + (state->current_band ==
+                                                        BAND_UHF ? state->config->freq_offset_khz_uhf : state->config->freq_offset_khz_vhf);
+        /* in any case we first need to do a reset if needed */
+        if (state->reset & 0x1)
+                return dib0090_dc_offset_calibration(state, tune_state);
+        else if (state->reset & 0x2)
+                return dib0090_wbd_calibration(state, tune_state);
+
+    /************************* VCO ***************************/
+        /* Default values for FG                                 */
+        /* from these are needed :                               */
+        /* Cp,HFdiv,VCOband,SD,Num,Den,FB and REFDiv             */
+
+#ifdef CONFIG_SYS_ISDBT
+        if (state->fe->dtv_property_cache.delivery_system == SYS_ISDBT && state->fe->dtv_property_cache.isdbt_sb_mode == 1)
+                rf += 850;
+#endif
+
+        if (state->current_rf != rf) {
+                state->tuner_is_tuned = 0;
+
+                tune = dib0090_tuning_table;
+
+                tmp = (state->revision >> 5) & 0x7;
+                if (tmp == 0x4 || tmp == 0x7) {
+                        /* CBAND tuner version for VHF */
+                        if (state->current_band == BAND_FM || state->current_band == BAND_VHF) {
+                                /* Force CBAND */
+                                state->current_band = BAND_CBAND;
+                                tune = dib0090_tuning_table_fm_vhf_on_cband;
+                        }
+                }
+
+                pll = dib0090_pll_table;
+                /* Look for the interval */
+                while (rf > tune->max_freq)
+                        tune++;
+                while (rf > pll->max_freq)
+                        pll++;
+                state->current_tune_table_index = tune;
+                state->current_pll_table_index = pll;
+        }
+
+        if (*tune_state == CT_TUNER_START) {
+
+                if (state->tuner_is_tuned == 0)
+                        state->current_rf = 0;
+
+                if (state->current_rf != rf) {
+
+                        dib0090_write_reg(state, 0x0b, 0xb800 | (tune->switch_trim));
+
+                        /* external loop filter, otherwise:
+                         * lo5 = (0 << 15) | (0 << 12) | (0 << 11) | (3 << 9) | (4 << 6) | (3 << 4) | 4;
+                         * lo6 = 0x0e34 */
+                        if (pll->vco_band)
+                                lo5 = 0x049e;
+                        else if (state->config->analog_output)
+                                lo5 = 0x041d;
+                        else
+                                lo5 = 0x041c;
+
+                        lo5 |= (pll->hfdiv_code << 11) | (pll->vco_band << 7);  /* bit 15 is the split to the slave, we do not do it here */
+
+                        if (!state->config->io.pll_int_loop_filt)
+                                lo6 = 0xff28;
+                        else
+                                lo6 = (state->config->io.pll_int_loop_filt << 3);
+
+                        VCOF_kHz = (pll->hfdiv * rf) * 2;
+
+                        FREF = state->config->io.clock_khz;
+
+                        FBDiv = (VCOF_kHz / pll->topresc / FREF);
+                        Rest = (VCOF_kHz / pll->topresc) - FBDiv * FREF;
+
+                        if (Rest < LPF)
+                                Rest = 0;
+                        else if (Rest < 2 * LPF)
+                                Rest = 2 * LPF;
+                        else if (Rest > (FREF - LPF)) {
+                                Rest = 0;
+                                FBDiv += 1;
+                        } else if (Rest > (FREF - 2 * LPF))
+                                Rest = FREF - 2 * LPF;
+                        Rest = (Rest * 6528) / (FREF / 10);
+
+                        Den = 1;
+
+                        dprintk(" *****  ******* Rest value = %d", Rest);
+
+                        if (Rest > 0) {
+                                if (state->config->analog_output)
+                                        lo6 |= (1 << 2) | 2;
+                                else
+                                        lo6 |= (1 << 2) | 1;
+                                Den = 255;
+                        }
+#ifdef CONFIG_BAND_SBAND
+                        if (state->current_band == BAND_SBAND)
+                                lo6 &= 0xfffb;
+#endif
+
+                        dib0090_write_reg(state, 0x15, (u16) FBDiv);
+
+                        dib0090_write_reg(state, 0x16, (Den << 8) | 1);
+
+                        dib0090_write_reg(state, 0x17, (u16) Rest);
+
+                        dib0090_write_reg(state, 0x19, lo5);
+
+                        dib0090_write_reg(state, 0x1c, lo6);
+
+                        lo6 = tune->tuner_enable;
+                        if (state->config->analog_output)
+                                lo6 = (lo6 & 0xff9f) | 0x2;
+
+                        dib0090_write_reg(state, 0x24, lo6 | EN_LO
+#ifdef CONFIG_DIB0090_USE_PWM_AGC
+                                          | state->config->use_pwm_agc * EN_CRYSTAL
+#endif
+                            );
+
+                        state->current_rf = rf;
+
+                        /* prepare a complete captrim */
+                        state->step = state->captrim = state->fcaptrim = 64;
+
+                } else {        /* we are already tuned to this frequency - the configuration is correct  */
+
+                        /* do a minimal captrim even if the frequency has not changed */
+                        state->step = 4;
+                        state->captrim = state->fcaptrim = dib0090_read_reg(state, 0x18) & 0x7f;
+                }
+                state->adc_diff = 3000;
+
+                dib0090_write_reg(state, 0x10, 0x2B1);
+
+                dib0090_write_reg(state, 0x1e, 0x0032);
+
+                ret = 20;
+                *tune_state = CT_TUNER_STEP_1;
+        } else if (*tune_state == CT_TUNER_STEP_0) {
+                /* nothing */
+        } else if (*tune_state == CT_TUNER_STEP_1) {
+                state->step /= 2;
+                dib0090_write_reg(state, 0x18, lo4 | state->captrim);
+                *tune_state = CT_TUNER_STEP_2;
+        } else if (*tune_state == CT_TUNER_STEP_2) {
+
+                adc = dib0090_read_reg(state, 0x1d);
+                dprintk("FE %d CAPTRIM=%d; ADC = %d (ADC) & %dmV", (u32) fe->id, (u32) state->captrim, (u32) adc,
+                        (u32) (adc) * (u32) 1800 / (u32) 1024);
+
+                if (adc >= 400) {
+                        adc -= 400;
+                        step_sign = -1;
+                } else {
+                        adc = 400 - adc;
+                        step_sign = 1;
+                }
+
+                if (adc < state->adc_diff) {
+                        dprintk("FE %d CAPTRIM=%d is closer to target (%d/%d)", (u32) fe->id, (u32) state->captrim, (u32) adc, (u32) state->adc_diff);
+                        state->adc_diff = adc;
+                        state->fcaptrim = state->captrim;
+
+                }
+
+                state->captrim += step_sign * state->step;
+                if (state->step >= 1)
+                        *tune_state = CT_TUNER_STEP_1;
+                else
+                        *tune_state = CT_TUNER_STEP_3;
+
+                ret = 15;
+        } else if (*tune_state == CT_TUNER_STEP_3) {
+                /*write the final cptrim config */
+                dib0090_write_reg(state, 0x18, lo4 | state->fcaptrim);
+
+#ifdef CONFIG_TUNER_DIB0090_CAPTRIM_MEMORY
+                state->memory[state->memory_index].cap = state->fcaptrim;
+#endif
+
+                *tune_state = CT_TUNER_STEP_4;
+        } else if (*tune_state == CT_TUNER_STEP_4) {
+                dib0090_write_reg(state, 0x1e, 0x07ff);
+
+                dprintk("FE %d Final Captrim: %d", (u32) fe->id, (u32) state->fcaptrim);
+                dprintk("FE %d HFDIV code: %d", (u32) fe->id, (u32) pll->hfdiv_code);
+                dprintk("FE %d VCO = %d", (u32) fe->id, (u32) pll->vco_band);
+                dprintk("FE %d VCOF in kHz: %d ((%d*%d) << 1))", (u32) fe->id, (u32) ((pll->hfdiv * rf) * 2), (u32) pll->hfdiv, (u32) rf);
+                dprintk("FE %d REFDIV: %d, FREF: %d", (u32) fe->id, (u32) 1, (u32) state->config->io.clock_khz);
+                dprintk("FE %d FBDIV: %d, Rest: %d", (u32) fe->id, (u32) dib0090_read_reg(state, 0x15), (u32) dib0090_read_reg(state, 0x17));
+                dprintk("FE %d Num: %d, Den: %d, SD: %d", (u32) fe->id, (u32) dib0090_read_reg(state, 0x17),
+                        (u32) (dib0090_read_reg(state, 0x16) >> 8), (u32) dib0090_read_reg(state, 0x1c) & 0x3);
+
+                c = 4;
+                i = 3;
+#if defined(CONFIG_BAND_LBAND) || defined(CONFIG_BAND_SBAND)
+                if ((state->current_band == BAND_LBAND) || (state->current_band == BAND_SBAND)) {
+                        c = 2;
+                        i = 2;
+                }
+#endif
+                dib0090_write_reg(state, 0x10, (c << 13) | (i << 11) | (WBD
+#ifdef CONFIG_DIB0090_USE_PWM_AGC
+                                                                        | (state->config->use_pwm_agc << 1)
+#endif
+                                  ));
+                dib0090_write_reg(state, 0x09, (tune->lna_tune << 5) | (tune->lna_bias << 0));
+                dib0090_write_reg(state, 0x0c, tune->v2i);
+                dib0090_write_reg(state, 0x0d, tune->mix);
+                dib0090_write_reg(state, 0x0e, tune->load);
+
+                *tune_state = CT_TUNER_STEP_5;
+        } else if (*tune_state == CT_TUNER_STEP_5) {
+
+                /* initialize the lt gain register */
+                state->rf_lt_def = 0x7c00;
+                dib0090_write_reg(state, 0x0f, state->rf_lt_def);
+
+                dib0090_set_bandwidth(state);
+                state->tuner_is_tuned = 1;
+                *tune_state = CT_TUNER_STOP;
+        } else
+                ret = FE_CALLBACK_TIME_NEVER;
+        return ret;
+}
+
+static int dib0090_release(struct dvb_frontend *fe)
+{
+        kfree(fe->tuner_priv);
+        fe->tuner_priv = NULL;
+        return 0;
+}
+
+enum frontend_tune_state dib0090_get_tune_state(struct dvb_frontend *fe)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+
+        return state->tune_state;
+}
+EXPORT_SYMBOL(dib0090_get_tune_state);
+
+int dib0090_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tune_state)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+
+        state->tune_state = tune_state;
+        return 0;
+}
+EXPORT_SYMBOL(dib0090_set_tune_state);
+
+static int dib0090_get_frequency(struct dvb_frontend *fe, u32 * frequency)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+
+        *frequency = 1000 * state->current_rf;
+        return 0;
+}
+
+static int dib0090_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)
+{
+        struct dib0090_state *state = fe->tuner_priv;
+        uint32_t ret;
+
+        state->tune_state = CT_TUNER_START;
+
+        do {
+                ret = dib0090_tune(fe);
+                if (ret != FE_CALLBACK_TIME_NEVER)
+                        msleep(ret / 10);
+                else
+                        break;
+        } while (state->tune_state != CT_TUNER_STOP);
+
+        return 0;
+}
+
+static const struct dvb_tuner_ops dib0090_ops = {
+        .info = {
+                 .name = "DiBcom DiB0090",
+                 .frequency_min = 45000000,
+                 .frequency_max = 860000000,
+                 .frequency_step = 1000,
+                 },
+        .release = dib0090_release,
+
+        .init = dib0090_wakeup,
+        .sleep = dib0090_sleep,
+        .set_params = dib0090_set_params,
+        .get_frequency = dib0090_get_frequency,
+};
+
+struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, const struct dib0090_config *config)
+{
+        struct dib0090_state *st = kzalloc(sizeof(struct dib0090_state), GFP_KERNEL);
+        if (st == NULL)
+                return NULL;
+
+        st->config = config;
+        st->i2c = i2c;
+        st->fe = fe;
+        fe->tuner_priv = st;
+
+        if (dib0090_reset(fe) != 0)
+                goto free_mem;
+
+        printk(KERN_INFO "DiB0090: successfully identified\n");
+        memcpy(&fe->ops.tuner_ops, &dib0090_ops, sizeof(struct dvb_tuner_ops));
+
+        return fe;
+ free_mem:
+        kfree(st);
+        fe->tuner_priv = NULL;
+        return NULL;
+}
+EXPORT_SYMBOL(dib0090_register);
+
+MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
+MODULE_AUTHOR("Olivier Grenie <olivier.grenie@dibcom.fr>");
+MODULE_DESCRIPTION("Driver for the DiBcom 0090 base-band RF Tuner");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/dib0090.h b/drivers/media/dvb/frontends/dib0090.h
new file mode 100644
index 000000000000..aa7711e88776
--- /dev/null
+++ b/drivers/media/dvb/frontends/dib0090.h
@@ -0,0 +1,108 @@
+/*
+ * Linux-DVB Driver for DiBcom's DiB0090 base-band RF Tuner.
+ *
+ * Copyright (C) 2005-7 DiBcom (http://www.dibcom.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, version 2.
+ */
+#ifndef DIB0090_H
+#define DIB0090_H
+
+struct dvb_frontend;
+struct i2c_adapter;
+
+#define DEFAULT_DIB0090_I2C_ADDRESS 0x60
+
+struct dib0090_io_config {
+        u32 clock_khz;
+
+        u8 pll_bypass:1;
+        u8 pll_range:1;
+        u8 pll_prediv:6;
+        u8 pll_loopdiv:6;
+
+        u8 adc_clock_ratio;     /* valid is 8, 7 ,6 */
+        u16 pll_int_loop_filt;
+};
+
+struct dib0090_config {
+        struct dib0090_io_config io;
+        int (*reset) (struct dvb_frontend *, int);
+        int (*sleep) (struct dvb_frontend *, int);
+
+        /*  offset in kHz */
+        int freq_offset_khz_uhf;
+        int freq_offset_khz_vhf;
+
+        int (*get_adc_power) (struct dvb_frontend *);
+
+        u8 clkouttobamse:1;     /* activate or deactivate clock output */
+        u8 analog_output;
+
+        u8 i2c_address;
+        /* add drives and other things if necessary */
+        u16 wbd_vhf_offset;
+        u16 wbd_cband_offset;
+        u8 use_pwm_agc;
+        u8 clkoutdrive;
+};
+
+#if defined(CONFIG_DVB_TUNER_DIB0090) || (defined(CONFIG_DVB_TUNER_DIB0090_MODULE) && defined(MODULE))
+extern struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, const struct dib0090_config *config);
+extern void dib0090_dcc_freq(struct dvb_frontend *fe, u8 fast);
+extern void dib0090_pwm_gain_reset(struct dvb_frontend *fe);
+extern u16 dib0090_get_wbd_offset(struct dvb_frontend *tuner);
+extern int dib0090_gain_control(struct dvb_frontend *fe);
+extern enum frontend_tune_state dib0090_get_tune_state(struct dvb_frontend *fe);
+extern int dib0090_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tune_state);
+extern void dib0090_get_current_gain(struct dvb_frontend *fe, u16 * rf, u16 * bb, u16 * rf_gain_limit, u16 * rflt);
+#else
+static inline struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dib0090_config *config)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+
+static inline void dib0090_dcc_freq(struct dvb_frontend *fe, u8 fast)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+}
+
+static inline void dib0090_pwm_gain_reset(struct dvb_frontend *fe)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+}
+
+static inline u16 dib0090_get_wbd_offset(struct dvb_frontend *tuner)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return 0;
+}
+
+static inline int dib0090_gain_control(struct dvb_frontend *fe)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return -ENODEV;
+}
+
+static inline enum frontend_tune_state dib0090_get_tune_state(struct dvb_frontend *fe)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return CT_DONE;
+}
+
+static inline int dib0090_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tune_state)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return -ENODEV;
+}
+
+static inline void dib0090_get_current_gain(struct dvb_frontend *fe, u16 * rf, u16 * bb, u16 * rf_gain_limit, u16 * rflt)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+}
+#endif
+
+#endif
diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c
index 898400d331a3..6f6fa29d9ea4 100644
--- a/drivers/media/dvb/frontends/dib8000.c
+++ b/drivers/media/dvb/frontends/dib8000.c
@@ -28,18 +28,6 @@ MODULE_PARM_DESC(debug, "turn on debugging (default: 0)");
 
 #define dprintk(args...) do { if (debug) { printk(KERN_DEBUG "DiB8000: "); printk(args); printk("\n"); } } while (0)
 
-enum frontend_tune_state {
-        CT_AGC_START = 20,
-        CT_AGC_STEP_0,
-        CT_AGC_STEP_1,
-        CT_AGC_STEP_2,
-        CT_AGC_STEP_3,
-        CT_AGC_STEP_4,
-        CT_AGC_STOP,
-
-        CT_DEMOD_START = 30,
-};
-
 #define FE_STATUS_TUNE_FAILED 0
 
 struct i2c_device {
@@ -133,104 +121,104 @@ static int dib8000_write_word(struct dib8000_state *state, u16 reg, u16 val)
         return dib8000_i2c_write16(&state->i2c, reg, val);
 }
 
-const int16_t coeff_2k_sb_1seg_dqpsk[8] = {
+static const int16_t coeff_2k_sb_1seg_dqpsk[8] = {
         (769 << 5) | 0x0a, (745 << 5) | 0x03, (595 << 5) | 0x0d, (769 << 5) | 0x0a, (920 << 5) | 0x09, (784 << 5) | 0x02, (519 << 5) | 0x0c,
             (920 << 5) | 0x09
 };
 
-const int16_t coeff_2k_sb_1seg[8] = {
+static const int16_t coeff_2k_sb_1seg[8] = {
         (692 << 5) | 0x0b, (683 << 5) | 0x01, (519 << 5) | 0x09, (692 << 5) | 0x0b, 0 | 0x1f, 0 | 0x1f, 0 | 0x1f, 0 | 0x1f
 };
 
-const int16_t coeff_2k_sb_3seg_0dqpsk_1dqpsk[8] = {
+static const int16_t coeff_2k_sb_3seg_0dqpsk_1dqpsk[8] = {
         (832 << 5) | 0x10, (912 << 5) | 0x05, (900 << 5) | 0x12, (832 << 5) | 0x10, (-931 << 5) | 0x0f, (912 << 5) | 0x04, (807 << 5) | 0x11,
             (-931 << 5) | 0x0f
 };
 
-const int16_t coeff_2k_sb_3seg_0dqpsk[8] = {
+static const int16_t coeff_2k_sb_3seg_0dqpsk[8] = {
         (622 << 5) | 0x0c, (941 << 5) | 0x04, (796 << 5) | 0x10, (622 << 5) | 0x0c, (982 << 5) | 0x0c, (519 << 5) | 0x02, (572 << 5) | 0x0e,
             (982 << 5) | 0x0c
 };
 
-const int16_t coeff_2k_sb_3seg_1dqpsk[8] = {
+static const int16_t coeff_2k_sb_3seg_1dqpsk[8] = {
         (699 << 5) | 0x14, (607 << 5) | 0x04, (944 << 5) | 0x13, (699 << 5) | 0x14, (-720 << 5) | 0x0d, (640 << 5) | 0x03, (866 << 5) | 0x12,
             (-720 << 5) | 0x0d
 };
 
-const int16_t coeff_2k_sb_3seg[8] = {
+static const int16_t coeff_2k_sb_3seg[8] = {
         (664 << 5) | 0x0c, (925 << 5) | 0x03, (937 << 5) | 0x10, (664 << 5) | 0x0c, (-610 << 5) | 0x0a, (697 << 5) | 0x01, (836 << 5) | 0x0e,
             (-610 << 5) | 0x0a
 };
 
-const int16_t coeff_4k_sb_1seg_dqpsk[8] = {
+static const int16_t coeff_4k_sb_1seg_dqpsk[8] = {
         (-955 << 5) | 0x0e, (687 << 5) | 0x04, (818 << 5) | 0x10, (-955 << 5) | 0x0e, (-922 << 5) | 0x0d, (750 << 5) | 0x03, (665 << 5) | 0x0f,
             (-922 << 5) | 0x0d
 };
 
-const int16_t coeff_4k_sb_1seg[8] = {
+static const int16_t coeff_4k_sb_1seg[8] = {
         (638 << 5) | 0x0d, (683 << 5) | 0x02, (638 << 5) | 0x0d, (638 << 5) | 0x0d, (-655 << 5) | 0x0a, (517 << 5) | 0x00, (698 << 5) | 0x0d,
             (-655 << 5) | 0x0a
 };
 
-const int16_t coeff_4k_sb_3seg_0dqpsk_1dqpsk[8] = {
+static const int16_t coeff_4k_sb_3seg_0dqpsk_1dqpsk[8] = {
         (-707 << 5) | 0x14, (910 << 5) | 0x06, (889 << 5) | 0x16, (-707 << 5) | 0x14, (-958 << 5) | 0x13, (993 << 5) | 0x05, (523 << 5) | 0x14,
             (-958 << 5) | 0x13
 };
 
-const int16_t coeff_4k_sb_3seg_0dqpsk[8] = {
+static const int16_t coeff_4k_sb_3seg_0dqpsk[8] = {
         (-723 << 5) | 0x13, (910 << 5) | 0x05, (777 << 5) | 0x14, (-723 << 5) | 0x13, (-568 << 5) | 0x0f, (547 << 5) | 0x03, (696 << 5) | 0x12,
             (-568 << 5) | 0x0f
 };
 
-const int16_t coeff_4k_sb_3seg_1dqpsk[8] = {
+static const int16_t coeff_4k_sb_3seg_1dqpsk[8] = {
         (-940 << 5) | 0x15, (607 << 5) | 0x05, (915 << 5) | 0x16, (-940 << 5) | 0x15, (-848 << 5) | 0x13, (683 << 5) | 0x04, (543 << 5) | 0x14,
             (-848 << 5) | 0x13
 };
 
-const int16_t coeff_4k_sb_3seg[8] = {
+static const int16_t coeff_4k_sb_3seg[8] = {
         (612 << 5) | 0x12, (910 << 5) | 0x04, (864 << 5) | 0x14, (612 << 5) | 0x12, (-869 << 5) | 0x13, (683 << 5) | 0x02, (869 << 5) | 0x12,
             (-869 << 5) | 0x13
 };
 
-const int16_t coeff_8k_sb_1seg_dqpsk[8] = {
+static const int16_t coeff_8k_sb_1seg_dqpsk[8] = {
         (-835 << 5) | 0x12, (684 << 5) | 0x05, (735 << 5) | 0x14, (-835 << 5) | 0x12, (-598 << 5) | 0x10, (781 << 5) | 0x04, (739 << 5) | 0x13,
             (-598 << 5) | 0x10
 };
 
-const int16_t coeff_8k_sb_1seg[8] = {
+static const int16_t coeff_8k_sb_1seg[8] = {
         (673 << 5) | 0x0f, (683 << 5) | 0x03, (808 << 5) | 0x12, (673 << 5) | 0x0f, (585 << 5) | 0x0f, (512 << 5) | 0x01, (780 << 5) | 0x0f,
             (585 << 5) | 0x0f
 };
 
-const int16_t coeff_8k_sb_3seg_0dqpsk_1dqpsk[8] = {
+static const int16_t coeff_8k_sb_3seg_0dqpsk_1dqpsk[8] = {
         (863 << 5) | 0x17, (930 << 5) | 0x07, (878 << 5) | 0x19, (863 << 5) | 0x17, (0 << 5) | 0x14, (521 << 5) | 0x05, (980 << 5) | 0x18,
             (0 << 5) | 0x14
 };
 
-const int16_t coeff_8k_sb_3seg_0dqpsk[8] = {
+static const int16_t coeff_8k_sb_3seg_0dqpsk[8] = {
         (-924 << 5) | 0x17, (910 << 5) | 0x06, (774 << 5) | 0x17, (-924 << 5) | 0x17, (-877 << 5) | 0x15, (565 << 5) | 0x04, (553 << 5) | 0x15,
             (-877 << 5) | 0x15
 };
 
-const int16_t coeff_8k_sb_3seg_1dqpsk[8] = {
+static const int16_t coeff_8k_sb_3seg_1dqpsk[8] = {
         (-921 << 5) | 0x19, (607 << 5) | 0x06, (881 << 5) | 0x19, (-921 << 5) | 0x19, (-921 << 5) | 0x14, (713 << 5) | 0x05, (1018 << 5) | 0x18,
             (-921 << 5) | 0x14
 };
 
-const int16_t coeff_8k_sb_3seg[8] = {
+static const int16_t coeff_8k_sb_3seg[8] = {
         (514 << 5) | 0x14, (910 << 5) | 0x05, (861 << 5) | 0x17, (514 << 5) | 0x14, (690 << 5) | 0x14, (683 << 5) | 0x03, (662 << 5) | 0x15,
             (690 << 5) | 0x14
 };
 
-const int16_t ana_fe_coeff_3seg[24] = {
+static const int16_t ana_fe_coeff_3seg[24] = {
         81, 80, 78, 74, 68, 61, 54, 45, 37, 28, 19, 11, 4, 1022, 1017, 1013, 1010, 1008, 1008, 1008, 1008, 1010, 1014, 1017
 };
 
-const int16_t ana_fe_coeff_1seg[24] = {
+static const int16_t ana_fe_coeff_1seg[24] = {
         249, 226, 164, 82, 5, 981, 970, 988, 1018, 20, 31, 26, 8, 1012, 1000, 1018, 1012, 8, 15, 14, 9, 3, 1017, 1003
 };
 
-const int16_t ana_fe_coeff_13seg[24] = {
+static const int16_t ana_fe_coeff_13seg[24] = {
         396, 305, 105, -51, -77, -12, 41, 31, -11, -30, -11, 14, 15, -2, -13, -7, 5, 8, 1, -6, -7, -3, 0, 1
 };
 
@@ -852,6 +840,14 @@ static int dib8000_set_agc_config(struct dib8000_state *state, u8 band)
         return 0;
 }
 
+void dib8000_pwm_agc_reset(struct dvb_frontend *fe)
+{
+        struct dib8000_state *state = fe->demodulator_priv;
+        dib8000_set_adc_state(state, DIBX000_ADC_ON);
+        dib8000_set_agc_config(state, (unsigned char)(BAND_OF_FREQUENCY(fe->dtv_property_cache.frequency / 1000)));
+}
+EXPORT_SYMBOL(dib8000_pwm_agc_reset);
+
 static int dib8000_agc_soft_split(struct dib8000_state *state)
 {
         u16 agc, split_offset;
@@ -939,6 +935,32 @@ static int dib8000_agc_startup(struct dvb_frontend *fe)
 
 }
 
+static const int32_t lut_1000ln_mant[] =
+{
+        908, 7003, 7090, 7170, 7244, 7313, 7377, 7438, 7495, 7549, 7600
+};
+
+int32_t dib8000_get_adc_power(struct dvb_frontend *fe, uint8_t mode)
+{
+    struct dib8000_state *state = fe->demodulator_priv;
+    uint32_t ix = 0, tmp_val = 0, exp = 0, mant = 0;
+    int32_t val;
+
+    val = dib8000_read32(state, 384);
+    /* mode = 1 : ln_agcpower calc using mant-exp conversion and mantis look up table */
+    if (mode) {
+        tmp_val = val;
+        while (tmp_val >>= 1)
+                exp++;
+        mant = (val * 1000 / (1<<exp));
+        ix = (uint8_t)((mant-1000)/100); /* index of the LUT */
+        val = (lut_1000ln_mant[ix] + 693*(exp-20) - 6908); /* 1000 * ln(adcpower_real) ; 693 = 1000ln(2) ; 6908 = 1000*ln(1000) ; 20 comes from adc_real = adc_pow_int / 2**20 */
+        val = (val*256)/1000;
+    }
+    return val;
+}
+EXPORT_SYMBOL(dib8000_get_adc_power);
+
 static void dib8000_update_timf(struct dib8000_state *state)
 {
         u32 timf = state->timf = dib8000_read32(state, 435);
@@ -1401,10 +1423,9 @@ static void dib8000_set_channel(struct dib8000_state *state, u8 seq, u8 autosear
                         }
                         break;
                 }
-        }
-        if (state->fe.dtv_property_cache.isdbt_sb_mode == 1)
                 for (i = 0; i < 8; i++)
                         dib8000_write_word(state, 343 + i, ncoeff[i]);
+        }
 
         // P_small_coef_ext_enable=ISDB-Tsb, P_small_narrow_band=ISDB-Tsb, P_small_last_seg=13, P_small_offset_num_car=5
         dib8000_write_word(state, 351,
@@ -1854,6 +1875,24 @@ static int dib8000_sleep(struct dvb_frontend *fe)
         }
 }
 
+enum frontend_tune_state dib8000_get_tune_state(struct dvb_frontend *fe)
+{
+        struct dib8000_state *state = fe->demodulator_priv;
+        return state->tune_state;
+}
+EXPORT_SYMBOL(dib8000_get_tune_state);
+
+int dib8000_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tune_state)
+{
+        struct dib8000_state *state = fe->demodulator_priv;
+        state->tune_state = tune_state;
+        return 0;
+}
+EXPORT_SYMBOL(dib8000_set_tune_state);
+
+
+
+
 static int dib8000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
 {
         struct dib8000_state *state = fe->demodulator_priv;
@@ -2043,29 +2082,31 @@ static int dib8000_read_status(struct dvb_frontend *fe, fe_status_t * stat)
 
         *stat = 0;
 
-        if ((lock >> 14) & 1)   // AGC
+        if ((lock >> 13) & 1)
                 *stat |= FE_HAS_SIGNAL;
 
-        if ((lock >> 8) & 1)    // Equal
+        if ((lock >> 8) & 1) /* Equal */
                 *stat |= FE_HAS_CARRIER;
 
-        if ((lock >> 3) & 1)    // TMCC_SYNC
+        if (((lock >> 1) & 0xf) == 0xf) /* TMCC_SYNC */
                 *stat |= FE_HAS_SYNC;
 
-        if ((lock >> 5) & 7)    // FEC MPEG
+        if (((lock >> 12) & 1) && ((lock >> 5) & 7)) /* FEC MPEG */
                 *stat |= FE_HAS_LOCK;
 
-        lock = dib8000_read_word(state, 554);   // Viterbi Layer A
-        if (lock & 0x01)
-                *stat |= FE_HAS_VITERBI;
+        if ((lock >> 12) & 1) {
+                lock = dib8000_read_word(state, 554); /* Viterbi Layer A */
+                if (lock & 0x01)
+                        *stat |= FE_HAS_VITERBI;
 
-        lock = dib8000_read_word(state, 555);   // Viterbi Layer B
-        if (lock & 0x01)
-                *stat |= FE_HAS_VITERBI;
+                lock = dib8000_read_word(state, 555); /* Viterbi Layer B */
+                if (lock & 0x01)
+                        *stat |= FE_HAS_VITERBI;
 
-        lock = dib8000_read_word(state, 556);   // Viterbi Layer C
-        if (lock & 0x01)
-                *stat |= FE_HAS_VITERBI;
+                lock = dib8000_read_word(state, 556); /* Viterbi Layer C */
+                if (lock & 0x01)
+                        *stat |= FE_HAS_VITERBI;
+        }
 
         return 0;
 }
diff --git a/drivers/media/dvb/frontends/dib8000.h b/drivers/media/dvb/frontends/dib8000.h
index 8c89482b738a..d99619ae983c 100644
--- a/drivers/media/dvb/frontends/dib8000.h
+++ b/drivers/media/dvb/frontends/dib8000.h
@@ -46,6 +46,10 @@ extern int dib8000_set_gpio(struct dvb_frontend *, u8 num, u8 dir, u8 val);
 extern int dib8000_set_wbd_ref(struct dvb_frontend *, u16 value);
 extern int dib8000_pid_filter_ctrl(struct dvb_frontend *, u8 onoff);
 extern int dib8000_pid_filter(struct dvb_frontend *, u8 id, u16 pid, u8 onoff);
+extern int dib8000_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tune_state);
+extern enum frontend_tune_state dib8000_get_tune_state(struct dvb_frontend *fe);
+extern void dib8000_pwm_agc_reset(struct dvb_frontend *fe);
+extern s32 dib8000_get_adc_power(struct dvb_frontend *fe, u8 mode);
 #else
 static inline struct dvb_frontend *dib8000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg)
 {
@@ -59,35 +63,53 @@ static inline struct i2c_adapter *dib8000_get_i2c_master(struct dvb_frontend *fe
         return NULL;
 }
 
-int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 default_addr, u8 first_addr)
+static inline int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 default_addr, u8 first_addr)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return -ENODEV;
 }
 
-int dib8000_set_gpio(struct dvb_frontend *fe, u8 num, u8 dir, u8 val)
+static inline int dib8000_set_gpio(struct dvb_frontend *fe, u8 num, u8 dir, u8 val)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return -ENODEV;
 }
 
-int dib8000_set_wbd_ref(struct dvb_frontend *fe, u16 value)
+static inline int dib8000_set_wbd_ref(struct dvb_frontend *fe, u16 value)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return -ENODEV;
 }
 
-int dib8000_pid_filter_ctrl(struct dvb_frontend *fe, u8 onoff)
+static inline int dib8000_pid_filter_ctrl(struct dvb_frontend *fe, u8 onoff)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return -ENODEV;
 }
 
-int dib8000_pid_filter(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff)
+static inline int dib8000_pid_filter(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return -ENODEV;
 }
+static inline int dib8000_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tune_state)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return -ENODEV;
+}
+static inline enum frontend_tune_state dib8000_get_tune_state(struct dvb_frontend *fe)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+    return CT_SHUTDOWN,
+}
+static inline void dib8000_pwm_agc_reset(struct dvb_frontend *fe)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+}
+static inline s32 dib8000_get_adc_power(struct dvb_frontend *fe, u8 mode)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+}
 #endif
 
 #endif
diff --git a/drivers/media/dvb/frontends/dibx000_common.c b/drivers/media/dvb/frontends/dibx000_common.c
index 4efca30d2127..e6f3d73db9d3 100644
--- a/drivers/media/dvb/frontends/dibx000_common.c
+++ b/drivers/media/dvb/frontends/dibx000_common.c
@@ -6,7 +6,7 @@ static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "turn on debugging (default: 0)");
 
-#define dprintk(args...) do { if (debug) { printk(KERN_DEBUG "DiBX000: "); printk(args); } } while (0)
+#define dprintk(args...) do { if (debug) { printk(KERN_DEBUG "DiBX000: "); printk(args); printk("\n"); } } while (0)
 
 static int dibx000_write_word(struct dibx000_i2c_master *mst, u16 reg, u16 val)
 {
@@ -25,7 +25,7 @@ static int dibx000_i2c_select_interface(struct dibx000_i2c_master *mst,
                                         enum dibx000_i2c_interface intf)
 {
         if (mst->device_rev > DIB3000MC && mst->selected_interface != intf) {
-                dprintk("selecting interface: %d\n", intf);
+                dprintk("selecting interface: %d", intf);
                 mst->selected_interface = intf;
                 return dibx000_write_word(mst, mst->base_reg + 4, intf);
         }
@@ -171,9 +171,18 @@ void dibx000_exit_i2c_master(struct dibx000_i2c_master *mst)
 {
         i2c_del_adapter(&mst->gated_tuner_i2c_adap);
 }
-
 EXPORT_SYMBOL(dibx000_exit_i2c_master);
 
+
+u32 systime()
+{
+    struct timespec t;
+
+    t = current_kernel_time();
+    return (t.tv_sec * 10000) + (t.tv_nsec / 100000);
+}
+EXPORT_SYMBOL(systime);
+
 MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
 MODULE_DESCRIPTION("Common function the DiBcom demodulator family");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/dibx000_common.h b/drivers/media/dvb/frontends/dibx000_common.h
index 5be10eca07c0..4f5d141a308d 100644
--- a/drivers/media/dvb/frontends/dibx000_common.h
+++ b/drivers/media/dvb/frontends/dibx000_common.h
@@ -36,13 +36,17 @@ extern struct i2c_adapter *dibx000_get_i2c_adapter(struct dibx000_i2c_master
 extern void dibx000_exit_i2c_master(struct dibx000_i2c_master *mst);
 extern void dibx000_reset_i2c_master(struct dibx000_i2c_master *mst);
 
+extern u32 systime(void);
+
 #define BAND_LBAND 0x01
 #define BAND_UHF   0x02
 #define BAND_VHF   0x04
 #define BAND_SBAND 0x08
-#define BAND_FM    0x10
+#define BAND_FM    0x10
+#define BAND_CBAND 0x20
 
-#define BAND_OF_FREQUENCY(freq_kHz) ( (freq_kHz) <= 115000 ? BAND_FM : \
+#define BAND_OF_FREQUENCY(freq_kHz) ((freq_kHz) <= 170000 ? BAND_CBAND : \
+                                                                        (freq_kHz) <= 115000 ? BAND_FM : \
                                                                         (freq_kHz) <= 250000 ? BAND_VHF : \
                                                                         (freq_kHz) <= 863000 ? BAND_UHF : \
                                                                         (freq_kHz) <= 2000000 ? BAND_LBAND : BAND_SBAND )
@@ -149,4 +153,67 @@ enum dibx000_adc_states {
 #define OUTMODE_MPEG2_FIFO          5
 #define OUTMODE_ANALOG_ADC          6
 
+enum frontend_tune_state {
+    CT_TUNER_START = 10,
+    CT_TUNER_STEP_0,
+    CT_TUNER_STEP_1,
+    CT_TUNER_STEP_2,
+    CT_TUNER_STEP_3,
+    CT_TUNER_STEP_4,
+    CT_TUNER_STEP_5,
+    CT_TUNER_STEP_6,
+    CT_TUNER_STEP_7,
+    CT_TUNER_STOP,
+
+    CT_AGC_START = 20,
+    CT_AGC_STEP_0,
+    CT_AGC_STEP_1,
+    CT_AGC_STEP_2,
+    CT_AGC_STEP_3,
+    CT_AGC_STEP_4,
+    CT_AGC_STOP,
+
+        CT_DEMOD_START = 30,
+    CT_DEMOD_STEP_1,
+    CT_DEMOD_STEP_2,
+    CT_DEMOD_STEP_3,
+    CT_DEMOD_STEP_4,
+    CT_DEMOD_STEP_5,
+    CT_DEMOD_STEP_6,
+    CT_DEMOD_STEP_7,
+    CT_DEMOD_STEP_8,
+    CT_DEMOD_STEP_9,
+    CT_DEMOD_STEP_10,
+    CT_DEMOD_SEARCH_NEXT = 41,
+    CT_DEMOD_STEP_LOCKED,
+    CT_DEMOD_STOP,
+
+    CT_DONE = 100,
+    CT_SHUTDOWN,
+
+};
+
+struct dvb_frontend_parametersContext {
+#define CHANNEL_STATUS_PARAMETERS_UNKNOWN   0x01
+#define CHANNEL_STATUS_PARAMETERS_SET       0x02
+    u8 status;
+    u32 tune_time_estimation[2];
+    s32 tps_available;
+    u16 tps[9];
+};
+
+#define FE_STATUS_TUNE_FAILED          0
+#define FE_STATUS_TUNE_TIMED_OUT      -1
+#define FE_STATUS_TUNE_TIME_TOO_SHORT -2
+#define FE_STATUS_TUNE_PENDING        -3
+#define FE_STATUS_STD_SUCCESS         -4
+#define FE_STATUS_FFT_SUCCESS         -5
+#define FE_STATUS_DEMOD_SUCCESS       -6
+#define FE_STATUS_LOCKED              -7
+#define FE_STATUS_DATA_LOCKED         -8
+
+#define FE_CALLBACK_TIME_NEVER 0xffffffff
+
+#define ABS(x) ((x < 0) ? (-x) : (x))
+
 #endif
diff --git a/drivers/media/dvb/frontends/lgs8gxx.c b/drivers/media/dvb/frontends/lgs8gxx.c
index eabcadc425d5..dee53960e7e8 100644
--- a/drivers/media/dvb/frontends/lgs8gxx.c
+++ b/drivers/media/dvb/frontends/lgs8gxx.c
@@ -199,7 +199,7 @@ static int lgs8gxx_set_if_freq(struct lgs8gxx_state *priv, u32 freq /*in kHz*/)
 
         val = freq;
         if (freq != 0) {
-                val *= (u64)1 << 32;
+                val <<= 32;
                 if (if_clk != 0)
                         do_div(val, if_clk);
                 v32 = val & 0xFFFFFFFF;
@@ -246,7 +246,7 @@ static int lgs8gxx_get_afc_phase(struct lgs8gxx_state *priv)
 
         val = v32;
         val *= priv->config->if_clk_freq;
-        val /= (u64)1 << 32;
+        val >>= 32;
         dprintk("AFC = %u kHz\n", (u32)val);
         return 0;
 }
diff --git a/drivers/media/dvb/frontends/lnbp21.c b/drivers/media/dvb/frontends/lnbp21.c
index 71f607fe8fc7..b181bf023ada 100644
--- a/drivers/media/dvb/frontends/lnbp21.c
+++ b/drivers/media/dvb/frontends/lnbp21.c
@@ -1,7 +1,7 @@
 /*
  * lnbp21.c - driver for lnb supply and control ic lnbp21
  *
- * Copyright (C) 2006 Oliver Endriss
+ * Copyright (C) 2006, 2009 Oliver Endriss <o.endriss@gmx.de>
  * Copyright (C) 2009 Igor M. Liplianin <liplianin@netup.ru>
  *
  * This program is free software; you can redistribute it and/or
@@ -91,6 +91,31 @@ static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg)
         return (i2c_transfer(lnbp21->i2c, &msg, 1) == 1) ? 0 : -EIO;
 }
 
+static int lnbp21_set_tone(struct dvb_frontend *fe,
+                                fe_sec_tone_mode_t tone)
+{
+        struct lnbp21 *lnbp21 = (struct lnbp21 *) fe->sec_priv;
+        struct i2c_msg msg = {  .addr = lnbp21->i2c_addr, .flags = 0,
+                                .buf = &lnbp21->config,
+                                .len = sizeof(lnbp21->config) };
+
+        switch (tone) {
+        case SEC_TONE_OFF:
+                lnbp21->config &= ~LNBP21_TEN;
+                break;
+        case SEC_TONE_ON:
+                lnbp21->config |= LNBP21_TEN;
+                break;
+        default:
+                return -EINVAL;
+        };
+
+        lnbp21->config |= lnbp21->override_or;
+        lnbp21->config &= lnbp21->override_and;
+
+        return (i2c_transfer(lnbp21->i2c, &msg, 1) == 1) ? 0 : -EIO;
+}
+
 static void lnbp21_release(struct dvb_frontend *fe)
 {
         /* LNBP power off */
@@ -133,6 +158,7 @@ static struct dvb_frontend *lnbx2x_attach(struct dvb_frontend *fe,
         /* override frontend ops */
         fe->ops.set_voltage = lnbp21_set_voltage;
         fe->ops.enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;
+        fe->ops.set_tone = lnbp21_set_tone;
         printk(KERN_INFO "LNBx2x attached on addr=%x\n", lnbp21->i2c_addr);
 
         return fe;
diff --git a/drivers/media/dvb/frontends/stv0900_core.c b/drivers/media/dvb/frontends/stv0900_core.c
index df49ea0983bc..8762c86044a5 100644
--- a/drivers/media/dvb/frontends/stv0900_core.c
+++ b/drivers/media/dvb/frontends/stv0900_core.c
@@ -1451,6 +1451,8 @@ static int stv0900_status(struct stv0900_internal *intp,
 {
         enum fe_stv0900_search_state demod_state;
         int locked = FALSE;
+        u8 tsbitrate0_val, tsbitrate1_val;
+        s32 bitrate;
 
         demod_state = stv0900_get_bits(intp, HEADER_MODE);
         switch (demod_state) {
@@ -1473,6 +1475,17 @@ static int stv0900_status(struct stv0900_internal *intp,
 
         dprintk("%s: locked = %d\n", __func__, locked);
 
+        if (stvdebug) {
+                /* Print TS bitrate */
+                tsbitrate0_val = stv0900_read_reg(intp, TSBITRATE0);
+                tsbitrate1_val = stv0900_read_reg(intp, TSBITRATE1);
+                /* Formula Bit rate = Mclk * px_tsfifo_bitrate / 16384 */
+                bitrate = (stv0900_get_mclk_freq(intp, intp->quartz)/1000000)
+                        * (tsbitrate1_val << 8 | tsbitrate0_val);
+                bitrate /= 16384;
+                dprintk("TS bitrate = %d Mbit/sec \n", bitrate);
+        };
+
         return locked;
 }
 
diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c
index 48edd542242e..1573466a5c74 100644
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -3597,7 +3597,8 @@ static int stv090x_send_diseqc_msg(struct dvb_frontend *fe, struct dvb_diseqc_ma
 
         reg = STV090x_READ_DEMOD(state, DISTXCTL);
 
-        STV090x_SETFIELD_Px(reg, DISTX_MODE_FIELD, 2);
+        STV090x_SETFIELD_Px(reg, DISTX_MODE_FIELD,
+                (state->config->diseqc_envelope_mode) ? 4 : 2);
         STV090x_SETFIELD_Px(reg, DISEQC_RESET_FIELD, 1);
         if (STV090x_WRITE_DEMOD(state, DISTXCTL, reg) < 0)
                 goto err;
@@ -3649,10 +3650,10 @@ static int stv090x_send_diseqc_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t
         reg = STV090x_READ_DEMOD(state, DISTXCTL);
 
         if (burst == SEC_MINI_A) {
-                mode = 3;
+                mode = (state->config->diseqc_envelope_mode) ? 5 : 3;
                 value = 0x00;
         } else {
-                mode = 2;
+                mode = (state->config->diseqc_envelope_mode) ? 4 : 2;
                 value = 0xFF;
         }
 
diff --git a/drivers/media/dvb/frontends/stv090x.h b/drivers/media/dvb/frontends/stv090x.h
index e968c98bb70f..b133807663ea 100644
--- a/drivers/media/dvb/frontends/stv090x.h
+++ b/drivers/media/dvb/frontends/stv090x.h
@@ -75,6 +75,8 @@ struct stv090x_config {
 
         enum stv090x_i2crpt     repeater_level;
 
+        bool diseqc_envelope_mode;
+
         int (*tuner_init) (struct dvb_frontend *fe);
         int (*tuner_set_mode) (struct dvb_frontend *fe, enum tuner_mode mode);
         int (*tuner_set_frequency) (struct dvb_frontend *fe, u32 frequency);
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index 266033ae2784..68bf9fbd8fed 100644
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -662,7 +662,7 @@ adapter_error:
         return rc;
 }
 
-int smsdvb_module_init(void)
+static int __init smsdvb_module_init(void)
 {
         int rc;
 
@@ -676,7 +676,7 @@ int smsdvb_module_init(void)
         return rc;
 }
 
-void smsdvb_module_exit(void)
+static void __exit smsdvb_module_exit(void)
 {
         smscore_unregister_hotplug(smsdvb_hotplug);
 
diff --git a/drivers/media/dvb/siano/smssdio.c b/drivers/media/dvb/siano/smssdio.c
index 24206cbda264..195244a3e69b 100644
--- a/drivers/media/dvb/siano/smssdio.c
+++ b/drivers/media/dvb/siano/smssdio.c
@@ -48,7 +48,7 @@
 #define SMSSDIO_INT             0x04
 #define SMSSDIO_BLOCK_SIZE      128
 
-static const struct sdio_device_id smssdio_ids[] = {
+static const struct sdio_device_id smssdio_ids[] __devinitconst = {
         {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_STELLAR),
          .driver_data = SMS1XXX_BOARD_SIANO_STELLAR},
         {SDIO_DEVICE(SDIO_VENDOR_ID_SIANO, SDIO_DEVICE_ID_SIANO_NOVA_A0),
@@ -222,7 +222,7 @@ static void smssdio_interrupt(struct sdio_func *func)
         smscore_onresponse(smsdev->coredev, cb);
 }
 
-static int smssdio_probe(struct sdio_func *func,
+static int __devinit smssdio_probe(struct sdio_func *func,
                          const struct sdio_device_id *id)
 {
         int ret;
@@ -338,7 +338,7 @@ static struct sdio_driver smssdio_driver = {
 /* Module functions                                                */
 /*******************************************************************/
 
-int smssdio_module_init(void)
+static int __init smssdio_module_init(void)
 {
         int ret = 0;
 
@@ -350,7 +350,7 @@ int smssdio_module_init(void)
         return ret;
 }
 
-void smssdio_module_exit(void)
+static void __exit smssdio_module_exit(void)
 {
         sdio_unregister_driver(&smssdio_driver);
 }
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index 8f88a586b0dd..5eac27287d9c 100644
--- a/drivers/media/dvb/siano/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -390,7 +390,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
         return rc;
 }
 
-static int smsusb_probe(struct usb_interface *intf,
+static int __devinit smsusb_probe(struct usb_interface *intf,
                         const struct usb_device_id *id)
 {
         struct usb_device *udev = interface_to_usbdev(intf);
@@ -484,7 +484,7 @@ static int smsusb_resume(struct usb_interface *intf)
         return 0;
 }
 
-struct usb_device_id smsusb_id_table[] = {
+static const struct usb_device_id smsusb_id_table[] __devinitconst = {
         { USB_DEVICE(0x187f, 0x0010),
                 .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
         { USB_DEVICE(0x187f, 0x0100),
@@ -533,8 +533,18 @@ struct usb_device_id smsusb_id_table[] = {
                 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
         { USB_DEVICE(0x2040, 0xb910),
                 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+        { USB_DEVICE(0x2040, 0xb980),
+                .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+        { USB_DEVICE(0x2040, 0xb990),
+                .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
         { USB_DEVICE(0x2040, 0xc000),
                 .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+        { USB_DEVICE(0x2040, 0xc010),
+                .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+        { USB_DEVICE(0x2040, 0xc080),
+                .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
+        { USB_DEVICE(0x2040, 0xc090),
+                .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
         { } /* Terminating entry */
         };
 
@@ -550,7 +560,7 @@ static struct usb_driver smsusb_driver = {
         .resume                 = smsusb_resume,
 };
 
-int smsusb_module_init(void)
+static int __init smsusb_module_init(void)
 {
         int rc = usb_register(&smsusb_driver);
         if (rc)
@@ -561,7 +571,7 @@ int smsusb_module_init(void)
         return rc;
 }
 
-void smsusb_module_exit(void)
+static void __exit smsusb_module_exit(void)
 {
         /* Regular USB Cleanup */
         usb_deregister(&smsusb_driver);
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 7d193ebc0aea..9782e0593733 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -190,12 +190,13 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         struct saa7146_dev *saa = budget_ci->budget.dev;
         struct input_dev *input_dev = budget_ci->ir.dev;
         int error;
+        struct ir_scancode_table *ir_codes;
+
 
         budget_ci->ir.dev = input_dev = input_allocate_device();
         if (!input_dev) {
                 printk(KERN_ERR "budget_ci: IR interface initialisation failed\n");
-                error = -ENOMEM;
-                goto out1;
+                return -ENOMEM;
         }
 
         snprintf(budget_ci->ir.name, sizeof(budget_ci->ir.name),
@@ -217,6 +218,11 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         }
         input_dev->dev.parent = &saa->pci->dev;
 
+        if (rc5_device < 0)
+                budget_ci->ir.rc5_device = IR_DEVICE_ANY;
+        else
+                budget_ci->ir.rc5_device = rc5_device;
+
         /* Select keymap and address */
         switch (budget_ci->budget.dev->pci->subsystem_device) {
         case 0x100c:
@@ -224,53 +230,34 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         case 0x1011:
         case 0x1012:
                 /* The hauppauge keymap is a superset of these remotes */
-                error = ir_input_init(input_dev, &budget_ci->ir.state,
-                              IR_TYPE_RC5, &ir_codes_hauppauge_new_table);
-                if (error < 0)
-                        goto out2;
+                ir_codes = &ir_codes_hauppauge_new_table;
 
                 if (rc5_device < 0)
                         budget_ci->ir.rc5_device = 0x1f;
-                else
-                        budget_ci->ir.rc5_device = rc5_device;
                 break;
         case 0x1010:
         case 0x1017:
         case 0x101a:
                 /* for the Technotrend 1500 bundled remote */
-                error = ir_input_init(input_dev, &budget_ci->ir.state,
-                              IR_TYPE_RC5, &ir_codes_tt_1500_table);
-                if (error < 0)
-                        goto out2;
-
-                if (rc5_device < 0)
-                        budget_ci->ir.rc5_device = IR_DEVICE_ANY;
-                else
-                        budget_ci->ir.rc5_device = rc5_device;
+                ir_codes = &ir_codes_tt_1500_table;
                 break;
         default:
                 /* unknown remote */
-                error = ir_input_init(input_dev, &budget_ci->ir.state,
-                              IR_TYPE_RC5, &ir_codes_budget_ci_old_table);
-                if (error < 0)
-                        goto out2;
-
-                if (rc5_device < 0)
-                        budget_ci->ir.rc5_device = IR_DEVICE_ANY;
-                else
-                        budget_ci->ir.rc5_device = rc5_device;
+                ir_codes = &ir_codes_budget_ci_old_table;
                 break;
         }
 
+        ir_input_init(input_dev, &budget_ci->ir.state, IR_TYPE_RC5);
+
         /* initialise the key-up timeout handler */
         init_timer(&budget_ci->ir.timer_keyup);
         budget_ci->ir.timer_keyup.function = msp430_ir_keyup;
         budget_ci->ir.timer_keyup.data = (unsigned long) &budget_ci->ir;
         budget_ci->ir.last_raw = 0xffff; /* An impossible value */
-        error = input_register_device(input_dev);
+        error = ir_input_register(input_dev, ir_codes);
         if (error) {
                 printk(KERN_ERR "budget_ci: could not init driver for IR device (code %d)\n", error);
-                goto out2;
+                return error;
         }
 
         /* note: these must be after input_register_device */
@@ -284,12 +271,6 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         saa7146_setgpio(saa, 3, SAA7146_GPIO_IRQHI);
 
         return 0;
-
-out2:
-        ir_input_free(input_dev);
-        input_free_device(input_dev);
-out1:
-        return error;
 }
 
 static void msp430_ir_deinit(struct budget_ci *budget_ci)
@@ -304,8 +285,7 @@ static void msp430_ir_deinit(struct budget_ci *budget_ci)
         del_timer_sync(&dev->timer);
         ir_input_nokey(dev, &budget_ci->ir.state);
 
-        ir_input_free(dev);
-        input_unregister_device(dev);
+        ir_input_unregister(dev);
 }
 
 static int ciintf_read_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int address)
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 4c2b8a246772..3f40f375981b 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -215,13 +215,10 @@ config RADIO_MIROPCM20
           module will be called radio-miropcm20.
 
 config RADIO_SF16FMI
-        tristate "SF16FMI Radio"
+        tristate "SF16-FMI/SF16-FMP Radio"
         depends on ISA && VIDEO_V4L2
         ---help---
-          Choose Y here if you have one of these FM radio cards.  If you
-          compile the driver into the kernel and your card is not PnP one, you
-          have to add "sf16fm=<io>" to the kernel command line (I/O address is
-          0x284 or 0x384).
+          Choose Y here if you have one of these FM radio cards.
 
           In order to control your radio card, you will need to use programs
           that are compatible with the Video For Linux API.  Information on
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 35edee009ba8..5bf4985daede 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -268,6 +268,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct rtrack *rt = video_drvdata(file);
 
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
         rt_setfreq(rt, f->frequency);
         return 0;
 }
@@ -277,6 +279,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct rtrack *rt = video_drvdata(file);
 
+        if (f->tuner != 0)
+                return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
         f->frequency = rt->curfreq;
         return 0;
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 8daf809eb01a..c22311393624 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -254,6 +254,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct aztech *az = video_drvdata(file);
 
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
         az_setfreq(az, f->frequency);
         return 0;
 }
@@ -263,6 +265,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct aztech *az = video_drvdata(file);
 
+        if (f->tuner != 0)
+                return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
         f->frequency = az->curfreq;
         return 0;
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index c6cf11661868..000f4d34087c 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -240,6 +240,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct gemtek_pci *card = video_drvdata(file);
 
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
         if (f->frequency < GEMTEK_PCI_RANGE_LOW ||
             f->frequency > GEMTEK_PCI_RANGE_HIGH)
                 return -EINVAL;
@@ -253,6 +255,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct gemtek_pci *card = video_drvdata(file);
 
+        if (f->tuner != 0)
+                return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
         f->frequency = card->current_frequency;
         return 0;
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index 64d737c35acf..f8213b7c8ddc 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -200,6 +200,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct maestro *dev = video_drvdata(file);
 
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
         if (f->frequency < FREQ_LO || f->frequency > FREQ_HI)
                 return -EINVAL;
         mutex_lock(&dev->lock);
@@ -213,6 +215,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct maestro *dev = video_drvdata(file);
 
+        if (f->tuner != 0)
+                return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
         mutex_lock(&dev->lock);
         f->frequency = BITS2FREQ(radio_bits_get(dev));
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 3da51fe8fb93..44b4dbedb322 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -262,6 +262,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct maxiradio *dev = video_drvdata(file);
 
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
         if (f->frequency < FREQ_LO || f->frequency > FREQ_HI) {
                 dprintk(dev, 1, "radio freq (%d.%02d MHz) out of range (%d-%d)\n",
                                         f->frequency / 16000,
@@ -285,6 +287,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct maxiradio *dev = video_drvdata(file);
 
+        if (f->tuner != 0)
+                return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
         f->frequency = dev->freq;
 
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index 949f60513d9e..02a9cefc9a00 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -374,6 +374,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct amradio_device *radio = file->private_data;
 
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
         return amradio_setfreq(radio, f->frequency);
 }
 
@@ -383,6 +385,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct amradio_device *radio = file->private_data;
 
+        if (f->tuner != 0)
+                return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
         f->frequency = radio->curfreq;
 
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index 9cb193fa6e33..a79296aac9a9 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -167,6 +167,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct rtrack2 *rt = video_drvdata(file);
 
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
         rt_setfreq(rt, f->frequency);
         return 0;
 }
@@ -176,6 +178,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct rtrack2 *rt = video_drvdata(file);
 
+        if (f->tuner != 0)
+                return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
         f->frequency = rt->curfreq;
         return 0;
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 49c4aab95dab..985359d18aa5 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -1,4 +1,4 @@
-/* SF16FMI radio driver for Linux radio support
+/* SF16-FMI and SF16-FMP radio driver for Linux radio support
  * heavily based on rtrack driver...
  * (c) 1997 M. Kirkwood
  * (c) 1998 Petr Vandrovec, vandrove@vc.cvut.cz
@@ -11,7 +11,7 @@
  *
  *  Frequency control is done digitally -- ie out(port,encodefreq(95.8));
  *  No volume control - only mute/unmute - you have to use line volume
- *  control on SB-part of SF16FMI
+ *  control on SB-part of SF16-FMI/SF16-FMP
  *
  * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>
  */
@@ -30,14 +30,14 @@
 #include <media/v4l2-ioctl.h>
 
 MODULE_AUTHOR("Petr Vandrovec, vandrove@vc.cvut.cz and M. Kirkwood");
-MODULE_DESCRIPTION("A driver for the SF16MI radio.");
+MODULE_DESCRIPTION("A driver for the SF16-FMI and SF16-FMP radio.");
 MODULE_LICENSE("GPL");
 
 static int io = -1;
 static int radio_nr = -1;
 
 module_param(io, int, 0);
-MODULE_PARM_DESC(io, "I/O address of the SF16MI card (0x284 or 0x384)");
+MODULE_PARM_DESC(io, "I/O address of the SF16-FMI or SF16-FMP card (0x284 or 0x384)");
 module_param(radio_nr, int, 0);
 
 #define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
@@ -47,13 +47,14 @@ struct fmi
         struct v4l2_device v4l2_dev;
         struct video_device vdev;
         int io;
-        int curvol; /* 1 or 0 */
+        bool mute;
         unsigned long curfreq; /* freq in kHz */
         struct mutex lock;
 };
 
 static struct fmi fmi_card;
 static struct pnp_dev *dev;
+bool pnp_attached;
 
 /* freq is in 1/16 kHz to internal number, hw precision is 50 kHz */
 /* It is only useful to give freq in interval of 800 (=0.05Mhz),
@@ -105,7 +106,7 @@ static inline int fmi_setfreq(struct fmi *fmi, unsigned long freq)
         outbits(8, 0xC0, fmi->io);
         msleep(143);            /* was schedule_timeout(HZ/7) */
         mutex_unlock(&fmi->lock);
-        if (fmi->curvol)
+        if (!fmi->mute)
                 fmi_unmute(fmi);
         return 0;
 }
@@ -116,7 +117,7 @@ static inline int fmi_getsigstr(struct fmi *fmi)
         int res;
 
         mutex_lock(&fmi->lock);
-        val = fmi->curvol ? 0x08 : 0x00;        /* unmute/mute */
+        val = fmi->mute ? 0x00 : 0x08;  /* mute/unmute */
         outb(val, fmi->io);
         outb(val | 0x10, fmi->io);
         msleep(143);            /* was schedule_timeout(HZ/7) */
@@ -168,6 +169,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct fmi *fmi = video_drvdata(file);
 
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
         if (f->frequency < RSF16_MINFREQ ||
                         f->frequency > RSF16_MAXFREQ)
                 return -EINVAL;
@@ -182,6 +185,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct fmi *fmi = video_drvdata(file);
 
+        if (f->tuner != 0)
+                return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
         f->frequency = fmi->curfreq;
         return 0;
@@ -204,7 +209,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
-                ctrl->value = fmi->curvol;
+                ctrl->value = fmi->mute;
                 return 0;
         }
         return -EINVAL;
@@ -221,7 +226,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
                         fmi_mute(fmi);
                 else
                         fmi_unmute(fmi);
-                fmi->curvol = ctrl->value;
+                fmi->mute = ctrl->value;
                 return 0;
         }
         return -EINVAL;
@@ -316,26 +321,54 @@ static int __init fmi_init(void)
 {
         struct fmi *fmi = &fmi_card;
         struct v4l2_device *v4l2_dev = &fmi->v4l2_dev;
-        int res;
+        int res, i;
+        int probe_ports[] = { 0, 0x284, 0x384 };
+
+        if (io < 0) {
+                for (i = 0; i < ARRAY_SIZE(probe_ports); i++) {
+                        io = probe_ports[i];
+                        if (io == 0) {
+                                io = isapnp_fmi_probe();
+                                if (io < 0)
+                                        continue;
+                                pnp_attached = 1;
+                        }
+                        if (!request_region(io, 2, "radio-sf16fmi")) {
+                                if (pnp_attached)
+                                        pnp_device_detach(dev);
+                                io = -1;
+                                continue;
+                        }
+                        if (pnp_attached ||
+                            ((inb(io) & 0xf9) == 0xf9 && (inb(io) & 0x4) == 0))
+                                break;
+                        release_region(io, 2);
+                        io = -1;
+                }
+        } else {
+                if (!request_region(io, 2, "radio-sf16fmi")) {
+                        printk(KERN_ERR "radio-sf16fmi: port %#x already in use\n", io);
+                        return -EBUSY;
+                }
+                if (inb(io) == 0xff) {
+                        printk(KERN_ERR "radio-sf16fmi: card not present at %#x\n", io);
+                        release_region(io, 2);
+                        return -ENODEV;
+                }
+        }
+        if (io < 0) {
+                printk(KERN_ERR "radio-sf16fmi: no cards found\n");
+                return -ENODEV;
+        }
 
-        if (io < 0)
-                io = isapnp_fmi_probe();
         strlcpy(v4l2_dev->name, "sf16fmi", sizeof(v4l2_dev->name));
         fmi->io = io;
-        if (fmi->io < 0) {
-                v4l2_err(v4l2_dev, "No PnP card found.\n");
-                return fmi->io;
-        }
-        if (!request_region(io, 2, "radio-sf16fmi")) {
-                v4l2_err(v4l2_dev, "port 0x%x already in use\n", fmi->io);
-                pnp_device_detach(dev);
-                return -EBUSY;
-        }
 
         res = v4l2_device_register(NULL, v4l2_dev);
         if (res < 0) {
                 release_region(fmi->io, 2);
-                pnp_device_detach(dev);
+                if (pnp_attached)
+                        pnp_device_detach(dev);
                 v4l2_err(v4l2_dev, "Could not register v4l2_device\n");
                 return res;
         }
@@ -352,7 +385,8 @@ static int __init fmi_init(void)
         if (video_register_device(&fmi->vdev, VFL_TYPE_RADIO, radio_nr) < 0) {
                 v4l2_device_unregister(v4l2_dev);
                 release_region(fmi->io, 2);
-                pnp_device_detach(dev);
+                if (pnp_attached)
+                        pnp_device_detach(dev);
                 return -EINVAL;
         }
 
@@ -369,7 +403,7 @@ static void __exit fmi_exit(void)
         video_unregister_device(&fmi->vdev);
         v4l2_device_unregister(&fmi->v4l2_dev);
         release_region(fmi->io, 2);
-        if (dev)
+        if (dev && pnp_attached)
                 pnp_device_detach(dev);
 }
 
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index a11414f648d4..52c7bbb32b8b 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -251,6 +251,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct fmr2 *fmr2 = video_drvdata(file);
 
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
         if (f->frequency < RSF16_MINFREQ ||
                         f->frequency > RSF16_MAXFREQ)
                 return -EINVAL;
@@ -272,6 +274,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct fmr2 *fmr2 = video_drvdata(file);
 
+        if (f->tuner != 0)
+                return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
         f->frequency = fmr2->curfreq;
         return 0;
diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
index 3cd76dddb6aa..8e718bfcdad3 100644
--- a/drivers/media/radio/radio-tea5764.c
+++ b/drivers/media/radio/radio-tea5764.c
@@ -314,7 +314,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
         if (v->index > 0)
                 return -EINVAL;
 
-        memset(v, 0, sizeof(v));
+        memset(v, 0, sizeof(*v));
         strcpy(v->name, "FM");
         v->type = V4L2_TUNER_RADIO;
         tea5764_i2c_read(radio);
@@ -349,7 +349,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct tea5764_device *radio = video_drvdata(file);
 
-        if (f->tuner != 0)
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
                 return -EINVAL;
         if (f->frequency == 0) {
                 /* We special case this as a power down control. */
@@ -370,8 +370,10 @@ static int vidioc_g_frequency(struct file *file, void *priv,
         struct tea5764_device *radio = video_drvdata(file);
         struct tea5764_regs *r = &radio->regs;
 
+        if (f->tuner != 0)
+                return -EINVAL;
         tea5764_i2c_read(radio);
-        memset(f, 0, sizeof(f));
+        memset(f, 0, sizeof(*f));
         f->type = V4L2_TUNER_RADIO;
         if (r->tnctrl & TEA5764_TNCTRL_PUPD0)
                 f->frequency = (tea5764_get_freq(radio) * 2) / 125;
@@ -458,12 +460,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
 static int tea5764_open(struct file *file)
 {
         /* Currently we support only one device */
-        int minor = video_devdata(file)->minor;
         struct tea5764_device *radio = video_drvdata(file);
 
-        if (radio->videodev->minor != minor)
-                return -ENODEV;
-
         mutex_lock(&radio->mutex);
         /* Only exclusive access */
         if (radio->users) {
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index 699db9acaaf7..fc1c860fd438 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -240,6 +240,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct terratec *tt = video_drvdata(file);
 
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
         tt_setfreq(tt, f->frequency);
         return 0;
 }
@@ -249,6 +251,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct terratec *tt = video_drvdata(file);
 
+        if (f->tuner != 0)
+                return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
         f->frequency = tt->curfreq;
         return 0;
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index 6f9ecc359356..9d6dcf8af5b0 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -239,6 +239,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct trust *tr = video_drvdata(file);
 
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
         tr_setfreq(tr, f->frequency);
         return 0;
 }
@@ -248,6 +250,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct trust *tr = video_drvdata(file);
 
+        if (f->tuner != 0)
+                return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
         f->frequency = tr->curfreq;
         return 0;
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 3a98f1399495..03439282dfce 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -207,6 +207,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct typhoon *dev = video_drvdata(file);
 
+        if (f->tuner != 0)
+                return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
         f->frequency = dev->curfreq;
         return 0;
@@ -217,6 +219,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct typhoon *dev = video_drvdata(file);
 
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
         dev->curfreq = f->frequency;
         typhoon_setfreq(dev, dev->curfreq);
         return 0;
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index 80e98b6422fe..f31eab99c943 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -266,6 +266,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 {
         struct zoltrix *zol = video_drvdata(file);
 
+        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+                return -EINVAL;
         if (zol_setfreq(zol, f->frequency) != 0)
                 return -EINVAL;
         return 0;
@@ -276,6 +278,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct zoltrix *zol = video_drvdata(file);
 
+        if (f->tuner != 0)
+                return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
         f->frequency = zol->curfreq;
         return 0;
diff --git a/drivers/media/radio/si470x/radio-si470x-common.c b/drivers/media/radio/si470x/radio-si470x-common.c
index f33315f2c543..4da0f150c6e2 100644
--- a/drivers/media/radio/si470x/radio-si470x-common.c
+++ b/drivers/media/radio/si470x/radio-si470x-common.c
@@ -426,6 +426,104 @@ int si470x_rds_on(struct si470x_device *radio)
 
 
 /**************************************************************************
+ * File Operations Interface
+ **************************************************************************/
+
+/*
+ * si470x_fops_read - read RDS data
+ */
+static ssize_t si470x_fops_read(struct file *file, char __user *buf,
+                size_t count, loff_t *ppos)
+{
+        struct si470x_device *radio = video_drvdata(file);
+        int retval = 0;
+        unsigned int block_count = 0;
+
+        /* switch on rds reception */
+        if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0)
+                si470x_rds_on(radio);
+
+        /* block if no new data available */
+        while (radio->wr_index == radio->rd_index) {
+                if (file->f_flags & O_NONBLOCK) {
+                        retval = -EWOULDBLOCK;
+                        goto done;
+                }
+                if (wait_event_interruptible(radio->read_queue,
+                        radio->wr_index != radio->rd_index) < 0) {
+                        retval = -EINTR;
+                        goto done;
+                }
+        }
+
+        /* calculate block count from byte count */
+        count /= 3;
+
+        /* copy RDS block out of internal buffer and to user buffer */
+        mutex_lock(&radio->lock);
+        while (block_count < count) {
+                if (radio->rd_index == radio->wr_index)
+                        break;
+
+                /* always transfer rds complete blocks */
+                if (copy_to_user(buf, &radio->buffer[radio->rd_index], 3))
+                        /* retval = -EFAULT; */
+                        break;
+
+                /* increment and wrap read pointer */
+                radio->rd_index += 3;
+                if (radio->rd_index >= radio->buf_size)
+                        radio->rd_index = 0;
+
+                /* increment counters */
+                block_count++;
+                buf += 3;
+                retval += 3;
+        }
+        mutex_unlock(&radio->lock);
+
+done:
+        return retval;
+}
+
+
+/*
+ * si470x_fops_poll - poll RDS data
+ */
+static unsigned int si470x_fops_poll(struct file *file,
+                struct poll_table_struct *pts)
+{
+        struct si470x_device *radio = video_drvdata(file);
+        int retval = 0;
+
+        /* switch on rds reception */
+        if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0)
+                si470x_rds_on(radio);
+
+        poll_wait(file, &radio->read_queue, pts);
+
+        if (radio->rd_index != radio->wr_index)
+                retval = POLLIN | POLLRDNORM;
+
+        return retval;
+}
+
+
+/*
+ * si470x_fops - file operations interface
+ */
+static const struct v4l2_file_operations si470x_fops = {
+        .owner                  = THIS_MODULE,
+        .read                   = si470x_fops_read,
+        .poll                   = si470x_fops_poll,
+        .ioctl                  = video_ioctl2,
+        .open                   = si470x_fops_open,
+        .release                = si470x_fops_release,
+};
+
+
+
+/**************************************************************************
  * Video4Linux Interface
  **************************************************************************/
 
diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c
index 2d53b6a9409b..5466015346a1 100644
--- a/drivers/media/radio/si470x/radio-si470x-i2c.c
+++ b/drivers/media/radio/si470x/radio-si470x-i2c.c
@@ -22,22 +22,17 @@
  */
 
 
-/*
- * ToDo:
- * - RDS support
- */
-
-
 /* driver definitions */
 #define DRIVER_AUTHOR "Joonyoung Shim <jy0922.shim@samsung.com>";
-#define DRIVER_KERNEL_VERSION KERNEL_VERSION(1, 0, 0)
+#define DRIVER_KERNEL_VERSION KERNEL_VERSION(1, 0, 1)
 #define DRIVER_CARD "Silicon Labs Si470x FM Radio Receiver"
 #define DRIVER_DESC "I2C radio driver for Si470x FM Radio Receivers"
-#define DRIVER_VERSION "1.0.0"
+#define DRIVER_VERSION "1.0.1"
 
 /* kernel includes */
 #include <linux/i2c.h>
 #include <linux/delay.h>
+#include <linux/interrupt.h>
 
 #include "radio-si470x.h"
 
@@ -62,6 +57,20 @@ static int radio_nr = -1;
 module_param(radio_nr, int, 0444);
 MODULE_PARM_DESC(radio_nr, "Radio Nr");
 
+/* RDS buffer blocks */
+static unsigned int rds_buf = 100;
+module_param(rds_buf, uint, 0444);
+MODULE_PARM_DESC(rds_buf, "RDS buffer entries: *100*");
+
+/* RDS maximum block errors */
+static unsigned short max_rds_errors = 1;
+/* 0 means   0  errors requiring correction */
+/* 1 means 1-2  errors requiring correction (used by original USBRadio.exe) */
+/* 2 means 3-5  errors requiring correction */
+/* 3 means   6+ errors or errors in checkword, correction not possible */
+module_param(max_rds_errors, ushort, 0644);
+MODULE_PARM_DESC(max_rds_errors, "RDS maximum block errors: *1*");
+
 
 
 /**************************************************************************
@@ -173,7 +182,7 @@ int si470x_disconnect_check(struct si470x_device *radio)
 /*
  * si470x_fops_open - file open
  */
-static int si470x_fops_open(struct file *file)
+int si470x_fops_open(struct file *file)
 {
         struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
@@ -181,12 +190,21 @@ static int si470x_fops_open(struct file *file)
         mutex_lock(&radio->lock);
         radio->users++;
 
-        if (radio->users == 1)
+        if (radio->users == 1) {
                 /* start radio */
                 retval = si470x_start(radio);
+                if (retval < 0)
+                        goto done;
+
+                /* enable RDS interrupt */
+                radio->registers[SYSCONFIG1] |= SYSCONFIG1_RDSIEN;
+                radio->registers[SYSCONFIG1] &= ~SYSCONFIG1_GPIO2;
+                radio->registers[SYSCONFIG1] |= 0x1 << 2;
+                retval = si470x_set_register(radio, SYSCONFIG1);
+        }
 
+done:
         mutex_unlock(&radio->lock);
-
         return retval;
 }
 
@@ -194,7 +212,7 @@ static int si470x_fops_open(struct file *file)
 /*
  * si470x_fops_release - file release
  */
-static int si470x_fops_release(struct file *file)
+int si470x_fops_release(struct file *file)
 {
         struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
@@ -215,17 +233,6 @@ static int si470x_fops_release(struct file *file)
 }
 
 
-/*
- * si470x_fops - file operations interface
- */
-const struct v4l2_file_operations si470x_fops = {
-        .owner          = THIS_MODULE,
-        .ioctl          = video_ioctl2,
-        .open           = si470x_fops_open,
-        .release        = si470x_fops_release,
-};
-
-
 
 /**************************************************************************
  * Video4Linux Interface
@@ -253,6 +260,105 @@ int si470x_vidioc_querycap(struct file *file, void *priv,
  **************************************************************************/
 
 /*
+ * si470x_i2c_interrupt_work - rds processing function
+ */
+static void si470x_i2c_interrupt_work(struct work_struct *work)
+{
+        struct si470x_device *radio = container_of(work,
+                        struct si470x_device, radio_work);
+        unsigned char regnr;
+        unsigned char blocknum;
+        unsigned short bler; /* rds block errors */
+        unsigned short rds;
+        unsigned char tmpbuf[3];
+        int retval = 0;
+
+        /* safety checks */
+        if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0)
+                return;
+
+        /* Update RDS registers */
+        for (regnr = 0; regnr < RDS_REGISTER_NUM; regnr++) {
+                retval = si470x_get_register(radio, STATUSRSSI + regnr);
+                if (retval < 0)
+                        return;
+        }
+
+        /* get rds blocks */
+        if ((radio->registers[STATUSRSSI] & STATUSRSSI_RDSR) == 0)
+                /* No RDS group ready, better luck next time */
+                return;
+
+        for (blocknum = 0; blocknum < 4; blocknum++) {
+                switch (blocknum) {
+                default:
+                        bler = (radio->registers[STATUSRSSI] &
+                                        STATUSRSSI_BLERA) >> 9;
+                        rds = radio->registers[RDSA];
+                        break;
+                case 1:
+                        bler = (radio->registers[READCHAN] &
+                                        READCHAN_BLERB) >> 14;
+                        rds = radio->registers[RDSB];
+                        break;
+                case 2:
+                        bler = (radio->registers[READCHAN] &
+                                        READCHAN_BLERC) >> 12;
+                        rds = radio->registers[RDSC];
+                        break;
+                case 3:
+                        bler = (radio->registers[READCHAN] &
+                                        READCHAN_BLERD) >> 10;
+                        rds = radio->registers[RDSD];
+                        break;
+                };
+
+                /* Fill the V4L2 RDS buffer */
+                put_unaligned_le16(rds, &tmpbuf);
+                tmpbuf[2] = blocknum;           /* offset name */
+                tmpbuf[2] |= blocknum << 3;     /* received offset */
+                if (bler > max_rds_errors)
+                        tmpbuf[2] |= 0x80;      /* uncorrectable errors */
+                else if (bler > 0)
+                        tmpbuf[2] |= 0x40;      /* corrected error(s) */
+
+                /* copy RDS block to internal buffer */
+                memcpy(&radio->buffer[radio->wr_index], &tmpbuf, 3);
+                radio->wr_index += 3;
+
+                /* wrap write pointer */
+                if (radio->wr_index >= radio->buf_size)
+                        radio->wr_index = 0;
+
+                /* check for overflow */
+                if (radio->wr_index == radio->rd_index) {
+                        /* increment and wrap read pointer */
+                        radio->rd_index += 3;
+                        if (radio->rd_index >= radio->buf_size)
+                                radio->rd_index = 0;
+                }
+        }
+
+        if (radio->wr_index != radio->rd_index)
+                wake_up_interruptible(&radio->read_queue);
+}
+
+
+/*
+ * si470x_i2c_interrupt - interrupt handler
+ */
+static irqreturn_t si470x_i2c_interrupt(int irq, void *dev_id)
+{
+        struct si470x_device *radio = dev_id;
+
+        if (!work_pending(&radio->radio_work))
+                schedule_work(&radio->radio_work);
+
+        return IRQ_HANDLED;
+}
+
+
+/*
  * si470x_i2c_probe - probe for the device
  */
 static int __devinit si470x_i2c_probe(struct i2c_client *client,
@@ -268,6 +374,8 @@ static int __devinit si470x_i2c_probe(struct i2c_client *client,
                 retval = -ENOMEM;
                 goto err_initial;
         }
+
+        INIT_WORK(&radio->radio_work, si470x_i2c_interrupt_work);
         radio->users = 0;
         radio->client = client;
         mutex_init(&radio->lock);
@@ -319,6 +427,26 @@ static int __devinit si470x_i2c_probe(struct i2c_client *client,
         /* set initial frequency */
         si470x_set_freq(radio, 87.5 * FREQ_MUL); /* available in all regions */
 
+        /* rds buffer allocation */
+        radio->buf_size = rds_buf * 3;
+        radio->buffer = kmalloc(radio->buf_size, GFP_KERNEL);
+        if (!radio->buffer) {
+                retval = -EIO;
+                goto err_video;
+        }
+
+        /* rds buffer configuration */
+        radio->wr_index = 0;
+        radio->rd_index = 0;
+        init_waitqueue_head(&radio->read_queue);
+
+        retval = request_irq(client->irq, si470x_i2c_interrupt,
+                        IRQF_TRIGGER_FALLING, DRIVER_NAME, radio);
+        if (retval) {
+                dev_err(&client->dev, "Failed to register interrupt\n");
+                goto err_rds;
+        }
+
         /* register video device */
         retval = video_register_device(radio->videodev, VFL_TYPE_RADIO,
                         radio_nr);
@@ -330,6 +458,9 @@ static int __devinit si470x_i2c_probe(struct i2c_client *client,
 
         return 0;
 err_all:
+        free_irq(client->irq, radio);
+err_rds:
+        kfree(radio->buffer);
 err_video:
         video_device_release(radio->videodev);
 err_radio:
@@ -346,6 +477,8 @@ static __devexit int si470x_i2c_remove(struct i2c_client *client)
 {
         struct si470x_device *radio = i2c_get_clientdata(client);
 
+        free_irq(client->irq, radio);
+        cancel_work_sync(&radio->radio_work);
         video_unregister_device(radio->videodev);
         kfree(radio);
         i2c_set_clientdata(client, NULL);
@@ -354,6 +487,44 @@ static __devexit int si470x_i2c_remove(struct i2c_client *client)
 }
 
 
+#ifdef CONFIG_PM
+/*
+ * si470x_i2c_suspend - suspend the device
+ */
+static int si470x_i2c_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+        struct si470x_device *radio = i2c_get_clientdata(client);
+
+        /* power down */
+        radio->registers[POWERCFG] |= POWERCFG_DISABLE;
+        if (si470x_set_register(radio, POWERCFG) < 0)
+                return -EIO;
+
+        return 0;
+}
+
+
+/*
+ * si470x_i2c_resume - resume the device
+ */
+static int si470x_i2c_resume(struct i2c_client *client)
+{
+        struct si470x_device *radio = i2c_get_clientdata(client);
+
+        /* power up : need 110ms */
+        radio->registers[POWERCFG] |= POWERCFG_ENABLE;
+        if (si470x_set_register(radio, POWERCFG) < 0)
+                return -EIO;
+        msleep(110);
+
+        return 0;
+}
+#else
+#define si470x_i2c_suspend      NULL
+#define si470x_i2c_resume       NULL
+#endif
+
+
 /*
  * si470x_i2c_driver - i2c driver interface
  */
@@ -364,6 +535,8 @@ static struct i2c_driver si470x_i2c_driver = {
         },
         .probe                  = si470x_i2c_probe,
         .remove                 = __devexit_p(si470x_i2c_remove),
+        .suspend                = si470x_i2c_suspend,
+        .resume                 = si470x_i2c_resume,
         .id_table               = si470x_i2c_id,
 };
 
diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c
index f2d0e1ddb301..a96e1b9dd646 100644
--- a/drivers/media/radio/si470x/radio-si470x-usb.c
+++ b/drivers/media/radio/si470x/radio-si470x-usb.c
@@ -509,89 +509,9 @@ resubmit:
  **************************************************************************/
 
 /*
- * si470x_fops_read - read RDS data
- */
-static ssize_t si470x_fops_read(struct file *file, char __user *buf,
-                size_t count, loff_t *ppos)
-{
-        struct si470x_device *radio = video_drvdata(file);
-        int retval = 0;
-        unsigned int block_count = 0;
-
-        /* switch on rds reception */
-        if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0)
-                si470x_rds_on(radio);
-
-        /* block if no new data available */
-        while (radio->wr_index == radio->rd_index) {
-                if (file->f_flags & O_NONBLOCK) {
-                        retval = -EWOULDBLOCK;
-                        goto done;
-                }
-                if (wait_event_interruptible(radio->read_queue,
-                        radio->wr_index != radio->rd_index) < 0) {
-                        retval = -EINTR;
-                        goto done;
-                }
-        }
-
-        /* calculate block count from byte count */
-        count /= 3;
-
-        /* copy RDS block out of internal buffer and to user buffer */
-        mutex_lock(&radio->lock);
-        while (block_count < count) {
-                if (radio->rd_index == radio->wr_index)
-                        break;
-
-                /* always transfer rds complete blocks */
-                if (copy_to_user(buf, &radio->buffer[radio->rd_index], 3))
-                        /* retval = -EFAULT; */
-                        break;
-
-                /* increment and wrap read pointer */
-                radio->rd_index += 3;
-                if (radio->rd_index >= radio->buf_size)
-                        radio->rd_index = 0;
-
-                /* increment counters */
-                block_count++;
-                buf += 3;
-                retval += 3;
-        }
-        mutex_unlock(&radio->lock);
-
-done:
-        return retval;
-}
-
-
-/*
- * si470x_fops_poll - poll RDS data
- */
-static unsigned int si470x_fops_poll(struct file *file,
-                struct poll_table_struct *pts)
-{
-        struct si470x_device *radio = video_drvdata(file);
-        int retval = 0;
-
-        /* switch on rds reception */
-        if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0)
-                si470x_rds_on(radio);
-
-        poll_wait(file, &radio->read_queue, pts);
-
-        if (radio->rd_index != radio->wr_index)
-                retval = POLLIN | POLLRDNORM;
-
-        return retval;
-}
-
-
-/*
  * si470x_fops_open - file open
  */
-static int si470x_fops_open(struct file *file)
+int si470x_fops_open(struct file *file)
 {
         struct si470x_device *radio = video_drvdata(file);
         int retval;
@@ -645,7 +565,7 @@ done:
 /*
  * si470x_fops_release - file release
  */
-static int si470x_fops_release(struct file *file)
+int si470x_fops_release(struct file *file)
 {
         struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
@@ -688,19 +608,6 @@ done:
 }
 
 
-/*
- * si470x_fops - file operations interface
- */
-const struct v4l2_file_operations si470x_fops = {
-        .owner          = THIS_MODULE,
-        .read           = si470x_fops_read,
-        .poll           = si470x_fops_poll,
-        .ioctl          = video_ioctl2,
-        .open           = si470x_fops_open,
-        .release        = si470x_fops_release,
-};
-
-
 
 /**************************************************************************
  * Video4Linux Interface
diff --git a/drivers/media/radio/si470x/radio-si470x.h b/drivers/media/radio/si470x/radio-si470x.h
index d0af194d194c..3cd0a29cd6e7 100644
--- a/drivers/media/radio/si470x/radio-si470x.h
+++ b/drivers/media/radio/si470x/radio-si470x.h
@@ -29,6 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include <linux/input.h>
@@ -181,6 +182,7 @@ struct si470x_device {
 
 #if defined(CONFIG_I2C_SI470X) || defined(CONFIG_I2C_SI470X_MODULE)
         struct i2c_client *client;
+        struct work_struct radio_work;
 #endif
 };
 
@@ -212,7 +214,6 @@ struct si470x_device {
 /**************************************************************************
  * Common Functions
  **************************************************************************/
-extern const struct v4l2_file_operations si470x_fops;
 extern struct video_device si470x_viddev_template;
 int si470x_get_register(struct si470x_device *radio, int regnr);
 int si470x_set_register(struct si470x_device *radio, int regnr);
@@ -221,5 +222,7 @@ int si470x_set_freq(struct si470x_device *radio, unsigned int freq);
 int si470x_start(struct si470x_device *radio);
 int si470x_stop(struct si470x_device *radio);
 int si470x_rds_on(struct si470x_device *radio);
+int si470x_fops_open(struct file *file);
+int si470x_fops_release(struct file *file);
 int si470x_vidioc_querycap(struct file *file, void *priv,
                 struct v4l2_capability *capability);
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 9dc74c93bf24..2f83be766d9f 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -37,10 +37,6 @@ config VIDEO_BTCX
         depends on PCI
         tristate
 
-config VIDEO_IR
-        tristate
-        depends on INPUT
-
 config VIDEO_TVEEPROM
         tristate
         depends on I2C
@@ -840,6 +836,12 @@ config SOC_CAMERA_MT9T031
         help
           This driver supports MT9T031 cameras from Micron.
 
+config SOC_CAMERA_MT9T112
+        tristate "mt9t112 support"
+        depends on SOC_CAMERA && I2C
+        help
+          This driver supports MT9T112 cameras from Aptina.
+
 config SOC_CAMERA_MT9V022
         tristate "mt9v022 support"
         depends on SOC_CAMERA && I2C
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 7a2dcc34111c..2af68ee84122 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -75,6 +75,7 @@ obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o
 obj-$(CONFIG_SOC_CAMERA_MT9M001)        += mt9m001.o
 obj-$(CONFIG_SOC_CAMERA_MT9M111)        += mt9m111.o
 obj-$(CONFIG_SOC_CAMERA_MT9T031)        += mt9t031.o
+obj-$(CONFIG_SOC_CAMERA_MT9T112)        += mt9t112.o
 obj-$(CONFIG_SOC_CAMERA_MT9V022)        += mt9v022.o
 obj-$(CONFIG_SOC_CAMERA_OV772X)         += ov772x.o
 obj-$(CONFIG_SOC_CAMERA_OV9640)         += ov9640.o
@@ -149,7 +150,7 @@ obj-$(CONFIG_VIDEO_VIVI) += vivi.o
 obj-$(CONFIG_VIDEO_CX23885) += cx23885/
 
 obj-$(CONFIG_VIDEO_OMAP2)               += omap2cam.o
-obj-$(CONFIG_SOC_CAMERA)                += soc_camera.o
+obj-$(CONFIG_SOC_CAMERA)                += soc_camera.o soc_mediabus.o
 obj-$(CONFIG_SOC_CAMERA_PLATFORM)       += soc_camera_platform.o
 # soc-camera host drivers have to be linked after camera drivers
 obj-$(CONFIG_VIDEO_MX1)                 += mx1_camera.o
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index d137bac84511..a356d6bd3131 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -767,7 +767,6 @@ static struct video_device ar_template = {
         .name           = "Colour AR VGA",
         .fops           = &ar_fops,
         .release        = ar_release,
-        .minor          = -1,
 };
 
 #define ALIGN4(x)       ((((int)(x)) & 0x3) == 0)
@@ -860,8 +859,8 @@ static int __init ar_init(void)
                 goto out_dev;
         }
 
-        printk("video%d: Found M64278 VGA (IRQ %d, Freq %dMHz).\n",
-                ar->vdev->num, M32R_IRQ_INT3, freq);
+        printk("%s: Found M64278 VGA (IRQ %d, Freq %dMHz).\n",
+                video_device_node_name(ar->vdev), M32R_IRQ_INT3, freq);
 
         return 0;
 
diff --git a/drivers/media/video/au0828/au0828-video.c b/drivers/media/video/au0828/au0828-video.c
index 1485aee18d58..dc67bc40f36f 100644
--- a/drivers/media/video/au0828/au0828-video.c
+++ b/drivers/media/video/au0828/au0828-video.c
@@ -40,7 +40,6 @@
 #include "au0828.h"
 #include "au0828-reg.h"
 
-static LIST_HEAD(au0828_devlist);
 static DEFINE_MUTEX(au0828_sysfs_lock);
 
 #define AU0828_VERSION_CODE KERNEL_VERSION(0, 0, 1)
@@ -693,10 +692,8 @@ void au0828_analog_unregister(struct au0828_dev *dev)
         dprintk(1, "au0828_release_resources called\n");
         mutex_lock(&au0828_sysfs_lock);
 
-        if (dev->vdev) {
-                list_del(&dev->au0828list);
+        if (dev->vdev)
                 video_unregister_device(dev->vdev);
-        }
         if (dev->vbi_dev)
                 video_unregister_device(dev->vbi_dev);
 
@@ -737,29 +734,15 @@ static void res_free(struct au0828_fh *fh)
 
 static int au0828_v4l2_open(struct file *filp)
 {
-        int minor = video_devdata(filp)->minor;
         int ret = 0;
-        struct au0828_dev *h, *dev = NULL;
+        struct au0828_dev *dev = video_drvdata(filp);
         struct au0828_fh *fh;
-        int type = 0;
-        struct list_head *list;
-
-        list_for_each(list, &au0828_devlist) {
-                h = list_entry(list, struct au0828_dev, au0828list);
-                if (h->vdev->minor == minor) {
-                        dev = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
+        int type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
 #ifdef VBI_IS_WORKING
-                if (h->vbi_dev->minor == minor) {
-                        dev = h;
-                        type = V4L2_BUF_TYPE_VBI_CAPTURE;
-                }
+        if (video_devdata(filp)->vfl_type == VFL_TYPE_GRABBER)
+                type = V4L2_BUF_TYPE_VBI_CAPTURE;
 #endif
-        }
-
-        if (NULL == dev)
-                return -ENODEV;
 
         fh = kzalloc(sizeof(struct au0828_fh), GFP_KERNEL);
         if (NULL == fh) {
@@ -1587,7 +1570,6 @@ static const struct video_device au0828_video_template = {
         .fops                       = &au0828_v4l_fops,
         .release                    = video_device_release,
         .ioctl_ops                  = &video_ioctl_ops,
-        .minor                      = -1,
         .tvnorms                    = V4L2_STD_NTSC_M,
         .current_norm               = V4L2_STD_NTSC_M,
 };
@@ -1676,25 +1658,23 @@ int au0828_analog_register(struct au0828_dev *dev,
         strcpy(dev->vbi_dev->name, "au0828a vbi");
 #endif
 
-        list_add_tail(&dev->au0828list, &au0828_devlist);
-
         /* Register the v4l2 device */
+        video_set_drvdata(dev->vdev, dev);
         retval = video_register_device(dev->vdev, VFL_TYPE_GRABBER, -1);
         if (retval != 0) {
                 dprintk(1, "unable to register video device (error = %d).\n",
                         retval);
-                list_del(&dev->au0828list);
                 video_device_release(dev->vdev);
                 return -ENODEV;
         }
 
 #ifdef VBI_IS_WORKING
         /* Register the vbi device */
+        video_set_drvdata(dev->vbi_dev, dev);
         retval = video_register_device(dev->vbi_dev, VFL_TYPE_VBI, -1);
         if (retval != 0) {
                 dprintk(1, "unable to register vbi device (error = %d).\n",
                         retval);
-                list_del(&dev->au0828list);
                 video_device_release(dev->vbi_dev);
                 video_device_release(dev->vdev);
                 return -ENODEV;
diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
index b977915efbd0..207f32dec6a6 100644
--- a/drivers/media/video/au0828/au0828.h
+++ b/drivers/media/video/au0828/au0828.h
@@ -192,7 +192,6 @@ struct au0828_dev {
         struct au0828_dvb               dvb;
 
         /* Analog */
-        struct list_head au0828list;
         struct v4l2_device v4l2_dev;
         int users;
         unsigned int stream_on:1;       /* Locks streams */
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index a6724019c66f..3182a406bdd1 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -3206,24 +3206,24 @@ err:
 
 static int bttv_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
+        struct video_device *vdev = video_devdata(file);
         struct bttv *btv = video_drvdata(file);
         struct bttv_fh *fh;
         enum v4l2_buf_type type = 0;
 
-        dprintk(KERN_DEBUG "bttv: open minor=%d\n",minor);
+        dprintk(KERN_DEBUG "bttv: open dev=%s\n", video_device_node_name(vdev));
 
-        lock_kernel();
-        if (btv->video_dev->minor == minor) {
+        if (vdev->vfl_type == VFL_TYPE_GRABBER) {
                 type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-        } else if (btv->vbi_dev->minor == minor) {
+        } else if (vdev->vfl_type == VFL_TYPE_VBI) {
                 type = V4L2_BUF_TYPE_VBI_CAPTURE;
         } else {
                 WARN_ON(1);
-                unlock_kernel();
                 return -ENODEV;
         }
 
+        lock_kernel();
+
         dprintk(KERN_DEBUG "bttv%d: open called (type=%s)\n",
                 btv->c.nr,v4l2_type_names[type]);
 
@@ -3397,7 +3397,6 @@ static const struct v4l2_ioctl_ops bttv_ioctl_ops = {
 
 static struct video_device bttv_video_template = {
         .fops         = &bttv_fops,
-        .minor        = -1,
         .ioctl_ops    = &bttv_ioctl_ops,
         .tvnorms      = BTTV_NORMS,
         .current_norm = V4L2_STD_PAL,
@@ -3408,18 +3407,13 @@ static struct video_device bttv_video_template = {
 
 static int radio_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
+        struct video_device *vdev = video_devdata(file);
         struct bttv *btv = video_drvdata(file);
         struct bttv_fh *fh;
 
-        dprintk("bttv: open minor=%d\n",minor);
+        dprintk("bttv: open dev=%s\n", video_device_node_name(vdev));
 
         lock_kernel();
-        WARN_ON(btv->radio_dev && btv->radio_dev->minor != minor);
-        if (!btv->radio_dev || btv->radio_dev->minor != minor) {
-                unlock_kernel();
-                return -ENODEV;
-        }
 
         dprintk("bttv%d: open called (radio)\n",btv->c.nr);
 
@@ -3640,7 +3634,6 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = {
 
 static struct video_device radio_template = {
         .fops      = &radio_fops,
-        .minor     = -1,
         .ioctl_ops = &radio_ioctl_ops,
 };
 
@@ -4208,21 +4201,21 @@ static struct video_device *vdev_init(struct bttv *btv,
 static void bttv_unregister_video(struct bttv *btv)
 {
         if (btv->video_dev) {
-                if (-1 != btv->video_dev->minor)
+                if (video_is_registered(btv->video_dev))
                         video_unregister_device(btv->video_dev);
                 else
                         video_device_release(btv->video_dev);
                 btv->video_dev = NULL;
         }
         if (btv->vbi_dev) {
-                if (-1 != btv->vbi_dev->minor)
+                if (video_is_registered(btv->vbi_dev))
                         video_unregister_device(btv->vbi_dev);
                 else
                         video_device_release(btv->vbi_dev);
                 btv->vbi_dev = NULL;
         }
         if (btv->radio_dev) {
-                if (-1 != btv->radio_dev->minor)
+                if (video_is_registered(btv->radio_dev))
                         video_unregister_device(btv->radio_dev);
                 else
                         video_device_release(btv->radio_dev);
@@ -4244,8 +4237,8 @@ static int __devinit bttv_register_video(struct bttv *btv)
         if (video_register_device(btv->video_dev, VFL_TYPE_GRABBER,
                                   video_nr[btv->c.nr]) < 0)
                 goto err;
-        printk(KERN_INFO "bttv%d: registered device video%d\n",
-               btv->c.nr, btv->video_dev->num);
+        printk(KERN_INFO "bttv%d: registered device %s\n",
+               btv->c.nr, video_device_node_name(btv->video_dev));
         if (device_create_file(&btv->video_dev->dev,
                                      &dev_attr_card)<0) {
                 printk(KERN_ERR "bttv%d: device_create_file 'card' "
@@ -4261,8 +4254,8 @@ static int __devinit bttv_register_video(struct bttv *btv)
         if (video_register_device(btv->vbi_dev, VFL_TYPE_VBI,
                                   vbi_nr[btv->c.nr]) < 0)
                 goto err;
-        printk(KERN_INFO "bttv%d: registered device vbi%d\n",
-               btv->c.nr, btv->vbi_dev->num);
+        printk(KERN_INFO "bttv%d: registered device %s\n",
+               btv->c.nr, video_device_node_name(btv->vbi_dev));
 
         if (!btv->has_radio)
                 return 0;
@@ -4273,8 +4266,8 @@ static int __devinit bttv_register_video(struct bttv *btv)
         if (video_register_device(btv->radio_dev, VFL_TYPE_RADIO,
                                   radio_nr[btv->c.nr]) < 0)
                 goto err;
-        printk(KERN_INFO "bttv%d: registered device radio%d\n",
-               btv->c.nr, btv->radio_dev->num);
+        printk(KERN_INFO "bttv%d: registered device %s\n",
+               btv->c.nr, video_device_node_name(btv->radio_dev));
 
         /* all done */
         return 0;
diff --git a/drivers/media/video/bt8xx/bttv-i2c.c b/drivers/media/video/bt8xx/bttv-i2c.c
index beda363418b0..63aa31a041e8 100644
--- a/drivers/media/video/bt8xx/bttv-i2c.c
+++ b/drivers/media/video/bt8xx/bttv-i2c.c
@@ -40,7 +40,7 @@ static int i2c_debug;
 static int i2c_hw;
 static int i2c_scan;
 module_param(i2c_debug, int, 0644);
-MODULE_PARM_DESC(i2c_hw,"configure i2c debug level");
+MODULE_PARM_DESC(i2c_debug, "configure i2c debug level");
 module_param(i2c_hw,    int, 0444);
 MODULE_PARM_DESC(i2c_hw,"force use of hardware i2c support, "
                         "instead of software bitbang");
@@ -400,7 +400,7 @@ int __devinit init_bttv_i2c(struct bttv *btv)
                    That's why we probe 0x1a (~0x34) first. CB
                 */
                 const unsigned short addr_list[] = {
-                        0x1a, 0x18, 0x4b, 0x64, 0x30,
+                        0x1a, 0x18, 0x4b, 0x64, 0x30, 0x71,
                         I2C_CLIENT_END
                 };
 
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 84a957e52c4b..277a092e1214 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -368,7 +368,7 @@ int bttv_input_init(struct bttv *btv)
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
                  pci_name(btv->c.pci));
 
-        err = ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, ir_type);
         if (err < 0)
                 goto err_out_free;
 
@@ -389,7 +389,7 @@ int bttv_input_init(struct bttv *btv)
         bttv_ir_start(btv, ir);
 
         /* all done */
-        err = input_register_device(btv->remote->dev);
+        err = ir_input_register(btv->remote->dev, ir_codes);
         if (err)
                 goto err_out_stop;
 
@@ -403,8 +403,6 @@ int bttv_input_init(struct bttv *btv)
         bttv_ir_stop(btv);
         btv->remote = NULL;
  err_out_free:
-        ir_input_free(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return err;
 }
@@ -415,8 +413,7 @@ void bttv_input_fini(struct bttv *btv)
                 return;
 
         bttv_ir_stop(btv);
-        ir_input_free(btv->remote->dev);
-        input_unregister_device(btv->remote->dev);
+        ir_input_unregister(btv->remote->dev);
         kfree(btv->remote);
         btv->remote = NULL;
 }
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index 85cf1778827a..e2cbebab959b 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -809,8 +809,8 @@ static int init_cqcam(struct parport *port)
                 return -ENODEV;
         }
 
-        printk(KERN_INFO "video%d: Colour QuickCam found on %s\n",
-               qcam->vdev.num, qcam->pport->name);
+        printk(KERN_INFO "%s: Colour QuickCam found on %s\n",
+               video_device_node_name(&qcam->vdev), qcam->pport->name);
 
         qcams[num_cams++] = qcam;
 
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 10230cb3d210..7bb9c1ec7819 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -1723,7 +1723,6 @@ static const struct v4l2_ioctl_ops cafe_v4l_ioctl_ops = {
 
 static struct video_device cafe_v4l_template = {
         .name = "cafe",
-        .minor = -1, /* Get one dynamically */
         .tvnorms = V4L2_STD_NTSC_M,
         .current_norm = V4L2_STD_NTSC_M,  /* make mplayer happy */
 
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index 2377313c041a..551ddf216a4b 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -32,6 +32,7 @@
 #include <linux/fs.h>
 #include <linux/vmalloc.h>
 #include <linux/sched.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/ctype.h>
@@ -244,72 +245,67 @@ static void rvfree(void *mem, unsigned long size)
 #ifdef CONFIG_PROC_FS
 static struct proc_dir_entry *cpia_proc_root=NULL;
 
-static int cpia_read_proc(char *page, char **start, off_t off,
-                          int count, int *eof, void *data)
+static int cpia_proc_show(struct seq_file *m, void *v)
 {
-        char *out = page;
-        int len, tmp;
-        struct cam_data *cam = data;
+        struct cam_data *cam = m->private;
+        int tmp;
         char tmpstr[29];
 
-        /* IMPORTANT: This output MUST be kept under PAGE_SIZE
-         *            or we need to get more sophisticated. */
-
-        out += sprintf(out, "read-only\n-----------------------\n");
-        out += sprintf(out, "V4L Driver version:       %d.%d.%d\n",
+        seq_printf(m, "read-only\n-----------------------\n");
+        seq_printf(m, "V4L Driver version:       %d.%d.%d\n",
                        CPIA_MAJ_VER, CPIA_MIN_VER, CPIA_PATCH_VER);
-        out += sprintf(out, "CPIA Version:             %d.%02d (%d.%d)\n",
+        seq_printf(m, "CPIA Version:             %d.%02d (%d.%d)\n",
                        cam->params.version.firmwareVersion,
                        cam->params.version.firmwareRevision,
                        cam->params.version.vcVersion,
                        cam->params.version.vcRevision);
-        out += sprintf(out, "CPIA PnP-ID:              %04x:%04x:%04x\n",
+        seq_printf(m, "CPIA PnP-ID:              %04x:%04x:%04x\n",
                        cam->params.pnpID.vendor, cam->params.pnpID.product,
                        cam->params.pnpID.deviceRevision);
-        out += sprintf(out, "VP-Version:               %d.%d %04x\n",
+        seq_printf(m, "VP-Version:               %d.%d %04x\n",
                        cam->params.vpVersion.vpVersion,
                        cam->params.vpVersion.vpRevision,
                        cam->params.vpVersion.cameraHeadID);
 
-        out += sprintf(out, "system_state:             %#04x\n",
+        seq_printf(m, "system_state:             %#04x\n",
                        cam->params.status.systemState);
-        out += sprintf(out, "grab_state:               %#04x\n",
+        seq_printf(m, "grab_state:               %#04x\n",
                        cam->params.status.grabState);
-        out += sprintf(out, "stream_state:             %#04x\n",
+        seq_printf(m, "stream_state:             %#04x\n",
                        cam->params.status.streamState);
-        out += sprintf(out, "fatal_error:              %#04x\n",
+        seq_printf(m, "fatal_error:              %#04x\n",
                        cam->params.status.fatalError);
-        out += sprintf(out, "cmd_error:                %#04x\n",
+        seq_printf(m, "cmd_error:                %#04x\n",
                        cam->params.status.cmdError);
-        out += sprintf(out, "debug_flags:              %#04x\n",
+        seq_printf(m, "debug_flags:              %#04x\n",
                        cam->params.status.debugFlags);
-        out += sprintf(out, "vp_status:                %#04x\n",
+        seq_printf(m, "vp_status:                %#04x\n",
                        cam->params.status.vpStatus);
-        out += sprintf(out, "error_code:               %#04x\n",
+        seq_printf(m, "error_code:               %#04x\n",
                        cam->params.status.errorCode);
         /* QX3 specific entries */
         if (cam->params.qx3.qx3_detected) {
-                out += sprintf(out, "button:                   %4d\n",
+                seq_printf(m, "button:                   %4d\n",
                                cam->params.qx3.button);
-                out += sprintf(out, "cradled:                  %4d\n",
+                seq_printf(m, "cradled:                  %4d\n",
                                cam->params.qx3.cradled);
         }
-        out += sprintf(out, "video_size:               %s\n",
+        seq_printf(m, "video_size:               %s\n",
                        cam->params.format.videoSize == VIDEOSIZE_CIF ?
                        "CIF " : "QCIF");
-        out += sprintf(out, "roi:                      (%3d, %3d) to (%3d, %3d)\n",
+        seq_printf(m, "roi:                      (%3d, %3d) to (%3d, %3d)\n",
                        cam->params.roi.colStart*8,
                        cam->params.roi.rowStart*4,
                        cam->params.roi.colEnd*8,
                        cam->params.roi.rowEnd*4);
-        out += sprintf(out, "actual_fps:               %3d\n", cam->fps);
-        out += sprintf(out, "transfer_rate:            %4dkB/s\n",
+        seq_printf(m, "actual_fps:               %3d\n", cam->fps);
+        seq_printf(m, "transfer_rate:            %4dkB/s\n",
                        cam->transfer_rate);
 
-        out += sprintf(out, "\nread-write\n");
-        out += sprintf(out, "-----------------------  current       min"
+        seq_printf(m, "\nread-write\n");
+        seq_printf(m, "-----------------------  current       min"
                        "       max   default  comment\n");
-        out += sprintf(out, "brightness:             %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "brightness:             %8d  %8d  %8d  %8d\n",
                        cam->params.colourParams.brightness, 0, 100, 50);
         if (cam->params.version.firmwareVersion == 1 &&
            cam->params.version.firmwareRevision == 2)
@@ -318,26 +314,26 @@ static int cpia_read_proc(char *page, char **start, off_t off,
         else
                 tmp = 96;
 
-        out += sprintf(out, "contrast:               %8d  %8d  %8d  %8d"
+        seq_printf(m, "contrast:               %8d  %8d  %8d  %8d"
                        "  steps of 8\n",
                        cam->params.colourParams.contrast, 0, tmp, 48);
-        out += sprintf(out, "saturation:             %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "saturation:             %8d  %8d  %8d  %8d\n",
                        cam->params.colourParams.saturation, 0, 100, 50);
         tmp = (25000+5000*cam->params.sensorFps.baserate)/
               (1<<cam->params.sensorFps.divisor);
-        out += sprintf(out, "sensor_fps:             %4d.%03d  %8d  %8d  %8d\n",
+        seq_printf(m, "sensor_fps:             %4d.%03d  %8d  %8d  %8d\n",
                        tmp/1000, tmp%1000, 3, 30, 15);
-        out += sprintf(out, "stream_start_line:      %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "stream_start_line:      %8d  %8d  %8d  %8d\n",
                        2*cam->params.streamStartLine, 0,
                        cam->params.format.videoSize == VIDEOSIZE_CIF ? 288:144,
                        cam->params.format.videoSize == VIDEOSIZE_CIF ? 240:120);
-        out += sprintf(out, "sub_sample:             %8s  %8s  %8s  %8s\n",
+        seq_printf(m, "sub_sample:             %8s  %8s  %8s  %8s\n",
                        cam->params.format.subSample == SUBSAMPLE_420 ?
                        "420" : "422", "420", "422", "422");
-        out += sprintf(out, "yuv_order:              %8s  %8s  %8s  %8s\n",
+        seq_printf(m, "yuv_order:              %8s  %8s  %8s  %8s\n",
                        cam->params.format.yuvOrder == YUVORDER_YUYV ?
                        "YUYV" : "UYVY", "YUYV" , "UYVY", "YUYV");
-        out += sprintf(out, "ecp_timing:             %8s  %8s  %8s  %8s\n",
+        seq_printf(m, "ecp_timing:             %8s  %8s  %8s  %8s\n",
                        cam->params.ecpTiming ? "slow" : "normal", "slow",
                        "normal", "normal");
 
@@ -346,13 +342,13 @@ static int cpia_read_proc(char *page, char **start, off_t off,
         } else {
                 sprintf(tmpstr, "manual");
         }
-        out += sprintf(out, "color_balance_mode:     %8s  %8s  %8s"
+        seq_printf(m, "color_balance_mode:     %8s  %8s  %8s"
                        "  %8s\n",  tmpstr, "manual", "auto", "auto");
-        out += sprintf(out, "red_gain:               %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "red_gain:               %8d  %8d  %8d  %8d\n",
                        cam->params.colourBalance.redGain, 0, 212, 32);
-        out += sprintf(out, "green_gain:             %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "green_gain:             %8d  %8d  %8d  %8d\n",
                        cam->params.colourBalance.greenGain, 0, 212, 6);
-        out += sprintf(out, "blue_gain:              %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "blue_gain:              %8d  %8d  %8d  %8d\n",
                        cam->params.colourBalance.blueGain, 0, 212, 92);
 
         if (cam->params.version.firmwareVersion == 1 &&
@@ -363,10 +359,10 @@ static int cpia_read_proc(char *page, char **start, off_t off,
                 sprintf(tmpstr, "%8d  %8d  %8d", 1, 8, 2);
 
         if (cam->params.exposure.gainMode == 0)
-                out += sprintf(out, "max_gain:                unknown  %28s"
+                seq_printf(m, "max_gain:                unknown  %28s"
                                "  powers of 2\n", tmpstr);
         else
-                out += sprintf(out, "max_gain:               %8d  %28s"
+                seq_printf(m, "max_gain:               %8d  %28s"
                                "  1,2,4 or 8 \n",
                                1<<(cam->params.exposure.gainMode-1), tmpstr);
 
@@ -382,12 +378,12 @@ static int cpia_read_proc(char *page, char **start, off_t off,
                 sprintf(tmpstr, "unknown");
                 break;
         }
-        out += sprintf(out, "exposure_mode:          %8s  %8s  %8s"
+        seq_printf(m, "exposure_mode:          %8s  %8s  %8s"
                        "  %8s\n",  tmpstr, "manual", "auto", "auto");
-        out += sprintf(out, "centre_weight:          %8s  %8s  %8s  %8s\n",
+        seq_printf(m, "centre_weight:          %8s  %8s  %8s  %8s\n",
                        (2-cam->params.exposure.centreWeight) ? "on" : "off",
                        "off", "on", "on");
-        out += sprintf(out, "gain:                   %8d  %8d  max_gain  %8d  1,2,4,8 possible\n",
+        seq_printf(m, "gain:                   %8d  %8d  max_gain  %8d  1,2,4,8 possible\n",
                        1<<cam->params.exposure.gain, 1, 1);
         if (cam->params.version.firmwareVersion == 1 &&
            cam->params.version.firmwareRevision == 2)
@@ -396,7 +392,7 @@ static int cpia_read_proc(char *page, char **start, off_t off,
         else
                 tmp = 510;
 
-        out += sprintf(out, "fine_exp:               %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "fine_exp:               %8d  %8d  %8d  %8d\n",
                        cam->params.exposure.fineExp*2, 0, tmp, 0);
         if (cam->params.version.firmwareVersion == 1 &&
            cam->params.version.firmwareRevision == 2)
@@ -405,127 +401,122 @@ static int cpia_read_proc(char *page, char **start, off_t off,
         else
                 tmp = MAX_EXP;
 
-        out += sprintf(out, "coarse_exp:             %8d  %8d  %8d"
+        seq_printf(m, "coarse_exp:             %8d  %8d  %8d"
                        "  %8d\n", cam->params.exposure.coarseExpLo+
                        256*cam->params.exposure.coarseExpHi, 0, tmp, 185);
-        out += sprintf(out, "red_comp:               %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "red_comp:               %8d  %8d  %8d  %8d\n",
                        cam->params.exposure.redComp, COMP_RED, 255, COMP_RED);
-        out += sprintf(out, "green1_comp:            %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "green1_comp:            %8d  %8d  %8d  %8d\n",
                        cam->params.exposure.green1Comp, COMP_GREEN1, 255,
                        COMP_GREEN1);
-        out += sprintf(out, "green2_comp:            %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "green2_comp:            %8d  %8d  %8d  %8d\n",
                        cam->params.exposure.green2Comp, COMP_GREEN2, 255,
                        COMP_GREEN2);
-        out += sprintf(out, "blue_comp:              %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "blue_comp:              %8d  %8d  %8d  %8d\n",
                        cam->params.exposure.blueComp, COMP_BLUE, 255, COMP_BLUE);
 
-        out += sprintf(out, "apcor_gain1:            %#8x  %#8x  %#8x  %#8x\n",
+        seq_printf(m, "apcor_gain1:            %#8x  %#8x  %#8x  %#8x\n",
                        cam->params.apcor.gain1, 0, 0xff, 0x1c);
-        out += sprintf(out, "apcor_gain2:            %#8x  %#8x  %#8x  %#8x\n",
+        seq_printf(m, "apcor_gain2:            %#8x  %#8x  %#8x  %#8x\n",
                        cam->params.apcor.gain2, 0, 0xff, 0x1a);
-        out += sprintf(out, "apcor_gain4:            %#8x  %#8x  %#8x  %#8x\n",
+        seq_printf(m, "apcor_gain4:            %#8x  %#8x  %#8x  %#8x\n",
                        cam->params.apcor.gain4, 0, 0xff, 0x2d);
-        out += sprintf(out, "apcor_gain8:            %#8x  %#8x  %#8x  %#8x\n",
+        seq_printf(m, "apcor_gain8:            %#8x  %#8x  %#8x  %#8x\n",
                        cam->params.apcor.gain8, 0, 0xff, 0x2a);
-        out += sprintf(out, "vl_offset_gain1:        %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "vl_offset_gain1:        %8d  %8d  %8d  %8d\n",
                        cam->params.vlOffset.gain1, 0, 255, 24);
-        out += sprintf(out, "vl_offset_gain2:        %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "vl_offset_gain2:        %8d  %8d  %8d  %8d\n",
                        cam->params.vlOffset.gain2, 0, 255, 28);
-        out += sprintf(out, "vl_offset_gain4:        %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "vl_offset_gain4:        %8d  %8d  %8d  %8d\n",
                        cam->params.vlOffset.gain4, 0, 255, 30);
-        out += sprintf(out, "vl_offset_gain8:        %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "vl_offset_gain8:        %8d  %8d  %8d  %8d\n",
                        cam->params.vlOffset.gain8, 0, 255, 30);
-        out += sprintf(out, "flicker_control:        %8s  %8s  %8s  %8s\n",
+        seq_printf(m, "flicker_control:        %8s  %8s  %8s  %8s\n",
                        cam->params.flickerControl.flickerMode ? "on" : "off",
                        "off", "on", "off");
-        out += sprintf(out, "mains_frequency:        %8d  %8d  %8d  %8d"
+        seq_printf(m, "mains_frequency:        %8d  %8d  %8d  %8d"
                        " only 50/60\n",
                        cam->mainsFreq ? 60 : 50, 50, 60, 50);
         if(cam->params.flickerControl.allowableOverExposure < 0)
-                out += sprintf(out, "allowable_overexposure: %4dauto      auto  %8d      auto\n",
+                seq_printf(m, "allowable_overexposure: %4dauto      auto  %8d      auto\n",
                                -cam->params.flickerControl.allowableOverExposure,
                                255);
         else
-                out += sprintf(out, "allowable_overexposure: %8d      auto  %8d      auto\n",
+                seq_printf(m, "allowable_overexposure: %8d      auto  %8d      auto\n",
                                cam->params.flickerControl.allowableOverExposure,
                                255);
-        out += sprintf(out, "compression_mode:       ");
+        seq_printf(m, "compression_mode:       ");
         switch(cam->params.compression.mode) {
         case CPIA_COMPRESSION_NONE:
-                out += sprintf(out, "%8s", "none");
+                seq_printf(m, "%8s", "none");
                 break;
         case CPIA_COMPRESSION_AUTO:
-                out += sprintf(out, "%8s", "auto");
+                seq_printf(m, "%8s", "auto");
                 break;
         case CPIA_COMPRESSION_MANUAL:
-                out += sprintf(out, "%8s", "manual");
+                seq_printf(m, "%8s", "manual");
                 break;
         default:
-                out += sprintf(out, "%8s", "unknown");
+                seq_printf(m, "%8s", "unknown");
                 break;
         }
-        out += sprintf(out, "    none,auto,manual      auto\n");
-        out += sprintf(out, "decimation_enable:      %8s  %8s  %8s  %8s\n",
+        seq_printf(m, "    none,auto,manual      auto\n");
+        seq_printf(m, "decimation_enable:      %8s  %8s  %8s  %8s\n",
                        cam->params.compression.decimation ==
                        DECIMATION_ENAB ? "on":"off", "off", "on",
                        "off");
-        out += sprintf(out, "compression_target:    %9s %9s %9s %9s\n",
+        seq_printf(m, "compression_target:    %9s %9s %9s %9s\n",
                        cam->params.compressionTarget.frTargeting  ==
                        CPIA_COMPRESSION_TARGET_FRAMERATE ?
                        "framerate":"quality",
                        "framerate", "quality", "quality");
-        out += sprintf(out, "target_framerate:       %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "target_framerate:       %8d  %8d  %8d  %8d\n",
                        cam->params.compressionTarget.targetFR, 1, 30, 15);
-        out += sprintf(out, "target_quality:         %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "target_quality:         %8d  %8d  %8d  %8d\n",
                        cam->params.compressionTarget.targetQ, 1, 64, 5);
-        out += sprintf(out, "y_threshold:            %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "y_threshold:            %8d  %8d  %8d  %8d\n",
                        cam->params.yuvThreshold.yThreshold, 0, 31, 6);
-        out += sprintf(out, "uv_threshold:           %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "uv_threshold:           %8d  %8d  %8d  %8d\n",
                        cam->params.yuvThreshold.uvThreshold, 0, 31, 6);
-        out += sprintf(out, "hysteresis:             %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "hysteresis:             %8d  %8d  %8d  %8d\n",
                        cam->params.compressionParams.hysteresis, 0, 255, 3);
-        out += sprintf(out, "threshold_max:          %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "threshold_max:          %8d  %8d  %8d  %8d\n",
                        cam->params.compressionParams.threshMax, 0, 255, 11);
-        out += sprintf(out, "small_step:             %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "small_step:             %8d  %8d  %8d  %8d\n",
                        cam->params.compressionParams.smallStep, 0, 255, 1);
-        out += sprintf(out, "large_step:             %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "large_step:             %8d  %8d  %8d  %8d\n",
                        cam->params.compressionParams.largeStep, 0, 255, 3);
-        out += sprintf(out, "decimation_hysteresis:  %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "decimation_hysteresis:  %8d  %8d  %8d  %8d\n",
                        cam->params.compressionParams.decimationHysteresis,
                        0, 255, 2);
-        out += sprintf(out, "fr_diff_step_thresh:    %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "fr_diff_step_thresh:    %8d  %8d  %8d  %8d\n",
                        cam->params.compressionParams.frDiffStepThresh,
                        0, 255, 5);
-        out += sprintf(out, "q_diff_step_thresh:     %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "q_diff_step_thresh:     %8d  %8d  %8d  %8d\n",
                        cam->params.compressionParams.qDiffStepThresh,
                        0, 255, 3);
-        out += sprintf(out, "decimation_thresh_mod:  %8d  %8d  %8d  %8d\n",
+        seq_printf(m, "decimation_thresh_mod:  %8d  %8d  %8d  %8d\n",
                        cam->params.compressionParams.decimationThreshMod,
                        0, 255, 2);
         /* QX3 specific entries */
         if (cam->params.qx3.qx3_detected) {
-                out += sprintf(out, "toplight:               %8s  %8s  %8s  %8s\n",
+                seq_printf(m, "toplight:               %8s  %8s  %8s  %8s\n",
                                cam->params.qx3.toplight ? "on" : "off",
                                "off", "on", "off");
-                out += sprintf(out, "bottomlight:            %8s  %8s  %8s  %8s\n",
+                seq_printf(m, "bottomlight:            %8s  %8s  %8s  %8s\n",
                                cam->params.qx3.bottomlight ? "on" : "off",
                                "off", "on", "off");
         }
 
-        len = out - page;
-        len -= off;
-        if (len < count) {
-                *eof = 1;
-                if (len <= 0) return 0;
-        } else
-                len = count;
-
-        *start = page + off;
-        return len;
+        return 0;
 }
 
+static int cpia_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, cpia_proc_show, PDE(inode)->data);
+}
 
-static int match(char *checkstr, char **buffer, unsigned long *count,
+static int match(char *checkstr, char **buffer, size_t *count,
                  int *find_colon, int *err)
 {
         int ret, colon_found = 1;
@@ -551,7 +542,7 @@ static int match(char *checkstr, char **buffer, unsigned long *count,
         return ret;
 }
 
-static unsigned long int value(char **buffer, unsigned long *count, int *err)
+static unsigned long int value(char **buffer, size_t *count, int *err)
 {
         char *p;
         unsigned long int ret;
@@ -565,10 +556,10 @@ static unsigned long int value(char **buffer, unsigned long *count, int *err)
         return ret;
 }
 
-static int cpia_write_proc(struct file *file, const char __user *buf,
-                           unsigned long count, void *data)
+static ssize_t cpia_proc_write(struct file *file, const char __user *buf,
+                               size_t count, loff_t *pos)
 {
-        struct cam_data *cam = data;
+        struct cam_data *cam = PDE(file->f_path.dentry->d_inode)->data;
         struct cam_params new_params;
         char *page, *buffer;
         int retval, find_colon;
@@ -582,7 +573,7 @@ static int cpia_write_proc(struct file *file, const char __user *buf,
          * from the comx driver
          */
         if (count > PAGE_SIZE) {
-                printk(KERN_ERR "count is %lu > %d!!!\n", count, (int)PAGE_SIZE);
+                printk(KERN_ERR "count is %zu > %d!!!\n", count, (int)PAGE_SIZE);
                 return -ENOSPC;
         }
 
@@ -1340,23 +1331,28 @@ out:
         return retval;
 }
 
+static const struct file_operations cpia_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = cpia_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = cpia_proc_write,
+};
+
 static void create_proc_cpia_cam(struct cam_data *cam)
 {
-        char name[5 + 1 + 10 + 1];
         struct proc_dir_entry *ent;
 
         if (!cpia_proc_root || !cam)
                 return;
 
-        snprintf(name, sizeof(name), "video%d", cam->vdev.num);
-
-        ent = create_proc_entry(name, S_IFREG|S_IRUGO|S_IWUSR, cpia_proc_root);
+        ent = proc_create_data(video_device_node_name(&cam->vdev),
+                               S_IRUGO|S_IWUSR, cpia_proc_root,
+                               &cpia_proc_fops, cam);
         if (!ent)
                 return;
 
-        ent->data = cam;
-        ent->read_proc = cpia_read_proc;
-        ent->write_proc = cpia_write_proc;
         /*
            size of the proc entry is 3736 bytes for the standard webcam;
            the extra features of the QX3 microscope add 189 bytes.
@@ -1368,13 +1364,10 @@ static void create_proc_cpia_cam(struct cam_data *cam)
 
 static void destroy_proc_cpia_cam(struct cam_data *cam)
 {
-        char name[5 + 1 + 10 + 1];
-
         if (!cam || !cam->proc_entry)
                 return;
 
-        snprintf(name, sizeof(name), "video%d", cam->vdev.num);
-        remove_proc_entry(name, cpia_proc_root);
+        remove_proc_entry(video_device_node_name(&cam->vdev), cpia_proc_root);
         cam->proc_entry = NULL;
 }
 
@@ -3999,7 +3992,7 @@ void cpia_unregister_camera(struct cam_data *cam)
         }
 
 #ifdef CONFIG_PROC_FS
-        DBG("destroying /proc/cpia/video%d\n", cam->vdev.num);
+        DBG("destroying /proc/cpia/%s\n", video_device_node_name(&cam->vdev));
         destroy_proc_cpia_cam(cam);
 #endif
         if (!cam->open_count) {
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index 0b4a8f309cfa..6f91415eb7b4 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -38,17 +38,12 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/videodev.h>
+#include <linux/stringify.h>
 #include <media/v4l2-ioctl.h>
 
 #include "cpia2.h"
 #include "cpia2dev.h"
 
-
-//#define _CPIA2_DEBUG_
-
-#define MAKE_STRING_1(x)        #x
-#define MAKE_STRING(x)  MAKE_STRING_1(x)
-
 static int video_nr = -1;
 module_param(video_nr, int, 0);
 MODULE_PARM_DESC(video_nr,"video device to register (0=/dev/video0, etc)");
@@ -60,26 +55,26 @@ MODULE_PARM_DESC(buffer_size, "Size for each frame buffer in bytes (default 68k)
 static int num_buffers = 3;
 module_param(num_buffers, int, 0);
 MODULE_PARM_DESC(num_buffers, "Number of frame buffers (1-"
-                 MAKE_STRING(VIDEO_MAX_FRAME) ", default 3)");
+                 __stringify(VIDEO_MAX_FRAME) ", default 3)");
 
 static int alternate = DEFAULT_ALT;
 module_param(alternate, int, 0);
-MODULE_PARM_DESC(alternate, "USB Alternate (" MAKE_STRING(USBIF_ISO_1) "-"
-                 MAKE_STRING(USBIF_ISO_6) ", default "
-                 MAKE_STRING(DEFAULT_ALT) ")");
+MODULE_PARM_DESC(alternate, "USB Alternate (" __stringify(USBIF_ISO_1) "-"
+                 __stringify(USBIF_ISO_6) ", default "
+                 __stringify(DEFAULT_ALT) ")");
 
 static int flicker_freq = 60;
 module_param(flicker_freq, int, 0);
-MODULE_PARM_DESC(flicker_freq, "Flicker frequency (" MAKE_STRING(50) "or"
-                 MAKE_STRING(60) ", default "
-                 MAKE_STRING(60) ")");
+MODULE_PARM_DESC(flicker_freq, "Flicker frequency (" __stringify(50) "or"
+                 __stringify(60) ", default "
+                 __stringify(60) ")");
 
 static int flicker_mode = NEVER_FLICKER;
 module_param(flicker_mode, int, 0);
 MODULE_PARM_DESC(flicker_mode,
-                 "Flicker supression (" MAKE_STRING(NEVER_FLICKER) "or"
-                 MAKE_STRING(ANTI_FLICKER_ON) ", default "
-                 MAKE_STRING(NEVER_FLICKER) ")");
+                 "Flicker supression (" __stringify(NEVER_FLICKER) "or"
+                 __stringify(ANTI_FLICKER_ON) ", default "
+                 __stringify(NEVER_FLICKER) ")");
 
 MODULE_AUTHOR("Steve Miller (STMicroelectronics) <steve.miller@st.com>");
 MODULE_DESCRIPTION("V4L-driver for STMicroelectronics CPiA2 based cameras");
@@ -1926,7 +1921,6 @@ static const struct v4l2_file_operations fops_template = {
 static struct video_device cpia2_template = {
         /* I could not find any place for the old .initialize initializer?? */
         .name=          "CPiA2 Camera",
-        .minor=         -1,
         .fops=          &fops_template,
         .release=       video_device_release,
 };
@@ -1967,9 +1961,9 @@ void cpia2_unregister_camera(struct camera_data *cam)
         if (!cam->open_count) {
                 video_unregister_device(cam->vdev);
         } else {
-                LOG("/dev/video%d removed while open, "
-                    "deferring video_unregister_device\n",
-                    cam->vdev->num);
+                LOG("%s removed while open, deferring "
+                    "video_unregister_device\n",
+                    video_device_node_name(cam->vdev));
         }
 }
 
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 4e278db31cc9..c0885c69fd89 100644
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -758,8 +758,8 @@ int cx18_v4l2_open(struct file *filp)
 
         mutex_lock(&cx->serialize_lock);
         if (cx18_init_on_first_open(cx)) {
-                CX18_ERR("Failed to initialize on minor %d\n",
-                         video_dev->minor);
+                CX18_ERR("Failed to initialize on %s\n",
+                         video_device_node_name(video_dev));
                 mutex_unlock(&cx->serialize_lock);
                 return -ENXIO;
         }
diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c
index c398651dd74c..987a9308d938 100644
--- a/drivers/media/video/cx18/cx18-streams.c
+++ b/drivers/media/video/cx18/cx18-streams.c
@@ -219,6 +219,7 @@ static int cx18_reg_dev(struct cx18 *cx, int type)
 {
         struct cx18_stream *s = &cx->streams[type];
         int vfl_type = cx18_stream_info[type].vfl_type;
+        const char *name;
         int num, ret;
 
         /* TODO: Shouldn't this be a VFL_TYPE_TRANSPORT or something?
@@ -258,31 +259,30 @@ static int cx18_reg_dev(struct cx18 *cx, int type)
                 s->video_dev = NULL;
                 return ret;
         }
-        num = s->video_dev->num;
+
+        name = video_device_node_name(s->video_dev);
 
         switch (vfl_type) {
         case VFL_TYPE_GRABBER:
-                CX18_INFO("Registered device video%d for %s "
-                          "(%d x %d.%02d kB)\n",
-                          num, s->name, cx->stream_buffers[type],
+                CX18_INFO("Registered device %s for %s (%d x %d.%02d kB)\n",
+                          name, s->name, cx->stream_buffers[type],
                           cx->stream_buf_size[type] / 1024,
                           (cx->stream_buf_size[type] * 100 / 1024) % 100);
                 break;
 
         case VFL_TYPE_RADIO:
-                CX18_INFO("Registered device radio%d for %s\n",
-                        num, s->name);
+                CX18_INFO("Registered device %s for %s\n", name, s->name);
                 break;
 
         case VFL_TYPE_VBI:
                 if (cx->stream_buffers[type])
-                        CX18_INFO("Registered device vbi%d for %s "
+                        CX18_INFO("Registered device %s for %s "
                                   "(%d x %d bytes)\n",
-                                  num, s->name, cx->stream_buffers[type],
+                                  name, s->name, cx->stream_buffers[type],
                                   cx->stream_buf_size[type]);
                 else
-                        CX18_INFO("Registered device vbi%d for %s\n",
-                                num, s->name);
+                        CX18_INFO("Registered device %s for %s\n",
+                                name, s->name);
                 break;
         }
 
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index 319c459459e0..a54908235009 100644
--- a/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -68,19 +68,19 @@ struct cx231xx_board cx231xx_boards[] = {
                                 .type = CX231XX_VMUX_TELEVISION,
                                 .vmux = CX231XX_VIN_3_1,
                                 .amux = CX231XX_AMUX_VIDEO,
-                                .gpio = 0,
+                                .gpio = NULL,
                         }, {
                                 .type = CX231XX_VMUX_COMPOSITE1,
                                 .vmux = CX231XX_VIN_2_1,
                                 .amux = CX231XX_AMUX_LINE_IN,
-                                .gpio = 0,
+                                .gpio = NULL,
                         }, {
                                 .type = CX231XX_VMUX_SVIDEO,
                                 .vmux = CX231XX_VIN_1_1 |
                                         (CX231XX_VIN_1_2 << 8) |
                                         CX25840_SVIDEO_ON,
                                 .amux = CX231XX_AMUX_LINE_IN,
-                                .gpio = 0,
+                                .gpio = NULL,
                         }
                 },
         },
@@ -107,19 +107,19 @@ struct cx231xx_board cx231xx_boards[] = {
                                 .type = CX231XX_VMUX_TELEVISION,
                                 .vmux = CX231XX_VIN_3_1,
                                 .amux = CX231XX_AMUX_VIDEO,
-                                .gpio = 0,
+                                .gpio = NULL,
                         }, {
                                 .type = CX231XX_VMUX_COMPOSITE1,
                                 .vmux = CX231XX_VIN_2_1,
                                 .amux = CX231XX_AMUX_LINE_IN,
-                                .gpio = 0,
+                                .gpio = NULL,
                         }, {
                                 .type = CX231XX_VMUX_SVIDEO,
                                 .vmux = CX231XX_VIN_1_1 |
                                         (CX231XX_VIN_1_2 << 8) |
                                         CX25840_SVIDEO_ON,
                                 .amux = CX231XX_AMUX_LINE_IN,
-                                .gpio = 0,
+                                .gpio = NULL,
                         }
                 },
         },
@@ -147,19 +147,19 @@ struct cx231xx_board cx231xx_boards[] = {
                                 .type = CX231XX_VMUX_TELEVISION,
                                 .vmux = CX231XX_VIN_3_1,
                                 .amux = CX231XX_AMUX_VIDEO,
-                                .gpio = 0,
+                                .gpio = NULL,
                         }, {
                                 .type = CX231XX_VMUX_COMPOSITE1,
                                 .vmux = CX231XX_VIN_2_1,
                                 .amux = CX231XX_AMUX_LINE_IN,
-                                .gpio = 0,
+                                .gpio = NULL,
                         }, {
                                 .type = CX231XX_VMUX_SVIDEO,
                                 .vmux = CX231XX_VIN_1_1 |
                                         (CX231XX_VIN_1_2 << 8) |
                                         CX25840_SVIDEO_ON,
                                 .amux = CX231XX_AMUX_LINE_IN,
-                                .gpio = 0,
+                                .gpio = NULL,
                         }
                 },
         },
@@ -856,8 +856,9 @@ static void cx231xx_usb_disconnect(struct usb_interface *interface)
 
         if (dev->users) {
                 cx231xx_warn
-                    ("device /dev/video%d is open! Deregistration and memory "
-                     "deallocation are deferred on close.\n", dev->vdev->num);
+                    ("device %s is open! Deregistration and memory "
+                     "deallocation are deferred on close.\n",
+                     video_device_node_name(dev->vdev));
 
                 dev->state |= DEV_MISCONFIGURED;
                 cx231xx_uninit_isoc(dev);
diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c
index 0d333e679f70..4a60dfbc347d 100644
--- a/drivers/media/video/cx231xx/cx231xx-core.c
+++ b/drivers/media/video/cx231xx/cx231xx-core.c
@@ -66,32 +66,6 @@ MODULE_PARM_DESC(alt, "alternate setting to use for video endpoint");
 static LIST_HEAD(cx231xx_devlist);
 static DEFINE_MUTEX(cx231xx_devlist_mutex);
 
-struct cx231xx *cx231xx_get_device(int minor,
-                                   enum v4l2_buf_type *fh_type, int *has_radio)
-{
-        struct cx231xx *h, *dev = NULL;
-
-        *fh_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-        *has_radio = 0;
-
-        mutex_lock(&cx231xx_devlist_mutex);
-        list_for_each_entry(h, &cx231xx_devlist, devlist) {
-                if (h->vdev->minor == minor)
-                        dev = h;
-                if (h->vbi_dev->minor == minor) {
-                        dev = h;
-                        *fh_type = V4L2_BUF_TYPE_VBI_CAPTURE;
-                }
-                if (h->radio_dev && h->radio_dev->minor == minor) {
-                        dev = h;
-                        *has_radio = 1;
-                }
-        }
-        mutex_unlock(&cx231xx_devlist_mutex);
-
-        return dev;
-}
-
 /*
  * cx231xx_realease_resources()
  * unregisters the v4l2,i2c and usb devices
diff --git a/drivers/media/video/cx231xx/cx231xx-input.c b/drivers/media/video/cx231xx/cx231xx-input.c
index cd135f01b9c1..15826f98b688 100644
--- a/drivers/media/video/cx231xx/cx231xx-input.c
+++ b/drivers/media/video/cx231xx/cx231xx-input.c
@@ -197,8 +197,7 @@ int cx231xx_ir_init(struct cx231xx *dev)
         usb_make_path(dev->udev, ir->phys, sizeof(ir->phys));
         strlcat(ir->phys, "/input0", sizeof(ir->phys));
 
-        err = ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER,
-                            dev->board.ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER);
         if (err < 0)
                 goto err_out_free;
 
@@ -217,7 +216,7 @@ int cx231xx_ir_init(struct cx231xx *dev)
         cx231xx_ir_start(ir);
 
         /* all done */
-        err = input_register_device(ir->input);
+        err = ir_input_register(ir->input, dev->board.ir_codes);
         if (err)
                 goto err_out_stop;
 
@@ -226,8 +225,6 @@ err_out_stop:
         cx231xx_ir_stop(ir);
         dev->ir = NULL;
 err_out_free:
-        ir_input_free(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return err;
 }
@@ -241,8 +238,7 @@ int cx231xx_ir_fini(struct cx231xx *dev)
                 return 0;
 
         cx231xx_ir_stop(ir);
-        ir_input_free(ir->input);
-        input_unregister_device(ir->input);
+        ir_input_unregister(ir->input);
         kfree(ir);
 
         /* done */
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index d095aa0d6d19..d4f546f11d74 100644
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -1916,20 +1916,29 @@ static int radio_queryctrl(struct file *file, void *priv,
  */
 static int cx231xx_v4l2_open(struct file *filp)
 {
-        int minor = video_devdata(filp)->minor;
         int errCode = 0, radio = 0;
-        struct cx231xx *dev = NULL;
+        struct video_device *vdev = video_devdata(filp);
+        struct cx231xx *dev = video_drvdata(filp);
         struct cx231xx_fh *fh;
         enum v4l2_buf_type fh_type = 0;
 
-        dev = cx231xx_get_device(minor, &fh_type, &radio);
-        if (NULL == dev)
-                return -ENODEV;
+        switch (vdev->vfl_type) {
+        case VFL_TYPE_GRABBER:
+                fh_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                break;
+        case VFL_TYPE_VBI:
+                fh_type = V4L2_BUF_TYPE_VBI_CAPTURE;
+                break;
+        case VFL_TYPE_RADIO:
+                radio = 1;
+                break;
+        }
 
         mutex_lock(&dev->lock);
 
-        cx231xx_videodbg("open minor=%d type=%s users=%d\n",
-                         minor, v4l2_type_names[fh_type], dev->users);
+        cx231xx_videodbg("open dev=%s type=%s users=%d\n",
+                         video_device_node_name(vdev), v4l2_type_names[fh_type],
+                         dev->users);
 
 #if 0
         errCode = cx231xx_set_mode(dev, CX231XX_ANALOG_MODE);
@@ -2020,25 +2029,25 @@ void cx231xx_release_analog_resources(struct cx231xx *dev)
         /*FIXME: I2C IR should be disconnected */
 
         if (dev->radio_dev) {
-                if (-1 != dev->radio_dev->minor)
+                if (video_is_registered(dev->radio_dev))
                         video_unregister_device(dev->radio_dev);
                 else
                         video_device_release(dev->radio_dev);
                 dev->radio_dev = NULL;
         }
         if (dev->vbi_dev) {
-                cx231xx_info("V4L2 device /dev/vbi%d deregistered\n",
-                             dev->vbi_dev->num);
-                if (-1 != dev->vbi_dev->minor)
+                cx231xx_info("V4L2 device %s deregistered\n",
+                             video_device_node_name(dev->vbi_dev));
+                if (video_is_registered(dev->vbi_dev))
                         video_unregister_device(dev->vbi_dev);
                 else
                         video_device_release(dev->vbi_dev);
                 dev->vbi_dev = NULL;
         }
         if (dev->vdev) {
-                cx231xx_info("V4L2 device /dev/video%d deregistered\n",
-                             dev->vdev->num);
-                if (-1 != dev->vdev->minor)
+                cx231xx_info("V4L2 device %s deregistered\n",
+                             video_device_node_name(dev->vdev));
+                if (video_is_registered(dev->vdev))
                         video_unregister_device(dev->vdev);
                 else
                         video_device_release(dev->vdev);
@@ -2268,7 +2277,6 @@ static const struct video_device cx231xx_video_template = {
         .fops         = &cx231xx_v4l_fops,
         .release      = video_device_release,
         .ioctl_ops    = &video_ioctl_ops,
-        .minor        = -1,
         .tvnorms      = V4L2_STD_ALL,
         .current_norm = V4L2_STD_PAL,
 };
@@ -2303,7 +2311,6 @@ static struct video_device cx231xx_radio_template = {
         .name      = "cx231xx-radio",
         .fops      = &radio_fops,
         .ioctl_ops = &radio_ioctl_ops,
-        .minor     = -1,
 };
 
 /******************************** usb interface ******************************/
@@ -2319,13 +2326,13 @@ static struct video_device *cx231xx_vdev_init(struct cx231xx *dev,
                 return NULL;
 
         *vfd = *template;
-        vfd->minor = -1;
         vfd->v4l2_dev = &dev->v4l2_dev;
         vfd->release = video_device_release;
         vfd->debug = video_debug;
 
         snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name);
 
+        video_set_drvdata(vfd, dev);
         return vfd;
 }
 
@@ -2374,8 +2381,8 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
                 return ret;
         }
 
-        cx231xx_info("%s/0: registered device video%d [v4l2]\n",
-                     dev->name, dev->vdev->num);
+        cx231xx_info("%s/0: registered device %s [v4l2]\n",
+                     dev->name, video_device_node_name(dev->vdev));
 
         /* Initialize VBI template */
         memcpy(&cx231xx_vbi_template, &cx231xx_video_template,
@@ -2393,8 +2400,8 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
                 return ret;
         }
 
-        cx231xx_info("%s/0: registered device vbi%d\n",
-                     dev->name, dev->vbi_dev->num);
+        cx231xx_info("%s/0: registered device %s\n",
+                     dev->name, video_device_node_name(dev->vbi_dev));
 
         if (cx231xx_boards[dev->model].radio.type == CX231XX_RADIO) {
                 dev->radio_dev = cx231xx_vdev_init(dev, &cx231xx_radio_template,
@@ -2409,12 +2416,13 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
                         cx231xx_errdev("can't register radio device\n");
                         return ret;
                 }
-                cx231xx_info("Registered radio device as /dev/radio%d\n",
-                             dev->radio_dev->num);
+                cx231xx_info("Registered radio device as %s\n",
+                             video_device_node_name(dev->radio_dev));
         }
 
-        cx231xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n",
-                     dev->vdev->num, dev->vbi_dev->num);
+        cx231xx_info("V4L2 device registered as %s and %s\n",
+                     video_device_node_name(dev->vdev),
+                     video_device_node_name(dev->vbi_dev));
 
         return 0;
 }
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h
index 64e2ddd3c401..17d4d1a800ce 100644
--- a/drivers/media/video/cx231xx/cx231xx.h
+++ b/drivers/media/video/cx231xx/cx231xx.h
@@ -689,8 +689,6 @@ void cx231xx_release_analog_resources(struct cx231xx *dev);
 int cx231xx_register_analog_devices(struct cx231xx *dev);
 void cx231xx_remove_from_devlist(struct cx231xx *dev);
 void cx231xx_add_into_devlist(struct cx231xx *dev);
-struct cx231xx *cx231xx_get_device(int minor,
-                                   enum v4l2_buf_type *fh_type, int *has_radio);
 void cx231xx_init_extension(struct cx231xx *dev);
 void cx231xx_close_extension(struct cx231xx *dev);
 
diff --git a/drivers/media/video/cx23885/cimax2.c b/drivers/media/video/cx23885/cimax2.c
index c04222ffb286..d4a9d2c5947c 100644
--- a/drivers/media/video/cx23885/cimax2.c
+++ b/drivers/media/video/cx23885/cimax2.c
@@ -53,6 +53,8 @@
 #define NETUP_CI_CTL            0x04
 #define NETUP_CI_RD             1
 
+#define NETUP_IRQ_DETAM         0x1
+#define NETUP_IRQ_IRQAM         0x4
 
 static unsigned int ci_dbg;
 module_param(ci_dbg, int, 0644);
@@ -73,6 +75,9 @@ struct netup_ci_state {
         int status;
         struct work_struct work;
         void *priv;
+        u8 current_irq_mode;
+        int current_ci_flag;
+        unsigned long next_status_checked_time;
 };
 
 
@@ -169,24 +174,26 @@ int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
         if (0 != slot)
                 return -EINVAL;
 
-        ret = netup_read_i2c(state->i2c_adap, state->ci_i2c_addr,
-                                                        0, &store, 1);
-        if (ret != 0)
-                return ret;
+        if (state->current_ci_flag != flag) {
+                ret = netup_read_i2c(state->i2c_adap, state->ci_i2c_addr,
+                                0, &store, 1);
+                if (ret != 0)
+                        return ret;
 
-        store &= ~0x0c;
-        store |= flag;
+                store &= ~0x0c;
+                store |= flag;
 
-        ret = netup_write_i2c(state->i2c_adap, state->ci_i2c_addr,
-                                                        0, &store, 1);
-        if (ret != 0)
-                return ret;
+                ret = netup_write_i2c(state->i2c_adap, state->ci_i2c_addr,
+                                0, &store, 1);
+                if (ret != 0)
+                        return ret;
+        };
+        state->current_ci_flag = flag;
 
         mutex_lock(&dev->gpio_lock);
 
         /* write addr */
         cx_write(MC417_OEN, NETUP_EN_ALL);
-        msleep(2);
         cx_write(MC417_RWD, NETUP_CTRL_OFF |
                                 NETUP_ADLO | (0xff & addr));
         cx_clear(MC417_RWD, NETUP_ADLO);
@@ -196,7 +203,6 @@ int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
 
         if (read) { /* data in */
                 cx_write(MC417_OEN, NETUP_EN_ALL | NETUP_DATA);
-                msleep(2);
         } else /* data out */
                 cx_write(MC417_RWD, NETUP_CTRL_OFF | data);
 
@@ -213,8 +219,8 @@ int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
                 if (mem < 0)
                         return -EREMOTEIO;
 
-        ci_dbg_print("%s: %s: addr=[0x%02x], %s=%x\n", __func__,
-                        (read) ? "read" : "write", addr,
+        ci_dbg_print("%s: %s: chipaddr=[0x%x] addr=[0x%02x], %s=%x\n", __func__,
+                        (read) ? "read" : "write", state->ci_i2c_addr, addr,
                         (flag == NETUP_CI_CTL) ? "ctl" : "mem",
                         (read) ? mem : data);
 
@@ -283,14 +289,39 @@ int netup_ci_slot_shutdown(struct dvb_ca_en50221 *en50221, int slot)
         return 0;
 }
 
+int netup_ci_set_irq(struct dvb_ca_en50221 *en50221, u8 irq_mode)
+{
+        struct netup_ci_state *state = en50221->data;
+        int ret;
+
+        if (irq_mode == state->current_irq_mode)
+                return 0;
+
+        ci_dbg_print("%s: chipaddr=[0x%x] setting ci IRQ to [0x%x] \n",
+                        __func__, state->ci_i2c_addr, irq_mode);
+        ret = netup_write_i2c(state->i2c_adap, state->ci_i2c_addr,
+                                                        0x1b, &irq_mode, 1);
+
+        if (ret != 0)
+                return ret;
+
+        state->current_irq_mode = irq_mode;
+
+        return 0;
+}
+
 int netup_ci_slot_ts_ctl(struct dvb_ca_en50221 *en50221, int slot)
 {
         struct netup_ci_state *state = en50221->data;
-        u8 buf = 0x60;
+        u8 buf;
 
         if (0 != slot)
                 return -EINVAL;
 
+        netup_read_i2c(state->i2c_adap, state->ci_i2c_addr,
+                        0, &buf, 1);
+        buf |= 0x60;
+
         return netup_write_i2c(state->i2c_adap, state->ci_i2c_addr,
                                                         0, &buf, 1);
 }
@@ -303,21 +334,35 @@ static void netup_read_ci_status(struct work_struct *work)
         u8 buf[33];
         int ret;
 
-        ret = netup_read_i2c(state->i2c_adap, state->ci_i2c_addr,
-                                                        0, &buf[0], 33);
+        /* CAM module IRQ processing. fast operation */
+        dvb_ca_en50221_frda_irq(&state->ca, 0);
 
-        if (ret != 0)
-                return;
+        /* CAM module INSERT/REMOVE processing. slow operation because of i2c
+         * transfers */
+        if (time_after(jiffies, state->next_status_checked_time)
+                        || !state->status) {
+                ret = netup_read_i2c(state->i2c_adap, state->ci_i2c_addr,
+                                0, &buf[0], 33);
+
+                state->next_status_checked_time = jiffies
+                        + msecs_to_jiffies(1000);
+
+                if (ret != 0)
+                        return;
 
-        ci_dbg_print("%s: Slot Status Addr=[0x%04x], Reg=[0x%02x], data=%02x, "
-                "TS config = %02x\n", __func__, state->ci_i2c_addr, 0, buf[0],
-                buf[32]);
+                ci_dbg_print("%s: Slot Status Addr=[0x%04x], "
+                                "Reg=[0x%02x], data=%02x, "
+                                "TS config = %02x\n", __func__,
+                                state->ci_i2c_addr, 0, buf[0],
+                                buf[0]);
 
-        if (buf[0] & 1)
-                state->status = DVB_CA_EN50221_POLL_CAM_PRESENT |
-                        DVB_CA_EN50221_POLL_CAM_READY;
-        else
-                state->status = 0;
+
+                if (buf[0] & 1)
+                        state->status = DVB_CA_EN50221_POLL_CAM_PRESENT |
+                                DVB_CA_EN50221_POLL_CAM_READY;
+                else
+                        state->status = 0;
+        };
 }
 
 /* CI irq handler */
@@ -347,6 +392,9 @@ int netup_poll_ci_slot_status(struct dvb_ca_en50221 *en50221, int slot, int open
         if (0 != slot)
                 return -EINVAL;
 
+        netup_ci_set_irq(en50221, open ? (NETUP_IRQ_DETAM | NETUP_IRQ_IRQAM)
+                        : NETUP_IRQ_DETAM);
+
         return state->status;
 }
 
@@ -381,8 +429,8 @@ int netup_ci_init(struct cx23885_tsport *port)
                 0x01, /* power on (use it like store place) */
                 0x00, /* RFU */
                 0x00, /* int status read only */
-                0x01, /* all int unmasked */
-                0x04, /* int config */
+                NETUP_IRQ_IRQAM | NETUP_IRQ_DETAM, /* DETAM, IRQAM unmasked */
+                0x05, /* EXTINT=active-high, INT=push-pull */
                 0x00, /* USCG1 */
                 0x04, /* ack active low */
                 0x00, /* LOCK = 0 */
@@ -422,6 +470,7 @@ int netup_ci_init(struct cx23885_tsport *port)
         state->ca.poll_slot_status = netup_poll_ci_slot_status;
         state->ca.data = state;
         state->priv = port;
+        state->current_irq_mode = NETUP_IRQ_IRQAM | NETUP_IRQ_DETAM;
 
         ret = netup_write_i2c(state->i2c_adap, state->ci_i2c_addr,
                                                 0, &cimax_init[0], 34);
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index 0eed852c61e9..88c0d2481118 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -1568,28 +1568,11 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 
 static int mpeg_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx23885_dev *h, *dev = NULL;
-        struct list_head *list;
+        struct cx23885_dev *dev = video_drvdata(file);
         struct cx23885_fh *fh;
 
         dprintk(2, "%s()\n", __func__);
 
-        lock_kernel();
-        list_for_each(list, &cx23885_devlist) {
-                h = list_entry(list, struct cx23885_dev, devlist);
-                if (h->v4l_device &&
-                    h->v4l_device->minor == minor) {
-                        dev = h;
-                        break;
-                }
-        }
-
-        if (dev == NULL) {
-                unlock_kernel();
-                return -ENODEV;
-        }
-
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
         if (NULL == fh) {
@@ -1597,6 +1580,8 @@ static int mpeg_open(struct file *file)
                 return -ENOMEM;
         }
 
+        lock_kernel();
+
         file->private_data = fh;
         fh->dev      = dev;
 
@@ -1736,7 +1721,6 @@ static struct video_device cx23885_mpeg_template = {
         .name          = "cx23885",
         .fops          = &mpeg_fops,
         .ioctl_ops     = &mpeg_ioctl_ops,
-        .minor         = -1,
         .tvnorms       = CX23885_NORMS,
         .current_norm  = V4L2_STD_NTSC_M,
 };
@@ -1746,7 +1730,7 @@ void cx23885_417_unregister(struct cx23885_dev *dev)
         dprintk(1, "%s()\n", __func__);
 
         if (dev->v4l_device) {
-                if (-1 != dev->v4l_device->minor)
+                if (video_is_registered(dev->v4l_device))
                         video_unregister_device(dev->v4l_device);
                 else
                         video_device_release(dev->v4l_device);
@@ -1803,6 +1787,7 @@ int cx23885_417_register(struct cx23885_dev *dev)
         /* Allocate and initialize V4L video device */
         dev->v4l_device = cx23885_video_dev_alloc(tsport,
                 dev->pci, &cx23885_mpeg_template, "mpeg");
+        video_set_drvdata(dev->v4l_device, dev);
         err = video_register_device(dev->v4l_device,
                 VFL_TYPE_GRABBER, -1);
         if (err < 0) {
@@ -1810,8 +1795,8 @@ int cx23885_417_register(struct cx23885_dev *dev)
                 return err;
         }
 
-        printk(KERN_INFO "%s: registered device video%d [mpeg]\n",
-               dev->name, dev->v4l_device->num);
+        printk(KERN_INFO "%s: registered device %s [mpeg]\n",
+               dev->name, video_device_node_name(dev->v4l_device));
 
         return 0;
 }
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 04b12d27bc13..0dde57e96d30 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -55,9 +55,6 @@ MODULE_PARM_DESC(card, "card type");
 
 static unsigned int cx23885_devcount;
 
-static DEFINE_MUTEX(devlist);
-LIST_HEAD(cx23885_devlist);
-
 #define NO_SYNC_LINE (-1U)
 
 /* FIXME, these allocations will change when
@@ -785,10 +782,6 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
         dev->nr = cx23885_devcount++;
         sprintf(dev->name, "cx23885[%d]", dev->nr);
 
-        mutex_lock(&devlist);
-        list_add_tail(&dev->devlist, &cx23885_devlist);
-        mutex_unlock(&devlist);
-
         /* Configure the internal memory */
         if (dev->pci->device == 0x8880) {
                 /* Could be 887 or 888, assume a default */
@@ -2008,10 +2001,6 @@ static void __devexit cx23885_finidev(struct pci_dev *pci_dev)
         /* unregister stuff */
         free_irq(pci_dev->irq, dev);
 
-        mutex_lock(&devlist);
-        list_del(&dev->devlist);
-        mutex_unlock(&devlist);
-
         cx23885_dev_unregister(dev);
         v4l2_device_unregister(v4l2_dev);
         kfree(dev);
diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index 469e083dd5f8..768eec92ccf9 100644
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -377,7 +377,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
                  cx23885_boards[dev->board].name);
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(dev->pci));
 
-        ret = ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+        ret = ir_input_init(input_dev, &ir->ir, ir_type);
         if (ret < 0)
                 goto err_out_free;
 
@@ -397,7 +397,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
         dev->ir_input = ir;
         cx23885_input_ir_start(dev);
 
-        ret = input_register_device(ir->dev);
+        ret = ir_input_register(ir->dev, ir_codes);
         if (ret)
                 goto err_out_stop;
 
@@ -407,8 +407,6 @@ err_out_stop:
         cx23885_input_ir_stop(dev);
         dev->ir_input = NULL;
 err_out_free:
-        ir_input_free(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return ret;
 }
@@ -420,8 +418,7 @@ void cx23885_input_fini(struct cx23885_dev *dev)
 
         if (dev->ir_input == NULL)
                 return;
-        ir_input_free(dev->ir_input->dev);
-        input_unregister_device(dev->ir_input->dev);
+        ir_input_unregister(dev->ir_input->dev);
         kfree(dev->ir_input);
         dev->ir_input = NULL;
 }
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 8b372b4f0de2..8934d61cf660 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -318,11 +318,11 @@ static struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,
         if (NULL == vfd)
                 return NULL;
         *vfd = *template;
-        vfd->minor = -1;
         vfd->v4l2_dev = &dev->v4l2_dev;
         vfd->release = video_device_release;
         snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)",
                  dev->name, type, cx23885_boards[dev->board].name);
+        video_set_drvdata(vfd, dev);
         return vfd;
 }
 
@@ -716,46 +716,34 @@ static int get_resource(struct cx23885_fh *fh)
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx23885_dev *h, *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx23885_dev *dev = video_drvdata(file);
         struct cx23885_fh *fh;
-        struct list_head *list;
         enum v4l2_buf_type type = 0;
         int radio = 0;
 
-        lock_kernel();
-        list_for_each(list, &cx23885_devlist) {
-                h = list_entry(list, struct cx23885_dev, devlist);
-                if (h->video_dev &&
-                    h->video_dev->minor == minor) {
-                        dev  = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
-                if (h->vbi_dev &&
-                    h->vbi_dev->minor == minor) {
-                        dev  = h;
-                        type = V4L2_BUF_TYPE_VBI_CAPTURE;
-                }
-                if (h->radio_dev &&
-                    h->radio_dev->minor == minor) {
-                        radio = 1;
-                        dev   = h;
-                }
-        }
-        if (NULL == dev) {
-                unlock_kernel();
-                return -ENODEV;
+        switch (vdev->vfl_type) {
+        case VFL_TYPE_GRABBER:
+                type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                break;
+        case VFL_TYPE_VBI:
+                type = V4L2_BUF_TYPE_VBI_CAPTURE;
+                break;
+        case VFL_TYPE_RADIO:
+                radio = 1;
+                break;
         }
 
-        dprintk(1, "open minor=%d radio=%d type=%s\n",
-                minor, radio, v4l2_type_names[type]);
+        dprintk(1, "open dev=%s radio=%d type=%s\n",
+                video_device_node_name(vdev), radio, v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh) {
-                unlock_kernel();
+        if (NULL == fh)
                 return -ENOMEM;
-        }
+
+        lock_kernel();
+
         file->private_data = fh;
         fh->dev      = dev;
         fh->radio    = radio;
@@ -1441,7 +1429,6 @@ static struct video_device cx23885_vbi_template;
 static struct video_device cx23885_video_template = {
         .name                 = "cx23885-video",
         .fops                 = &video_fops,
-        .minor                = -1,
         .ioctl_ops            = &video_ioctl_ops,
         .tvnorms              = CX23885_NORMS,
         .current_norm         = V4L2_STD_NTSC_M,
@@ -1461,7 +1448,7 @@ void cx23885_video_unregister(struct cx23885_dev *dev)
         cx_clear(PCI_INT_MSK, 1);
 
         if (dev->video_dev) {
-                if (-1 != dev->video_dev->minor)
+                if (video_is_registered(dev->video_dev))
                         video_unregister_device(dev->video_dev);
                 else
                         video_device_release(dev->video_dev);
@@ -1532,8 +1519,8 @@ int cx23885_video_register(struct cx23885_dev *dev)
                         dev->name);
                 goto fail_unreg;
         }
-        printk(KERN_INFO "%s/0: registered device video%d [v4l2]\n",
-               dev->name, dev->video_dev->num);
+        printk(KERN_INFO "%s/0: registered device %s [v4l2]\n",
+               dev->name, video_device_node_name(dev->video_dev));
         /* initial device configuration */
         mutex_lock(&dev->lock);
         cx23885_set_tvnorm(dev, dev->tvnorm);
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index fa744764dc8b..08b3f6b136a0 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -303,7 +303,6 @@ struct cx23885_tsport {
 };
 
 struct cx23885_dev {
-        struct list_head           devlist;
         atomic_t                   refcount;
         struct v4l2_device         v4l2_dev;
 
@@ -399,8 +398,6 @@ static inline struct cx23885_dev *to_cx23885(struct v4l2_device *v4l2_dev)
 
 extern struct v4l2_subdev *cx23885_find_hw(struct cx23885_dev *dev, u32 hw);
 
-extern struct list_head cx23885_devlist;
-
 #define SRAM_CH01  0 /* Video A */
 #define SRAM_CH02  1 /* VBI A */
 #define SRAM_CH03  2 /* Video B */
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index fbdc1cde56a6..6fe30e6c4262 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1048,21 +1048,15 @@ static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *id)
 
 static int mpeg_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx8802_dev *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx8802_dev *dev = video_drvdata(file);
         struct cx8802_fh *fh;
         struct cx8802_driver *drv = NULL;
         int err;
 
-        lock_kernel();
-        dev = cx8802_get_device(minor);
-
         dprintk( 1, "%s\n", __func__);
 
-        if (dev == NULL) {
-                unlock_kernel();
-                return -ENODEV;
-        }
+        lock_kernel();
 
         /* Make sure we can acquire the hardware */
         drv = cx8802_get_driver(dev, CX88_MPEG_BLACKBIRD);
@@ -1081,7 +1075,7 @@ static int mpeg_open(struct file *file)
                 unlock_kernel();
                 return -EINVAL;
         }
-        dprintk(1,"open minor=%d\n",minor);
+        dprintk(1, "open dev=%s\n", video_device_node_name(vdev));
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh),GFP_KERNEL);
@@ -1129,10 +1123,6 @@ static int mpeg_release(struct file *file)
         kfree(fh);
 
         /* Make sure we release the hardware */
-        dev = cx8802_get_device(video_devdata(file)->minor);
-        if (dev == NULL)
-                return -ENODEV;
-
         drv = cx8802_get_driver(dev, CX88_MPEG_BLACKBIRD);
         if (drv)
                 drv->request_release(drv);
@@ -1220,7 +1210,6 @@ static struct video_device cx8802_mpeg_template = {
         .name                 = "cx8802",
         .fops                 = &mpeg_fops,
         .ioctl_ops            = &mpeg_ioctl_ops,
-        .minor                = -1,
         .tvnorms              = CX88_NORMS,
         .current_norm         = V4L2_STD_NTSC_M,
 };
@@ -1276,7 +1265,7 @@ static int cx8802_blackbird_advise_release(struct cx8802_driver *drv)
 static void blackbird_unregister_video(struct cx8802_dev *dev)
 {
         if (dev->mpeg_dev) {
-                if (-1 != dev->mpeg_dev->minor)
+                if (video_is_registered(dev->mpeg_dev))
                         video_unregister_device(dev->mpeg_dev);
                 else
                         video_device_release(dev->mpeg_dev);
@@ -1290,14 +1279,15 @@ static int blackbird_register_video(struct cx8802_dev *dev)
 
         dev->mpeg_dev = cx88_vdev_init(dev->core,dev->pci,
                                        &cx8802_mpeg_template,"mpeg");
+        video_set_drvdata(dev->mpeg_dev, dev);
         err = video_register_device(dev->mpeg_dev,VFL_TYPE_GRABBER, -1);
         if (err < 0) {
                 printk(KERN_INFO "%s/2: can't register mpeg device\n",
                        dev->core->name);
                 return err;
         }
-        printk(KERN_INFO "%s/2: registered device video%d [mpeg]\n",
-               dev->core->name, dev->mpeg_dev->num);
+        printk(KERN_INFO "%s/2: registered device %s [mpeg]\n",
+               dev->core->name, video_device_node_name(dev->mpeg_dev));
         return 0;
 }
 
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 92b8cdf9fb81..f9fda18b410c 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -360,7 +360,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         snprintf(ir->name, sizeof(ir->name), "cx88 IR (%s)", core->board.name);
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(pci));
 
-        err = ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, ir_type);
         if (err < 0)
                 goto err_out_free;
 
@@ -383,7 +383,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         cx88_ir_start(core, ir);
 
         /* all done */
-        err = input_register_device(ir->input);
+        err = ir_input_register(ir->input, ir_codes);
         if (err)
                 goto err_out_stop;
 
@@ -393,8 +393,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         cx88_ir_stop(core, ir);
         core->ir = NULL;
  err_out_free:
-        ir_input_free(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return err;
 }
@@ -408,8 +406,7 @@ int cx88_ir_fini(struct cx88_core *core)
                 return 0;
 
         cx88_ir_stop(core, ir);
-        ir_input_free(ir->input);
-        input_unregister_device(ir->input);
+        ir_input_unregister(ir->input);
         kfree(ir);
 
         /* done */
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index de9ff0fc741f..bb5104893411 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -580,21 +580,6 @@ static int cx8802_resume_common(struct pci_dev *pci_dev)
         return 0;
 }
 
-#if defined(CONFIG_VIDEO_CX88_BLACKBIRD) || \
-    defined(CONFIG_VIDEO_CX88_BLACKBIRD_MODULE)
-struct cx8802_dev *cx8802_get_device(int minor)
-{
-        struct cx8802_dev *dev;
-
-        list_for_each_entry(dev, &cx8802_devlist, devlist)
-                if (dev->mpeg_dev && dev->mpeg_dev->minor == minor)
-                        return dev;
-
-        return NULL;
-}
-EXPORT_SYMBOL(cx8802_get_device);
-#endif
-
 struct cx8802_driver * cx8802_get_driver(struct cx8802_dev *dev, enum cx88_board_type btype)
 {
         struct cx8802_driver *d;
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index d7e8fcee559c..48c450f4a85a 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -75,10 +75,6 @@ MODULE_PARM_DESC(vid_limit,"capture memory limit in megabytes");
 #define dprintk(level,fmt, arg...)      if (video_debug >= level) \
         printk(KERN_DEBUG "%s/0: " fmt, core->name , ## arg)
 
-/* ------------------------------------------------------------------ */
-
-static LIST_HEAD(cx8800_devlist);
-
 /* ------------------------------------------------------------------- */
 /* static data                                                         */
 
@@ -753,38 +749,31 @@ static int get_ressource(struct cx8800_fh *fh)
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx8800_dev *h,*dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx8800_dev *dev = video_drvdata(file);
         struct cx88_core *core;
         struct cx8800_fh *fh;
         enum v4l2_buf_type type = 0;
         int radio = 0;
 
-        lock_kernel();
-        list_for_each_entry(h, &cx8800_devlist, devlist) {
-                if (h->video_dev->minor == minor) {
-                        dev  = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
-                if (h->vbi_dev->minor == minor) {
-                        dev  = h;
-                        type = V4L2_BUF_TYPE_VBI_CAPTURE;
-                }
-                if (h->radio_dev &&
-                    h->radio_dev->minor == minor) {
-                        radio = 1;
-                        dev   = h;
-                }
-        }
-        if (NULL == dev) {
-                unlock_kernel();
-                return -ENODEV;
+        switch (vdev->vfl_type) {
+        case VFL_TYPE_GRABBER:
+                type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                break;
+        case VFL_TYPE_VBI:
+                type = V4L2_BUF_TYPE_VBI_CAPTURE;
+                break;
+        case VFL_TYPE_RADIO:
+                radio = 1;
+                break;
         }
 
+        lock_kernel();
+
         core = dev->core;
 
-        dprintk(1,"open minor=%d radio=%d type=%s\n",
-                minor,radio,v4l2_type_names[type]);
+        dprintk(1, "open dev=%s radio=%d type=%s\n",
+                video_device_node_name(vdev), radio, v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh),GFP_KERNEL);
@@ -1733,7 +1722,6 @@ static struct video_device cx8800_vbi_template;
 static struct video_device cx8800_video_template = {
         .name                 = "cx8800-video",
         .fops                 = &video_fops,
-        .minor                = -1,
         .ioctl_ops            = &video_ioctl_ops,
         .tvnorms              = CX88_NORMS,
         .current_norm         = V4L2_STD_NTSC_M,
@@ -1769,7 +1757,6 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = {
 static struct video_device cx8800_radio_template = {
         .name                 = "cx8800-radio",
         .fops                 = &radio_fops,
-        .minor                = -1,
         .ioctl_ops            = &radio_ioctl_ops,
 };
 
@@ -1778,21 +1765,21 @@ static struct video_device cx8800_radio_template = {
 static void cx8800_unregister_video(struct cx8800_dev *dev)
 {
         if (dev->radio_dev) {
-                if (-1 != dev->radio_dev->minor)
+                if (video_is_registered(dev->radio_dev))
                         video_unregister_device(dev->radio_dev);
                 else
                         video_device_release(dev->radio_dev);
                 dev->radio_dev = NULL;
         }
         if (dev->vbi_dev) {
-                if (-1 != dev->vbi_dev->minor)
+                if (video_is_registered(dev->vbi_dev))
                         video_unregister_device(dev->vbi_dev);
                 else
                         video_device_release(dev->vbi_dev);
                 dev->vbi_dev = NULL;
         }
         if (dev->video_dev) {
-                if (-1 != dev->video_dev->minor)
+                if (video_is_registered(dev->video_dev))
                         video_unregister_device(dev->video_dev);
                 else
                         video_device_release(dev->video_dev);
@@ -1909,6 +1896,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
         /* register v4l devices */
         dev->video_dev = cx88_vdev_init(core,dev->pci,
                                         &cx8800_video_template,"video");
+        video_set_drvdata(dev->video_dev, dev);
         err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER,
                                     video_nr[core->nr]);
         if (err < 0) {
@@ -1916,10 +1904,11 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
                        core->name);
                 goto fail_unreg;
         }
-        printk(KERN_INFO "%s/0: registered device video%d [v4l2]\n",
-               core->name, dev->video_dev->num);
+        printk(KERN_INFO "%s/0: registered device %s [v4l2]\n",
+               core->name, video_device_node_name(dev->video_dev));
 
         dev->vbi_dev = cx88_vdev_init(core,dev->pci,&cx8800_vbi_template,"vbi");
+        video_set_drvdata(dev->vbi_dev, dev);
         err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI,
                                     vbi_nr[core->nr]);
         if (err < 0) {
@@ -1927,12 +1916,13 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
                        core->name);
                 goto fail_unreg;
         }
-        printk(KERN_INFO "%s/0: registered device vbi%d\n",
-               core->name, dev->vbi_dev->num);
+        printk(KERN_INFO "%s/0: registered device %s\n",
+               core->name, video_device_node_name(dev->vbi_dev));
 
         if (core->board.radio.type == CX88_RADIO) {
                 dev->radio_dev = cx88_vdev_init(core,dev->pci,
                                                 &cx8800_radio_template,"radio");
+                video_set_drvdata(dev->radio_dev, dev);
                 err = video_register_device(dev->radio_dev,VFL_TYPE_RADIO,
                                             radio_nr[core->nr]);
                 if (err < 0) {
@@ -1940,12 +1930,11 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
                                core->name);
                         goto fail_unreg;
                 }
-                printk(KERN_INFO "%s/0: registered device radio%d\n",
-                       core->name, dev->radio_dev->num);
+                printk(KERN_INFO "%s/0: registered device %s\n",
+                       core->name, video_device_node_name(dev->radio_dev));
         }
 
         /* everything worked */
-        list_add_tail(&dev->devlist,&cx8800_devlist);
         pci_set_drvdata(pci_dev,dev);
 
         /* initial device configuration */
@@ -2001,7 +1990,6 @@ static void __devexit cx8800_finidev(struct pci_dev *pci_dev)
 
         /* free memory */
         btcx_riscmem_free(dev->pci,&dev->vidq.stopper);
-        list_del(&dev->devlist);
         cx88_core_put(core,dev->pci);
         kfree(dev);
 }
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index e1c521710103..b1499bf604ea 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -423,7 +423,6 @@ struct cx8800_suspend_state {
 
 struct cx8800_dev {
         struct cx88_core           *core;
-        struct list_head           devlist;
         spinlock_t                 slock;
 
         /* various device info */
@@ -670,7 +669,6 @@ int cx88_audio_thread(void *data);
 
 int cx8802_register_driver(struct cx8802_driver *drv);
 int cx8802_unregister_driver(struct cx8802_driver *drv);
-struct cx8802_dev *cx8802_get_device(int minor);
 struct cx8802_driver * cx8802_get_driver(struct cx8802_dev *dev, enum cx88_board_type btype);
 
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c
index 12a1b3d7132d..de22bc9faf21 100644
--- a/drivers/media/video/davinci/vpfe_capture.c
+++ b/drivers/media/video/davinci/vpfe_capture.c
@@ -70,7 +70,6 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
-#include <linux/version.h>
 #include <media/v4l2-common.h>
 #include <linux/io.h>
 #include <media/davinci/vpfe_capture.h>
@@ -1967,7 +1966,6 @@ static __init int vpfe_probe(struct platform_device *pdev)
         vfd->release            = video_device_release;
         vfd->fops               = &vpfe_fops;
         vfd->ioctl_ops          = &vpfe_ioctl_ops;
-        vfd->minor              = -1;
         vfd->tvnorms            = 0;
         vfd->current_norm       = V4L2_STD_PAL;
         vfd->v4l2_dev           = &vpfe_dev->v4l2_dev;
@@ -2071,7 +2069,7 @@ probe_out_video_unregister:
 probe_out_v4l2_unregister:
         v4l2_device_unregister(&vpfe_dev->v4l2_dev);
 probe_out_video_release:
-        if (vpfe_dev->video_dev->minor == -1)
+        if (!video_is_registered(vpfe_dev->video_dev))
                 video_device_release(vpfe_dev->video_dev);
 probe_out_release_irq:
         free_irq(vpfe_dev->ccdc_irq0, vpfe_dev);
@@ -2091,7 +2089,7 @@ probe_free_dev_mem:
 /*
  * vpfe_remove : It un-register device from V4L2 driver
  */
-static int vpfe_remove(struct platform_device *pdev)
+static int __devexit vpfe_remove(struct platform_device *pdev)
 {
         struct vpfe_device *vpfe_dev = platform_get_drvdata(pdev);
         struct resource *res;
@@ -2127,7 +2125,7 @@ vpfe_resume(struct device *dev)
         return -1;
 }
 
-static struct dev_pm_ops vpfe_dev_pm_ops = {
+static const struct dev_pm_ops vpfe_dev_pm_ops = {
         .suspend = vpfe_suspend,
         .resume = vpfe_resume,
 };
diff --git a/drivers/media/video/davinci/vpif.c b/drivers/media/video/davinci/vpif.c
index 3b8eac31ecae..1f532e31cd49 100644
--- a/drivers/media/video/davinci/vpif.c
+++ b/drivers/media/video/davinci/vpif.c
@@ -266,7 +266,7 @@ fail:
         return status;
 }
 
-static int vpif_remove(struct platform_device *pdev)
+static int __devexit vpif_remove(struct platform_device *pdev)
 {
         iounmap(vpif_base);
         release_mem_region(res->start, res_len);
diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c
index d947ee5e4eb4..78130721f578 100644
--- a/drivers/media/video/davinci/vpif_capture.c
+++ b/drivers/media/video/davinci/vpif_capture.c
@@ -2107,7 +2107,7 @@ vpif_resume(struct device *dev)
         return -1;
 }
 
-static struct dev_pm_ops vpif_dev_pm_ops = {
+static const struct dev_pm_ops vpif_dev_pm_ops = {
         .suspend = vpif_suspend,
         .resume = vpif_resume,
 };
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
index d14cfb200ed0..dfddef7228dd 100644
--- a/drivers/media/video/davinci/vpif_display.c
+++ b/drivers/media/video/davinci/vpif_display.c
@@ -1347,7 +1347,6 @@ static const struct v4l2_file_operations vpif_fops = {
 static struct video_device vpif_video_template = {
         .name           = "vpif",
         .fops           = &vpif_fops,
-        .minor          = -1,
         .ioctl_ops      = &vpif_ioctl_ops,
         .tvnorms        = DM646X_V4L2_STD,
         .current_norm   = V4L2_STD_625_50,
diff --git a/drivers/media/video/davinci/vpss.c b/drivers/media/video/davinci/vpss.c
index 453236bd7559..7ee72ecd3d81 100644
--- a/drivers/media/video/davinci/vpss.c
+++ b/drivers/media/video/davinci/vpss.c
@@ -268,7 +268,7 @@ fail1:
         return status;
 }
 
-static int vpss_remove(struct platform_device *pdev)
+static int __devexit vpss_remove(struct platform_device *pdev)
 {
         iounmap(oper_cfg.vpss_bl_regs_base);
         release_mem_region(oper_cfg.r1->start, oper_cfg.len1);
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 82da205047be..25100001ffff 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -2285,7 +2285,7 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
                 dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
                 break;
         case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
-                dev->init_data.ir_codes = &ir_codes_hauppauge_new_table;
+                dev->init_data.ir_codes = &ir_codes_rc5_hauppauge_new_table;
                 dev->init_data.get_key = em28xx_get_key_em_haup;
                 dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
                 break;
@@ -2653,7 +2653,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         INIT_LIST_HEAD(&dev->vbiq.active);
         INIT_LIST_HEAD(&dev->vbiq.queued);
 
-
         if (dev->board.has_msp34xx) {
                 /* Send a reset to other chips via gpio */
                 errCode = em28xx_write_reg(dev, EM28XX_R08_GPIO, 0xf7);
@@ -2923,9 +2922,9 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
 
         if (dev->users) {
                 em28xx_warn
-                    ("device /dev/video%d is open! Deregistration and memory "
+                    ("device %s is open! Deregistration and memory "
                      "deallocation are deferred on close.\n",
-                                dev->vdev->num);
+                     video_device_node_name(dev->vdev));
 
                 dev->state |= DEV_MISCONFIGURED;
                 em28xx_uninit_isoc(dev);
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 3f86d36dff2b..b311d4514bdf 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -216,7 +216,7 @@ int em28xx_write_reg(struct em28xx *dev, u16 reg, u8 val)
  * sets only some bits (specified by bitmask) of a register, by first reading
  * the actual value
  */
-static int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
+int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
                                  u8 bitmask)
 {
         int oldval;
@@ -1136,34 +1136,6 @@ void em28xx_wake_i2c(struct em28xx *dev)
 static LIST_HEAD(em28xx_devlist);
 static DEFINE_MUTEX(em28xx_devlist_mutex);
 
-struct em28xx *em28xx_get_device(int minor,
-                                 enum v4l2_buf_type *fh_type,
-                                 int *has_radio)
-{
-        struct em28xx *h, *dev = NULL;
-
-        *fh_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-        *has_radio = 0;
-
-        mutex_lock(&em28xx_devlist_mutex);
-        list_for_each_entry(h, &em28xx_devlist, devlist) {
-                if (h->vdev->minor == minor)
-                        dev = h;
-                if (h->vbi_dev && h->vbi_dev->minor == minor) {
-                        dev = h;
-                        *fh_type = V4L2_BUF_TYPE_VBI_CAPTURE;
-                }
-                if (h->radio_dev &&
-                    h->radio_dev->minor == minor) {
-                        dev = h;
-                        *has_radio = 1;
-                }
-        }
-        mutex_unlock(&em28xx_devlist_mutex);
-
-        return dev;
-}
-
 /*
  * em28xx_realease_resources()
  * unregisters the v4l2,i2c and usb devices
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index d96ec7c09dca..af0d935c29be 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -112,10 +112,13 @@ int em28xx_get_key_terratec(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 int em28xx_get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
         unsigned char buf[2];
-        unsigned char code;
+        u16 code;
+        int size;
 
         /* poll IR chip */
-        if (2 != i2c_master_recv(ir->c, buf, 2))
+        size = i2c_master_recv(ir->c, buf, sizeof(buf));
+
+        if (size != 2)
                 return -EIO;
 
         /* Does eliminate repeated parity code */
@@ -124,16 +127,30 @@ int em28xx_get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 
         ir->old = buf[1];
 
-        /* Rearranges bits to the right order */
-        code =   ((buf[0]&0x01)<<5) | /* 0010 0000 */
-                 ((buf[0]&0x02)<<3) | /* 0001 0000 */
-                 ((buf[0]&0x04)<<1) | /* 0000 1000 */
-                 ((buf[0]&0x08)>>1) | /* 0000 0100 */
-                 ((buf[0]&0x10)>>3) | /* 0000 0010 */
-                 ((buf[0]&0x20)>>5);  /* 0000 0001 */
-
-        i2cdprintk("ir hauppauge (em2840): code=0x%02x (rcv=0x%02x)\n",
-                        code, buf[0]);
+        /*
+         * Rearranges bits to the right order.
+         * The bit order were determined experimentally by using
+         * The original Hauppauge Grey IR and another RC5 that uses addr=0x08
+         * The RC5 code has 14 bits, but we've experimentally determined
+         * the meaning for only 11 bits.
+         * So, the code translation is not complete. Yet, it is enough to
+         * work with the provided RC5 IR.
+         */
+        code =
+                 ((buf[0] & 0x01) ? 0x0020 : 0) | /*            0010 0000 */
+                 ((buf[0] & 0x02) ? 0x0010 : 0) | /*            0001 0000 */
+                 ((buf[0] & 0x04) ? 0x0008 : 0) | /*            0000 1000 */
+                 ((buf[0] & 0x08) ? 0x0004 : 0) | /*            0000 0100 */
+                 ((buf[0] & 0x10) ? 0x0002 : 0) | /*            0000 0010 */
+                 ((buf[0] & 0x20) ? 0x0001 : 0) | /*            0000 0001 */
+                 ((buf[1] & 0x08) ? 0x1000 : 0) | /* 0001 0000            */
+                 ((buf[1] & 0x10) ? 0x0800 : 0) | /* 0000 1000            */
+                 ((buf[1] & 0x20) ? 0x0400 : 0) | /* 0000 0100            */
+                 ((buf[1] & 0x40) ? 0x0200 : 0) | /* 0000 0010            */
+                 ((buf[1] & 0x80) ? 0x0100 : 0);  /* 0000 0001            */
+
+        i2cdprintk("ir hauppauge (em2840): code=0x%02x (rcv=0x%02x%02x)\n",
+                        code, buf[1], buf[0]);
 
         /* return key */
         *ir_key = code;
@@ -337,19 +354,28 @@ int em28xx_ir_init(struct em28xx *dev)
                 goto err_out_free;
 
         ir->input = input_dev;
+        ir_config = EM2874_IR_RC5;
+
+        /* Adjust xclk based o IR table for RC5/NEC tables */
+        if (dev->board.ir_codes->ir_type == IR_TYPE_RC5) {
+                dev->board.xclk |= EM28XX_XCLK_IR_RC5_MODE;
+                ir->full_code = 1;
+        } else  if (dev->board.ir_codes->ir_type == IR_TYPE_NEC) {
+                dev->board.xclk &= ~EM28XX_XCLK_IR_RC5_MODE;
+                ir_config = EM2874_IR_NEC;
+                ir->full_code = 1;
+        }
+        em28xx_write_reg_bits(dev, EM28XX_R0F_XCLK, dev->board.xclk,
+                              EM28XX_XCLK_IR_RC5_MODE);
 
         /* Setup the proper handler based on the chip */
         switch (dev->chip_id) {
         case CHIP_ID_EM2860:
         case CHIP_ID_EM2883:
-                if (dev->model == EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950)
-                        ir->full_code = 1;
                 ir->get_key = default_polling_getkey;
                 break;
         case CHIP_ID_EM2874:
                 ir->get_key = em2874_polling_getkey;
-                /* For now we only support RC5, so enable it */
-                ir_config = EM2874_IR_RC5;
                 em28xx_write_regs(dev, EM2874_R50_IR_CONFIG, &ir_config, 1);
                 break;
         default:
@@ -367,8 +393,7 @@ int em28xx_ir_init(struct em28xx *dev)
         usb_make_path(dev->udev, ir->phys, sizeof(ir->phys));
         strlcat(ir->phys, "/input0", sizeof(ir->phys));
 
-        err = ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER,
-                             dev->board.ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER);
         if (err < 0)
                 goto err_out_free;
 
@@ -387,7 +412,7 @@ int em28xx_ir_init(struct em28xx *dev)
         em28xx_ir_start(ir);
 
         /* all done */
-        err = input_register_device(ir->input);
+        err = ir_input_register(ir->input, dev->board.ir_codes);
         if (err)
                 goto err_out_stop;
 
@@ -396,8 +421,6 @@ int em28xx_ir_init(struct em28xx *dev)
         em28xx_ir_stop(ir);
         dev->ir = NULL;
  err_out_free:
-        ir_input_free(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return err;
 }
@@ -411,8 +434,7 @@ int em28xx_ir_fini(struct em28xx *dev)
                 return 0;
 
         em28xx_ir_stop(ir);
-        ir_input_free(ir->input);
-        input_unregister_device(ir->input);
+        ir_input_unregister(ir->input);
         kfree(ir);
 
         /* done */
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 7ad65370f274..849b18c94037 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -2081,22 +2081,30 @@ static int radio_queryctrl(struct file *file, void *priv,
  */
 static int em28xx_v4l2_open(struct file *filp)
 {
-        int minor = video_devdata(filp)->minor;
-        int errCode = 0, radio;
-        struct em28xx *dev;
-        enum v4l2_buf_type fh_type;
+        int errCode = 0, radio = 0;
+        struct video_device *vdev = video_devdata(filp);
+        struct em28xx *dev = video_drvdata(filp);
+        enum v4l2_buf_type fh_type = 0;
         struct em28xx_fh *fh;
         enum v4l2_field field;
 
-        dev = em28xx_get_device(minor, &fh_type, &radio);
-
-        if (NULL == dev)
-                return -ENODEV;
+        switch (vdev->vfl_type) {
+        case VFL_TYPE_GRABBER:
+                fh_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                break;
+        case VFL_TYPE_VBI:
+                fh_type = V4L2_BUF_TYPE_VBI_CAPTURE;
+                break;
+        case VFL_TYPE_RADIO:
+                radio = 1;
+                break;
+        }
 
         mutex_lock(&dev->lock);
 
-        em28xx_videodbg("open minor=%d type=%s users=%d\n",
-                                minor, v4l2_type_names[fh_type], dev->users);
+        em28xx_videodbg("open dev=%s type=%s users=%d\n",
+                        video_device_node_name(vdev), v4l2_type_names[fh_type],
+                        dev->users);
 
 
         fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL);
@@ -2160,25 +2168,25 @@ void em28xx_release_analog_resources(struct em28xx *dev)
         /*FIXME: I2C IR should be disconnected */
 
         if (dev->radio_dev) {
-                if (-1 != dev->radio_dev->minor)
+                if (video_is_registered(dev->radio_dev))
                         video_unregister_device(dev->radio_dev);
                 else
                         video_device_release(dev->radio_dev);
                 dev->radio_dev = NULL;
         }
         if (dev->vbi_dev) {
-                em28xx_info("V4L2 device /dev/vbi%d deregistered\n",
-                            dev->vbi_dev->num);
-                if (-1 != dev->vbi_dev->minor)
+                em28xx_info("V4L2 device %s deregistered\n",
+                            video_device_node_name(dev->vbi_dev));
+                if (video_is_registered(dev->vbi_dev))
                         video_unregister_device(dev->vbi_dev);
                 else
                         video_device_release(dev->vbi_dev);
                 dev->vbi_dev = NULL;
         }
         if (dev->vdev) {
-                em28xx_info("V4L2 device /dev/video%d deregistered\n",
-                            dev->vdev->num);
-                if (-1 != dev->vdev->minor)
+                em28xx_info("V4L2 device %s deregistered\n",
+                            video_device_node_name(dev->vdev));
+                if (video_is_registered(dev->vdev))
                         video_unregister_device(dev->vdev);
                 else
                         video_device_release(dev->vdev);
@@ -2397,8 +2405,6 @@ static const struct video_device em28xx_video_template = {
         .release                    = video_device_release,
         .ioctl_ops                  = &video_ioctl_ops,
 
-        .minor                      = -1,
-
         .tvnorms                    = V4L2_STD_ALL,
         .current_norm               = V4L2_STD_PAL,
 };
@@ -2433,7 +2439,6 @@ static struct video_device em28xx_radio_template = {
         .name                 = "em28xx-radio",
         .fops                 = &radio_fops,
         .ioctl_ops            = &radio_ioctl_ops,
-        .minor                = -1,
 };
 
 /******************************** usb interface ******************************/
@@ -2451,7 +2456,6 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
                 return NULL;
 
         *vfd            = *template;
-        vfd->minor      = -1;
         vfd->v4l2_dev   = &dev->v4l2_dev;
         vfd->release    = video_device_release;
         vfd->debug      = video_debug;
@@ -2459,6 +2463,7 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
         snprintf(vfd->name, sizeof(vfd->name), "%s %s",
                  dev->name, type_name);
 
+        video_set_drvdata(vfd, dev);
         return vfd;
 }
 
@@ -2540,16 +2545,16 @@ int em28xx_register_analog_devices(struct em28xx *dev)
                         em28xx_errdev("can't register radio device\n");
                         return ret;
                 }
-                em28xx_info("Registered radio device as /dev/radio%d\n",
-                            dev->radio_dev->num);
+                em28xx_info("Registered radio device as %s\n",
+                            video_device_node_name(dev->radio_dev));
         }
 
-        em28xx_info("V4L2 video device registered as /dev/video%d\n",
-                                dev->vdev->num);
+        em28xx_info("V4L2 video device registered as %s\n",
+                    video_device_node_name(dev->vdev));
 
         if (dev->vbi_dev)
-                em28xx_info("V4L2 VBI device registered as /dev/vbi%d\n",
-                            dev->vbi_dev->num);
+                em28xx_info("V4L2 VBI device registered as %s\n",
+                            video_device_node_name(dev->vbi_dev));
 
         return 0;
 }
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 441df644ddbe..80d9b4fa1b97 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -643,6 +643,8 @@ int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
                           int len);
 int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len);
 int em28xx_write_reg(struct em28xx *dev, u16 reg, u8 val);
+int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
+                                 u8 bitmask);
 
 int em28xx_read_ac97(struct em28xx *dev, u8 reg);
 int em28xx_write_ac97(struct em28xx *dev, u8 reg, u16 val);
@@ -666,9 +668,6 @@ int em28xx_gpio_set(struct em28xx *dev, struct em28xx_reg_seq *gpio);
 void em28xx_wake_i2c(struct em28xx *dev);
 void em28xx_remove_from_devlist(struct em28xx *dev);
 void em28xx_add_into_devlist(struct em28xx *dev);
-struct em28xx *em28xx_get_device(int minor,
-                                 enum v4l2_buf_type *fh_type,
-                                 int *has_radio);
 int em28xx_register_extension(struct em28xx_ops *dev);
 void em28xx_unregister_extension(struct em28xx_ops *dev);
 void em28xx_init_extension(struct em28xx *dev);
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 88987a57cf7b..e6c23d509862 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -587,8 +587,8 @@ static int et61x251_stream_interrupt(struct et61x251_device* cam)
         else if (cam->stream != STREAM_OFF) {
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "URB timeout reached. The camera is misconfigured. To "
-                       "use it, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use it, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -1195,7 +1195,8 @@ static void et61x251_release_resources(struct kref *kref)
 
         cam = container_of(kref, struct et61x251_device, kref);
 
-        DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->num);
+        DBG(2, "V4L2 device %s deregistered",
+            video_device_node_name(cam->v4ldev));
         video_set_drvdata(cam->v4ldev, NULL);
         video_unregister_device(cam->v4ldev);
         usb_put_dev(cam->usbdev);
@@ -1236,8 +1237,8 @@ static int et61x251_open(struct file *filp)
         }
 
         if (cam->users) {
-                DBG(2, "Device /dev/video%d is already in use",
-                       cam->v4ldev->num);
+                DBG(2, "Device %s is already in use",
+                       video_device_node_name(cam->v4ldev));
                 DBG(3, "Simultaneous opens are not supported");
                 if ((filp->f_flags & O_NONBLOCK) ||
                     (filp->f_flags & O_NDELAY)) {
@@ -1280,7 +1281,8 @@ static int et61x251_open(struct file *filp)
         cam->frame_count = 0;
         et61x251_empty_framequeues(cam);
 
-        DBG(3, "Video device /dev/video%d is open", cam->v4ldev->num);
+        DBG(3, "Video device %s is open",
+            video_device_node_name(cam->v4ldev));
 
 out:
         mutex_unlock(&cam->open_mutex);
@@ -1304,7 +1306,8 @@ static int et61x251_release(struct file *filp)
         cam->users--;
         wake_up_interruptible_nr(&cam->wait_open, 1);
 
-        DBG(3, "Video device /dev/video%d closed", cam->v4ldev->num);
+        DBG(3, "Video device %s closed",
+            video_device_node_name(cam->v4ldev));
 
         kref_put(&cam->kref, et61x251_release_resources);
 
@@ -1846,8 +1849,8 @@ et61x251_vidioc_s_crop(struct et61x251_device* cam, void __user * arg)
         if (err) { /* atomic, no rollback in ioctl() */
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_CROP failed because of hardware problems. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -1859,8 +1862,8 @@ et61x251_vidioc_s_crop(struct et61x251_device* cam, void __user * arg)
             nbuffers != et61x251_request_buffers(cam, nbuffers, cam->io)) {
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_CROP failed because of not enough memory. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -ENOMEM;
         }
 
@@ -2069,8 +2072,8 @@ et61x251_vidioc_try_s_fmt(struct et61x251_device* cam, unsigned int cmd,
         if (err) { /* atomic, no rollback in ioctl() */
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_FMT failed because of hardware problems. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -2081,8 +2084,8 @@ et61x251_vidioc_try_s_fmt(struct et61x251_device* cam, unsigned int cmd,
             nbuffers != et61x251_request_buffers(cam, nbuffers, cam->io)) {
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_FMT failed because of not enough memory. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -ENOMEM;
         }
 
@@ -2130,7 +2133,7 @@ et61x251_vidioc_s_jpegcomp(struct et61x251_device* cam, void __user * arg)
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware "
                        "problems. To use the camera, close and open "
-                       "/dev/video%d again.", cam->v4ldev->num);
+                       "%s again.", video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -2584,7 +2587,6 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
 
         strcpy(cam->v4ldev->name, "ET61X[12]51 PC Camera");
         cam->v4ldev->fops = &et61x251_fops;
-        cam->v4ldev->minor = video_nr[dev_nr];
         cam->v4ldev->release = video_device_release;
         cam->v4ldev->parent = &udev->dev;
         video_set_drvdata(cam->v4ldev, cam);
@@ -2603,7 +2605,8 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                 goto fail;
         }
 
-        DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->num);
+        DBG(2, "V4L2 device registered as %s",
+            video_device_node_name(cam->v4ldev));
 
         cam->module_param.force_munmap = force_munmap[dev_nr];
         cam->module_param.frame_timeout = frame_timeout[dev_nr];
@@ -2654,9 +2657,9 @@ static void et61x251_usb_disconnect(struct usb_interface* intf)
         DBG(2, "Disconnecting %s...", cam->v4ldev->name);
 
         if (cam->users) {
-                DBG(2, "Device /dev/video%d is open! Deregistration and "
-                       "memory deallocation are deferred.",
-                    cam->v4ldev->num);
+                DBG(2, "Device %s is open! Deregistration and memory "
+                       "deallocation are deferred.",
+                    video_device_node_name(cam->v4ldev));
                 cam->state |= DEV_MISCONFIGURED;
                 et61x251_stop_transfer(cam);
                 cam->state |= DEV_DISCONNECTED;
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c
index 2f0b8d621e00..c98b5d69c438 100644
--- a/drivers/media/video/gspca/conex.c
+++ b/drivers/media/video/gspca/conex.c
@@ -1046,14 +1046,14 @@ static struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] __devinitconst = {
         {USB_DEVICE(0x0572, 0x0041)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
 
 /* -- device connect -- */
-static int sd_probe(struct usb_interface *intf,
+static int __devinit sd_probe(struct usb_interface *intf,
                         const struct usb_device_id *id)
 {
         return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c
index 9de86419ae1e..fdf4c0ec5e7a 100644
--- a/drivers/media/video/gspca/etoms.c
+++ b/drivers/media/video/gspca/etoms.c
@@ -864,7 +864,7 @@ static struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] __devinitconst = {
         {USB_DEVICE(0x102c, 0x6151), .driver_info = SENSOR_PAS106},
 #if !defined CONFIG_USB_ET61X251 && !defined CONFIG_USB_ET61X251_MODULE
         {USB_DEVICE(0x102c, 0x6251), .driver_info = SENSOR_TAS5130CXX},
@@ -875,7 +875,7 @@ static __devinitdata struct usb_device_id device_table[] = {
 MODULE_DEVICE_TABLE(usb, device_table);
 
 /* -- device connect -- */
-static int sd_probe(struct usb_interface *intf,
+static int __devinit sd_probe(struct usb_interface *intf,
                     const struct usb_device_id *id)
 {
         return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git a/drivers/media/video/gspca/gl860/gl860-mi1320.c b/drivers/media/video/gspca/gl860/gl860-mi1320.c
index 1355e526ee84..c276a7debdec 100644
--- a/drivers/media/video/gspca/gl860/gl860-mi1320.c
+++ b/drivers/media/video/gspca/gl860/gl860-mi1320.c
@@ -345,7 +345,7 @@ static int mi1320_configure_alt(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-int mi1320_camera_settings(struct gspca_dev *gspca_dev)
+static int mi1320_camera_settings(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
diff --git a/drivers/media/video/gspca/gl860/gl860-mi2020.c b/drivers/media/video/gspca/gl860/gl860-mi2020.c
index 80cb3f1b36f7..7c31b4f2abea 100644
--- a/drivers/media/video/gspca/gl860/gl860-mi2020.c
+++ b/drivers/media/video/gspca/gl860/gl860-mi2020.c
@@ -769,7 +769,7 @@ static int mi2020_configure_alt(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-int mi2020_camera_settings(struct gspca_dev *gspca_dev)
+static int mi2020_camera_settings(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
diff --git a/drivers/media/video/gspca/gl860/gl860.c b/drivers/media/video/gspca/gl860/gl860.c
index a695e0ae13c2..4878c8f66543 100644
--- a/drivers/media/video/gspca/gl860/gl860.c
+++ b/drivers/media/video/gspca/gl860/gl860.c
@@ -40,7 +40,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 static void sd_callback(struct gspca_dev *gspca_dev);
 
 static int gl860_guess_sensor(struct gspca_dev *gspca_dev,
-                                s32 vendor_id, s32 product_id);
+                                u16 vendor_id, u16 product_id);
 
 /*============================ driver options ==============================*/
 
@@ -326,11 +326,11 @@ static int sd_config(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
-        s32 vendor_id, product_id;
+        u16 vendor_id, product_id;
 
         /* Get USB VendorID and ProductID */
-        vendor_id  = le16_to_cpu(id->idVendor);
-        product_id = le16_to_cpu(id->idProduct);
+        vendor_id  = id->idVendor;
+        product_id = id->idProduct;
 
         sd->nbRightUp = 1;
         sd->nbIm = -1;
@@ -534,8 +534,8 @@ static int sd_probe(struct usb_interface *intf,
                 gspca_dev = usb_get_intfdata(intf);
 
                 PDEBUG(D_PROBE,
-                        "Camera is now controlling video device /dev/video%d",
-                        gspca_dev->vdev.minor);
+                        "Camera is now controlling video device %s",
+                        video_device_node_name(&gspca_dev->vdev));
         }
 
         return ret;
@@ -673,7 +673,7 @@ void fetch_idxdata(struct gspca_dev *gspca_dev, struct idxdata *tbl, int len)
 }
 
 static int gl860_guess_sensor(struct gspca_dev *gspca_dev,
-                                s32 vendor_id, s32 product_id)
+                                u16 vendor_id, u16 product_id)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u8 probe, nb26, nb96, nOV, ntry;
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 4076f8e5a6fc..e930a67d526b 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -304,7 +304,6 @@ void gspca_frame_add(struct gspca_dev *gspca_dev,
                 j = gspca_dev->fr_queue[i];
                 gspca_dev->cur_frame = &gspca_dev->frame[j];
         }
-        return;
 }
 EXPORT_SYMBOL(gspca_frame_add);
 
@@ -321,7 +320,7 @@ static int gspca_is_compressed(__u32 format)
         return 0;
 }
 
-static void *rvmalloc(unsigned long size)
+static void *rvmalloc(long size)
 {
         void *mem;
         unsigned long adr;
@@ -329,7 +328,7 @@ static void *rvmalloc(unsigned long size)
         mem = vmalloc_32(size);
         if (mem != NULL) {
                 adr = (unsigned long) mem;
-                while ((long) size > 0) {
+                while (size > 0) {
                         SetPageReserved(vmalloc_to_page((void *) adr));
                         adr += PAGE_SIZE;
                         size -= PAGE_SIZE;
@@ -768,6 +767,7 @@ static int vidioc_g_register(struct file *file, void *priv,
 
         if (mutex_lock_interruptible(&gspca_dev->usb_lock))
                 return -ERESTARTSYS;
+        gspca_dev->usb_err = 0;
         if (gspca_dev->present)
                 ret = gspca_dev->sd_desc->get_register(gspca_dev, reg);
         else
@@ -791,6 +791,7 @@ static int vidioc_s_register(struct file *file, void *priv,
 
         if (mutex_lock_interruptible(&gspca_dev->usb_lock))
                 return -ERESTARTSYS;
+        gspca_dev->usb_err = 0;
         if (gspca_dev->present)
                 ret = gspca_dev->sd_desc->set_register(gspca_dev, reg);
         else
@@ -812,6 +813,7 @@ static int vidioc_g_chip_ident(struct file *file, void *priv,
 
         if (mutex_lock_interruptible(&gspca_dev->usb_lock))
                 return -ERESTARTSYS;
+        gspca_dev->usb_err = 0;
         if (gspca_dev->present)
                 ret = gspca_dev->sd_desc->get_chip_ident(gspca_dev, chip);
         else
@@ -983,11 +985,40 @@ static int vidioc_enum_framesizes(struct file *file, void *priv,
         return -EINVAL;
 }
 
+static int vidioc_enum_frameintervals(struct file *filp, void *priv,
+                                      struct v4l2_frmivalenum *fival)
+{
+        struct gspca_dev *gspca_dev = priv;
+        int mode = wxh_to_mode(gspca_dev, fival->width, fival->height);
+        __u32 i;
+
+        if (gspca_dev->cam.mode_framerates == NULL ||
+                        gspca_dev->cam.mode_framerates[mode].nrates == 0)
+                return -EINVAL;
+
+        if (fival->pixel_format !=
+                        gspca_dev->cam.cam_mode[mode].pixelformat)
+                return -EINVAL;
+
+        for (i = 0; i < gspca_dev->cam.mode_framerates[mode].nrates; i++) {
+                if (fival->index == i) {
+                        fival->type = V4L2_FRMSIZE_TYPE_DISCRETE;
+                        fival->discrete.numerator = 1;
+                        fival->discrete.denominator =
+                                gspca_dev->cam.mode_framerates[mode].rates[i];
+                        return 0;
+                }
+        }
+
+        return -EINVAL;
+}
+
 static void gspca_release(struct video_device *vfd)
 {
         struct gspca_dev *gspca_dev = container_of(vfd, struct gspca_dev, vdev);
 
-        PDEBUG(D_PROBE, "/dev/video%d released", gspca_dev->vdev.num);
+        PDEBUG(D_PROBE, "%s released",
+                video_device_node_name(&gspca_dev->vdev));
 
         kfree(gspca_dev->usb_buf);
         kfree(gspca_dev);
@@ -1053,6 +1084,7 @@ static int dev_close(struct file *file)
         if (gspca_dev->capt_file == file) {
                 if (gspca_dev->streaming) {
                         mutex_lock(&gspca_dev->usb_lock);
+                        gspca_dev->usb_err = 0;
                         gspca_stream_off(gspca_dev);
                         mutex_unlock(&gspca_dev->usb_lock);
                 }
@@ -1143,12 +1175,14 @@ static int vidioc_queryctrl(struct file *file, void *priv,
                                 continue;
                         ctrls = &gspca_dev->sd_desc->ctrls[i];
                 }
+                if (ctrls == NULL)
+                        return -EINVAL;
         } else {
                 ctrls = get_ctrl(gspca_dev, id);
+                if (ctrls == NULL)
+                        return -EINVAL;
                 i = ctrls - gspca_dev->sd_desc->ctrls;
         }
-        if (ctrls == NULL)
-                return -EINVAL;
         memcpy(q_ctrl, ctrls, sizeof *q_ctrl);
         if (gspca_dev->ctrl_inac & (1 << i))
                 q_ctrl->flags |= V4L2_CTRL_FLAG_INACTIVE;
@@ -1172,6 +1206,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
         PDEBUG(D_CONF, "set ctrl [%08x] = %d", ctrl->id, ctrl->value);
         if (mutex_lock_interruptible(&gspca_dev->usb_lock))
                 return -ERESTARTSYS;
+        gspca_dev->usb_err = 0;
         if (gspca_dev->present)
                 ret = ctrls->set(gspca_dev, ctrl->value);
         else
@@ -1193,6 +1228,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 
         if (mutex_lock_interruptible(&gspca_dev->usb_lock))
                 return -ERESTARTSYS;
+        gspca_dev->usb_err = 0;
         if (gspca_dev->present)
                 ret = ctrls->get(gspca_dev, &ctrl->value);
         else
@@ -1307,6 +1343,7 @@ static int vidioc_reqbufs(struct file *file, void *priv,
         /* stop streaming */
         if (gspca_dev->streaming) {
                 mutex_lock(&gspca_dev->usb_lock);
+                gspca_dev->usb_err = 0;
                 gspca_stream_off(gspca_dev);
                 mutex_unlock(&gspca_dev->usb_lock);
         }
@@ -1398,6 +1435,7 @@ static int vidioc_streamoff(struct file *file, void *priv,
                 ret = -ERESTARTSYS;
                 goto out;
         }
+        gspca_dev->usb_err = 0;
         gspca_stream_off(gspca_dev);
         mutex_unlock(&gspca_dev->usb_lock);
 
@@ -1423,6 +1461,7 @@ static int vidioc_g_jpegcomp(struct file *file, void *priv,
                 return -EINVAL;
         if (mutex_lock_interruptible(&gspca_dev->usb_lock))
                 return -ERESTARTSYS;
+        gspca_dev->usb_err = 0;
         if (gspca_dev->present)
                 ret = gspca_dev->sd_desc->get_jcomp(gspca_dev, jpegcomp);
         else
@@ -1441,6 +1480,7 @@ static int vidioc_s_jpegcomp(struct file *file, void *priv,
                 return -EINVAL;
         if (mutex_lock_interruptible(&gspca_dev->usb_lock))
                 return -ERESTARTSYS;
+        gspca_dev->usb_err = 0;
         if (gspca_dev->present)
                 ret = gspca_dev->sd_desc->set_jcomp(gspca_dev, jpegcomp);
         else
@@ -1461,6 +1501,7 @@ static int vidioc_g_parm(struct file *filp, void *priv,
 
                 if (mutex_lock_interruptible(&gspca_dev->usb_lock))
                         return -ERESTARTSYS;
+                gspca_dev->usb_err = 0;
                 if (gspca_dev->present)
                         ret = gspca_dev->sd_desc->get_streamparm(gspca_dev,
                                                                  parm);
@@ -1490,6 +1531,7 @@ static int vidioc_s_parm(struct file *filp, void *priv,
 
                 if (mutex_lock_interruptible(&gspca_dev->usb_lock))
                         return -ERESTARTSYS;
+                gspca_dev->usb_err = 0;
                 if (gspca_dev->present)
                         ret = gspca_dev->sd_desc->set_streamparm(gspca_dev,
                                                                  parm);
@@ -1613,7 +1655,7 @@ static int dev_mmap(struct file *file, struct vm_area_struct *vma)
                 size -= PAGE_SIZE;
         }
 
-        vma->vm_ops = (struct vm_operations_struct *) &gspca_vm_ops;
+        vma->vm_ops = &gspca_vm_ops;
         vma->vm_private_data = frame;
         gspca_vm_open(vma);
         ret = 0;
@@ -1661,6 +1703,7 @@ static int frame_wait(struct gspca_dev *gspca_dev,
 
         if (gspca_dev->sd_desc->dq_callback) {
                 mutex_lock(&gspca_dev->usb_lock);
+                gspca_dev->usb_err = 0;
                 if (gspca_dev->present)
                         gspca_dev->sd_desc->dq_callback(gspca_dev);
                 mutex_unlock(&gspca_dev->usb_lock);
@@ -1973,6 +2016,7 @@ static const struct v4l2_ioctl_ops dev_ioctl_ops = {
         .vidioc_g_parm          = vidioc_g_parm,
         .vidioc_s_parm          = vidioc_s_parm,
         .vidioc_enum_framesizes = vidioc_enum_framesizes,
+        .vidioc_enum_frameintervals = vidioc_enum_frameintervals,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         .vidioc_g_register      = vidioc_g_register,
         .vidioc_s_register      = vidioc_s_register,
@@ -1988,7 +2032,6 @@ static struct video_device gspca_template = {
         .fops = &dev_fops,
         .ioctl_ops = &dev_ioctl_ops,
         .release = gspca_release,
-        .minor = -1,
 };
 
 /*
@@ -2049,9 +2092,6 @@ int gspca_dev_probe(struct usb_interface *intf,
         ret = sd_desc->init(gspca_dev);
         if (ret < 0)
                 goto out;
-        ret = gspca_set_alt0(gspca_dev);
-        if (ret < 0)
-                goto out;
         gspca_set_default_mode(gspca_dev);
 
         mutex_init(&gspca_dev->usb_lock);
@@ -2073,7 +2113,7 @@ int gspca_dev_probe(struct usb_interface *intf,
         }
 
         usb_set_intfdata(intf, gspca_dev);
-        PDEBUG(D_PROBE, "/dev/video%d created", gspca_dev->vdev.num);
+        PDEBUG(D_PROBE, "%s created", video_device_node_name(&gspca_dev->vdev));
         return 0;
 out:
         kfree(gspca_dev->usb_buf);
@@ -2092,7 +2132,8 @@ void gspca_disconnect(struct usb_interface *intf)
 {
         struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
 
-        PDEBUG(D_PROBE, "/dev/video%d disconnect", gspca_dev->vdev.num);
+        PDEBUG(D_PROBE, "%s disconnect",
+                video_device_node_name(&gspca_dev->vdev));
         mutex_lock(&gspca_dev->usb_lock);
         gspca_dev->present = 0;
 
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index 181617355ec3..59c7941da999 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -45,11 +45,20 @@ extern int gspca_debug;
 /* image transfers */
 #define MAX_NURBS 4             /* max number of URBs */
 
+
+/* used to list framerates supported by a camera mode (resolution) */
+struct framerates {
+        int *rates;
+        int nrates;
+};
+
 /* device information - set at probe time */
 struct cam {
         int bulk_size;          /* buffer size when image transfer by bulk */
         const struct v4l2_pix_format *cam_mode; /* size nmodes */
         char nmodes;
+        const struct framerates *mode_framerates; /* must have size nmode,
+                                                   * just like cam_mode */
         __u8 bulk_nurbs;        /* number of URBs in bulk mode
                                  * - cannot be > MAX_NURBS
                                  * - when 0 and bulk_size != 0 means
@@ -171,6 +180,7 @@ struct gspca_dev {
         struct mutex usb_lock;          /* usb exchange protection */
         struct mutex read_lock;         /* read protection */
         struct mutex queue_lock;        /* ISOC queue protection */
+        int usb_err;                    /* USB error - protected by usb_lock */
 #ifdef CONFIG_PM
         char frozen;                    /* suspend - resume */
 #endif
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
index 844fc1d886d1..4294c75e3b11 100644
--- a/drivers/media/video/gspca/m5602/m5602_core.c
+++ b/drivers/media/video/gspca/m5602/m5602_core.c
@@ -81,7 +81,7 @@ int m5602_write_bridge(struct sd *sd, const u8 address, const u8 i2c_data)
         return (err < 0) ? err : 0;
 }
 
-int m5602_wait_for_i2c(struct sd *sd)
+static int m5602_wait_for_i2c(struct sd *sd)
 {
         int err;
         u8 data;
@@ -388,7 +388,7 @@ static int m5602_probe(struct usb_interface *intf,
                                THIS_MODULE);
 }
 
-void m5602_disconnect(struct usb_interface *intf)
+static void m5602_disconnect(struct usb_interface *intf)
 {
         struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
         struct sd *sd = (struct sd *) gspca_dev;
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.c b/drivers/media/video/gspca/m5602/m5602_ov9650.c
index c2739d6605a1..923cdd5f7a6b 100644
--- a/drivers/media/video/gspca/m5602/m5602_ov9650.c
+++ b/drivers/media/video/gspca/m5602/m5602_ov9650.c
@@ -439,7 +439,7 @@ int ov9650_start(struct sd *sd)
                         err = m5602_write_bridge(sd, res_init_ov9650[i][1],
                                 res_init_ov9650[i][2]);
                 else if (res_init_ov9650[i][0] == SENSOR) {
-                        u8 data = res_init_ov9650[i][2];
+                        data = res_init_ov9650[i][2];
                         err = m5602_write_sensor(sd,
                                 res_init_ov9650[i][1], &data, 1);
                 }
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
index a27afeb6f39b..aa2f3c7e2cb5 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
@@ -525,7 +525,10 @@ static int s5k4aa_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
         err = m5602_read_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
         if (err < 0)
                 return err;
-        data = (data & 0xfe) | !val;
+        if (val)
+                data &= 0xfe;
+        else
+                data |= 0x01;
         err = m5602_write_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
         return err;
 }
@@ -570,7 +573,10 @@ static int s5k4aa_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
         err = m5602_read_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
         if (err < 0)
                 return err;
-        data = (data & 0xfe) | !val;
+        if (val)
+                data &= 0xfe;
+        else
+                data |= 0x01;
         err = m5602_write_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
         return err;
 }
diff --git a/drivers/media/video/gspca/mr97310a.c b/drivers/media/video/gspca/mr97310a.c
index 126d968dd9e0..9154870e07d2 100644
--- a/drivers/media/video/gspca/mr97310a.c
+++ b/drivers/media/video/gspca/mr97310a.c
@@ -67,7 +67,7 @@ MODULE_DESCRIPTION("GSPCA/Mars-Semi MR97310A USB Camera Driver");
 MODULE_LICENSE("GPL");
 
 /* global parameters */
-int force_sensor_type = -1;
+static int force_sensor_type = -1;
 module_param(force_sensor_type, int, 0644);
 MODULE_PARM_DESC(force_sensor_type, "Force sensor type (-1 (auto), 0 or 1)");
 
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index ad9ec339981d..b4f965731244 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -1982,7 +1982,7 @@ static int ov518_reg_w32(struct sd *sd, __u16 index, u32 value, int n)
 {
         int ret;
 
-        *((u32 *)sd->gspca_dev.usb_buf) = __cpu_to_le32(value);
+        *((__le32 *) sd->gspca_dev.usb_buf) = __cpu_to_le32(value);
 
         ret = usb_control_msg(sd->gspca_dev.dev,
                         usb_sndctrlpipe(sd->gspca_dev.dev, 0),
@@ -2021,9 +2021,9 @@ static int ov511_i2c_w(struct sd *sd, __u8 reg, __u8 value)
                 if (rc < 0)
                         return rc;
 
-                do
+                do {
                         rc = reg_r(sd, R511_I2C_CTL);
-                while (rc > 0 && ((rc & 1) == 0)); /* Retry until idle */
+                } while (rc > 0 && ((rc & 1) == 0)); /* Retry until idle */
 
                 if (rc < 0)
                         return rc;
@@ -2055,9 +2055,9 @@ static int ov511_i2c_r(struct sd *sd, __u8 reg)
                 if (rc < 0)
                         return rc;
 
-                do
+                do {
                         rc = reg_r(sd, R511_I2C_CTL);
-                while (rc > 0 && ((rc & 1) == 0)); /* Retry until idle */
+                } while (rc > 0 && ((rc & 1) == 0)); /* Retry until idle */
 
                 if (rc < 0)
                         return rc;
@@ -2081,9 +2081,9 @@ static int ov511_i2c_r(struct sd *sd, __u8 reg)
                 if (rc < 0)
                         return rc;
 
-                do
+                do {
                         rc = reg_r(sd, R511_I2C_CTL);
-                while (rc > 0 && ((rc & 1) == 0)); /* Retry until idle */
+                } while (rc > 0 && ((rc & 1) == 0)); /* Retry until idle */
 
                 if (rc < 0)
                         return rc;
diff --git a/drivers/media/video/gspca/pac7302.c b/drivers/media/video/gspca/pac7302.c
index 74acceea8094..de0b66c4b56e 100644
--- a/drivers/media/video/gspca/pac7302.c
+++ b/drivers/media/video/gspca/pac7302.c
@@ -90,6 +90,9 @@ struct sd {
         unsigned char autogain;
         __u8 hflip;
         __u8 vflip;
+        u8 flags;
+#define FL_HFLIP 0x01           /* mirrored by default */
+#define FL_VFLIP 0x02           /* vertical flipped by default */
 
         u8 sof_read;
         u8 autogain_ignore_frames;
@@ -552,6 +555,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
         sd->autogain = AUTOGAIN_DEF;
         sd->hflip = HFLIP_DEF;
         sd->vflip = VFLIP_DEF;
+        sd->flags = id->driver_info;
         return 0;
 }
 
@@ -708,10 +712,17 @@ static int sethvflip(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         int ret;
-        __u8 data;
+        u8 data, hflip, vflip;
+
+        hflip = sd->hflip;
+        if (sd->flags & FL_HFLIP)
+                hflip = !hflip;
+        vflip = sd->vflip;
+        if (sd->flags & FL_VFLIP)
+                vflip = !vflip;
 
         ret = reg_w(gspca_dev, 0xff, 0x03);             /* page 3 */
-        data = (sd->hflip ? 0x08 : 0x00) | (sd->vflip ? 0x04 : 0x00);
+        data = (hflip ? 0x08 : 0x00) | (vflip ? 0x04 : 0x00);
         if (0 <= ret)
                 ret = reg_w(gspca_dev, 0x21, data);
         /* load registers to sensor (Bit 0, auto clear) */
@@ -1218,15 +1229,15 @@ static struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] __devinitconst = {
         {USB_DEVICE(0x06f8, 0x3009)},
         {USB_DEVICE(0x093a, 0x2620)},
         {USB_DEVICE(0x093a, 0x2621)},
-        {USB_DEVICE(0x093a, 0x2622)},
-        {USB_DEVICE(0x093a, 0x2624)},
+        {USB_DEVICE(0x093a, 0x2622), .driver_info = FL_VFLIP},
+        {USB_DEVICE(0x093a, 0x2624), .driver_info = FL_VFLIP},
         {USB_DEVICE(0x093a, 0x2626)},
         {USB_DEVICE(0x093a, 0x2628)},
-        {USB_DEVICE(0x093a, 0x2629)},
+        {USB_DEVICE(0x093a, 0x2629), .driver_info = FL_VFLIP},
         {USB_DEVICE(0x093a, 0x262a)},
         {USB_DEVICE(0x093a, 0x262c)},
         {}
@@ -1234,7 +1245,7 @@ static __devinitdata struct usb_device_id device_table[] = {
 MODULE_DEVICE_TABLE(usb, device_table);
 
 /* -- device connect -- */
-static int sd_probe(struct usb_interface *intf,
+static int __devinit sd_probe(struct usb_interface *intf,
                         const struct usb_device_id *id)
 {
         return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index e5697a6345e8..42cfcdfd8f4f 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -863,7 +863,7 @@ static struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] __devinitconst = {
         {USB_DEVICE(0x093a, 0x2600)},
         {USB_DEVICE(0x093a, 0x2601)},
         {USB_DEVICE(0x093a, 0x2603)},
@@ -875,7 +875,7 @@ static __devinitdata struct usb_device_id device_table[] = {
 MODULE_DEVICE_TABLE(usb, device_table);
 
 /* -- device connect -- */
-static int sd_probe(struct usb_interface *intf,
+static int __devinit sd_probe(struct usb_interface *intf,
                         const struct usb_device_id *id)
 {
         return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c
index b1944a7cbb0f..4cff8035614f 100644
--- a/drivers/media/video/gspca/sn9c20x.c
+++ b/drivers/media/video/gspca/sn9c20x.c
@@ -1158,7 +1158,7 @@ static int i2c_w2(struct gspca_dev *gspca_dev, u8 reg, u16 val)
         return i2c_w(gspca_dev, row);
 }
 
-int i2c_r1(struct gspca_dev *gspca_dev, u8 reg, u8 *val)
+static int i2c_r1(struct gspca_dev *gspca_dev, u8 reg, u8 *val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u8 row[8];
@@ -1183,7 +1183,7 @@ int i2c_r1(struct gspca_dev *gspca_dev, u8 reg, u8 *val)
         return 0;
 }
 
-int i2c_r2(struct gspca_dev *gspca_dev, u8 reg, u16 *val)
+static int i2c_r2(struct gspca_dev *gspca_dev, u8 reg, u16 *val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u8 row[8];
@@ -1476,8 +1476,9 @@ static int sn9c20x_input_init(struct gspca_dev *gspca_dev)
         if (input_register_device(sd->input_dev))
                 return -EINVAL;
 
-        sd->input_task = kthread_run(input_kthread, gspca_dev, "sn9c20x/%d",
-                                     gspca_dev->vdev.minor);
+        sd->input_task = kthread_run(input_kthread, gspca_dev, "sn9c20x/%s-%s",
+                                     gspca_dev->dev->bus->bus_name,
+                                     gspca_dev->dev->devpath);
 
         if (IS_ERR(sd->input_task))
                 return -EINVAL;
@@ -2174,8 +2175,7 @@ static void configure_sensor_output(struct gspca_dev *gspca_dev, int mode)
 }
 
 #define HW_WIN(mode, hstart, vstart) \
-((const u8 []){hstart & 0xff, hstart >> 8, \
-vstart & 0xff, vstart >> 8, \
+((const u8 []){hstart, 0, vstart, 0, \
 (mode & MODE_SXGA ? 1280 >> 4 : 640 >> 4), \
 (mode & MODE_SXGA ? 1024 >> 3 : 480 >> 3)})
 
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 5be95bc65138..ddff2b5ee5c2 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -1226,7 +1226,7 @@ static const struct sd_desc sd_desc = {
         .driver_info = (SENSOR_ ## sensor << 8) | BRIDGE_ ## bridge
 
 
-static __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] __devinitconst = {
         {USB_DEVICE(0x0c45, 0x6001), SB(TAS5110, 102)}, /* TAS5110C1B */
         {USB_DEVICE(0x0c45, 0x6005), SB(TAS5110, 101)}, /* TAS5110C1B */
 #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
@@ -1257,7 +1257,7 @@ static __devinitdata struct usb_device_id device_table[] = {
 MODULE_DEVICE_TABLE(usb, device_table);
 
 /* -- device connect -- */
-static int sd_probe(struct usb_interface *intf,
+static int __devinit sd_probe(struct usb_interface *intf,
                         const struct usb_device_id *id)
 {
         return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c
index ab28cc23e415..39257e4e074f 100644
--- a/drivers/media/video/gspca/spca506.c
+++ b/drivers/media/video/gspca/spca506.c
@@ -685,7 +685,7 @@ static struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] __devinitconst = {
         {USB_DEVICE(0x06e1, 0xa190)},
 /*fixme: may be IntelPCCameraPro BRIDGE_SPCA505
         {USB_DEVICE(0x0733, 0x0430)}, */
@@ -696,7 +696,7 @@ static __devinitdata struct usb_device_id device_table[] = {
 MODULE_DEVICE_TABLE(usb, device_table);
 
 /* -- device connect -- */
-static int sd_probe(struct usb_interface *intf,
+static int __devinit sd_probe(struct usb_interface *intf,
                         const struct usb_device_id *id)
 {
         return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c
index 8e23320d7ab7..2e2935532d99 100644
--- a/drivers/media/video/gspca/stk014.c
+++ b/drivers/media/video/gspca/stk014.c
@@ -126,12 +126,14 @@ static const struct v4l2_pix_format vga_mode[] = {
 };
 
 /* -- read a register -- */
-static int reg_r(struct gspca_dev *gspca_dev,
+static u8 reg_r(struct gspca_dev *gspca_dev,
                         __u16 index)
 {
         struct usb_device *dev = gspca_dev->dev;
         int ret;
 
+        if (gspca_dev->usb_err < 0)
+                return 0;
         ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
                         0x00,
                         USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
@@ -141,18 +143,21 @@ static int reg_r(struct gspca_dev *gspca_dev,
                         500);
         if (ret < 0) {
                 PDEBUG(D_ERR, "reg_r err %d", ret);
-                return ret;
+                gspca_dev->usb_err = ret;
+                return 0;
         }
         return gspca_dev->usb_buf[0];
 }
 
 /* -- write a register -- */
-static int reg_w(struct gspca_dev *gspca_dev,
+static void reg_w(struct gspca_dev *gspca_dev,
                         __u16 index, __u16 value)
 {
         struct usb_device *dev = gspca_dev->dev;
         int ret;
 
+        if (gspca_dev->usb_err < 0)
+                return;
         ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
                         0x01,
                         USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
@@ -161,13 +166,14 @@ static int reg_w(struct gspca_dev *gspca_dev,
                         NULL,
                         0,
                         500);
-        if (ret < 0)
+        if (ret < 0) {
                 PDEBUG(D_ERR, "reg_w err %d", ret);
-        return ret;
+                gspca_dev->usb_err = ret;
+        }
 }
 
 /* -- get a bulk value (4 bytes) -- */
-static int rcv_val(struct gspca_dev *gspca_dev,
+static void rcv_val(struct gspca_dev *gspca_dev,
                         int ads)
 {
         struct usb_device *dev = gspca_dev->dev;
@@ -182,17 +188,22 @@ static int rcv_val(struct gspca_dev *gspca_dev,
         reg_w(gspca_dev, 0x63a, 0);
         reg_w(gspca_dev, 0x63b, 0);
         reg_w(gspca_dev, 0x630, 5);
+        if (gspca_dev->usb_err < 0)
+                return;
         ret = usb_bulk_msg(dev,
                         usb_rcvbulkpipe(dev, 0x05),
                         gspca_dev->usb_buf,
                         4,              /* length */
                         &alen,
                         500);           /* timeout in milliseconds */
-        return ret;
+        if (ret < 0) {
+                PDEBUG(D_ERR, "rcv_val err %d", ret);
+                gspca_dev->usb_err = ret;
+        }
 }
 
 /* -- send a bulk value -- */
-static int snd_val(struct gspca_dev *gspca_dev,
+static void snd_val(struct gspca_dev *gspca_dev,
                         int ads,
                         unsigned int val)
 {
@@ -201,16 +212,9 @@ static int snd_val(struct gspca_dev *gspca_dev,
         __u8 seq = 0;
 
         if (ads == 0x003f08) {
-                ret = reg_r(gspca_dev, 0x0704);
-                if (ret < 0)
-                        goto ko;
-                ret = reg_r(gspca_dev, 0x0705);
-                if (ret < 0)
-                        goto ko;
-                seq = ret;              /* keep the sequence number */
-                ret = reg_r(gspca_dev, 0x0650);
-                if (ret < 0)
-                        goto ko;
+                reg_r(gspca_dev, 0x0704);
+                seq = reg_r(gspca_dev, 0x0705);
+                reg_r(gspca_dev, 0x0650);
                 reg_w(gspca_dev, 0x654, seq);
         } else {
                 reg_w(gspca_dev, 0x654, (ads >> 16) & 0xff);
@@ -223,6 +227,8 @@ static int snd_val(struct gspca_dev *gspca_dev,
         reg_w(gspca_dev, 0x65a, 0);
         reg_w(gspca_dev, 0x65b, 0);
         reg_w(gspca_dev, 0x650, 5);
+        if (gspca_dev->usb_err < 0)
+                return;
         gspca_dev->usb_buf[0] = val >> 24;
         gspca_dev->usb_buf[1] = val >> 16;
         gspca_dev->usb_buf[2] = val >> 8;
@@ -233,24 +239,23 @@ static int snd_val(struct gspca_dev *gspca_dev,
                         4,
                         &alen,
                         500);   /* timeout in milliseconds */
-        if (ret < 0)
-                goto ko;
-        if (ads == 0x003f08) {
-                seq += 4;
-                seq &= 0x3f;
-                reg_w(gspca_dev, 0x705, seq);
+        if (ret < 0) {
+                PDEBUG(D_ERR, "snd_val err %d", ret);
+                gspca_dev->usb_err = ret;
+        } else {
+                if (ads == 0x003f08) {
+                        seq += 4;
+                        seq &= 0x3f;
+                        reg_w(gspca_dev, 0x705, seq);
+                }
         }
-        return ret;
-ko:
-        PDEBUG(D_ERR, "snd_val err %d", ret);
-        return ret;
 }
 
 /* set a camera parameter */
-static int set_par(struct gspca_dev *gspca_dev,
+static void set_par(struct gspca_dev *gspca_dev,
                    int parval)
 {
-        return snd_val(gspca_dev, 0x003f08, parval);
+        snd_val(gspca_dev, 0x003f08, parval);
 }
 
 static void setbrightness(struct gspca_dev *gspca_dev)
@@ -311,18 +316,18 @@ static int sd_config(struct gspca_dev *gspca_dev,
 /* this function is called at probe and resume time */
 static int sd_init(struct gspca_dev *gspca_dev)
 {
-        int ret;
+        u8 ret;
 
         /* check if the device responds */
         usb_set_interface(gspca_dev->dev, gspca_dev->iface, 1);
         ret = reg_r(gspca_dev, 0x0740);
-        if (ret < 0)
-                return ret;
-        if (ret != 0xff) {
-                PDEBUG(D_ERR|D_STREAM, "init reg: 0x%02x", ret);
-                return -1;
+        if (gspca_dev->usb_err >= 0) {
+                if (ret != 0xff) {
+                        PDEBUG(D_ERR|D_STREAM, "init reg: 0x%02x", ret);
+                        gspca_dev->usb_err = -EIO;
+                }
         }
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 /* -- start the camera -- */
@@ -357,15 +362,12 @@ static int sd_start(struct gspca_dev *gspca_dev)
         if (ret < 0) {
                 PDEBUG(D_ERR|D_STREAM, "set intf %d %d failed",
                         gspca_dev->iface, gspca_dev->alt);
+                gspca_dev->usb_err = ret;
                 goto out;
         }
-        ret = reg_r(gspca_dev, 0x0630);
-        if (ret < 0)
-                goto out;
+         reg_r(gspca_dev, 0x0630);
         rcv_val(gspca_dev, 0x000020);   /* << (value ff ff ff ff) */
-        ret = reg_r(gspca_dev, 0x0650);
-        if (ret < 0)
-                goto out;
+        reg_r(gspca_dev, 0x0650);
         snd_val(gspca_dev, 0x000020, 0xffffffff);
         reg_w(gspca_dev, 0x0620, 0);
         reg_w(gspca_dev, 0x0630, 0);
@@ -384,11 +386,11 @@ static int sd_start(struct gspca_dev *gspca_dev)
         /* start the video flow */
         set_par(gspca_dev, 0x01000000);
         set_par(gspca_dev, 0x01000000);
-        PDEBUG(D_STREAM, "camera started alt: 0x%02x", gspca_dev->alt);
-        return 0;
+        if (gspca_dev->usb_err >= 0)
+                PDEBUG(D_STREAM, "camera started alt: 0x%02x",
+                                gspca_dev->alt);
 out:
-        PDEBUG(D_ERR|D_STREAM, "camera start err %d", ret);
-        return ret;
+        return gspca_dev->usb_err;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
@@ -456,7 +458,7 @@ static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
         sd->brightness = val;
         if (gspca_dev->streaming)
                 setbrightness(gspca_dev);
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
@@ -474,7 +476,7 @@ static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
         sd->contrast = val;
         if (gspca_dev->streaming)
                 setcontrast(gspca_dev);
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
@@ -492,7 +494,7 @@ static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)
         sd->colors = val;
         if (gspca_dev->streaming)
                 setcolors(gspca_dev);
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
@@ -510,7 +512,7 @@ static int sd_setfreq(struct gspca_dev *gspca_dev, __s32 val)
         sd->lightfreq = val;
         if (gspca_dev->streaming)
                 setfreq(gspca_dev);
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val)
@@ -552,7 +554,7 @@ static int sd_set_jcomp(struct gspca_dev *gspca_dev,
                 sd->quality = jcomp->quality;
         if (gspca_dev->streaming)
                 jpeg_set_qual(sd->jpeg_hdr, sd->quality);
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static int sd_get_jcomp(struct gspca_dev *gspca_dev,
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index 72bf3b4f0a31..716df6b15fc5 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -460,13 +460,17 @@ static void reg_r(struct gspca_dev *gspca_dev,
                   u16 index,
                   u16 len)
 {
+        int ret;
+
 #ifdef GSPCA_DEBUG
         if (len > USB_BUF_SZ) {
                 err("reg_r: buffer overflow");
                 return;
         }
 #endif
-        usb_control_msg(gspca_dev->dev,
+        if (gspca_dev->usb_err < 0)
+                return;
+        ret = usb_control_msg(gspca_dev->dev,
                         usb_rcvctrlpipe(gspca_dev->dev, 0),
                         req,
                         USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
@@ -474,6 +478,10 @@ static void reg_r(struct gspca_dev *gspca_dev,
                         index,
                         len ? gspca_dev->usb_buf : NULL, len,
                         500);
+        if (ret < 0) {
+                PDEBUG(D_ERR, "reg_r err %d", ret);
+                gspca_dev->usb_err = ret;
+        }
 }
 
 /* write one byte */
@@ -483,40 +491,55 @@ static void reg_w_1(struct gspca_dev *gspca_dev,
                    u16 index,
                    u16 byte)
 {
+        int ret;
+
+        if (gspca_dev->usb_err < 0)
+                return;
         gspca_dev->usb_buf[0] = byte;
-        usb_control_msg(gspca_dev->dev,
+        ret = usb_control_msg(gspca_dev->dev,
                         usb_sndctrlpipe(gspca_dev->dev, 0),
                         req,
                         USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                         value, index,
                         gspca_dev->usb_buf, 1,
                         500);
+        if (ret < 0) {
+                PDEBUG(D_ERR, "reg_w_1 err %d", ret);
+                gspca_dev->usb_err = ret;
+        }
 }
 
 /* write req / index / value */
-static int reg_w_riv(struct usb_device *dev,
+static void reg_w_riv(struct gspca_dev *gspca_dev,
                      u8 req, u16 index, u16 value)
 {
+        struct usb_device *dev = gspca_dev->dev;
         int ret;
 
+        if (gspca_dev->usb_err < 0)
+                return;
         ret = usb_control_msg(dev,
                         usb_sndctrlpipe(dev, 0),
                         req,
                         USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                         value, index, NULL, 0, 500);
-        PDEBUG(D_USBO, "reg write: 0x%02x,0x%02x:0x%02x, %d",
-                req, index, value, ret);
-        if (ret < 0)
-                PDEBUG(D_ERR, "reg write: error %d", ret);
-        return ret;
+        if (ret < 0) {
+                PDEBUG(D_ERR, "reg_w_riv err %d", ret);
+                gspca_dev->usb_err = ret;
+                return;
+        }
+        PDEBUG(D_USBO, "reg_w_riv: 0x%02x,0x%04x:0x%04x",
+                req, index, value);
 }
 
 /* read 1 byte */
-static int reg_r_1(struct gspca_dev *gspca_dev,
+static u8 reg_r_1(struct gspca_dev *gspca_dev,
                         u16 value)      /* wValue */
 {
         int ret;
 
+        if (gspca_dev->usb_err < 0)
+                return 0;
         ret = usb_control_msg(gspca_dev->dev,
                         usb_rcvctrlpipe(gspca_dev->dev, 0),
                         0x20,                   /* request */
@@ -527,19 +550,22 @@ static int reg_r_1(struct gspca_dev *gspca_dev,
                         500);                   /* timeout */
         if (ret < 0) {
                 PDEBUG(D_ERR, "reg_r_1 err %d", ret);
+                gspca_dev->usb_err = ret;
                 return 0;
         }
         return gspca_dev->usb_buf[0];
 }
 
-/* read 1 or 2 bytes - returns < 0 if error */
-static int reg_r_12(struct gspca_dev *gspca_dev,
+/* read 1 or 2 bytes */
+static u16 reg_r_12(struct gspca_dev *gspca_dev,
                         u8 req,         /* bRequest */
                         u16 index,      /* wIndex */
                         u16 length)     /* wLength (1 or 2 only) */
 {
         int ret;
 
+        if (gspca_dev->usb_err < 0)
+                return 0;
         gspca_dev->usb_buf[1] = 0;
         ret = usb_control_msg(gspca_dev->dev,
                         usb_rcvctrlpipe(gspca_dev->dev, 0),
@@ -550,62 +576,44 @@ static int reg_r_12(struct gspca_dev *gspca_dev,
                         gspca_dev->usb_buf, length,
                         500);
         if (ret < 0) {
-                PDEBUG(D_ERR, "reg_read err %d", ret);
-                return -1;
+                PDEBUG(D_ERR, "reg_r_12 err %d", ret);
+                gspca_dev->usb_err = ret;
+                return 0;
         }
         return (gspca_dev->usb_buf[1] << 8) + gspca_dev->usb_buf[0];
 }
 
-static int write_vector(struct gspca_dev *gspca_dev,
+static void write_vector(struct gspca_dev *gspca_dev,
                         const struct cmd *data, int ncmds)
 {
-        struct usb_device *dev = gspca_dev->dev;
-        int ret;
-
         while (--ncmds >= 0) {
-                ret = reg_w_riv(dev, data->req, data->idx, data->val);
-                if (ret < 0) {
-                        PDEBUG(D_ERR,
-                           "Register write failed for 0x%02x, 0x%04x, 0x%04x",
-                                data->req, data->val, data->idx);
-                        return ret;
-                }
+                reg_w_riv(gspca_dev, data->req, data->idx, data->val);
                 data++;
         }
-        return 0;
 }
 
-static int spca50x_setup_qtable(struct gspca_dev *gspca_dev,
-                                const u8 qtable[2][64])
+static void setup_qtable(struct gspca_dev *gspca_dev,
+                        const u8 qtable[2][64])
 {
-        struct usb_device *dev = gspca_dev->dev;
-        int i, err;
+        int i;
 
         /* loop over y components */
-        for (i = 0; i < 64; i++) {
-                err = reg_w_riv(dev, 0x00, 0x2800 + i, qtable[0][i]);
-                if (err < 0)
-                        return err;
-        }
+        for (i = 0; i < 64; i++)
+                 reg_w_riv(gspca_dev, 0x00, 0x2800 + i, qtable[0][i]);
 
         /* loop over c components */
-        for (i = 0; i < 64; i++) {
-                err = reg_w_riv(dev, 0x00, 0x2840 + i, qtable[1][i]);
-                if (err < 0)
-                        return err;
-        }
-        return 0;
+        for (i = 0; i < 64; i++)
+                reg_w_riv(gspca_dev, 0x00, 0x2840 + i, qtable[1][i]);
 }
 
 static void spca504_acknowledged_command(struct gspca_dev *gspca_dev,
                              u8 req, u16 idx, u16 val)
 {
-        struct usb_device *dev = gspca_dev->dev;
-        int notdone;
+        u16 notdone;
 
-        reg_w_riv(dev, req, idx, val);
+        reg_w_riv(gspca_dev, req, idx, val);
         notdone = reg_r_12(gspca_dev, 0x01, 0x0001, 1);
-        reg_w_riv(dev, req, idx, val);
+        reg_w_riv(gspca_dev, req, idx, val);
 
         PDEBUG(D_FRAM, "before wait 0x%04x", notdone);
 
@@ -616,23 +624,22 @@ static void spca504_acknowledged_command(struct gspca_dev *gspca_dev,
 
 static void spca504A_acknowledged_command(struct gspca_dev *gspca_dev,
                         u8 req,
-                        u16 idx, u16 val, u8 stat, u8 count)
+                        u16 idx, u16 val, u16 endcode, u8 count)
 {
-        struct usb_device *dev = gspca_dev->dev;
-        int status;
-        u8 endcode;
+        u16 status;
 
-        reg_w_riv(dev, req, idx, val);
+        reg_w_riv(gspca_dev, req, idx, val);
         status = reg_r_12(gspca_dev, 0x01, 0x0001, 1);
-        endcode = stat;
-        PDEBUG(D_FRAM, "Status 0x%x Need 0x%04x", status, stat);
+        if (gspca_dev->usb_err < 0)
+                return;
+        PDEBUG(D_FRAM, "Status 0x%04x Need 0x%04x", status, endcode);
         if (!count)
                 return;
         count = 200;
         while (--count > 0) {
                 msleep(10);
                 /* gsmart mini2 write a each wait setting 1 ms is enough */
-/*              reg_w_riv(dev, req, idx, val); */
+/*              reg_w_riv(gspca_dev, req, idx, val); */
                 status = reg_r_12(gspca_dev, 0x01, 0x0001, 1);
                 if (status == endcode) {
                         PDEBUG(D_FRAM, "status 0x%04x after wait %d",
@@ -642,7 +649,7 @@ static void spca504A_acknowledged_command(struct gspca_dev *gspca_dev,
         }
 }
 
-static int spca504B_PollingDataReady(struct gspca_dev *gspca_dev)
+static void spca504B_PollingDataReady(struct gspca_dev *gspca_dev)
 {
         int count = 10;
 
@@ -652,7 +659,6 @@ static int spca504B_PollingDataReady(struct gspca_dev *gspca_dev)
                         break;
                 msleep(10);
         }
-        return gspca_dev->usb_buf[0];
 }
 
 static void spca504B_WaitCmdStatus(struct gspca_dev *gspca_dev)
@@ -686,28 +692,26 @@ static void spca50x_GetFirmware(struct gspca_dev *gspca_dev)
 static void spca504B_SetSizeType(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        struct usb_device *dev = gspca_dev->dev;
         u8 Size;
-        int rc;
 
         Size = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].priv;
         switch (sd->bridge) {
         case BRIDGE_SPCA533:
-                reg_w_riv(dev, 0x31, 0, 0);
+                reg_w_riv(gspca_dev, 0x31, 0, 0);
                 spca504B_WaitCmdStatus(gspca_dev);
-                rc = spca504B_PollingDataReady(gspca_dev);
+                spca504B_PollingDataReady(gspca_dev);
                 spca50x_GetFirmware(gspca_dev);
                 reg_w_1(gspca_dev, 0x24, 0, 8, 2);              /* type */
                 reg_r(gspca_dev, 0x24, 8, 1);
 
                 reg_w_1(gspca_dev, 0x25, 0, 4, Size);
                 reg_r(gspca_dev, 0x25, 4, 1);                   /* size */
-                rc = spca504B_PollingDataReady(gspca_dev);
+                spca504B_PollingDataReady(gspca_dev);
 
                 /* Init the cam width height with some values get on init ? */
-                reg_w_riv(dev, 0x31, 0, 0x04);
+                reg_w_riv(gspca_dev, 0x31, 0, 0x04);
                 spca504B_WaitCmdStatus(gspca_dev);
-                rc = spca504B_PollingDataReady(gspca_dev);
+                spca504B_PollingDataReady(gspca_dev);
                 break;
         default:
 /* case BRIDGE_SPCA504B: */
@@ -716,7 +720,7 @@ static void spca504B_SetSizeType(struct gspca_dev *gspca_dev)
                 reg_r(gspca_dev, 0x25, 4, 1);                   /* size */
                 reg_w_1(gspca_dev, 0x27, 0, 0, 6);
                 reg_r(gspca_dev, 0x27, 0, 1);                   /* type */
-                rc = spca504B_PollingDataReady(gspca_dev);
+                spca504B_PollingDataReady(gspca_dev);
                 break;
         case BRIDGE_SPCA504:
                 Size += 3;
@@ -733,8 +737,8 @@ static void spca504B_SetSizeType(struct gspca_dev *gspca_dev)
                 break;
         case BRIDGE_SPCA504C:
                 /* capture mode */
-                reg_w_riv(dev, 0xa0, (0x0500 | (Size & 0x0f)), 0x00);
-                reg_w_riv(dev, 0x20, 0x01, 0x0500 | (Size & 0x0f));
+                reg_w_riv(gspca_dev, 0xa0, (0x0500 | (Size & 0x0f)), 0x00);
+                reg_w_riv(gspca_dev, 0x20, 0x01, 0x0500 | (Size & 0x0f));
                 break;
         }
 }
@@ -762,37 +766,33 @@ static void spca504B_setQtable(struct gspca_dev *gspca_dev)
 static void setbrightness(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        struct usb_device *dev = gspca_dev->dev;
         u16 reg;
 
         reg = sd->bridge == BRIDGE_SPCA536 ? 0x20f0 : 0x21a7;
-        reg_w_riv(dev, 0x00, reg, sd->brightness);
+        reg_w_riv(gspca_dev, 0x00, reg, sd->brightness);
 }
 
 static void setcontrast(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        struct usb_device *dev = gspca_dev->dev;
         u16 reg;
 
         reg = sd->bridge == BRIDGE_SPCA536 ? 0x20f1 : 0x21a8;
-        reg_w_riv(dev, 0x00, reg, sd->contrast);
+        reg_w_riv(gspca_dev, 0x00, reg, sd->contrast);
 }
 
 static void setcolors(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        struct usb_device *dev = gspca_dev->dev;
         u16 reg;
 
         reg = sd->bridge == BRIDGE_SPCA536 ? 0x20f6 : 0x21ae;
-        reg_w_riv(dev, 0x00, reg, sd->colors);
+        reg_w_riv(gspca_dev, 0x00, reg, sd->colors);
 }
 
 static void init_ctl_reg(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        struct usb_device *dev = gspca_dev->dev;
         int pollreg = 1;
 
         setbrightness(gspca_dev);
@@ -807,14 +807,14 @@ static void init_ctl_reg(struct gspca_dev *gspca_dev)
         default:
 /*      case BRIDGE_SPCA533: */
 /*      case BRIDGE_SPCA504B: */
-                reg_w_riv(dev, 0, 0x00, 0x21ad);        /* hue */
-                reg_w_riv(dev, 0, 0x01, 0x21ac);        /* sat/hue */
-                reg_w_riv(dev, 0, 0x00, 0x21a3);        /* gamma */
+                reg_w_riv(gspca_dev, 0, 0x00, 0x21ad);  /* hue */
+                reg_w_riv(gspca_dev, 0, 0x01, 0x21ac);  /* sat/hue */
+                reg_w_riv(gspca_dev, 0, 0x00, 0x21a3);  /* gamma */
                 break;
         case BRIDGE_SPCA536:
-                reg_w_riv(dev, 0, 0x40, 0x20f5);
-                reg_w_riv(dev, 0, 0x01, 0x20f4);
-                reg_w_riv(dev, 0, 0x00, 0x2089);
+                reg_w_riv(gspca_dev, 0, 0x40, 0x20f5);
+                reg_w_riv(gspca_dev, 0, 0x01, 0x20f4);
+                reg_w_riv(gspca_dev, 0, 0x00, 0x2089);
                 break;
         }
         if (pollreg)
@@ -881,18 +881,17 @@ static int sd_config(struct gspca_dev *gspca_dev,
 static int sd_init(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        struct usb_device *dev = gspca_dev->dev;
-        int i, err_code;
+        int i;
         u8 info[6];
 
         switch (sd->bridge) {
         case BRIDGE_SPCA504B:
-                reg_w_riv(dev, 0x1d, 0x00, 0);
-                reg_w_riv(dev, 0, 0x01, 0x2306);
-                reg_w_riv(dev, 0, 0x00, 0x0d04);
-                reg_w_riv(dev, 0, 0x00, 0x2000);
-                reg_w_riv(dev, 0, 0x13, 0x2301);
-                reg_w_riv(dev, 0, 0x00, 0x2306);
+                reg_w_riv(gspca_dev, 0x1d, 0x00, 0);
+                reg_w_riv(gspca_dev, 0, 0x01, 0x2306);
+                reg_w_riv(gspca_dev, 0, 0x00, 0x0d04);
+                reg_w_riv(gspca_dev, 0, 0x00, 0x2000);
+                reg_w_riv(gspca_dev, 0, 0x13, 0x2301);
+                reg_w_riv(gspca_dev, 0, 0x00, 0x2306);
                 /* fall thru */
         case BRIDGE_SPCA533:
                 spca504B_PollingDataReady(gspca_dev);
@@ -904,13 +903,13 @@ static int sd_init(struct gspca_dev *gspca_dev)
                 reg_w_1(gspca_dev, 0x24, 0, 0, 0);
                 reg_r(gspca_dev, 0x24, 0, 1);
                 spca504B_PollingDataReady(gspca_dev);
-                reg_w_riv(dev, 0x34, 0, 0);
+                reg_w_riv(gspca_dev, 0x34, 0, 0);
                 spca504B_WaitCmdStatus(gspca_dev);
                 break;
         case BRIDGE_SPCA504C:   /* pccam600 */
                 PDEBUG(D_STREAM, "Opening SPCA504 (PC-CAM 600)");
-                reg_w_riv(dev, 0xe0, 0x0000, 0x0000);
-                reg_w_riv(dev, 0xe0, 0x0000, 0x0001);   /* reset */
+                reg_w_riv(gspca_dev, 0xe0, 0x0000, 0x0000);
+                reg_w_riv(gspca_dev, 0xe0, 0x0000, 0x0001);     /* reset */
                 spca504_wait_status(gspca_dev);
                 if (sd->subtype == LogitechClickSmart420)
                         write_vector(gspca_dev,
@@ -919,12 +918,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
                 else
                         write_vector(gspca_dev, spca504_pccam600_open_data,
                                 ARRAY_SIZE(spca504_pccam600_open_data));
-                err_code = spca50x_setup_qtable(gspca_dev,
-                                                qtable_creative_pccam);
-                if (err_code < 0) {
-                        PDEBUG(D_ERR|D_STREAM, "spca50x_setup_qtable failed");
-                        return err_code;
-                }
+                setup_qtable(gspca_dev, qtable_creative_pccam);
                 break;
         default:
 /*      case BRIDGE_SPCA504: */
@@ -958,29 +952,24 @@ static int sd_init(struct gspca_dev *gspca_dev)
                                                         6, 0, 0x86, 1); */
 /*                      spca504A_acknowledged_command (gspca_dev, 0x24,
                                                         0, 0, 0x9D, 1); */
-                        reg_w_riv(dev, 0x00, 0x270c, 0x05); /* L92 sno1t.txt */
-                        reg_w_riv(dev, 0x00, 0x2310, 0x05);
+                        reg_w_riv(gspca_dev, 0x00, 0x270c, 0x05);
+                                                        /* L92 sno1t.txt */
+                        reg_w_riv(gspca_dev, 0x00, 0x2310, 0x05);
                         spca504A_acknowledged_command(gspca_dev, 0x01,
                                                         0x0f, 0, 0xff, 0);
                 }
                 /* setup qtable */
-                reg_w_riv(dev, 0, 0x2000, 0);
-                reg_w_riv(dev, 0, 0x2883, 1);
-                err_code = spca50x_setup_qtable(gspca_dev,
-                                                qtable_spca504_default);
-                if (err_code < 0) {
-                        PDEBUG(D_ERR, "spca50x_setup_qtable failed");
-                        return err_code;
-                }
+                reg_w_riv(gspca_dev, 0, 0x2000, 0);
+                reg_w_riv(gspca_dev, 0, 0x2883, 1);
+                setup_qtable(gspca_dev, qtable_spca504_default);
                 break;
         }
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        struct usb_device *dev = gspca_dev->dev;
         int enable;
         int i;
         u8 info[6];
@@ -1005,13 +994,13 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 case MegapixV4:
                 case LogitechClickSmart820:
                 case MegaImageVI:
-                        reg_w_riv(dev, 0xf0, 0, 0);
+                        reg_w_riv(gspca_dev, 0xf0, 0, 0);
                         spca504B_WaitCmdStatus(gspca_dev);
                         reg_r(gspca_dev, 0xf0, 4, 0);
                         spca504B_WaitCmdStatus(gspca_dev);
                         break;
                 default:
-                        reg_w_riv(dev, 0x31, 0, 0x04);
+                        reg_w_riv(gspca_dev, 0x31, 0, 0x04);
                         spca504B_WaitCmdStatus(gspca_dev);
                         spca504B_PollingDataReady(gspca_dev);
                         break;
@@ -1048,8 +1037,9 @@ static int sd_start(struct gspca_dev *gspca_dev)
                         spca504_acknowledged_command(gspca_dev, 0x24, 0, 0);
                 }
                 spca504B_SetSizeType(gspca_dev);
-                reg_w_riv(dev, 0x00, 0x270c, 0x05);     /* L92 sno1t.txt */
-                reg_w_riv(dev, 0x00, 0x2310, 0x05);
+                reg_w_riv(gspca_dev, 0x00, 0x270c, 0x05);
+                                                        /* L92 sno1t.txt */
+                reg_w_riv(gspca_dev, 0x00, 0x2310, 0x05);
                 break;
         case BRIDGE_SPCA504C:
                 if (sd->subtype == LogitechClickSmart420) {
@@ -1061,36 +1051,37 @@ static int sd_start(struct gspca_dev *gspca_dev)
                                 ARRAY_SIZE(spca504_pccam600_init_data));
                 }
                 enable = (sd->autogain ? 0x04 : 0x01);
-                reg_w_riv(dev, 0x0c, 0x0000, enable);   /* auto exposure */
-                reg_w_riv(dev, 0xb0, 0x0000, enable);   /* auto whiteness */
+                reg_w_riv(gspca_dev, 0x0c, 0x0000, enable);
+                                                        /* auto exposure */
+                reg_w_riv(gspca_dev, 0xb0, 0x0000, enable);
+                                                        /* auto whiteness */
 
                 /* set default exposure compensation and whiteness balance */
-                reg_w_riv(dev, 0x30, 0x0001, 800);      /* ~ 20 fps */
-                reg_w_riv(dev, 0x30, 0x0002, 1600);
+                reg_w_riv(gspca_dev, 0x30, 0x0001, 800);        /* ~ 20 fps */
+                reg_w_riv(gspca_dev, 0x30, 0x0002, 1600);
                 spca504B_SetSizeType(gspca_dev);
                 break;
         }
         init_ctl_reg(gspca_dev);
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        struct usb_device *dev = gspca_dev->dev;
 
         switch (sd->bridge) {
         default:
 /*      case BRIDGE_SPCA533: */
 /*      case BRIDGE_SPCA536: */
 /*      case BRIDGE_SPCA504B: */
-                reg_w_riv(dev, 0x31, 0, 0);
+                reg_w_riv(gspca_dev, 0x31, 0, 0);
                 spca504B_WaitCmdStatus(gspca_dev);
                 spca504B_PollingDataReady(gspca_dev);
                 break;
         case BRIDGE_SPCA504:
         case BRIDGE_SPCA504C:
-                reg_w_riv(dev, 0x00, 0x2000, 0x0000);
+                reg_w_riv(gspca_dev, 0x00, 0x2000, 0x0000);
 
                 if (sd->subtype == AiptekMiniPenCam13) {
                         /* spca504a aiptek */
@@ -1102,7 +1093,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
                                                         0x0f, 0x00, 0xff, 1);
                 } else {
                         spca504_acknowledged_command(gspca_dev, 0x24, 0, 0);
-                        reg_w_riv(dev, 0x01, 0x000f, 0x0000);
+                        reg_w_riv(gspca_dev, 0x01, 0x000f, 0x0000);
                 }
                 break;
         }
@@ -1216,7 +1207,7 @@ static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
         sd->brightness = val;
         if (gspca_dev->streaming)
                 setbrightness(gspca_dev);
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
@@ -1234,7 +1225,7 @@ static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
         sd->contrast = val;
         if (gspca_dev->streaming)
                 setcontrast(gspca_dev);
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
@@ -1252,7 +1243,7 @@ static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)
         sd->colors = val;
         if (gspca_dev->streaming)
                 setcolors(gspca_dev);
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
@@ -1292,7 +1283,7 @@ static int sd_set_jcomp(struct gspca_dev *gspca_dev,
                 sd->quality = jcomp->quality;
         if (gspca_dev->streaming)
                 jpeg_set_qual(sd->jpeg_hdr, sd->quality);
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static int sd_get_jcomp(struct gspca_dev *gspca_dev,
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index 69e5dc4fc9de..1a800fc1c00e 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -5345,9 +5345,6 @@ static const struct usb_action tas5130cxx_InitialScale[] = {	/* 320x240 */
         {0xa0, 0x01, ZC3XX_R012_VIDEOCONTROLFUNC},
         {0xa0, 0x01, ZC3XX_R001_SYSTEMOPERATING},
         {0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC},
-        {0xa0, 0x07, ZC3XX_R0A5_EXPOSUREGAIN},
-        {0xa0, 0x02, ZC3XX_R0A6_EXPOSUREBLACKLVL},
-
         {0xa0, 0x02, ZC3XX_R003_FRAMEWIDTHHIGH},
         {0xa0, 0x80, ZC3XX_R004_FRAMEWIDTHLOW},
         {0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH},
@@ -5364,27 +5361,27 @@ static const struct usb_action tas5130cxx_InitialScale[] = {	/* 320x240 */
         {0xa0, 0xf7, ZC3XX_R101_SENSORCORRECTION},
         {0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE},
         {0xa0, 0x06, ZC3XX_R189_AWBSTATUS},
-        {0xa0, 0x95, ZC3XX_R18D_YTARGET},
+        {0xa0, 0x70, ZC3XX_R18D_YTARGET},
         {0xa0, 0x50, ZC3XX_R1A8_DIGITALGAIN},
         {0xa0, 0x00, 0x01ad},
         {0xa0, 0x03, ZC3XX_R1C5_SHARPNESSMODE},
         {0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05},
         {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE},
         {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},
+        {0xa0, 0x07, ZC3XX_R0A5_EXPOSUREGAIN},
+        {0xa0, 0x02, ZC3XX_R0A6_EXPOSUREBLACKLVL},
         {}
 };
 static const struct usb_action tas5130cxx_Initial[] = { /* 640x480 */
         {0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL},
         {0xa0, 0x40, ZC3XX_R002_CLOCKSELECT},
-        {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},
+        {0xa0, 0x00, ZC3XX_R008_CLOCKSETTING},
         {0xa0, 0x02, ZC3XX_R010_CMOSSENSORSELECT},
         {0xa0, 0x01, ZC3XX_R001_SYSTEMOPERATING},
         {0xa0, 0x00, ZC3XX_R001_SYSTEMOPERATING},
         {0xa0, 0x01, ZC3XX_R012_VIDEOCONTROLFUNC},
         {0xa0, 0x01, ZC3XX_R001_SYSTEMOPERATING},
         {0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC},
-        {0xa0, 0x07, ZC3XX_R0A5_EXPOSUREGAIN},
-        {0xa0, 0x02, ZC3XX_R0A6_EXPOSUREBLACKLVL},
         {0xa0, 0x02, ZC3XX_R003_FRAMEWIDTHHIGH},
         {0xa0, 0x80, ZC3XX_R004_FRAMEWIDTHLOW},
         {0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH},
@@ -5400,13 +5397,15 @@ static const struct usb_action tas5130cxx_Initial[] = {	/* 640x480 */
         {0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION},
         {0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE},
         {0xa0, 0x06, ZC3XX_R189_AWBSTATUS},
-        {0xa0, 0x95, ZC3XX_R18D_YTARGET},
+        {0xa0, 0x70, ZC3XX_R18D_YTARGET},
         {0xa0, 0x50, ZC3XX_R1A8_DIGITALGAIN},
         {0xa0, 0x00, 0x01ad},
         {0xa0, 0x03, ZC3XX_R1C5_SHARPNESSMODE},
         {0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05},
         {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE},
         {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},
+        {0xa0, 0x07, ZC3XX_R0A5_EXPOSUREGAIN},
+        {0xa0, 0x02, ZC3XX_R0A6_EXPOSUREBLACKLVL},
         {}
 };
 static const struct usb_action tas5130cxx_50HZ[] = {
@@ -6424,11 +6423,11 @@ static int vga_2wr_probe(struct gspca_dev *gspca_dev)
         if (retword != 0)
                 return 0x0e;                    /* PAS202BCB */
 
-        start_2wr_probe(dev, 0x02);             /* ?? */
+        start_2wr_probe(dev, 0x02);             /* TAS5130C */
         i2c_write(gspca_dev, 0x01, 0xaa, 0x00);
         retword = i2c_read(gspca_dev, 0x01);
         if (retword != 0)
-                return 0x02;                    /* ?? */
+                return 0x02;                    /* TAS5130C */
 ov_check:
         reg_r(gspca_dev, 0x0010);               /* ?? */
         reg_r(gspca_dev, 0x0010);
@@ -6505,6 +6504,8 @@ static int vga_3wr_probe(struct gspca_dev *gspca_dev)
         reg_r(gspca_dev, 0x0010);
         /* value 0x4001 is meaningless */
         if (retword != 0x4001) {
+                if ((retword & 0xff00) == 0x6400)
+                        return 0x02;            /* TAS5130C */
                 for (i = 0; i < ARRAY_SIZE(chipset_revision_sensor); i++) {
                         if (chipset_revision_sensor[i].revision == retword) {
                                 sd->chip_revision = retword;
@@ -6515,7 +6516,7 @@ static int vga_3wr_probe(struct gspca_dev *gspca_dev)
                 }
         }
 
-        reg_w(dev, 0x01, 0x0000);       /* check ?? */
+        reg_w(dev, 0x01, 0x0000);       /* check PB0330 */
         reg_w(dev, 0x01, 0x0001);
         reg_w(dev, 0xdd, 0x008b);
         reg_w(dev, 0x0a, 0x0010);
@@ -6524,7 +6525,7 @@ static int vga_3wr_probe(struct gspca_dev *gspca_dev)
         retword = i2c_read(gspca_dev, 0x00);
         if (retword != 0) {
                 PDEBUG(D_PROBE, "probe 3wr vga type 0a ?");
-                return 0x0a;                    /* ?? */
+                return 0x0a;                    /* PB0330 */
         }
 
         reg_w(dev, 0x01, 0x0000);
@@ -6673,6 +6674,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
                         PDEBUG(D_PROBE, "Find Sensor HV7131B");
                         sd->sensor = SENSOR_HV7131B;
                         break;
+                case 0x02:
+                        PDEBUG(D_PROBE, "Sensor TAS5130C");
+                        sd->sensor = SENSOR_TAS5130CXX;
+                        break;
                 case 0x04:
                         PDEBUG(D_PROBE, "Find Sensor CS2102");
                         sd->sensor = SENSOR_CS2102;
@@ -6866,11 +6871,14 @@ static int sd_start(struct gspca_dev *gspca_dev)
         case SENSOR_GC0305:
         case SENSOR_OV7620:
         case SENSOR_PO2030:
+        case SENSOR_TAS5130CXX:
         case SENSOR_TAS5130C_VF0250:
 /*              msleep(100);                     * ?? */
                 reg_r(gspca_dev, 0x0002);       /* --> 0x40 */
                 reg_w(dev, 0x09, 0x01ad);       /* (from win traces) */
                 reg_w(dev, 0x15, 0x01ae);
+                if (sd->sensor == SENSOR_TAS5130CXX)
+                        break;
                 reg_w(dev, 0x0d, 0x003a);
                 reg_w(dev, 0x02, 0x003b);
                 reg_w(dev, 0x00, 0x0038);
@@ -6887,6 +6895,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 break;
         case SENSOR_PAS202B:
         case SENSOR_GC0305:
+        case SENSOR_TAS5130CXX:
                 reg_r(gspca_dev, 0x0008);
                 /* fall thru */
         case SENSOR_PO2030:
@@ -6928,6 +6937,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 reg_w(dev, 0x40, 0x0117);
                 break;
         case SENSOR_GC0305:
+        case SENSOR_TAS5130CXX:
                 reg_w(dev, 0x09, 0x01ad);       /* (from win traces) */
                 reg_w(dev, 0x15, 0x01ae);
                 /* fall thru */
@@ -7220,7 +7230,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
         {USB_DEVICE(0x0ac8, 0x0302), .driver_info = SENSOR_PAS106},
         {USB_DEVICE(0x0ac8, 0x301b)},
         {USB_DEVICE(0x0ac8, 0x303b)},
-        {USB_DEVICE(0x0ac8, 0x305b), .driver_info = SENSOR_TAS5130C_VF0250},
+        {USB_DEVICE(0x0ac8, 0x305b)},
         {USB_DEVICE(0x0ac8, 0x307b)},
         {USB_DEVICE(0x10fd, 0x0128)},
         {USB_DEVICE(0x10fd, 0x804d)},
diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
index 1c9bc94c905c..51f393d03a46 100644
--- a/drivers/media/video/hdpvr/hdpvr-core.c
+++ b/drivers/media/video/hdpvr/hdpvr-core.c
@@ -145,7 +145,7 @@ static int device_authorization(struct hdpvr_device *dev)
 #ifdef HDPVR_DEBUG
         else {
                 hex_dump_to_buffer(dev->usbc_buf, 46, 16, 1, print_buf,
-                                   sizeof(print_buf), 0);
+                                   5*buf_size+1, 0);
                 v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev,
                          "Status request returned, len %d: %s\n",
                          ret, print_buf);
@@ -168,13 +168,13 @@ static int device_authorization(struct hdpvr_device *dev)
 
         response = dev->usbc_buf+38;
 #ifdef HDPVR_DEBUG
-        hex_dump_to_buffer(response, 8, 16, 1, print_buf, sizeof(print_buf), 0);
+        hex_dump_to_buffer(response, 8, 16, 1, print_buf, 5*buf_size+1, 0);
         v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev, "challenge: %s\n",
                  print_buf);
 #endif
         challenge(response);
 #ifdef HDPVR_DEBUG
-        hex_dump_to_buffer(response, 8, 16, 1, print_buf, sizeof(print_buf), 0);
+        hex_dump_to_buffer(response, 8, 16, 1, print_buf, 5*buf_size+1, 0);
         v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev, " response: %s\n",
                  print_buf);
 #endif
@@ -376,8 +376,8 @@ static int hdpvr_probe(struct usb_interface *interface,
         usb_set_intfdata(interface, dev);
 
         /* let the user know what node this device is now attached to */
-        v4l2_info(&dev->v4l2_dev, "device now attached to /dev/video%d\n",
-                  dev->video_dev->minor);
+        v4l2_info(&dev->v4l2_dev, "device now attached to %s\n",
+                  video_device_node_name(dev->video_dev));
         return 0;
 
 error:
@@ -391,13 +391,10 @@ error:
 static void hdpvr_disconnect(struct usb_interface *interface)
 {
         struct hdpvr_device *dev;
-        int minor;
 
         dev = usb_get_intfdata(interface);
         usb_set_intfdata(interface, NULL);
 
-        minor = dev->video_dev->minor;
-
         /* prevent more I/O from starting and stop any ongoing */
         mutex_lock(&dev->io_mutex);
         dev->status = STATUS_DISCONNECTED;
@@ -425,7 +422,8 @@ static void hdpvr_disconnect(struct usb_interface *interface)
 
         atomic_dec(&dev_nr);
 
-        v4l2_info(&dev->v4l2_dev, "device /dev/video%d disconnected\n", minor);
+        v4l2_info(&dev->v4l2_dev, "device %s disconnected\n",
+                  video_device_node_name(dev->video_dev));
 
         v4l2_device_unregister(&dev->v4l2_dev);
         kfree(dev->usbc_buf);
diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
index b5439cabb381..fdd782039e9d 100644
--- a/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/drivers/media/video/hdpvr/hdpvr-video.c
@@ -523,7 +523,7 @@ static unsigned int hdpvr_poll(struct file *filp, poll_table *wait)
 
         mutex_lock(&dev->io_mutex);
 
-        if (video_is_unregistered(dev->video_dev)) {
+        if (!video_is_registered(dev->video_dev)) {
                 mutex_unlock(&dev->io_mutex);
                 return -EIO;
         }
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 64360d26b32d..b86e35386cee 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -353,6 +353,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                 ir_type     = IR_TYPE_RC5;
                 ir_codes    = &ir_codes_fusionhdtv_mce_table;
                 break;
+        case 0x0b:
         case 0x47:
         case 0x71:
                 if (adap->id == I2C_HW_B_CX2388x ||
@@ -422,7 +423,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
         /* Make sure we are all setup before going on */
         if (!name || !ir->get_key || !ir_type || !ir_codes) {
-                dprintk(1, DEVNAME ": Unsupported device at address 0x%02x\n",
+                dprintk(1, ": Unsupported device at address 0x%02x\n",
                         addr);
                 err = -ENODEV;
                 goto err_out_free;
@@ -437,7 +438,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                  dev_name(&client->dev));
 
         /* init + register input device */
-        err = ir_input_init(input_dev, &ir->ir, ir_type, ir->ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, ir_type);
         if (err < 0)
                 goto err_out_free;
 
@@ -445,7 +446,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
         input_dev->name       = ir->name;
         input_dev->phys       = ir->phys;
 
-        err = input_register_device(ir->input);
+        err = ir_input_register(ir->input, ir->ir_codes);
         if (err)
                 goto err_out_free;
 
@@ -459,8 +460,6 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
         return 0;
 
  err_out_free:
-        ir_input_free(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return err;
 }
@@ -473,8 +472,7 @@ static int ir_remove(struct i2c_client *client)
         cancel_delayed_work_sync(&ir->work);
 
         /* unregister device */
-        ir_input_free(ir->input);
-        input_unregister_device(ir->input);
+        ir_input_unregister(ir->input);
 
         /* free memory */
         kfree(ir);
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index e707ef3086b2..babcabd73c08 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -985,8 +985,8 @@ int ivtv_v4l2_open(struct file *filp)
 
         mutex_lock(&itv->serialize_lock);
         if (ivtv_init_on_first_open(itv)) {
-                IVTV_ERR("Failed to initialize on minor %d\n",
-                                vdev->minor);
+                IVTV_ERR("Failed to initialize on device %s\n",
+                         video_device_node_name(vdev));
                 mutex_unlock(&itv->serialize_lock);
                 return -ENXIO;
         }
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 67699e3f2aaa..e12c6022373e 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -245,6 +245,7 @@ static int ivtv_reg_dev(struct ivtv *itv, int type)
 {
         struct ivtv_stream *s = &itv->streams[type];
         int vfl_type = ivtv_stream_info[type].vfl_type;
+        const char *name;
         int num;
 
         if (s->vdev == NULL)
@@ -268,24 +269,24 @@ static int ivtv_reg_dev(struct ivtv *itv, int type)
                 s->vdev = NULL;
                 return -ENOMEM;
         }
-        num = s->vdev->num;
+        name = video_device_node_name(s->vdev);
 
         switch (vfl_type) {
         case VFL_TYPE_GRABBER:
-                IVTV_INFO("Registered device video%d for %s (%d kB)\n",
-                        num, s->name, itv->options.kilobytes[type]);
+                IVTV_INFO("Registered device %s for %s (%d kB)\n",
+                        name, s->name, itv->options.kilobytes[type]);
                 break;
         case VFL_TYPE_RADIO:
-                IVTV_INFO("Registered device radio%d for %s\n",
-                        num, s->name);
+                IVTV_INFO("Registered device %s for %s\n",
+                        name, s->name);
                 break;
         case VFL_TYPE_VBI:
                 if (itv->options.kilobytes[type])
-                        IVTV_INFO("Registered device vbi%d for %s (%d kB)\n",
-                                num, s->name, itv->options.kilobytes[type]);
+                        IVTV_INFO("Registered device %s for %s (%d kB)\n",
+                                name, s->name, itv->options.kilobytes[type]);
                 else
-                        IVTV_INFO("Registered device vbi%d for %s\n",
-                                num, s->name);
+                        IVTV_INFO("Registered device %s for %s\n",
+                                name, s->name);
                 break;
         }
         return 0;
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 01e1eefcf1eb..6ffa64cd1c6d 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -1681,7 +1681,6 @@ static struct video_device meye_template = {
         .fops           = &meye_fops,
         .ioctl_ops      = &meye_ioctl_ops,
         .release        = video_device_release,
-        .minor          = -1,
 };
 
 #ifdef CONFIG_PM
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index 45388d2ce2fd..b62c0bd3f8ea 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -17,9 +17,11 @@
 #include <media/v4l2-chip-ident.h>
 #include <media/soc_camera.h>
 
-/* mt9m001 i2c address 0x5d
+/*
+ * mt9m001 i2c address 0x5d
  * The platform has to define ctruct i2c_board_info objects and link to them
- * from struct soc_camera_link */
+ * from struct soc_camera_link
+ */
 
 /* mt9m001 selected register addresses */
 #define MT9M001_CHIP_VERSION            0x00
@@ -46,42 +48,50 @@
 #define MT9M001_COLUMN_SKIP             20
 #define MT9M001_ROW_SKIP                12
 
-static const struct soc_camera_data_format mt9m001_colour_formats[] = {
-        /* Order important: first natively supported,
-         * second supported with a GPIO extender */
-        {
-                .name           = "Bayer (sRGB) 10 bit",
-                .depth          = 10,
-                .fourcc         = V4L2_PIX_FMT_SBGGR16,
-                .colorspace     = V4L2_COLORSPACE_SRGB,
-        }, {
-                .name           = "Bayer (sRGB) 8 bit",
-                .depth          = 8,
-                .fourcc         = V4L2_PIX_FMT_SBGGR8,
-                .colorspace     = V4L2_COLORSPACE_SRGB,
-        }
+/* MT9M001 has only one fixed colorspace per pixelcode */
+struct mt9m001_datafmt {
+        enum v4l2_mbus_pixelcode        code;
+        enum v4l2_colorspace            colorspace;
+};
+
+/* Find a data format by a pixel code in an array */
+static const struct mt9m001_datafmt *mt9m001_find_datafmt(
+        enum v4l2_mbus_pixelcode code, const struct mt9m001_datafmt *fmt,
+        int n)
+{
+        int i;
+        for (i = 0; i < n; i++)
+                if (fmt[i].code == code)
+                        return fmt + i;
+
+        return NULL;
+}
+
+static const struct mt9m001_datafmt mt9m001_colour_fmts[] = {
+        /*
+         * Order important: first natively supported,
+         * second supported with a GPIO extender
+         */
+        {V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
+        {V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
 };
 
-static const struct soc_camera_data_format mt9m001_monochrome_formats[] = {
+static const struct mt9m001_datafmt mt9m001_monochrome_fmts[] = {
         /* Order important - see above */
-        {
-                .name           = "Monochrome 10 bit",
-                .depth          = 10,
-                .fourcc         = V4L2_PIX_FMT_Y16,
-        }, {
-                .name           = "Monochrome 8 bit",
-                .depth          = 8,
-                .fourcc         = V4L2_PIX_FMT_GREY,
-        },
+        {V4L2_MBUS_FMT_Y10_1X10, V4L2_COLORSPACE_JPEG},
+        {V4L2_MBUS_FMT_GREY8_1X8, V4L2_COLORSPACE_JPEG},
 };
 
 struct mt9m001 {
         struct v4l2_subdev subdev;
         struct v4l2_rect rect;  /* Sensor window */
-        __u32 fourcc;
+        const struct mt9m001_datafmt *fmt;
+        const struct mt9m001_datafmt *fmts;
+        int num_fmts;
         int model;      /* V4L2_IDENT_MT9M001* codes from v4l2-chip-ident.h */
         unsigned int gain;
         unsigned int exposure;
+        unsigned short y_skip_top;      /* Lines to skip at the top */
         unsigned char autoexposure;
 };
 
@@ -204,8 +214,7 @@ static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
         const u16 hblank = 9, vblank = 25;
         unsigned int total_h;
 
-        if (mt9m001->fourcc == V4L2_PIX_FMT_SBGGR8 ||
-            mt9m001->fourcc == V4L2_PIX_FMT_SBGGR16)
+        if (mt9m001->fmts == mt9m001_colour_fmts)
                 /*
                  * Bayer format - even number of rows for simplicity,
                  * but let the user play with the top row.
@@ -222,15 +231,17 @@ static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
         soc_camera_limit_side(&rect.top, &rect.height,
                      MT9M001_ROW_SKIP, MT9M001_MIN_HEIGHT, MT9M001_MAX_HEIGHT);
 
-        total_h = rect.height + icd->y_skip_top + vblank;
+        total_h = rect.height + mt9m001->y_skip_top + vblank;
 
         /* Blanking and start values - default... */
         ret = reg_write(client, MT9M001_HORIZONTAL_BLANKING, hblank);
         if (!ret)
                 ret = reg_write(client, MT9M001_VERTICAL_BLANKING, vblank);
 
-        /* The caller provides a supported format, as verified per
-         * call to icd->try_fmt() */
+        /*
+         * The caller provides a supported format, as verified per
+         * call to icd->try_fmt()
+         */
         if (!ret)
                 ret = reg_write(client, MT9M001_COLUMN_START, rect.left);
         if (!ret)
@@ -239,7 +250,7 @@ static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
                 ret = reg_write(client, MT9M001_WINDOW_WIDTH, rect.width - 1);
         if (!ret)
                 ret = reg_write(client, MT9M001_WINDOW_HEIGHT,
-                                rect.height + icd->y_skip_top - 1);
+                                rect.height + mt9m001->y_skip_top - 1);
         if (!ret && mt9m001->autoexposure) {
                 ret = reg_write(client, MT9M001_SHUTTER_WIDTH, total_h);
                 if (!ret) {
@@ -283,32 +294,32 @@ static int mt9m001_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
         return 0;
 }
 
-static int mt9m001_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int mt9m001_g_fmt(struct v4l2_subdev *sd,
+                         struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
         struct mt9m001 *mt9m001 = to_mt9m001(client);
-        struct v4l2_pix_format *pix = &f->fmt.pix;
 
-        pix->width              = mt9m001->rect.width;
-        pix->height             = mt9m001->rect.height;
-        pix->pixelformat        = mt9m001->fourcc;
-        pix->field              = V4L2_FIELD_NONE;
-        pix->colorspace         = V4L2_COLORSPACE_SRGB;
+        mf->width       = mt9m001->rect.width;
+        mf->height      = mt9m001->rect.height;
+        mf->code        = mt9m001->fmt->code;
+        mf->colorspace  = mt9m001->fmt->colorspace;
+        mf->field       = V4L2_FIELD_NONE;
 
         return 0;
 }
 
-static int mt9m001_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int mt9m001_s_fmt(struct v4l2_subdev *sd,
+                         struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
         struct mt9m001 *mt9m001 = to_mt9m001(client);
-        struct v4l2_pix_format *pix = &f->fmt.pix;
         struct v4l2_crop a = {
                 .c = {
                         .left   = mt9m001->rect.left,
                         .top    = mt9m001->rect.top,
-                        .width  = pix->width,
-                        .height = pix->height,
+                        .width  = mf->width,
+                        .height = mf->height,
                 },
         };
         int ret;
@@ -316,28 +327,39 @@ static int mt9m001_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
         /* No support for scaling so far, just crop. TODO: use skipping */
         ret = mt9m001_s_crop(sd, &a);
         if (!ret) {
-                pix->width = mt9m001->rect.width;
-                pix->height = mt9m001->rect.height;
-                mt9m001->fourcc = pix->pixelformat;
+                mf->width       = mt9m001->rect.width;
+                mf->height      = mt9m001->rect.height;
+                mt9m001->fmt    = mt9m001_find_datafmt(mf->code,
+                                        mt9m001->fmts, mt9m001->num_fmts);
+                mf->colorspace  = mt9m001->fmt->colorspace;
         }
 
         return ret;
 }
 
-static int mt9m001_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int mt9m001_try_fmt(struct v4l2_subdev *sd,
+                           struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
-        struct soc_camera_device *icd = client->dev.platform_data;
-        struct v4l2_pix_format *pix = &f->fmt.pix;
+        struct mt9m001 *mt9m001 = to_mt9m001(client);
+        const struct mt9m001_datafmt *fmt;
 
-        v4l_bound_align_image(&pix->width, MT9M001_MIN_WIDTH,
+        v4l_bound_align_image(&mf->width, MT9M001_MIN_WIDTH,
                 MT9M001_MAX_WIDTH, 1,
-                &pix->height, MT9M001_MIN_HEIGHT + icd->y_skip_top,
-                MT9M001_MAX_HEIGHT + icd->y_skip_top, 0, 0);
+                &mf->height, MT9M001_MIN_HEIGHT + mt9m001->y_skip_top,
+                MT9M001_MAX_HEIGHT + mt9m001->y_skip_top, 0, 0);
+
+        if (mt9m001->fmts == mt9m001_colour_fmts)
+                mf->height = ALIGN(mf->height - 1, 2);
 
-        if (pix->pixelformat == V4L2_PIX_FMT_SBGGR8 ||
-            pix->pixelformat == V4L2_PIX_FMT_SBGGR16)
-                pix->height = ALIGN(pix->height - 1, 2);
+        fmt = mt9m001_find_datafmt(mf->code, mt9m001->fmts,
+                                   mt9m001->num_fmts);
+        if (!fmt) {
+                fmt = mt9m001->fmt;
+                mf->code = fmt->code;
+        }
+
+        mf->colorspace  = fmt->colorspace;
 
         return 0;
 }
@@ -552,7 +574,7 @@ static int mt9m001_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                 if (ctrl->value) {
                         const u16 vblank = 25;
                         unsigned int total_h = mt9m001->rect.height +
-                                icd->y_skip_top + vblank;
+                                mt9m001->y_skip_top + vblank;
                         if (reg_write(client, MT9M001_SHUTTER_WIDTH,
                                       total_h) < 0)
                                 return -EIO;
@@ -568,8 +590,10 @@ static int mt9m001_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
         return 0;
 }
 
-/* Interface active, can use i2c. If it fails, it can indeed mean, that
- * this wasn't our capture interface, so, we wait for the right one */
+/*
+ * Interface active, can use i2c. If it fails, it can indeed mean, that
+ * this wasn't our capture interface, so, we wait for the right one
+ */
 static int mt9m001_video_probe(struct soc_camera_device *icd,
                                struct i2c_client *client)
 {
@@ -579,8 +603,10 @@ static int mt9m001_video_probe(struct soc_camera_device *icd,
         unsigned long flags;
         int ret;
 
-        /* We must have a parent by now. And it cannot be a wrong one.
-         * So this entire test is completely redundant. */
+        /*
+         * We must have a parent by now. And it cannot be a wrong one.
+         * So this entire test is completely redundant.
+         */
         if (!icd->dev.parent ||
             to_soc_camera_host(icd->dev.parent)->nr != icd->iface)
                 return -ENODEV;
@@ -597,11 +623,11 @@ static int mt9m001_video_probe(struct soc_camera_device *icd,
         case 0x8411:
         case 0x8421:
                 mt9m001->model = V4L2_IDENT_MT9M001C12ST;
-                icd->formats = mt9m001_colour_formats;
+                mt9m001->fmts = mt9m001_colour_fmts;
                 break;
         case 0x8431:
                 mt9m001->model = V4L2_IDENT_MT9M001C12STM;
-                icd->formats = mt9m001_monochrome_formats;
+                mt9m001->fmts = mt9m001_monochrome_fmts;
                 break;
         default:
                 dev_err(&client->dev,
@@ -609,7 +635,7 @@ static int mt9m001_video_probe(struct soc_camera_device *icd,
                 return -ENODEV;
         }
 
-        icd->num_formats = 0;
+        mt9m001->num_fmts = 0;
 
         /*
          * This is a 10bit sensor, so by default we only allow 10bit.
@@ -622,14 +648,14 @@ static int mt9m001_video_probe(struct soc_camera_device *icd,
                 flags = SOCAM_DATAWIDTH_10;
 
         if (flags & SOCAM_DATAWIDTH_10)
-                icd->num_formats++;
+                mt9m001->num_fmts++;
         else
-                icd->formats++;
+                mt9m001->fmts++;
 
         if (flags & SOCAM_DATAWIDTH_8)
-                icd->num_formats++;
+                mt9m001->num_fmts++;
 
-        mt9m001->fourcc = icd->formats->fourcc;
+        mt9m001->fmt = &mt9m001->fmts[0];
 
         dev_info(&client->dev, "Detected a MT9M001 chip ID %x (%s)\n", data,
                  data == 0x8431 ? "C12STM" : "C12ST");
@@ -655,6 +681,16 @@ static void mt9m001_video_remove(struct soc_camera_device *icd)
                 icl->free_bus(icl);
 }
 
+static int mt9m001_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)
+{
+        struct i2c_client *client = sd->priv;
+        struct mt9m001 *mt9m001 = to_mt9m001(client);
+
+        *lines = mt9m001->y_skip_top;
+
+        return 0;
+}
+
 static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = {
         .g_ctrl         = mt9m001_g_ctrl,
         .s_ctrl         = mt9m001_s_ctrl,
@@ -665,19 +701,38 @@ static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = {
 #endif
 };
 
+static int mt9m001_enum_fmt(struct v4l2_subdev *sd, int index,
+                            enum v4l2_mbus_pixelcode *code)
+{
+        struct i2c_client *client = sd->priv;
+        struct mt9m001 *mt9m001 = to_mt9m001(client);
+
+        if ((unsigned int)index >= mt9m001->num_fmts)
+                return -EINVAL;
+
+        *code = mt9m001->fmts[index].code;
+        return 0;
+}
+
 static struct v4l2_subdev_video_ops mt9m001_subdev_video_ops = {
         .s_stream       = mt9m001_s_stream,
-        .s_fmt          = mt9m001_s_fmt,
-        .g_fmt          = mt9m001_g_fmt,
-        .try_fmt        = mt9m001_try_fmt,
+        .s_mbus_fmt     = mt9m001_s_fmt,
+        .g_mbus_fmt     = mt9m001_g_fmt,
+        .try_mbus_fmt   = mt9m001_try_fmt,
         .s_crop         = mt9m001_s_crop,
         .g_crop         = mt9m001_g_crop,
         .cropcap        = mt9m001_cropcap,
+        .enum_mbus_fmt  = mt9m001_enum_fmt,
+};
+
+static struct v4l2_subdev_sensor_ops mt9m001_subdev_sensor_ops = {
+        .g_skip_top_lines       = mt9m001_g_skip_top_lines,
 };
 
 static struct v4l2_subdev_ops mt9m001_subdev_ops = {
         .core   = &mt9m001_subdev_core_ops,
         .video  = &mt9m001_subdev_video_ops,
+        .sensor = &mt9m001_subdev_sensor_ops,
 };
 
 static int mt9m001_probe(struct i2c_client *client,
@@ -714,15 +769,17 @@ static int mt9m001_probe(struct i2c_client *client,
 
         /* Second stage probe - when a capture adapter is there */
         icd->ops                = &mt9m001_ops;
-        icd->y_skip_top         = 0;
 
+        mt9m001->y_skip_top     = 0;
         mt9m001->rect.left      = MT9M001_COLUMN_SKIP;
         mt9m001->rect.top       = MT9M001_ROW_SKIP;
         mt9m001->rect.width     = MT9M001_MAX_WIDTH;
         mt9m001->rect.height    = MT9M001_MAX_HEIGHT;
 
-        /* Simulated autoexposure. If enabled, we calculate shutter width
-         * ourselves in the driver based on vertical blanking and frame width */
+        /*
+         * Simulated autoexposure. If enabled, we calculate shutter width
+         * ourselves in the driver based on vertical blanking and frame width
+         */
         mt9m001->autoexposure = 1;
 
         ret = mt9m001_video_probe(icd, client);
diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c
index 90da699601ea..d35f536f9fc3 100644
--- a/drivers/media/video/mt9m111.c
+++ b/drivers/media/video/mt9m111.c
@@ -123,23 +123,34 @@
 #define MT9M111_MAX_HEIGHT      1024
 #define MT9M111_MAX_WIDTH       1280
 
-#define COL_FMT(_name, _depth, _fourcc, _colorspace) \
-        { .name = _name, .depth = _depth, .fourcc = _fourcc, \
-        .colorspace = _colorspace }
-#define RGB_FMT(_name, _depth, _fourcc) \
-        COL_FMT(_name, _depth, _fourcc, V4L2_COLORSPACE_SRGB)
-#define JPG_FMT(_name, _depth, _fourcc) \
-        COL_FMT(_name, _depth, _fourcc, V4L2_COLORSPACE_JPEG)
-
-static const struct soc_camera_data_format mt9m111_colour_formats[] = {
-        JPG_FMT("CbYCrY 16 bit", 16, V4L2_PIX_FMT_UYVY),
-        JPG_FMT("CrYCbY 16 bit", 16, V4L2_PIX_FMT_VYUY),
-        JPG_FMT("YCbYCr 16 bit", 16, V4L2_PIX_FMT_YUYV),
-        JPG_FMT("YCrYCb 16 bit", 16, V4L2_PIX_FMT_YVYU),
-        RGB_FMT("RGB 565", 16, V4L2_PIX_FMT_RGB565),
-        RGB_FMT("RGB 555", 16, V4L2_PIX_FMT_RGB555),
-        RGB_FMT("Bayer (sRGB) 10 bit", 10, V4L2_PIX_FMT_SBGGR16),
-        RGB_FMT("Bayer (sRGB) 8 bit", 8, V4L2_PIX_FMT_SBGGR8),
+/* MT9M111 has only one fixed colorspace per pixelcode */
+struct mt9m111_datafmt {
+        enum v4l2_mbus_pixelcode        code;
+        enum v4l2_colorspace            colorspace;
+};
+
+/* Find a data format by a pixel code in an array */
+static const struct mt9m111_datafmt *mt9m111_find_datafmt(
+        enum v4l2_mbus_pixelcode code, const struct mt9m111_datafmt *fmt,
+        int n)
+{
+        int i;
+        for (i = 0; i < n; i++)
+                if (fmt[i].code == code)
+                        return fmt + i;
+
+        return NULL;
+}
+
+static const struct mt9m111_datafmt mt9m111_colour_fmts[] = {
+        {V4L2_MBUS_FMT_YUYV8_2X8_LE, V4L2_COLORSPACE_JPEG},
+        {V4L2_MBUS_FMT_YVYU8_2X8_LE, V4L2_COLORSPACE_JPEG},
+        {V4L2_MBUS_FMT_YUYV8_2X8_BE, V4L2_COLORSPACE_JPEG},
+        {V4L2_MBUS_FMT_YVYU8_2X8_BE, V4L2_COLORSPACE_JPEG},
+        {V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
+        {V4L2_MBUS_FMT_RGB565_2X8_LE, V4L2_COLORSPACE_SRGB},
+        {V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
+        {V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
 };
 
 enum mt9m111_context {
@@ -152,7 +163,7 @@ struct mt9m111 {
         int model;      /* V4L2_IDENT_MT9M11x* codes from v4l2-chip-ident.h */
         enum mt9m111_context context;
         struct v4l2_rect rect;
-        u32 pixfmt;
+        const struct mt9m111_datafmt *fmt;
         unsigned int gain;
         unsigned char autoexposure;
         unsigned char datawidth;
@@ -258,8 +269,8 @@ static int mt9m111_setup_rect(struct i2c_client *client,
         int width = rect->width;
         int height = rect->height;
 
-        if (mt9m111->pixfmt == V4L2_PIX_FMT_SBGGR8 ||
-            mt9m111->pixfmt == V4L2_PIX_FMT_SBGGR16)
+        if (mt9m111->fmt->code == V4L2_MBUS_FMT_SBGGR8_1X8 ||
+            mt9m111->fmt->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE)
                 is_raw_format = 1;
         else
                 is_raw_format = 0;
@@ -307,7 +318,8 @@ static int mt9m111_setup_pixfmt(struct i2c_client *client, u16 outfmt)
 
 static int mt9m111_setfmt_bayer8(struct i2c_client *client)
 {
-        return mt9m111_setup_pixfmt(client, MT9M111_OUTFMT_PROCESSED_BAYER);
+        return mt9m111_setup_pixfmt(client, MT9M111_OUTFMT_PROCESSED_BAYER |
+                                    MT9M111_OUTFMT_RGB);
 }
 
 static int mt9m111_setfmt_bayer10(struct i2c_client *client)
@@ -401,8 +413,8 @@ static int mt9m111_make_rect(struct i2c_client *client,
 {
         struct mt9m111 *mt9m111 = to_mt9m111(client);
 
-        if (mt9m111->pixfmt == V4L2_PIX_FMT_SBGGR8 ||
-            mt9m111->pixfmt == V4L2_PIX_FMT_SBGGR16) {
+        if (mt9m111->fmt->code == V4L2_MBUS_FMT_SBGGR8_1X8 ||
+            mt9m111->fmt->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE) {
                 /* Bayer format - even size lengths */
                 rect->width     = ALIGN(rect->width, 2);
                 rect->height    = ALIGN(rect->height, 2);
@@ -460,120 +472,139 @@ static int mt9m111_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
         return 0;
 }
 
-static int mt9m111_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int mt9m111_g_fmt(struct v4l2_subdev *sd,
+                         struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
         struct mt9m111 *mt9m111 = to_mt9m111(client);
-        struct v4l2_pix_format *pix = &f->fmt.pix;
 
-        pix->width              = mt9m111->rect.width;
-        pix->height             = mt9m111->rect.height;
-        pix->pixelformat        = mt9m111->pixfmt;
-        pix->field              = V4L2_FIELD_NONE;
-        pix->colorspace         = V4L2_COLORSPACE_SRGB;
+        mf->width       = mt9m111->rect.width;
+        mf->height      = mt9m111->rect.height;
+        mf->code        = mt9m111->fmt->code;
+        mf->field       = V4L2_FIELD_NONE;
 
         return 0;
 }
 
-static int mt9m111_set_pixfmt(struct i2c_client *client, u32 pixfmt)
+static int mt9m111_set_pixfmt(struct i2c_client *client,
+                              enum v4l2_mbus_pixelcode code)
 {
         struct mt9m111 *mt9m111 = to_mt9m111(client);
         int ret;
 
-        switch (pixfmt) {
-        case V4L2_PIX_FMT_SBGGR8:
+        switch (code) {
+        case V4L2_MBUS_FMT_SBGGR8_1X8:
                 ret = mt9m111_setfmt_bayer8(client);
                 break;
-        case V4L2_PIX_FMT_SBGGR16:
+        case V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE:
                 ret = mt9m111_setfmt_bayer10(client);
                 break;
-        case V4L2_PIX_FMT_RGB555:
+        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
                 ret = mt9m111_setfmt_rgb555(client);
                 break;
-        case V4L2_PIX_FMT_RGB565:
+        case V4L2_MBUS_FMT_RGB565_2X8_LE:
                 ret = mt9m111_setfmt_rgb565(client);
                 break;
-        case V4L2_PIX_FMT_UYVY:
+        case V4L2_MBUS_FMT_YUYV8_2X8_BE:
                 mt9m111->swap_yuv_y_chromas = 0;
                 mt9m111->swap_yuv_cb_cr = 0;
                 ret = mt9m111_setfmt_yuv(client);
                 break;
-        case V4L2_PIX_FMT_VYUY:
+        case V4L2_MBUS_FMT_YVYU8_2X8_BE:
                 mt9m111->swap_yuv_y_chromas = 0;
                 mt9m111->swap_yuv_cb_cr = 1;
                 ret = mt9m111_setfmt_yuv(client);
                 break;
-        case V4L2_PIX_FMT_YUYV:
+        case V4L2_MBUS_FMT_YUYV8_2X8_LE:
                 mt9m111->swap_yuv_y_chromas = 1;
                 mt9m111->swap_yuv_cb_cr = 0;
                 ret = mt9m111_setfmt_yuv(client);
                 break;
-        case V4L2_PIX_FMT_YVYU:
+        case V4L2_MBUS_FMT_YVYU8_2X8_LE:
                 mt9m111->swap_yuv_y_chromas = 1;
                 mt9m111->swap_yuv_cb_cr = 1;
                 ret = mt9m111_setfmt_yuv(client);
                 break;
         default:
                 dev_err(&client->dev, "Pixel format not handled : %x\n",
-                        pixfmt);
+                        code);
                 ret = -EINVAL;
         }
 
-        if (!ret)
-                mt9m111->pixfmt = pixfmt;
-
         return ret;
 }
 
-static int mt9m111_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int mt9m111_s_fmt(struct v4l2_subdev *sd,
+                         struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
+        const struct mt9m111_datafmt *fmt;
         struct mt9m111 *mt9m111 = to_mt9m111(client);
-        struct v4l2_pix_format *pix = &f->fmt.pix;
         struct v4l2_rect rect = {
                 .left   = mt9m111->rect.left,
                 .top    = mt9m111->rect.top,
-                .width  = pix->width,
-                .height = pix->height,
+                .width  = mf->width,
+                .height = mf->height,
         };
         int ret;
 
+        fmt = mt9m111_find_datafmt(mf->code, mt9m111_colour_fmts,
+                                   ARRAY_SIZE(mt9m111_colour_fmts));
+        if (!fmt)
+                return -EINVAL;
+
         dev_dbg(&client->dev,
-                "%s fmt=%x left=%d, top=%d, width=%d, height=%d\n", __func__,
-                pix->pixelformat, rect.left, rect.top, rect.width, rect.height);
+                "%s code=%x left=%d, top=%d, width=%d, height=%d\n", __func__,
+                mf->code, rect.left, rect.top, rect.width, rect.height);
 
         ret = mt9m111_make_rect(client, &rect);
         if (!ret)
-                ret = mt9m111_set_pixfmt(client, pix->pixelformat);
-        if (!ret)
-                mt9m111->rect = rect;
+                ret = mt9m111_set_pixfmt(client, mf->code);
+        if (!ret) {
+                mt9m111->rect   = rect;
+                mt9m111->fmt    = fmt;
+                mf->colorspace  = fmt->colorspace;
+        }
+
         return ret;
 }
 
-static int mt9m111_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int mt9m111_try_fmt(struct v4l2_subdev *sd,
+                           struct v4l2_mbus_framefmt *mf)
 {
-        struct v4l2_pix_format *pix = &f->fmt.pix;
-        bool bayer = pix->pixelformat == V4L2_PIX_FMT_SBGGR8 ||
-                pix->pixelformat == V4L2_PIX_FMT_SBGGR16;
+        struct i2c_client *client = sd->priv;
+        struct mt9m111 *mt9m111 = to_mt9m111(client);
+        const struct mt9m111_datafmt *fmt;
+        bool bayer = mf->code == V4L2_MBUS_FMT_SBGGR8_1X8 ||
+                mf->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE;
+
+        fmt = mt9m111_find_datafmt(mf->code, mt9m111_colour_fmts,
+                                   ARRAY_SIZE(mt9m111_colour_fmts));
+        if (!fmt) {
+                fmt = mt9m111->fmt;
+                mf->code = fmt->code;
+        }
 
         /*
          * With Bayer format enforce even side lengths, but let the user play
          * with the starting pixel
          */
 
-        if (pix->height > MT9M111_MAX_HEIGHT)
-                pix->height = MT9M111_MAX_HEIGHT;
-        else if (pix->height < 2)
-                pix->height = 2;
+        if (mf->height > MT9M111_MAX_HEIGHT)
+                mf->height = MT9M111_MAX_HEIGHT;
+        else if (mf->height < 2)
+                mf->height = 2;
         else if (bayer)
-                pix->height = ALIGN(pix->height, 2);
+                mf->height = ALIGN(mf->height, 2);
 
-        if (pix->width > MT9M111_MAX_WIDTH)
-                pix->width = MT9M111_MAX_WIDTH;
-        else if (pix->width < 2)
-                pix->width = 2;
+        if (mf->width > MT9M111_MAX_WIDTH)
+                mf->width = MT9M111_MAX_WIDTH;
+        else if (mf->width < 2)
+                mf->width = 2;
         else if (bayer)
-                pix->width = ALIGN(pix->width, 2);
+                mf->width = ALIGN(mf->width, 2);
+
+        mf->colorspace = fmt->colorspace;
 
         return 0;
 }
@@ -863,7 +894,7 @@ static int mt9m111_restore_state(struct i2c_client *client)
         struct mt9m111 *mt9m111 = to_mt9m111(client);
 
         mt9m111_set_context(client, mt9m111->context);
-        mt9m111_set_pixfmt(client, mt9m111->pixfmt);
+        mt9m111_set_pixfmt(client, mt9m111->fmt->code);
         mt9m111_setup_rect(client, &mt9m111->rect);
         mt9m111_set_flip(client, mt9m111->hflip, MT9M111_RMB_MIRROR_COLS);
         mt9m111_set_flip(client, mt9m111->vflip, MT9M111_RMB_MIRROR_ROWS);
@@ -952,9 +983,6 @@ static int mt9m111_video_probe(struct soc_camera_device *icd,
                 goto ei2c;
         }
 
-        icd->formats = mt9m111_colour_formats;
-        icd->num_formats = ARRAY_SIZE(mt9m111_colour_formats);
-
         dev_info(&client->dev, "Detected a MT9M11x chip ID %x\n", data);
 
 ei2c:
@@ -971,13 +999,24 @@ static struct v4l2_subdev_core_ops mt9m111_subdev_core_ops = {
 #endif
 };
 
+static int mt9m111_enum_fmt(struct v4l2_subdev *sd, int index,
+                            enum v4l2_mbus_pixelcode *code)
+{
+        if ((unsigned int)index >= ARRAY_SIZE(mt9m111_colour_fmts))
+                return -EINVAL;
+
+        *code = mt9m111_colour_fmts[index].code;
+        return 0;
+}
+
 static struct v4l2_subdev_video_ops mt9m111_subdev_video_ops = {
-        .s_fmt          = mt9m111_s_fmt,
-        .g_fmt          = mt9m111_g_fmt,
-        .try_fmt        = mt9m111_try_fmt,
+        .s_mbus_fmt     = mt9m111_s_fmt,
+        .g_mbus_fmt     = mt9m111_g_fmt,
+        .try_mbus_fmt   = mt9m111_try_fmt,
         .s_crop         = mt9m111_s_crop,
         .g_crop         = mt9m111_g_crop,
         .cropcap        = mt9m111_cropcap,
+        .enum_mbus_fmt  = mt9m111_enum_fmt,
 };
 
 static struct v4l2_subdev_ops mt9m111_subdev_ops = {
@@ -1019,12 +1058,12 @@ static int mt9m111_probe(struct i2c_client *client,
 
         /* Second stage probe - when a capture adapter is there */
         icd->ops                = &mt9m111_ops;
-        icd->y_skip_top         = 0;
 
         mt9m111->rect.left      = MT9M111_MIN_DARK_COLS;
         mt9m111->rect.top       = MT9M111_MIN_DARK_ROWS;
         mt9m111->rect.width     = MT9M111_MAX_WIDTH;
         mt9m111->rect.height    = MT9M111_MAX_HEIGHT;
+        mt9m111->fmt            = &mt9m111_colour_fmts[0];
 
         ret = mt9m111_video_probe(icd, client);
         if (ret) {
diff --git a/drivers/media/video/mt9t031.c b/drivers/media/video/mt9t031.c
index 6966f644977e..a9061bff79b2 100644
--- a/drivers/media/video/mt9t031.c
+++ b/drivers/media/video/mt9t031.c
@@ -17,9 +17,11 @@
 #include <media/v4l2-chip-ident.h>
 #include <media/soc_camera.h>
 
-/* mt9t031 i2c address 0x5d
+/*
+ * mt9t031 i2c address 0x5d
  * The platform has to define i2c_board_info and link to it from
- * struct soc_camera_link */
+ * struct soc_camera_link
+ */
 
 /* mt9t031 selected register addresses */
 #define MT9T031_CHIP_VERSION            0x00
@@ -58,15 +60,6 @@
         SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_HIGH |      \
         SOCAM_MASTER | SOCAM_DATAWIDTH_10)
 
-static const struct soc_camera_data_format mt9t031_colour_formats[] = {
-        {
-                .name           = "Bayer (sRGB) 10 bit",
-                .depth          = 10,
-                .fourcc         = V4L2_PIX_FMT_SGRBG10,
-                .colorspace     = V4L2_COLORSPACE_SRGB,
-        }
-};
-
 struct mt9t031 {
         struct v4l2_subdev subdev;
         struct v4l2_rect rect;  /* Sensor window */
@@ -74,6 +67,7 @@ struct mt9t031 {
         u16 xskip;
         u16 yskip;
         unsigned int gain;
+        unsigned short y_skip_top;      /* Lines to skip at the top */
         unsigned int exposure;
         unsigned char autoexposure;
 };
@@ -207,6 +201,71 @@ static unsigned long mt9t031_query_bus_param(struct soc_camera_device *icd)
         return soc_camera_apply_sensor_flags(icl, MT9T031_BUS_PARAM);
 }
 
+enum {
+        MT9T031_CTRL_VFLIP,
+        MT9T031_CTRL_HFLIP,
+        MT9T031_CTRL_GAIN,
+        MT9T031_CTRL_EXPOSURE,
+        MT9T031_CTRL_EXPOSURE_AUTO,
+};
+
+static const struct v4l2_queryctrl mt9t031_controls[] = {
+        [MT9T031_CTRL_VFLIP] = {
+                .id             = V4L2_CID_VFLIP,
+                .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                .name           = "Flip Vertically",
+                .minimum        = 0,
+                .maximum        = 1,
+                .step           = 1,
+                .default_value  = 0,
+        },
+        [MT9T031_CTRL_HFLIP] = {
+                .id             = V4L2_CID_HFLIP,
+                .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                .name           = "Flip Horizontally",
+                .minimum        = 0,
+                .maximum        = 1,
+                .step           = 1,
+                .default_value  = 0,
+        },
+        [MT9T031_CTRL_GAIN] = {
+                .id             = V4L2_CID_GAIN,
+                .type           = V4L2_CTRL_TYPE_INTEGER,
+                .name           = "Gain",
+                .minimum        = 0,
+                .maximum        = 127,
+                .step           = 1,
+                .default_value  = 64,
+                .flags          = V4L2_CTRL_FLAG_SLIDER,
+        },
+        [MT9T031_CTRL_EXPOSURE] = {
+                .id             = V4L2_CID_EXPOSURE,
+                .type           = V4L2_CTRL_TYPE_INTEGER,
+                .name           = "Exposure",
+                .minimum        = 1,
+                .maximum        = 255,
+                .step           = 1,
+                .default_value  = 255,
+                .flags          = V4L2_CTRL_FLAG_SLIDER,
+        },
+        [MT9T031_CTRL_EXPOSURE_AUTO] = {
+                .id             = V4L2_CID_EXPOSURE_AUTO,
+                .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                .name           = "Automatic Exposure",
+                .minimum        = 0,
+                .maximum        = 1,
+                .step           = 1,
+                .default_value  = 1,
+        }
+};
+
+static struct soc_camera_ops mt9t031_ops = {
+        .set_bus_param          = mt9t031_set_bus_param,
+        .query_bus_param        = mt9t031_query_bus_param,
+        .controls               = mt9t031_controls,
+        .num_controls           = ARRAY_SIZE(mt9t031_controls),
+};
+
 /* target must be _even_ */
 static u16 mt9t031_skip(s32 *source, s32 target, s32 max)
 {
@@ -226,10 +285,9 @@ static u16 mt9t031_skip(s32 *source, s32 target, s32 max)
 }
 
 /* rect is the sensor rectangle, the caller guarantees parameter validity */
-static int mt9t031_set_params(struct soc_camera_device *icd,
+static int mt9t031_set_params(struct i2c_client *client,
                               struct v4l2_rect *rect, u16 xskip, u16 yskip)
 {
-        struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
         struct mt9t031 *mt9t031 = to_mt9t031(client);
         int ret;
         u16 xbin, ybin;
@@ -291,8 +349,10 @@ static int mt9t031_set_params(struct soc_camera_device *icd,
         dev_dbg(&client->dev, "new physical left %u, top %u\n",
                 rect->left, rect->top);
 
-        /* The caller provides a supported format, as guaranteed by
-         * icd->try_fmt_cap(), soc_camera_s_crop() and soc_camera_cropcap() */
+        /*
+         * The caller provides a supported format, as guaranteed by
+         * icd->try_fmt_cap(), soc_camera_s_crop() and soc_camera_cropcap()
+         */
         if (ret >= 0)
                 ret = reg_write(client, MT9T031_COLUMN_START, rect->left);
         if (ret >= 0)
@@ -301,15 +361,14 @@ static int mt9t031_set_params(struct soc_camera_device *icd,
                 ret = reg_write(client, MT9T031_WINDOW_WIDTH, rect->width - 1);
         if (ret >= 0)
                 ret = reg_write(client, MT9T031_WINDOW_HEIGHT,
-                                rect->height + icd->y_skip_top - 1);
+                                rect->height + mt9t031->y_skip_top - 1);
         if (ret >= 0 && mt9t031->autoexposure) {
-                unsigned int total_h = rect->height + icd->y_skip_top + vblank;
+                unsigned int total_h = rect->height + mt9t031->y_skip_top + vblank;
                 ret = set_shutter(client, total_h);
                 if (ret >= 0) {
                         const u32 shutter_max = MT9T031_MAX_HEIGHT + vblank;
                         const struct v4l2_queryctrl *qctrl =
-                                soc_camera_find_qctrl(icd->ops,
-                                                      V4L2_CID_EXPOSURE);
+                                &mt9t031_controls[MT9T031_CTRL_EXPOSURE];
                         mt9t031->exposure = (shutter_max / 2 + (total_h - 1) *
                                  (qctrl->maximum - qctrl->minimum)) /
                                 shutter_max + qctrl->minimum;
@@ -334,7 +393,6 @@ static int mt9t031_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
         struct v4l2_rect rect = a->c;
         struct i2c_client *client = sd->priv;
         struct mt9t031 *mt9t031 = to_mt9t031(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
 
         rect.width = ALIGN(rect.width, 2);
         rect.height = ALIGN(rect.height, 2);
@@ -345,7 +403,7 @@ static int mt9t031_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
         soc_camera_limit_side(&rect.top, &rect.height,
                      MT9T031_ROW_SKIP, MT9T031_MIN_HEIGHT, MT9T031_MAX_HEIGHT);
 
-        return mt9t031_set_params(icd, &rect, mt9t031->xskip, mt9t031->yskip);
+        return mt9t031_set_params(client, &rect, mt9t031->xskip, mt9t031->yskip);
 }
 
 static int mt9t031_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
@@ -373,27 +431,26 @@ static int mt9t031_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
         return 0;
 }
 
-static int mt9t031_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int mt9t031_g_fmt(struct v4l2_subdev *sd,
+                         struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
         struct mt9t031 *mt9t031 = to_mt9t031(client);
-        struct v4l2_pix_format *pix = &f->fmt.pix;
 
-        pix->width              = mt9t031->rect.width / mt9t031->xskip;
-        pix->height             = mt9t031->rect.height / mt9t031->yskip;
-        pix->pixelformat        = V4L2_PIX_FMT_SGRBG10;
-        pix->field              = V4L2_FIELD_NONE;
-        pix->colorspace         = V4L2_COLORSPACE_SRGB;
+        mf->width       = mt9t031->rect.width / mt9t031->xskip;
+        mf->height      = mt9t031->rect.height / mt9t031->yskip;
+        mf->code        = V4L2_MBUS_FMT_SBGGR10_1X10;
+        mf->colorspace  = V4L2_COLORSPACE_SRGB;
+        mf->field       = V4L2_FIELD_NONE;
 
         return 0;
 }
 
-static int mt9t031_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int mt9t031_s_fmt(struct v4l2_subdev *sd,
+                         struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
         struct mt9t031 *mt9t031 = to_mt9t031(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
-        struct v4l2_pix_format *pix = &f->fmt.pix;
         u16 xskip, yskip;
         struct v4l2_rect rect = mt9t031->rect;
 
@@ -401,24 +458,29 @@ static int mt9t031_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
          * try_fmt has put width and height within limits.
          * S_FMT: use binning and skipping for scaling
          */
-        xskip = mt9t031_skip(&rect.width, pix->width, MT9T031_MAX_WIDTH);
-        yskip = mt9t031_skip(&rect.height, pix->height, MT9T031_MAX_HEIGHT);
+        xskip = mt9t031_skip(&rect.width, mf->width, MT9T031_MAX_WIDTH);
+        yskip = mt9t031_skip(&rect.height, mf->height, MT9T031_MAX_HEIGHT);
+
+        mf->code        = V4L2_MBUS_FMT_SBGGR10_1X10;
+        mf->colorspace  = V4L2_COLORSPACE_SRGB;
 
         /* mt9t031_set_params() doesn't change width and height */
-        return mt9t031_set_params(icd, &rect, xskip, yskip);
+        return mt9t031_set_params(client, &rect, xskip, yskip);
 }
 
 /*
  * If a user window larger than sensor window is requested, we'll increase the
  * sensor window.
  */
-static int mt9t031_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int mt9t031_try_fmt(struct v4l2_subdev *sd,
+                           struct v4l2_mbus_framefmt *mf)
 {
-        struct v4l2_pix_format *pix = &f->fmt.pix;
-
         v4l_bound_align_image(
-                &pix->width, MT9T031_MIN_WIDTH, MT9T031_MAX_WIDTH, 1,
-                &pix->height, MT9T031_MIN_HEIGHT, MT9T031_MAX_HEIGHT, 1, 0);
+                &mf->width, MT9T031_MIN_WIDTH, MT9T031_MAX_WIDTH, 1,
+                &mf->height, MT9T031_MIN_HEIGHT, MT9T031_MAX_HEIGHT, 1, 0);
+
+        mf->code        = V4L2_MBUS_FMT_SBGGR10_1X10;
+        mf->colorspace  = V4L2_COLORSPACE_SRGB;
 
         return 0;
 }
@@ -479,59 +541,6 @@ static int mt9t031_s_register(struct v4l2_subdev *sd,
 }
 #endif
 
-static const struct v4l2_queryctrl mt9t031_controls[] = {
-        {
-                .id             = V4L2_CID_VFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Vertically",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        }, {
-                .id             = V4L2_CID_HFLIP,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Flip Horizontally",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 0,
-        }, {
-                .id             = V4L2_CID_GAIN,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Gain",
-                .minimum        = 0,
-                .maximum        = 127,
-                .step           = 1,
-                .default_value  = 64,
-                .flags          = V4L2_CTRL_FLAG_SLIDER,
-        }, {
-                .id             = V4L2_CID_EXPOSURE,
-                .type           = V4L2_CTRL_TYPE_INTEGER,
-                .name           = "Exposure",
-                .minimum        = 1,
-                .maximum        = 255,
-                .step           = 1,
-                .default_value  = 255,
-                .flags          = V4L2_CTRL_FLAG_SLIDER,
-        }, {
-                .id             = V4L2_CID_EXPOSURE_AUTO,
-                .type           = V4L2_CTRL_TYPE_BOOLEAN,
-                .name           = "Automatic Exposure",
-                .minimum        = 0,
-                .maximum        = 1,
-                .step           = 1,
-                .default_value  = 1,
-        }
-};
-
-static struct soc_camera_ops mt9t031_ops = {
-        .set_bus_param          = mt9t031_set_bus_param,
-        .query_bus_param        = mt9t031_query_bus_param,
-        .controls               = mt9t031_controls,
-        .num_controls           = ARRAY_SIZE(mt9t031_controls),
-};
-
 static int mt9t031_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
         struct i2c_client *client = sd->priv;
@@ -568,15 +577,9 @@ static int mt9t031_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
         struct i2c_client *client = sd->priv;
         struct mt9t031 *mt9t031 = to_mt9t031(client);
-        struct soc_camera_device *icd = client->dev.platform_data;
         const struct v4l2_queryctrl *qctrl;
         int data;
 
-        qctrl = soc_camera_find_qctrl(&mt9t031_ops, ctrl->id);
-
-        if (!qctrl)
-                return -EINVAL;
-
         switch (ctrl->id) {
         case V4L2_CID_VFLIP:
                 if (ctrl->value)
@@ -595,6 +598,7 @@ static int mt9t031_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                         return -EIO;
                 break;
         case V4L2_CID_GAIN:
+                qctrl = &mt9t031_controls[MT9T031_CTRL_GAIN];
                 if (ctrl->value > qctrl->maximum || ctrl->value < qctrl->minimum)
                         return -EINVAL;
                 /* See Datasheet Table 7, Gain settings. */
@@ -634,6 +638,7 @@ static int mt9t031_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                 mt9t031->gain = ctrl->value;
                 break;
         case V4L2_CID_EXPOSURE:
+                qctrl = &mt9t031_controls[MT9T031_CTRL_EXPOSURE];
                 /* mt9t031 has maximum == default */
                 if (ctrl->value > qctrl->maximum || ctrl->value < qctrl->minimum)
                         return -EINVAL;
@@ -657,11 +662,11 @@ static int mt9t031_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                         const u16 vblank = MT9T031_VERTICAL_BLANK;
                         const u32 shutter_max = MT9T031_MAX_HEIGHT + vblank;
                         unsigned int total_h = mt9t031->rect.height +
-                                icd->y_skip_top + vblank;
+                                mt9t031->y_skip_top + vblank;
 
                         if (set_shutter(client, total_h) < 0)
                                 return -EIO;
-                        qctrl = soc_camera_find_qctrl(icd->ops, V4L2_CID_EXPOSURE);
+                        qctrl = &mt9t031_controls[MT9T031_CTRL_EXPOSURE];
                         mt9t031->exposure = (shutter_max / 2 + (total_h - 1) *
                                  (qctrl->maximum - qctrl->minimum)) /
                                 shutter_max + qctrl->minimum;
@@ -669,15 +674,18 @@ static int mt9t031_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                 } else
                         mt9t031->autoexposure = 0;
                 break;
+        default:
+                return -EINVAL;
         }
         return 0;
 }
 
-/* Interface active, can use i2c. If it fails, it can indeed mean, that
- * this wasn't our capture interface, so, we wait for the right one */
+/*
+ * Interface active, can use i2c. If it fails, it can indeed mean, that
+ * this wasn't our capture interface, so, we wait for the right one
+ */
 static int mt9t031_video_probe(struct i2c_client *client)
 {
-        struct soc_camera_device *icd = client->dev.platform_data;
         struct mt9t031 *mt9t031 = to_mt9t031(client);
         s32 data;
         int ret;
@@ -692,8 +700,6 @@ static int mt9t031_video_probe(struct i2c_client *client)
         switch (data) {
         case 0x1621:
                 mt9t031->model = V4L2_IDENT_MT9T031;
-                icd->formats = mt9t031_colour_formats;
-                icd->num_formats = ARRAY_SIZE(mt9t031_colour_formats);
                 break;
         default:
                 dev_err(&client->dev,
@@ -714,6 +720,16 @@ static int mt9t031_video_probe(struct i2c_client *client)
         return ret;
 }
 
+static int mt9t031_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)
+{
+        struct i2c_client *client = sd->priv;
+        struct mt9t031 *mt9t031 = to_mt9t031(client);
+
+        *lines = mt9t031->y_skip_top;
+
+        return 0;
+}
+
 static struct v4l2_subdev_core_ops mt9t031_subdev_core_ops = {
         .g_ctrl         = mt9t031_g_ctrl,
         .s_ctrl         = mt9t031_s_ctrl,
@@ -724,19 +740,35 @@ static struct v4l2_subdev_core_ops mt9t031_subdev_core_ops = {
 #endif
 };
 
+static int mt9t031_enum_fmt(struct v4l2_subdev *sd, int index,
+                            enum v4l2_mbus_pixelcode *code)
+{
+        if (index)
+                return -EINVAL;
+
+        *code = V4L2_MBUS_FMT_SBGGR10_1X10;
+        return 0;
+}
+
 static struct v4l2_subdev_video_ops mt9t031_subdev_video_ops = {
         .s_stream       = mt9t031_s_stream,
-        .s_fmt          = mt9t031_s_fmt,
-        .g_fmt          = mt9t031_g_fmt,
-        .try_fmt        = mt9t031_try_fmt,
+        .s_mbus_fmt     = mt9t031_s_fmt,
+        .g_mbus_fmt     = mt9t031_g_fmt,
+        .try_mbus_fmt   = mt9t031_try_fmt,
         .s_crop         = mt9t031_s_crop,
         .g_crop         = mt9t031_g_crop,
         .cropcap        = mt9t031_cropcap,
+        .enum_mbus_fmt  = mt9t031_enum_fmt,
+};
+
+static struct v4l2_subdev_sensor_ops mt9t031_subdev_sensor_ops = {
+        .g_skip_top_lines       = mt9t031_g_skip_top_lines,
 };
 
 static struct v4l2_subdev_ops mt9t031_subdev_ops = {
         .core   = &mt9t031_subdev_core_ops,
         .video  = &mt9t031_subdev_video_ops,
+        .sensor = &mt9t031_subdev_sensor_ops,
 };
 
 static int mt9t031_probe(struct i2c_client *client,
@@ -745,18 +777,16 @@ static int mt9t031_probe(struct i2c_client *client,
         struct mt9t031 *mt9t031;
         struct soc_camera_device *icd = client->dev.platform_data;
         struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
-        struct soc_camera_link *icl;
         int ret;
 
-        if (!icd) {
-                dev_err(&client->dev, "MT9T031: missing soc-camera data!\n");
-                return -EINVAL;
-        }
+        if (icd) {
+                struct soc_camera_link *icl = to_soc_camera_link(icd);
+                if (!icl) {
+                        dev_err(&client->dev, "MT9T031 driver needs platform data\n");
+                        return -EINVAL;
+                }
 
-        icl = to_soc_camera_link(icd);
-        if (!icl) {
-                dev_err(&client->dev, "MT9T031 driver needs platform data\n");
-                return -EINVAL;
+                icd->ops = &mt9t031_ops;
         }
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) {
@@ -771,17 +801,16 @@ static int mt9t031_probe(struct i2c_client *client,
 
         v4l2_i2c_subdev_init(&mt9t031->subdev, client, &mt9t031_subdev_ops);
 
-        /* Second stage probe - when a capture adapter is there */
-        icd->ops                = &mt9t031_ops;
-        icd->y_skip_top         = 0;
-
+        mt9t031->y_skip_top     = 0;
         mt9t031->rect.left      = MT9T031_COLUMN_SKIP;
         mt9t031->rect.top       = MT9T031_ROW_SKIP;
         mt9t031->rect.width     = MT9T031_MAX_WIDTH;
         mt9t031->rect.height    = MT9T031_MAX_HEIGHT;
 
-        /* Simulated autoexposure. If enabled, we calculate shutter width
-         * ourselves in the driver based on vertical blanking and frame width */
+        /*
+         * Simulated autoexposure. If enabled, we calculate shutter width
+         * ourselves in the driver based on vertical blanking and frame width
+         */
         mt9t031->autoexposure = 1;
 
         mt9t031->xskip = 1;
@@ -794,7 +823,8 @@ static int mt9t031_probe(struct i2c_client *client,
         mt9t031_disable(client);
 
         if (ret) {
-                icd->ops = NULL;
+                if (icd)
+                        icd->ops = NULL;
                 i2c_set_clientdata(client, NULL);
                 kfree(mt9t031);
         }
@@ -807,7 +837,8 @@ static int mt9t031_remove(struct i2c_client *client)
         struct mt9t031 *mt9t031 = to_mt9t031(client);
         struct soc_camera_device *icd = client->dev.platform_data;
 
-        icd->ops = NULL;
+        if (icd)
+                icd->ops = NULL;
         i2c_set_clientdata(client, NULL);
         client->driver = NULL;
         kfree(mt9t031);
diff --git a/drivers/media/video/mt9t112.c b/drivers/media/video/mt9t112.c
new file mode 100644
index 000000000000..fc4dd6045720
--- /dev/null
+++ b/drivers/media/video/mt9t112.c
@@ -0,0 +1,1177 @@
+/*
+ * mt9t112 Camera Driver
+ *
+ * Copyright (C) 2009 Renesas Solutions Corp.
+ * Kuninori Morimoto <morimoto.kuninori@renesas.com>
+ *
+ * Based on ov772x driver, mt9m111 driver,
+ *
+ * Copyright (C) 2008 Kuninori Morimoto <morimoto.kuninori@renesas.com>
+ * Copyright (C) 2008, Robert Jarzmik <robert.jarzmik@free.fr>
+ * Copyright 2006-7 Jonathan Corbet <corbet@lwn.net>
+ * Copyright (C) 2008 Magnus Damm
+ * Copyright (C) 2008, Guennadi Liakhovetski <kernel@pengutronix.de>
+ *
+ * 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/delay.h>
+#include <linux/i2c.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/videodev2.h>
+
+#include <media/mt9t112.h>
+#include <media/soc_camera.h>
+#include <media/soc_mediabus.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/v4l2-common.h>
+
+/* you can check PLL/clock info */
+/* #define EXT_CLOCK 24000000 */
+
+/************************************************************************
+
+
+                        macro
+
+
+************************************************************************/
+/*
+ * frame size
+ */
+#define MAX_WIDTH   2048
+#define MAX_HEIGHT  1536
+
+#define VGA_WIDTH   640
+#define VGA_HEIGHT  480
+
+/*
+ * macro of read/write
+ */
+#define ECHECKER(ret, x)                \
+        do {                            \
+                (ret) = (x);            \
+                if ((ret) < 0)          \
+                        return (ret);   \
+        } while (0)
+
+#define mt9t112_reg_write(ret, client, a, b) \
+        ECHECKER(ret, __mt9t112_reg_write(client, a, b))
+#define mt9t112_mcu_write(ret, client, a, b) \
+        ECHECKER(ret, __mt9t112_mcu_write(client, a, b))
+
+#define mt9t112_reg_mask_set(ret, client, a, b, c) \
+        ECHECKER(ret, __mt9t112_reg_mask_set(client, a, b, c))
+#define mt9t112_mcu_mask_set(ret, client, a, b, c) \
+        ECHECKER(ret, __mt9t112_mcu_mask_set(client, a, b, c))
+
+#define mt9t112_reg_read(ret, client, a) \
+        ECHECKER(ret, __mt9t112_reg_read(client, a))
+
+/*
+ * Logical address
+ */
+#define _VAR(id, offset, base)  (base | (id & 0x1f) << 10 | (offset & 0x3ff))
+#define VAR(id, offset)  _VAR(id, offset, 0x0000)
+#define VAR8(id, offset) _VAR(id, offset, 0x8000)
+
+/************************************************************************
+
+
+                        struct
+
+
+************************************************************************/
+struct mt9t112_frame_size {
+        u16 width;
+        u16 height;
+};
+
+struct mt9t112_format {
+        enum v4l2_mbus_pixelcode code;
+        enum v4l2_colorspace colorspace;
+        u16 fmt;
+        u16 order;
+};
+
+struct mt9t112_priv {
+        struct v4l2_subdev               subdev;
+        struct mt9t112_camera_info      *info;
+        struct i2c_client               *client;
+        struct soc_camera_device         icd;
+        struct mt9t112_frame_size        frame;
+        const struct mt9t112_format     *format;
+        int                              model;
+        u32                              flags;
+/* for flags */
+#define INIT_DONE  (1<<0)
+};
+
+/************************************************************************
+
+
+                        supported format
+
+
+************************************************************************/
+
+static const struct mt9t112_format mt9t112_cfmts[] = {
+        {
+                .code           = V4L2_MBUS_FMT_YUYV8_2X8_BE,
+                .colorspace     = V4L2_COLORSPACE_JPEG,
+                .fmt            = 1,
+                .order          = 0,
+        }, {
+                .code           = V4L2_MBUS_FMT_YVYU8_2X8_BE,
+                .colorspace     = V4L2_COLORSPACE_JPEG,
+                .fmt            = 1,
+                .order          = 1,
+        }, {
+                .code           = V4L2_MBUS_FMT_YUYV8_2X8_LE,
+                .colorspace     = V4L2_COLORSPACE_JPEG,
+                .fmt            = 1,
+                .order          = 2,
+        }, {
+                .code           = V4L2_MBUS_FMT_YVYU8_2X8_LE,
+                .colorspace     = V4L2_COLORSPACE_JPEG,
+                .fmt            = 1,
+                .order          = 3,
+        }, {
+                .code           = V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
+                .colorspace     = V4L2_COLORSPACE_SRGB,
+                .fmt            = 8,
+                .order          = 2,
+        }, {
+                .code           = V4L2_MBUS_FMT_RGB565_2X8_LE,
+                .colorspace     = V4L2_COLORSPACE_SRGB,
+                .fmt            = 4,
+                .order          = 2,
+        },
+};
+
+/************************************************************************
+
+
+                        general function
+
+
+************************************************************************/
+static struct mt9t112_priv *to_mt9t112(const struct i2c_client *client)
+{
+        return container_of(i2c_get_clientdata(client),
+                            struct mt9t112_priv,
+                            subdev);
+}
+
+static int __mt9t112_reg_read(const struct i2c_client *client, u16 command)
+{
+        struct i2c_msg msg[2];
+        u8 buf[2];
+        int ret;
+
+        command = swab16(command);
+
+        msg[0].addr  = client->addr;
+        msg[0].flags = 0;
+        msg[0].len   = 2;
+        msg[0].buf   = (u8 *)&command;
+
+        msg[1].addr  = client->addr;
+        msg[1].flags = I2C_M_RD;
+        msg[1].len   = 2;
+        msg[1].buf   = buf;
+
+        /*
+         * if return value of this function is < 0,
+         * it mean error.
+         * else, under 16bit is valid data.
+         */
+        ret = i2c_transfer(client->adapter, msg, 2);
+        if (ret < 0)
+                return ret;
+
+        memcpy(&ret, buf, 2);
+        return swab16(ret);
+}
+
+static int __mt9t112_reg_write(const struct i2c_client *client,
+                               u16 command, u16 data)
+{
+        struct i2c_msg msg;
+        u8 buf[4];
+        int ret;
+
+        command = swab16(command);
+        data = swab16(data);
+
+        memcpy(buf + 0, &command, 2);
+        memcpy(buf + 2, &data,    2);
+
+        msg.addr  = client->addr;
+        msg.flags = 0;
+        msg.len   = 4;
+        msg.buf   = buf;
+
+        /*
+         * i2c_transfer return message length,
+         * but this function should return 0 if correct case
+         */
+        ret = i2c_transfer(client->adapter, &msg, 1);
+        if (ret >= 0)
+                ret = 0;
+
+        return ret;
+}
+
+static int __mt9t112_reg_mask_set(const struct i2c_client *client,
+                                  u16  command,
+                                  u16  mask,
+                                  u16  set)
+{
+        int val = __mt9t112_reg_read(client, command);
+        if (val < 0)
+                return val;
+
+        val &= ~mask;
+        val |= set & mask;
+
+        return __mt9t112_reg_write(client, command, val);
+}
+
+/* mcu access */
+static int __mt9t112_mcu_read(const struct i2c_client *client, u16 command)
+{
+        int ret;
+
+        ret = __mt9t112_reg_write(client, 0x098E, command);
+        if (ret < 0)
+                return ret;
+
+        return __mt9t112_reg_read(client, 0x0990);
+}
+
+static int __mt9t112_mcu_write(const struct i2c_client *client,
+                               u16 command, u16 data)
+{
+        int ret;
+
+        ret = __mt9t112_reg_write(client, 0x098E, command);
+        if (ret < 0)
+                return ret;
+
+        return __mt9t112_reg_write(client, 0x0990, data);
+}
+
+static int __mt9t112_mcu_mask_set(const struct i2c_client *client,
+                                  u16  command,
+                                  u16  mask,
+                                  u16  set)
+{
+        int val = __mt9t112_mcu_read(client, command);
+        if (val < 0)
+                return val;
+
+        val &= ~mask;
+        val |= set & mask;
+
+        return __mt9t112_mcu_write(client, command, val);
+}
+
+static int mt9t112_reset(const struct i2c_client *client)
+{
+        int ret;
+
+        mt9t112_reg_mask_set(ret, client, 0x001a, 0x0001, 0x0001);
+        msleep(1);
+        mt9t112_reg_mask_set(ret, client, 0x001a, 0x0001, 0x0000);
+
+        return ret;
+}
+
+#ifndef EXT_CLOCK
+#define CLOCK_INFO(a, b)
+#else
+#define CLOCK_INFO(a, b) mt9t112_clock_info(a, b)
+static int mt9t112_clock_info(const struct i2c_client *client, u32 ext)
+{
+        int m, n, p1, p2, p3, p4, p5, p6, p7;
+        u32 vco, clk;
+        char *enable;
+
+        ext /= 1000; /* kbyte order */
+
+        mt9t112_reg_read(n, client, 0x0012);
+        p1 = n & 0x000f;
+        n = n >> 4;
+        p2 = n & 0x000f;
+        n = n >> 4;
+        p3 = n & 0x000f;
+
+        mt9t112_reg_read(n, client, 0x002a);
+        p4 = n & 0x000f;
+        n = n >> 4;
+        p5 = n & 0x000f;
+        n = n >> 4;
+        p6 = n & 0x000f;
+
+        mt9t112_reg_read(n, client, 0x002c);
+        p7 = n & 0x000f;
+
+        mt9t112_reg_read(n, client, 0x0010);
+        m = n & 0x00ff;
+        n = (n >> 8) & 0x003f;
+
+        enable = ((6000 > ext) || (54000 < ext)) ? "X" : "";
+        dev_info(&client->dev, "EXTCLK          : %10u K %s\n", ext, enable);
+
+        vco = 2 * m * ext / (n+1);
+        enable = ((384000 > vco) || (768000 < vco)) ? "X" : "";
+        dev_info(&client->dev, "VCO             : %10u K %s\n", vco, enable);
+
+        clk = vco / (p1+1) / (p2+1);
+        enable = (96000 < clk) ? "X" : "";
+        dev_info(&client->dev, "PIXCLK          : %10u K %s\n", clk, enable);
+
+        clk = vco / (p3+1);
+        enable = (768000 < clk) ? "X" : "";
+        dev_info(&client->dev, "MIPICLK         : %10u K %s\n", clk, enable);
+
+        clk = vco / (p6+1);
+        enable = (96000 < clk) ? "X" : "";
+        dev_info(&client->dev, "MCU CLK         : %10u K %s\n", clk, enable);
+
+        clk = vco / (p5+1);
+        enable = (54000 < clk) ? "X" : "";
+        dev_info(&client->dev, "SOC CLK         : %10u K %s\n", clk, enable);
+
+        clk = vco / (p4+1);
+        enable = (70000 < clk) ? "X" : "";
+        dev_info(&client->dev, "Sensor CLK      : %10u K %s\n", clk, enable);
+
+        clk = vco / (p7+1);
+        dev_info(&client->dev, "External sensor : %10u K\n", clk);
+
+        clk = ext / (n+1);
+        enable = ((2000 > clk) || (24000 < clk)) ? "X" : "";
+        dev_info(&client->dev, "PFD             : %10u K %s\n", clk, enable);
+
+        return 0;
+}
+#endif
+
+static void mt9t112_frame_check(u32 *width, u32 *height)
+{
+        if (*width > MAX_WIDTH)
+                *width = MAX_WIDTH;
+
+        if (*height > MAX_HEIGHT)
+                *height = MAX_HEIGHT;
+}
+
+static int mt9t112_set_a_frame_size(const struct i2c_client *client,
+                                   u16 width,
+                                   u16 height)
+{
+        int ret;
+        u16 wstart = (MAX_WIDTH - width) / 2;
+        u16 hstart = (MAX_HEIGHT - height) / 2;
+
+        /* (Context A) Image Width/Height */
+        mt9t112_mcu_write(ret, client, VAR(26, 0), width);
+        mt9t112_mcu_write(ret, client, VAR(26, 2), height);
+
+        /* (Context A) Output Width/Height */
+        mt9t112_mcu_write(ret, client, VAR(18, 43), 8 + width);
+        mt9t112_mcu_write(ret, client, VAR(18, 45), 8 + height);
+
+        /* (Context A) Start Row/Column */
+        mt9t112_mcu_write(ret, client, VAR(18, 2), 4 + hstart);
+        mt9t112_mcu_write(ret, client, VAR(18, 4), 4 + wstart);
+
+        /* (Context A) End Row/Column */
+        mt9t112_mcu_write(ret, client, VAR(18, 6), 11 + height + hstart);
+        mt9t112_mcu_write(ret, client, VAR(18, 8), 11 + width  + wstart);
+
+        mt9t112_mcu_write(ret, client, VAR8(1, 0), 0x06);
+
+        return ret;
+}
+
+static int mt9t112_set_pll_dividers(const struct i2c_client *client,
+                                    u8 m, u8 n,
+                                    u8 p1, u8 p2, u8 p3,
+                                    u8 p4, u8 p5, u8 p6,
+                                    u8 p7)
+{
+        int ret;
+        u16 val;
+
+        /* N/M */
+        val = (n << 8) |
+              (m << 0);
+        mt9t112_reg_mask_set(ret, client, 0x0010, 0x3fff, val);
+
+        /* P1/P2/P3 */
+        val = ((p3 & 0x0F) << 8) |
+              ((p2 & 0x0F) << 4) |
+              ((p1 & 0x0F) << 0);
+        mt9t112_reg_mask_set(ret, client, 0x0012, 0x0fff, val);
+
+        /* P4/P5/P6 */
+        val = (0x7         << 12) |
+              ((p6 & 0x0F) <<  8) |
+              ((p5 & 0x0F) <<  4) |
+              ((p4 & 0x0F) <<  0);
+        mt9t112_reg_mask_set(ret, client, 0x002A, 0x7fff, val);
+
+        /* P7 */
+        val = (0x1         << 12) |
+              ((p7 & 0x0F) <<  0);
+        mt9t112_reg_mask_set(ret, client, 0x002C, 0x100f, val);
+
+        return ret;
+}
+
+static int mt9t112_init_pll(const struct i2c_client *client)
+{
+        struct mt9t112_priv *priv = to_mt9t112(client);
+        int data, i, ret;
+
+        mt9t112_reg_mask_set(ret, client, 0x0014, 0x003, 0x0001);
+
+        /* PLL control: BYPASS PLL = 8517 */
+        mt9t112_reg_write(ret, client, 0x0014, 0x2145);
+
+        /* Replace these registers when new timing parameters are generated */
+        mt9t112_set_pll_dividers(client,
+                                 priv->info->divider.m,
+                                 priv->info->divider.n,
+                                 priv->info->divider.p1,
+                                 priv->info->divider.p2,
+                                 priv->info->divider.p3,
+                                 priv->info->divider.p4,
+                                 priv->info->divider.p5,
+                                 priv->info->divider.p6,
+                                 priv->info->divider.p7);
+
+        /*
+         * TEST_BYPASS  on
+         * PLL_ENABLE   on
+         * SEL_LOCK_DET on
+         * TEST_BYPASS  off
+         */
+        mt9t112_reg_write(ret, client, 0x0014, 0x2525);
+        mt9t112_reg_write(ret, client, 0x0014, 0x2527);
+        mt9t112_reg_write(ret, client, 0x0014, 0x3427);
+        mt9t112_reg_write(ret, client, 0x0014, 0x3027);
+
+        mdelay(10);
+
+        /*
+         * PLL_BYPASS off
+         * Reference clock count
+         * I2C Master Clock Divider
+         */
+        mt9t112_reg_write(ret, client, 0x0014, 0x3046);
+        mt9t112_reg_write(ret, client, 0x0022, 0x0190);
+        mt9t112_reg_write(ret, client, 0x3B84, 0x0212);
+
+        /* External sensor clock is PLL bypass */
+        mt9t112_reg_write(ret, client, 0x002E, 0x0500);
+
+        mt9t112_reg_mask_set(ret, client, 0x0018, 0x0002, 0x0002);
+        mt9t112_reg_mask_set(ret, client, 0x3B82, 0x0004, 0x0004);
+
+        /* MCU disabled */
+        mt9t112_reg_mask_set(ret, client, 0x0018, 0x0004, 0x0004);
+
+        /* out of standby */
+        mt9t112_reg_mask_set(ret, client, 0x0018, 0x0001, 0);
+
+        mdelay(50);
+
+        /*
+         * Standby Workaround
+         * Disable Secondary I2C Pads
+         */
+        mt9t112_reg_write(ret, client, 0x0614, 0x0001);
+        mdelay(1);
+        mt9t112_reg_write(ret, client, 0x0614, 0x0001);
+        mdelay(1);
+        mt9t112_reg_write(ret, client, 0x0614, 0x0001);
+        mdelay(1);
+        mt9t112_reg_write(ret, client, 0x0614, 0x0001);
+        mdelay(1);
+        mt9t112_reg_write(ret, client, 0x0614, 0x0001);
+        mdelay(1);
+        mt9t112_reg_write(ret, client, 0x0614, 0x0001);
+        mdelay(1);
+
+        /* poll to verify out of standby. Must Poll this bit */
+        for (i = 0; i < 100; i++) {
+                mt9t112_reg_read(data, client, 0x0018);
+                if (0x4000 & data)
+                        break;
+
+                mdelay(10);
+        }
+
+        return ret;
+}
+
+static int mt9t112_init_setting(const struct i2c_client *client)
+{
+
+        int ret;
+
+        /* Adaptive Output Clock (A) */
+        mt9t112_mcu_mask_set(ret, client, VAR(26, 160), 0x0040, 0x0000);
+
+        /* Read Mode (A) */
+        mt9t112_mcu_write(ret, client, VAR(18, 12), 0x0024);
+
+        /* Fine Correction (A) */
+        mt9t112_mcu_write(ret, client, VAR(18, 15), 0x00CC);
+
+        /* Fine IT Min (A) */
+        mt9t112_mcu_write(ret, client, VAR(18, 17), 0x01f1);
+
+        /* Fine IT Max Margin (A) */
+        mt9t112_mcu_write(ret, client, VAR(18, 19), 0x00fF);
+
+        /* Base Frame Lines (A) */
+        mt9t112_mcu_write(ret, client, VAR(18, 29), 0x032D);
+
+        /* Min Line Length (A) */
+        mt9t112_mcu_write(ret, client, VAR(18, 31), 0x073a);
+
+        /* Line Length (A) */
+        mt9t112_mcu_write(ret, client, VAR(18, 37), 0x07d0);
+
+        /* Adaptive Output Clock (B) */
+        mt9t112_mcu_mask_set(ret, client, VAR(27, 160), 0x0040, 0x0000);
+
+        /* Row Start (B) */
+        mt9t112_mcu_write(ret, client, VAR(18, 74), 0x004);
+
+        /* Column Start (B) */
+        mt9t112_mcu_write(ret, client, VAR(18, 76), 0x004);
+
+        /* Row End (B) */
+        mt9t112_mcu_write(ret, client, VAR(18, 78), 0x60B);
+
+        /* Column End (B) */
+        mt9t112_mcu_write(ret, client, VAR(18, 80), 0x80B);
+
+        /* Fine Correction (B) */
+        mt9t112_mcu_write(ret, client, VAR(18, 87), 0x008C);
+
+        /* Fine IT Min (B) */
+        mt9t112_mcu_write(ret, client, VAR(18, 89), 0x01F1);
+
+        /* Fine IT Max Margin (B) */
+        mt9t112_mcu_write(ret, client, VAR(18, 91), 0x00FF);
+
+        /* Base Frame Lines (B) */
+        mt9t112_mcu_write(ret, client, VAR(18, 101), 0x0668);
+
+        /* Min Line Length (B) */
+        mt9t112_mcu_write(ret, client, VAR(18, 103), 0x0AF0);
+
+        /* Line Length (B) */
+        mt9t112_mcu_write(ret, client, VAR(18, 109), 0x0AF0);
+
+        /*
+         * Flicker Dectection registers
+         * This section should be replaced whenever new Timing file is generated
+         * All the following registers need to be replaced
+         * Following registers are generated from Register Wizard but user can
+         * modify them. For detail see auto flicker detection tuning
+         */
+
+        /* FD_FDPERIOD_SELECT */
+        mt9t112_mcu_write(ret, client, VAR8(8, 5), 0x01);
+
+        /* PRI_B_CONFIG_FD_ALGO_RUN */
+        mt9t112_mcu_write(ret, client, VAR(27, 17), 0x0003);
+
+        /* PRI_A_CONFIG_FD_ALGO_RUN */
+        mt9t112_mcu_write(ret, client, VAR(26, 17), 0x0003);
+
+        /*
+         * AFD range detection tuning registers
+         */
+
+        /* search_f1_50 */
+        mt9t112_mcu_write(ret, client, VAR8(18, 165), 0x25);
+
+        /* search_f2_50 */
+        mt9t112_mcu_write(ret, client, VAR8(18, 166), 0x28);
+
+        /* search_f1_60 */
+        mt9t112_mcu_write(ret, client, VAR8(18, 167), 0x2C);
+
+        /* search_f2_60 */
+        mt9t112_mcu_write(ret, client, VAR8(18, 168), 0x2F);
+
+        /* period_50Hz (A) */
+        mt9t112_mcu_write(ret, client, VAR8(18, 68), 0xBA);
+
+        /* secret register by aptina */
+        /* period_50Hz (A MSB) */
+        mt9t112_mcu_write(ret, client, VAR8(18, 303), 0x00);
+
+        /* period_60Hz (A) */
+        mt9t112_mcu_write(ret, client, VAR8(18, 69), 0x9B);
+
+        /* secret register by aptina */
+        /* period_60Hz (A MSB) */
+        mt9t112_mcu_write(ret, client, VAR8(18, 301), 0x00);
+
+        /* period_50Hz (B) */
+        mt9t112_mcu_write(ret, client, VAR8(18, 140), 0x82);
+
+        /* secret register by aptina */
+        /* period_50Hz (B) MSB */
+        mt9t112_mcu_write(ret, client, VAR8(18, 304), 0x00);
+
+        /* period_60Hz (B) */
+        mt9t112_mcu_write(ret, client, VAR8(18, 141), 0x6D);
+
+        /* secret register by aptina */
+        /* period_60Hz (B) MSB */
+        mt9t112_mcu_write(ret, client, VAR8(18, 302), 0x00);
+
+        /* FD Mode */
+        mt9t112_mcu_write(ret, client, VAR8(8, 2), 0x10);
+
+        /* Stat_min */
+        mt9t112_mcu_write(ret, client, VAR8(8, 9), 0x02);
+
+        /* Stat_max */
+        mt9t112_mcu_write(ret, client, VAR8(8, 10), 0x03);
+
+        /* Min_amplitude */
+        mt9t112_mcu_write(ret, client, VAR8(8, 12), 0x0A);
+
+        /* RX FIFO Watermark (A) */
+        mt9t112_mcu_write(ret, client, VAR(18, 70), 0x0014);
+
+        /* RX FIFO Watermark (B) */
+        mt9t112_mcu_write(ret, client, VAR(18, 142), 0x0014);
+
+        /* MCLK: 16MHz
+         * PCLK: 73MHz
+         * CorePixCLK: 36.5 MHz
+         */
+        mt9t112_mcu_write(ret, client, VAR8(18, 0x0044), 133);
+        mt9t112_mcu_write(ret, client, VAR8(18, 0x0045), 110);
+        mt9t112_mcu_write(ret, client, VAR8(18, 0x008c), 130);
+        mt9t112_mcu_write(ret, client, VAR8(18, 0x008d), 108);
+
+        mt9t112_mcu_write(ret, client, VAR8(18, 0x00A5), 27);
+        mt9t112_mcu_write(ret, client, VAR8(18, 0x00a6), 30);
+        mt9t112_mcu_write(ret, client, VAR8(18, 0x00a7), 32);
+        mt9t112_mcu_write(ret, client, VAR8(18, 0x00a8), 35);
+
+        return ret;
+}
+
+static int mt9t112_auto_focus_setting(const struct i2c_client *client)
+{
+        int ret;
+
+        mt9t112_mcu_write(ret, client, VAR(12, 13),     0x000F);
+        mt9t112_mcu_write(ret, client, VAR(12, 23),     0x0F0F);
+        mt9t112_mcu_write(ret, client, VAR8(1, 0),      0x06);
+
+        mt9t112_reg_write(ret, client, 0x0614, 0x0000);
+
+        mt9t112_mcu_write(ret, client, VAR8(1, 0),      0x05);
+        mt9t112_mcu_write(ret, client, VAR8(12, 2),     0x02);
+        mt9t112_mcu_write(ret, client, VAR(12, 3),      0x0002);
+        mt9t112_mcu_write(ret, client, VAR(17, 3),      0x8001);
+        mt9t112_mcu_write(ret, client, VAR(17, 11),     0x0025);
+        mt9t112_mcu_write(ret, client, VAR(17, 13),     0x0193);
+        mt9t112_mcu_write(ret, client, VAR8(17, 33),    0x18);
+        mt9t112_mcu_write(ret, client, VAR8(1, 0),      0x05);
+
+        return ret;
+}
+
+static int mt9t112_auto_focus_trigger(const struct i2c_client *client)
+{
+        int ret;
+
+        mt9t112_mcu_write(ret, client, VAR8(12, 25), 0x01);
+
+        return ret;
+}
+
+static int mt9t112_init_camera(const struct i2c_client *client)
+{
+        int ret;
+
+        ECHECKER(ret, mt9t112_reset(client));
+
+        ECHECKER(ret, mt9t112_init_pll(client));
+
+        ECHECKER(ret, mt9t112_init_setting(client));
+
+        ECHECKER(ret, mt9t112_auto_focus_setting(client));
+
+        mt9t112_reg_mask_set(ret, client, 0x0018, 0x0004, 0);
+
+        /* Analog setting B */
+        mt9t112_reg_write(ret, client, 0x3084, 0x2409);
+        mt9t112_reg_write(ret, client, 0x3092, 0x0A49);
+        mt9t112_reg_write(ret, client, 0x3094, 0x4949);
+        mt9t112_reg_write(ret, client, 0x3096, 0x4950);
+
+        /*
+         * Disable adaptive clock
+         * PRI_A_CONFIG_JPEG_OB_TX_CONTROL_VAR
+         * PRI_B_CONFIG_JPEG_OB_TX_CONTROL_VAR
+         */
+        mt9t112_mcu_write(ret, client, VAR(26, 160), 0x0A2E);
+        mt9t112_mcu_write(ret, client, VAR(27, 160), 0x0A2E);
+
+        /* Configure STatus in Status_before_length Format and enable header */
+        /* PRI_B_CONFIG_JPEG_OB_TX_CONTROL_VAR */
+        mt9t112_mcu_write(ret, client, VAR(27, 144), 0x0CB4);
+
+        /* Enable JPEG in context B */
+        /* PRI_B_CONFIG_JPEG_OB_TX_CONTROL_VAR */
+        mt9t112_mcu_write(ret, client, VAR8(27, 142), 0x01);
+
+        /* Disable Dac_TXLO */
+        mt9t112_reg_write(ret, client, 0x316C, 0x350F);
+
+        /* Set max slew rates */
+        mt9t112_reg_write(ret, client, 0x1E, 0x777);
+
+        return ret;
+}
+
+/************************************************************************
+
+
+                        soc_camera_ops
+
+
+************************************************************************/
+static int mt9t112_set_bus_param(struct soc_camera_device *icd,
+                                 unsigned long  flags)
+{
+        return 0;
+}
+
+static unsigned long mt9t112_query_bus_param(struct soc_camera_device *icd)
+{
+        struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
+        struct mt9t112_priv *priv = to_mt9t112(client);
+        struct soc_camera_link *icl = to_soc_camera_link(icd);
+        unsigned long flags = SOCAM_MASTER | SOCAM_VSYNC_ACTIVE_HIGH |
+                SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_HIGH;
+
+        flags |= (priv->info->flags & MT9T112_FLAG_PCLK_RISING_EDGE) ?
+                SOCAM_PCLK_SAMPLE_RISING : SOCAM_PCLK_SAMPLE_FALLING;
+
+        if (priv->info->flags & MT9T112_FLAG_DATAWIDTH_8)
+                flags |= SOCAM_DATAWIDTH_8;
+        else
+                flags |= SOCAM_DATAWIDTH_10;
+
+        return soc_camera_apply_sensor_flags(icl, flags);
+}
+
+static struct soc_camera_ops mt9t112_ops = {
+        .set_bus_param          = mt9t112_set_bus_param,
+        .query_bus_param        = mt9t112_query_bus_param,
+};
+
+/************************************************************************
+
+
+                        v4l2_subdev_core_ops
+
+
+************************************************************************/
+static int mt9t112_g_chip_ident(struct v4l2_subdev *sd,
+                                struct v4l2_dbg_chip_ident *id)
+{
+        struct i2c_client *client = sd->priv;
+        struct mt9t112_priv *priv = to_mt9t112(client);
+
+        id->ident    = priv->model;
+        id->revision = 0;
+
+        return 0;
+}
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+static int mt9t112_g_register(struct v4l2_subdev *sd,
+                              struct v4l2_dbg_register *reg)
+{
+        struct i2c_client *client = sd->priv;
+        int                ret;
+
+        reg->size = 2;
+        mt9t112_reg_read(ret, client, reg->reg);
+
+        reg->val = (__u64)ret;
+
+        return 0;
+}
+
+static int mt9t112_s_register(struct v4l2_subdev *sd,
+                              struct v4l2_dbg_register *reg)
+{
+        struct i2c_client *client = sd->priv;
+        int ret;
+
+        mt9t112_reg_write(ret, client, reg->reg, reg->val);
+
+        return ret;
+}
+#endif
+
+static struct v4l2_subdev_core_ops mt9t112_subdev_core_ops = {
+        .g_chip_ident   = mt9t112_g_chip_ident,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        .g_register     = mt9t112_g_register,
+        .s_register     = mt9t112_s_register,
+#endif
+};
+
+
+/************************************************************************
+
+
+                        v4l2_subdev_video_ops
+
+
+************************************************************************/
+static int mt9t112_s_stream(struct v4l2_subdev *sd, int enable)
+{
+        struct i2c_client *client = sd->priv;
+        struct mt9t112_priv *priv = to_mt9t112(client);
+        int ret = 0;
+
+        if (!enable) {
+                /* FIXME
+                 *
+                 * If user selected large output size,
+                 * and used it long time,
+                 * mt9t112 camera will be very warm.
+                 *
+                 * But current driver can not stop mt9t112 camera.
+                 * So, set small size here to solve this problem.
+                 */
+                mt9t112_set_a_frame_size(client, VGA_WIDTH, VGA_HEIGHT);
+                return ret;
+        }
+
+        if (!(priv->flags & INIT_DONE)) {
+                u16 param = (MT9T112_FLAG_PCLK_RISING_EDGE &
+                             priv->info->flags) ? 0x0001 : 0x0000;
+
+                ECHECKER(ret, mt9t112_init_camera(client));
+
+                /* Invert PCLK (Data sampled on falling edge of pixclk) */
+                mt9t112_reg_write(ret, client, 0x3C20, param);
+
+                mdelay(5);
+
+                priv->flags |= INIT_DONE;
+        }
+
+        mt9t112_mcu_write(ret, client, VAR(26, 7), priv->format->fmt);
+        mt9t112_mcu_write(ret, client, VAR(26, 9), priv->format->order);
+        mt9t112_mcu_write(ret, client, VAR8(1, 0), 0x06);
+
+        mt9t112_set_a_frame_size(client,
+                                 priv->frame.width,
+                                 priv->frame.height);
+
+        ECHECKER(ret, mt9t112_auto_focus_trigger(client));
+
+        dev_dbg(&client->dev, "format : %d\n", priv->format->code);
+        dev_dbg(&client->dev, "size   : %d x %d\n",
+                priv->frame.width,
+                priv->frame.height);
+
+        CLOCK_INFO(client, EXT_CLOCK);
+
+        return ret;
+}
+
+static int mt9t112_set_params(struct i2c_client *client, u32 width, u32 height,
+                              enum v4l2_mbus_pixelcode code)
+{
+        struct mt9t112_priv *priv = to_mt9t112(client);
+        int i;
+
+        priv->format = NULL;
+
+        /*
+         * frame size check
+         */
+        mt9t112_frame_check(&width, &height);
+
+        /*
+         * get color format
+         */
+        for (i = 0; i < ARRAY_SIZE(mt9t112_cfmts); i++)
+                if (mt9t112_cfmts[i].code == code)
+                        break;
+
+        if (i == ARRAY_SIZE(mt9t112_cfmts))
+                return -EINVAL;
+
+        priv->frame.width  = (u16)width;
+        priv->frame.height = (u16)height;
+
+        priv->format = mt9t112_cfmts + i;
+
+        return 0;
+}
+
+static int mt9t112_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
+{
+        a->bounds.left                  = 0;
+        a->bounds.top                   = 0;
+        a->bounds.width                 = VGA_WIDTH;
+        a->bounds.height                = VGA_HEIGHT;
+        a->defrect                      = a->bounds;
+        a->type                         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        a->pixelaspect.numerator        = 1;
+        a->pixelaspect.denominator      = 1;
+
+        return 0;
+}
+
+static int mt9t112_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
+{
+        a->c.left       = 0;
+        a->c.top        = 0;
+        a->c.width      = VGA_WIDTH;
+        a->c.height     = VGA_HEIGHT;
+        a->type         = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+        return 0;
+}
+
+static int mt9t112_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
+{
+        struct i2c_client *client = sd->priv;
+        struct v4l2_rect *rect = &a->c;
+
+        return mt9t112_set_params(client, rect->width, rect->height,
+                                 V4L2_MBUS_FMT_YUYV8_2X8_BE);
+}
+
+static int mt9t112_g_fmt(struct v4l2_subdev *sd,
+                         struct v4l2_mbus_framefmt *mf)
+{
+        struct i2c_client *client = sd->priv;
+        struct mt9t112_priv *priv = to_mt9t112(client);
+
+        if (!priv->format) {
+                int ret = mt9t112_set_params(client, VGA_WIDTH, VGA_HEIGHT,
+                                             V4L2_MBUS_FMT_YUYV8_2X8_BE);
+                if (ret < 0)
+                        return ret;
+        }
+
+        mf->width       = priv->frame.width;
+        mf->height      = priv->frame.height;
+        /* TODO: set colorspace */
+        mf->code        = priv->format->code;
+        mf->field       = V4L2_FIELD_NONE;
+
+        return 0;
+}
+
+static int mt9t112_s_fmt(struct v4l2_subdev *sd,
+                         struct v4l2_mbus_framefmt *mf)
+{
+        struct i2c_client *client = sd->priv;
+
+        /* TODO: set colorspace */
+        return mt9t112_set_params(client, mf->width, mf->height, mf->code);
+}
+
+static int mt9t112_try_fmt(struct v4l2_subdev *sd,
+                           struct v4l2_mbus_framefmt *mf)
+{
+        mt9t112_frame_check(&mf->width, &mf->height);
+
+        /* TODO: set colorspace */
+        mf->field = V4L2_FIELD_NONE;
+
+        return 0;
+}
+
+static int mt9t112_enum_fmt(struct v4l2_subdev *sd, int index,
+                           enum v4l2_mbus_pixelcode *code)
+{
+        if ((unsigned int)index >= ARRAY_SIZE(mt9t112_cfmts))
+                return -EINVAL;
+
+        *code = mt9t112_cfmts[index].code;
+        return 0;
+}
+
+static struct v4l2_subdev_video_ops mt9t112_subdev_video_ops = {
+        .s_stream       = mt9t112_s_stream,
+        .g_mbus_fmt     = mt9t112_g_fmt,
+        .s_mbus_fmt     = mt9t112_s_fmt,
+        .try_mbus_fmt   = mt9t112_try_fmt,
+        .cropcap        = mt9t112_cropcap,
+        .g_crop         = mt9t112_g_crop,
+        .s_crop         = mt9t112_s_crop,
+        .enum_mbus_fmt  = mt9t112_enum_fmt,
+};
+
+/************************************************************************
+
+
+                        i2c driver
+
+
+************************************************************************/
+static struct v4l2_subdev_ops mt9t112_subdev_ops = {
+        .core   = &mt9t112_subdev_core_ops,
+        .video  = &mt9t112_subdev_video_ops,
+};
+
+static int mt9t112_camera_probe(struct soc_camera_device *icd,
+                                struct i2c_client *client)
+{
+        struct mt9t112_priv *priv = to_mt9t112(client);
+        const char          *devname;
+        int                  chipid;
+
+        /*
+         * We must have a parent by now. And it cannot be a wrong one.
+         * So this entire test is completely redundant.
+         */
+        if (!icd->dev.parent ||
+            to_soc_camera_host(icd->dev.parent)->nr != icd->iface)
+                return -ENODEV;
+
+        /*
+         * check and show chip ID
+         */
+        mt9t112_reg_read(chipid, client, 0x0000);
+
+        switch (chipid) {
+        case 0x2680:
+                devname = "mt9t111";
+                priv->model = V4L2_IDENT_MT9T111;
+                break;
+        case 0x2682:
+                devname = "mt9t112";
+                priv->model = V4L2_IDENT_MT9T112;
+                break;
+        default:
+                dev_err(&client->dev, "Product ID error %04x\n", chipid);
+                return -ENODEV;
+        }
+
+        dev_info(&client->dev, "%s chip ID %04x\n", devname, chipid);
+
+        return 0;
+}
+
+static int mt9t112_probe(struct i2c_client *client,
+                         const struct i2c_device_id *did)
+{
+        struct mt9t112_priv        *priv;
+        struct soc_camera_device   *icd = client->dev.platform_data;
+        struct soc_camera_link     *icl;
+        int                         ret;
+
+        if (!icd) {
+                dev_err(&client->dev, "mt9t112: missing soc-camera data!\n");
+                return -EINVAL;
+        }
+
+        icl = to_soc_camera_link(icd);
+        if (!icl || !icl->priv)
+                return -EINVAL;
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->info = icl->priv;
+
+        v4l2_i2c_subdev_init(&priv->subdev, client, &mt9t112_subdev_ops);
+
+        icd->ops = &mt9t112_ops;
+
+        ret = mt9t112_camera_probe(icd, client);
+        if (ret) {
+                icd->ops = NULL;
+                i2c_set_clientdata(client, NULL);
+                kfree(priv);
+        }
+
+        return ret;
+}
+
+static int mt9t112_remove(struct i2c_client *client)
+{
+        struct mt9t112_priv *priv = to_mt9t112(client);
+        struct soc_camera_device *icd = client->dev.platform_data;
+
+        icd->ops = NULL;
+        i2c_set_clientdata(client, NULL);
+        kfree(priv);
+        return 0;
+}
+
+static const struct i2c_device_id mt9t112_id[] = {
+        { "mt9t112", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, mt9t112_id);
+
+static struct i2c_driver mt9t112_i2c_driver = {
+        .driver = {
+                .name = "mt9t112",
+        },
+        .probe    = mt9t112_probe,
+        .remove   = mt9t112_remove,
+        .id_table = mt9t112_id,
+};
+
+/************************************************************************
+
+
+                        module function
+
+
+************************************************************************/
+static int __init mt9t112_module_init(void)
+{
+        return i2c_add_driver(&mt9t112_i2c_driver);
+}
+
+static void __exit mt9t112_module_exit(void)
+{
+        i2c_del_driver(&mt9t112_i2c_driver);
+}
+
+module_init(mt9t112_module_init);
+module_exit(mt9t112_module_exit);
+
+MODULE_DESCRIPTION("SoC Camera driver for mt9t112");
+MODULE_AUTHOR("Kuninori Morimoto");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c
index 995607f9d3ba..91df7ec91fb6 100644
--- a/drivers/media/video/mt9v022.c
+++ b/drivers/media/video/mt9v022.c
@@ -18,9 +18,11 @@
 #include <media/v4l2-chip-ident.h>
 #include <media/soc_camera.h>
 
-/* mt9v022 i2c address 0x48, 0x4c, 0x58, 0x5c
+/*
+ * mt9v022 i2c address 0x48, 0x4c, 0x58, 0x5c
  * The platform has to define ctruct i2c_board_info objects and link to them
- * from struct soc_camera_link */
+ * from struct soc_camera_link
+ */
 
 static char *sensor_type;
 module_param(sensor_type, charp, S_IRUGO);
@@ -62,41 +64,49 @@ MODULE_PARM_DESC(sensor_type, "Sensor type: \"colour\" or \"monochrome\"");
 #define MT9V022_COLUMN_SKIP             1
 #define MT9V022_ROW_SKIP                4
 
-static const struct soc_camera_data_format mt9v022_colour_formats[] = {
-        /* Order important: first natively supported,
-         * second supported with a GPIO extender */
-        {
-                .name           = "Bayer (sRGB) 10 bit",
-                .depth          = 10,
-                .fourcc         = V4L2_PIX_FMT_SBGGR16,
-                .colorspace     = V4L2_COLORSPACE_SRGB,
-        }, {
-                .name           = "Bayer (sRGB) 8 bit",
-                .depth          = 8,
-                .fourcc         = V4L2_PIX_FMT_SBGGR8,
-                .colorspace     = V4L2_COLORSPACE_SRGB,
-        }
+/* MT9V022 has only one fixed colorspace per pixelcode */
+struct mt9v022_datafmt {
+        enum v4l2_mbus_pixelcode        code;
+        enum v4l2_colorspace            colorspace;
+};
+
+/* Find a data format by a pixel code in an array */
+static const struct mt9v022_datafmt *mt9v022_find_datafmt(
+        enum v4l2_mbus_pixelcode code, const struct mt9v022_datafmt *fmt,
+        int n)
+{
+        int i;
+        for (i = 0; i < n; i++)
+                if (fmt[i].code == code)
+                        return fmt + i;
+
+        return NULL;
+}
+
+static const struct mt9v022_datafmt mt9v022_colour_fmts[] = {
+        /*
+         * Order important: first natively supported,
+         * second supported with a GPIO extender
+         */
+        {V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
+        {V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
 };
 
-static const struct soc_camera_data_format mt9v022_monochrome_formats[] = {
+static const struct mt9v022_datafmt mt9v022_monochrome_fmts[] = {
         /* Order important - see above */
-        {
-                .name           = "Monochrome 10 bit",
-                .depth          = 10,
-                .fourcc         = V4L2_PIX_FMT_Y16,
-        }, {
-                .name           = "Monochrome 8 bit",
-                .depth          = 8,
-                .fourcc         = V4L2_PIX_FMT_GREY,
-        },
+        {V4L2_MBUS_FMT_Y10_1X10, V4L2_COLORSPACE_JPEG},
+        {V4L2_MBUS_FMT_GREY8_1X8, V4L2_COLORSPACE_JPEG},
 };
 
 struct mt9v022 {
         struct v4l2_subdev subdev;
         struct v4l2_rect rect;  /* Sensor window */
-        __u32 fourcc;
+        const struct mt9v022_datafmt *fmt;
+        const struct mt9v022_datafmt *fmts;
+        int num_fmts;
         int model;      /* V4L2_IDENT_MT9V022* codes from v4l2-chip-ident.h */
         u16 chip_control;
+        unsigned short y_skip_top;      /* Lines to skip at the top */
 };
 
 static struct mt9v022 *to_mt9v022(const struct i2c_client *client)
@@ -143,9 +153,11 @@ static int mt9v022_init(struct i2c_client *client)
         struct mt9v022 *mt9v022 = to_mt9v022(client);
         int ret;
 
-        /* Almost the default mode: master, parallel, simultaneous, and an
+        /*
+         * Almost the default mode: master, parallel, simultaneous, and an
          * undocumented bit 0x200, which is present in table 7, but not in 8,
-         * plus snapshot mode to disable scan for now */
+         * plus snapshot mode to disable scan for now
+         */
         mt9v022->chip_control |= 0x10;
         ret = reg_write(client, MT9V022_CHIP_CONTROL, mt9v022->chip_control);
         if (!ret)
@@ -265,12 +277,10 @@ static int mt9v022_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
         struct i2c_client *client = sd->priv;
         struct mt9v022 *mt9v022 = to_mt9v022(client);
         struct v4l2_rect rect = a->c;
-        struct soc_camera_device *icd = client->dev.platform_data;
         int ret;
 
         /* Bayer format - even size lengths */
-        if (mt9v022->fourcc == V4L2_PIX_FMT_SBGGR8 ||
-            mt9v022->fourcc == V4L2_PIX_FMT_SBGGR16) {
+        if (mt9v022->fmts == mt9v022_colour_fmts) {
                 rect.width      = ALIGN(rect.width, 2);
                 rect.height     = ALIGN(rect.height, 2);
                 /* Let the user play with the starting pixel */
@@ -287,10 +297,10 @@ static int mt9v022_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
         if (ret >= 0) {
                 if (ret & 1) /* Autoexposure */
                         ret = reg_write(client, MT9V022_MAX_TOTAL_SHUTTER_WIDTH,
-                                        rect.height + icd->y_skip_top + 43);
+                                        rect.height + mt9v022->y_skip_top + 43);
                 else
                         ret = reg_write(client, MT9V022_TOTAL_SHUTTER_WIDTH,
-                                        rect.height + icd->y_skip_top + 43);
+                                        rect.height + mt9v022->y_skip_top + 43);
         }
         /* Setup frame format: defaults apart from width and height */
         if (!ret)
@@ -298,8 +308,10 @@ static int mt9v022_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
         if (!ret)
                 ret = reg_write(client, MT9V022_ROW_START, rect.top);
         if (!ret)
-                /* Default 94, Phytec driver says:
-                 * "width + horizontal blank >= 660" */
+                /*
+                 * Default 94, Phytec driver says:
+                 * "width + horizontal blank >= 660"
+                 */
                 ret = reg_write(client, MT9V022_HORIZONTAL_BLANKING,
                                 rect.width > 660 - 43 ? 43 :
                                 660 - rect.width);
@@ -309,7 +321,7 @@ static int mt9v022_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
                 ret = reg_write(client, MT9V022_WINDOW_WIDTH, rect.width);
         if (!ret)
                 ret = reg_write(client, MT9V022_WINDOW_HEIGHT,
-                                rect.height + icd->y_skip_top);
+                                rect.height + mt9v022->y_skip_top);
 
         if (ret < 0)
                 return ret;
@@ -346,46 +358,48 @@ static int mt9v022_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
         return 0;
 }
 
-static int mt9v022_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int mt9v022_g_fmt(struct v4l2_subdev *sd,
+                         struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
         struct mt9v022 *mt9v022 = to_mt9v022(client);
-        struct v4l2_pix_format *pix = &f->fmt.pix;
 
-        pix->width              = mt9v022->rect.width;
-        pix->height             = mt9v022->rect.height;
-        pix->pixelformat        = mt9v022->fourcc;
-        pix->field              = V4L2_FIELD_NONE;
-        pix->colorspace         = V4L2_COLORSPACE_SRGB;
+        mf->width       = mt9v022->rect.width;
+        mf->height      = mt9v022->rect.height;
+        mf->code        = mt9v022->fmt->code;
+        mf->colorspace  = mt9v022->fmt->colorspace;
+        mf->field       = V4L2_FIELD_NONE;
 
         return 0;
 }
 
-static int mt9v022_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int mt9v022_s_fmt(struct v4l2_subdev *sd,
+                         struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
         struct mt9v022 *mt9v022 = to_mt9v022(client);
-        struct v4l2_pix_format *pix = &f->fmt.pix;
         struct v4l2_crop a = {
                 .c = {
                         .left   = mt9v022->rect.left,
                         .top    = mt9v022->rect.top,
-                        .width  = pix->width,
-                        .height = pix->height,
+                        .width  = mf->width,
+                        .height = mf->height,
                 },
         };
         int ret;
 
-        /* The caller provides a supported format, as verified per call to
-         * icd->try_fmt(), datawidth is from our supported format list */
-        switch (pix->pixelformat) {
-        case V4L2_PIX_FMT_GREY:
-        case V4L2_PIX_FMT_Y16:
+        /*
+         * The caller provides a supported format, as verified per call to
+         * icd->try_fmt(), datawidth is from our supported format list
+         */
+        switch (mf->code) {
+        case V4L2_MBUS_FMT_GREY8_1X8:
+        case V4L2_MBUS_FMT_Y10_1X10:
                 if (mt9v022->model != V4L2_IDENT_MT9V022IX7ATM)
                         return -EINVAL;
                 break;
-        case V4L2_PIX_FMT_SBGGR8:
-        case V4L2_PIX_FMT_SBGGR16:
+        case V4L2_MBUS_FMT_SBGGR8_1X8:
+        case V4L2_MBUS_FMT_SBGGR10_1X10:
                 if (mt9v022->model != V4L2_IDENT_MT9V022IX7ATC)
                         return -EINVAL;
                 break;
@@ -399,26 +413,38 @@ static int mt9v022_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
         /* No support for scaling on this camera, just crop. */
         ret = mt9v022_s_crop(sd, &a);
         if (!ret) {
-                pix->width = mt9v022->rect.width;
-                pix->height = mt9v022->rect.height;
-                mt9v022->fourcc = pix->pixelformat;
+                mf->width       = mt9v022->rect.width;
+                mf->height      = mt9v022->rect.height;
+                mt9v022->fmt    = mt9v022_find_datafmt(mf->code,
+                                        mt9v022->fmts, mt9v022->num_fmts);
+                mf->colorspace  = mt9v022->fmt->colorspace;
         }
 
         return ret;
 }
 
-static int mt9v022_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int mt9v022_try_fmt(struct v4l2_subdev *sd,
+                           struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
-        struct soc_camera_device *icd = client->dev.platform_data;
-        struct v4l2_pix_format *pix = &f->fmt.pix;
-        int align = pix->pixelformat == V4L2_PIX_FMT_SBGGR8 ||
-                pix->pixelformat == V4L2_PIX_FMT_SBGGR16;
+        struct mt9v022 *mt9v022 = to_mt9v022(client);
+        const struct mt9v022_datafmt *fmt;
+        int align = mf->code == V4L2_MBUS_FMT_SBGGR8_1X8 ||
+                mf->code == V4L2_MBUS_FMT_SBGGR10_1X10;
 
-        v4l_bound_align_image(&pix->width, MT9V022_MIN_WIDTH,
+        v4l_bound_align_image(&mf->width, MT9V022_MIN_WIDTH,
                 MT9V022_MAX_WIDTH, align,
-                &pix->height, MT9V022_MIN_HEIGHT + icd->y_skip_top,
-                MT9V022_MAX_HEIGHT + icd->y_skip_top, align, 0);
+                &mf->height, MT9V022_MIN_HEIGHT + mt9v022->y_skip_top,
+                MT9V022_MAX_HEIGHT + mt9v022->y_skip_top, align, 0);
+
+        fmt = mt9v022_find_datafmt(mf->code, mt9v022->fmts,
+                                   mt9v022->num_fmts);
+        if (!fmt) {
+                fmt = mt9v022->fmt;
+                mf->code = fmt->code;
+        }
+
+        mf->colorspace  = fmt->colorspace;
 
         return 0;
 }
@@ -635,8 +661,10 @@ static int mt9v022_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                                               48 + range / 2) / range + 16;
                         if (gain >= 32)
                                 gain &= ~1;
-                        /* The user wants to set gain manually, hope, she
-                         * knows, what she's doing... Switch AGC off. */
+                        /*
+                         * The user wants to set gain manually, hope, she
+                         * knows, what she's doing... Switch AGC off.
+                         */
 
                         if (reg_clear(client, MT9V022_AEC_AGC_ENABLE, 0x2) < 0)
                                 return -EIO;
@@ -655,8 +683,10 @@ static int mt9v022_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                         unsigned long range = qctrl->maximum - qctrl->minimum;
                         unsigned long shutter = ((ctrl->value - qctrl->minimum) *
                                                  479 + range / 2) / range + 1;
-                        /* The user wants to set shutter width manually, hope,
-                         * she knows, what she's doing... Switch AEC off. */
+                        /*
+                         * The user wants to set shutter width manually, hope,
+                         * she knows, what she's doing... Switch AEC off.
+                         */
 
                         if (reg_clear(client, MT9V022_AEC_AGC_ENABLE, 0x1) < 0)
                                 return -EIO;
@@ -689,8 +719,10 @@ static int mt9v022_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
         return 0;
 }
 
-/* Interface active, can use i2c. If it fails, it can indeed mean, that
- * this wasn't our capture interface, so, we wait for the right one */
+/*
+ * Interface active, can use i2c. If it fails, it can indeed mean, that
+ * this wasn't our capture interface, so, we wait for the right one
+ */
 static int mt9v022_video_probe(struct soc_camera_device *icd,
                                struct i2c_client *client)
 {
@@ -733,17 +765,17 @@ static int mt9v022_video_probe(struct soc_camera_device *icd,
                             !strcmp("color", sensor_type))) {
                 ret = reg_write(client, MT9V022_PIXEL_OPERATION_MODE, 4 | 0x11);
                 mt9v022->model = V4L2_IDENT_MT9V022IX7ATC;
-                icd->formats = mt9v022_colour_formats;
+                mt9v022->fmts = mt9v022_colour_fmts;
         } else {
                 ret = reg_write(client, MT9V022_PIXEL_OPERATION_MODE, 0x11);
                 mt9v022->model = V4L2_IDENT_MT9V022IX7ATM;
-                icd->formats = mt9v022_monochrome_formats;
+                mt9v022->fmts = mt9v022_monochrome_fmts;
         }
 
         if (ret < 0)
                 goto ei2c;
 
-        icd->num_formats = 0;
+        mt9v022->num_fmts = 0;
 
         /*
          * This is a 10bit sensor, so by default we only allow 10bit.
@@ -756,14 +788,14 @@ static int mt9v022_video_probe(struct soc_camera_device *icd,
                 flags = SOCAM_DATAWIDTH_10;
 
         if (flags & SOCAM_DATAWIDTH_10)
-                icd->num_formats++;
+                mt9v022->num_fmts++;
         else
-                icd->formats++;
+                mt9v022->fmts++;
 
         if (flags & SOCAM_DATAWIDTH_8)
-                icd->num_formats++;
+                mt9v022->num_fmts++;
 
-        mt9v022->fourcc = icd->formats->fourcc;
+        mt9v022->fmt = &mt9v022->fmts[0];
 
         dev_info(&client->dev, "Detected a MT9V022 chip ID %x, %s sensor\n",
                  data, mt9v022->model == V4L2_IDENT_MT9V022IX7ATM ?
@@ -787,6 +819,16 @@ static void mt9v022_video_remove(struct soc_camera_device *icd)
                 icl->free_bus(icl);
 }
 
+static int mt9v022_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)
+{
+        struct i2c_client *client = sd->priv;
+        struct mt9v022 *mt9v022 = to_mt9v022(client);
+
+        *lines = mt9v022->y_skip_top;
+
+        return 0;
+}
+
 static struct v4l2_subdev_core_ops mt9v022_subdev_core_ops = {
         .g_ctrl         = mt9v022_g_ctrl,
         .s_ctrl         = mt9v022_s_ctrl,
@@ -797,19 +839,38 @@ static struct v4l2_subdev_core_ops mt9v022_subdev_core_ops = {
 #endif
 };
 
+static int mt9v022_enum_fmt(struct v4l2_subdev *sd, int index,
+                            enum v4l2_mbus_pixelcode *code)
+{
+        struct i2c_client *client = sd->priv;
+        struct mt9v022 *mt9v022 = to_mt9v022(client);
+
+        if ((unsigned int)index >= mt9v022->num_fmts)
+                return -EINVAL;
+
+        *code = mt9v022->fmts[index].code;
+        return 0;
+}
+
 static struct v4l2_subdev_video_ops mt9v022_subdev_video_ops = {
         .s_stream       = mt9v022_s_stream,
-        .s_fmt          = mt9v022_s_fmt,
-        .g_fmt          = mt9v022_g_fmt,
-        .try_fmt        = mt9v022_try_fmt,
+        .s_mbus_fmt     = mt9v022_s_fmt,
+        .g_mbus_fmt     = mt9v022_g_fmt,
+        .try_mbus_fmt   = mt9v022_try_fmt,
         .s_crop         = mt9v022_s_crop,
         .g_crop         = mt9v022_g_crop,
         .cropcap        = mt9v022_cropcap,
+        .enum_mbus_fmt  = mt9v022_enum_fmt,
+};
+
+static struct v4l2_subdev_sensor_ops mt9v022_subdev_sensor_ops = {
+        .g_skip_top_lines       = mt9v022_g_skip_top_lines,
 };
 
 static struct v4l2_subdev_ops mt9v022_subdev_ops = {
         .core   = &mt9v022_subdev_core_ops,
         .video  = &mt9v022_subdev_video_ops,
+        .sensor = &mt9v022_subdev_sensor_ops,
 };
 
 static int mt9v022_probe(struct i2c_client *client,
@@ -851,8 +912,7 @@ static int mt9v022_probe(struct i2c_client *client,
          * MT9V022 _really_ corrupts the first read out line.
          * TODO: verify on i.MX31
          */
-        icd->y_skip_top         = 1;
-
+        mt9v022->y_skip_top     = 1;
         mt9v022->rect.left      = MT9V022_COLUMN_SKIP;
         mt9v022->rect.top       = MT9V022_ROW_SKIP;
         mt9v022->rect.width     = MT9V022_MAX_WIDTH;
diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c
index 72802291e812..2ba14fb5b031 100644
--- a/drivers/media/video/mx1_camera.c
+++ b/drivers/media/video/mx1_camera.c
@@ -37,6 +37,7 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-dev.h>
 #include <media/videobuf-dma-contig.h>
+#include <media/soc_mediabus.h>
 
 #include <asm/dma.h>
 #include <asm/fiq.h>
@@ -94,14 +95,16 @@
 /* buffer for one video frame */
 struct mx1_buffer {
         /* common v4l buffer stuff -- must be first */
-        struct videobuf_buffer vb;
-        const struct soc_camera_data_format *fmt;
-        int inwork;
+        struct videobuf_buffer          vb;
+        enum v4l2_mbus_pixelcode        code;
+        int                             inwork;
 };
 
-/* i.MX1/i.MXL is only supposed to handle one camera on its Camera Sensor
+/*
+ * i.MX1/i.MXL is only supposed to handle one camera on its Camera Sensor
  * Interface. If anyone ever builds hardware to enable more than
- * one camera, they will have to modify this driver too */
+ * one camera, they will have to modify this driver too
+ */
 struct mx1_camera_dev {
         struct soc_camera_host          soc_host;
         struct soc_camera_device        *icd;
@@ -126,9 +129,13 @@ static int mx1_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
                               unsigned int *size)
 {
         struct soc_camera_device *icd = vq->priv_data;
+        int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
+                                                icd->current_fmt->host_fmt);
+
+        if (bytes_per_line < 0)
+                return bytes_per_line;
 
-        *size = icd->user_width * icd->user_height *
-                ((icd->current_fmt->depth + 7) >> 3);
+        *size = bytes_per_line * icd->user_height;
 
         if (!*count)
                 *count = 32;
@@ -151,8 +158,10 @@ static void free_buffer(struct videobuf_queue *vq, struct mx1_buffer *buf)
         dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                 vb, vb->baddr, vb->bsize);
 
-        /* This waits until this buffer is out of danger, i.e., until it is no
-         * longer in STATE_QUEUED or STATE_ACTIVE */
+        /*
+         * This waits until this buffer is out of danger, i.e., until it is no
+         * longer in STATE_QUEUED or STATE_ACTIVE
+         */
         videobuf_waiton(vb, 0, 0);
         videobuf_dma_contig_free(vq, vb);
 
@@ -165,6 +174,11 @@ static int mx1_videobuf_prepare(struct videobuf_queue *vq,
         struct soc_camera_device *icd = vq->priv_data;
         struct mx1_buffer *buf = container_of(vb, struct mx1_buffer, vb);
         int ret;
+        int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
+                                                icd->current_fmt->host_fmt);
+
+        if (bytes_per_line < 0)
+                return bytes_per_line;
 
         dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                 vb, vb->baddr, vb->bsize);
@@ -174,22 +188,24 @@ static int mx1_videobuf_prepare(struct videobuf_queue *vq,
 
         BUG_ON(NULL == icd->current_fmt);
 
-        /* I think, in buf_prepare you only have to protect global data,
-         * the actual buffer is yours */
+        /*
+         * I think, in buf_prepare you only have to protect global data,
+         * the actual buffer is yours
+         */
         buf->inwork = 1;
 
-        if (buf->fmt    != icd->current_fmt ||
+        if (buf->code   != icd->current_fmt->code ||
             vb->width   != icd->user_width ||
             vb->height  != icd->user_height ||
             vb->field   != field) {
-                buf->fmt        = icd->current_fmt;
+                buf->code       = icd->current_fmt->code;
                 vb->width       = icd->user_width;
                 vb->height      = icd->user_height;
                 vb->field       = field;
                 vb->state       = VIDEOBUF_NEEDS_INIT;
         }
 
-        vb->size = vb->width * vb->height * ((buf->fmt->depth + 7) >> 3);
+        vb->size = bytes_per_line * vb->height;
         if (0 != vb->baddr && vb->bsize < vb->size) {
                 ret = -EINVAL;
                 goto out;
@@ -381,8 +397,10 @@ static int mclk_get_divisor(struct mx1_camera_dev *pcdev)
 
         lcdclk = clk_get_rate(pcdev->clk);
 
-        /* We verify platform_mclk_10khz != 0, so if anyone breaks it, here
-         * they get a nice Oops */
+        /*
+         * We verify platform_mclk_10khz != 0, so if anyone breaks it, here
+         * they get a nice Oops
+         */
         div = (lcdclk + 2 * mclk - 1) / (2 * mclk) - 1;
 
         dev_dbg(pcdev->icd->dev.parent,
@@ -420,8 +438,10 @@ static void mx1_camera_deactivate(struct mx1_camera_dev *pcdev)
         clk_disable(pcdev->clk);
 }
 
-/* The following two functions absolutely depend on the fact, that
- * there can be only one camera on i.MX1/i.MXL camera sensor interface */
+/*
+ * The following two functions absolutely depend on the fact, that
+ * there can be only one camera on i.MX1/i.MXL camera sensor interface
+ */
 static int mx1_camera_add_device(struct soc_camera_device *icd)
 {
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
@@ -487,12 +507,10 @@ static int mx1_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
 
         /* MX1 supports only 8bit buswidth */
         common_flags = soc_camera_bus_param_compatible(camera_flags,
-                                                               CSI_BUS_FLAGS);
+                                                       CSI_BUS_FLAGS);
         if (!common_flags)
                 return -EINVAL;
 
-        icd->buswidth = 8;
-
         /* Make choises, based on platform choice */
         if ((common_flags & SOCAM_VSYNC_ACTIVE_HIGH) &&
                 (common_flags & SOCAM_VSYNC_ACTIVE_LOW)) {
@@ -545,7 +563,8 @@ static int mx1_camera_set_fmt(struct soc_camera_device *icd,
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         const struct soc_camera_format_xlate *xlate;
         struct v4l2_pix_format *pix = &f->fmt.pix;
-        int ret;
+        struct v4l2_mbus_framefmt mf;
+        int ret, buswidth;
 
         xlate = soc_camera_xlate_by_fourcc(icd, pix->pixelformat);
         if (!xlate) {
@@ -554,12 +573,33 @@ static int mx1_camera_set_fmt(struct soc_camera_device *icd,
                 return -EINVAL;
         }
 
-        ret = v4l2_subdev_call(sd, video, s_fmt, f);
-        if (!ret) {
-                icd->buswidth = xlate->buswidth;
-                icd->current_fmt = xlate->host_fmt;
+        buswidth = xlate->host_fmt->bits_per_sample;
+        if (buswidth > 8) {
+                dev_warn(icd->dev.parent,
+                         "bits-per-sample %d for format %x unsupported\n",
+                         buswidth, pix->pixelformat);
+                return -EINVAL;
         }
 
+        mf.width        = pix->width;
+        mf.height       = pix->height;
+        mf.field        = pix->field;
+        mf.colorspace   = pix->colorspace;
+        mf.code         = xlate->code;
+
+        ret = v4l2_subdev_call(sd, video, s_mbus_fmt, &mf);
+        if (ret < 0)
+                return ret;
+
+        if (mf.code != xlate->code)
+                return -EINVAL;
+
+        pix->width              = mf.width;
+        pix->height             = mf.height;
+        pix->field              = mf.field;
+        pix->colorspace         = mf.colorspace;
+        icd->current_fmt        = xlate;
+
         return ret;
 }
 
@@ -567,10 +607,36 @@ static int mx1_camera_try_fmt(struct soc_camera_device *icd,
                               struct v4l2_format *f)
 {
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+        const struct soc_camera_format_xlate *xlate;
+        struct v4l2_pix_format *pix = &f->fmt.pix;
+        struct v4l2_mbus_framefmt mf;
+        int ret;
         /* TODO: limit to mx1 hardware capabilities */
 
+        xlate = soc_camera_xlate_by_fourcc(icd, pix->pixelformat);
+        if (!xlate) {
+                dev_warn(icd->dev.parent, "Format %x not found\n",
+                         pix->pixelformat);
+                return -EINVAL;
+        }
+
+        mf.width        = pix->width;
+        mf.height       = pix->height;
+        mf.field        = pix->field;
+        mf.colorspace   = pix->colorspace;
+        mf.code         = xlate->code;
+
         /* limit to sensor capabilities */
-        return v4l2_subdev_call(sd, video, try_fmt, f);
+        ret = v4l2_subdev_call(sd, video, try_mbus_fmt, &mf);
+        if (ret < 0)
+                return ret;
+
+        pix->width      = mf.width;
+        pix->height     = mf.height;
+        pix->field      = mf.field;
+        pix->colorspace = mf.colorspace;
+
+        return 0;
 }
 
 static int mx1_camera_reqbufs(struct soc_camera_file *icf,
@@ -578,10 +644,12 @@ static int mx1_camera_reqbufs(struct soc_camera_file *icf,
 {
         int i;
 
-        /* This is for locking debugging only. I removed spinlocks and now I
+        /*
+         * This is for locking debugging only. I removed spinlocks and now I
          * check whether .prepare is ever called on a linked buffer, or whether
          * a dma IRQ can occur for an in-work or unlinked buffer. Until now
-         * it hadn't triggered */
+         * it hadn't triggered
+         */
         for (i = 0; i < p->count; i++) {
                 struct mx1_buffer *buf = container_of(icf->vb_vidq.bufs[i],
                                                       struct mx1_buffer, vb);
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c
index 7db82bdf6f31..bd297f567dc7 100644
--- a/drivers/media/video/mx3_camera.c
+++ b/drivers/media/video/mx3_camera.c
@@ -23,6 +23,7 @@
 #include <media/v4l2-dev.h>
 #include <media/videobuf-dma-contig.h>
 #include <media/soc_camera.h>
+#include <media/soc_mediabus.h>
 
 #include <mach/ipu.h>
 #include <mach/mx3_camera.h>
@@ -63,7 +64,7 @@
 struct mx3_camera_buffer {
         /* common v4l buffer stuff -- must be first */
         struct videobuf_buffer                  vb;
-        const struct soc_camera_data_format     *fmt;
+        enum v4l2_mbus_pixelcode                code;
 
         /* One descriptot per scatterlist (per frame) */
         struct dma_async_tx_descriptor          *txd;
@@ -118,8 +119,6 @@ struct dma_chan_request {
         enum ipu_channel        id;
 };
 
-static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt);
-
 static u32 csi_reg_read(struct mx3_camera_dev *mx3, off_t reg)
 {
         return __raw_readl(mx3->base + reg);
@@ -211,17 +210,16 @@ static int mx3_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
         struct soc_camera_device *icd = vq->priv_data;
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct mx3_camera_dev *mx3_cam = ici->priv;
-        /*
-         * bits-per-pixel (depth) as specified in camera's pixel format does
-         * not necessarily match what the camera interface writes to RAM, but
-         * it should be good enough for now.
-         */
-        unsigned int bpp = DIV_ROUND_UP(icd->current_fmt->depth, 8);
+        int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
+                                                icd->current_fmt->host_fmt);
+
+        if (bytes_per_line < 0)
+                return bytes_per_line;
 
         if (!mx3_cam->idmac_channel[0])
                 return -EINVAL;
 
-        *size = icd->user_width * icd->user_height * bpp;
+        *size = bytes_per_line * icd->user_height;
 
         if (!*count)
                 *count = 32;
@@ -241,21 +239,26 @@ static int mx3_videobuf_prepare(struct videobuf_queue *vq,
         struct mx3_camera_dev *mx3_cam = ici->priv;
         struct mx3_camera_buffer *buf =
                 container_of(vb, struct mx3_camera_buffer, vb);
-        /* current_fmt _must_ always be set */
-        size_t new_size = icd->user_width * icd->user_height *
-                ((icd->current_fmt->depth + 7) >> 3);
+        size_t new_size;
         int ret;
+        int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
+                                                icd->current_fmt->host_fmt);
+
+        if (bytes_per_line < 0)
+                return bytes_per_line;
+
+        new_size = bytes_per_line * icd->user_height;
 
         /*
          * I think, in buf_prepare you only have to protect global data,
          * the actual buffer is yours
          */
 
-        if (buf->fmt    != icd->current_fmt ||
+        if (buf->code   != icd->current_fmt->code ||
             vb->width   != icd->user_width ||
             vb->height  != icd->user_height ||
             vb->field   != field) {
-                buf->fmt        = icd->current_fmt;
+                buf->code       = icd->current_fmt->code;
                 vb->width       = icd->user_width;
                 vb->height      = icd->user_height;
                 vb->field       = field;
@@ -348,13 +351,13 @@ static void mx3_videobuf_queue(struct videobuf_queue *vq,
         struct dma_async_tx_descriptor *txd = buf->txd;
         struct idmac_channel *ichan = to_idmac_chan(txd->chan);
         struct idmac_video_param *video = &ichan->params.video;
-        const struct soc_camera_data_format *data_fmt = icd->current_fmt;
         dma_cookie_t cookie;
+        u32 fourcc = icd->current_fmt->host_fmt->fourcc;
 
         BUG_ON(!irqs_disabled());
 
         /* This is the configuration of one sg-element */
-        video->out_pixel_fmt    = fourcc_to_ipu_pix(data_fmt->fourcc);
+        video->out_pixel_fmt    = fourcc_to_ipu_pix(fourcc);
         video->out_width        = icd->user_width;
         video->out_height       = icd->user_height;
         video->out_stride       = icd->user_width;
@@ -564,30 +567,37 @@ static int test_platform_param(struct mx3_camera_dev *mx3_cam,
                 SOCAM_DATA_ACTIVE_HIGH |
                 SOCAM_DATA_ACTIVE_LOW;
 
-        /* If requested data width is supported by the platform, use it or any
-         * possible lower value - i.MX31 is smart enough to schift bits */
+        /*
+         * If requested data width is supported by the platform, use it or any
+         * possible lower value - i.MX31 is smart enough to schift bits
+         */
+        if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_15)
+                *flags |= SOCAM_DATAWIDTH_15 | SOCAM_DATAWIDTH_10 |
+                        SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_4;
+        else if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_10)
+                *flags |= SOCAM_DATAWIDTH_10 | SOCAM_DATAWIDTH_8 |
+                        SOCAM_DATAWIDTH_4;
+        else if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_8)
+                *flags |= SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_4;
+        else if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_4)
+                *flags |= SOCAM_DATAWIDTH_4;
+
         switch (buswidth) {
         case 15:
-                if (!(mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_15))
+                if (!(*flags & SOCAM_DATAWIDTH_15))
                         return -EINVAL;
-                *flags |= SOCAM_DATAWIDTH_15 | SOCAM_DATAWIDTH_10 |
-                        SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_4;
                 break;
         case 10:
-                if (!(mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_10))
+                if (!(*flags & SOCAM_DATAWIDTH_10))
                         return -EINVAL;
-                *flags |= SOCAM_DATAWIDTH_10 | SOCAM_DATAWIDTH_8 |
-                        SOCAM_DATAWIDTH_4;
                 break;
         case 8:
-                if (!(mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_8))
+                if (!(*flags & SOCAM_DATAWIDTH_8))
                         return -EINVAL;
-                *flags |= SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_4;
                 break;
         case 4:
-                if (!(mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_4))
+                if (!(*flags & SOCAM_DATAWIDTH_4))
                         return -EINVAL;
-                *flags |= SOCAM_DATAWIDTH_4;
                 break;
         default:
                 dev_warn(mx3_cam->soc_host.v4l2_dev.dev,
@@ -636,91 +646,92 @@ static bool chan_filter(struct dma_chan *chan, void *arg)
                 pdata->dma_dev == chan->device->dev;
 }
 
-static const struct soc_camera_data_format mx3_camera_formats[] = {
+static const struct soc_mbus_pixelfmt mx3_camera_formats[] = {
         {
-                .name           = "Bayer (sRGB) 8 bit",
-                .depth          = 8,
-                .fourcc         = V4L2_PIX_FMT_SBGGR8,
-                .colorspace     = V4L2_COLORSPACE_SRGB,
+                .fourcc                 = V4L2_PIX_FMT_SBGGR8,
+                .name                   = "Bayer BGGR (sRGB) 8 bit",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_NONE,
+                .order                  = SOC_MBUS_ORDER_LE,
         }, {
-                .name           = "Monochrome 8 bit",
-                .depth          = 8,
-                .fourcc         = V4L2_PIX_FMT_GREY,
-                .colorspace     = V4L2_COLORSPACE_JPEG,
+                .fourcc                 = V4L2_PIX_FMT_GREY,
+                .name                   = "Monochrome 8 bit",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_NONE,
+                .order                  = SOC_MBUS_ORDER_LE,
         },
 };
 
-static bool buswidth_supported(struct soc_camera_host *ici, int depth)
+/* This will be corrected as we get more formats */
+static bool mx3_camera_packing_supported(const struct soc_mbus_pixelfmt *fmt)
 {
-        struct mx3_camera_dev *mx3_cam = ici->priv;
-
-        switch (depth) {
-        case 4:
-                return !!(mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_4);
-        case 8:
-                return !!(mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_8);
-        case 10:
-                return !!(mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_10);
-        case 15:
-                return !!(mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_15);
-        }
-        return false;
+        return  fmt->packing == SOC_MBUS_PACKING_NONE ||
+                (fmt->bits_per_sample == 8 &&
+                 fmt->packing == SOC_MBUS_PACKING_2X8_PADHI) ||
+                (fmt->bits_per_sample > 8 &&
+                 fmt->packing == SOC_MBUS_PACKING_EXTEND16);
 }
 
 static int mx3_camera_get_formats(struct soc_camera_device *icd, int idx,
                                   struct soc_camera_format_xlate *xlate)
 {
-        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
-        int formats = 0, buswidth, ret;
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+        struct device *dev = icd->dev.parent;
+        int formats = 0, ret;
+        enum v4l2_mbus_pixelcode code;
+        const struct soc_mbus_pixelfmt *fmt;
 
-        buswidth = icd->formats[idx].depth;
+        ret = v4l2_subdev_call(sd, video, enum_mbus_fmt, idx, &code);
+        if (ret < 0)
+                /* No more formats */
+                return 0;
 
-        if (!buswidth_supported(ici, buswidth))
+        fmt = soc_mbus_get_fmtdesc(code);
+        if (!fmt) {
+                dev_err(icd->dev.parent,
+                        "Invalid format code #%d: %d\n", idx, code);
                 return 0;
+        }
 
-        ret = mx3_camera_try_bus_param(icd, buswidth);
+        /* This also checks support for the requested bits-per-sample */
+        ret = mx3_camera_try_bus_param(icd, fmt->bits_per_sample);
         if (ret < 0)
                 return 0;
 
-        switch (icd->formats[idx].fourcc) {
-        case V4L2_PIX_FMT_SGRBG10:
+        switch (code) {
+        case V4L2_MBUS_FMT_SBGGR10_1X10:
                 formats++;
                 if (xlate) {
-                        xlate->host_fmt = &mx3_camera_formats[0];
-                        xlate->cam_fmt = icd->formats + idx;
-                        xlate->buswidth = buswidth;
+                        xlate->host_fmt = &mx3_camera_formats[0];
+                        xlate->code     = code;
                         xlate++;
-                        dev_dbg(icd->dev.parent,
-                                "Providing format %s using %s\n",
-                                mx3_camera_formats[0].name,
-                                icd->formats[idx].name);
+                        dev_dbg(dev, "Providing format %s using code %d\n",
+                                mx3_camera_formats[0].name, code);
                 }
-                goto passthrough;
-        case V4L2_PIX_FMT_Y16:
+                break;
+        case V4L2_MBUS_FMT_Y10_1X10:
                 formats++;
                 if (xlate) {
-                        xlate->host_fmt = &mx3_camera_formats[1];
-                        xlate->cam_fmt = icd->formats + idx;
-                        xlate->buswidth = buswidth;
+                        xlate->host_fmt = &mx3_camera_formats[1];
+                        xlate->code     = code;
                         xlate++;
-                        dev_dbg(icd->dev.parent,
-                                "Providing format %s using %s\n",
-                                mx3_camera_formats[0].name,
-                                icd->formats[idx].name);
+                        dev_dbg(dev, "Providing format %s using code %d\n",
+                                mx3_camera_formats[1].name, code);
                 }
+                break;
         default:
-passthrough:
-                /* Generic pass-through */
-                formats++;
-                if (xlate) {
-                        xlate->host_fmt = icd->formats + idx;
-                        xlate->cam_fmt = icd->formats + idx;
-                        xlate->buswidth = buswidth;
-                        xlate++;
-                        dev_dbg(icd->dev.parent,
-                                "Providing format %s in pass-through mode\n",
-                                icd->formats[idx].name);
-                }
+                if (!mx3_camera_packing_supported(fmt))
+                        return 0;
+        }
+
+        /* Generic pass-through */
+        formats++;
+        if (xlate) {
+                xlate->host_fmt = fmt;
+                xlate->code     = code;
+                xlate++;
+                dev_dbg(dev, "Providing format %x in pass-through mode\n",
+                        xlate->host_fmt->fourcc);
         }
 
         return formats;
@@ -804,8 +815,7 @@ static int mx3_camera_set_crop(struct soc_camera_device *icd,
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct mx3_camera_dev *mx3_cam = ici->priv;
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
-        struct v4l2_format f = {.type = V4L2_BUF_TYPE_VIDEO_CAPTURE};
-        struct v4l2_pix_format *pix = &f.fmt.pix;
+        struct v4l2_mbus_framefmt mf;
         int ret;
 
         soc_camera_limit_side(&rect->left, &rect->width, 0, 2, 4096);
@@ -816,19 +826,19 @@ static int mx3_camera_set_crop(struct soc_camera_device *icd,
                 return ret;
 
         /* The capture device might have changed its output  */
-        ret = v4l2_subdev_call(sd, video, g_fmt, &f);
+        ret = v4l2_subdev_call(sd, video, g_mbus_fmt, &mf);
         if (ret < 0)
                 return ret;
 
-        if (pix->width & 7) {
+        if (mf.width & 7) {
                 /* Ouch! We can only handle 8-byte aligned width... */
-                stride_align(&pix->width);
-                ret = v4l2_subdev_call(sd, video, s_fmt, &f);
+                stride_align(&mf.width);
+                ret = v4l2_subdev_call(sd, video, s_mbus_fmt, &mf);
                 if (ret < 0)
                         return ret;
         }
 
-        if (pix->width != icd->user_width || pix->height != icd->user_height) {
+        if (mf.width != icd->user_width || mf.height != icd->user_height) {
                 /*
                  * We now know pixel formats and can decide upon DMA-channel(s)
                  * So far only direct camera-to-memory is supported
@@ -839,14 +849,14 @@ static int mx3_camera_set_crop(struct soc_camera_device *icd,
                                 return ret;
                 }
 
-                configure_geometry(mx3_cam, pix->width, pix->height);
+                configure_geometry(mx3_cam, mf.width, mf.height);
         }
 
         dev_dbg(icd->dev.parent, "Sensor cropped %dx%d\n",
-                pix->width, pix->height);
+                mf.width, mf.height);
 
-        icd->user_width = pix->width;
-        icd->user_height = pix->height;
+        icd->user_width         = mf.width;
+        icd->user_height        = mf.height;
 
         return ret;
 }
@@ -859,6 +869,7 @@ static int mx3_camera_set_fmt(struct soc_camera_device *icd,
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         const struct soc_camera_format_xlate *xlate;
         struct v4l2_pix_format *pix = &f->fmt.pix;
+        struct v4l2_mbus_framefmt mf;
         int ret;
 
         xlate = soc_camera_xlate_by_fourcc(icd, pix->pixelformat);
@@ -883,11 +894,24 @@ static int mx3_camera_set_fmt(struct soc_camera_device *icd,
 
         configure_geometry(mx3_cam, pix->width, pix->height);
 
-        ret = v4l2_subdev_call(sd, video, s_fmt, f);
-        if (!ret) {
-                icd->buswidth = xlate->buswidth;
-                icd->current_fmt = xlate->host_fmt;
-        }
+        mf.width        = pix->width;
+        mf.height       = pix->height;
+        mf.field        = pix->field;
+        mf.colorspace   = pix->colorspace;
+        mf.code         = xlate->code;
+
+        ret = v4l2_subdev_call(sd, video, s_mbus_fmt, &mf);
+        if (ret < 0)
+                return ret;
+
+        if (mf.code != xlate->code)
+                return -EINVAL;
+
+        pix->width              = mf.width;
+        pix->height             = mf.height;
+        pix->field              = mf.field;
+        pix->colorspace         = mf.colorspace;
+        icd->current_fmt        = xlate;
 
         dev_dbg(icd->dev.parent, "Sensor set %dx%d\n", pix->width, pix->height);
 
@@ -900,8 +924,8 @@ static int mx3_camera_try_fmt(struct soc_camera_device *icd,
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         const struct soc_camera_format_xlate *xlate;
         struct v4l2_pix_format *pix = &f->fmt.pix;
+        struct v4l2_mbus_framefmt mf;
         __u32 pixfmt = pix->pixelformat;
-        enum v4l2_field field;
         int ret;
 
         xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
@@ -916,23 +940,37 @@ static int mx3_camera_try_fmt(struct soc_camera_device *icd,
         if (pix->width > 4096)
                 pix->width = 4096;
 
-        pix->bytesperline = pix->width *
-                DIV_ROUND_UP(xlate->host_fmt->depth, 8);
+        pix->bytesperline = soc_mbus_bytes_per_line(pix->width,
+                                                    xlate->host_fmt);
+        if (pix->bytesperline < 0)
+                return pix->bytesperline;
         pix->sizeimage = pix->height * pix->bytesperline;
 
-        /* camera has to see its format, but the user the original one */
-        pix->pixelformat = xlate->cam_fmt->fourcc;
         /* limit to sensor capabilities */
-        ret = v4l2_subdev_call(sd, video, try_fmt, f);
-        pix->pixelformat = xlate->host_fmt->fourcc;
+        mf.width        = pix->width;
+        mf.height       = pix->height;
+        mf.field        = pix->field;
+        mf.colorspace   = pix->colorspace;
+        mf.code         = xlate->code;
+
+        ret = v4l2_subdev_call(sd, video, try_mbus_fmt, &mf);
+        if (ret < 0)
+                return ret;
 
-        field = pix->field;
+        pix->width      = mf.width;
+        pix->height     = mf.height;
+        pix->colorspace = mf.colorspace;
 
-        if (field == V4L2_FIELD_ANY) {
+        switch (mf.field) {
+        case V4L2_FIELD_ANY:
                 pix->field = V4L2_FIELD_NONE;
-        } else if (field != V4L2_FIELD_NONE) {
-                dev_err(icd->dev.parent, "Field type %d unsupported.\n", field);
-                return -EINVAL;
+                break;
+        case V4L2_FIELD_NONE:
+                break;
+        default:
+                dev_err(icd->dev.parent, "Field type %d unsupported.\n",
+                        mf.field);
+                ret = -EINVAL;
         }
 
         return ret;
@@ -968,18 +1006,26 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
         struct mx3_camera_dev *mx3_cam = ici->priv;
         unsigned long bus_flags, camera_flags, common_flags;
         u32 dw, sens_conf;
-        int ret = test_platform_param(mx3_cam, icd->buswidth, &bus_flags);
+        const struct soc_mbus_pixelfmt *fmt;
+        int buswidth;
+        int ret;
         const struct soc_camera_format_xlate *xlate;
         struct device *dev = icd->dev.parent;
 
+        fmt = soc_mbus_get_fmtdesc(icd->current_fmt->code);
+        if (!fmt)
+                return -EINVAL;
+
+        buswidth = fmt->bits_per_sample;
+        ret = test_platform_param(mx3_cam, buswidth, &bus_flags);
+
         xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
         if (!xlate) {
                 dev_warn(dev, "Format %x not found\n", pixfmt);
                 return -EINVAL;
         }
 
-        dev_dbg(dev, "requested bus width %d bit: %d\n",
-                icd->buswidth, ret);
+        dev_dbg(dev, "requested bus width %d bit: %d\n", buswidth, ret);
 
         if (ret < 0)
                 return ret;
@@ -1027,8 +1073,10 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
                         common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING;
         }
 
-        /* Make the camera work in widest common mode, we'll take care of
-         * the rest */
+        /*
+         * Make the camera work in widest common mode, we'll take care of
+         * the rest
+         */
         if (common_flags & SOCAM_DATAWIDTH_15)
                 common_flags = (common_flags & ~SOCAM_DATAWIDTH_MASK) |
                         SOCAM_DATAWIDTH_15;
@@ -1078,7 +1126,7 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
                 sens_conf |= 1 << CSI_SENS_CONF_DATA_POL_SHIFT;
 
         /* Just do what we're asked to do */
-        switch (xlate->host_fmt->depth) {
+        switch (xlate->host_fmt->bits_per_sample) {
         case 4:
                 dw = 0 << CSI_SENS_CONF_DATA_WIDTH_SHIFT;
                 break;
@@ -1152,8 +1200,10 @@ static int __devinit mx3_camera_probe(struct platform_device *pdev)
         if (!(mx3_cam->platform_flags & (MX3_CAMERA_DATAWIDTH_4 |
                         MX3_CAMERA_DATAWIDTH_8 | MX3_CAMERA_DATAWIDTH_10 |
                         MX3_CAMERA_DATAWIDTH_15))) {
-                /* Platform hasn't set available data widths. This is bad.
-                 * Warn and use a default. */
+                /*
+                 * Platform hasn't set available data widths. This is bad.
+                 * Warn and use a default.
+                 */
                 dev_warn(&pdev->dev, "WARNING! Platform hasn't set available "
                          "data widths, using default 8 bit\n");
                 mx3_cam->platform_flags |= MX3_CAMERA_DATAWIDTH_8;
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index 5fc4ac0d88f0..7400eacb4d64 100644
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
@@ -1450,12 +1450,11 @@ static int omap24xxcam_mmap(struct file *file, struct vm_area_struct *vma)
 
 static int omap24xxcam_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
         struct omap24xxcam_device *cam = omap24xxcam.priv;
         struct omap24xxcam_fh *fh;
         struct v4l2_format format;
 
-        if (!cam || !cam->vfd || (cam->vfd->minor != minor))
+        if (!cam || !cam->vfd)
                 return -ENODEV;
 
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
@@ -1660,7 +1659,6 @@ static int omap24xxcam_device_register(struct v4l2_int_device *s)
 
         strlcpy(vfd->name, CAM_NAME, sizeof(vfd->name));
         vfd->fops                = &omap24xxcam_fops;
-        vfd->minor               = -1;
         vfd->ioctl_ops           = &omap24xxcam_ioctl_fops;
 
         omap24xxcam_hwinit(cam);
@@ -1671,14 +1669,14 @@ static int omap24xxcam_device_register(struct v4l2_int_device *s)
 
         if (video_register_device(vfd, VFL_TYPE_GRABBER, video_nr) < 0) {
                 dev_err(cam->dev, "could not register V4L device\n");
-                vfd->minor = -1;
                 rval = -EBUSY;
                 goto err;
         }
 
         omap24xxcam_poweron_reset(cam);
 
-        dev_info(cam->dev, "registered device video%d\n", vfd->minor);
+        dev_info(cam->dev, "registered device %s\n",
+                 video_device_node_name(vfd));
 
         return 0;
 
@@ -1695,7 +1693,7 @@ static void omap24xxcam_device_unregister(struct v4l2_int_device *s)
         omap24xxcam_sensor_exit(cam);
 
         if (cam->vfd) {
-                if (cam->vfd->minor == -1) {
+                if (!video_is_registered(cam->vfd)) {
                         /*
                          * The device was never registered, so release the
                          * video_device struct directly.
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index 0bc2cf573c76..e0bce8dc74bf 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -4674,7 +4674,6 @@ static struct video_device vdev_template = {
         .name =         "OV511 USB Camera",
         .fops =         &ov511_fops,
         .release =      video_device_release,
-        .minor =        -1,
 };
 
 /****************************************************************************
@@ -5867,8 +5866,8 @@ ov51x_probe(struct usb_interface *intf, const struct usb_device_id *id)
         ov511_devused |= 1 << nr;
         ov->nr = nr;
 
-        dev_info(&intf->dev, "Device at %s registered to minor %d\n",
-                 ov->usb_path, ov->vdev->minor);
+        dev_info(&intf->dev, "Device at %s registered to %s\n",
+                 ov->usb_path, video_device_node_name(ov->vdev));
 
         usb_set_intfdata(intf, ov);
         if (ov_create_sysfs(ov->vdev)) {
@@ -5878,13 +5877,13 @@ ov51x_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 goto error;
         }
 
-        mutex_lock(&ov->lock);
+        mutex_unlock(&ov->lock);
 
         return 0;
 
 error:
         if (ov->vdev) {
-                if (-1 == ov->vdev->minor)
+                if (!video_is_registered(ov->vdev))
                         video_device_release(ov->vdev);
                 else
                         video_unregister_device(ov->vdev);
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c
index 205229333466..3a45e945a528 100644
--- a/drivers/media/video/ov772x.c
+++ b/drivers/media/video/ov772x.c
@@ -24,6 +24,7 @@
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-subdev.h>
 #include <media/soc_camera.h>
+#include <media/soc_mediabus.h>
 #include <media/ov772x.h>
 
 /*
@@ -382,7 +383,8 @@ struct regval_list {
 };
 
 struct ov772x_color_format {
-        const struct soc_camera_data_format *format;
+        enum v4l2_mbus_pixelcode code;
+        enum v4l2_colorspace colorspace;
         u8 dsp3;
         u8 com3;
         u8 com7;
@@ -399,7 +401,7 @@ struct ov772x_win_size {
 struct ov772x_priv {
         struct v4l2_subdev                subdev;
         struct ov772x_camera_info        *info;
-        const struct ov772x_color_format *fmt;
+        const struct ov772x_color_format *cfmt;
         const struct ov772x_win_size     *win;
         int                               model;
         unsigned short                    flag_vflip:1;
@@ -434,93 +436,57 @@ static const struct regval_list ov772x_vga_regs[] = {
 };
 
 /*
- * supported format list
- */
-
-#define SETFOURCC(type) .name = (#type), .fourcc = (V4L2_PIX_FMT_ ## type)
-static const struct soc_camera_data_format ov772x_fmt_lists[] = {
-        {
-                SETFOURCC(YUYV),
-                .depth      = 16,
-                .colorspace = V4L2_COLORSPACE_JPEG,
-        },
-        {
-                SETFOURCC(YVYU),
-                .depth      = 16,
-                .colorspace = V4L2_COLORSPACE_JPEG,
-        },
-        {
-                SETFOURCC(UYVY),
-                .depth      = 16,
-                .colorspace = V4L2_COLORSPACE_JPEG,
-        },
-        {
-                SETFOURCC(RGB555),
-                .depth      = 16,
-                .colorspace = V4L2_COLORSPACE_SRGB,
-        },
-        {
-                SETFOURCC(RGB555X),
-                .depth      = 16,
-                .colorspace = V4L2_COLORSPACE_SRGB,
-        },
-        {
-                SETFOURCC(RGB565),
-                .depth      = 16,
-                .colorspace = V4L2_COLORSPACE_SRGB,
-        },
-        {
-                SETFOURCC(RGB565X),
-                .depth      = 16,
-                .colorspace = V4L2_COLORSPACE_SRGB,
-        },
-};
-
-/*
- * color format list
+ * supported color format list
  */
 static const struct ov772x_color_format ov772x_cfmts[] = {
         {
-                .format = &ov772x_fmt_lists[0],
-                .dsp3   = 0x0,
-                .com3   = SWAP_YUV,
-                .com7   = OFMT_YUV,
+                .code           = V4L2_MBUS_FMT_YUYV8_2X8_LE,
+                .colorspace     = V4L2_COLORSPACE_JPEG,
+                .dsp3           = 0x0,
+                .com3           = SWAP_YUV,
+                .com7           = OFMT_YUV,
         },
         {
-                .format = &ov772x_fmt_lists[1],
-                .dsp3   = UV_ON,
-                .com3   = SWAP_YUV,
-                .com7   = OFMT_YUV,
+                .code           = V4L2_MBUS_FMT_YVYU8_2X8_LE,
+                .colorspace     = V4L2_COLORSPACE_JPEG,
+                .dsp3           = UV_ON,
+                .com3           = SWAP_YUV,
+                .com7           = OFMT_YUV,
         },
         {
-                .format = &ov772x_fmt_lists[2],
-                .dsp3   = 0x0,
-                .com3   = 0x0,
-                .com7   = OFMT_YUV,
+                .code           = V4L2_MBUS_FMT_YUYV8_2X8_BE,
+                .colorspace     = V4L2_COLORSPACE_JPEG,
+                .dsp3           = 0x0,
+                .com3           = 0x0,
+                .com7           = OFMT_YUV,
         },
         {
-                .format = &ov772x_fmt_lists[3],
-                .dsp3   = 0x0,
-                .com3   = SWAP_RGB,
-                .com7   = FMT_RGB555 | OFMT_RGB,
+                .code           = V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
+                .colorspace     = V4L2_COLORSPACE_SRGB,
+                .dsp3           = 0x0,
+                .com3           = SWAP_RGB,
+                .com7           = FMT_RGB555 | OFMT_RGB,
         },
         {
-                .format = &ov772x_fmt_lists[4],
-                .dsp3   = 0x0,
-                .com3   = 0x0,
-                .com7   = FMT_RGB555 | OFMT_RGB,
+                .code           = V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE,
+                .colorspace     = V4L2_COLORSPACE_SRGB,
+                .dsp3           = 0x0,
+                .com3           = 0x0,
+                .com7           = FMT_RGB555 | OFMT_RGB,
         },
         {
-                .format = &ov772x_fmt_lists[5],
-                .dsp3   = 0x0,
-                .com3   = SWAP_RGB,
-                .com7   = FMT_RGB565 | OFMT_RGB,
+                .code           = V4L2_MBUS_FMT_RGB565_2X8_LE,
+                .colorspace     = V4L2_COLORSPACE_SRGB,
+                .dsp3           = 0x0,
+                .com3           = SWAP_RGB,
+                .com7           = FMT_RGB565 | OFMT_RGB,
         },
         {
-                .format = &ov772x_fmt_lists[6],
-                .dsp3   = 0x0,
-                .com3   = 0x0,
-                .com7   = FMT_RGB565 | OFMT_RGB,
+                .code           = V4L2_MBUS_FMT_RGB565_2X8_BE,
+                .colorspace     = V4L2_COLORSPACE_SRGB,
+                .dsp3           = 0x0,
+                .com3           = 0x0,
+                .com7           = FMT_RGB565 | OFMT_RGB,
         },
 };
 
@@ -642,15 +608,15 @@ static int ov772x_s_stream(struct v4l2_subdev *sd, int enable)
                 return 0;
         }
 
-        if (!priv->win || !priv->fmt) {
+        if (!priv->win || !priv->cfmt) {
                 dev_err(&client->dev, "norm or win select error\n");
                 return -EPERM;
         }
 
         ov772x_mask_set(client, COM2, SOFT_SLEEP_MODE, 0);
 
-        dev_dbg(&client->dev, "format %s, win %s\n",
-                priv->fmt->format->name, priv->win->name);
+        dev_dbg(&client->dev, "format %d, win %s\n",
+                priv->cfmt->code, priv->win->name);
 
         return 0;
 }
@@ -806,8 +772,8 @@ static const struct ov772x_win_size *ov772x_select_win(u32 width, u32 height)
         return win;
 }
 
-static int ov772x_set_params(struct i2c_client *client,
-                             u32 *width, u32 *height, u32 pixfmt)
+static int ov772x_set_params(struct i2c_client *client, u32 *width, u32 *height,
+                             enum v4l2_mbus_pixelcode code)
 {
         struct ov772x_priv *priv = to_ov772x(client);
         int ret = -EINVAL;
@@ -817,14 +783,14 @@ static int ov772x_set_params(struct i2c_client *client,
         /*
          * select format
          */
-        priv->fmt = NULL;
+        priv->cfmt = NULL;
         for (i = 0; i < ARRAY_SIZE(ov772x_cfmts); i++) {
-                if (pixfmt == ov772x_cfmts[i].format->fourcc) {
-                        priv->fmt = ov772x_cfmts + i;
+                if (code == ov772x_cfmts[i].code) {
+                        priv->cfmt = ov772x_cfmts + i;
                         break;
                 }
         }
-        if (!priv->fmt)
+        if (!priv->cfmt)
                 goto ov772x_set_fmt_error;
 
         /*
@@ -894,7 +860,7 @@ static int ov772x_set_params(struct i2c_client *client,
         /*
          * set DSP_CTRL3
          */
-        val = priv->fmt->dsp3;
+        val = priv->cfmt->dsp3;
         if (val) {
                 ret = ov772x_mask_set(client,
                                       DSP_CTRL3, UV_MASK, val);
@@ -905,7 +871,7 @@ static int ov772x_set_params(struct i2c_client *client,
         /*
          * set COM3
          */
-        val = priv->fmt->com3;
+        val = priv->cfmt->com3;
         if (priv->info->flags & OV772X_FLAG_VFLIP)
                 val |= VFLIP_IMG;
         if (priv->info->flags & OV772X_FLAG_HFLIP)
@@ -923,9 +889,9 @@ static int ov772x_set_params(struct i2c_client *client,
         /*
          * set COM7
          */
-        val = priv->win->com7_bit | priv->fmt->com7;
+        val = priv->win->com7_bit | priv->cfmt->com7;
         ret = ov772x_mask_set(client,
-                              COM7, (SLCT_MASK | FMT_MASK | OFMT_MASK),
+                              COM7, SLCT_MASK | FMT_MASK | OFMT_MASK,
                               val);
         if (ret < 0)
                 goto ov772x_set_fmt_error;
@@ -951,7 +917,7 @@ ov772x_set_fmt_error:
 
         ov772x_reset(client);
         priv->win = NULL;
-        priv->fmt = NULL;
+        priv->cfmt = NULL;
 
         return ret;
 }
@@ -981,54 +947,79 @@ static int ov772x_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
         return 0;
 }
 
-static int ov772x_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int ov772x_g_fmt(struct v4l2_subdev *sd,
+                        struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
         struct ov772x_priv *priv = to_ov772x(client);
-        struct v4l2_pix_format *pix = &f->fmt.pix;
 
-        if (!priv->win || !priv->fmt) {
+        if (!priv->win || !priv->cfmt) {
                 u32 width = VGA_WIDTH, height = VGA_HEIGHT;
                 int ret = ov772x_set_params(client, &width, &height,
-                                            V4L2_PIX_FMT_YUYV);
+                                            V4L2_MBUS_FMT_YUYV8_2X8_LE);
                 if (ret < 0)
                         return ret;
         }
 
-        f->type                 = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-        pix->width              = priv->win->width;
-        pix->height             = priv->win->height;
-        pix->pixelformat        = priv->fmt->format->fourcc;
-        pix->colorspace         = priv->fmt->format->colorspace;
-        pix->field              = V4L2_FIELD_NONE;
+        mf->width       = priv->win->width;
+        mf->height      = priv->win->height;
+        mf->code        = priv->cfmt->code;
+        mf->colorspace  = priv->cfmt->colorspace;
+        mf->field       = V4L2_FIELD_NONE;
 
         return 0;
 }
 
-static int ov772x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int ov772x_s_fmt(struct v4l2_subdev *sd,
+                        struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
-        struct v4l2_pix_format *pix = &f->fmt.pix;
+        struct ov772x_priv *priv = to_ov772x(client);
+        int ret = ov772x_set_params(client, &mf->width, &mf->height,
+                                    mf->code);
+
+        if (!ret)
+                mf->colorspace = priv->cfmt->colorspace;
 
-        return ov772x_set_params(client, &pix->width, &pix->height,
-                                 pix->pixelformat);
+        return ret;
 }
 
 static int ov772x_try_fmt(struct v4l2_subdev *sd,
-                          struct v4l2_format *f)
+                          struct v4l2_mbus_framefmt *mf)
 {
-        struct v4l2_pix_format *pix = &f->fmt.pix;
+        struct i2c_client *client = sd->priv;
+        struct ov772x_priv *priv = to_ov772x(client);
         const struct ov772x_win_size *win;
+        int i;
 
         /*
          * select suitable win
          */
-        win = ov772x_select_win(pix->width, pix->height);
+        win = ov772x_select_win(mf->width, mf->height);
+
+        mf->width       = win->width;
+        mf->height      = win->height;
+        mf->field       = V4L2_FIELD_NONE;
 
-        pix->width  = win->width;
-        pix->height = win->height;
-        pix->field  = V4L2_FIELD_NONE;
+        for (i = 0; i < ARRAY_SIZE(ov772x_cfmts); i++)
+                if (mf->code == ov772x_cfmts[i].code)
+                        break;
+
+        if (i == ARRAY_SIZE(ov772x_cfmts)) {
+                /* Unsupported format requested. Propose either */
+                if (priv->cfmt) {
+                        /* the current one or */
+                        mf->colorspace = priv->cfmt->colorspace;
+                        mf->code = priv->cfmt->code;
+                } else {
+                        /* the default one */
+                        mf->colorspace = ov772x_cfmts[0].colorspace;
+                        mf->code = ov772x_cfmts[0].code;
+                }
+        } else {
+                /* Also return the colorspace */
+                mf->colorspace  = ov772x_cfmts[i].colorspace;
+        }
 
         return 0;
 }
@@ -1057,9 +1048,6 @@ static int ov772x_video_probe(struct soc_camera_device *icd,
                 return -ENODEV;
         }
 
-        icd->formats     = ov772x_fmt_lists;
-        icd->num_formats = ARRAY_SIZE(ov772x_fmt_lists);
-
         /*
          * check and show product ID and manufacturer ID
          */
@@ -1109,13 +1097,24 @@ static struct v4l2_subdev_core_ops ov772x_subdev_core_ops = {
 #endif
 };
 
+static int ov772x_enum_fmt(struct v4l2_subdev *sd, int index,
+                           enum v4l2_mbus_pixelcode *code)
+{
+        if ((unsigned int)index >= ARRAY_SIZE(ov772x_cfmts))
+                return -EINVAL;
+
+        *code = ov772x_cfmts[index].code;
+        return 0;
+}
+
 static struct v4l2_subdev_video_ops ov772x_subdev_video_ops = {
         .s_stream       = ov772x_s_stream,
-        .g_fmt          = ov772x_g_fmt,
-        .s_fmt          = ov772x_s_fmt,
-        .try_fmt        = ov772x_try_fmt,
+        .g_mbus_fmt     = ov772x_g_fmt,
+        .s_mbus_fmt     = ov772x_s_fmt,
+        .try_mbus_fmt   = ov772x_try_fmt,
         .cropcap        = ov772x_cropcap,
         .g_crop         = ov772x_g_crop,
+        .enum_mbus_fmt  = ov772x_enum_fmt,
 };
 
 static struct v4l2_subdev_ops ov772x_subdev_ops = {
@@ -1143,10 +1142,10 @@ static int ov772x_probe(struct i2c_client *client,
         }
 
         icl = to_soc_camera_link(icd);
-        if (!icl)
+        if (!icl || !icl->priv)
                 return -EINVAL;
 
-        info = container_of(icl, struct ov772x_camera_info, link);
+        info = icl->priv;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                 dev_err(&adapter->dev,
diff --git a/drivers/media/video/ov9640.c b/drivers/media/video/ov9640.c
index c81ae2192887..47bf60ceb7a2 100644
--- a/drivers/media/video/ov9640.c
+++ b/drivers/media/video/ov9640.c
@@ -154,19 +154,10 @@ static const struct ov9640_reg ov9640_regs_rgb[] = {
         { OV9640_MTXS,  0x65 },
 };
 
-/*
- * TODO: this sensor also supports RGB555 and RGB565 formats, but support for
- * them has not yet been sufficiently tested and so it is not included with
- * this version of the driver. To test and debug these formats add two entries
- * to the below array, see ov722x.c for an example.
- */
-static const struct soc_camera_data_format ov9640_fmt_lists[] = {
-        {
-                .name           = "UYVY",
-                .fourcc         = V4L2_PIX_FMT_UYVY,
-                .depth          = 16,
-                .colorspace     = V4L2_COLORSPACE_JPEG,
-        },
+static enum v4l2_mbus_pixelcode ov9640_codes[] = {
+        V4L2_MBUS_FMT_YUYV8_2X8_BE,
+        V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
+        V4L2_MBUS_FMT_RGB565_2X8_LE,
 };
 
 static const struct v4l2_queryctrl ov9640_controls[] = {
@@ -434,20 +425,22 @@ static void ov9640_res_roundup(u32 *width, u32 *height)
 }
 
 /* Prepare necessary register changes depending on color encoding */
-static void ov9640_alter_regs(u32 pixfmt, struct ov9640_reg_alt *alt)
+static void ov9640_alter_regs(enum v4l2_mbus_pixelcode code,
+                              struct ov9640_reg_alt *alt)
 {
-        switch (pixfmt) {
-        case V4L2_PIX_FMT_UYVY:
+        switch (code) {
+        default:
+        case V4L2_MBUS_FMT_YUYV8_2X8_BE:
                 alt->com12      = OV9640_COM12_YUV_AVG;
                 alt->com13      = OV9640_COM13_Y_DELAY_EN |
                                         OV9640_COM13_YUV_DLY(0x01);
                 break;
-        case V4L2_PIX_FMT_RGB555:
+        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
                 alt->com7       = OV9640_COM7_RGB;
                 alt->com13      = OV9640_COM13_RGB_AVG;
                 alt->com15      = OV9640_COM15_RGB_555;
                 break;
-        case V4L2_PIX_FMT_RGB565:
+        case V4L2_MBUS_FMT_RGB565_2X8_LE:
                 alt->com7       = OV9640_COM7_RGB;
                 alt->com13      = OV9640_COM13_RGB_AVG;
                 alt->com15      = OV9640_COM15_RGB_565;
@@ -456,8 +449,8 @@ static void ov9640_alter_regs(u32 pixfmt, struct ov9640_reg_alt *alt)
 }
 
 /* Setup registers according to resolution and color encoding */
-static int ov9640_write_regs(struct i2c_client *client,
-                u32 width, u32 pixfmt, struct ov9640_reg_alt *alts)
+static int ov9640_write_regs(struct i2c_client *client, u32 width,
+                enum v4l2_mbus_pixelcode code, struct ov9640_reg_alt *alts)
 {
         const struct ov9640_reg *ov9640_regs, *matrix_regs;
         int                     ov9640_regs_len, matrix_regs_len;
@@ -500,7 +493,7 @@ static int ov9640_write_regs(struct i2c_client *client,
         }
 
         /* select color matrix configuration for given color encoding */
-        if (pixfmt == V4L2_PIX_FMT_UYVY) {
+        if (code == V4L2_MBUS_FMT_YUYV8_2X8_BE) {
                 matrix_regs     = ov9640_regs_yuv;
                 matrix_regs_len = ARRAY_SIZE(ov9640_regs_yuv);
         } else {
@@ -562,15 +555,17 @@ static int ov9640_prog_dflt(struct i2c_client *client)
 }
 
 /* set the format we will capture in */
-static int ov9640_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int ov9640_s_fmt(struct v4l2_subdev *sd,
+                        struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
-        struct v4l2_pix_format *pix = &f->fmt.pix;
         struct ov9640_reg_alt alts = {0};
+        enum v4l2_colorspace cspace;
+        enum v4l2_mbus_pixelcode code = mf->code;
         int ret;
 
-        ov9640_res_roundup(&pix->width, &pix->height);
-        ov9640_alter_regs(pix->pixelformat, &alts);
+        ov9640_res_roundup(&mf->width, &mf->height);
+        ov9640_alter_regs(mf->code, &alts);
 
         ov9640_reset(client);
 
@@ -578,19 +573,57 @@ static int ov9640_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
         if (ret)
                 return ret;
 
-        return ov9640_write_regs(client, pix->width, pix->pixelformat, &alts);
+        switch (code) {
+        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
+        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+                cspace = V4L2_COLORSPACE_SRGB;
+                break;
+        default:
+                code = V4L2_MBUS_FMT_YUYV8_2X8_BE;
+        case V4L2_MBUS_FMT_YUYV8_2X8_BE:
+                cspace = V4L2_COLORSPACE_JPEG;
+        }
+
+        ret = ov9640_write_regs(client, mf->width, code, &alts);
+        if (!ret) {
+                mf->code        = code;
+                mf->colorspace  = cspace;
+        }
+
+        return ret;
 }
 
-static int ov9640_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int ov9640_try_fmt(struct v4l2_subdev *sd,
+                          struct v4l2_mbus_framefmt *mf)
 {
-        struct v4l2_pix_format *pix = &f->fmt.pix;
+        ov9640_res_roundup(&mf->width, &mf->height);
 
-        ov9640_res_roundup(&pix->width, &pix->height);
-        pix->field  = V4L2_FIELD_NONE;
+        mf->field = V4L2_FIELD_NONE;
+
+        switch (mf->code) {
+        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
+        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+                mf->colorspace = V4L2_COLORSPACE_SRGB;
+                break;
+        default:
+                mf->code = V4L2_MBUS_FMT_YUYV8_2X8_BE;
+        case V4L2_MBUS_FMT_YUYV8_2X8_BE:
+                mf->colorspace = V4L2_COLORSPACE_JPEG;
+        }
 
         return 0;
 }
 
+static int ov9640_enum_fmt(struct v4l2_subdev *sd, int index,
+                           enum v4l2_mbus_pixelcode *code)
+{
+        if ((unsigned int)index >= ARRAY_SIZE(ov9640_codes))
+                return -EINVAL;
+
+        *code = ov9640_codes[index];
+        return 0;
+}
+
 static int ov9640_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
         a->c.left       = 0;
@@ -637,9 +670,6 @@ static int ov9640_video_probe(struct soc_camera_device *icd,
                 goto err;
         }
 
-        icd->formats            = ov9640_fmt_lists;
-        icd->num_formats        = ARRAY_SIZE(ov9640_fmt_lists);
-
         /*
          * check and show product ID and manufacturer ID
          */
@@ -702,11 +732,12 @@ static struct v4l2_subdev_core_ops ov9640_core_ops = {
 };
 
 static struct v4l2_subdev_video_ops ov9640_video_ops = {
-        .s_stream               = ov9640_s_stream,
-        .s_fmt                  = ov9640_s_fmt,
-        .try_fmt                = ov9640_try_fmt,
-        .cropcap                = ov9640_cropcap,
-        .g_crop                 = ov9640_g_crop,
+        .s_stream       = ov9640_s_stream,
+        .s_mbus_fmt     = ov9640_s_fmt,
+        .try_mbus_fmt   = ov9640_try_fmt,
+        .enum_mbus_fmt  = ov9640_enum_fmt,
+        .cropcap        = ov9640_cropcap,
+        .g_crop         = ov9640_g_crop,
 
 };
 
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index 73ec970ca5ca..11a2c26399b5 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -31,7 +31,7 @@
 #include <linux/init.h>
 #include <linux/version.h>
 #include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/io.h>
 
 #include <linux/videodev2.h>
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 6aa48e0ae731..cc8ddb2d2382 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -151,17 +151,6 @@ static struct v4l2_format pvr_format [] = {
 };
 
 
-static const char *get_v4l_name(int v4l_type)
-{
-        switch (v4l_type) {
-        case VFL_TYPE_GRABBER: return "video";
-        case VFL_TYPE_RADIO: return "radio";
-        case VFL_TYPE_VBI: return "vbi";
-        default: return "?";
-        }
-}
-
-
 /*
  * pvr_ioctl()
  *
@@ -891,10 +880,8 @@ static long pvr2_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 
 static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)
 {
-        int num = dip->devbase.num;
         struct pvr2_hdw *hdw = dip->v4lp->channel.mc_head->hdw;
         enum pvr2_config cfg = dip->config;
-        int v4l_type = dip->v4l_type;
 
         pvr2_hdw_v4l_store_minor_number(hdw,dip->minor_type,-1);
 
@@ -906,8 +893,8 @@ static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)
            are gone. */
         video_unregister_device(&dip->devbase);
 
-        printk(KERN_INFO "pvrusb2: unregistered device %s%u [%s]\n",
-               get_v4l_name(v4l_type), num,
+        printk(KERN_INFO "pvrusb2: unregistered device %s [%s]\n",
+               video_device_node_name(&dip->devbase),
                pvr2_config_get_name(cfg));
 
 }
@@ -1317,8 +1304,8 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
                         ": Failed to register pvrusb2 v4l device\n");
         }
 
-        printk(KERN_INFO "pvrusb2: registered device %s%u [%s]\n",
-               get_v4l_name(dip->v4l_type), dip->devbase.num,
+        printk(KERN_INFO "pvrusb2: registered device %s [%s]\n",
+               video_device_node_name(&dip->devbase),
                pvr2_config_get_name(dip->config));
 
         pvr2_hdw_v4l_store_minor_number(vp->channel.mc_head->hdw,
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 89b620f6db7b..aea7e224cef6 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -169,7 +169,6 @@ static struct video_device pwc_template = {
         .name =         "Philips Webcam",       /* Filled in later */
         .release =      video_device_release,
         .fops =         &pwc_fops,
-        .minor =        -1,
 };
 
 /***************************************************************************/
@@ -1807,7 +1806,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
                 goto err_video_release;
         }
 
-        PWC_INFO("Registered as /dev/video%d.\n", pdev->vdev->num);
+        PWC_INFO("Registered as %s.\n", video_device_node_name(pdev->vdev));
 
         /* occupy slot */
         if (hint < MAX_DEV_HINTS)
@@ -1948,7 +1947,9 @@ MODULE_PARM_DESC(size, "Initial image size. One of sqcif, qsif, qcif, sif, cif,
 MODULE_PARM_DESC(fps, "Initial frames per second. Varies with model, useful range 5-30");
 MODULE_PARM_DESC(fbufs, "Number of internal frame buffers to reserve");
 MODULE_PARM_DESC(mbufs, "Number of external (mmap()ed) image buffers");
+#ifdef CONFIG_USB_PWC_DEBUG
 MODULE_PARM_DESC(trace, "For debugging purposes");
+#endif
 MODULE_PARM_DESC(power_save, "Turn power save feature in camera on or off");
 MODULE_PARM_DESC(compression, "Preferred compression quality. Range 0 (uncompressed) to 3 (high compression)");
 MODULE_PARM_DESC(leds, "LED on,off time in milliseconds");
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index 51b683c63b70..294f860ce2b0 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -32,6 +32,7 @@
 #include <media/v4l2-dev.h>
 #include <media/videobuf-dma-sg.h>
 #include <media/soc_camera.h>
+#include <media/soc_mediabus.h>
 
 #include <linux/videodev2.h>
 
@@ -183,23 +184,21 @@ struct pxa_cam_dma {
 /* buffer for one video frame */
 struct pxa_buffer {
         /* common v4l buffer stuff -- must be first */
-        struct videobuf_buffer vb;
-
-        const struct soc_camera_data_format        *fmt;
-
+        struct videobuf_buffer          vb;
+        enum v4l2_mbus_pixelcode        code;
         /* our descriptor lists for Y, U and V channels */
-        struct pxa_cam_dma dmas[3];
-
-        int                     inwork;
-
-        enum pxa_camera_active_dma active_dma;
+        struct pxa_cam_dma              dmas[3];
+        int                             inwork;
+        enum pxa_camera_active_dma      active_dma;
 };
 
 struct pxa_camera_dev {
         struct soc_camera_host  soc_host;
-        /* PXA27x is only supposed to handle one camera on its Quick Capture
+        /*
+         * PXA27x is only supposed to handle one camera on its Quick Capture
          * interface. If anyone ever builds hardware to enable more than
-         * one camera, they will have to modify this driver too */
+         * one camera, they will have to modify this driver too
+         */
         struct soc_camera_device *icd;
         struct clk              *clk;
 
@@ -241,11 +240,15 @@ static int pxa_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
                               unsigned int *size)
 {
         struct soc_camera_device *icd = vq->priv_data;
+        int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
+                                                icd->current_fmt->host_fmt);
+
+        if (bytes_per_line < 0)
+                return bytes_per_line;
 
         dev_dbg(icd->dev.parent, "count=%d, size=%d\n", *count, *size);
 
-        *size = roundup(icd->user_width * icd->user_height *
-                        ((icd->current_fmt->depth + 7) >> 3), 8);
+        *size = bytes_per_line * icd->user_height;
 
         if (0 == *count)
                 *count = 32;
@@ -267,8 +270,10 @@ static void free_buffer(struct videobuf_queue *vq, struct pxa_buffer *buf)
         dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                 &buf->vb, buf->vb.baddr, buf->vb.bsize);
 
-        /* This waits until this buffer is out of danger, i.e., until it is no
-         * longer in STATE_QUEUED or STATE_ACTIVE */
+        /*
+         * This waits until this buffer is out of danger, i.e., until it is no
+         * longer in STATE_QUEUED or STATE_ACTIVE
+         */
         videobuf_waiton(&buf->vb, 0, 0);
         videobuf_dma_unmap(vq, dma);
         videobuf_dma_free(dma);
@@ -429,6 +434,11 @@ static int pxa_videobuf_prepare(struct videobuf_queue *vq,
         struct pxa_buffer *buf = container_of(vb, struct pxa_buffer, vb);
         int ret;
         int size_y, size_u = 0, size_v = 0;
+        int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
+                                                icd->current_fmt->host_fmt);
+
+        if (bytes_per_line < 0)
+                return bytes_per_line;
 
         dev_dbg(dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                 vb, vb->baddr, vb->bsize);
@@ -437,29 +447,33 @@ static int pxa_videobuf_prepare(struct videobuf_queue *vq,
         WARN_ON(!list_empty(&vb->queue));
 
 #ifdef DEBUG
-        /* This can be useful if you want to see if we actually fill
-         * the buffer with something */
+        /*
+         * This can be useful if you want to see if we actually fill
+         * the buffer with something
+         */
         memset((void *)vb->baddr, 0xaa, vb->bsize);
 #endif
 
         BUG_ON(NULL == icd->current_fmt);
 
-        /* I think, in buf_prepare you only have to protect global data,
-         * the actual buffer is yours */
+        /*
+         * I think, in buf_prepare you only have to protect global data,
+         * the actual buffer is yours
+         */
         buf->inwork = 1;
 
-        if (buf->fmt    != icd->current_fmt ||
+        if (buf->code   != icd->current_fmt->code ||
             vb->width   != icd->user_width ||
             vb->height  != icd->user_height ||
             vb->field   != field) {
-                buf->fmt        = icd->current_fmt;
+                buf->code       = icd->current_fmt->code;
                 vb->width       = icd->user_width;
                 vb->height      = icd->user_height;
                 vb->field       = field;
                 vb->state       = VIDEOBUF_NEEDS_INIT;
         }
 
-        vb->size = vb->width * vb->height * ((buf->fmt->depth + 7) >> 3);
+        vb->size = bytes_per_line * vb->height;
         if (0 != vb->baddr && vb->bsize < vb->size) {
                 ret = -EINVAL;
                 goto out;
@@ -834,8 +848,10 @@ static void pxa_camera_init_videobuf(struct videobuf_queue *q,
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct pxa_camera_dev *pcdev = ici->priv;
 
-        /* We must pass NULL as dev pointer, then all pci_* dma operations
-         * transform to normal dma_* ones. */
+        /*
+         * We must pass NULL as dev pointer, then all pci_* dma operations
+         * transform to normal dma_* ones.
+         */
         videobuf_queue_sg_init(q, &pxa_videobuf_ops, NULL, &pcdev->lock,
                                 V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,
                                 sizeof(struct pxa_buffer), icd);
@@ -1051,11 +1067,18 @@ static void pxa_camera_setup_cicr(struct soc_camera_device *icd,
 {
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct pxa_camera_dev *pcdev = ici->priv;
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         unsigned long dw, bpp;
-        u32 cicr0, cicr1, cicr2, cicr3, cicr4 = 0;
+        u32 cicr0, cicr1, cicr2, cicr3, cicr4 = 0, y_skip_top;
+        int ret = v4l2_subdev_call(sd, sensor, g_skip_top_lines, &y_skip_top);
+
+        if (ret < 0)
+                y_skip_top = 0;
 
-        /* Datawidth is now guaranteed to be equal to one of the three values.
-         * We fix bit-per-pixel equal to data-width... */
+        /*
+         * Datawidth is now guaranteed to be equal to one of the three values.
+         * We fix bit-per-pixel equal to data-width...
+         */
         switch (flags & SOCAM_DATAWIDTH_MASK) {
         case SOCAM_DATAWIDTH_10:
                 dw = 4;
@@ -1066,8 +1089,10 @@ static void pxa_camera_setup_cicr(struct soc_camera_device *icd,
                 bpp = 0x20;
                 break;
         default:
-                /* Actually it can only be 8 now,
-                 * default is just to silence compiler warnings */
+                /*
+                 * Actually it can only be 8 now,
+                 * default is just to silence compiler warnings
+                 */
         case SOCAM_DATAWIDTH_8:
                 dw = 2;
                 bpp = 0;
@@ -1118,7 +1143,7 @@ static void pxa_camera_setup_cicr(struct soc_camera_device *icd,
 
         cicr2 = 0;
         cicr3 = CICR3_LPF_VAL(icd->user_height - 1) |
-                CICR3_BFW_VAL(min((unsigned short)255, icd->y_skip_top));
+                CICR3_BFW_VAL(min((u32)255, y_skip_top));
         cicr4 |= pcdev->mclk_divisor;
 
         __raw_writel(cicr1, pcdev->base + CICR1);
@@ -1138,9 +1163,15 @@ static int pxa_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct pxa_camera_dev *pcdev = ici->priv;
         unsigned long bus_flags, camera_flags, common_flags;
-        int ret = test_platform_param(pcdev, icd->buswidth, &bus_flags);
+        const struct soc_mbus_pixelfmt *fmt;
+        int ret;
         struct pxa_cam *cam = icd->host_priv;
 
+        fmt = soc_mbus_get_fmtdesc(icd->current_fmt->code);
+        if (!fmt)
+                return -EINVAL;
+
+        ret = test_platform_param(pcdev, fmt->bits_per_sample, &bus_flags);
         if (ret < 0)
                 return ret;
 
@@ -1204,59 +1235,49 @@ static int pxa_camera_try_bus_param(struct soc_camera_device *icd,
         return soc_camera_bus_param_compatible(camera_flags, bus_flags) ? 0 : -EINVAL;
 }
 
-static const struct soc_camera_data_format pxa_camera_formats[] = {
+static const struct soc_mbus_pixelfmt pxa_camera_formats[] = {
         {
-                .name           = "Planar YUV422 16 bit",
-                .depth          = 16,
-                .fourcc         = V4L2_PIX_FMT_YUV422P,
-                .colorspace     = V4L2_COLORSPACE_JPEG,
+                .fourcc                 = V4L2_PIX_FMT_YUV422P,
+                .name                   = "Planar YUV422 16 bit",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_2X8_PADHI,
+                .order                  = SOC_MBUS_ORDER_LE,
         },
 };
 
-static bool buswidth_supported(struct soc_camera_device *icd, int depth)
+/* This will be corrected as we get more formats */
+static bool pxa_camera_packing_supported(const struct soc_mbus_pixelfmt *fmt)
 {
-        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
-        struct pxa_camera_dev *pcdev = ici->priv;
-
-        switch (depth) {
-        case 8:
-                return !!(pcdev->platform_flags & PXA_CAMERA_DATAWIDTH_8);
-        case 9:
-                return !!(pcdev->platform_flags & PXA_CAMERA_DATAWIDTH_9);
-        case 10:
-                return !!(pcdev->platform_flags & PXA_CAMERA_DATAWIDTH_10);
-        }
-        return false;
-}
-
-static int required_buswidth(const struct soc_camera_data_format *fmt)
-{
-        switch (fmt->fourcc) {
-        case V4L2_PIX_FMT_UYVY:
-        case V4L2_PIX_FMT_VYUY:
-        case V4L2_PIX_FMT_YUYV:
-        case V4L2_PIX_FMT_YVYU:
-        case V4L2_PIX_FMT_RGB565:
-        case V4L2_PIX_FMT_RGB555:
-                return 8;
-        default:
-                return fmt->depth;
-        }
+        return  fmt->packing == SOC_MBUS_PACKING_NONE ||
+                (fmt->bits_per_sample == 8 &&
+                 fmt->packing == SOC_MBUS_PACKING_2X8_PADHI) ||
+                (fmt->bits_per_sample > 8 &&
+                 fmt->packing == SOC_MBUS_PACKING_EXTEND16);
 }
 
 static int pxa_camera_get_formats(struct soc_camera_device *icd, int idx,
                                   struct soc_camera_format_xlate *xlate)
 {
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         struct device *dev = icd->dev.parent;
-        int formats = 0, buswidth, ret;
+        int formats = 0, ret;
         struct pxa_cam *cam;
+        enum v4l2_mbus_pixelcode code;
+        const struct soc_mbus_pixelfmt *fmt;
 
-        buswidth = required_buswidth(icd->formats + idx);
+        ret = v4l2_subdev_call(sd, video, enum_mbus_fmt, idx, &code);
+        if (ret < 0)
+                /* No more formats */
+                return 0;
 
-        if (!buswidth_supported(icd, buswidth))
+        fmt = soc_mbus_get_fmtdesc(code);
+        if (!fmt) {
+                dev_err(dev, "Invalid format code #%d: %d\n", idx, code);
                 return 0;
+        }
 
-        ret = pxa_camera_try_bus_param(icd, buswidth);
+        /* This also checks support for the requested bits-per-sample */
+        ret = pxa_camera_try_bus_param(icd, fmt->bits_per_sample);
         if (ret < 0)
                 return 0;
 
@@ -1270,45 +1291,40 @@ static int pxa_camera_get_formats(struct soc_camera_device *icd, int idx,
                 cam = icd->host_priv;
         }
 
-        switch (icd->formats[idx].fourcc) {
-        case V4L2_PIX_FMT_UYVY:
+        switch (code) {
+        case V4L2_MBUS_FMT_YUYV8_2X8_BE:
                 formats++;
                 if (xlate) {
-                        xlate->host_fmt = &pxa_camera_formats[0];
-                        xlate->cam_fmt = icd->formats + idx;
-                        xlate->buswidth = buswidth;
+                        xlate->host_fmt = &pxa_camera_formats[0];
+                        xlate->code     = code;
                         xlate++;
-                        dev_dbg(dev, "Providing format %s using %s\n",
-                                pxa_camera_formats[0].name,
-                                icd->formats[idx].name);
+                        dev_dbg(dev, "Providing format %s using code %d\n",
+                                pxa_camera_formats[0].name, code);
                 }
-        case V4L2_PIX_FMT_VYUY:
-        case V4L2_PIX_FMT_YUYV:
-        case V4L2_PIX_FMT_YVYU:
-        case V4L2_PIX_FMT_RGB565:
-        case V4L2_PIX_FMT_RGB555:
-                formats++;
-                if (xlate) {
-                        xlate->host_fmt = icd->formats + idx;
-                        xlate->cam_fmt = icd->formats + idx;
-                        xlate->buswidth = buswidth;
-                        xlate++;
+        case V4L2_MBUS_FMT_YVYU8_2X8_BE:
+        case V4L2_MBUS_FMT_YUYV8_2X8_LE:
+        case V4L2_MBUS_FMT_YVYU8_2X8_LE:
+        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
+                if (xlate)
                         dev_dbg(dev, "Providing format %s packed\n",
-                                icd->formats[idx].name);
-                }
+                                fmt->name);
                 break;
         default:
-                /* Generic pass-through */
-                formats++;
-                if (xlate) {
-                        xlate->host_fmt = icd->formats + idx;
-                        xlate->cam_fmt = icd->formats + idx;
-                        xlate->buswidth = icd->formats[idx].depth;
-                        xlate++;
+                if (!pxa_camera_packing_supported(fmt))
+                        return 0;
+                if (xlate)
                         dev_dbg(dev,
                                 "Providing format %s in pass-through mode\n",
-                                icd->formats[idx].name);
-                }
+                                fmt->name);
+        }
+
+        /* Generic pass-through */
+        formats++;
+        if (xlate) {
+                xlate->host_fmt = fmt;
+                xlate->code     = code;
+                xlate++;
         }
 
         return formats;
@@ -1320,11 +1336,11 @@ static void pxa_camera_put_formats(struct soc_camera_device *icd)
         icd->host_priv = NULL;
 }
 
-static int pxa_camera_check_frame(struct v4l2_pix_format *pix)
+static int pxa_camera_check_frame(u32 width, u32 height)
 {
         /* limit to pxa hardware capabilities */
-        return pix->height < 32 || pix->height > 2048 || pix->width < 48 ||
-                pix->width > 2048 || (pix->width & 0x01);
+        return height < 32 || height > 2048 || width < 48 || width > 2048 ||
+                (width & 0x01);
 }
 
 static int pxa_camera_set_crop(struct soc_camera_device *icd,
@@ -1339,9 +1355,9 @@ static int pxa_camera_set_crop(struct soc_camera_device *icd,
                 .master_clock = pcdev->mclk,
                 .pixel_clock_max = pcdev->ciclk / 4,
         };
-        struct v4l2_format f;
-        struct v4l2_pix_format *pix = &f.fmt.pix, pix_tmp;
+        struct v4l2_mbus_framefmt mf;
         struct pxa_cam *cam = icd->host_priv;
+        u32 fourcc = icd->current_fmt->host_fmt->fourcc;
         int ret;
 
         /* If PCLK is used to latch data from the sensor, check sense */
@@ -1358,27 +1374,23 @@ static int pxa_camera_set_crop(struct soc_camera_device *icd,
                 return ret;
         }
 
-        f.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-        ret = v4l2_subdev_call(sd, video, g_fmt, &f);
+        ret = v4l2_subdev_call(sd, video, g_mbus_fmt, &mf);
         if (ret < 0)
                 return ret;
 
-        pix_tmp = *pix;
-        if (pxa_camera_check_frame(pix)) {
+        if (pxa_camera_check_frame(mf.width, mf.height)) {
                 /*
                  * Camera cropping produced a frame beyond our capabilities.
                  * FIXME: just extract a subframe, that we can process.
                  */
-                v4l_bound_align_image(&pix->width, 48, 2048, 1,
-                        &pix->height, 32, 2048, 0,
-                        icd->current_fmt->fourcc == V4L2_PIX_FMT_YUV422P ?
-                                4 : 0);
-                ret = v4l2_subdev_call(sd, video, s_fmt, &f);
+                v4l_bound_align_image(&mf.width, 48, 2048, 1,
+                        &mf.height, 32, 2048, 0,
+                        fourcc == V4L2_PIX_FMT_YUV422P ? 4 : 0);
+                ret = v4l2_subdev_call(sd, video, s_mbus_fmt, &mf);
                 if (ret < 0)
                         return ret;
 
-                if (pxa_camera_check_frame(pix)) {
+                if (pxa_camera_check_frame(mf.width, mf.height)) {
                         dev_warn(icd->dev.parent,
                                  "Inconsistent state. Use S_FMT to repair\n");
                         return -EINVAL;
@@ -1395,10 +1407,10 @@ static int pxa_camera_set_crop(struct soc_camera_device *icd,
                 recalculate_fifo_timeout(pcdev, sense.pixel_clock);
         }
 
-        icd->user_width = pix->width;
-        icd->user_height = pix->height;
+        icd->user_width         = mf.width;
+        icd->user_height        = mf.height;
 
-        pxa_camera_setup_cicr(icd, cam->flags, icd->current_fmt->fourcc);
+        pxa_camera_setup_cicr(icd, cam->flags, fourcc);
 
         return ret;
 }
@@ -1410,14 +1422,13 @@ static int pxa_camera_set_fmt(struct soc_camera_device *icd,
         struct pxa_camera_dev *pcdev = ici->priv;
         struct device *dev = icd->dev.parent;
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
-        const struct soc_camera_data_format *cam_fmt = NULL;
         const struct soc_camera_format_xlate *xlate = NULL;
         struct soc_camera_sense sense = {
                 .master_clock = pcdev->mclk,
                 .pixel_clock_max = pcdev->ciclk / 4,
         };
         struct v4l2_pix_format *pix = &f->fmt.pix;
-        struct v4l2_format cam_f = *f;
+        struct v4l2_mbus_framefmt mf;
         int ret;
 
         xlate = soc_camera_xlate_by_fourcc(icd, pix->pixelformat);
@@ -1426,26 +1437,31 @@ static int pxa_camera_set_fmt(struct soc_camera_device *icd,
                 return -EINVAL;
         }
 
-        cam_fmt = xlate->cam_fmt;
-
         /* If PCLK is used to latch data from the sensor, check sense */
         if (pcdev->platform_flags & PXA_CAMERA_PCLK_EN)
+                /* The caller holds a mutex. */
                 icd->sense = &sense;
 
-        cam_f.fmt.pix.pixelformat = cam_fmt->fourcc;
-        ret = v4l2_subdev_call(sd, video, s_fmt, &cam_f);
-        cam_f.fmt.pix.pixelformat = pix->pixelformat;
-        *pix = cam_f.fmt.pix;
+        mf.width        = pix->width;
+        mf.height       = pix->height;
+        mf.field        = pix->field;
+        mf.colorspace   = pix->colorspace;
+        mf.code         = xlate->code;
+
+        ret = v4l2_subdev_call(sd, video, s_mbus_fmt, &mf);
+
+        if (mf.code != xlate->code)
+                return -EINVAL;
 
         icd->sense = NULL;
 
         if (ret < 0) {
                 dev_warn(dev, "Failed to configure for format %x\n",
                          pix->pixelformat);
-        } else if (pxa_camera_check_frame(pix)) {
+        } else if (pxa_camera_check_frame(mf.width, mf.height)) {
                 dev_warn(dev,
                          "Camera driver produced an unsupported frame %dx%d\n",
-                         pix->width, pix->height);
+                         mf.width, mf.height);
                 ret = -EINVAL;
         } else if (sense.flags & SOCAM_SENSE_PCLK_CHANGED) {
                 if (sense.pixel_clock > sense.pixel_clock_max) {
@@ -1457,10 +1473,14 @@ static int pxa_camera_set_fmt(struct soc_camera_device *icd,
                 recalculate_fifo_timeout(pcdev, sense.pixel_clock);
         }
 
-        if (!ret) {
-                icd->buswidth = xlate->buswidth;
-                icd->current_fmt = xlate->host_fmt;
-        }
+        if (ret < 0)
+                return ret;
+
+        pix->width              = mf.width;
+        pix->height             = mf.height;
+        pix->field              = mf.field;
+        pix->colorspace         = mf.colorspace;
+        icd->current_fmt        = xlate;
 
         return ret;
 }
@@ -1468,17 +1488,16 @@ static int pxa_camera_set_fmt(struct soc_camera_device *icd,
 static int pxa_camera_try_fmt(struct soc_camera_device *icd,
                               struct v4l2_format *f)
 {
-        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         const struct soc_camera_format_xlate *xlate;
         struct v4l2_pix_format *pix = &f->fmt.pix;
+        struct v4l2_mbus_framefmt mf;
         __u32 pixfmt = pix->pixelformat;
-        enum v4l2_field field;
         int ret;
 
         xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
         if (!xlate) {
-                dev_warn(ici->v4l2_dev.dev, "Format %x not found\n", pixfmt);
+                dev_warn(icd->dev.parent, "Format %x not found\n", pixfmt);
                 return -EINVAL;
         }
 
@@ -1492,22 +1511,36 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd,
                               &pix->height, 32, 2048, 0,
                               pixfmt == V4L2_PIX_FMT_YUV422P ? 4 : 0);
 
-        pix->bytesperline = pix->width *
-                DIV_ROUND_UP(xlate->host_fmt->depth, 8);
+        pix->bytesperline = soc_mbus_bytes_per_line(pix->width,
+                                                    xlate->host_fmt);
+        if (pix->bytesperline < 0)
+                return pix->bytesperline;
         pix->sizeimage = pix->height * pix->bytesperline;
 
-        /* camera has to see its format, but the user the original one */
-        pix->pixelformat = xlate->cam_fmt->fourcc;
         /* limit to sensor capabilities */
-        ret = v4l2_subdev_call(sd, video, try_fmt, f);
-        pix->pixelformat = pixfmt;
+        mf.width        = pix->width;
+        mf.height       = pix->height;
+        mf.field        = pix->field;
+        mf.colorspace   = pix->colorspace;
+        mf.code         = xlate->code;
 
-        field = pix->field;
+        ret = v4l2_subdev_call(sd, video, try_mbus_fmt, &mf);
+        if (ret < 0)
+                return ret;
 
-        if (field == V4L2_FIELD_ANY) {
-                pix->field = V4L2_FIELD_NONE;
-        } else if (field != V4L2_FIELD_NONE) {
-                dev_err(icd->dev.parent, "Field type %d unsupported.\n", field);
+        pix->width      = mf.width;
+        pix->height     = mf.height;
+        pix->colorspace = mf.colorspace;
+
+        switch (mf.field) {
+        case V4L2_FIELD_ANY:
+        case V4L2_FIELD_NONE:
+                pix->field      = V4L2_FIELD_NONE;
+                break;
+        default:
+                /* TODO: support interlaced at least in pass-through mode */
+                dev_err(icd->dev.parent, "Field type %d unsupported.\n",
+                        mf.field);
                 return -EINVAL;
         }
 
@@ -1519,10 +1552,12 @@ static int pxa_camera_reqbufs(struct soc_camera_file *icf,
 {
         int i;
 
-        /* This is for locking debugging only. I removed spinlocks and now I
+        /*
+         * This is for locking debugging only. I removed spinlocks and now I
          * check whether .prepare is ever called on a linked buffer, or whether
          * a dma IRQ can occur for an in-work or unlinked buffer. Until now
-         * it hadn't triggered */
+         * it hadn't triggered
+         */
         for (i = 0; i < p->count; i++) {
                 struct pxa_buffer *buf = container_of(icf->vb_vidq.bufs[i],
                                                       struct pxa_buffer, vb);
@@ -1657,8 +1692,10 @@ static int __devinit pxa_camera_probe(struct platform_device *pdev)
         pcdev->platform_flags = pcdev->pdata->flags;
         if (!(pcdev->platform_flags & (PXA_CAMERA_DATAWIDTH_8 |
                         PXA_CAMERA_DATAWIDTH_9 | PXA_CAMERA_DATAWIDTH_10))) {
-                /* Platform hasn't set available data widths. This is bad.
-                 * Warn and use a default. */
+                /*
+                 * Platform hasn't set available data widths. This is bad.
+                 * Warn and use a default.
+                 */
                 dev_warn(&pdev->dev, "WARNING! Platform hasn't set available "
                          "data widths, using default 10 bit\n");
                 pcdev->platform_flags |= PXA_CAMERA_DATAWIDTH_10;
diff --git a/drivers/media/video/rj54n1cb0c.c b/drivers/media/video/rj54n1cb0c.c
index 373f2a30a677..7e42989ce0e4 100644
--- a/drivers/media/video/rj54n1cb0c.c
+++ b/drivers/media/video/rj54n1cb0c.c
@@ -13,9 +13,11 @@
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 
+#include <media/rj54n1cb0c.h>
+#include <media/soc_camera.h>
+#include <media/soc_mediabus.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/soc_camera.h>
 
 #define RJ54N1_DEV_CODE                 0x0400
 #define RJ54N1_DEV_CODE2                0x0401
@@ -38,6 +40,7 @@
 #define RJ54N1_H_OBEN_OFS               0x0413
 #define RJ54N1_V_OBEN_OFS               0x0414
 #define RJ54N1_RESIZE_CONTROL           0x0415
+#define RJ54N1_STILL_CONTROL            0x0417
 #define RJ54N1_INC_USE_SEL_H            0x0425
 #define RJ54N1_INC_USE_SEL_L            0x0426
 #define RJ54N1_MIRROR_STILL_MODE        0x0427
@@ -49,10 +52,21 @@
 #define RJ54N1_RA_SEL_UL                0x0530
 #define RJ54N1_BYTE_SWAP                0x0531
 #define RJ54N1_OUT_SIGPO                0x053b
+#define RJ54N1_WB_SEL_WEIGHT_I          0x054e
+#define RJ54N1_BIT8_WB                  0x0569
+#define RJ54N1_HCAPS_WB                 0x056a
+#define RJ54N1_VCAPS_WB                 0x056b
+#define RJ54N1_HCAPE_WB                 0x056c
+#define RJ54N1_VCAPE_WB                 0x056d
+#define RJ54N1_EXPOSURE_CONTROL         0x058c
 #define RJ54N1_FRAME_LENGTH_S_H         0x0595
 #define RJ54N1_FRAME_LENGTH_S_L         0x0596
 #define RJ54N1_FRAME_LENGTH_P_H         0x0597
 #define RJ54N1_FRAME_LENGTH_P_L         0x0598
+#define RJ54N1_PEAK_H                   0x05b7
+#define RJ54N1_PEAK_50                  0x05b8
+#define RJ54N1_PEAK_60                  0x05b9
+#define RJ54N1_PEAK_DIFF                0x05ba
 #define RJ54N1_IOC                      0x05ef
 #define RJ54N1_TG_BYPASS                0x0700
 #define RJ54N1_PLL_L                    0x0701
@@ -68,6 +82,7 @@
 #define RJ54N1_OCLK_SEL_EN              0x0713
 #define RJ54N1_CLK_RST                  0x0717
 #define RJ54N1_RESET_STANDBY            0x0718
+#define RJ54N1_FWFLG                    0x07fe
 
 #define E_EXCLK                         (1 << 7)
 #define SOFT_STDBY                      (1 << 4)
@@ -78,29 +93,53 @@
 #define RESIZE_HOLD_SEL                 (1 << 2)
 #define RESIZE_GO                       (1 << 1)
 
+/*
+ * When cropping, the camera automatically centers the cropped region, there
+ * doesn't seem to be a way to specify an explicit location of the rectangle.
+ */
 #define RJ54N1_COLUMN_SKIP              0
 #define RJ54N1_ROW_SKIP                 0
 #define RJ54N1_MAX_WIDTH                1600
 #define RJ54N1_MAX_HEIGHT               1200
 
+#define PLL_L                           2
+#define PLL_N                           0x31
+
 /* I2C addresses: 0x50, 0x51, 0x60, 0x61 */
 
-static const struct soc_camera_data_format rj54n1_colour_formats[] = {
-        {
-                .name           = "YUYV",
-                .depth          = 16,
-                .fourcc         = V4L2_PIX_FMT_YUYV,
-                .colorspace     = V4L2_COLORSPACE_JPEG,
-        }, {
-                .name           = "RGB565",
-                .depth          = 16,
-                .fourcc         = V4L2_PIX_FMT_RGB565,
-                .colorspace     = V4L2_COLORSPACE_SRGB,
-        }
+/* RJ54N1CB0C has only one fixed colorspace per pixelcode */
+struct rj54n1_datafmt {
+        enum v4l2_mbus_pixelcode        code;
+        enum v4l2_colorspace            colorspace;
+};
+
+/* Find a data format by a pixel code in an array */
+static const struct rj54n1_datafmt *rj54n1_find_datafmt(
+        enum v4l2_mbus_pixelcode code, const struct rj54n1_datafmt *fmt,
+        int n)
+{
+        int i;
+        for (i = 0; i < n; i++)
+                if (fmt[i].code == code)
+                        return fmt + i;
+
+        return NULL;
+}
+
+static const struct rj54n1_datafmt rj54n1_colour_fmts[] = {
+        {V4L2_MBUS_FMT_YUYV8_2X8_LE, V4L2_COLORSPACE_JPEG},
+        {V4L2_MBUS_FMT_YVYU8_2X8_LE, V4L2_COLORSPACE_JPEG},
+        {V4L2_MBUS_FMT_RGB565_2X8_LE, V4L2_COLORSPACE_SRGB},
+        {V4L2_MBUS_FMT_RGB565_2X8_BE, V4L2_COLORSPACE_SRGB},
+        {V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
+        {V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE, V4L2_COLORSPACE_SRGB},
+        {V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE, V4L2_COLORSPACE_SRGB},
+        {V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE, V4L2_COLORSPACE_SRGB},
+        {V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
 };
 
 struct rj54n1_clock_div {
-        u8 ratio_tg;
+        u8 ratio_tg;    /* can be 0 or an odd number */
         u8 ratio_t;
         u8 ratio_r;
         u8 ratio_op;
@@ -109,12 +148,14 @@ struct rj54n1_clock_div {
 
 struct rj54n1 {
         struct v4l2_subdev subdev;
+        struct rj54n1_clock_div clk_div;
+        const struct rj54n1_datafmt *fmt;
         struct v4l2_rect rect;  /* Sensor window */
+        unsigned int tgclk_mhz;
+        bool auto_wb;
         unsigned short width;   /* Output window */
         unsigned short height;
         unsigned short resize;  /* Sensor * 1024 / resize = Output */
-        struct rj54n1_clock_div clk_div;
-        u32 fourcc;
         unsigned short scale;
         u8 bank;
 };
@@ -171,7 +212,7 @@ const static struct rj54n1_reg_val bank_7[] = {
         {0x714, 0xff},
         {0x715, 0xff},
         {0x716, 0x1f},
-        {0x7FE, 0x02},
+        {0x7FE, 2},
 };
 
 const static struct rj54n1_reg_val bank_8[] = {
@@ -359,7 +400,7 @@ const static struct rj54n1_reg_val bank_8[] = {
         {0x8BB, 0x00},
         {0x8BC, 0xFF},
         {0x8BD, 0x00},
-        {0x8FE, 0x02},
+        {0x8FE, 2},
 };
 
 const static struct rj54n1_reg_val bank_10[] = {
@@ -440,12 +481,24 @@ static int reg_write_multiple(struct i2c_client *client,
         return 0;
 }
 
-static int rj54n1_s_stream(struct v4l2_subdev *sd, int enable)
+static int rj54n1_enum_fmt(struct v4l2_subdev *sd, int index,
+                           enum v4l2_mbus_pixelcode *code)
 {
-        /* TODO: start / stop streaming */
+        if ((unsigned int)index >= ARRAY_SIZE(rj54n1_colour_fmts))
+                return -EINVAL;
+
+        *code = rj54n1_colour_fmts[index].code;
         return 0;
 }
 
+static int rj54n1_s_stream(struct v4l2_subdev *sd, int enable)
+{
+        struct i2c_client *client = sd->priv;
+
+        /* Switch between preview and still shot modes */
+        return reg_set(client, RJ54N1_STILL_CONTROL, (!enable) << 7, 0x80);
+}
+
 static int rj54n1_set_bus_param(struct soc_camera_device *icd,
                                 unsigned long flags)
 {
@@ -502,6 +555,44 @@ static int rj54n1_commit(struct i2c_client *client)
         return ret;
 }
 
+static int rj54n1_sensor_scale(struct v4l2_subdev *sd, u32 *in_w, u32 *in_h,
+                               u32 *out_w, u32 *out_h);
+
+static int rj54n1_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
+{
+        struct i2c_client *client = sd->priv;
+        struct rj54n1 *rj54n1 = to_rj54n1(client);
+        struct v4l2_rect *rect = &a->c;
+        unsigned int dummy, output_w, output_h,
+                input_w = rect->width, input_h = rect->height;
+        int ret;
+
+        /* arbitrary minimum width and height, edges unimportant */
+        soc_camera_limit_side(&dummy, &input_w,
+                     RJ54N1_COLUMN_SKIP, 8, RJ54N1_MAX_WIDTH);
+
+        soc_camera_limit_side(&dummy, &input_h,
+                     RJ54N1_ROW_SKIP, 8, RJ54N1_MAX_HEIGHT);
+
+        output_w = (input_w * 1024 + rj54n1->resize / 2) / rj54n1->resize;
+        output_h = (input_h * 1024 + rj54n1->resize / 2) / rj54n1->resize;
+
+        dev_dbg(&client->dev, "Scaling for %ux%u : %u = %ux%u\n",
+                input_w, input_h, rj54n1->resize, output_w, output_h);
+
+        ret = rj54n1_sensor_scale(sd, &input_w, &input_h, &output_w, &output_h);
+        if (ret < 0)
+                return ret;
+
+        rj54n1->width           = output_w;
+        rj54n1->height          = output_h;
+        rj54n1->resize          = ret;
+        rj54n1->rect.width      = input_w;
+        rj54n1->rect.height     = input_h;
+
+        return 0;
+}
+
 static int rj54n1_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
         struct i2c_client *client = sd->priv;
@@ -527,16 +618,17 @@ static int rj54n1_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
         return 0;
 }
 
-static int rj54n1_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int rj54n1_g_fmt(struct v4l2_subdev *sd,
+                        struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
         struct rj54n1 *rj54n1 = to_rj54n1(client);
-        struct v4l2_pix_format *pix = &f->fmt.pix;
 
-        pix->pixelformat        = rj54n1->fourcc;
-        pix->field              = V4L2_FIELD_NONE;
-        pix->width              = rj54n1->width;
-        pix->height             = rj54n1->height;
+        mf->code        = rj54n1->fmt->code;
+        mf->colorspace  = rj54n1->fmt->colorspace;
+        mf->field       = V4L2_FIELD_NONE;
+        mf->width       = rj54n1->width;
+        mf->height      = rj54n1->height;
 
         return 0;
 }
@@ -550,11 +642,44 @@ static int rj54n1_sensor_scale(struct v4l2_subdev *sd, u32 *in_w, u32 *in_h,
                                u32 *out_w, u32 *out_h)
 {
         struct i2c_client *client = sd->priv;
+        struct rj54n1 *rj54n1 = to_rj54n1(client);
         unsigned int skip, resize, input_w = *in_w, input_h = *in_h,
                 output_w = *out_w, output_h = *out_h;
-        u16 inc_sel;
+        u16 inc_sel, wb_bit8, wb_left, wb_right, wb_top, wb_bottom;
+        unsigned int peak, peak_50, peak_60;
         int ret;
 
+        /*
+         * We have a problem with crops, where the window is larger than 512x384
+         * and output window is larger than a half of the input one. In this
+         * case we have to either reduce the input window to equal or below
+         * 512x384 or the output window to equal or below 1/2 of the input.
+         */
+        if (output_w > max(512U, input_w / 2)) {
+                if (2 * output_w > RJ54N1_MAX_WIDTH) {
+                        input_w = RJ54N1_MAX_WIDTH;
+                        output_w = RJ54N1_MAX_WIDTH / 2;
+                } else {
+                        input_w = output_w * 2;
+                }
+
+                dev_dbg(&client->dev, "Adjusted output width: in %u, out %u\n",
+                        input_w, output_w);
+        }
+
+        if (output_h > max(384U, input_h / 2)) {
+                if (2 * output_h > RJ54N1_MAX_HEIGHT) {
+                        input_h = RJ54N1_MAX_HEIGHT;
+                        output_h = RJ54N1_MAX_HEIGHT / 2;
+                } else {
+                        input_h = output_h * 2;
+                }
+
+                dev_dbg(&client->dev, "Adjusted output height: in %u, out %u\n",
+                        input_h, output_h);
+        }
+
+        /* Idea: use the read mode for snapshots, handle separate geometries */
         ret = rj54n1_set_rect(client, RJ54N1_X_OUTPUT_SIZE_S_L,
                               RJ54N1_Y_OUTPUT_SIZE_S_L,
                               RJ54N1_XY_OUTPUT_SIZE_S_H, output_w, output_h);
@@ -566,17 +691,27 @@ static int rj54n1_sensor_scale(struct v4l2_subdev *sd, u32 *in_w, u32 *in_h,
         if (ret < 0)
                 return ret;
 
-        if (output_w > input_w || output_h > input_h) {
+        if (output_w > input_w && output_h > input_h) {
                 input_w = output_w;
                 input_h = output_h;
 
                 resize = 1024;
         } else {
                 unsigned int resize_x, resize_y;
-                resize_x = input_w * 1024 / output_w;
-                resize_y = input_h * 1024 / output_h;
-
-                resize = min(resize_x, resize_y);
+                resize_x = (input_w * 1024 + output_w / 2) / output_w;
+                resize_y = (input_h * 1024 + output_h / 2) / output_h;
+
+                /* We want max(resize_x, resize_y), check if it still fits */
+                if (resize_x > resize_y &&
+                    (output_h * resize_x + 512) / 1024 > RJ54N1_MAX_HEIGHT)
+                        resize = (RJ54N1_MAX_HEIGHT * 1024 + output_h / 2) /
+                                output_h;
+                else if (resize_y > resize_x &&
+                         (output_w * resize_y + 512) / 1024 > RJ54N1_MAX_WIDTH)
+                        resize = (RJ54N1_MAX_WIDTH * 1024 + output_w / 2) /
+                                output_w;
+                else
+                        resize = max(resize_x, resize_y);
 
                 /* Prohibited value ranges */
                 switch (resize) {
@@ -589,12 +724,9 @@ static int rj54n1_sensor_scale(struct v4l2_subdev *sd, u32 *in_w, u32 *in_h,
                 case 8160 ... 8191:
                         resize = 8159;
                         break;
-                case 16320 ... 16383:
+                case 16320 ... 16384:
                         resize = 16319;
                 }
-
-                input_w = output_w * resize / 1024;
-                input_h = output_h * resize / 1024;
         }
 
         /* Set scaling */
@@ -607,9 +739,18 @@ static int rj54n1_sensor_scale(struct v4l2_subdev *sd, u32 *in_w, u32 *in_h,
 
         /*
          * Configure a skipping bitmask. The sensor will select a skipping value
-         * among set bits automatically.
+         * among set bits automatically. This is very unclear in the datasheet
+         * too. I was told, in this register one enables all skipping values,
+         * that are required for a specific resize, and the camera selects
+         * automatically, which ones to use. But it is unclear how to identify,
+         * which cropping values are needed. Secondly, why don't we just set all
+         * bits and let the camera choose? Would it increase processing time and
+         * reduce the framerate? Using 0xfffc for INC_USE_SEL doesn't seem to
+         * improve the image quality or stability for larger frames (see comment
+         * above), but I didn't check the framerate.
          */
         skip = min(resize / 1024, (unsigned)15);
+
         inc_sel = 1 << skip;
 
         if (inc_sel <= 2)
@@ -621,6 +762,43 @@ static int rj54n1_sensor_scale(struct v4l2_subdev *sd, u32 *in_w, u32 *in_h,
         if (!ret)
                 ret = reg_write(client, RJ54N1_INC_USE_SEL_H, inc_sel >> 8);
 
+        if (!rj54n1->auto_wb) {
+                /* Auto white balance window */
+                wb_left   = output_w / 16;
+                wb_right  = (3 * output_w / 4 - 3) / 4;
+                wb_top    = output_h / 16;
+                wb_bottom = (3 * output_h / 4 - 3) / 4;
+                wb_bit8   = ((wb_left >> 2) & 0x40) | ((wb_top >> 4) & 0x10) |
+                        ((wb_right >> 6) & 4) | ((wb_bottom >> 8) & 1);
+
+                if (!ret)
+                        ret = reg_write(client, RJ54N1_BIT8_WB, wb_bit8);
+                if (!ret)
+                        ret = reg_write(client, RJ54N1_HCAPS_WB, wb_left);
+                if (!ret)
+                        ret = reg_write(client, RJ54N1_VCAPS_WB, wb_top);
+                if (!ret)
+                        ret = reg_write(client, RJ54N1_HCAPE_WB, wb_right);
+                if (!ret)
+                        ret = reg_write(client, RJ54N1_VCAPE_WB, wb_bottom);
+        }
+
+        /* Antiflicker */
+        peak = 12 * RJ54N1_MAX_WIDTH * (1 << 14) * resize / rj54n1->tgclk_mhz /
+                10000;
+        peak_50 = peak / 6;
+        peak_60 = peak / 5;
+
+        if (!ret)
+                ret = reg_write(client, RJ54N1_PEAK_H,
+                                ((peak_50 >> 4) & 0xf0) | (peak_60 >> 8));
+        if (!ret)
+                ret = reg_write(client, RJ54N1_PEAK_50, peak_50);
+        if (!ret)
+                ret = reg_write(client, RJ54N1_PEAK_60, peak_60);
+        if (!ret)
+                ret = reg_write(client, RJ54N1_PEAK_DIFF, peak / 150);
+
         /* Start resizing */
         if (!ret)
                 ret = reg_write(client, RJ54N1_RESIZE_CONTROL,
@@ -629,8 +807,6 @@ static int rj54n1_sensor_scale(struct v4l2_subdev *sd, u32 *in_w, u32 *in_h,
         if (ret < 0)
                 return ret;
 
-        dev_dbg(&client->dev, "resize %u, skip %u\n", resize, skip);
-
         /* Constant taken from manufacturer's example */
         msleep(230);
 
@@ -638,11 +814,14 @@ static int rj54n1_sensor_scale(struct v4l2_subdev *sd, u32 *in_w, u32 *in_h,
         if (ret < 0)
                 return ret;
 
-        *in_w = input_w;
-        *in_h = input_h;
+        *in_w = (output_w * resize + 512) / 1024;
+        *in_h = (output_h * resize + 512) / 1024;
         *out_w = output_w;
         *out_h = output_h;
 
+        dev_dbg(&client->dev, "Scaled for %ux%u : %u = %ux%u, skip %u\n",
+                *in_w, *in_h, resize, output_w, output_h, skip);
+
         return resize;
 }
 
@@ -653,14 +832,14 @@ static int rj54n1_set_clock(struct i2c_client *client)
 
         /* Enable external clock */
         ret = reg_write(client, RJ54N1_RESET_STANDBY, E_EXCLK | SOFT_STDBY);
-        /* Leave stand-by */
+        /* Leave stand-by. Note: use this when implementing suspend / resume */
         if (!ret)
                 ret = reg_write(client, RJ54N1_RESET_STANDBY, E_EXCLK);
 
         if (!ret)
-                ret = reg_write(client, RJ54N1_PLL_L, 2);
+                ret = reg_write(client, RJ54N1_PLL_L, PLL_L);
         if (!ret)
-                ret = reg_write(client, RJ54N1_PLL_N, 0x31);
+                ret = reg_write(client, RJ54N1_PLL_N, PLL_N);
 
         /* TGCLK dividers */
         if (!ret)
@@ -719,6 +898,7 @@ static int rj54n1_set_clock(struct i2c_client *client)
                         "Resetting RJ54N1CB0C clock failed: %d!\n", ret);
                 return -EIO;
         }
+
         /* Start the PLL */
         ret = reg_set(client, RJ54N1_OCLK_DSP, 1, 1);
 
@@ -731,6 +911,7 @@ static int rj54n1_set_clock(struct i2c_client *client)
 
 static int rj54n1_reg_init(struct i2c_client *client)
 {
+        struct rj54n1 *rj54n1 = to_rj54n1(client);
         int ret = rj54n1_set_clock(client);
 
         if (!ret)
@@ -753,14 +934,26 @@ static int rj54n1_reg_init(struct i2c_client *client)
         if (!ret)
                 ret = reg_write(client, RJ54N1_Y_GAIN, 0x84);
 
-        /* Mirror the image back: default is upside down and left-to-right... */
+        /*
+         * Mirror the image back: default is upside down and left-to-right...
+         * Set manual preview / still shot switching
+         */
         if (!ret)
-                ret = reg_set(client, RJ54N1_MIRROR_STILL_MODE, 3, 3);
+                ret = reg_write(client, RJ54N1_MIRROR_STILL_MODE, 0x27);
 
         if (!ret)
                 ret = reg_write_multiple(client, bank_4, ARRAY_SIZE(bank_4));
+
+        /* Auto exposure area */
         if (!ret)
+                ret = reg_write(client, RJ54N1_EXPOSURE_CONTROL, 0x80);
+        /* Check current auto WB config */
+        if (!ret)
+                ret = reg_read(client, RJ54N1_WB_SEL_WEIGHT_I);
+        if (ret >= 0) {
+                rj54n1->auto_wb = ret & 0x80;
                 ret = reg_write_multiple(client, bank_5, ARRAY_SIZE(bank_5));
+        }
         if (!ret)
                 ret = reg_write_multiple(client, bank_8, ARRAY_SIZE(bank_8));
 
@@ -777,8 +970,9 @@ static int rj54n1_reg_init(struct i2c_client *client)
                 ret = reg_write(client, RJ54N1_RESET_STANDBY,
                                 E_EXCLK | DSP_RSTX | TG_RSTX | SEN_RSTX);
 
+        /* Start register update? Same register as 0x?FE in many bank_* sets */
         if (!ret)
-                ret = reg_write(client, 0x7fe, 2);
+                ret = reg_write(client, RJ54N1_FWFLG, 2);
 
         /* Constant taken from manufacturer's example */
         msleep(700);
@@ -786,27 +980,44 @@ static int rj54n1_reg_init(struct i2c_client *client)
         return ret;
 }
 
-/* FIXME: streaming output only up to 800x600 is functional */
-static int rj54n1_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int rj54n1_try_fmt(struct v4l2_subdev *sd,
+                          struct v4l2_mbus_framefmt *mf)
 {
-        struct v4l2_pix_format *pix = &f->fmt.pix;
+        struct i2c_client *client = sd->priv;
+        struct rj54n1 *rj54n1 = to_rj54n1(client);
+        const struct rj54n1_datafmt *fmt;
+        int align = mf->code == V4L2_MBUS_FMT_SBGGR10_1X10 ||
+                mf->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE ||
+                mf->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE ||
+                mf->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE ||
+                mf->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE;
+
+        dev_dbg(&client->dev, "%s: code = %d, width = %u, height = %u\n",
+                __func__, mf->code, mf->width, mf->height);
+
+        fmt = rj54n1_find_datafmt(mf->code, rj54n1_colour_fmts,
+                                  ARRAY_SIZE(rj54n1_colour_fmts));
+        if (!fmt) {
+                fmt = rj54n1->fmt;
+                mf->code = fmt->code;
+        }
 
-        pix->field = V4L2_FIELD_NONE;
+        mf->field       = V4L2_FIELD_NONE;
+        mf->colorspace  = fmt->colorspace;
 
-        if (pix->width > 800)
-                pix->width = 800;
-        if (pix->height > 600)
-                pix->height = 600;
+        v4l_bound_align_image(&mf->width, 112, RJ54N1_MAX_WIDTH, align,
+                              &mf->height, 84, RJ54N1_MAX_HEIGHT, align, 0);
 
         return 0;
 }
 
-static int rj54n1_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int rj54n1_s_fmt(struct v4l2_subdev *sd,
+                        struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
         struct rj54n1 *rj54n1 = to_rj54n1(client);
-        struct v4l2_pix_format *pix = &f->fmt.pix;
-        unsigned int output_w, output_h,
+        const struct rj54n1_datafmt *fmt;
+        unsigned int output_w, output_h, max_w, max_h,
                 input_w = rj54n1->rect.width, input_h = rj54n1->rect.height;
         int ret;
 
@@ -814,14 +1025,13 @@ static int rj54n1_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
          * The host driver can call us without .try_fmt(), so, we have to take
          * care ourseleves
          */
-        ret = rj54n1_try_fmt(sd, f);
+        rj54n1_try_fmt(sd, mf);
 
         /*
          * Verify if the sensor has just been powered on. TODO: replace this
          * with proper PM, when a suitable API is available.
          */
-        if (!ret)
-                ret = reg_read(client, RJ54N1_RESET_STANDBY);
+        ret = reg_read(client, RJ54N1_RESET_STANDBY);
         if (ret < 0)
                 return ret;
 
@@ -831,50 +1041,105 @@ static int rj54n1_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
                         return ret;
         }
 
+        dev_dbg(&client->dev, "%s: code = %d, width = %u, height = %u\n",
+                __func__, mf->code, mf->width, mf->height);
+
         /* RA_SEL_UL is only relevant for raw modes, ignored otherwise. */
-        switch (pix->pixelformat) {
-        case V4L2_PIX_FMT_YUYV:
+        switch (mf->code) {
+        case V4L2_MBUS_FMT_YUYV8_2X8_LE:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 0);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 8, 8);
                 break;
-        case V4L2_PIX_FMT_RGB565:
+        case V4L2_MBUS_FMT_YVYU8_2X8_LE:
+                ret = reg_write(client, RJ54N1_OUT_SEL, 0);
+                if (!ret)
+                        ret = reg_set(client, RJ54N1_BYTE_SWAP, 0, 8);
+                break;
+        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+                ret = reg_write(client, RJ54N1_OUT_SEL, 0x11);
+                if (!ret)
+                        ret = reg_set(client, RJ54N1_BYTE_SWAP, 8, 8);
+                break;
+        case V4L2_MBUS_FMT_RGB565_2X8_BE:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 0x11);
                 if (!ret)
+                        ret = reg_set(client, RJ54N1_BYTE_SWAP, 0, 8);
+                break;
+        case V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE:
+                ret = reg_write(client, RJ54N1_OUT_SEL, 4);
+                if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 8, 8);
+                if (!ret)
+                        ret = reg_write(client, RJ54N1_RA_SEL_UL, 0);
+                break;
+        case V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE:
+                ret = reg_write(client, RJ54N1_OUT_SEL, 4);
+                if (!ret)
+                        ret = reg_set(client, RJ54N1_BYTE_SWAP, 8, 8);
+                if (!ret)
+                        ret = reg_write(client, RJ54N1_RA_SEL_UL, 8);
+                break;
+        case V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE:
+                ret = reg_write(client, RJ54N1_OUT_SEL, 4);
+                if (!ret)
+                        ret = reg_set(client, RJ54N1_BYTE_SWAP, 0, 8);
+                if (!ret)
+                        ret = reg_write(client, RJ54N1_RA_SEL_UL, 0);
+                break;
+        case V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE:
+                ret = reg_write(client, RJ54N1_OUT_SEL, 4);
+                if (!ret)
+                        ret = reg_set(client, RJ54N1_BYTE_SWAP, 0, 8);
+                if (!ret)
+                        ret = reg_write(client, RJ54N1_RA_SEL_UL, 8);
+                break;
+        case V4L2_MBUS_FMT_SBGGR10_1X10:
+                ret = reg_write(client, RJ54N1_OUT_SEL, 5);
                 break;
         default:
                 ret = -EINVAL;
         }
 
+        /* Special case: a raw mode with 10 bits of data per clock tick */
+        if (!ret)
+                ret = reg_set(client, RJ54N1_OCLK_SEL_EN,
+                              (mf->code == V4L2_MBUS_FMT_SBGGR10_1X10) << 1, 2);
+
         if (ret < 0)
                 return ret;
 
-        /* Supported scales 1:1 - 1:16 */
-        if (pix->width < input_w / 16)
-                pix->width = input_w / 16;
-        if (pix->height < input_h / 16)
-                pix->height = input_h / 16;
+        /* Supported scales 1:1 >= scale > 1:16 */
+        max_w = mf->width * (16 * 1024 - 1) / 1024;
+        if (input_w > max_w)
+                input_w = max_w;
+        max_h = mf->height * (16 * 1024 - 1) / 1024;
+        if (input_h > max_h)
+                input_h = max_h;
 
-        output_w = pix->width;
-        output_h = pix->height;
+        output_w = mf->width;
+        output_h = mf->height;
 
         ret = rj54n1_sensor_scale(sd, &input_w, &input_h, &output_w, &output_h);
         if (ret < 0)
                 return ret;
 
-        rj54n1->fourcc          = pix->pixelformat;
+        fmt = rj54n1_find_datafmt(mf->code, rj54n1_colour_fmts,
+                                  ARRAY_SIZE(rj54n1_colour_fmts));
+
+        rj54n1->fmt             = fmt;
         rj54n1->resize          = ret;
         rj54n1->rect.width      = input_w;
         rj54n1->rect.height     = input_h;
         rj54n1->width           = output_w;
         rj54n1->height          = output_h;
 
-        pix->width              = output_w;
-        pix->height             = output_h;
-        pix->field              = V4L2_FIELD_NONE;
+        mf->width               = output_w;
+        mf->height              = output_h;
+        mf->field               = V4L2_FIELD_NONE;
+        mf->colorspace          = fmt->colorspace;
 
-        return ret;
+        return 0;
 }
 
 static int rj54n1_g_chip_ident(struct v4l2_subdev *sd,
@@ -963,6 +1228,14 @@ static const struct v4l2_queryctrl rj54n1_controls[] = {
                 .step           = 1,
                 .default_value  = 66,
                 .flags          = V4L2_CTRL_FLAG_SLIDER,
+        }, {
+                .id             = V4L2_CID_AUTO_WHITE_BALANCE,
+                .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                .name           = "Auto white balance",
+                .minimum        = 0,
+                .maximum        = 1,
+                .step           = 1,
+                .default_value  = 1,
         },
 };
 
@@ -976,6 +1249,7 @@ static struct soc_camera_ops rj54n1_ops = {
 static int rj54n1_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
         struct i2c_client *client = sd->priv;
+        struct rj54n1 *rj54n1 = to_rj54n1(client);
         int data;
 
         switch (ctrl->id) {
@@ -998,6 +1272,9 @@ static int rj54n1_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 
                 ctrl->value = data / 2;
                 break;
+        case V4L2_CID_AUTO_WHITE_BALANCE:
+                ctrl->value = rj54n1->auto_wb;
+                break;
         }
 
         return 0;
@@ -1007,6 +1284,7 @@ static int rj54n1_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
         int data;
         struct i2c_client *client = sd->priv;
+        struct rj54n1 *rj54n1 = to_rj54n1(client);
         const struct v4l2_queryctrl *qctrl;
 
         qctrl = soc_camera_find_qctrl(&rj54n1_ops, ctrl->id);
@@ -1037,6 +1315,13 @@ static int rj54n1_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
                 else if (reg_write(client, RJ54N1_Y_GAIN, ctrl->value * 2) < 0)
                         return -EIO;
                 break;
+        case V4L2_CID_AUTO_WHITE_BALANCE:
+                /* Auto WB area - whole image */
+                if (reg_set(client, RJ54N1_WB_SEL_WEIGHT_I, ctrl->value << 7,
+                            0x80) < 0)
+                        return -EIO;
+                rj54n1->auto_wb = ctrl->value;
+                break;
         }
 
         return 0;
@@ -1054,10 +1339,12 @@ static struct v4l2_subdev_core_ops rj54n1_subdev_core_ops = {
 
 static struct v4l2_subdev_video_ops rj54n1_subdev_video_ops = {
         .s_stream       = rj54n1_s_stream,
-        .s_fmt          = rj54n1_s_fmt,
-        .g_fmt          = rj54n1_g_fmt,
-        .try_fmt        = rj54n1_try_fmt,
+        .s_mbus_fmt     = rj54n1_s_fmt,
+        .g_mbus_fmt     = rj54n1_g_fmt,
+        .try_mbus_fmt   = rj54n1_try_fmt,
+        .enum_mbus_fmt  = rj54n1_enum_fmt,
         .g_crop         = rj54n1_g_crop,
+        .s_crop         = rj54n1_s_crop,
         .cropcap        = rj54n1_cropcap,
 };
 
@@ -1066,21 +1353,13 @@ static struct v4l2_subdev_ops rj54n1_subdev_ops = {
         .video  = &rj54n1_subdev_video_ops,
 };
 
-static int rj54n1_pin_config(struct i2c_client *client)
-{
-        /*
-         * Experimentally found out IOCTRL wired to 0. TODO: add to platform
-         * data: 0 or 1 << 7.
-         */
-        return reg_write(client, RJ54N1_IOC, 0);
-}
-
 /*
  * Interface active, can use i2c. If it fails, it can indeed mean, that
  * this wasn't our capture interface, so, we wait for the right one
  */
 static int rj54n1_video_probe(struct soc_camera_device *icd,
-                              struct i2c_client *client)
+                              struct i2c_client *client,
+                              struct rj54n1_pdata *priv)
 {
         int data1, data2;
         int ret;
@@ -1101,7 +1380,8 @@ static int rj54n1_video_probe(struct soc_camera_device *icd,
                 goto ei2c;
         }
 
-        ret = rj54n1_pin_config(client);
+        /* Configure IOCTL polarity from the platform data: 0 or 1 << 7. */
+        ret = reg_write(client, RJ54N1_IOC, priv->ioctl_high << 7);
         if (ret < 0)
                 goto ei2c;
 
@@ -1119,6 +1399,7 @@ static int rj54n1_probe(struct i2c_client *client,
         struct soc_camera_device *icd = client->dev.platform_data;
         struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
         struct soc_camera_link *icl;
+        struct rj54n1_pdata *rj54n1_priv;
         int ret;
 
         if (!icd) {
@@ -1127,11 +1408,13 @@ static int rj54n1_probe(struct i2c_client *client,
         }
 
         icl = to_soc_camera_link(icd);
-        if (!icl) {
+        if (!icl || !icl->priv) {
                 dev_err(&client->dev, "RJ54N1CB0C: missing platform data!\n");
                 return -EINVAL;
         }
 
+        rj54n1_priv = icl->priv;
+
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                 dev_warn(&adapter->dev,
                          "I2C-Adapter doesn't support I2C_FUNC_SMBUS_BYTE\n");
@@ -1153,10 +1436,12 @@ static int rj54n1_probe(struct i2c_client *client,
         rj54n1->rect.height     = RJ54N1_MAX_HEIGHT;
         rj54n1->width           = RJ54N1_MAX_WIDTH;
         rj54n1->height          = RJ54N1_MAX_HEIGHT;
-        rj54n1->fourcc          = V4L2_PIX_FMT_YUYV;
+        rj54n1->fmt             = &rj54n1_colour_fmts[0];
         rj54n1->resize          = 1024;
+        rj54n1->tgclk_mhz       = (rj54n1_priv->mclk_freq / PLL_L * PLL_N) /
+                (clk_div.ratio_tg + 1) / (clk_div.ratio_t + 1);
 
-        ret = rj54n1_video_probe(icd, client);
+        ret = rj54n1_video_probe(icd, client, rj54n1_priv);
         if (ret < 0) {
                 icd->ops = NULL;
                 i2c_set_clientdata(client, NULL);
@@ -1164,9 +1449,6 @@ static int rj54n1_probe(struct i2c_client *client,
                 return ret;
         }
 
-        icd->formats            = rj54n1_colour_formats;
-        icd->num_formats        = ARRAY_SIZE(rj54n1_colour_formats);
-
         return ret;
 }
 
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 41765f3c7c28..fb742f1ae711 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -233,7 +233,6 @@ struct s2255_dev {
 
         struct s2255_dmaqueue   vidq[MAX_CHANNELS];
         struct video_device     *vdev[MAX_CHANNELS];
-        struct list_head        s2255_devlist;
         struct timer_list       timer;
         struct s2255_fw *fw_data;
         struct s2255_pipeinfo   pipes[MAX_PIPE_BUFFERS];
@@ -313,8 +312,6 @@ struct s2255_fh {
 /* Channels on box are in reverse order */
 static unsigned long G_chnmap[MAX_CHANNELS] = {3, 2, 1, 0};
 
-static LIST_HEAD(s2255_devlist);
-
 static int debug;
 static int *s2255_debug = &debug;
 
@@ -1533,32 +1530,24 @@ static int vidioc_s_parm(struct file *file, void *priv,
 }
 static int s2255_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct s2255_dev *h, *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct s2255_dev *dev = video_drvdata(file);
         struct s2255_fh *fh;
-        struct list_head *list;
-        enum v4l2_buf_type type = 0;
+        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         int i = 0;
         int cur_channel = -1;
         int state;
-        dprintk(1, "s2255: open called (minor=%d)\n", minor);
+
+        dprintk(1, "s2255: open called (dev=%s)\n",
+                video_device_node_name(vdev));
 
         lock_kernel();
-        list_for_each(list, &s2255_devlist) {
-                h = list_entry(list, struct s2255_dev, s2255_devlist);
-                for (i = 0; i < MAX_CHANNELS; i++) {
-                        if (h->vdev[i]->minor == minor) {
-                                cur_channel = i;
-                                dev = h;
-                                type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                        }
-                }
-        }
 
-        if ((NULL == dev) || (cur_channel == -1)) {
-                unlock_kernel();
-                printk(KERN_INFO "s2255: openv4l no dev\n");
-                return -ENODEV;
+        for (i = 0; i < MAX_CHANNELS; i++) {
+                if (dev->vdev[i] == vdev) {
+                        cur_channel = i;
+                        break;
+                }
         }
 
         if (atomic_read(&dev->fw_data->fw_state) == S2255_FW_DISCONNECTING) {
@@ -1662,8 +1651,9 @@ static int s2255_open(struct file *file)
         for (i = 0; i < ARRAY_SIZE(s2255_qctrl); i++)
                 qctl_regs[i] = s2255_qctrl[i].default_value;
 
-        dprintk(1, "s2255drv: open minor=%d type=%s users=%d\n",
-                minor, v4l2_type_names[type], dev->users[cur_channel]);
+        dprintk(1, "s2255drv: open dev=%s type=%s users=%d\n",
+                video_device_node_name(vdev), v4l2_type_names[type],
+                dev->users[cur_channel]);
         dprintk(2, "s2255drv: open: fh=0x%08lx, dev=0x%08lx, vidq=0x%08lx\n",
                 (unsigned long)fh, (unsigned long)dev,
                 (unsigned long)&dev->vidq[cur_channel]);
@@ -1699,7 +1689,6 @@ static unsigned int s2255_poll(struct file *file,
 static void s2255_destroy(struct kref *kref)
 {
         struct s2255_dev *dev = to_s2255_dev(kref);
-        struct list_head *list;
         int i;
         if (!dev) {
                 printk(KERN_ERR "s2255drv: kref problem\n");
@@ -1733,10 +1722,6 @@ static void s2255_destroy(struct kref *kref)
         usb_put_dev(dev->udev);
         dprintk(1, "%s", __func__);
 
-        while (!list_empty(&s2255_devlist)) {
-                list = s2255_devlist.next;
-                list_del(list);
-        }
         mutex_unlock(&dev->open_lock);
         kfree(dev);
 }
@@ -1745,7 +1730,8 @@ static int s2255_close(struct file *file)
 {
         struct s2255_fh *fh = file->private_data;
         struct s2255_dev *dev = fh->dev;
-        int minor = video_devdata(file)->minor;
+        struct video_device *vdev = video_devdata(file);
+
         if (!dev)
                 return -ENODEV;
 
@@ -1765,8 +1751,8 @@ static int s2255_close(struct file *file)
         mutex_unlock(&dev->open_lock);
 
         kref_put(&dev->kref, s2255_destroy);
-        dprintk(1, "s2255: close called (minor=%d, users=%d)\n",
-                minor, dev->users[fh->channel]);
+        dprintk(1, "s2255: close called (dev=%s, users=%d)\n",
+                video_device_node_name(vdev), dev->users[fh->channel]);
         kfree(fh);
         return 0;
 }
@@ -1830,7 +1816,6 @@ static struct video_device template = {
         .name = "s2255v",
         .fops = &s2255_fops_v4l,
         .ioctl_ops = &s2255_ioctl_ops,
-        .minor = -1,
         .release = video_device_release,
         .tvnorms = S2255_NORMS,
         .current_norm = V4L2_STD_NTSC_M,
@@ -1843,7 +1828,6 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
         int cur_nr = video_nr;
 
         /* initialize all video 4 linux */
-        list_add_tail(&dev->s2255_devlist, &s2255_devlist);
         /* register 4 video devices */
         for (i = 0; i < MAX_CHANNELS; i++) {
                 INIT_LIST_HEAD(&dev->vidq[i].active);
@@ -1853,6 +1837,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
                 dev->vdev[i] = video_device_alloc();
                 memcpy(dev->vdev[i], &template, sizeof(struct video_device));
                 dev->vdev[i]->parent = &dev->interface->dev;
+                video_set_drvdata(dev->vdev[i], dev);
                 if (video_nr == -1)
                         ret = video_register_device(dev->vdev[i],
                                                     VFL_TYPE_GRABBER,
@@ -1880,7 +1865,7 @@ static void s2255_exit_v4l(struct s2255_dev *dev)
 
         int i;
         for (i = 0; i < MAX_CHANNELS; i++) {
-                if (-1 != dev->vdev[i]->minor) {
+                if (video_is_registered(dev->vdev[i])) {
                         video_unregister_device(dev->vdev[i]);
                         printk(KERN_INFO "s2255 unregistered\n");
                 } else {
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index b624a4c01fdc..5ab6a0f901c0 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -1036,7 +1036,6 @@ static struct video_device saa_template =
         .name     = "saa5246a",
         .fops     = &saa_fops,
         .release  = video_device_release,
-        .minor    = -1,
 };
 
 static int saa5246a_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 7e40d6d99dd0..03f572708b85 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -7211,9 +7211,31 @@ int saa7134_board_init2(struct saa7134_dev *dev)
         }
         case SAA7134_BOARD_FLYDVB_TRIO:
         {
+                u8 temp = 0;
+                int rc;
                 u8 data[] = { 0x3c, 0x33, 0x62};
                 struct i2c_msg msg = {.addr=0x09, .flags=0, .buf=data, .len = sizeof(data)};
                 i2c_transfer(&dev->i2c_adap, &msg, 1);
+
+                /*
+                 * send weak up message to pic16C505 chip
+                 * @ LifeView FlyDVB Trio
+                 */
+                msg.buf = &temp;
+                msg.addr = 0x0b;
+                msg.len = 1;
+                if (1 != i2c_transfer(&dev->i2c_adap, &msg, 1)) {
+                        printk(KERN_WARNING "%s: send wake up byte to pic16C505"
+                                        "(IR chip) failed\n", dev->name);
+                } else {
+                        msg.flags = I2C_M_RD;
+                        rc = i2c_transfer(&dev->i2c_adap, &msg, 1);
+                        printk(KERN_INFO "%s: probe IR chip @ i2c 0x%02x: %s\n",
+                                   dev->name, msg.addr,
+                                   (1 == rc) ? "yes" : "no");
+                        if (rc == 1)
+                                dev->has_remote = SAA7134_REMOTE_I2C;
+                }
                 break;
         }
         case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331:
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 0ba7f5af0fc3..9f85e917f9f3 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -797,27 +797,28 @@ static struct video_device *vdev_init(struct saa7134_dev *dev,
         vfd->debug   = video_debug;
         snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)",
                  dev->name, type, saa7134_boards[dev->board].name);
+        video_set_drvdata(vfd, dev);
         return vfd;
 }
 
 static void saa7134_unregister_video(struct saa7134_dev *dev)
 {
         if (dev->video_dev) {
-                if (-1 != dev->video_dev->minor)
+                if (video_is_registered(dev->video_dev))
                         video_unregister_device(dev->video_dev);
                 else
                         video_device_release(dev->video_dev);
                 dev->video_dev = NULL;
         }
         if (dev->vbi_dev) {
-                if (-1 != dev->vbi_dev->minor)
+                if (video_is_registered(dev->vbi_dev))
                         video_unregister_device(dev->vbi_dev);
                 else
                         video_device_release(dev->vbi_dev);
                 dev->vbi_dev = NULL;
         }
         if (dev->radio_dev) {
-                if (-1 != dev->radio_dev->minor)
+                if (video_is_registered(dev->radio_dev))
                         video_unregister_device(dev->radio_dev);
                 else
                         video_device_release(dev->radio_dev);
@@ -1046,8 +1047,8 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
                        dev->name);
                 goto fail4;
         }
-        printk(KERN_INFO "%s: registered device video%d [v4l2]\n",
-               dev->name, dev->video_dev->num);
+        printk(KERN_INFO "%s: registered device %s [v4l2]\n",
+               dev->name, video_device_node_name(dev->video_dev));
 
         dev->vbi_dev = vdev_init(dev, &saa7134_video_template, "vbi");
 
@@ -1055,8 +1056,8 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
                                     vbi_nr[dev->nr]);
         if (err < 0)
                 goto fail4;
-        printk(KERN_INFO "%s: registered device vbi%d\n",
-               dev->name, dev->vbi_dev->num);
+        printk(KERN_INFO "%s: registered device %s\n",
+               dev->name, video_device_node_name(dev->vbi_dev));
 
         if (card_has_radio(dev)) {
                 dev->radio_dev = vdev_init(dev,&saa7134_radio_template,"radio");
@@ -1064,8 +1065,8 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
                                             radio_nr[dev->nr]);
                 if (err < 0)
                         goto fail4;
-                printk(KERN_INFO "%s: registered device radio%d\n",
-                       dev->name, dev->radio_dev->num);
+                printk(KERN_INFO "%s: registered device %s\n",
+                       dev->name, video_device_node_name(dev->radio_dev));
         }
 
         /* everything worked */
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 296788c3bf0e..7dfecfc6017c 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -86,19 +86,11 @@ static int ts_init_encoder(struct saa7134_dev* dev)
 
 static int ts_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct saa7134_dev *dev;
+        struct video_device *vdev = video_devdata(file);
+        struct saa7134_dev *dev = video_drvdata(file);
         int err;
 
-        lock_kernel();
-        list_for_each_entry(dev, &saa7134_devlist, devlist)
-                if (dev->empress_dev && dev->empress_dev->minor == minor)
-                        goto found;
-        unlock_kernel();
-        return -ENODEV;
- found:
-
-        dprintk("open minor=%d\n",minor);
+        dprintk("open dev=%s\n", video_device_node_name(vdev));
         err = -EBUSY;
         if (!mutex_trylock(&dev->empress_tsq.vb_lock))
                 goto done;
@@ -489,7 +481,6 @@ static const struct v4l2_ioctl_ops ts_ioctl_ops = {
 static struct video_device saa7134_empress_template = {
         .name          = "saa7134-empress",
         .fops          = &ts_fops,
-        .minor         = -1,
         .ioctl_ops     = &ts_ioctl_ops,
 
         .tvnorms                        = SAA7134_NORMS,
@@ -531,6 +522,7 @@ static int empress_init(struct saa7134_dev *dev)
 
         INIT_WORK(&dev->empress_workqueue, empress_signal_update);
 
+        video_set_drvdata(dev->empress_dev, dev);
         err = video_register_device(dev->empress_dev,VFL_TYPE_GRABBER,
                                     empress_nr[dev->nr]);
         if (err < 0) {
@@ -540,8 +532,8 @@ static int empress_init(struct saa7134_dev *dev)
                 dev->empress_dev = NULL;
                 return err;
         }
-        printk(KERN_INFO "%s: registered device video%d [mpeg]\n",
-               dev->name, dev->empress_dev->num);
+        printk(KERN_INFO "%s: registered device %s [mpeg]\n",
+               dev->name, video_device_node_name(dev->empress_dev));
 
         videobuf_queue_sg_init(&dev->empress_tsq, &saa7134_ts_qops,
                             &dev->pci->dev, &dev->slock,
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 744918b1cd47..f8e985989ca0 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -127,6 +127,61 @@ static int build_key(struct saa7134_dev *dev)
 
 /* --------------------- Chip specific I2C key builders ----------------- */
 
+static int get_key_flydvb_trio(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+        int gpio;
+        int attempt = 0;
+        unsigned char b;
+
+        /* We need this to access GPI Used by the saa_readl macro. */
+        struct saa7134_dev *dev = ir->c->adapter->algo_data;
+
+        if (dev == NULL) {
+                dprintk("get_key_flydvb_trio: "
+                         "gir->c->adapter->algo_data is NULL!\n");
+                return -EIO;
+        }
+
+        /* rising SAA7134_GPIGPRESCAN reads the status */
+        saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+        saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+
+        gpio = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2);
+
+        if (0x40000 & ~gpio)
+                return 0; /* No button press */
+
+        /* No button press - only before first key pressed */
+        if (b == 0xFF)
+                return 0;
+
+        /* poll IR chip */
+        /* weak up the IR chip */
+        b = 0;
+
+        while (1 != i2c_master_send(ir->c, &b, 1)) {
+                if ((attempt++) < 10) {
+                        /*
+                         * wait a bit for next attempt -
+                         * I don't know how make it better
+                         */
+                        msleep(10);
+                        continue;
+                }
+                i2cdprintk("send wake up byte to pic16C505 (IR chip)"
+                           "failed %dx\n", attempt);
+                return -EIO;
+        }
+        if (1 != i2c_master_recv(ir->c, &b, 1)) {
+                i2cdprintk("read error\n");
+                return -EIO;
+        }
+
+        *ir_key = b;
+        *ir_raw = b;
+        return 1;
+}
+
 static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, u32 *ir_key,
                                        u32 *ir_raw)
 {
@@ -622,6 +677,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keyup   = 0x020000;
                 polling      = 50; /* ms */
                 break;
+        break;
         }
         if (NULL == ir_codes) {
                 printk("%s: Oops: IR config error [card=%d]\n",
@@ -652,7 +708,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
                  pci_name(dev->pci));
 
-        err = ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, ir_type);
         if (err < 0)
                 goto err_out_free;
 
@@ -672,7 +728,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         dev->remote = ir;
         saa7134_ir_start(dev, ir);
 
-        err = input_register_device(ir->dev);
+        err = ir_input_register(ir->dev, ir_codes);
         if (err)
                 goto err_out_stop;
 
@@ -686,8 +742,6 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         saa7134_ir_stop(dev);
         dev->remote = NULL;
  err_out_free:
-        ir_input_free(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return err;
 }
@@ -698,8 +752,7 @@ void saa7134_input_fini(struct saa7134_dev *dev)
                 return;
 
         saa7134_ir_stop(dev);
-        ir_input_free(dev->remote->dev);
-        input_unregister_device(dev->remote->dev);
+        ir_input_unregister(dev->remote->dev);
         kfree(dev->remote);
         dev->remote = NULL;
 }
@@ -788,6 +841,12 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
         case SAA7134_BOARD_AVERMEDIA_CARDBUS_506:
                 info.addr = 0x40;
                 break;
+        case SAA7134_BOARD_FLYDVB_TRIO:
+                dev->init_data.name = "FlyDVB Trio";
+                dev->init_data.get_key = get_key_flydvb_trio;
+                dev->init_data.ir_codes = &ir_codes_flydvb_table;
+                info.addr = 0x0b;
+                break;
         default:
                 dprintk("No I2C IR support for board %x\n", dev->board);
                 return;
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 35f8daa3a359..cb732640ac4a 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1326,33 +1326,26 @@ static int saa7134_resource(struct saa7134_fh *fh)
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct saa7134_dev *dev;
+        struct video_device *vdev = video_devdata(file);
+        struct saa7134_dev *dev = video_drvdata(file);
         struct saa7134_fh *fh;
-        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        enum v4l2_buf_type type = 0;
         int radio = 0;
 
-        mutex_lock(&saa7134_devlist_lock);
-        list_for_each_entry(dev, &saa7134_devlist, devlist) {
-                if (dev->video_dev && (dev->video_dev->minor == minor))
-                        goto found;
-                if (dev->radio_dev && (dev->radio_dev->minor == minor)) {
-                        radio = 1;
-                        goto found;
-                }
-                if (dev->vbi_dev && (dev->vbi_dev->minor == minor)) {
-                        type = V4L2_BUF_TYPE_VBI_CAPTURE;
-                        goto found;
-                }
+        switch (vdev->vfl_type) {
+        case VFL_TYPE_GRABBER:
+                type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                break;
+        case VFL_TYPE_VBI:
+                type = V4L2_BUF_TYPE_VBI_CAPTURE;
+                break;
+        case VFL_TYPE_RADIO:
+                radio = 1;
+                break;
         }
-        mutex_unlock(&saa7134_devlist_lock);
-        return -ENODEV;
-
-found:
-        mutex_unlock(&saa7134_devlist_lock);
 
-        dprintk("open minor=%d radio=%d type=%s\n",minor,radio,
-                v4l2_type_names[type]);
+        dprintk("open dev=%s radio=%d type=%s\n", video_device_node_name(vdev),
+                radio, v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh),GFP_KERNEL);
@@ -2502,7 +2495,6 @@ struct video_device saa7134_video_template = {
         .name                           = "saa7134-video",
         .fops                           = &video_fops,
         .ioctl_ops                      = &video_ioctl_ops,
-        .minor                          = -1,
         .tvnorms                        = SAA7134_NORMS,
         .current_norm                   = V4L2_STD_PAL,
 };
@@ -2511,7 +2503,6 @@ struct video_device saa7134_radio_template = {
         .name                   = "saa7134-radio",
         .fops                   = &radio_fops,
         .ioctl_ops              = &radio_ioctl_ops,
-        .minor                  = -1,
 };
 
 int saa7134_video_init1(struct saa7134_dev *dev)
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index 85ffc2cba039..41d0166c0f95 100644
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -1428,8 +1428,8 @@ static int se401_probe(struct usb_interface *intf,
                 err("video_register_device failed");
                 return -EIO;
         }
-        dev_info(&intf->dev, "registered new video device: video%d\n",
-                 se401->vdev.num);
+        dev_info(&intf->dev, "registered new video device: %s\n",
+                 video_device_node_name(&se401->vdev));
 
         usb_set_intfdata(intf, se401);
         return 0;
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c
index a4f3472d4db8..d69363f0d8c9 100644
--- a/drivers/media/video/sh_mobile_ceu_camera.c
+++ b/drivers/media/video/sh_mobile_ceu_camera.c
@@ -38,6 +38,8 @@
 #include <media/soc_camera.h>
 #include <media/sh_mobile_ceu.h>
 #include <media/videobuf-dma-contig.h>
+#include <media/v4l2-mediabus.h>
+#include <media/soc_mediabus.h>
 
 /* register offsets for sh7722 / sh7723 */
 
@@ -85,7 +87,7 @@
 /* per video frame buffer */
 struct sh_mobile_ceu_buffer {
         struct videobuf_buffer vb; /* v4l buffer must be first */
-        const struct soc_camera_data_format *fmt;
+        enum v4l2_mbus_pixelcode code;
 };
 
 struct sh_mobile_ceu_dev {
@@ -105,7 +107,8 @@ struct sh_mobile_ceu_dev {
 
         u32 cflcr;
 
-        unsigned int is_interlaced:1;
+        enum v4l2_field field;
+
         unsigned int image_mode:1;
         unsigned int is_16bit:1;
 };
@@ -114,8 +117,8 @@ struct sh_mobile_ceu_cam {
         struct v4l2_rect ceu_rect;
         unsigned int cam_width;
         unsigned int cam_height;
-        const struct soc_camera_data_format *extra_fmt;
-        const struct soc_camera_data_format *camera_fmt;
+        const struct soc_mbus_pixelfmt *extra_fmt;
+        enum v4l2_mbus_pixelcode code;
 };
 
 static unsigned long make_bus_param(struct sh_mobile_ceu_dev *pcdev)
@@ -197,16 +200,19 @@ static int sh_mobile_ceu_videobuf_setup(struct videobuf_queue *vq,
         struct soc_camera_device *icd = vq->priv_data;
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct sh_mobile_ceu_dev *pcdev = ici->priv;
-        int bytes_per_pixel = (icd->current_fmt->depth + 7) >> 3;
+        int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
+                                                icd->current_fmt->host_fmt);
+
+        if (bytes_per_line < 0)
+                return bytes_per_line;
 
-        *size = PAGE_ALIGN(icd->user_width * icd->user_height *
-                           bytes_per_pixel);
+        *size = bytes_per_line * icd->user_height;
 
         if (0 == *count)
                 *count = 2;
 
         if (pcdev->video_limit) {
-                while (*size * *count > pcdev->video_limit)
+                while (PAGE_ALIGN(*size) * *count > pcdev->video_limit)
                         (*count)--;
         }
 
@@ -249,10 +255,13 @@ static int sh_mobile_ceu_capture(struct sh_mobile_ceu_dev *pcdev)
 {
         struct soc_camera_device *icd = pcdev->icd;
         dma_addr_t phys_addr_top, phys_addr_bottom;
+        unsigned long top1, top2;
+        unsigned long bottom1, bottom2;
         u32 status;
         int ret = 0;
 
-        /* The hardware is _very_ picky about this sequence. Especially
+        /*
+         * The hardware is _very_ picky about this sequence. Especially
          * the CEU_CETCR_MAGIC value. It seems like we need to acknowledge
          * several not-so-well documented interrupt sources in CETCR.
          */
@@ -276,25 +285,36 @@ static int sh_mobile_ceu_capture(struct sh_mobile_ceu_dev *pcdev)
         if (!pcdev->active)
                 return ret;
 
+        if (V4L2_FIELD_INTERLACED_BT == pcdev->field) {
+                top1    = CDBYR;
+                top2    = CDBCR;
+                bottom1 = CDAYR;
+                bottom2 = CDACR;
+        } else {
+                top1    = CDAYR;
+                top2    = CDACR;
+                bottom1 = CDBYR;
+                bottom2 = CDBCR;
+        }
+
         phys_addr_top = videobuf_to_dma_contig(pcdev->active);
-        ceu_write(pcdev, CDAYR, phys_addr_top);
-        if (pcdev->is_interlaced) {
+        ceu_write(pcdev, top1, phys_addr_top);
+        if (V4L2_FIELD_NONE != pcdev->field) {
                 phys_addr_bottom = phys_addr_top + icd->user_width;
-                ceu_write(pcdev, CDBYR, phys_addr_bottom);
+                ceu_write(pcdev, bottom1, phys_addr_bottom);
         }
 
-        switch (icd->current_fmt->fourcc) {
+        switch (icd->current_fmt->host_fmt->fourcc) {
         case V4L2_PIX_FMT_NV12:
         case V4L2_PIX_FMT_NV21:
         case V4L2_PIX_FMT_NV16:
         case V4L2_PIX_FMT_NV61:
                 phys_addr_top += icd->user_width *
                         icd->user_height;
-                ceu_write(pcdev, CDACR, phys_addr_top);
-                if (pcdev->is_interlaced) {
-                        phys_addr_bottom = phys_addr_top +
-                                icd->user_width;
-                        ceu_write(pcdev, CDBCR, phys_addr_bottom);
+                ceu_write(pcdev, top2, phys_addr_top);
+                if (V4L2_FIELD_NONE != pcdev->field) {
+                        phys_addr_bottom = phys_addr_top + icd->user_width;
+                        ceu_write(pcdev, bottom2, phys_addr_bottom);
                 }
         }
 
@@ -310,8 +330,13 @@ static int sh_mobile_ceu_videobuf_prepare(struct videobuf_queue *vq,
 {
         struct soc_camera_device *icd = vq->priv_data;
         struct sh_mobile_ceu_buffer *buf;
+        int bytes_per_line = soc_mbus_bytes_per_line(icd->user_width,
+                                                icd->current_fmt->host_fmt);
         int ret;
 
+        if (bytes_per_line < 0)
+                return bytes_per_line;
+
         buf = container_of(vb, struct sh_mobile_ceu_buffer, vb);
 
         dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %zd\n", __func__,
@@ -321,25 +346,27 @@ static int sh_mobile_ceu_videobuf_prepare(struct videobuf_queue *vq,
         WARN_ON(!list_empty(&vb->queue));
 
 #ifdef DEBUG
-        /* This can be useful if you want to see if we actually fill
-         * the buffer with something */
+        /*
+         * This can be useful if you want to see if we actually fill
+         * the buffer with something
+         */
         memset((void *)vb->baddr, 0xaa, vb->bsize);
 #endif
 
         BUG_ON(NULL == icd->current_fmt);
 
-        if (buf->fmt    != icd->current_fmt ||
+        if (buf->code   != icd->current_fmt->code ||
             vb->width   != icd->user_width ||
             vb->height  != icd->user_height ||
             vb->field   != field) {
-                buf->fmt        = icd->current_fmt;
+                buf->code       = icd->current_fmt->code;
                 vb->width       = icd->user_width;
                 vb->height      = icd->user_height;
                 vb->field       = field;
                 vb->state       = VIDEOBUF_NEEDS_INIT;
         }
 
-        vb->size = vb->width * vb->height * ((buf->fmt->depth + 7) >> 3);
+        vb->size = vb->height * bytes_per_line;
         if (0 != vb->baddr && vb->bsize < vb->size) {
                 ret = -EINVAL;
                 goto out;
@@ -456,6 +483,7 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd)
 {
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct sh_mobile_ceu_dev *pcdev = ici->priv;
+        int ret;
 
         if (pcdev->icd)
                 return -EBUSY;
@@ -466,9 +494,11 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd)
 
         pm_runtime_get_sync(ici->v4l2_dev.dev);
 
-        pcdev->icd = icd;
+        ret = sh_mobile_ceu_soft_reset(pcdev);
+        if (!ret)
+                pcdev->icd = icd;
 
-        return sh_mobile_ceu_soft_reset(pcdev);
+        return ret;
 }
 
 /* Called with .video_lock held */
@@ -558,24 +588,35 @@ static void sh_mobile_ceu_set_rect(struct soc_camera_device *icd,
                         in_width *= 2;
                         left_offset *= 2;
                 }
-                width = cdwdr_width = out_width;
+                width = out_width;
+                cdwdr_width = out_width;
         } else {
-                unsigned int w_factor = (icd->current_fmt->depth + 7) >> 3;
+                int bytes_per_line = soc_mbus_bytes_per_line(out_width,
+                                                icd->current_fmt->host_fmt);
+                unsigned int w_factor;
 
-                width = out_width * w_factor / 2;
+                width = out_width;
 
-                if (!pcdev->is_16bit)
-                        w_factor *= 2;
+                switch (icd->current_fmt->host_fmt->packing) {
+                case SOC_MBUS_PACKING_2X8_PADHI:
+                        w_factor = 2;
+                        break;
+                default:
+                        w_factor = 1;
+                }
 
-                in_width = rect->width * w_factor / 2;
-                left_offset = left_offset * w_factor / 2;
+                in_width = rect->width * w_factor;
+                left_offset = left_offset * w_factor;
 
-                cdwdr_width = width * 2;
+                if (bytes_per_line < 0)
+                        cdwdr_width = out_width;
+                else
+                        cdwdr_width = bytes_per_line;
         }
 
         height = out_height;
         in_height = rect->height;
-        if (pcdev->is_interlaced) {
+        if (V4L2_FIELD_NONE != pcdev->field) {
                 height /= 2;
                 in_height /= 2;
                 top_offset /= 2;
@@ -646,6 +687,23 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,
         if (!common_flags)
                 return -EINVAL;
 
+        /* Make choises, based on platform preferences */
+        if ((common_flags & SOCAM_HSYNC_ACTIVE_HIGH) &&
+            (common_flags & SOCAM_HSYNC_ACTIVE_LOW)) {
+                if (pcdev->pdata->flags & SH_CEU_FLAG_HSYNC_LOW)
+                        common_flags &= ~SOCAM_HSYNC_ACTIVE_HIGH;
+                else
+                        common_flags &= ~SOCAM_HSYNC_ACTIVE_LOW;
+        }
+
+        if ((common_flags & SOCAM_VSYNC_ACTIVE_HIGH) &&
+            (common_flags & SOCAM_VSYNC_ACTIVE_LOW)) {
+                if (pcdev->pdata->flags & SH_CEU_FLAG_VSYNC_LOW)
+                        common_flags &= ~SOCAM_VSYNC_ACTIVE_HIGH;
+                else
+                        common_flags &= ~SOCAM_VSYNC_ACTIVE_LOW;
+        }
+
         ret = icd->ops->set_bus_param(icd, common_flags);
         if (ret < 0)
                 return ret;
@@ -667,24 +725,24 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,
         value = 0x00000010; /* data fetch by default */
         yuv_lineskip = 0;
 
-        switch (icd->current_fmt->fourcc) {
+        switch (icd->current_fmt->host_fmt->fourcc) {
         case V4L2_PIX_FMT_NV12:
         case V4L2_PIX_FMT_NV21:
                 yuv_lineskip = 1; /* skip for NV12/21, no skip for NV16/61 */
                 /* fall-through */
         case V4L2_PIX_FMT_NV16:
         case V4L2_PIX_FMT_NV61:
-                switch (cam->camera_fmt->fourcc) {
-                case V4L2_PIX_FMT_UYVY:
+                switch (cam->code) {
+                case V4L2_MBUS_FMT_YUYV8_2X8_BE:
                         value = 0x00000000; /* Cb0, Y0, Cr0, Y1 */
                         break;
-                case V4L2_PIX_FMT_VYUY:
+                case V4L2_MBUS_FMT_YVYU8_2X8_BE:
                         value = 0x00000100; /* Cr0, Y0, Cb0, Y1 */
                         break;
-                case V4L2_PIX_FMT_YUYV:
+                case V4L2_MBUS_FMT_YUYV8_2X8_LE:
                         value = 0x00000200; /* Y0, Cb0, Y1, Cr0 */
                         break;
-                case V4L2_PIX_FMT_YVYU:
+                case V4L2_MBUS_FMT_YVYU8_2X8_LE:
                         value = 0x00000300; /* Y0, Cr0, Y1, Cb0 */
                         break;
                 default:
@@ -692,8 +750,8 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,
                 }
         }
 
-        if (icd->current_fmt->fourcc == V4L2_PIX_FMT_NV21 ||
-            icd->current_fmt->fourcc == V4L2_PIX_FMT_NV61)
+        if (icd->current_fmt->host_fmt->fourcc == V4L2_PIX_FMT_NV21 ||
+            icd->current_fmt->host_fmt->fourcc == V4L2_PIX_FMT_NV61)
                 value ^= 0x00000100; /* swap U, V to change from NV1x->NVx1 */
 
         value |= common_flags & SOCAM_VSYNC_ACTIVE_LOW ? 1 << 1 : 0;
@@ -702,14 +760,27 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,
         ceu_write(pcdev, CAMCR, value);
 
         ceu_write(pcdev, CAPCR, 0x00300000);
-        ceu_write(pcdev, CAIFR, pcdev->is_interlaced ? 0x101 : 0);
+
+        switch (pcdev->field) {
+        case V4L2_FIELD_INTERLACED_TB:
+                value = 0x101;
+                break;
+        case V4L2_FIELD_INTERLACED_BT:
+                value = 0x102;
+                break;
+        default:
+                value = 0;
+                break;
+        }
+        ceu_write(pcdev, CAIFR, value);
 
         sh_mobile_ceu_set_rect(icd, icd->user_width, icd->user_height);
         mdelay(1);
 
         ceu_write(pcdev, CFLCR, pcdev->cflcr);
 
-        /* A few words about byte order (observed in Big Endian mode)
+        /*
+         * A few words about byte order (observed in Big Endian mode)
          *
          * In data fetch mode bytes are received in chunks of 8 bytes.
          * D0, D1, D2, D3, D4, D5, D6, D7 (D0 received first)
@@ -739,7 +810,8 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd,
         return 0;
 }
 
-static int sh_mobile_ceu_try_bus_param(struct soc_camera_device *icd)
+static int sh_mobile_ceu_try_bus_param(struct soc_camera_device *icd,
+                                       unsigned char buswidth)
 {
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct sh_mobile_ceu_dev *pcdev = ici->priv;
@@ -748,48 +820,75 @@ static int sh_mobile_ceu_try_bus_param(struct soc_camera_device *icd)
         camera_flags = icd->ops->query_bus_param(icd);
         common_flags = soc_camera_bus_param_compatible(camera_flags,
                                                        make_bus_param(pcdev));
-        if (!common_flags)
+        if (!common_flags || buswidth > 16 ||
+            (buswidth > 8 && !(common_flags & SOCAM_DATAWIDTH_16)))
                 return -EINVAL;
 
         return 0;
 }
 
-static const struct soc_camera_data_format sh_mobile_ceu_formats[] = {
-        {
-                .name           = "NV12",
-                .depth          = 12,
-                .fourcc         = V4L2_PIX_FMT_NV12,
-                .colorspace     = V4L2_COLORSPACE_JPEG,
-        },
-        {
-                .name           = "NV21",
-                .depth          = 12,
-                .fourcc         = V4L2_PIX_FMT_NV21,
-                .colorspace     = V4L2_COLORSPACE_JPEG,
-        },
-        {
-                .name           = "NV16",
-                .depth          = 16,
-                .fourcc         = V4L2_PIX_FMT_NV16,
-                .colorspace     = V4L2_COLORSPACE_JPEG,
-        },
+static const struct soc_mbus_pixelfmt sh_mobile_ceu_formats[] = {
         {
-                .name           = "NV61",
-                .depth          = 16,
-                .fourcc         = V4L2_PIX_FMT_NV61,
-                .colorspace     = V4L2_COLORSPACE_JPEG,
+                .fourcc                 = V4L2_PIX_FMT_NV12,
+                .name                   = "NV12",
+                .bits_per_sample        = 12,
+                .packing                = SOC_MBUS_PACKING_NONE,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, {
+                .fourcc                 = V4L2_PIX_FMT_NV21,
+                .name                   = "NV21",
+                .bits_per_sample        = 12,
+                .packing                = SOC_MBUS_PACKING_NONE,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, {
+                .fourcc                 = V4L2_PIX_FMT_NV16,
+                .name                   = "NV16",
+                .bits_per_sample        = 16,
+                .packing                = SOC_MBUS_PACKING_NONE,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, {
+                .fourcc                 = V4L2_PIX_FMT_NV61,
+                .name                   = "NV61",
+                .bits_per_sample        = 16,
+                .packing                = SOC_MBUS_PACKING_NONE,
+                .order                  = SOC_MBUS_ORDER_LE,
         },
 };
 
+/* This will be corrected as we get more formats */
+static bool sh_mobile_ceu_packing_supported(const struct soc_mbus_pixelfmt *fmt)
+{
+        return  fmt->packing == SOC_MBUS_PACKING_NONE ||
+                (fmt->bits_per_sample == 8 &&
+                 fmt->packing == SOC_MBUS_PACKING_2X8_PADHI) ||
+                (fmt->bits_per_sample > 8 &&
+                 fmt->packing == SOC_MBUS_PACKING_EXTEND16);
+}
+
 static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, int idx,
                                      struct soc_camera_format_xlate *xlate)
 {
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         struct device *dev = icd->dev.parent;
         int ret, k, n;
         int formats = 0;
         struct sh_mobile_ceu_cam *cam;
+        enum v4l2_mbus_pixelcode code;
+        const struct soc_mbus_pixelfmt *fmt;
 
-        ret = sh_mobile_ceu_try_bus_param(icd);
+        ret = v4l2_subdev_call(sd, video, enum_mbus_fmt, idx, &code);
+        if (ret < 0)
+                /* No more formats */
+                return 0;
+
+        fmt = soc_mbus_get_fmtdesc(code);
+        if (!fmt) {
+                dev_err(icd->dev.parent,
+                        "Invalid format code #%d: %d\n", idx, code);
+                return -EINVAL;
+        }
+
+        ret = sh_mobile_ceu_try_bus_param(icd, fmt->bits_per_sample);
         if (ret < 0)
                 return 0;
 
@@ -807,13 +906,13 @@ static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, int idx,
         if (!idx)
                 cam->extra_fmt = NULL;
 
-        switch (icd->formats[idx].fourcc) {
-        case V4L2_PIX_FMT_UYVY:
-        case V4L2_PIX_FMT_VYUY:
-        case V4L2_PIX_FMT_YUYV:
-        case V4L2_PIX_FMT_YVYU:
+        switch (code) {
+        case V4L2_MBUS_FMT_YUYV8_2X8_BE:
+        case V4L2_MBUS_FMT_YVYU8_2X8_BE:
+        case V4L2_MBUS_FMT_YUYV8_2X8_LE:
+        case V4L2_MBUS_FMT_YVYU8_2X8_LE:
                 if (cam->extra_fmt)
-                        goto add_single_format;
+                        break;
 
                 /*
                  * Our case is simple so far: for any of the above four camera
@@ -824,32 +923,31 @@ static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, int idx,
                  * the host_priv pointer and check whether the format you're
                  * going to add now is already there.
                  */
-                cam->extra_fmt = (void *)sh_mobile_ceu_formats;
+                cam->extra_fmt = sh_mobile_ceu_formats;
 
                 n = ARRAY_SIZE(sh_mobile_ceu_formats);
                 formats += n;
                 for (k = 0; xlate && k < n; k++) {
-                        xlate->host_fmt = &sh_mobile_ceu_formats[k];
-                        xlate->cam_fmt = icd->formats + idx;
-                        xlate->buswidth = icd->formats[idx].depth;
+                        xlate->host_fmt = &sh_mobile_ceu_formats[k];
+                        xlate->code     = code;
                         xlate++;
-                        dev_dbg(dev, "Providing format %s using %s\n",
-                                sh_mobile_ceu_formats[k].name,
-                                icd->formats[idx].name);
+                        dev_dbg(dev, "Providing format %s using code %d\n",
+                                sh_mobile_ceu_formats[k].name, code);
                 }
+                break;
         default:
-add_single_format:
-                /* Generic pass-through */
-                formats++;
-                if (xlate) {
-                        xlate->host_fmt = icd->formats + idx;
-                        xlate->cam_fmt = icd->formats + idx;
-                        xlate->buswidth = icd->formats[idx].depth;
-                        xlate++;
-                        dev_dbg(dev,
-                                "Providing format %s in pass-through mode\n",
-                                icd->formats[idx].name);
-                }
+                if (!sh_mobile_ceu_packing_supported(fmt))
+                        return 0;
+        }
+
+        /* Generic pass-through */
+        formats++;
+        if (xlate) {
+                xlate->host_fmt = fmt;
+                xlate->code     = code;
+                xlate++;
+                dev_dbg(dev, "Providing format %s in pass-through mode\n",
+                        xlate->host_fmt->name);
         }
 
         return formats;
@@ -1029,17 +1127,15 @@ static int client_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *crop,
 static int get_camera_scales(struct v4l2_subdev *sd, struct v4l2_rect *rect,
                              unsigned int *scale_h, unsigned int *scale_v)
 {
-        struct v4l2_format f;
+        struct v4l2_mbus_framefmt mf;
         int ret;
 
-        f.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-        ret = v4l2_subdev_call(sd, video, g_fmt, &f);
+        ret = v4l2_subdev_call(sd, video, g_mbus_fmt, &mf);
         if (ret < 0)
                 return ret;
 
-        *scale_h = calc_generic_scale(rect->width, f.fmt.pix.width);
-        *scale_v = calc_generic_scale(rect->height, f.fmt.pix.height);
+        *scale_h = calc_generic_scale(rect->width, mf.width);
+        *scale_v = calc_generic_scale(rect->height, mf.height);
 
         return 0;
 }
@@ -1054,32 +1150,29 @@ static int get_camera_subwin(struct soc_camera_device *icd,
         if (!ceu_rect->width) {
                 struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
                 struct device *dev = icd->dev.parent;
-                struct v4l2_format f;
-                struct v4l2_pix_format *pix = &f.fmt.pix;
+                struct v4l2_mbus_framefmt mf;
                 int ret;
                 /* First time */
 
-                f.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-                ret = v4l2_subdev_call(sd, video, g_fmt, &f);
+                ret = v4l2_subdev_call(sd, video, g_mbus_fmt, &mf);
                 if (ret < 0)
                         return ret;
 
-                dev_geo(dev, "camera fmt %ux%u\n", pix->width, pix->height);
+                dev_geo(dev, "camera fmt %ux%u\n", mf.width, mf.height);
 
-                if (pix->width > 2560) {
+                if (mf.width > 2560) {
                         ceu_rect->width  = 2560;
-                        ceu_rect->left   = (pix->width - 2560) / 2;
+                        ceu_rect->left   = (mf.width - 2560) / 2;
                 } else {
-                        ceu_rect->width  = pix->width;
+                        ceu_rect->width  = mf.width;
                         ceu_rect->left   = 0;
                 }
 
-                if (pix->height > 1920) {
+                if (mf.height > 1920) {
                         ceu_rect->height = 1920;
-                        ceu_rect->top    = (pix->height - 1920) / 2;
+                        ceu_rect->top    = (mf.height - 1920) / 2;
                 } else {
-                        ceu_rect->height = pix->height;
+                        ceu_rect->height = mf.height;
                         ceu_rect->top    = 0;
                 }
 
@@ -1096,13 +1189,12 @@ static int get_camera_subwin(struct soc_camera_device *icd,
         return 0;
 }
 
-static int client_s_fmt(struct soc_camera_device *icd, struct v4l2_format *f,
-                        bool ceu_can_scale)
+static int client_s_fmt(struct soc_camera_device *icd,
+                        struct v4l2_mbus_framefmt *mf, bool ceu_can_scale)
 {
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         struct device *dev = icd->dev.parent;
-        struct v4l2_pix_format *pix = &f->fmt.pix;
-        unsigned int width = pix->width, height = pix->height, tmp_w, tmp_h;
+        unsigned int width = mf->width, height = mf->height, tmp_w, tmp_h;
         unsigned int max_width, max_height;
         struct v4l2_cropcap cap;
         int ret;
@@ -1116,29 +1208,29 @@ static int client_s_fmt(struct soc_camera_device *icd, struct v4l2_format *f,
         max_width = min(cap.bounds.width, 2560);
         max_height = min(cap.bounds.height, 1920);
 
-        ret = v4l2_subdev_call(sd, video, s_fmt, f);
+        ret = v4l2_subdev_call(sd, video, s_mbus_fmt, mf);
         if (ret < 0)
                 return ret;
 
-        dev_geo(dev, "camera scaled to %ux%u\n", pix->width, pix->height);
+        dev_geo(dev, "camera scaled to %ux%u\n", mf->width, mf->height);
 
-        if ((width == pix->width && height == pix->height) || !ceu_can_scale)
+        if ((width == mf->width && height == mf->height) || !ceu_can_scale)
                 return 0;
 
         /* Camera set a format, but geometry is not precise, try to improve */
-        tmp_w = pix->width;
-        tmp_h = pix->height;
+        tmp_w = mf->width;
+        tmp_h = mf->height;
 
         /* width <= max_width && height <= max_height - guaranteed by try_fmt */
         while ((width > tmp_w || height > tmp_h) &&
                tmp_w < max_width && tmp_h < max_height) {
                 tmp_w = min(2 * tmp_w, max_width);
                 tmp_h = min(2 * tmp_h, max_height);
-                pix->width = tmp_w;
-                pix->height = tmp_h;
-                ret = v4l2_subdev_call(sd, video, s_fmt, f);
+                mf->width = tmp_w;
+                mf->height = tmp_h;
+                ret = v4l2_subdev_call(sd, video, s_mbus_fmt, mf);
                 dev_geo(dev, "Camera scaled to %ux%u\n",
-                        pix->width, pix->height);
+                        mf->width, mf->height);
                 if (ret < 0) {
                         /* This shouldn't happen */
                         dev_err(dev, "Client failed to set format: %d\n", ret);
@@ -1156,27 +1248,26 @@ static int client_s_fmt(struct soc_camera_device *icd, struct v4l2_format *f,
  */
 static int client_scale(struct soc_camera_device *icd, struct v4l2_rect *rect,
                         struct v4l2_rect *sub_rect, struct v4l2_rect *ceu_rect,
-                        struct v4l2_format *f, bool ceu_can_scale)
+                        struct v4l2_mbus_framefmt *mf, bool ceu_can_scale)
 {
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         struct sh_mobile_ceu_cam *cam = icd->host_priv;
         struct device *dev = icd->dev.parent;
-        struct v4l2_format f_tmp = *f;
-        struct v4l2_pix_format *pix_tmp = &f_tmp.fmt.pix;
+        struct v4l2_mbus_framefmt mf_tmp = *mf;
         unsigned int scale_h, scale_v;
         int ret;
 
         /* 5. Apply iterative camera S_FMT for camera user window. */
-        ret = client_s_fmt(icd, &f_tmp, ceu_can_scale);
+        ret = client_s_fmt(icd, &mf_tmp, ceu_can_scale);
         if (ret < 0)
                 return ret;
 
         dev_geo(dev, "5: camera scaled to %ux%u\n",
-                pix_tmp->width, pix_tmp->height);
+                mf_tmp.width, mf_tmp.height);
 
         /* 6. Retrieve camera output window (g_fmt) */
 
-        /* unneeded - it is already in "f_tmp" */
+        /* unneeded - it is already in "mf_tmp" */
 
         /* 7. Calculate new camera scales. */
         ret = get_camera_scales(sd, rect, &scale_h, &scale_v);
@@ -1185,10 +1276,11 @@ static int client_scale(struct soc_camera_device *icd, struct v4l2_rect *rect,
 
         dev_geo(dev, "7: camera scales %u:%u\n", scale_h, scale_v);
 
-        cam->cam_width          = pix_tmp->width;
-        cam->cam_height         = pix_tmp->height;
-        f->fmt.pix.width        = pix_tmp->width;
-        f->fmt.pix.height       = pix_tmp->height;
+        cam->cam_width  = mf_tmp.width;
+        cam->cam_height = mf_tmp.height;
+        mf->width       = mf_tmp.width;
+        mf->height      = mf_tmp.height;
+        mf->colorspace  = mf_tmp.colorspace;
 
         /*
          * 8. Calculate new CEU crop - apply camera scales to previously
@@ -1252,8 +1344,7 @@ static int sh_mobile_ceu_set_crop(struct soc_camera_device *icd,
         struct v4l2_rect *cam_rect = &cam_crop.c, *ceu_rect = &cam->ceu_rect;
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         struct device *dev = icd->dev.parent;
-        struct v4l2_format f;
-        struct v4l2_pix_format *pix = &f.fmt.pix;
+        struct v4l2_mbus_framefmt mf;
         unsigned int scale_comb_h, scale_comb_v, scale_ceu_h, scale_ceu_v,
                 out_width, out_height;
         u32 capsr, cflcr;
@@ -1302,26 +1393,25 @@ static int sh_mobile_ceu_set_crop(struct soc_camera_device *icd,
          * 5. Using actual input window and calculated combined scales calculate
          *    camera target output window.
          */
-        pix->width              = scale_down(cam_rect->width, scale_comb_h);
-        pix->height             = scale_down(cam_rect->height, scale_comb_v);
+        mf.width        = scale_down(cam_rect->width, scale_comb_h);
+        mf.height       = scale_down(cam_rect->height, scale_comb_v);
 
-        dev_geo(dev, "5: camera target %ux%u\n", pix->width, pix->height);
+        dev_geo(dev, "5: camera target %ux%u\n", mf.width, mf.height);
 
         /* 6. - 9. */
-        pix->pixelformat        = cam->camera_fmt->fourcc;
-        pix->colorspace         = cam->camera_fmt->colorspace;
+        mf.code         = cam->code;
+        mf.field        = pcdev->field;
 
         capsr = capture_save_reset(pcdev);
         dev_dbg(dev, "CAPSR 0x%x, CFLCR 0x%x\n", capsr, pcdev->cflcr);
 
         /* Make relative to camera rectangle */
-        rect->left              -= cam_rect->left;
-        rect->top               -= cam_rect->top;
+        rect->left      -= cam_rect->left;
+        rect->top       -= cam_rect->top;
 
-        f.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-        ret = client_scale(icd, cam_rect, rect, ceu_rect, &f,
-                           pcdev->image_mode && !pcdev->is_interlaced);
+        ret = client_scale(icd, cam_rect, rect, ceu_rect, &mf,
+                           pcdev->image_mode &&
+                           V4L2_FIELD_NONE == pcdev->field);
 
         dev_geo(dev, "6-9: %d\n", ret);
 
@@ -1368,8 +1458,7 @@ static int sh_mobile_ceu_set_fmt(struct soc_camera_device *icd,
         struct sh_mobile_ceu_dev *pcdev = ici->priv;
         struct sh_mobile_ceu_cam *cam = icd->host_priv;
         struct v4l2_pix_format *pix = &f->fmt.pix;
-        struct v4l2_format cam_f = *f;
-        struct v4l2_pix_format *cam_pix = &cam_f.fmt.pix;
+        struct v4l2_mbus_framefmt mf;
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         struct device *dev = icd->dev.parent;
         __u32 pixfmt = pix->pixelformat;
@@ -1379,18 +1468,20 @@ static int sh_mobile_ceu_set_fmt(struct soc_camera_device *icd,
         unsigned int scale_cam_h, scale_cam_v;
         u16 scale_v, scale_h;
         int ret;
-        bool is_interlaced, image_mode;
+        bool image_mode;
+        enum v4l2_field field;
 
         switch (pix->field) {
-        case V4L2_FIELD_INTERLACED:
-                is_interlaced = true;
-                break;
-        case V4L2_FIELD_ANY:
         default:
                 pix->field = V4L2_FIELD_NONE;
                 /* fall-through */
+        case V4L2_FIELD_INTERLACED_TB:
+        case V4L2_FIELD_INTERLACED_BT:
         case V4L2_FIELD_NONE:
-                is_interlaced = false;
+                field = pix->field;
+                break;
+        case V4L2_FIELD_INTERLACED:
+                field = V4L2_FIELD_INTERLACED_TB;
                 break;
         }
 
@@ -1438,9 +1529,11 @@ static int sh_mobile_ceu_set_fmt(struct soc_camera_device *icd,
          * 4. Calculate camera output window by applying combined scales to real
          *    input window.
          */
-        cam_pix->width = scale_down(cam_rect->width, scale_h);
-        cam_pix->height = scale_down(cam_rect->height, scale_v);
-        cam_pix->pixelformat = xlate->cam_fmt->fourcc;
+        mf.width        = scale_down(cam_rect->width, scale_h);
+        mf.height       = scale_down(cam_rect->height, scale_v);
+        mf.field        = pix->field;
+        mf.colorspace   = pix->colorspace;
+        mf.code         = xlate->code;
 
         switch (pixfmt) {
         case V4L2_PIX_FMT_NV12:
@@ -1453,51 +1546,61 @@ static int sh_mobile_ceu_set_fmt(struct soc_camera_device *icd,
                 image_mode = false;
         }
 
-        dev_geo(dev, "4: camera output %ux%u\n",
-                cam_pix->width, cam_pix->height);
+        dev_geo(dev, "4: camera output %ux%u\n", mf.width, mf.height);
 
         /* 5. - 9. */
-        ret = client_scale(icd, cam_rect, &cam_subrect, &ceu_rect, &cam_f,
-                           image_mode && !is_interlaced);
+        ret = client_scale(icd, cam_rect, &cam_subrect, &ceu_rect, &mf,
+                           image_mode && V4L2_FIELD_NONE == field);
 
         dev_geo(dev, "5-9: client scale %d\n", ret);
 
         /* Done with the camera. Now see if we can improve the result */
 
         dev_dbg(dev, "Camera %d fmt %ux%u, requested %ux%u\n",
-                ret, cam_pix->width, cam_pix->height, pix->width, pix->height);
+                ret, mf.width, mf.height, pix->width, pix->height);
         if (ret < 0)
                 return ret;
 
+        if (mf.code != xlate->code)
+                return -EINVAL;
+
         /* 10. Use CEU scaling to scale to the requested user window. */
 
         /* We cannot scale up */
-        if (pix->width > cam_pix->width)
-                pix->width = cam_pix->width;
+        if (pix->width > mf.width)
+                pix->width = mf.width;
         if (pix->width > ceu_rect.width)
                 pix->width = ceu_rect.width;
 
-        if (pix->height > cam_pix->height)
-                pix->height = cam_pix->height;
+        if (pix->height > mf.height)
+                pix->height = mf.height;
         if (pix->height > ceu_rect.height)
                 pix->height = ceu_rect.height;
 
-        /* Let's rock: scale pix->{width x height} down to width x height */
-        scale_h = calc_scale(ceu_rect.width, &pix->width);
-        scale_v = calc_scale(ceu_rect.height, &pix->height);
+        pix->colorspace = mf.colorspace;
+
+        if (image_mode) {
+                /* Scale pix->{width x height} down to width x height */
+                scale_h = calc_scale(ceu_rect.width, &pix->width);
+                scale_v = calc_scale(ceu_rect.height, &pix->height);
+
+                pcdev->cflcr = scale_h | (scale_v << 16);
+        } else {
+                pix->width = ceu_rect.width;
+                pix->height = ceu_rect.height;
+                scale_h = scale_v = 0;
+                pcdev->cflcr = 0;
+        }
 
         dev_geo(dev, "10: W: %u : 0x%x = %u, H: %u : 0x%x = %u\n",
                 ceu_rect.width, scale_h, pix->width,
                 ceu_rect.height, scale_v, pix->height);
 
-        pcdev->cflcr = scale_h | (scale_v << 16);
+        cam->code               = xlate->code;
+        cam->ceu_rect           = ceu_rect;
+        icd->current_fmt        = xlate;
 
-        icd->buswidth = xlate->buswidth;
-        icd->current_fmt = xlate->host_fmt;
-        cam->camera_fmt = xlate->cam_fmt;
-        cam->ceu_rect = ceu_rect;
-
-        pcdev->is_interlaced = is_interlaced;
+        pcdev->field = field;
         pcdev->image_mode = image_mode;
 
         return 0;
@@ -1509,6 +1612,7 @@ static int sh_mobile_ceu_try_fmt(struct soc_camera_device *icd,
         const struct soc_camera_format_xlate *xlate;
         struct v4l2_pix_format *pix = &f->fmt.pix;
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+        struct v4l2_mbus_framefmt mf;
         __u32 pixfmt = pix->pixelformat;
         int width, height;
         int ret;
@@ -1527,18 +1631,27 @@ static int sh_mobile_ceu_try_fmt(struct soc_camera_device *icd,
         width = pix->width;
         height = pix->height;
 
-        pix->bytesperline = pix->width *
-                DIV_ROUND_UP(xlate->host_fmt->depth, 8);
-        pix->sizeimage = pix->height * pix->bytesperline;
-
-        pix->pixelformat = xlate->cam_fmt->fourcc;
+        pix->bytesperline = soc_mbus_bytes_per_line(width, xlate->host_fmt);
+        if (pix->bytesperline < 0)
+                return pix->bytesperline;
+        pix->sizeimage = height * pix->bytesperline;
 
         /* limit to sensor capabilities */
-        ret = v4l2_subdev_call(sd, video, try_fmt, f);
-        pix->pixelformat = pixfmt;
+        mf.width        = pix->width;
+        mf.height       = pix->height;
+        mf.field        = pix->field;
+        mf.code         = xlate->code;
+        mf.colorspace   = pix->colorspace;
+
+        ret = v4l2_subdev_call(sd, video, try_mbus_fmt, &mf);
         if (ret < 0)
                 return ret;
 
+        pix->width      = mf.width;
+        pix->height     = mf.height;
+        pix->field      = mf.field;
+        pix->colorspace = mf.colorspace;
+
         switch (pixfmt) {
         case V4L2_PIX_FMT_NV12:
         case V4L2_PIX_FMT_NV21:
@@ -1547,21 +1660,25 @@ static int sh_mobile_ceu_try_fmt(struct soc_camera_device *icd,
                 /* FIXME: check against rect_max after converting soc-camera */
                 /* We can scale precisely, need a bigger image from camera */
                 if (pix->width < width || pix->height < height) {
-                        int tmp_w = pix->width, tmp_h = pix->height;
-                        pix->width = 2560;
-                        pix->height = 1920;
-                        ret = v4l2_subdev_call(sd, video, try_fmt, f);
+                        /*
+                         * We presume, the sensor behaves sanely, i.e., if
+                         * requested a bigger rectangle, it will not return a
+                         * smaller one.
+                         */
+                        mf.width = 2560;
+                        mf.height = 1920;
+                        ret = v4l2_subdev_call(sd, video, try_mbus_fmt, &mf);
                         if (ret < 0) {
                                 /* Shouldn't actually happen... */
                                 dev_err(icd->dev.parent,
-                                        "FIXME: try_fmt() returned %d\n", ret);
-                                pix->width = tmp_w;
-                                pix->height = tmp_h;
+                                        "FIXME: client try_fmt() = %d\n", ret);
+                                return ret;
                         }
                 }
-                if (pix->width > width)
+                /* We will scale exactly */
+                if (mf.width > width)
                         pix->width = width;
-                if (pix->height > height)
+                if (mf.height > height)
                         pix->height = height;
         }
 
@@ -1573,10 +1690,12 @@ static int sh_mobile_ceu_reqbufs(struct soc_camera_file *icf,
 {
         int i;
 
-        /* This is for locking debugging only. I removed spinlocks and now I
+        /*
+         * This is for locking debugging only. I removed spinlocks and now I
          * check whether .prepare is ever called on a linked buffer, or whether
          * a dma IRQ can occur for an in-work or unlinked buffer. Until now
-         * it hadn't triggered */
+         * it hadn't triggered
+         */
         for (i = 0; i < p->count; i++) {
                 struct sh_mobile_ceu_buffer *buf;
 
@@ -1624,8 +1743,7 @@ static void sh_mobile_ceu_init_videobuf(struct videobuf_queue *q,
                                        &sh_mobile_ceu_videobuf_ops,
                                        icd->dev.parent, &pcdev->lock,
                                        V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                                       pcdev->is_interlaced ?
-                                       V4L2_FIELD_INTERLACED : V4L2_FIELD_NONE,
+                                       pcdev->field,
                                        sizeof(struct sh_mobile_ceu_buffer),
                                        icd);
 }
@@ -1654,7 +1772,7 @@ static int sh_mobile_ceu_set_ctrl(struct soc_camera_device *icd,
 
         switch (ctrl->id) {
         case V4L2_CID_SHARPNESS:
-                switch (icd->current_fmt->fourcc) {
+                switch (icd->current_fmt->host_fmt->fourcc) {
                 case V4L2_PIX_FMT_NV12:
                 case V4L2_PIX_FMT_NV21:
                 case V4L2_PIX_FMT_NV16:
@@ -1825,7 +1943,7 @@ static int sh_mobile_ceu_runtime_nop(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops sh_mobile_ceu_dev_pm_ops = {
+static const struct dev_pm_ops sh_mobile_ceu_dev_pm_ops = {
         .runtime_suspend = sh_mobile_ceu_runtime_nop,
         .runtime_resume = sh_mobile_ceu_runtime_nop,
 };
@@ -1836,7 +1954,7 @@ static struct platform_driver sh_mobile_ceu_driver = {
                 .pm     = &sh_mobile_ceu_dev_pm_ops,
         },
         .probe          = sh_mobile_ceu_probe,
-        .remove         = __exit_p(sh_mobile_ceu_remove),
+        .remove         = __devexit_p(sh_mobile_ceu_remove),
 };
 
 static int __init sh_mobile_ceu_init(void)
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 4a7711c3e745..cbf8087b286f 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -1007,8 +1007,8 @@ static int sn9c102_stream_interrupt(struct sn9c102_device* cam)
         else if (cam->stream != STREAM_OFF) {
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "URB timeout reached. The camera is misconfigured. "
-                       "To use it, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "To use it, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -1734,7 +1734,8 @@ static void sn9c102_release_resources(struct kref *kref)
 
         cam = container_of(kref, struct sn9c102_device, kref);
 
-        DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->num);
+        DBG(2, "V4L2 device %s deregistered",
+            video_device_node_name(cam->v4ldev));
         video_set_drvdata(cam->v4ldev, NULL);
         video_unregister_device(cam->v4ldev);
         usb_put_dev(cam->usbdev);
@@ -1791,8 +1792,8 @@ static int sn9c102_open(struct file *filp)
         }
 
         if (cam->users) {
-                DBG(2, "Device /dev/video%d is already in use",
-                       cam->v4ldev->num);
+                DBG(2, "Device %s is already in use",
+                    video_device_node_name(cam->v4ldev));
                 DBG(3, "Simultaneous opens are not supported");
                 /*
                    open() must follow the open flags and should block
@@ -1845,7 +1846,7 @@ static int sn9c102_open(struct file *filp)
         cam->frame_count = 0;
         sn9c102_empty_framequeues(cam);
 
-        DBG(3, "Video device /dev/video%d is open", cam->v4ldev->num);
+        DBG(3, "Video device %s is open", video_device_node_name(cam->v4ldev));
 
 out:
         mutex_unlock(&cam->open_mutex);
@@ -1870,7 +1871,7 @@ static int sn9c102_release(struct file *filp)
         cam->users--;
         wake_up_interruptible_nr(&cam->wait_open, 1);
 
-        DBG(3, "Video device /dev/video%d closed", cam->v4ldev->num);
+        DBG(3, "Video device %s closed", video_device_node_name(cam->v4ldev));
 
         kref_put(&cam->kref, sn9c102_release_resources);
 
@@ -2433,8 +2434,8 @@ sn9c102_vidioc_s_crop(struct sn9c102_device* cam, void __user * arg)
         if (err) { /* atomic, no rollback in ioctl() */
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_CROP failed because of hardware problems. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -2446,8 +2447,8 @@ sn9c102_vidioc_s_crop(struct sn9c102_device* cam, void __user * arg)
             nbuffers != sn9c102_request_buffers(cam, nbuffers, cam->io)) {
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_CROP failed because of not enough memory. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -ENOMEM;
         }
 
@@ -2690,8 +2691,8 @@ sn9c102_vidioc_try_s_fmt(struct sn9c102_device* cam, unsigned int cmd,
         if (err) { /* atomic, no rollback in ioctl() */
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_FMT failed because of hardware problems. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -2702,8 +2703,8 @@ sn9c102_vidioc_try_s_fmt(struct sn9c102_device* cam, unsigned int cmd,
             nbuffers != sn9c102_request_buffers(cam, nbuffers, cam->io)) {
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_FMT failed because of not enough memory. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -ENOMEM;
         }
 
@@ -2748,9 +2749,9 @@ sn9c102_vidioc_s_jpegcomp(struct sn9c102_device* cam, void __user * arg)
         err += sn9c102_set_compression(cam, &jc);
         if (err) { /* atomic, no rollback in ioctl() */
                 cam->state |= DEV_MISCONFIGURED;
-                DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware "
-                       "problems. To use the camera, close and open "
-                       "/dev/video%d again.", cam->v4ldev->num);
+                DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware problems. "
+                       "To use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -3328,7 +3329,6 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
 
         strcpy(cam->v4ldev->name, "SN9C1xx PC Camera");
         cam->v4ldev->fops = &sn9c102_fops;
-        cam->v4ldev->minor = video_nr[dev_nr];
         cam->v4ldev->release = video_device_release;
         cam->v4ldev->parent = &udev->dev;
 
@@ -3346,7 +3346,8 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                 goto fail;
         }
 
-        DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->num);
+        DBG(2, "V4L2 device registered as %s",
+            video_device_node_name(cam->v4ldev));
 
         video_set_drvdata(cam->v4ldev, cam);
         cam->module_param.force_munmap = force_munmap[dev_nr];
@@ -3398,9 +3399,9 @@ static void sn9c102_usb_disconnect(struct usb_interface* intf)
         DBG(2, "Disconnecting %s...", cam->v4ldev->name);
 
         if (cam->users) {
-                DBG(2, "Device /dev/video%d is open! Deregistration and "
-                       "memory deallocation are deferred.",
-                    cam->v4ldev->num);
+                DBG(2, "Device %s is open! Deregistration and memory "
+                       "deallocation are deferred.",
+                    video_device_node_name(cam->v4ldev));
                 cam->state |= DEV_MISCONFIGURED;
                 sn9c102_stop_transfer(cam);
                 cam->state |= DEV_DISCONNECTED;
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 95fdeb23c2c1..6b3fbcca7747 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -31,6 +31,7 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-dev.h>
 #include <media/videobuf-core.h>
+#include <media/soc_mediabus.h>
 
 /* Default to VGA resolution */
 #define DEFAULT_WIDTH   640
@@ -40,18 +41,6 @@ static LIST_HEAD(hosts);
 static LIST_HEAD(devices);
 static DEFINE_MUTEX(list_lock);         /* Protects the list of hosts */
 
-const struct soc_camera_data_format *soc_camera_format_by_fourcc(
-        struct soc_camera_device *icd, unsigned int fourcc)
-{
-        unsigned int i;
-
-        for (i = 0; i < icd->num_formats; i++)
-                if (icd->formats[i].fourcc == fourcc)
-                        return icd->formats + i;
-        return NULL;
-}
-EXPORT_SYMBOL(soc_camera_format_by_fourcc);
-
 const struct soc_camera_format_xlate *soc_camera_xlate_by_fourcc(
         struct soc_camera_device *icd, unsigned int fourcc)
 {
@@ -207,21 +196,26 @@ static int soc_camera_dqbuf(struct file *file, void *priv,
 /* Always entered with .video_lock held */
 static int soc_camera_init_user_formats(struct soc_camera_device *icd)
 {
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
-        int i, fmts = 0, ret;
+        int i, fmts = 0, raw_fmts = 0, ret;
+        enum v4l2_mbus_pixelcode code;
+
+        while (!v4l2_subdev_call(sd, video, enum_mbus_fmt, raw_fmts, &code))
+                raw_fmts++;
 
         if (!ici->ops->get_formats)
                 /*
                  * Fallback mode - the host will have to serve all
                  * sensor-provided formats one-to-one to the user
                  */
-                fmts = icd->num_formats;
+                fmts = raw_fmts;
         else
                 /*
                  * First pass - only count formats this host-sensor
                  * configuration can provide
                  */
-                for (i = 0; i < icd->num_formats; i++) {
+                for (i = 0; i < raw_fmts; i++) {
                         ret = ici->ops->get_formats(icd, i, NULL);
                         if (ret < 0)
                                 return ret;
@@ -242,11 +236,12 @@ static int soc_camera_init_user_formats(struct soc_camera_device *icd)
 
         /* Second pass - actually fill data formats */
         fmts = 0;
-        for (i = 0; i < icd->num_formats; i++)
+        for (i = 0; i < raw_fmts; i++)
                 if (!ici->ops->get_formats) {
-                        icd->user_formats[i].host_fmt = icd->formats + i;
-                        icd->user_formats[i].cam_fmt = icd->formats + i;
-                        icd->user_formats[i].buswidth = icd->formats[i].depth;
+                        v4l2_subdev_call(sd, video, enum_mbus_fmt, i, &code);
+                        icd->user_formats[i].host_fmt =
+                                soc_mbus_get_fmtdesc(code);
+                        icd->user_formats[i].code = code;
                 } else {
                         ret = ici->ops->get_formats(icd, i,
                                                     &icd->user_formats[fmts]);
@@ -255,7 +250,7 @@ static int soc_camera_init_user_formats(struct soc_camera_device *icd)
                         fmts += ret;
                 }
 
-        icd->current_fmt = icd->user_formats[0].host_fmt;
+        icd->current_fmt = &icd->user_formats[0];
 
         return 0;
 
@@ -281,7 +276,7 @@ static void soc_camera_free_user_formats(struct soc_camera_device *icd)
 #define pixfmtstr(x) (x) & 0xff, ((x) >> 8) & 0xff, ((x) >> 16) & 0xff, \
         ((x) >> 24) & 0xff
 
-/* Called with .vb_lock held */
+/* Called with .vb_lock held, or from the first open(2), see comment there */
 static int soc_camera_set_fmt(struct soc_camera_file *icf,
                               struct v4l2_format *f)
 {
@@ -302,7 +297,7 @@ static int soc_camera_set_fmt(struct soc_camera_file *icf,
         if (ret < 0) {
                 return ret;
         } else if (!icd->current_fmt ||
-                   icd->current_fmt->fourcc != pix->pixelformat) {
+                   icd->current_fmt->host_fmt->fourcc != pix->pixelformat) {
                 dev_err(&icd->dev,
                         "Host driver hasn't set up current format correctly!\n");
                 return -EINVAL;
@@ -310,6 +305,7 @@ static int soc_camera_set_fmt(struct soc_camera_file *icf,
 
         icd->user_width         = pix->width;
         icd->user_height        = pix->height;
+        icd->colorspace         = pix->colorspace;
         icf->vb_vidq.field      =
                 icd->field      = pix->field;
 
@@ -369,8 +365,9 @@ static int soc_camera_open(struct file *file)
                                 .width          = icd->user_width,
                                 .height         = icd->user_height,
                                 .field          = icd->field,
-                                .pixelformat    = icd->current_fmt->fourcc,
-                                .colorspace     = icd->current_fmt->colorspace,
+                                .colorspace     = icd->colorspace,
+                                .pixelformat    =
+                                        icd->current_fmt->host_fmt->fourcc,
                         },
                 };
 
@@ -390,7 +387,12 @@ static int soc_camera_open(struct file *file)
                         goto eiciadd;
                 }
 
-                /* Try to configure with default parameters */
+                /*
+                 * Try to configure with default parameters. Notice: this is the
+                 * very first open, so, we cannot race against other calls,
+                 * apart from someone else calling open() simultaneously, but
+                 * .video_lock is protecting us against it.
+                 */
                 ret = soc_camera_set_fmt(icf, &f);
                 if (ret < 0)
                         goto esfmt;
@@ -534,7 +536,7 @@ static int soc_camera_enum_fmt_vid_cap(struct file *file, void  *priv,
 {
         struct soc_camera_file *icf = file->private_data;
         struct soc_camera_device *icd = icf->icd;
-        const struct soc_camera_data_format *format;
+        const struct soc_mbus_pixelfmt *format;
 
         WARN_ON(priv != file->private_data);
 
@@ -543,7 +545,8 @@ static int soc_camera_enum_fmt_vid_cap(struct file *file, void  *priv,
 
         format = icd->user_formats[f->index].host_fmt;
 
-        strlcpy(f->description, format->name, sizeof(f->description));
+        if (format->name)
+                strlcpy(f->description, format->name, sizeof(f->description));
         f->pixelformat = format->fourcc;
         return 0;
 }
@@ -560,12 +563,15 @@ static int soc_camera_g_fmt_vid_cap(struct file *file, void *priv,
         pix->width              = icd->user_width;
         pix->height             = icd->user_height;
         pix->field              = icf->vb_vidq.field;
-        pix->pixelformat        = icd->current_fmt->fourcc;
-        pix->bytesperline       = pix->width *
-                DIV_ROUND_UP(icd->current_fmt->depth, 8);
+        pix->pixelformat        = icd->current_fmt->host_fmt->fourcc;
+        pix->bytesperline       = soc_mbus_bytes_per_line(pix->width,
+                                                icd->current_fmt->host_fmt);
+        pix->colorspace         = icd->colorspace;
+        if (pix->bytesperline < 0)
+                return pix->bytesperline;
         pix->sizeimage          = pix->height * pix->bytesperline;
         dev_dbg(&icd->dev, "current_fmt->fourcc: 0x%08x\n",
-                icd->current_fmt->fourcc);
+                icd->current_fmt->host_fmt->fourcc);
         return 0;
 }
 
@@ -621,8 +627,10 @@ static int soc_camera_streamoff(struct file *file, void *priv,
 
         mutex_lock(&icd->video_lock);
 
-        /* This calls buf_release from host driver's videobuf_queue_ops for all
-         * remaining buffers. When the last buffer is freed, stop capture */
+        /*
+         * This calls buf_release from host driver's videobuf_queue_ops for all
+         * remaining buffers. When the last buffer is freed, stop capture
+         */
         videobuf_streamoff(&icf->vb_vidq);
 
         v4l2_subdev_call(sd, video, s_stream, 0);
@@ -892,7 +900,7 @@ static int soc_camera_probe(struct device *dev)
         struct soc_camera_link *icl = to_soc_camera_link(icd);
         struct device *control = NULL;
         struct v4l2_subdev *sd;
-        struct v4l2_format f = {.type = V4L2_BUF_TYPE_VIDEO_CAPTURE};
+        struct v4l2_mbus_framefmt mf;
         int ret;
 
         dev_info(dev, "Probing %s\n", dev_name(dev));
@@ -963,9 +971,11 @@ static int soc_camera_probe(struct device *dev)
 
         /* Try to improve our guess of a reasonable window format */
         sd = soc_camera_to_subdev(icd);
-        if (!v4l2_subdev_call(sd, video, g_fmt, &f)) {
-                icd->user_width         = f.fmt.pix.width;
-                icd->user_height        = f.fmt.pix.height;
+        if (!v4l2_subdev_call(sd, video, g_mbus_fmt, &mf)) {
+                icd->user_width         = mf.width;
+                icd->user_height        = mf.height;
+                icd->colorspace         = mf.colorspace;
+                icd->field              = mf.field;
         }
 
         /* Do we have to sysfs_remove_link() before device_unregister()? */
@@ -1004,8 +1014,10 @@ epower:
         return ret;
 }
 
-/* This is called on device_unregister, which only means we have to disconnect
- * from the host, but not remove ourselves from the device list */
+/*
+ * This is called on device_unregister, which only means we have to disconnect
+ * from the host, but not remove ourselves from the device list
+ */
 static int soc_camera_remove(struct device *dev)
 {
         struct soc_camera_device *icd = to_soc_camera_dev(dev);
@@ -1205,8 +1217,10 @@ static int soc_camera_device_register(struct soc_camera_device *icd)
         }
 
         if (num < 0)
-                /* ok, we have 256 cameras on this host...
-                 * man, stay reasonable... */
+                /*
+                 * ok, we have 256 cameras on this host...
+                 * man, stay reasonable...
+                 */
                 return -ENOMEM;
 
         icd->devnum             = num;
@@ -1268,7 +1282,6 @@ static int video_dev_create(struct soc_camera_device *icd)
         vdev->fops              = &soc_camera_fops;
         vdev->ioctl_ops         = &soc_camera_ioctl_ops;
         vdev->release           = video_device_release;
-        vdev->minor             = -1;
         vdev->tvnorms           = V4L2_STD_UNKNOWN;
 
         icd->vdev = vdev;
@@ -1291,8 +1304,7 @@ static int soc_camera_video_start(struct soc_camera_device *icd)
             !icd->ops->set_bus_param)
                 return -EINVAL;
 
-        ret = video_register_device(icd->vdev, VFL_TYPE_GRABBER,
-                                    icd->vdev->minor);
+        ret = video_register_device(icd->vdev, VFL_TYPE_GRABBER, -1);
         if (ret < 0) {
                 dev_err(&icd->dev, "video_register_device failed: %d\n", ret);
                 return ret;
@@ -1335,9 +1347,11 @@ escdevreg:
         return ret;
 }
 
-/* Only called on rmmod for each platform device, since they are not
+/*
+ * Only called on rmmod for each platform device, since they are not
  * hot-pluggable. Now we know, that all our users - hosts and devices have
- * been unloaded already */
+ * been unloaded already
+ */
 static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev)
 {
         struct soc_camera_device *icd = platform_get_drvdata(pdev);
diff --git a/drivers/media/video/soc_camera_platform.c b/drivers/media/video/soc_camera_platform.c
index b6a575ce5da2..10b003a8be83 100644
--- a/drivers/media/video/soc_camera_platform.c
+++ b/drivers/media/video/soc_camera_platform.c
@@ -22,7 +22,6 @@
 
 struct soc_camera_platform_priv {
         struct v4l2_subdev subdev;
-        struct soc_camera_data_format format;
 };
 
 static struct soc_camera_platform_priv *get_priv(struct platform_device *pdev)
@@ -58,36 +57,36 @@ soc_camera_platform_query_bus_param(struct soc_camera_device *icd)
 }
 
 static int soc_camera_platform_try_fmt(struct v4l2_subdev *sd,
-                                       struct v4l2_format *f)
+                                       struct v4l2_mbus_framefmt *mf)
 {
         struct soc_camera_platform_info *p = v4l2_get_subdevdata(sd);
-        struct v4l2_pix_format *pix = &f->fmt.pix;
 
-        pix->width = p->format.width;
-        pix->height = p->format.height;
+        mf->width       = p->format.width;
+        mf->height      = p->format.height;
+        mf->code        = p->format.code;
+        mf->colorspace  = p->format.colorspace;
+
         return 0;
 }
 
-static void soc_camera_platform_video_probe(struct soc_camera_device *icd,
-                                            struct platform_device *pdev)
+static struct v4l2_subdev_core_ops platform_subdev_core_ops;
+
+static int soc_camera_platform_enum_fmt(struct v4l2_subdev *sd, int index,
+                                        enum v4l2_mbus_pixelcode *code)
 {
-        struct soc_camera_platform_priv *priv = get_priv(pdev);
-        struct soc_camera_platform_info *p = pdev->dev.platform_data;
+        struct soc_camera_platform_info *p = v4l2_get_subdevdata(sd);
 
-        priv->format.name = p->format_name;
-        priv->format.depth = p->format_depth;
-        priv->format.fourcc = p->format.pixelformat;
-        priv->format.colorspace = p->format.colorspace;
+        if (index)
+                return -EINVAL;
 
-        icd->formats = &priv->format;
-        icd->num_formats = 1;
+        *code = p->format.code;
+        return 0;
 }
 
-static struct v4l2_subdev_core_ops platform_subdev_core_ops;
-
 static struct v4l2_subdev_video_ops platform_subdev_video_ops = {
         .s_stream       = soc_camera_platform_s_stream,
-        .try_fmt        = soc_camera_platform_try_fmt,
+        .try_mbus_fmt   = soc_camera_platform_try_fmt,
+        .enum_mbus_fmt  = soc_camera_platform_enum_fmt,
 };
 
 static struct v4l2_subdev_ops platform_subdev_ops = {
@@ -128,13 +127,10 @@ static int soc_camera_platform_probe(struct platform_device *pdev)
         /* Set the control device reference */
         dev_set_drvdata(&icd->dev, &pdev->dev);
 
-        icd->y_skip_top         = 0;
-        icd->ops                = &soc_camera_platform_ops;
+        icd->ops = &soc_camera_platform_ops;
 
         ici = to_soc_camera_host(icd->dev.parent);
 
-        soc_camera_platform_video_probe(icd, pdev);
-
         v4l2_subdev_init(&priv->subdev, &platform_subdev_ops);
         v4l2_set_subdevdata(&priv->subdev, p);
         strncpy(priv->subdev.name, dev_name(&pdev->dev), V4L2_SUBDEV_NAME_SIZE);
diff --git a/drivers/media/video/soc_mediabus.c b/drivers/media/video/soc_mediabus.c
new file mode 100644
index 000000000000..f8d5c87dc2aa
--- /dev/null
+++ b/drivers/media/video/soc_mediabus.c
@@ -0,0 +1,157 @@
+/*
+ * soc-camera media bus helper routines
+ *
+ * Copyright (C) 2009, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ *
+ * 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/kernel.h>
+#include <linux/module.h>
+
+#include <media/v4l2-device.h>
+#include <media/v4l2-mediabus.h>
+#include <media/soc_mediabus.h>
+
+#define MBUS_IDX(f) (V4L2_MBUS_FMT_ ## f - V4L2_MBUS_FMT_FIXED - 1)
+
+static const struct soc_mbus_pixelfmt mbus_fmt[] = {
+        [MBUS_IDX(YUYV8_2X8_LE)] = {
+                .fourcc                 = V4L2_PIX_FMT_YUYV,
+                .name                   = "YUYV",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_2X8_PADHI,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, [MBUS_IDX(YVYU8_2X8_LE)] = {
+                .fourcc                 = V4L2_PIX_FMT_YVYU,
+                .name                   = "YVYU",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_2X8_PADHI,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, [MBUS_IDX(YUYV8_2X8_BE)] = {
+                .fourcc                 = V4L2_PIX_FMT_UYVY,
+                .name                   = "UYVY",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_2X8_PADHI,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, [MBUS_IDX(YVYU8_2X8_BE)] = {
+                .fourcc                 = V4L2_PIX_FMT_VYUY,
+                .name                   = "VYUY",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_2X8_PADHI,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, [MBUS_IDX(RGB555_2X8_PADHI_LE)] = {
+                .fourcc                 = V4L2_PIX_FMT_RGB555,
+                .name                   = "RGB555",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_2X8_PADHI,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, [MBUS_IDX(RGB555_2X8_PADHI_BE)] = {
+                .fourcc                 = V4L2_PIX_FMT_RGB555X,
+                .name                   = "RGB555X",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_2X8_PADHI,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, [MBUS_IDX(RGB565_2X8_LE)] = {
+                .fourcc                 = V4L2_PIX_FMT_RGB565,
+                .name                   = "RGB565",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_2X8_PADHI,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, [MBUS_IDX(RGB565_2X8_BE)] = {
+                .fourcc                 = V4L2_PIX_FMT_RGB565X,
+                .name                   = "RGB565X",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_2X8_PADHI,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, [MBUS_IDX(SBGGR8_1X8)] = {
+                .fourcc                 = V4L2_PIX_FMT_SBGGR8,
+                .name                   = "Bayer 8 BGGR",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_NONE,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, [MBUS_IDX(SBGGR10_1X10)] = {
+                .fourcc                 = V4L2_PIX_FMT_SBGGR10,
+                .name                   = "Bayer 10 BGGR",
+                .bits_per_sample        = 10,
+                .packing                = SOC_MBUS_PACKING_EXTEND16,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, [MBUS_IDX(GREY8_1X8)] = {
+                .fourcc                 = V4L2_PIX_FMT_GREY,
+                .name                   = "Grey",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_NONE,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, [MBUS_IDX(Y10_1X10)] = {
+                .fourcc                 = V4L2_PIX_FMT_Y10,
+                .name                   = "Grey 10bit",
+                .bits_per_sample        = 10,
+                .packing                = SOC_MBUS_PACKING_EXTEND16,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, [MBUS_IDX(SBGGR10_2X8_PADHI_LE)] = {
+                .fourcc                 = V4L2_PIX_FMT_SBGGR10,
+                .name                   = "Bayer 10 BGGR",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_2X8_PADHI,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, [MBUS_IDX(SBGGR10_2X8_PADLO_LE)] = {
+                .fourcc                 = V4L2_PIX_FMT_SBGGR10,
+                .name                   = "Bayer 10 BGGR",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_2X8_PADLO,
+                .order                  = SOC_MBUS_ORDER_LE,
+        }, [MBUS_IDX(SBGGR10_2X8_PADHI_BE)] = {
+                .fourcc                 = V4L2_PIX_FMT_SBGGR10,
+                .name                   = "Bayer 10 BGGR",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_2X8_PADHI,
+                .order                  = SOC_MBUS_ORDER_BE,
+        }, [MBUS_IDX(SBGGR10_2X8_PADLO_BE)] = {
+                .fourcc                 = V4L2_PIX_FMT_SBGGR10,
+                .name                   = "Bayer 10 BGGR",
+                .bits_per_sample        = 8,
+                .packing                = SOC_MBUS_PACKING_2X8_PADLO,
+                .order                  = SOC_MBUS_ORDER_BE,
+        },
+};
+
+s32 soc_mbus_bytes_per_line(u32 width, const struct soc_mbus_pixelfmt *mf)
+{
+        switch (mf->packing) {
+        case SOC_MBUS_PACKING_NONE:
+                return width * mf->bits_per_sample / 8;
+        case SOC_MBUS_PACKING_2X8_PADHI:
+        case SOC_MBUS_PACKING_2X8_PADLO:
+        case SOC_MBUS_PACKING_EXTEND16:
+                return width * 2;
+        }
+        return -EINVAL;
+}
+EXPORT_SYMBOL(soc_mbus_bytes_per_line);
+
+const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc(
+        enum v4l2_mbus_pixelcode code)
+{
+        if ((unsigned int)(code - V4L2_MBUS_FMT_FIXED) > ARRAY_SIZE(mbus_fmt))
+                return NULL;
+        return mbus_fmt + code - V4L2_MBUS_FMT_FIXED - 1;
+}
+EXPORT_SYMBOL(soc_mbus_get_fmtdesc);
+
+static int __init soc_mbus_init(void)
+{
+        return 0;
+}
+
+static void __exit soc_mbus_exit(void)
+{
+}
+
+module_init(soc_mbus_init);
+module_exit(soc_mbus_exit);
+
+MODULE_DESCRIPTION("soc-camera media bus interface");
+MODULE_AUTHOR("Guennadi Liakhovetski <g.liakhovetski@gmx.de>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index 6b41865f42bd..f07a0f6b71c4 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -1307,7 +1307,6 @@ static void stk_v4l_dev_release(struct video_device *vd)
 
 static struct video_device stk_v4l_data = {
         .name = "stkwebcam",
-        .minor = -1,
         .tvnorms = V4L2_STD_UNKNOWN,
         .current_norm = V4L2_STD_UNKNOWN,
         .fops = &v4l_stk_fops,
@@ -1327,8 +1326,8 @@ static int stk_register_video_device(struct stk_camera *dev)
         if (err)
                 STK_ERROR("v4l registration failed\n");
         else
-                STK_INFO("Syntek USB2.0 Camera is now controlling video device"
-                        " /dev/video%d\n", dev->vdev.num);
+                STK_INFO("Syntek USB2.0 Camera is now controlling device %s\n",
+                         video_device_node_name(&dev->vdev));
         return err;
 }
 
@@ -1418,8 +1417,8 @@ static void stk_camera_disconnect(struct usb_interface *interface)
         wake_up_interruptible(&dev->wait_frame);
         stk_remove_sysfs_files(&dev->vdev);
 
-        STK_INFO("Syntek USB2.0 Camera release resources "
-                "video device /dev/video%d\n", dev->vdev.num);
+        STK_INFO("Syntek USB2.0 Camera release resources device %s\n",
+                 video_device_node_name(&dev->vdev));
 
         video_unregister_device(&dev->vdev);
 }
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index eaada39c76fd..a057824e7ebc 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -1921,7 +1921,6 @@ static const struct v4l2_file_operations saa_fops = {
 static struct video_device saa_template = {
         .name = "SAA7146A",
         .fops = &saa_fops,
-        .minor = -1,
         .release = video_device_release_empty,
 };
 
@@ -1972,7 +1971,6 @@ static int __devinit configure_saa7146(struct pci_dev *pdev, int num)
 
         saa->id = pdev->device;
         saa->irq = pdev->irq;
-        saa->video_dev.minor = -1;
         saa->saa7146_adr = pci_resource_start(pdev, 0);
         pci_read_config_byte(pdev, PCI_CLASS_REVISION, &saa->revision);
 
@@ -2134,7 +2132,7 @@ static void stradis_release_saa(struct pci_dev *pdev)
         free_irq(saa->irq, saa);
         if (saa->saa7146_mem)
                 iounmap(saa->saa7146_mem);
-        if (saa->video_dev.minor != -1)
+        if (video_is_registered(&saa->video_dev))
                 video_unregister_device(&saa->video_dev);
 }
 
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index 6a91714125d2..5938ad8702ef 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -1405,7 +1405,6 @@ static struct video_device stv680_template = {
         .name =         "STV0680 USB camera",
         .fops =         &stv680_fops,
         .release =      video_device_release,
-        .minor =        -1,
 };
 
 static int stv680_probe (struct usb_interface *intf, const struct usb_device_id *id)
@@ -1467,8 +1466,8 @@ static int stv680_probe (struct usb_interface *intf, const struct usb_device_id
                 retval = -EIO;
                 goto error_vdev;
         }
-        PDEBUG(0, "STV(i): registered new video device: video%d",
-                stv680->vdev->num);
+        PDEBUG(0, "STV(i): registered new video device: %s",
+                video_device_node_name(stv680->vdev));
 
         usb_set_intfdata (intf, stv680);
         retval = stv680_create_sysfs_files(stv680->vdev);
diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 269ab044072a..5b801a6e1eea 100644
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -29,7 +29,7 @@
 #include <media/tw9910.h>
 
 #define GET_ID(val)  ((val & 0xF8) >> 3)
-#define GET_ReV(val) (val & 0x07)
+#define GET_REV(val) (val & 0x07)
 
 /*
  * register offset
@@ -117,7 +117,7 @@
 #define LCTL24          0x68
 #define LCTL25          0x69
 #define LCTL26          0x6A
-#define HSGEGIN         0x6B
+#define HSBEGIN         0x6B
 #define HSEND           0x6C
 #define OVSDLY          0x6D
 #define OVSEND          0x6E
@@ -152,7 +152,10 @@
                          /* 1 : non-auto */
 #define VSCTL       0x08 /* 1 : Vertical out ctrl by DVALID */
                          /* 0 : Vertical out ctrl by HACTIVE and DVALID */
-#define OEN         0x04 /* Output Enable together with TRI_SEL. */
+#define OEN_TRI_SEL_MASK        0x07
+#define OEN_TRI_SEL_ALL_ON      0x00 /* Enable output for Rev0/Rev1 */
+#define OEN_TRI_SEL_ALL_OFF_r0  0x06 /* All tri-stated for Rev0 */
+#define OEN_TRI_SEL_ALL_OFF_r1  0x07 /* All tri-stated for Rev1 */
 
 /* OUTCTR1 */
 #define VSP_LO      0x00 /* 0 : VS pin output polarity is active low */
@@ -178,11 +181,18 @@
                           * but all register content remain unchanged.
                           * This bit is self-resetting.
                           */
+#define ACNTL1_PDN_MASK 0x0e
+#define CLK_PDN         0x08 /* system clock power down */
+#define Y_PDN           0x04 /* Luma ADC power down */
+#define C_PDN           0x02 /* Chroma ADC power down */
+
+/* ACNTL2 */
+#define ACNTL2_PDN_MASK 0x40
+#define PLL_PDN         0x40 /* PLL power down */
 
 /* VBICNTL */
-/* RTSEL : control the real time signal
-*          output from the MPOUT pin
-*/
+
+/* RTSEL : control the real time signal output from the MPOUT pin */
 #define RTSEL_MASK  0x07
 #define RTSEL_VLOSS 0x00 /* 0000 = Video loss */
 #define RTSEL_HLOCK 0x01 /* 0001 = H-lock */
@@ -226,28 +236,7 @@ struct tw9910_priv {
         struct v4l2_subdev                subdev;
         struct tw9910_video_info       *info;
         const struct tw9910_scale_ctrl *scale;
-};
-
-/*
- * register settings
- */
-
-#define ENDMARKER { 0xff, 0xff }
-
-static const struct regval_list tw9910_default_regs[] =
-{
-        { OPFORM,  0x00 },
-        { OUTCTR1, VSP_LO | VSSL_VVALID | HSP_HI | HSSL_HSYNC },
-        ENDMARKER,
-};
-
-static const struct soc_camera_data_format tw9910_color_fmt[] = {
-        {
-                .name       = "VYUY",
-                .fourcc     = V4L2_PIX_FMT_VYUY,
-                .depth      = 16,
-                .colorspace = V4L2_COLORSPACE_SMPTE170M,
-        }
+        u32                             revision;
 };
 
 static const struct tw9910_scale_ctrl tw9910_ntsc_scales[] = {
@@ -340,13 +329,6 @@ static const struct tw9910_scale_ctrl tw9910_pal_scales[] = {
         },
 };
 
-static const struct tw9910_cropping_ctrl tw9910_cropping_ctrl = {
-        .vdelay  = 0x0012,
-        .vactive = 0x00F0,
-        .hdelay  = 0x0010,
-        .hactive = 0x02D0,
-};
-
 static const struct tw9910_hsync_ctrl tw9910_hsync_ctrl = {
         .start = 0x0260,
         .end   = 0x0300,
@@ -361,6 +343,19 @@ static struct tw9910_priv *to_tw9910(const struct i2c_client *client)
                             subdev);
 }
 
+static int tw9910_mask_set(struct i2c_client *client, u8 command,
+                           u8 mask, u8 set)
+{
+        s32 val = i2c_smbus_read_byte_data(client, command);
+        if (val < 0)
+                return val;
+
+        val &= ~mask;
+        val |= set & mask;
+
+        return i2c_smbus_write_byte_data(client, command, val);
+}
+
 static int tw9910_set_scale(struct i2c_client *client,
                             const struct tw9910_scale_ctrl *scale)
 {
@@ -383,47 +378,14 @@ static int tw9910_set_scale(struct i2c_client *client,
         return ret;
 }
 
-static int tw9910_set_cropping(struct i2c_client *client,
-                               const struct tw9910_cropping_ctrl *cropping)
-{
-        int ret;
-
-        ret = i2c_smbus_write_byte_data(client, CROP_HI,
-                                        (cropping->vdelay  & 0x0300) >> 2 |
-                                        (cropping->vactive & 0x0300) >> 4 |
-                                        (cropping->hdelay  & 0x0300) >> 6 |
-                                        (cropping->hactive & 0x0300) >> 8);
-        if (ret < 0)
-                return ret;
-
-        ret = i2c_smbus_write_byte_data(client, VDELAY_LO,
-                                        cropping->vdelay & 0x00FF);
-        if (ret < 0)
-                return ret;
-
-        ret = i2c_smbus_write_byte_data(client, VACTIVE_LO,
-                                        cropping->vactive & 0x00FF);
-        if (ret < 0)
-                return ret;
-
-        ret = i2c_smbus_write_byte_data(client, HDELAY_LO,
-                                        cropping->hdelay & 0x00FF);
-        if (ret < 0)
-                return ret;
-
-        ret = i2c_smbus_write_byte_data(client, HACTIVE_LO,
-                                        cropping->hactive & 0x00FF);
-
-        return ret;
-}
-
 static int tw9910_set_hsync(struct i2c_client *client,
                             const struct tw9910_hsync_ctrl *hsync)
 {
+        struct tw9910_priv *priv = to_tw9910(client);
         int ret;
 
         /* bit 10 - 3 */
-        ret = i2c_smbus_write_byte_data(client, HSGEGIN,
+        ret = i2c_smbus_write_byte_data(client, HSBEGIN,
                                         (hsync->start & 0x07F8) >> 3);
         if (ret < 0)
                 return ret;
@@ -434,50 +396,41 @@ static int tw9910_set_hsync(struct i2c_client *client,
         if (ret < 0)
                 return ret;
 
+        /* So far only revisions 0 and 1 have been seen */
         /* bit 2 - 0 */
-        ret = i2c_smbus_read_byte_data(client, HSLOWCTL);
-        if (ret < 0)
-                return ret;
-
-        ret = i2c_smbus_write_byte_data(client, HSLOWCTL,
-                                        (ret & 0x88)                 |
-                                        (hsync->start & 0x0007) << 4 |
-                                        (hsync->end   & 0x0007));
+        if (1 == priv->revision)
+                ret = tw9910_mask_set(client, HSLOWCTL, 0x77,
+                                      (hsync->start & 0x0007) << 4 |
+                                      (hsync->end   & 0x0007));
 
         return ret;
 }
 
-static int tw9910_write_array(struct i2c_client *client,
-                              const struct regval_list *vals)
+static void tw9910_reset(struct i2c_client *client)
 {
-        while (vals->reg_num != 0xff) {
-                int ret = i2c_smbus_write_byte_data(client,
-                                                    vals->reg_num,
-                                                    vals->value);
-                if (ret < 0)
-                        return ret;
-                vals++;
-        }
-        return 0;
+        tw9910_mask_set(client, ACNTL1, SRESET, SRESET);
+        msleep(1);
 }
 
-static int tw9910_mask_set(struct i2c_client *client, u8 command,
-                           u8 mask, u8 set)
+static int tw9910_power(struct i2c_client *client, int enable)
 {
-        s32 val = i2c_smbus_read_byte_data(client, command);
-        if (val < 0)
-                return val;
+        int ret;
+        u8 acntl1;
+        u8 acntl2;
 
-        val &= ~mask;
-        val |= set & mask;
+        if (enable) {
+                acntl1 = 0;
+                acntl2 = 0;
+        } else {
+                acntl1 = CLK_PDN | Y_PDN | C_PDN;
+                acntl2 = PLL_PDN;
+        }
 
-        return i2c_smbus_write_byte_data(client, command, val);
-}
+        ret = tw9910_mask_set(client, ACNTL1, ACNTL1_PDN_MASK, acntl1);
+        if (ret < 0)
+                return ret;
 
-static void tw9910_reset(struct i2c_client *client)
-{
-        i2c_smbus_write_byte_data(client, ACNTL1, SRESET);
-        msleep(1);
+        return tw9910_mask_set(client, ACNTL2, ACNTL2_PDN_MASK, acntl2);
 }
 
 static const struct tw9910_scale_ctrl*
@@ -518,27 +471,62 @@ static int tw9910_s_stream(struct v4l2_subdev *sd, int enable)
 {
         struct i2c_client *client = sd->priv;
         struct tw9910_priv *priv = to_tw9910(client);
+        u8 val;
+        int ret;
 
-        if (!enable)
-                return 0;
+        if (!enable) {
+                switch (priv->revision) {
+                case 0:
+                        val = OEN_TRI_SEL_ALL_OFF_r0;
+                        break;
+                case 1:
+                        val = OEN_TRI_SEL_ALL_OFF_r1;
+                        break;
+                default:
+                        dev_err(&client->dev, "un-supported revision\n");
+                        return -EINVAL;
+                }
+        } else {
+                val = OEN_TRI_SEL_ALL_ON;
 
-        if (!priv->scale) {
-                dev_err(&client->dev, "norm select error\n");
-                return -EPERM;
+                if (!priv->scale) {
+                        dev_err(&client->dev, "norm select error\n");
+                        return -EPERM;
+                }
+
+                dev_dbg(&client->dev, "%s %dx%d\n",
+                        priv->scale->name,
+                        priv->scale->width,
+                        priv->scale->height);
         }
 
-        dev_dbg(&client->dev, "%s %dx%d\n",
-                 priv->scale->name,
-                 priv->scale->width,
-                 priv->scale->height);
+        ret = tw9910_mask_set(client, OPFORM, OEN_TRI_SEL_MASK, val);
+        if (ret < 0)
+                return ret;
 
-        return 0;
+        return tw9910_power(client, enable);
 }
 
 static int tw9910_set_bus_param(struct soc_camera_device *icd,
                                 unsigned long flags)
 {
-        return 0;
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+        struct i2c_client *client = sd->priv;
+        u8 val = VSSL_VVALID | HSSL_DVALID;
+
+        /*
+         * set OUTCTR1
+         *
+         * We use VVALID and DVALID signals to control VSYNC and HSYNC
+         * outputs, in this mode their polarity is inverted.
+         */
+        if (flags & SOCAM_HSYNC_ACTIVE_LOW)
+                val |= HSP_HI;
+
+        if (flags & SOCAM_VSYNC_ACTIVE_LOW)
+                val |= VSP_HI;
+
+        return i2c_smbus_write_byte_data(client, OUTCTR1, val);
 }
 
 static unsigned long tw9910_query_bus_param(struct soc_camera_device *icd)
@@ -548,6 +536,7 @@ static unsigned long tw9910_query_bus_param(struct soc_camera_device *icd)
         struct soc_camera_link *icl = to_soc_camera_link(icd);
         unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
                 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
+                SOCAM_VSYNC_ACTIVE_LOW  | SOCAM_HSYNC_ACTIVE_LOW  |
                 SOCAM_DATA_ACTIVE_HIGH | priv->info->buswidth;
 
         return soc_camera_apply_sensor_flags(icl, flags);
@@ -576,8 +565,11 @@ static int tw9910_enum_input(struct soc_camera_device *icd,
 static int tw9910_g_chip_ident(struct v4l2_subdev *sd,
                                struct v4l2_dbg_chip_ident *id)
 {
+        struct i2c_client *client = sd->priv;
+        struct tw9910_priv *priv = to_tw9910(client);
+
         id->ident = V4L2_IDENT_TW9910;
-        id->revision = 0;
+        id->revision = priv->revision;
 
         return 0;
 }
@@ -596,7 +588,8 @@ static int tw9910_g_register(struct v4l2_subdev *sd,
         if (ret < 0)
                 return ret;
 
-        /* ret      = int
+        /*
+         * ret      = int
          * reg->val = __u64
          */
         reg->val = (__u64)ret;
@@ -637,9 +630,6 @@ static int tw9910_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
          * reset hardware
          */
         tw9910_reset(client);
-        ret = tw9910_write_array(client, tw9910_default_regs);
-        if (ret < 0)
-                goto tw9910_set_fmt_error;
 
         /*
          * set bus width
@@ -688,13 +678,6 @@ static int tw9910_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
                 goto tw9910_set_fmt_error;
 
         /*
-         * set cropping
-         */
-        ret = tw9910_set_cropping(client, &tw9910_cropping_ctrl);
-        if (ret < 0)
-                goto tw9910_set_fmt_error;
-
-        /*
          * set hsync
          */
         ret = tw9910_set_hsync(client, &tw9910_hsync_ctrl);
@@ -762,11 +745,11 @@ static int tw9910_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
         return 0;
 }
 
-static int tw9910_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int tw9910_g_fmt(struct v4l2_subdev *sd,
+                        struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
         struct tw9910_priv *priv = to_tw9910(client);
-        struct v4l2_pix_format *pix = &f->fmt.pix;
 
         if (!priv->scale) {
                 int ret;
@@ -783,74 +766,76 @@ static int tw9910_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
                         return ret;
         }
 
-        f->type                 = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-        pix->width              = priv->scale->width;
-        pix->height             = priv->scale->height;
-        pix->pixelformat        = V4L2_PIX_FMT_VYUY;
-        pix->colorspace         = V4L2_COLORSPACE_SMPTE170M;
-        pix->field              = V4L2_FIELD_INTERLACED;
+        mf->width       = priv->scale->width;
+        mf->height      = priv->scale->height;
+        mf->code        = V4L2_MBUS_FMT_YUYV8_2X8_BE;
+        mf->colorspace  = V4L2_COLORSPACE_JPEG;
+        mf->field       = V4L2_FIELD_INTERLACED_BT;
 
         return 0;
 }
 
-static int tw9910_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int tw9910_s_fmt(struct v4l2_subdev *sd,
+                        struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
         struct tw9910_priv *priv = to_tw9910(client);
-        struct v4l2_pix_format *pix = &f->fmt.pix;
         /* See tw9910_s_crop() - no proper cropping support */
         struct v4l2_crop a = {
                 .c = {
                         .left   = 0,
                         .top    = 0,
-                        .width  = pix->width,
-                        .height = pix->height,
+                        .width  = mf->width,
+                        .height = mf->height,
                 },
         };
-        int i, ret;
+        int ret;
+
+        WARN_ON(mf->field != V4L2_FIELD_ANY &&
+                mf->field != V4L2_FIELD_INTERLACED_BT);
 
         /*
          * check color format
          */
-        for (i = 0; i < ARRAY_SIZE(tw9910_color_fmt); i++)
-                if (pix->pixelformat == tw9910_color_fmt[i].fourcc)
-                        break;
-
-        if (i == ARRAY_SIZE(tw9910_color_fmt))
+        if (mf->code != V4L2_MBUS_FMT_YUYV8_2X8_BE)
                 return -EINVAL;
 
+        mf->colorspace = V4L2_COLORSPACE_JPEG;
+
         ret = tw9910_s_crop(sd, &a);
         if (!ret) {
-                pix->width = priv->scale->width;
-                pix->height = priv->scale->height;
+                mf->width       = priv->scale->width;
+                mf->height      = priv->scale->height;
         }
         return ret;
 }
 
-static int tw9910_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
+static int tw9910_try_fmt(struct v4l2_subdev *sd,
+                          struct v4l2_mbus_framefmt *mf)
 {
         struct i2c_client *client = sd->priv;
         struct soc_camera_device *icd = client->dev.platform_data;
-        struct v4l2_pix_format *pix = &f->fmt.pix;
         const struct tw9910_scale_ctrl *scale;
 
-        if (V4L2_FIELD_ANY == pix->field) {
-                pix->field = V4L2_FIELD_INTERLACED;
-        } else if (V4L2_FIELD_INTERLACED != pix->field) {
-                dev_err(&client->dev, "Field type invalid.\n");
+        if (V4L2_FIELD_ANY == mf->field) {
+                mf->field = V4L2_FIELD_INTERLACED_BT;
+        } else if (V4L2_FIELD_INTERLACED_BT != mf->field) {
+                dev_err(&client->dev, "Field type %d invalid.\n", mf->field);
                 return -EINVAL;
         }
 
+        mf->code = V4L2_MBUS_FMT_YUYV8_2X8_BE;
+        mf->colorspace = V4L2_COLORSPACE_JPEG;
+
         /*
          * select suitable norm
          */
-        scale = tw9910_select_norm(icd, pix->width, pix->height);
+        scale = tw9910_select_norm(icd, mf->width, mf->height);
         if (!scale)
                 return -EINVAL;
 
-        pix->width  = scale->width;
-        pix->height = scale->height;
+        mf->width       = scale->width;
+        mf->height      = scale->height;
 
         return 0;
 }
@@ -859,7 +844,7 @@ static int tw9910_video_probe(struct soc_camera_device *icd,
                               struct i2c_client *client)
 {
         struct tw9910_priv *priv = to_tw9910(client);
-        s32 val;
+        s32 id;
 
         /*
          * We must have a parent by now. And it cannot be a wrong one.
@@ -878,23 +863,24 @@ static int tw9910_video_probe(struct soc_camera_device *icd,
                 return -ENODEV;
         }
 
-        icd->formats     = tw9910_color_fmt;
-        icd->num_formats = ARRAY_SIZE(tw9910_color_fmt);
-
         /*
          * check and show Product ID
+         * So far only revisions 0 and 1 have been seen
          */
-        val = i2c_smbus_read_byte_data(client, ID);
+        id = i2c_smbus_read_byte_data(client, ID);
+        priv->revision = GET_REV(id);
+        id = GET_ID(id);
 
-        if (0x0B != GET_ID(val) ||
-            0x00 != GET_ReV(val)) {
+        if (0x0B != id ||
+            0x01 < priv->revision) {
                 dev_err(&client->dev,
-                        "Product ID error %x:%x\n", GET_ID(val), GET_ReV(val));
+                        "Product ID error %x:%x\n",
+                        id, priv->revision);
                 return -ENODEV;
         }
 
         dev_info(&client->dev,
-                 "tw9910 Product ID %0x:%0x\n", GET_ID(val), GET_ReV(val));
+                 "tw9910 Product ID %0x:%0x\n", id, priv->revision);
 
         icd->vdev->tvnorms      = V4L2_STD_NTSC | V4L2_STD_PAL;
         icd->vdev->current_norm = V4L2_STD_NTSC;
@@ -917,14 +903,25 @@ static struct v4l2_subdev_core_ops tw9910_subdev_core_ops = {
 #endif
 };
 
+static int tw9910_enum_fmt(struct v4l2_subdev *sd, int index,
+                           enum v4l2_mbus_pixelcode *code)
+{
+        if (index)
+                return -EINVAL;
+
+        *code = V4L2_MBUS_FMT_YUYV8_2X8_BE;
+        return 0;
+}
+
 static struct v4l2_subdev_video_ops tw9910_subdev_video_ops = {
         .s_stream       = tw9910_s_stream,
-        .g_fmt          = tw9910_g_fmt,
-        .s_fmt          = tw9910_s_fmt,
-        .try_fmt        = tw9910_try_fmt,
+        .g_mbus_fmt     = tw9910_g_fmt,
+        .s_mbus_fmt     = tw9910_s_fmt,
+        .try_mbus_fmt   = tw9910_try_fmt,
         .cropcap        = tw9910_cropcap,
         .g_crop         = tw9910_g_crop,
         .s_crop         = tw9910_s_crop,
+        .enum_mbus_fmt  = tw9910_enum_fmt,
 };
 
 static struct v4l2_subdev_ops tw9910_subdev_ops = {
@@ -954,10 +951,10 @@ static int tw9910_probe(struct i2c_client *client,
         }
 
         icl = to_soc_camera_link(icd);
-        if (!icl)
+        if (!icl || !icl->priv)
                 return -EINVAL;
 
-        info = container_of(icl, struct tw9910_video_info, link);
+        info = icl->priv;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                 dev_err(&client->dev,
@@ -975,7 +972,7 @@ static int tw9910_probe(struct i2c_client *client,
         v4l2_i2c_subdev_init(&priv->subdev, client, &tw9910_subdev_ops);
 
         icd->ops     = &tw9910_ops;
-        icd->iface   = info->link.bus_id;
+        icd->iface   = icl->bus_id;
 
         ret = tw9910_video_probe(icd, client);
         if (ret) {
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index dea8b321fb4a..5ac37c6c4313 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -1053,9 +1053,9 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
                          "%s: video_register_device() successful\n", __func__);
         }
 
-        dev_info(&uvd->dev->dev, "%s on /dev/video%d: canvas=%s videosize=%s\n",
+        dev_info(&uvd->dev->dev, "%s on %s: canvas=%s videosize=%s\n",
                  (uvd->handle != NULL) ? uvd->handle->drvName : "???",
-                 uvd->vdev.num, tmp2, tmp1);
+                 video_device_node_name(&uvd->vdev), tmp2, tmp1);
 
         usb_get_dev(uvd->dev);
         return 0;
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index 45fce39ec9ad..6030410c6677 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -796,7 +796,6 @@ static const struct v4l2_file_operations vicam_fops = {
 static struct video_device vicam_template = {
         .name           = "ViCam-based USB Camera",
         .fops           = &vicam_fops,
-        .minor          = -1,
         .release        = video_device_release_empty,
 };
 
@@ -873,8 +872,8 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id)
                 return -EIO;
         }
 
-        printk(KERN_INFO "ViCam webcam driver now controlling video device %d\n",
-                        cam->vdev.num);
+        printk(KERN_INFO "ViCam webcam driver now controlling device %s\n",
+                video_device_node_name(&cam->vdev));
 
         usb_set_intfdata (intf, cam);
 
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index c19f51dba2ee..0613922997e0 100644
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -215,8 +215,8 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision)
         memcpy(&usbvision->i2c_adap, &i2c_adap_template,
                sizeof(struct i2c_adapter));
 
-        sprintf(usbvision->i2c_adap.name + strlen(usbvision->i2c_adap.name),
-                " #%d", usbvision->vdev->num);
+        sprintf(usbvision->i2c_adap.name, "%s-%d-%s", i2c_adap_template.name,
+                usbvision->dev->bus->busnum, usbvision->dev->devpath);
         PDEBUG(DBG_I2C,"Adaptername: %s", usbvision->i2c_adap.name);
         usbvision->i2c_adap.dev.parent = &usbvision->dev->dev;
 
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index c07b0ac452ab..1054546db908 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -1328,7 +1328,6 @@ static struct video_device usbvision_video_template = {
         .ioctl_ops      = &usbvision_ioctl_ops,
         .name           = "usbvision-video",
         .release        = video_device_release,
-        .minor          = -1,
         .tvnorms              = USBVISION_NORMS,
         .current_norm         = V4L2_STD_PAL
 };
@@ -1362,7 +1361,6 @@ static struct video_device usbvision_radio_template = {
         .fops           = &usbvision_radio_fops,
         .name           = "usbvision-radio",
         .release        = video_device_release,
-        .minor          = -1,
         .ioctl_ops      = &usbvision_radio_ioctl_ops,
 
         .tvnorms              = USBVISION_NORMS,
@@ -1382,7 +1380,6 @@ static struct video_device usbvision_vbi_template=
         .fops           = &usbvision_vbi_fops,
         .release        = video_device_release,
         .name           = "usbvision-vbi",
-        .minor          = -1,
 };
 
 
@@ -1404,7 +1401,6 @@ static struct video_device *usbvision_vdev_init(struct usb_usbvision *usbvision,
                 return NULL;
         }
         *vdev = *vdev_template;
-//      vdev->minor   = -1;
         vdev->v4l2_dev = &usbvision->v4l2_dev;
         snprintf(vdev->name, sizeof(vdev->name), "%s", name);
         video_set_drvdata(vdev, usbvision);
@@ -1416,9 +1412,9 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
 {
         // vbi Device:
         if (usbvision->vbi) {
-                PDEBUG(DBG_PROBE, "unregister /dev/vbi%d [v4l2]",
-                       usbvision->vbi->num);
-                if (usbvision->vbi->minor != -1) {
+                PDEBUG(DBG_PROBE, "unregister %s [v4l2]",
+                       video_device_node_name(usbvision->vbi));
+                if (video_is_registered(usbvision->vbi)) {
                         video_unregister_device(usbvision->vbi);
                 } else {
                         video_device_release(usbvision->vbi);
@@ -1428,9 +1424,9 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
 
         // Radio Device:
         if (usbvision->rdev) {
-                PDEBUG(DBG_PROBE, "unregister /dev/radio%d [v4l2]",
-                       usbvision->rdev->num);
-                if (usbvision->rdev->minor != -1) {
+                PDEBUG(DBG_PROBE, "unregister %s [v4l2]",
+                       video_device_node_name(usbvision->rdev));
+                if (video_is_registered(usbvision->rdev)) {
                         video_unregister_device(usbvision->rdev);
                 } else {
                         video_device_release(usbvision->rdev);
@@ -1440,9 +1436,9 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
 
         // Video Device:
         if (usbvision->vdev) {
-                PDEBUG(DBG_PROBE, "unregister /dev/video%d [v4l2]",
-                       usbvision->vdev->num);
-                if (usbvision->vdev->minor != -1) {
+                PDEBUG(DBG_PROBE, "unregister %s [v4l2]",
+                       video_device_node_name(usbvision->vdev));
+                if (video_is_registered(usbvision->vdev)) {
                         video_unregister_device(usbvision->vdev);
                 } else {
                         video_device_release(usbvision->vdev);
@@ -1466,8 +1462,8 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
                                   video_nr)<0) {
                 goto err_exit;
         }
-        printk(KERN_INFO "USBVision[%d]: registered USBVision Video device /dev/video%d [v4l2]\n",
-               usbvision->nr, usbvision->vdev->num);
+        printk(KERN_INFO "USBVision[%d]: registered USBVision Video device %s [v4l2]\n",
+               usbvision->nr, video_device_node_name(usbvision->vdev));
 
         // Radio Device:
         if (usbvision_device_data[usbvision->DevModel].Radio) {
@@ -1483,8 +1479,8 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
                                           radio_nr)<0) {
                         goto err_exit;
                 }
-                printk(KERN_INFO "USBVision[%d]: registered USBVision Radio device /dev/radio%d [v4l2]\n",
-                       usbvision->nr, usbvision->rdev->num);
+                printk(KERN_INFO "USBVision[%d]: registered USBVision Radio device %s [v4l2]\n",
+                       usbvision->nr, video_device_node_name(usbvision->rdev));
         }
         // vbi Device:
         if (usbvision_device_data[usbvision->DevModel].vbi) {
@@ -1499,8 +1495,8 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
                                           vbi_nr)<0) {
                         goto err_exit;
                 }
-                printk(KERN_INFO "USBVision[%d]: registered USBVision VBI device /dev/vbi%d [v4l2] (Not Working Yet!)\n",
-                       usbvision->nr, usbvision->vbi->num);
+                printk(KERN_INFO "USBVision[%d]: registered USBVision VBI device %s [v4l2] (Not Working Yet!)\n",
+                       usbvision->nr, video_device_node_name(usbvision->vbi));
         }
         // all done
         return 0;
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
index c31bc50113bc..391cccca7ffc 100644
--- a/drivers/media/video/uvc/uvc_driver.c
+++ b/drivers/media/video/uvc/uvc_driver.c
@@ -1651,7 +1651,6 @@ static int uvc_register_video(struct uvc_device *dev,
          * get another one.
          */
         vdev->parent = &dev->intf->dev;
-        vdev->minor = -1;
         vdev->fops = &uvc_fops;
         vdev->release = uvc_release;
         strlcpy(vdev->name, dev->name, sizeof vdev->name);
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index 05139a4f14f6..9a9802830d41 100644
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/drivers/media/video/uvc/uvc_video.c
@@ -145,7 +145,7 @@ static int uvc_get_video_ctrl(struct uvc_streaming *stream,
                 uvc_warn_once(stream->dev, UVC_WARN_MINMAX, "UVC non "
                         "compliance - GET_MIN/MAX(PROBE) incorrectly "
                         "supported. Enabling workaround.\n");
-                memset(ctrl, 0, sizeof ctrl);
+                memset(ctrl, 0, sizeof *ctrl);
                 ctrl->wCompQuality = le16_to_cpup((__le16 *)data);
                 ret = 0;
                 goto out;
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index e8e5affbabce..36b5cb86fb57 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -1024,3 +1024,50 @@ void v4l_bound_align_image(u32 *w, unsigned int wmin, unsigned int wmax,
         }
 }
 EXPORT_SYMBOL_GPL(v4l_bound_align_image);
+
+/**
+ * v4l_fill_dv_preset_info - fill description of a digital video preset
+ * @preset - preset value
+ * @info - pointer to struct v4l2_dv_enum_preset
+ *
+ * drivers can use this helper function to fill description of dv preset
+ * in info.
+ */
+int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info)
+{
+        static const struct v4l2_dv_preset_info {
+                u16 width;
+                u16 height;
+                const char *name;
+        } dv_presets[] = {
+                { 0, 0, "Invalid" },            /* V4L2_DV_INVALID */
+                { 720,  480, "480p@59.94" },    /* V4L2_DV_480P59_94 */
+                { 720,  576, "576p@50" },       /* V4L2_DV_576P50 */
+                { 1280, 720, "720p@24" },       /* V4L2_DV_720P24 */
+                { 1280, 720, "720p@25" },       /* V4L2_DV_720P25 */
+                { 1280, 720, "720p@30" },       /* V4L2_DV_720P30 */
+                { 1280, 720, "720p@50" },       /* V4L2_DV_720P50 */
+                { 1280, 720, "720p@59.94" },    /* V4L2_DV_720P59_94 */
+                { 1280, 720, "720p@60" },       /* V4L2_DV_720P60 */
+                { 1920, 1080, "1080i@29.97" },  /* V4L2_DV_1080I29_97 */
+                { 1920, 1080, "1080i@30" },     /* V4L2_DV_1080I30 */
+                { 1920, 1080, "1080i@25" },     /* V4L2_DV_1080I25 */
+                { 1920, 1080, "1080i@50" },     /* V4L2_DV_1080I50 */
+                { 1920, 1080, "1080i@60" },     /* V4L2_DV_1080I60 */
+                { 1920, 1080, "1080p@24" },     /* V4L2_DV_1080P24 */
+                { 1920, 1080, "1080p@25" },     /* V4L2_DV_1080P25 */
+                { 1920, 1080, "1080p@30" },     /* V4L2_DV_1080P30 */
+                { 1920, 1080, "1080p@50" },     /* V4L2_DV_1080P50 */
+                { 1920, 1080, "1080p@60" },     /* V4L2_DV_1080P60 */
+        };
+
+        if (info == NULL || preset >= ARRAY_SIZE(dv_presets))
+                return -EINVAL;
+
+        info->preset = preset;
+        info->width = dv_presets[preset].width;
+        info->height = dv_presets[preset].height;
+        strlcpy(info->name, dv_presets[preset].name, sizeof(info->name));
+        return 0;
+}
+EXPORT_SYMBOL_GPL(v4l_fill_dv_preset_info);
diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c
index 997975d5e024..c4150bd26337 100644
--- a/drivers/media/video/v4l2-compat-ioctl32.c
+++ b/drivers/media/video/v4l2-compat-ioctl32.c
@@ -1077,6 +1077,12 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
         case VIDIOC_DBG_G_REGISTER:
         case VIDIOC_DBG_G_CHIP_IDENT:
         case VIDIOC_S_HW_FREQ_SEEK:
+        case VIDIOC_ENUM_DV_PRESETS:
+        case VIDIOC_S_DV_PRESET:
+        case VIDIOC_G_DV_PRESET:
+        case VIDIOC_QUERY_DV_PRESET:
+        case VIDIOC_S_DV_TIMINGS:
+        case VIDIOC_G_DV_TIMINGS:
                 ret = do_video_ioctl(file, cmd, arg);
                 break;
 
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 500cbe9891ac..709069916068 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -189,7 +189,7 @@ static ssize_t v4l2_read(struct file *filp, char __user *buf,
 
         if (!vdev->fops->read)
                 return -EINVAL;
-        if (video_is_unregistered(vdev))
+        if (!video_is_registered(vdev))
                 return -EIO;
         return vdev->fops->read(filp, buf, sz, off);
 }
@@ -201,7 +201,7 @@ static ssize_t v4l2_write(struct file *filp, const char __user *buf,
 
         if (!vdev->fops->write)
                 return -EINVAL;
-        if (video_is_unregistered(vdev))
+        if (!video_is_registered(vdev))
                 return -EIO;
         return vdev->fops->write(filp, buf, sz, off);
 }
@@ -210,7 +210,7 @@ static unsigned int v4l2_poll(struct file *filp, struct poll_table_struct *poll)
 {
         struct video_device *vdev = video_devdata(filp);
 
-        if (!vdev->fops->poll || video_is_unregistered(vdev))
+        if (!vdev->fops->poll || !video_is_registered(vdev))
                 return DEFAULT_POLLMASK;
         return vdev->fops->poll(filp, poll);
 }
@@ -250,7 +250,7 @@ static unsigned long v4l2_get_unmapped_area(struct file *filp,
 
         if (!vdev->fops->get_unmapped_area)
                 return -ENOSYS;
-        if (video_is_unregistered(vdev))
+        if (!video_is_registered(vdev))
                 return -ENODEV;
         return vdev->fops->get_unmapped_area(filp, addr, len, pgoff, flags);
 }
@@ -260,8 +260,7 @@ static int v4l2_mmap(struct file *filp, struct vm_area_struct *vm)
 {
         struct video_device *vdev = video_devdata(filp);
 
-        if (!vdev->fops->mmap ||
-            video_is_unregistered(vdev))
+        if (!vdev->fops->mmap || !video_is_registered(vdev))
                 return -ENODEV;
         return vdev->fops->mmap(filp, vm);
 }
@@ -277,7 +276,7 @@ static int v4l2_open(struct inode *inode, struct file *filp)
         vdev = video_devdata(filp);
         /* return ENODEV if the video device has been removed
            already or if it is not registered anymore. */
-        if (vdev == NULL || video_is_unregistered(vdev)) {
+        if (vdev == NULL || !video_is_registered(vdev)) {
                 mutex_unlock(&videodev_lock);
                 return -ENODEV;
         }
@@ -551,10 +550,11 @@ static int __video_register_device(struct video_device *vdev, int type, int nr,
         vdev->dev.release = v4l2_device_release;
 
         if (nr != -1 && nr != vdev->num && warn_if_nr_in_use)
-                printk(KERN_WARNING "%s: requested %s%d, got %s%d\n",
-                                __func__, name_base, nr, name_base, vdev->num);
+                printk(KERN_WARNING "%s: requested %s%d, got %s\n", __func__,
+                        name_base, nr, video_device_node_name(vdev));
 
         /* Part 5: Activate this minor. The char device can now be used. */
+        set_bit(V4L2_FL_REGISTERED, &vdev->flags);
         mutex_lock(&videodev_lock);
         video_device[vdev->minor] = vdev;
         mutex_unlock(&videodev_lock);
@@ -593,11 +593,11 @@ EXPORT_SYMBOL(video_register_device_no_warn);
 void video_unregister_device(struct video_device *vdev)
 {
         /* Check if vdev was ever registered at all */
-        if (!vdev || vdev->minor < 0)
+        if (!vdev || !video_is_registered(vdev))
                 return;
 
         mutex_lock(&videodev_lock);
-        set_bit(V4L2_FL_UNREGISTERED, &vdev->flags);
+        clear_bit(V4L2_FL_REGISTERED, &vdev->flags);
         mutex_unlock(&videodev_lock);
         device_unregister(&vdev->dev);
 }
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 30cc3347ae52..4b11257c3184 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -284,6 +284,12 @@ static const char *v4l2_ioctls[] = {
         [_IOC_NR(VIDIOC_DBG_G_CHIP_IDENT)] = "VIDIOC_DBG_G_CHIP_IDENT",
         [_IOC_NR(VIDIOC_S_HW_FREQ_SEEK)]   = "VIDIOC_S_HW_FREQ_SEEK",
 #endif
+        [_IOC_NR(VIDIOC_ENUM_DV_PRESETS)]  = "VIDIOC_ENUM_DV_PRESETS",
+        [_IOC_NR(VIDIOC_S_DV_PRESET)]      = "VIDIOC_S_DV_PRESET",
+        [_IOC_NR(VIDIOC_G_DV_PRESET)]      = "VIDIOC_G_DV_PRESET",
+        [_IOC_NR(VIDIOC_QUERY_DV_PRESET)]  = "VIDIOC_QUERY_DV_PRESET",
+        [_IOC_NR(VIDIOC_S_DV_TIMINGS)]     = "VIDIOC_S_DV_TIMINGS",
+        [_IOC_NR(VIDIOC_G_DV_TIMINGS)]     = "VIDIOC_G_DV_TIMINGS",
 };
 #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
 
@@ -1135,6 +1141,19 @@ static long __video_do_ioctl(struct file *file,
         {
                 struct v4l2_input *p = arg;
 
+                /*
+                 * We set the flags for CAP_PRESETS, CAP_CUSTOM_TIMINGS &
+                 * CAP_STD here based on ioctl handler provided by the
+                 * driver. If the driver doesn't support these
+                 * for a specific input, it must override these flags.
+                 */
+                if (ops->vidioc_s_std)
+                        p->capabilities |= V4L2_IN_CAP_STD;
+                if (ops->vidioc_s_dv_preset)
+                        p->capabilities |= V4L2_IN_CAP_PRESETS;
+                if (ops->vidioc_s_dv_timings)
+                        p->capabilities |= V4L2_IN_CAP_CUSTOM_TIMINGS;
+
                 if (!ops->vidioc_enum_input)
                         break;
 
@@ -1179,6 +1198,19 @@ static long __video_do_ioctl(struct file *file,
                 if (!ops->vidioc_enum_output)
                         break;
 
+                /*
+                 * We set the flags for CAP_PRESETS, CAP_CUSTOM_TIMINGS &
+                 * CAP_STD here based on ioctl handler provided by the
+                 * driver. If the driver doesn't support these
+                 * for a specific output, it must override these flags.
+                 */
+                if (ops->vidioc_s_std)
+                        p->capabilities |= V4L2_OUT_CAP_STD;
+                if (ops->vidioc_s_dv_preset)
+                        p->capabilities |= V4L2_OUT_CAP_PRESETS;
+                if (ops->vidioc_s_dv_timings)
+                        p->capabilities |= V4L2_OUT_CAP_CUSTOM_TIMINGS;
+
                 ret = ops->vidioc_enum_output(file, fh, p);
                 if (!ret)
                         dbgarg(cmd, "index=%d, name=%s, type=%d, "
@@ -1794,6 +1826,121 @@ static long __video_do_ioctl(struct file *file,
                 }
                 break;
         }
+        case VIDIOC_ENUM_DV_PRESETS:
+        {
+                struct v4l2_dv_enum_preset *p = arg;
+
+                if (!ops->vidioc_enum_dv_presets)
+                        break;
+
+                ret = ops->vidioc_enum_dv_presets(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd,
+                                "index=%d, preset=%d, name=%s, width=%d,"
+                                " height=%d ",
+                                p->index, p->preset, p->name, p->width,
+                                p->height);
+                break;
+        }
+        case VIDIOC_S_DV_PRESET:
+        {
+                struct v4l2_dv_preset *p = arg;
+
+                if (!ops->vidioc_s_dv_preset)
+                        break;
+
+                dbgarg(cmd, "preset=%d\n", p->preset);
+                ret = ops->vidioc_s_dv_preset(file, fh, p);
+                break;
+        }
+        case VIDIOC_G_DV_PRESET:
+        {
+                struct v4l2_dv_preset *p = arg;
+
+                if (!ops->vidioc_g_dv_preset)
+                        break;
+
+                ret = ops->vidioc_g_dv_preset(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "preset=%d\n", p->preset);
+                break;
+        }
+        case VIDIOC_QUERY_DV_PRESET:
+        {
+                struct v4l2_dv_preset *p = arg;
+
+                if (!ops->vidioc_query_dv_preset)
+                        break;
+
+                ret = ops->vidioc_query_dv_preset(file, fh, p);
+                if (!ret)
+                        dbgarg(cmd, "preset=%d\n", p->preset);
+                break;
+        }
+        case VIDIOC_S_DV_TIMINGS:
+        {
+                struct v4l2_dv_timings *p = arg;
+
+                if (!ops->vidioc_s_dv_timings)
+                        break;
+
+                switch (p->type) {
+                case V4L2_DV_BT_656_1120:
+                        dbgarg2("bt-656/1120:interlaced=%d, pixelclock=%lld,"
+                                " width=%d, height=%d, polarities=%x,"
+                                " hfrontporch=%d, hsync=%d, hbackporch=%d,"
+                                " vfrontporch=%d, vsync=%d, vbackporch=%d,"
+                                " il_vfrontporch=%d, il_vsync=%d,"
+                                " il_vbackporch=%d\n",
+                                p->bt.interlaced, p->bt.pixelclock,
+                                p->bt.width, p->bt.height, p->bt.polarities,
+                                p->bt.hfrontporch, p->bt.hsync,
+                                p->bt.hbackporch, p->bt.vfrontporch,
+                                p->bt.vsync, p->bt.vbackporch,
+                                p->bt.il_vfrontporch, p->bt.il_vsync,
+                                p->bt.il_vbackporch);
+                        ret = ops->vidioc_s_dv_timings(file, fh, p);
+                        break;
+                default:
+                        dbgarg2("Unknown type %d!\n", p->type);
+                        break;
+                }
+                break;
+        }
+        case VIDIOC_G_DV_TIMINGS:
+        {
+                struct v4l2_dv_timings *p = arg;
+
+                if (!ops->vidioc_g_dv_timings)
+                        break;
+
+                ret = ops->vidioc_g_dv_timings(file, fh, p);
+                if (!ret) {
+                        switch (p->type) {
+                        case V4L2_DV_BT_656_1120:
+                                dbgarg2("bt-656/1120:interlaced=%d,"
+                                        " pixelclock=%lld,"
+                                        " width=%d, height=%d, polarities=%x,"
+                                        " hfrontporch=%d, hsync=%d,"
+                                        " hbackporch=%d, vfrontporch=%d,"
+                                        " vsync=%d, vbackporch=%d,"
+                                        " il_vfrontporch=%d, il_vsync=%d,"
+                                        " il_vbackporch=%d\n",
+                                        p->bt.interlaced, p->bt.pixelclock,
+                                        p->bt.width, p->bt.height,
+                                        p->bt.polarities, p->bt.hfrontporch,
+                                        p->bt.hsync, p->bt.hbackporch,
+                                        p->bt.vfrontporch, p->bt.vsync,
+                                        p->bt.vbackporch, p->bt.il_vfrontporch,
+                                        p->bt.il_vsync, p->bt.il_vbackporch);
+                                break;
+                        default:
+                                dbgarg2("Unknown type %d!\n", p->type);
+                                break;
+                        }
+                }
+                break;
+        }
 
         default:
         {
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c
index d25f28461da1..22c01097e8a8 100644
--- a/drivers/media/video/videobuf-dma-contig.c
+++ b/drivers/media/video/videobuf-dma-contig.c
@@ -141,9 +141,11 @@ static int videobuf_dma_contig_user_get(struct videobuf_dma_contig_memory *mem,
         struct vm_area_struct *vma;
         unsigned long prev_pfn, this_pfn;
         unsigned long pages_done, user_address;
+        unsigned int offset;
         int ret;
 
-        mem->size = PAGE_ALIGN(vb->size);
+        offset = vb->baddr & ~PAGE_MASK;
+        mem->size = PAGE_ALIGN(vb->size + offset);
         mem->is_userptr = 0;
         ret = -EINVAL;
 
@@ -166,7 +168,7 @@ static int videobuf_dma_contig_user_get(struct videobuf_dma_contig_memory *mem,
                         break;
 
                 if (pages_done == 0)
-                        mem->dma_handle = this_pfn << PAGE_SHIFT;
+                        mem->dma_handle = (this_pfn << PAGE_SHIFT) + offset;
                 else if (this_pfn != (prev_pfn + 1))
                         ret = -EFAULT;
 
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index b034a81d2b1c..a15d1e7cbed8 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -4068,7 +4068,6 @@ static struct video_device vdev_template = {
         .fops           = &vino_fops,
         .ioctl_ops      = &vino_ioctl_ops,
         .tvnorms        = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM,
-        .minor          = -1,
 };
 
 static void vino_module_cleanup(int stage)
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 7705fc6baf00..37632a064966 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -1148,7 +1148,8 @@ static int vivi_open(struct file *file)
                 return -EBUSY;
         }
 
-        dprintk(dev, 1, "open /dev/video%d type=%s users=%d\n", dev->vfd->num,
+        dprintk(dev, 1, "open %s type=%s users=%d\n",
+                video_device_node_name(dev->vfd),
                 v4l2_type_names[V4L2_BUF_TYPE_VIDEO_CAPTURE], dev->users);
 
         /* allocate + initialize per filehandle data */
@@ -1221,8 +1222,7 @@ static int vivi_close(struct file *file)
         struct vivi_fh         *fh = file->private_data;
         struct vivi_dev *dev       = fh->dev;
         struct vivi_dmaqueue *vidq = &dev->vidq;
-
-        int minor = video_devdata(file)->minor;
+        struct video_device  *vdev = video_devdata(file);
 
         vivi_stop_thread(vidq);
         videobuf_stop(&fh->vb_vidq);
@@ -1234,8 +1234,8 @@ static int vivi_close(struct file *file)
         dev->users--;
         mutex_unlock(&dev->mutex);
 
-        dprintk(dev, 1, "close called (minor=%d, users=%d)\n",
-                minor, dev->users);
+        dprintk(dev, 1, "close called (dev=%s, users=%d)\n",
+                video_device_node_name(vdev), dev->users);
 
         return 0;
 }
@@ -1296,7 +1296,6 @@ static struct video_device vivi_template = {
         .name           = "vivi",
         .fops           = &vivi_fops,
         .ioctl_ops      = &vivi_ioctl_ops,
-        .minor          = -1,
         .release        = video_device_release,
 
         .tvnorms              = V4L2_STD_525_60,
@@ -1317,8 +1316,8 @@ static int vivi_release(void)
                 list_del(list);
                 dev = list_entry(list, struct vivi_dev, vivi_devlist);
 
-                v4l2_info(&dev->v4l2_dev, "unregistering /dev/video%d\n",
-                        dev->vfd->num);
+                v4l2_info(&dev->v4l2_dev, "unregistering %s\n",
+                        video_device_node_name(dev->vfd));
                 video_unregister_device(dev->vfd);
                 v4l2_device_unregister(&dev->v4l2_dev);
                 kfree(dev);
@@ -1372,15 +1371,12 @@ static int __init vivi_create_instance(int inst)
         /* Now that everything is fine, let's add it to device list */
         list_add_tail(&dev->vivi_devlist, &vivi_devlist);
 
-        snprintf(vfd->name, sizeof(vfd->name), "%s (%i)",
-                        vivi_template.name, vfd->num);
-
         if (video_nr >= 0)
                 video_nr++;
 
         dev->vfd = vfd;
-        v4l2_info(&dev->v4l2_dev, "V4L2 device registered as /dev/video%d\n",
-                        vfd->num);
+        v4l2_info(&dev->v4l2_dev, "V4L2 device registered as %s\n",
+                  video_device_node_name(vfd));
         return 0;
 
 rel_vdev:
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index 37fcdc447db5..d807eea91757 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -2323,9 +2323,9 @@ static int w9968cf_sensor_init(struct w9968cf_device* cam)
 error:
         cam->sensor_initialized = 0;
         cam->sensor = CC_UNKNOWN;
-        DBG(1, "Image sensor initialization failed for %s (/dev/video%d). "
+        DBG(1, "Image sensor initialization failed for %s (%s). "
                "Try to detach and attach this device again",
-            symbolic(camlist, cam->id), cam->v4ldev->num)
+            symbolic(camlist, cam->id), video_device_node_name(cam->v4ldev))
         return err;
 }
 
@@ -2571,7 +2571,8 @@ static void w9968cf_release_resources(struct w9968cf_device* cam)
 {
         mutex_lock(&w9968cf_devlist_mutex);
 
-        DBG(2, "V4L device deregistered: /dev/video%d", cam->v4ldev->num)
+        DBG(2, "V4L device deregistered: %s",
+            video_device_node_name(cam->v4ldev))
 
         video_unregister_device(cam->v4ldev);
         list_del(&cam->v4llist);
@@ -2605,17 +2606,19 @@ static int w9968cf_open(struct file *filp)
 
         if (cam->sensor == CC_UNKNOWN) {
                 DBG(2, "No supported image sensor has been detected by the "
-                       "'ovcamchip' module for the %s (/dev/video%d). Make "
-                       "sure it is loaded *before* (re)connecting the camera.",
-                    symbolic(camlist, cam->id), cam->v4ldev->num)
+                       "'ovcamchip' module for the %s (%s). Make sure "
+                       "it is loaded *before* (re)connecting the camera.",
+                    symbolic(camlist, cam->id),
+                    video_device_node_name(cam->v4ldev))
                 mutex_unlock(&cam->dev_mutex);
                 up_read(&w9968cf_disconnect);
                 return -ENODEV;
         }
 
         if (cam->users) {
-                DBG(2, "%s (/dev/video%d) has been already occupied by '%s'",
-                    symbolic(camlist, cam->id), cam->v4ldev->num, cam->command)
+                DBG(2, "%s (%s) has been already occupied by '%s'",
+                    symbolic(camlist, cam->id),
+                    video_device_node_name(cam->v4ldev), cam->command)
                 if ((filp->f_flags & O_NONBLOCK)||(filp->f_flags & O_NDELAY)) {
                         mutex_unlock(&cam->dev_mutex);
                         up_read(&w9968cf_disconnect);
@@ -2636,8 +2639,8 @@ static int w9968cf_open(struct file *filp)
                 mutex_lock(&cam->dev_mutex);
         }
 
-        DBG(5, "Opening '%s', /dev/video%d ...",
-            symbolic(camlist, cam->id), cam->v4ldev->num)
+        DBG(5, "Opening '%s', %s ...",
+            symbolic(camlist, cam->id), video_device_node_name(cam->v4ldev))
 
         cam->streaming = 0;
         cam->misconfigured = 0;
@@ -2874,8 +2877,7 @@ static long w9968cf_v4l_ioctl(struct file *filp,
                         .minwidth = cam->minwidth,
                         .minheight = cam->minheight,
                 };
-                sprintf(cap.name, "W996[87]CF USB Camera #%d",
-                        cam->v4ldev->num);
+                sprintf(cap.name, "W996[87]CF USB Camera");
                 cap.maxwidth = (cam->upscaling && w9968cf_vpp)
                                ? max((u16)W9968CF_MAX_WIDTH, cam->maxwidth)
                                  : cam->maxwidth;
@@ -3485,7 +3487,6 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
 
         strcpy(cam->v4ldev->name, symbolic(camlist, mod_id));
         cam->v4ldev->fops = &w9968cf_fops;
-        cam->v4ldev->minor = video_nr[dev_nr];
         cam->v4ldev->release = video_device_release;
         video_set_drvdata(cam->v4ldev, cam);
         cam->v4ldev->v4l2_dev = &cam->v4l2_dev;
@@ -3501,7 +3502,8 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                 goto fail;
         }
 
-        DBG(2, "V4L device registered as /dev/video%d", cam->v4ldev->num)
+        DBG(2, "V4L device registered as %s",
+            video_device_node_name(cam->v4ldev))
 
         /* Set some basic constants */
         w9968cf_configure_camera(cam, udev, mod_id, dev_nr);
@@ -3557,10 +3559,10 @@ static void w9968cf_usb_disconnect(struct usb_interface* intf)
                 wake_up_interruptible_all(&cam->open);
 
                 if (cam->users) {
-                        DBG(2, "The device is open (/dev/video%d)! "
+                        DBG(2, "The device is open (%s)! "
                                "Process name: %s. Deregistration and memory "
                                "deallocation are deferred on close.",
-                            cam->v4ldev->num, cam->command)
+                            video_device_node_name(cam->v4ldev), cam->command)
                         cam->misconfigured = 1;
                         w9968cf_stop_transfer(cam);
                         wake_up_interruptible(&cam->wait_queue);
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 312a71336fd0..e44e4b5f3e50 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -538,8 +538,8 @@ static int zc0301_stream_interrupt(struct zc0301_device* cam)
         else if (cam->stream != STREAM_OFF) {
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "URB timeout reached. The camera is misconfigured. To "
-                       "use it, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use it, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -640,7 +640,8 @@ static void zc0301_release_resources(struct kref *kref)
 {
         struct zc0301_device *cam = container_of(kref, struct zc0301_device,
                                                  kref);
-        DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->num);
+        DBG(2, "V4L2 device %s deregistered",
+            video_device_node_name(cam->v4ldev));
         video_set_drvdata(cam->v4ldev, NULL);
         video_unregister_device(cam->v4ldev);
         usb_put_dev(cam->usbdev);
@@ -679,7 +680,8 @@ static int zc0301_open(struct file *filp)
         }
 
         if (cam->users) {
-                DBG(2, "Device /dev/video%d is busy...", cam->v4ldev->num);
+                DBG(2, "Device %s is busy...",
+                    video_device_node_name(cam->v4ldev));
                 DBG(3, "Simultaneous opens are not supported");
                 if ((filp->f_flags & O_NONBLOCK) ||
                     (filp->f_flags & O_NDELAY)) {
@@ -722,7 +724,8 @@ static int zc0301_open(struct file *filp)
         cam->frame_count = 0;
         zc0301_empty_framequeues(cam);
 
-        DBG(3, "Video device /dev/video%d is open", cam->v4ldev->num);
+        DBG(3, "Video device %s is open",
+            video_device_node_name(cam->v4ldev));
 
 out:
         mutex_unlock(&cam->open_mutex);
@@ -746,7 +749,8 @@ static int zc0301_release(struct file *filp)
         cam->users--;
         wake_up_interruptible_nr(&cam->wait_open, 1);
 
-        DBG(3, "Video device /dev/video%d closed", cam->v4ldev->num);
+        DBG(3, "Video device %s closed",
+            video_device_node_name(cam->v4ldev));
 
         kref_put(&cam->kref, zc0301_release_resources);
 
@@ -1276,8 +1280,8 @@ zc0301_vidioc_s_crop(struct zc0301_device* cam, void __user * arg)
         if (err) { /* atomic, no rollback in ioctl() */
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_CROP failed because of hardware problems. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -1289,8 +1293,8 @@ zc0301_vidioc_s_crop(struct zc0301_device* cam, void __user * arg)
             nbuffers != zc0301_request_buffers(cam, nbuffers, cam->io)) {
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_CROP failed because of not enough memory. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -ENOMEM;
         }
 
@@ -1471,8 +1475,8 @@ zc0301_vidioc_try_s_fmt(struct zc0301_device* cam, unsigned int cmd,
         if (err) { /* atomic, no rollback in ioctl() */
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_FMT failed because of hardware problems. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -1483,8 +1487,8 @@ zc0301_vidioc_try_s_fmt(struct zc0301_device* cam, unsigned int cmd,
             nbuffers != zc0301_request_buffers(cam, nbuffers, cam->io)) {
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_FMT failed because of not enough memory. To "
-                       "use the camera, close and open /dev/video%d again.",
-                    cam->v4ldev->num);
+                       "use the camera, close and open %s again.",
+                    video_device_node_name(cam->v4ldev));
                 return -ENOMEM;
         }
 
@@ -1530,8 +1534,8 @@ zc0301_vidioc_s_jpegcomp(struct zc0301_device* cam, void __user * arg)
         if (err) { /* atomic, no rollback in ioctl() */
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware "
-                       "problems. To use the camera, close and open "
-                       "/dev/video%d again.", cam->v4ldev->num);
+                       "problems. To use the camera, close and open %s again.",
+                       video_device_node_name(cam->v4ldev));
                 return -EIO;
         }
 
@@ -1984,7 +1988,6 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
 
         strcpy(cam->v4ldev->name, "ZC0301[P] PC Camera");
         cam->v4ldev->fops = &zc0301_fops;
-        cam->v4ldev->minor = video_nr[dev_nr];
         cam->v4ldev->release = video_device_release;
         cam->v4ldev->parent = &udev->dev;
         video_set_drvdata(cam->v4ldev, cam);
@@ -2003,7 +2006,8 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
                 goto fail;
         }
 
-        DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->num);
+        DBG(2, "V4L2 device registered as %s",
+            video_device_node_name(cam->v4ldev));
 
         cam->module_param.force_munmap = force_munmap[dev_nr];
         cam->module_param.frame_timeout = frame_timeout[dev_nr];
@@ -2040,9 +2044,9 @@ static void zc0301_usb_disconnect(struct usb_interface* intf)
         DBG(2, "Disconnecting %s...", cam->v4ldev->name);
 
         if (cam->users) {
-                DBG(2, "Device /dev/video%d is open! Deregistration and "
+                DBG(2, "Device %s is open! Deregistration and "
                        "memory deallocation are deferred.",
-                    cam->v4ldev->num);
+                    video_device_node_name(cam->v4ldev));
                 cam->state |= DEV_MISCONFIGURED;
                 zc0301_stop_transfer(cam);
                 cam->state |= DEV_DISCONNECTED;
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index e9f72ca458f1..2ddffed019ee 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -3387,6 +3387,5 @@ struct video_device zoran_template __devinitdata = {
         .ioctl_ops = &zoran_ioctl_ops,
         .release = &zoran_vdev_release,
         .tvnorms = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM,
-        .minor = -1
 };
 
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 2ef110b5221b..f0eae83e3d89 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -1455,7 +1455,6 @@ static struct video_device zr364xx_template = {
         .fops = &zr364xx_fops,
         .ioctl_ops = &zr364xx_ioctl_ops,
         .release = video_device_release,
-        .minor = -1,
 };
 
 
@@ -1635,8 +1634,8 @@ static int zr364xx_probe(struct usb_interface *intf,
 
         spin_lock_init(&cam->slock);
 
-        dev_info(&udev->dev, DRIVER_DESC " controlling video device %d\n",
-                 cam->vdev->num);
+        dev_info(&udev->dev, DRIVER_DESC " controlling device %s\n",
+                 video_device_node_name(cam->vdev));
         return 0;
 }
 
diff --git a/drivers/mfd/twl4030-codec.c b/drivers/mfd/twl4030-codec.c
index 77b914907d7c..700b149c1b91 100644
--- a/drivers/mfd/twl4030-codec.c
+++ b/drivers/mfd/twl4030-codec.c
@@ -26,7 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/platform_device.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/twl4030-codec.h>
 
@@ -56,7 +56,7 @@ static int twl4030_codec_set_resource(enum twl4030_codec_res id, int enable)
         struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
         u8 val;
 
-        twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
+        twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
                         codec->resource[id].reg);
 
         if (enable)
@@ -64,7 +64,7 @@ static int twl4030_codec_set_resource(enum twl4030_codec_res id, int enable)
         else
                 val &= ~codec->resource[id].mask;
 
-        twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
+        twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
                                         val, codec->resource[id].reg);
 
         return val;
@@ -75,7 +75,7 @@ static inline int twl4030_codec_get_resource(enum twl4030_codec_res id)
         struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
         u8 val;
 
-        twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
+        twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
                         codec->resource[id].reg);
 
         return val;
@@ -183,7 +183,7 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "Invalid audio_mclk\n");
                 return -EINVAL;
         }
-        twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
+        twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
                                         val, TWL4030_REG_APLL_CTL);
 
         codec = kzalloc(sizeof(struct twl4030_codec), GFP_KERNEL);
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index 223a90c7492f..4b2021af1d96 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -809,6 +809,9 @@ static struct resource wm831x_wdt_resources[] = {
 
 static struct mfd_cell wm8310_devs[] = {
         {
+                .name = "wm831x-backup",
+        },
+        {
                 .name = "wm831x-buckv",
                 .id = 1,
                 .num_resources = ARRAY_SIZE(wm831x_dcdc1_resources),
@@ -962,6 +965,9 @@ static struct mfd_cell wm8310_devs[] = {
 
 static struct mfd_cell wm8311_devs[] = {
         {
+                .name = "wm831x-backup",
+        },
+        {
                 .name = "wm831x-buckv",
                 .id = 1,
                 .num_resources = ARRAY_SIZE(wm831x_dcdc1_resources),
@@ -1096,6 +1102,9 @@ static struct mfd_cell wm8311_devs[] = {
 
 static struct mfd_cell wm8312_devs[] = {
         {
+                .name = "wm831x-backup",
+        },
+        {
                 .name = "wm831x-buckv",
                 .id = 1,
                 .num_resources = ARRAY_SIZE(wm831x_dcdc1_resources),
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 2c16ca6501d5..59f4ba1b7034 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -13,6 +13,20 @@ menuconfig MISC_DEVICES
 
 if MISC_DEVICES
 
+config AD525X_DPOT
+        tristate "Analog Devices AD525x Digital Potentiometers"
+        depends on I2C && SYSFS
+        help
+          If you say yes here, you get support for the Analog Devices
+          AD5258, AD5259, AD5251, AD5252, AD5253, AD5254 and AD5255
+          digital potentiometer chips.
+
+          See Documentation/misc-devices/ad525x_dpot.txt for the
+          userspace interface.
+
+          This driver can also be built as a module.  If so, the module
+          will be called ad525x_dpot.
+
 config ATMEL_PWM
         tristate "Atmel AT32/AT91 PWM support"
         depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9
@@ -173,6 +187,30 @@ config SGI_XP
           this feature will allow for direct communication between SSIs
           based on a network adapter and DMA messaging.
 
+config CS5535_MFGPT
+        tristate "CS5535/CS5536 Geode Multi-Function General Purpose Timer (MFGPT) support"
+        depends on PCI
+        depends on X86
+        default n
+        help
+          This driver provides access to MFGPT functionality for other
+          drivers that need timers.  MFGPTs are available in the CS5535 and
+          CS5536 companion chips that are found in AMD Geode and several
+          other platforms.  They have a better resolution and max interval
+          than the generic PIT, and are suitable for use as high-res timers.
+          You probably don't want to enable this manually; other drivers that
+          make use of it should enable it.
+
+config CS5535_MFGPT_DEFAULT_IRQ
+        int
+        default 7
+        help
+          MFGPTs on the CS5535 require an interrupt.  The selected IRQ
+          can be overridden as a module option as well as by driver that
+          use the cs5535_mfgpt_ API; however, different architectures might
+          want to use a different IRQ by default.  This is here for
+          architectures to set as necessary.
+
 config HP_ILO
         tristate "Channel interface driver for HP iLO/iLO2 processor"
         depends on PCI
@@ -256,6 +294,16 @@ config DS1682
           This driver can also be built as a module.  If so, the module
           will be called ds1682.
 
+config TI_DAC7512
+        tristate "Texas Instruments DAC7512"
+        depends on SPI && SYSFS
+        help
+          If you say yes here you get support for the Texas Instruments
+          DAC7512 16-bit digital-to-analog converter.
+
+          This driver can also be built as a module. If so, the module
+          will be calles ti_dac7512.
+
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 906a0edcea40..049ff2482f30 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -4,6 +4,7 @@
 
 obj-$(CONFIG_IBM_ASM)           += ibmasm/
 obj-$(CONFIG_HDPU_FEATURES)     += hdpuftrs/
+obj-$(CONFIG_AD525X_DPOT)       += ad525x_dpot.o
 obj-$(CONFIG_ATMEL_PWM)         += atmel_pwm.o
 obj-$(CONFIG_ATMEL_SSC)         += atmel-ssc.o
 obj-$(CONFIG_ATMEL_TCLIB)       += atmel_tclib.o
@@ -17,10 +18,12 @@ obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
 obj-$(CONFIG_KGDB_TESTS)        += kgdbts.o
 obj-$(CONFIG_SGI_XP)            += sgi-xp/
 obj-$(CONFIG_SGI_GRU)           += sgi-gru/
+obj-$(CONFIG_CS5535_MFGPT)      += cs5535-mfgpt.o
 obj-$(CONFIG_HP_ILO)            += hpilo.o
 obj-$(CONFIG_ISL29003)          += isl29003.o
 obj-$(CONFIG_EP93XX_PWM)        += ep93xx_pwm.o
 obj-$(CONFIG_DS1682)            += ds1682.o
+obj-$(CONFIG_TI_DAC7512)        += ti_dac7512.o
 obj-$(CONFIG_C2PORT)            += c2port/
 obj-$(CONFIG_IWMC3200TOP)      += iwmc3200top/
 obj-y                           += eeprom/
diff --git a/drivers/misc/ad525x_dpot.c b/drivers/misc/ad525x_dpot.c
new file mode 100644
index 000000000000..30a59f2bacd2
--- /dev/null
+++ b/drivers/misc/ad525x_dpot.c
@@ -0,0 +1,666 @@
+/*
+ * ad525x_dpot: Driver for the Analog Devices AD525x digital potentiometers
+ * Copyright (c) 2009 Analog Devices, Inc.
+ * Author: Michael Hennerich <hennerich@blackfin.uclinux.org>
+ *
+ * DEVID                #Wipers         #Positions      Resistor Options (kOhm)
+ * AD5258               1               64              1, 10, 50, 100
+ * AD5259               1               256             5, 10, 50, 100
+ * AD5251               2               64              1, 10, 50, 100
+ * AD5252               2               256             1, 10, 50, 100
+ * AD5255               3               512             25, 250
+ * AD5253               4               64              1, 10, 50, 100
+ * AD5254               4               256             1, 10, 50, 100
+ *
+ * See Documentation/misc-devices/ad525x_dpot.txt for more info.
+ *
+ * derived from ad5258.c
+ * Copyright (c) 2009 Cyber Switching, Inc.
+ * Author: Chris Verges <chrisv@cyberswitching.com>
+ *
+ * derived from ad5252.c
+ * Copyright (c) 2006 Michael Hennerich <hennerich@blackfin.uclinux.org>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+
+#define DRIVER_NAME                     "ad525x_dpot"
+#define DRIVER_VERSION                  "0.1"
+
+enum dpot_devid {
+        AD5258_ID,
+        AD5259_ID,
+        AD5251_ID,
+        AD5252_ID,
+        AD5253_ID,
+        AD5254_ID,
+        AD5255_ID,
+};
+
+#define AD5258_MAX_POSITION             64
+#define AD5259_MAX_POSITION             256
+#define AD5251_MAX_POSITION             64
+#define AD5252_MAX_POSITION             256
+#define AD5253_MAX_POSITION             64
+#define AD5254_MAX_POSITION             256
+#define AD5255_MAX_POSITION             512
+
+#define AD525X_RDAC0            0
+#define AD525X_RDAC1            1
+#define AD525X_RDAC2            2
+#define AD525X_RDAC3            3
+
+#define AD525X_REG_TOL          0x18
+#define AD525X_TOL_RDAC0        (AD525X_REG_TOL | AD525X_RDAC0)
+#define AD525X_TOL_RDAC1        (AD525X_REG_TOL | AD525X_RDAC1)
+#define AD525X_TOL_RDAC2        (AD525X_REG_TOL | AD525X_RDAC2)
+#define AD525X_TOL_RDAC3        (AD525X_REG_TOL | AD525X_RDAC3)
+
+/* RDAC-to-EEPROM Interface Commands */
+#define AD525X_I2C_RDAC         (0x00 << 5)
+#define AD525X_I2C_EEPROM       (0x01 << 5)
+#define AD525X_I2C_CMD          (0x80)
+
+#define AD525X_DEC_ALL_6DB      (AD525X_I2C_CMD | (0x4 << 3))
+#define AD525X_INC_ALL_6DB      (AD525X_I2C_CMD | (0x9 << 3))
+#define AD525X_DEC_ALL          (AD525X_I2C_CMD | (0x6 << 3))
+#define AD525X_INC_ALL          (AD525X_I2C_CMD | (0xB << 3))
+
+static s32 ad525x_read(struct i2c_client *client, u8 reg);
+static s32 ad525x_write(struct i2c_client *client, u8 reg, u8 value);
+
+/*
+ * Client data (each client gets its own)
+ */
+
+struct dpot_data {
+        struct mutex update_lock;
+        unsigned rdac_mask;
+        unsigned max_pos;
+        unsigned devid;
+};
+
+/* sysfs functions */
+
+static ssize_t sysfs_show_reg(struct device *dev,
+                              struct device_attribute *attr, char *buf, u32 reg)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct dpot_data *data = i2c_get_clientdata(client);
+        s32 value;
+
+        mutex_lock(&data->update_lock);
+        value = ad525x_read(client, reg);
+        mutex_unlock(&data->update_lock);
+
+        if (value < 0)
+                return -EINVAL;
+        /*
+         * Let someone else deal with converting this ...
+         * the tolerance is a two-byte value where the MSB
+         * is a sign + integer value, and the LSB is a
+         * decimal value.  See page 18 of the AD5258
+         * datasheet (Rev. A) for more details.
+         */
+
+        if (reg & AD525X_REG_TOL)
+                return sprintf(buf, "0x%04x\n", value & 0xFFFF);
+        else
+                return sprintf(buf, "%u\n", value & data->rdac_mask);
+}
+
+static ssize_t sysfs_set_reg(struct device *dev,
+                             struct device_attribute *attr,
+                             const char *buf, size_t count, u32 reg)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct dpot_data *data = i2c_get_clientdata(client);
+        unsigned long value;
+        int err;
+
+        err = strict_strtoul(buf, 10, &value);
+        if (err)
+                return err;
+
+        if (value > data->rdac_mask)
+                value = data->rdac_mask;
+
+        mutex_lock(&data->update_lock);
+        ad525x_write(client, reg, value);
+        if (reg & AD525X_I2C_EEPROM)
+                msleep(26);     /* Sleep while the EEPROM updates */
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+static ssize_t sysfs_do_cmd(struct device *dev,
+                            struct device_attribute *attr,
+                            const char *buf, size_t count, u32 reg)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct dpot_data *data = i2c_get_clientdata(client);
+
+        mutex_lock(&data->update_lock);
+        ad525x_write(client, reg, 0);
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+/* ------------------------------------------------------------------------- */
+
+static ssize_t show_rdac0(struct device *dev,
+                          struct device_attribute *attr, char *buf)
+{
+        return sysfs_show_reg(dev, attr, buf, AD525X_I2C_RDAC | AD525X_RDAC0);
+}
+
+static ssize_t set_rdac0(struct device *dev,
+                         struct device_attribute *attr,
+                         const char *buf, size_t count)
+{
+        return sysfs_set_reg(dev, attr, buf, count,
+                             AD525X_I2C_RDAC | AD525X_RDAC0);
+}
+
+static DEVICE_ATTR(rdac0, S_IWUSR | S_IRUGO, show_rdac0, set_rdac0);
+
+static ssize_t show_eeprom0(struct device *dev,
+                            struct device_attribute *attr, char *buf)
+{
+        return sysfs_show_reg(dev, attr, buf, AD525X_I2C_EEPROM | AD525X_RDAC0);
+}
+
+static ssize_t set_eeprom0(struct device *dev,
+                           struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+        return sysfs_set_reg(dev, attr, buf, count,
+                             AD525X_I2C_EEPROM | AD525X_RDAC0);
+}
+
+static DEVICE_ATTR(eeprom0, S_IWUSR | S_IRUGO, show_eeprom0, set_eeprom0);
+
+static ssize_t show_tolerance0(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+        return sysfs_show_reg(dev, attr, buf,
+                              AD525X_I2C_EEPROM | AD525X_TOL_RDAC0);
+}
+
+static DEVICE_ATTR(tolerance0, S_IRUGO, show_tolerance0, NULL);
+
+/* ------------------------------------------------------------------------- */
+
+static ssize_t show_rdac1(struct device *dev,
+                          struct device_attribute *attr, char *buf)
+{
+        return sysfs_show_reg(dev, attr, buf, AD525X_I2C_RDAC | AD525X_RDAC1);
+}
+
+static ssize_t set_rdac1(struct device *dev,
+                         struct device_attribute *attr,
+                         const char *buf, size_t count)
+{
+        return sysfs_set_reg(dev, attr, buf, count,
+                             AD525X_I2C_RDAC | AD525X_RDAC1);
+}
+
+static DEVICE_ATTR(rdac1, S_IWUSR | S_IRUGO, show_rdac1, set_rdac1);
+
+static ssize_t show_eeprom1(struct device *dev,
+                            struct device_attribute *attr, char *buf)
+{
+        return sysfs_show_reg(dev, attr, buf, AD525X_I2C_EEPROM | AD525X_RDAC1);
+}
+
+static ssize_t set_eeprom1(struct device *dev,
+                           struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+        return sysfs_set_reg(dev, attr, buf, count,
+                             AD525X_I2C_EEPROM | AD525X_RDAC1);
+}
+
+static DEVICE_ATTR(eeprom1, S_IWUSR | S_IRUGO, show_eeprom1, set_eeprom1);
+
+static ssize_t show_tolerance1(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+        return sysfs_show_reg(dev, attr, buf,
+                              AD525X_I2C_EEPROM | AD525X_TOL_RDAC1);
+}
+
+static DEVICE_ATTR(tolerance1, S_IRUGO, show_tolerance1, NULL);
+
+/* ------------------------------------------------------------------------- */
+
+static ssize_t show_rdac2(struct device *dev,
+                          struct device_attribute *attr, char *buf)
+{
+        return sysfs_show_reg(dev, attr, buf, AD525X_I2C_RDAC | AD525X_RDAC2);
+}
+
+static ssize_t set_rdac2(struct device *dev,
+                         struct device_attribute *attr,
+                         const char *buf, size_t count)
+{
+        return sysfs_set_reg(dev, attr, buf, count,
+                             AD525X_I2C_RDAC | AD525X_RDAC2);
+}
+
+static DEVICE_ATTR(rdac2, S_IWUSR | S_IRUGO, show_rdac2, set_rdac2);
+
+static ssize_t show_eeprom2(struct device *dev,
+                            struct device_attribute *attr, char *buf)
+{
+        return sysfs_show_reg(dev, attr, buf, AD525X_I2C_EEPROM | AD525X_RDAC2);
+}
+
+static ssize_t set_eeprom2(struct device *dev,
+                           struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+        return sysfs_set_reg(dev, attr, buf, count,
+                             AD525X_I2C_EEPROM | AD525X_RDAC2);
+}
+
+static DEVICE_ATTR(eeprom2, S_IWUSR | S_IRUGO, show_eeprom2, set_eeprom2);
+
+static ssize_t show_tolerance2(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+        return sysfs_show_reg(dev, attr, buf,
+                              AD525X_I2C_EEPROM | AD525X_TOL_RDAC2);
+}
+
+static DEVICE_ATTR(tolerance2, S_IRUGO, show_tolerance2, NULL);
+
+/* ------------------------------------------------------------------------- */
+
+static ssize_t show_rdac3(struct device *dev,
+                          struct device_attribute *attr, char *buf)
+{
+        return sysfs_show_reg(dev, attr, buf, AD525X_I2C_RDAC | AD525X_RDAC3);
+}
+
+static ssize_t set_rdac3(struct device *dev,
+                         struct device_attribute *attr,
+                         const char *buf, size_t count)
+{
+        return sysfs_set_reg(dev, attr, buf, count,
+                             AD525X_I2C_RDAC | AD525X_RDAC3);
+}
+
+static DEVICE_ATTR(rdac3, S_IWUSR | S_IRUGO, show_rdac3, set_rdac3);
+
+static ssize_t show_eeprom3(struct device *dev,
+                            struct device_attribute *attr, char *buf)
+{
+        return sysfs_show_reg(dev, attr, buf, AD525X_I2C_EEPROM | AD525X_RDAC3);
+}
+
+static ssize_t set_eeprom3(struct device *dev,
+                           struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+        return sysfs_set_reg(dev, attr, buf, count,
+                             AD525X_I2C_EEPROM | AD525X_RDAC3);
+}
+
+static DEVICE_ATTR(eeprom3, S_IWUSR | S_IRUGO, show_eeprom3, set_eeprom3);
+
+static ssize_t show_tolerance3(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+        return sysfs_show_reg(dev, attr, buf,
+                              AD525X_I2C_EEPROM | AD525X_TOL_RDAC3);
+}
+
+static DEVICE_ATTR(tolerance3, S_IRUGO, show_tolerance3, NULL);
+
+static struct attribute *ad525x_attributes_wipers[4][4] = {
+        {
+                &dev_attr_rdac0.attr,
+                &dev_attr_eeprom0.attr,
+                &dev_attr_tolerance0.attr,
+                NULL
+        }, {
+                &dev_attr_rdac1.attr,
+                &dev_attr_eeprom1.attr,
+                &dev_attr_tolerance1.attr,
+                NULL
+        }, {
+                &dev_attr_rdac2.attr,
+                &dev_attr_eeprom2.attr,
+                &dev_attr_tolerance2.attr,
+                NULL
+        }, {
+                &dev_attr_rdac3.attr,
+                &dev_attr_eeprom3.attr,
+                &dev_attr_tolerance3.attr,
+                NULL
+        }
+};
+
+static const struct attribute_group ad525x_group_wipers[] = {
+        {.attrs = ad525x_attributes_wipers[AD525X_RDAC0]},
+        {.attrs = ad525x_attributes_wipers[AD525X_RDAC1]},
+        {.attrs = ad525x_attributes_wipers[AD525X_RDAC2]},
+        {.attrs = ad525x_attributes_wipers[AD525X_RDAC3]},
+};
+
+/* ------------------------------------------------------------------------- */
+
+static ssize_t set_inc_all(struct device *dev,
+                           struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+        return sysfs_do_cmd(dev, attr, buf, count, AD525X_INC_ALL);
+}
+
+static DEVICE_ATTR(inc_all, S_IWUSR, NULL, set_inc_all);
+
+static ssize_t set_dec_all(struct device *dev,
+                           struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+        return sysfs_do_cmd(dev, attr, buf, count, AD525X_DEC_ALL);
+}
+
+static DEVICE_ATTR(dec_all, S_IWUSR, NULL, set_dec_all);
+
+static ssize_t set_inc_all_6db(struct device *dev,
+                               struct device_attribute *attr,
+                               const char *buf, size_t count)
+{
+        return sysfs_do_cmd(dev, attr, buf, count, AD525X_INC_ALL_6DB);
+}
+
+static DEVICE_ATTR(inc_all_6db, S_IWUSR, NULL, set_inc_all_6db);
+
+static ssize_t set_dec_all_6db(struct device *dev,
+                               struct device_attribute *attr,
+                               const char *buf, size_t count)
+{
+        return sysfs_do_cmd(dev, attr, buf, count, AD525X_DEC_ALL_6DB);
+}
+
+static DEVICE_ATTR(dec_all_6db, S_IWUSR, NULL, set_dec_all_6db);
+
+static struct attribute *ad525x_attributes_commands[] = {
+        &dev_attr_inc_all.attr,
+        &dev_attr_dec_all.attr,
+        &dev_attr_inc_all_6db.attr,
+        &dev_attr_dec_all_6db.attr,
+        NULL
+};
+
+static const struct attribute_group ad525x_group_commands = {
+        .attrs = ad525x_attributes_commands,
+};
+
+/* ------------------------------------------------------------------------- */
+
+/* i2c device functions */
+
+/**
+ * ad525x_read - return the value contained in the specified register
+ * on the AD5258 device.
+ * @client: value returned from i2c_new_device()
+ * @reg: the register to read
+ *
+ * If the tolerance register is specified, 2 bytes are returned.
+ * Otherwise, 1 byte is returned.  A negative value indicates an error
+ * occurred while reading the register.
+ */
+static s32 ad525x_read(struct i2c_client *client, u8 reg)
+{
+        struct dpot_data *data = i2c_get_clientdata(client);
+
+        if ((reg & AD525X_REG_TOL) || (data->max_pos > 256))
+                return i2c_smbus_read_word_data(client, (reg & 0xF8) |
+                                                ((reg & 0x7) << 1));
+        else
+                return i2c_smbus_read_byte_data(client, reg);
+}
+
+/**
+ * ad525x_write - store the given value in the specified register on
+ * the AD5258 device.
+ * @client: value returned from i2c_new_device()
+ * @reg: the register to write
+ * @value: the byte to store in the register
+ *
+ * For certain instructions that do not require a data byte, "NULL"
+ * should be specified for the "value" parameter.  These instructions
+ * include NOP, RESTORE_FROM_EEPROM, and STORE_TO_EEPROM.
+ *
+ * A negative return value indicates an error occurred while reading
+ * the register.
+ */
+static s32 ad525x_write(struct i2c_client *client, u8 reg, u8 value)
+{
+        struct dpot_data *data = i2c_get_clientdata(client);
+
+        /* Only write the instruction byte for certain commands */
+        if (reg & AD525X_I2C_CMD)
+                return i2c_smbus_write_byte(client, reg);
+
+        if (data->max_pos > 256)
+                return i2c_smbus_write_word_data(client, (reg & 0xF8) |
+                                                ((reg & 0x7) << 1), value);
+        else
+                /* All other registers require instruction + data bytes */
+                return i2c_smbus_write_byte_data(client, reg, value);
+}
+
+static int ad525x_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        struct device *dev = &client->dev;
+        struct dpot_data *data;
+        int err = 0;
+
+        dev_dbg(dev, "%s\n", __func__);
+
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE)) {
+                dev_err(dev, "missing I2C functionality for this driver\n");
+                goto exit;
+        }
+
+        data = kzalloc(sizeof(struct dpot_data), GFP_KERNEL);
+        if (!data) {
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        i2c_set_clientdata(client, data);
+        mutex_init(&data->update_lock);
+
+        switch (id->driver_data) {
+        case AD5258_ID:
+                data->max_pos = AD5258_MAX_POSITION;
+                err = sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC0]);
+                break;
+        case AD5259_ID:
+                data->max_pos = AD5259_MAX_POSITION;
+                err = sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC0]);
+                break;
+        case AD5251_ID:
+                data->max_pos = AD5251_MAX_POSITION;
+                err = sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC1]);
+                err |= sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC3]);
+                err |= sysfs_create_group(&dev->kobj, &ad525x_group_commands);
+                break;
+        case AD5252_ID:
+                data->max_pos = AD5252_MAX_POSITION;
+                err = sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC1]);
+                err |= sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC3]);
+                err |= sysfs_create_group(&dev->kobj, &ad525x_group_commands);
+                break;
+        case AD5253_ID:
+                data->max_pos = AD5253_MAX_POSITION;
+                err = sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC0]);
+                err |= sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC1]);
+                err |= sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC2]);
+                err |= sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC3]);
+                err |= sysfs_create_group(&dev->kobj, &ad525x_group_commands);
+                break;
+        case AD5254_ID:
+                data->max_pos = AD5254_MAX_POSITION;
+                err = sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC0]);
+                err |= sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC1]);
+                err |= sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC2]);
+                err |= sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC3]);
+                err |= sysfs_create_group(&dev->kobj, &ad525x_group_commands);
+                break;
+        case AD5255_ID:
+                data->max_pos = AD5255_MAX_POSITION;
+                err = sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC0]);
+                err |= sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC1]);
+                err |= sysfs_create_group(&dev->kobj,
+                                       &ad525x_group_wipers[AD525X_RDAC2]);
+                err |= sysfs_create_group(&dev->kobj, &ad525x_group_commands);
+                break;
+        default:
+                err = -ENODEV;
+                goto exit_free;
+        }
+
+        if (err) {
+                dev_err(dev, "failed to register sysfs hooks\n");
+                goto exit_free;
+        }
+
+        data->devid = id->driver_data;
+        data->rdac_mask = data->max_pos - 1;
+
+        dev_info(dev, "%s %d-Position Digital Potentiometer registered\n",
+                 id->name, data->max_pos);
+
+        return 0;
+
+exit_free:
+        kfree(data);
+        i2c_set_clientdata(client, NULL);
+exit:
+        dev_err(dev, "failed to create client\n");
+        return err;
+}
+
+static int __devexit ad525x_remove(struct i2c_client *client)
+{
+        struct dpot_data *data = i2c_get_clientdata(client);
+        struct device *dev = &client->dev;
+
+        switch (data->devid) {
+        case AD5258_ID:
+        case AD5259_ID:
+                sysfs_remove_group(&dev->kobj,
+                                   &ad525x_group_wipers[AD525X_RDAC0]);
+                break;
+        case AD5251_ID:
+        case AD5252_ID:
+                sysfs_remove_group(&dev->kobj,
+                                   &ad525x_group_wipers[AD525X_RDAC1]);
+                sysfs_remove_group(&dev->kobj,
+                                   &ad525x_group_wipers[AD525X_RDAC3]);
+                sysfs_remove_group(&dev->kobj, &ad525x_group_commands);
+                break;
+        case AD5253_ID:
+        case AD5254_ID:
+                sysfs_remove_group(&dev->kobj,
+                                   &ad525x_group_wipers[AD525X_RDAC0]);
+                sysfs_remove_group(&dev->kobj,
+                                   &ad525x_group_wipers[AD525X_RDAC1]);
+                sysfs_remove_group(&dev->kobj,
+                                   &ad525x_group_wipers[AD525X_RDAC2]);
+                sysfs_remove_group(&dev->kobj,
+                                   &ad525x_group_wipers[AD525X_RDAC3]);
+                sysfs_remove_group(&dev->kobj, &ad525x_group_commands);
+                break;
+        case AD5255_ID:
+                sysfs_remove_group(&dev->kobj,
+                                   &ad525x_group_wipers[AD525X_RDAC0]);
+                sysfs_remove_group(&dev->kobj,
+                                   &ad525x_group_wipers[AD525X_RDAC1]);
+                sysfs_remove_group(&dev->kobj,
+                                   &ad525x_group_wipers[AD525X_RDAC2]);
+                sysfs_remove_group(&dev->kobj, &ad525x_group_commands);
+                break;
+        }
+
+        i2c_set_clientdata(client, NULL);
+        kfree(data);
+
+        return 0;
+}
+
+static const struct i2c_device_id ad525x_idtable[] = {
+        {"ad5258", AD5258_ID},
+        {"ad5259", AD5259_ID},
+        {"ad5251", AD5251_ID},
+        {"ad5252", AD5252_ID},
+        {"ad5253", AD5253_ID},
+        {"ad5254", AD5254_ID},
+        {"ad5255", AD5255_ID},
+        {}
+};
+
+MODULE_DEVICE_TABLE(i2c, ad525x_idtable);
+
+static struct i2c_driver ad525x_driver = {
+        .driver = {
+                   .owner = THIS_MODULE,
+                   .name = DRIVER_NAME,
+                   },
+        .id_table = ad525x_idtable,
+        .probe = ad525x_probe,
+        .remove = __devexit_p(ad525x_remove),
+};
+
+static int __init ad525x_init(void)
+{
+        return i2c_add_driver(&ad525x_driver);
+}
+
+module_init(ad525x_init);
+
+static void __exit ad525x_exit(void)
+{
+        i2c_del_driver(&ad525x_driver);
+}
+
+module_exit(ad525x_exit);
+
+MODULE_AUTHOR("Chris Verges <chrisv@cyberswitching.com>, "
+              "Michael Hennerich <hennerich@blackfin.uclinux.org>, ");
+MODULE_DESCRIPTION("AD5258/9 digital potentiometer driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRIVER_VERSION);
diff --git a/drivers/misc/cs5535-mfgpt.c b/drivers/misc/cs5535-mfgpt.c
new file mode 100644
index 000000000000..8110460558ff
--- /dev/null
+++ b/drivers/misc/cs5535-mfgpt.c
@@ -0,0 +1,370 @@
+/*
+ * Driver for the CS5535/CS5536 Multi-Function General Purpose Timers (MFGPT)
+ *
+ * Copyright (C) 2006, Advanced Micro Devices, Inc.
+ * Copyright (C) 2007  Andres Salomon <dilinger@debian.org>
+ * Copyright (C) 2009  Andres Salomon <dilinger@collabora.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public License
+ * as published by the Free Software Foundation.
+ *
+ * The MFGPTs are documented in AMD Geode CS5536 Companion Device Data Book.
+ */
+
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/cs5535.h>
+
+#define DRV_NAME "cs5535-mfgpt"
+#define MFGPT_BAR 2
+
+static int mfgpt_reset_timers;
+module_param_named(mfgptfix, mfgpt_reset_timers, int, 0644);
+MODULE_PARM_DESC(mfgptfix, "Reset the MFGPT timers during init; "
+                "required by some broken BIOSes (ie, TinyBIOS < 0.99).");
+
+struct cs5535_mfgpt_timer {
+        struct cs5535_mfgpt_chip *chip;
+        int nr;
+};
+
+static struct cs5535_mfgpt_chip {
+        DECLARE_BITMAP(avail, MFGPT_MAX_TIMERS);
+        resource_size_t base;
+
+        struct pci_dev *pdev;
+        spinlock_t lock;
+        int initialized;
+} cs5535_mfgpt_chip;
+
+int cs5535_mfgpt_toggle_event(struct cs5535_mfgpt_timer *timer, int cmp,
+                int event, int enable)
+{
+        uint32_t msr, mask, value, dummy;
+        int shift = (cmp == MFGPT_CMP1) ? 0 : 8;
+
+        if (!timer) {
+                WARN_ON(1);
+                return -EIO;
+        }
+
+        /*
+         * The register maps for these are described in sections 6.17.1.x of
+         * the AMD Geode CS5536 Companion Device Data Book.
+         */
+        switch (event) {
+        case MFGPT_EVENT_RESET:
+                /*
+                 * XXX: According to the docs, we cannot reset timers above
+                 * 6; that is, resets for 7 and 8 will be ignored.  Is this
+                 * a problem?   -dilinger
+                 */
+                msr = MSR_MFGPT_NR;
+                mask = 1 << (timer->nr + 24);
+                break;
+
+        case MFGPT_EVENT_NMI:
+                msr = MSR_MFGPT_NR;
+                mask = 1 << (timer->nr + shift);
+                break;
+
+        case MFGPT_EVENT_IRQ:
+                msr = MSR_MFGPT_IRQ;
+                mask = 1 << (timer->nr + shift);
+                break;
+
+        default:
+                return -EIO;
+        }
+
+        rdmsr(msr, value, dummy);
+
+        if (enable)
+                value |= mask;
+        else
+                value &= ~mask;
+
+        wrmsr(msr, value, dummy);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cs5535_mfgpt_toggle_event);
+
+int cs5535_mfgpt_set_irq(struct cs5535_mfgpt_timer *timer, int cmp, int *irq,
+                int enable)
+{
+        uint32_t zsel, lpc, dummy;
+        int shift;
+
+        if (!timer) {
+                WARN_ON(1);
+                return -EIO;
+        }
+
+        /*
+         * Unfortunately, MFGPTs come in pairs sharing their IRQ lines. If VSA
+         * is using the same CMP of the timer's Siamese twin, the IRQ is set to
+         * 2, and we mustn't use nor change it.
+         * XXX: Likewise, 2 Linux drivers might clash if the 2nd overwrites the
+         * IRQ of the 1st. This can only happen if forcing an IRQ, calling this
+         * with *irq==0 is safe. Currently there _are_ no 2 drivers.
+         */
+        rdmsr(MSR_PIC_ZSEL_LOW, zsel, dummy);
+        shift = ((cmp == MFGPT_CMP1 ? 0 : 4) + timer->nr % 4) * 4;
+        if (((zsel >> shift) & 0xF) == 2)
+                return -EIO;
+
+        /* Choose IRQ: if none supplied, keep IRQ already set or use default */
+        if (!*irq)
+                *irq = (zsel >> shift) & 0xF;
+        if (!*irq)
+                *irq = CONFIG_CS5535_MFGPT_DEFAULT_IRQ;
+
+        /* Can't use IRQ if it's 0 (=disabled), 2, or routed to LPC */
+        if (*irq < 1 || *irq == 2 || *irq > 15)
+                return -EIO;
+        rdmsr(MSR_PIC_IRQM_LPC, lpc, dummy);
+        if (lpc & (1 << *irq))
+                return -EIO;
+
+        /* All chosen and checked - go for it */
+        if (cs5535_mfgpt_toggle_event(timer, cmp, MFGPT_EVENT_IRQ, enable))
+                return -EIO;
+        if (enable) {
+                zsel = (zsel & ~(0xF << shift)) | (*irq << shift);
+                wrmsr(MSR_PIC_ZSEL_LOW, zsel, dummy);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cs5535_mfgpt_set_irq);
+
+struct cs5535_mfgpt_timer *cs5535_mfgpt_alloc_timer(int timer_nr, int domain)
+{
+        struct cs5535_mfgpt_chip *mfgpt = &cs5535_mfgpt_chip;
+        struct cs5535_mfgpt_timer *timer = NULL;
+        unsigned long flags;
+        int max;
+
+        if (!mfgpt->initialized)
+                goto done;
+
+        /* only allocate timers from the working domain if requested */
+        if (domain == MFGPT_DOMAIN_WORKING)
+                max = 6;
+        else
+                max = MFGPT_MAX_TIMERS;
+
+        if (timer_nr >= max) {
+                /* programmer error.  silly programmers! */
+                WARN_ON(1);
+                goto done;
+        }
+
+        spin_lock_irqsave(&mfgpt->lock, flags);
+        if (timer_nr < 0) {
+                unsigned long t;
+
+                /* try to find any available timer */
+                t = find_first_bit(mfgpt->avail, max);
+                /* set timer_nr to -1 if no timers available */
+                timer_nr = t < max ? (int) t : -1;
+        } else {
+                /* check if the requested timer's available */
+                if (test_bit(timer_nr, mfgpt->avail))
+                        timer_nr = -1;
+        }
+
+        if (timer_nr >= 0)
+                /* if timer_nr is not -1, it's an available timer */
+                __clear_bit(timer_nr, mfgpt->avail);
+        spin_unlock_irqrestore(&mfgpt->lock, flags);
+
+        if (timer_nr < 0)
+                goto done;
+
+        timer = kmalloc(sizeof(*timer), GFP_KERNEL);
+        if (!timer) {
+                /* aw hell */
+                spin_lock_irqsave(&mfgpt->lock, flags);
+                __set_bit(timer_nr, mfgpt->avail);
+                spin_unlock_irqrestore(&mfgpt->lock, flags);
+                goto done;
+        }
+        timer->chip = mfgpt;
+        timer->nr = timer_nr;
+        dev_info(&mfgpt->pdev->dev, "registered timer %d\n", timer_nr);
+
+done:
+        return timer;
+}
+EXPORT_SYMBOL_GPL(cs5535_mfgpt_alloc_timer);
+
+/*
+ * XXX: This frees the timer memory, but never resets the actual hardware
+ * timer.  The old geode_mfgpt code did this; it would be good to figure
+ * out a way to actually release the hardware timer.  See comments below.
+ */
+void cs5535_mfgpt_free_timer(struct cs5535_mfgpt_timer *timer)
+{
+        kfree(timer);
+}
+EXPORT_SYMBOL_GPL(cs5535_mfgpt_free_timer);
+
+uint16_t cs5535_mfgpt_read(struct cs5535_mfgpt_timer *timer, uint16_t reg)
+{
+        return inw(timer->chip->base + reg + (timer->nr * 8));
+}
+EXPORT_SYMBOL_GPL(cs5535_mfgpt_read);
+
+void cs5535_mfgpt_write(struct cs5535_mfgpt_timer *timer, uint16_t reg,
+                uint16_t value)
+{
+        outw(value, timer->chip->base + reg + (timer->nr * 8));
+}
+EXPORT_SYMBOL_GPL(cs5535_mfgpt_write);
+
+/*
+ * This is a sledgehammer that resets all MFGPT timers. This is required by
+ * some broken BIOSes which leave the system in an unstable state
+ * (TinyBIOS 0.98, for example; fixed in 0.99).  It's uncertain as to
+ * whether or not this secret MSR can be used to release individual timers.
+ * Jordan tells me that he and Mitch once played w/ it, but it's unclear
+ * what the results of that were (and they experienced some instability).
+ */
+static void __init reset_all_timers(void)
+{
+        uint32_t val, dummy;
+
+        /* The following undocumented bit resets the MFGPT timers */
+        val = 0xFF; dummy = 0;
+        wrmsr(MSR_MFGPT_SETUP, val, dummy);
+}
+
+/*
+ * Check whether any MFGPTs are available for the kernel to use.  In most
+ * cases, firmware that uses AMD's VSA code will claim all timers during
+ * bootup; we certainly don't want to take them if they're already in use.
+ * In other cases (such as with VSAless OpenFirmware), the system firmware
+ * leaves timers available for us to use.
+ */
+static int __init scan_timers(struct cs5535_mfgpt_chip *mfgpt)
+{
+        struct cs5535_mfgpt_timer timer = { .chip = mfgpt };
+        unsigned long flags;
+        int timers = 0;
+        uint16_t val;
+        int i;
+
+        /* bios workaround */
+        if (mfgpt_reset_timers)
+                reset_all_timers();
+
+        /* just to be safe, protect this section w/ lock */
+        spin_lock_irqsave(&mfgpt->lock, flags);
+        for (i = 0; i < MFGPT_MAX_TIMERS; i++) {
+                timer.nr = i;
+                val = cs5535_mfgpt_read(&timer, MFGPT_REG_SETUP);
+                if (!(val & MFGPT_SETUP_SETUP)) {
+                        __set_bit(i, mfgpt->avail);
+                        timers++;
+                }
+        }
+        spin_unlock_irqrestore(&mfgpt->lock, flags);
+
+        return timers;
+}
+
+static int __init cs5535_mfgpt_probe(struct pci_dev *pdev,
+                const struct pci_device_id *pci_id)
+{
+        int err, t;
+
+        /* There are two ways to get the MFGPT base address; one is by
+         * fetching it from MSR_LBAR_MFGPT, the other is by reading the
+         * PCI BAR info.  The latter method is easier (especially across
+         * different architectures), so we'll stick with that for now.  If
+         * it turns out to be unreliable in the face of crappy BIOSes, we
+         * can always go back to using MSRs.. */
+
+        err = pci_enable_device_io(pdev);
+        if (err) {
+                dev_err(&pdev->dev, "can't enable device IO\n");
+                goto done;
+        }
+
+        err = pci_request_region(pdev, MFGPT_BAR, DRV_NAME);
+        if (err) {
+                dev_err(&pdev->dev, "can't alloc PCI BAR #%d\n", MFGPT_BAR);
+                goto done;
+        }
+
+        /* set up the driver-specific struct */
+        cs5535_mfgpt_chip.base = pci_resource_start(pdev, MFGPT_BAR);
+        cs5535_mfgpt_chip.pdev = pdev;
+        spin_lock_init(&cs5535_mfgpt_chip.lock);
+
+        dev_info(&pdev->dev, "allocated PCI BAR #%d: base 0x%llx\n", MFGPT_BAR,
+                        (unsigned long long) cs5535_mfgpt_chip.base);
+
+        /* detect the available timers */
+        t = scan_timers(&cs5535_mfgpt_chip);
+        dev_info(&pdev->dev, DRV_NAME ": %d MFGPT timers available\n", t);
+        cs5535_mfgpt_chip.initialized = 1;
+        return 0;
+
+done:
+        return err;
+}
+
+static struct pci_device_id cs5535_mfgpt_pci_tbl[] = {
+        { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) },
+        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
+        { 0, },
+};
+MODULE_DEVICE_TABLE(pci, cs5535_mfgpt_pci_tbl);
+
+/*
+ * Just like with the cs5535-gpio driver, we can't use the standard PCI driver
+ * registration stuff.  It only allows only one driver to bind to each PCI
+ * device, and we want the GPIO and MFGPT drivers to be able to share a PCI
+ * device.  Instead, we manually scan for the PCI device, request a single
+ * region, and keep track of the devices that we're using.
+ */
+
+static int __init cs5535_mfgpt_scan_pci(void)
+{
+        struct pci_dev *pdev;
+        int err = -ENODEV;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(cs5535_mfgpt_pci_tbl); i++) {
+                pdev = pci_get_device(cs5535_mfgpt_pci_tbl[i].vendor,
+                                cs5535_mfgpt_pci_tbl[i].device, NULL);
+                if (pdev) {
+                        err = cs5535_mfgpt_probe(pdev,
+                                        &cs5535_mfgpt_pci_tbl[i]);
+                        if (err)
+                                pci_dev_put(pdev);
+
+                        /* we only support a single CS5535/6 southbridge */
+                        break;
+                }
+        }
+
+        return err;
+}
+
+static int __init cs5535_mfgpt_init(void)
+{
+        return cs5535_mfgpt_scan_pci();
+}
+
+module_init(cs5535_mfgpt_init);
+
+MODULE_AUTHOR("Andres Salomon <dilinger@collabora.co.uk>");
+MODULE_DESCRIPTION("CS5535/CS5536 MFGPT timer driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/misc/eeprom/eeprom.c b/drivers/misc/eeprom/eeprom.c
index 2c27193aeaa0..f939ebc2507c 100644
--- a/drivers/misc/eeprom/eeprom.c
+++ b/drivers/misc/eeprom/eeprom.c
@@ -32,9 +32,6 @@
 static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
                                         0x55, 0x56, 0x57, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(eeprom);
-
 
 /* Size of EEPROM in bytes */
 #define EEPROM_SIZE             256
@@ -135,8 +132,7 @@ static struct bin_attribute eeprom_attr = {
 };
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int eeprom_detect(struct i2c_client *client, int kind,
-                         struct i2c_board_info *info)
+static int eeprom_detect(struct i2c_client *client, struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
 
@@ -233,7 +229,7 @@ static struct i2c_driver eeprom_driver = {
 
         .class          = I2C_CLASS_DDC | I2C_CLASS_SPD,
         .detect         = eeprom_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static int __init eeprom_init(void)
diff --git a/drivers/misc/ics932s401.c b/drivers/misc/ics932s401.c
index 4bb7a3af9ad9..395a4ea64e9c 100644
--- a/drivers/misc/ics932s401.c
+++ b/drivers/misc/ics932s401.c
@@ -30,9 +30,6 @@
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x69, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(ics932s401);
-
 /* ICS932S401 registers */
 #define ICS932S401_REG_CFG2                     0x01
 #define         ICS932S401_CFG1_SPREAD          0x01
@@ -106,12 +103,12 @@ struct ics932s401_data {
 
 static int ics932s401_probe(struct i2c_client *client,
                          const struct i2c_device_id *id);
-static int ics932s401_detect(struct i2c_client *client, int kind,
+static int ics932s401_detect(struct i2c_client *client,
                           struct i2c_board_info *info);
 static int ics932s401_remove(struct i2c_client *client);
 
 static const struct i2c_device_id ics932s401_id[] = {
-        { "ics932s401", ics932s401 },
+        { "ics932s401", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, ics932s401_id);
@@ -125,7 +122,7 @@ static struct i2c_driver ics932s401_driver = {
         .remove         = ics932s401_remove,
         .id_table       = ics932s401_id,
         .detect         = ics932s401_detect,
-        .address_data   = &addr_data,
+        .address_list   = normal_i2c,
 };
 
 static struct ics932s401_data *ics932s401_update_device(struct device *dev)
@@ -413,7 +410,7 @@ static ssize_t show_spread(struct device *dev,
 }
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
-static int ics932s401_detect(struct i2c_client *client, int kind,
+static int ics932s401_detect(struct i2c_client *client,
                           struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c
index 60b0b1a4fb3a..09dcb699e667 100644
--- a/drivers/misc/ioc4.c
+++ b/drivers/misc/ioc4.c
@@ -138,7 +138,7 @@ ioc4_unregister_submodule(struct ioc4_submodule *is)
  * even though the following code utilizes external interrupt registers
  * to perform the speed calculation.
  */
-static void
+static void __devinit
 ioc4_clock_calibrate(struct ioc4_driver_data *idd)
 {
         union ioc4_int_out int_out;
@@ -230,7 +230,7 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)
  * on the same PCI bus at slot number 3 to differentiate IO9 from IO10.
  * If neither is present, it's a PCI-RT.
  */
-static unsigned int
+static unsigned int __devinit
 ioc4_variant(struct ioc4_driver_data *idd)
 {
         struct pci_dev *pdev = NULL;
@@ -269,7 +269,7 @@ ioc4_variant(struct ioc4_driver_data *idd)
         return IOC4_VARIANT_PCI_RT;
 }
 
-static void
+static void __devinit
 ioc4_load_modules(struct work_struct *work)
 {
         /* arg just has to be freed */
@@ -280,7 +280,7 @@ ioc4_load_modules(struct work_struct *work)
 }
 
 /* Adds a new instance of an IOC4 card */
-static int
+static int __devinit
 ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
 {
         struct ioc4_driver_data *idd;
@@ -425,7 +425,7 @@ out:
 }
 
 /* Removes a particular instance of an IOC4 card. */
-static void
+static void __devexit
 ioc4_remove(struct pci_dev *pdev)
 {
         struct ioc4_submodule *is;
@@ -476,7 +476,7 @@ static struct pci_driver ioc4_driver = {
         .name = "IOC4",
         .id_table = ioc4_id_table,
         .probe = ioc4_probe,
-        .remove = ioc4_remove,
+        .remove = __devexit_p(ioc4_remove),
 };
 
 MODULE_DEVICE_TABLE(pci, ioc4_id_table);
@@ -486,14 +486,14 @@ MODULE_DEVICE_TABLE(pci, ioc4_id_table);
  *********************/
 
 /* Module load */
-static int __devinit
+static int __init
 ioc4_init(void)
 {
         return pci_register_driver(&ioc4_driver);
 }
 
 /* Module unload */
-static void __devexit
+static void __exit
 ioc4_exit(void)
 {
         /* Ensure ioc4_load_modules() has completed before exiting */
diff --git a/drivers/misc/sgi-gru/gru.h b/drivers/misc/sgi-gru/gru.h
index f93f03a9e6e9..3ad76cd18b4b 100644
--- a/drivers/misc/sgi-gru/gru.h
+++ b/drivers/misc/sgi-gru/gru.h
@@ -53,6 +53,17 @@ struct gru_chiplet_info {
         int     free_user_cbr;
 };
 
+/*
+ * Statictics kept for each context.
+ */
+struct gru_gseg_statistics {
+        unsigned long   fmm_tlbmiss;
+        unsigned long   upm_tlbmiss;
+        unsigned long   tlbdropin;
+        unsigned long   context_stolen;
+        unsigned long   reserved[10];
+};
+
 /* Flags for GRU options on the gru_create_context() call */
 /* Select one of the follow 4 options to specify how TLB misses are handled */
 #define GRU_OPT_MISS_DEFAULT    0x0000  /* Use default mode */
diff --git a/drivers/misc/sgi-gru/gru_instructions.h b/drivers/misc/sgi-gru/gru_instructions.h
index 3c9c06618e6a..d95587cc794c 100644
--- a/drivers/misc/sgi-gru/gru_instructions.h
+++ b/drivers/misc/sgi-gru/gru_instructions.h
@@ -34,17 +34,17 @@ extern void gru_wait_abort_proc(void *cb);
 #include <asm/intrinsics.h>
 #define __flush_cache(p)                ia64_fc((unsigned long)p)
 /* Use volatile on IA64 to ensure ordering via st4.rel */
-#define gru_ordered_store_int(p, v)                                     \
+#define gru_ordered_store_ulong(p, v)                                   \
                 do {                                                    \
                         barrier();                                      \
-                        *((volatile int *)(p)) = v; /* force st.rel */  \
+                        *((volatile unsigned long *)(p)) = v; /* force st.rel */        \
                 } while (0)
 #elif defined(CONFIG_X86_64)
 #define __flush_cache(p)                clflush(p)
-#define gru_ordered_store_int(p, v)                                     \
+#define gru_ordered_store_ulong(p, v)                                   \
                 do {                                                    \
                         barrier();                                      \
-                        *(int *)p = v;                                  \
+                        *(unsigned long *)p = v;                        \
                 } while (0)
 #else
 #error "Unsupported architecture"
@@ -129,8 +129,13 @@ struct gru_instruction_bits {
  */
 struct gru_instruction {
     /* DW 0 */
-    unsigned int                op32;    /* icmd,xtype,iaa0,ima,opc */
-    unsigned int                tri0;
+    union {
+        unsigned long           op64;    /* icmd,xtype,iaa0,ima,opc,tri0 */
+        struct {
+                unsigned int    op32;
+                unsigned int    tri0;
+        };
+    };
     unsigned long               tri1_bufsize;           /* DW 1 */
     unsigned long               baddr0;                 /* DW 2 */
     unsigned long               nelem;                  /* DW 3 */
@@ -140,7 +145,7 @@ struct gru_instruction {
     unsigned long               avalue;                 /* DW 7 */
 };
 
-/* Some shifts and masks for the low 32 bits of a GRU command */
+/* Some shifts and masks for the low 64 bits of a GRU command */
 #define GRU_CB_ICMD_SHFT        0
 #define GRU_CB_ICMD_MASK        0x1
 #define GRU_CB_XTYPE_SHFT       8
@@ -155,6 +160,10 @@ struct gru_instruction {
 #define GRU_CB_OPC_MASK         0xff
 #define GRU_CB_EXOPC_SHFT       24
 #define GRU_CB_EXOPC_MASK       0xff
+#define GRU_IDEF2_SHFT          32
+#define GRU_IDEF2_MASK          0x3ffff
+#define GRU_ISTATUS_SHFT        56
+#define GRU_ISTATUS_MASK        0x3
 
 /* GRU instruction opcodes (opc field) */
 #define OP_NOP          0x00
@@ -256,6 +265,7 @@ struct gru_instruction {
 #define CBE_CAUSE_PROTOCOL_STATE_DATA_ERROR     (1 << 16)
 #define CBE_CAUSE_RA_RESPONSE_DATA_ERROR        (1 << 17)
 #define CBE_CAUSE_HA_RESPONSE_DATA_ERROR        (1 << 18)
+#define CBE_CAUSE_FORCED_ERROR                  (1 << 19)
 
 /* CBE cbrexecstatus bits */
 #define CBR_EXS_ABORT_OCC_BIT                   0
@@ -264,13 +274,15 @@ struct gru_instruction {
 #define CBR_EXS_QUEUED_BIT                      3
 #define CBR_EXS_TLB_INVAL_BIT                   4
 #define CBR_EXS_EXCEPTION_BIT                   5
+#define CBR_EXS_CB_INT_PENDING_BIT              6
 
 #define CBR_EXS_ABORT_OCC                       (1 << CBR_EXS_ABORT_OCC_BIT)
 #define CBR_EXS_INT_OCC                         (1 << CBR_EXS_INT_OCC_BIT)
 #define CBR_EXS_PENDING                         (1 << CBR_EXS_PENDING_BIT)
 #define CBR_EXS_QUEUED                          (1 << CBR_EXS_QUEUED_BIT)
-#define CBR_TLB_INVAL                           (1 << CBR_EXS_TLB_INVAL_BIT)
+#define CBR_EXS_TLB_INVAL                       (1 << CBR_EXS_TLB_INVAL_BIT)
 #define CBR_EXS_EXCEPTION                       (1 << CBR_EXS_EXCEPTION_BIT)
+#define CBR_EXS_CB_INT_PENDING                  (1 << CBR_EXS_CB_INT_PENDING_BIT)
 
 /*
  * Exceptions are retried for the following cases. If any OTHER bits are set
@@ -296,12 +308,14 @@ union gru_mesqhead {
 
 
 /* Generate the low word of a GRU instruction */
-static inline unsigned int
-__opword(unsigned char opcode, unsigned char exopc, unsigned char xtype,
+static inline unsigned long
+__opdword(unsigned char opcode, unsigned char exopc, unsigned char xtype,
        unsigned char iaa0, unsigned char iaa1,
-       unsigned char ima)
+       unsigned long idef2, unsigned char ima)
 {
     return (1 << GRU_CB_ICMD_SHFT) |
+           ((unsigned long)CBS_ACTIVE << GRU_ISTATUS_SHFT) |
+           (idef2<< GRU_IDEF2_SHFT) |
            (iaa0 << GRU_CB_IAA0_SHFT) |
            (iaa1 << GRU_CB_IAA1_SHFT) |
            (ima << GRU_CB_IMA_SHFT) |
@@ -319,12 +333,13 @@ static inline void gru_flush_cache(void *p)
 }
 
 /*
- * Store the lower 32 bits of the command including the "start" bit. Then
+ * Store the lower 64 bits of the command including the "start" bit. Then
  * start the instruction executing.
  */
-static inline void gru_start_instruction(struct gru_instruction *ins, int op32)
+static inline void gru_start_instruction(struct gru_instruction *ins, unsigned long op64)
 {
-        gru_ordered_store_int(ins, op32);
+        gru_ordered_store_ulong(ins, op64);
+        mb();
         gru_flush_cache(ins);
 }
 
@@ -340,6 +355,30 @@ static inline void gru_start_instruction(struct gru_instruction *ins, int op32)
  *      - nelem and stride are in elements
  *      - tri0/tri1 is in bytes for the beginning of the data segment.
  */
+static inline void gru_vload_phys(void *cb, unsigned long gpa,
+                unsigned int tri0, int iaa, unsigned long hints)
+{
+        struct gru_instruction *ins = (struct gru_instruction *)cb;
+
+        ins->baddr0 = (long)gpa | ((unsigned long)iaa << 62);
+        ins->nelem = 1;
+        ins->op1_stride = 1;
+        gru_start_instruction(ins, __opdword(OP_VLOAD, 0, XTYPE_DW, iaa, 0,
+                                        (unsigned long)tri0, CB_IMA(hints)));
+}
+
+static inline void gru_vstore_phys(void *cb, unsigned long gpa,
+                unsigned int tri0, int iaa, unsigned long hints)
+{
+        struct gru_instruction *ins = (struct gru_instruction *)cb;
+
+        ins->baddr0 = (long)gpa | ((unsigned long)iaa << 62);
+        ins->nelem = 1;
+        ins->op1_stride = 1;
+        gru_start_instruction(ins, __opdword(OP_VSTORE, 0, XTYPE_DW, iaa, 0,
+                                        (unsigned long)tri0, CB_IMA(hints)));
+}
+
 static inline void gru_vload(void *cb, unsigned long mem_addr,
                 unsigned int tri0, unsigned char xtype, unsigned long nelem,
                 unsigned long stride, unsigned long hints)
@@ -348,10 +387,9 @@ static inline void gru_vload(void *cb, unsigned long mem_addr,
 
         ins->baddr0 = (long)mem_addr;
         ins->nelem = nelem;
-        ins->tri0 = tri0;
         ins->op1_stride = stride;
-        gru_start_instruction(ins, __opword(OP_VLOAD, 0, xtype, IAA_RAM, 0,
-                                        CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_VLOAD, 0, xtype, IAA_RAM, 0,
+                                        (unsigned long)tri0, CB_IMA(hints)));
 }
 
 static inline void gru_vstore(void *cb, unsigned long mem_addr,
@@ -362,10 +400,9 @@ static inline void gru_vstore(void *cb, unsigned long mem_addr,
 
         ins->baddr0 = (long)mem_addr;
         ins->nelem = nelem;
-        ins->tri0 = tri0;
         ins->op1_stride = stride;
-        gru_start_instruction(ins, __opword(OP_VSTORE, 0, xtype, IAA_RAM, 0,
-                                        CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_VSTORE, 0, xtype, IAA_RAM, 0,
+                                        tri0, CB_IMA(hints)));
 }
 
 static inline void gru_ivload(void *cb, unsigned long mem_addr,
@@ -376,10 +413,9 @@ static inline void gru_ivload(void *cb, unsigned long mem_addr,
 
         ins->baddr0 = (long)mem_addr;
         ins->nelem = nelem;
-        ins->tri0 = tri0;
         ins->tri1_bufsize = tri1;
-        gru_start_instruction(ins, __opword(OP_IVLOAD, 0, xtype, IAA_RAM, 0,
-                                        CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_IVLOAD, 0, xtype, IAA_RAM, 0,
+                                        tri0, CB_IMA(hints)));
 }
 
 static inline void gru_ivstore(void *cb, unsigned long mem_addr,
@@ -390,10 +426,9 @@ static inline void gru_ivstore(void *cb, unsigned long mem_addr,
 
         ins->baddr0 = (long)mem_addr;
         ins->nelem = nelem;
-        ins->tri0 = tri0;
         ins->tri1_bufsize = tri1;
-        gru_start_instruction(ins, __opword(OP_IVSTORE, 0, xtype, IAA_RAM, 0,
-                                        CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_IVSTORE, 0, xtype, IAA_RAM, 0,
+                                        tri0, CB_IMA(hints)));
 }
 
 static inline void gru_vset(void *cb, unsigned long mem_addr,
@@ -406,8 +441,8 @@ static inline void gru_vset(void *cb, unsigned long mem_addr,
         ins->op2_value_baddr1 = value;
         ins->nelem = nelem;
         ins->op1_stride = stride;
-        gru_start_instruction(ins, __opword(OP_VSET, 0, xtype, IAA_RAM, 0,
-                                         CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_VSET, 0, xtype, IAA_RAM, 0,
+                                         0, CB_IMA(hints)));
 }
 
 static inline void gru_ivset(void *cb, unsigned long mem_addr,
@@ -420,8 +455,8 @@ static inline void gru_ivset(void *cb, unsigned long mem_addr,
         ins->op2_value_baddr1 = value;
         ins->nelem = nelem;
         ins->tri1_bufsize = tri1;
-        gru_start_instruction(ins, __opword(OP_IVSET, 0, xtype, IAA_RAM, 0,
-                                        CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_IVSET, 0, xtype, IAA_RAM, 0,
+                                        0, CB_IMA(hints)));
 }
 
 static inline void gru_vflush(void *cb, unsigned long mem_addr,
@@ -433,15 +468,15 @@ static inline void gru_vflush(void *cb, unsigned long mem_addr,
         ins->baddr0 = (long)mem_addr;
         ins->op1_stride = stride;
         ins->nelem = nelem;
-        gru_start_instruction(ins, __opword(OP_VFLUSH, 0, xtype, IAA_RAM, 0,
-                                        CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_VFLUSH, 0, xtype, IAA_RAM, 0,
+                                        0, CB_IMA(hints)));
 }
 
 static inline void gru_nop(void *cb, int hints)
 {
         struct gru_instruction *ins = (void *)cb;
 
-        gru_start_instruction(ins, __opword(OP_NOP, 0, 0, 0, 0, CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_NOP, 0, 0, 0, 0, 0, CB_IMA(hints)));
 }
 
 
@@ -455,10 +490,9 @@ static inline void gru_bcopy(void *cb, const unsigned long src,
         ins->baddr0 = (long)src;
         ins->op2_value_baddr1 = (long)dest;
         ins->nelem = nelem;
-        ins->tri0 = tri0;
         ins->tri1_bufsize = bufsize;
-        gru_start_instruction(ins, __opword(OP_BCOPY, 0, xtype, IAA_RAM,
-                                        IAA_RAM, CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_BCOPY, 0, xtype, IAA_RAM,
+                                        IAA_RAM, tri0, CB_IMA(hints)));
 }
 
 static inline void gru_bstore(void *cb, const unsigned long src,
@@ -470,9 +504,8 @@ static inline void gru_bstore(void *cb, const unsigned long src,
         ins->baddr0 = (long)src;
         ins->op2_value_baddr1 = (long)dest;
         ins->nelem = nelem;
-        ins->tri0 = tri0;
-        gru_start_instruction(ins, __opword(OP_BSTORE, 0, xtype, 0, IAA_RAM,
-                                        CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_BSTORE, 0, xtype, 0, IAA_RAM,
+                                        tri0, CB_IMA(hints)));
 }
 
 static inline void gru_gamir(void *cb, int exopc, unsigned long src,
@@ -481,8 +514,8 @@ static inline void gru_gamir(void *cb, int exopc, unsigned long src,
         struct gru_instruction *ins = (void *)cb;
 
         ins->baddr0 = (long)src;
-        gru_start_instruction(ins, __opword(OP_GAMIR, exopc, xtype, IAA_RAM, 0,
-                                        CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_GAMIR, exopc, xtype, IAA_RAM, 0,
+                                        0, CB_IMA(hints)));
 }
 
 static inline void gru_gamirr(void *cb, int exopc, unsigned long src,
@@ -491,8 +524,8 @@ static inline void gru_gamirr(void *cb, int exopc, unsigned long src,
         struct gru_instruction *ins = (void *)cb;
 
         ins->baddr0 = (long)src;
-        gru_start_instruction(ins, __opword(OP_GAMIRR, exopc, xtype, IAA_RAM, 0,
-                                        CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_GAMIRR, exopc, xtype, IAA_RAM, 0,
+                                        0, CB_IMA(hints)));
 }
 
 static inline void gru_gamer(void *cb, int exopc, unsigned long src,
@@ -505,8 +538,8 @@ static inline void gru_gamer(void *cb, int exopc, unsigned long src,
         ins->baddr0 = (long)src;
         ins->op1_stride = operand1;
         ins->op2_value_baddr1 = operand2;
-        gru_start_instruction(ins, __opword(OP_GAMER, exopc, xtype, IAA_RAM, 0,
-                                        CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_GAMER, exopc, xtype, IAA_RAM, 0,
+                                        0, CB_IMA(hints)));
 }
 
 static inline void gru_gamerr(void *cb, int exopc, unsigned long src,
@@ -518,8 +551,8 @@ static inline void gru_gamerr(void *cb, int exopc, unsigned long src,
         ins->baddr0 = (long)src;
         ins->op1_stride = operand1;
         ins->op2_value_baddr1 = operand2;
-        gru_start_instruction(ins, __opword(OP_GAMERR, exopc, xtype, IAA_RAM, 0,
-                                        CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_GAMERR, exopc, xtype, IAA_RAM, 0,
+                                        0, CB_IMA(hints)));
 }
 
 static inline void gru_gamxr(void *cb, unsigned long src,
@@ -529,8 +562,8 @@ static inline void gru_gamxr(void *cb, unsigned long src,
 
         ins->baddr0 = (long)src;
         ins->nelem = 4;
-        gru_start_instruction(ins, __opword(OP_GAMXR, EOP_XR_CSWAP, XTYPE_DW,
-                                 IAA_RAM, 0, CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_GAMXR, EOP_XR_CSWAP, XTYPE_DW,
+                                 IAA_RAM, 0, 0, CB_IMA(hints)));
 }
 
 static inline void gru_mesq(void *cb, unsigned long queue,
@@ -541,9 +574,8 @@ static inline void gru_mesq(void *cb, unsigned long queue,
 
         ins->baddr0 = (long)queue;
         ins->nelem = nelem;
-        ins->tri0 = tri0;
-        gru_start_instruction(ins, __opword(OP_MESQ, 0, XTYPE_CL, IAA_RAM, 0,
-                                        CB_IMA(hints)));
+        gru_start_instruction(ins, __opdword(OP_MESQ, 0, XTYPE_CL, IAA_RAM, 0,
+                                        tri0, CB_IMA(hints)));
 }
 
 static inline unsigned long gru_get_amo_value(void *cb)
@@ -662,6 +694,14 @@ static inline void gru_wait_abort(void *cb)
         gru_wait_abort_proc(cb);
 }
 
+/*
+ * Get a pointer to the start of a gseg
+ *      p       - Any valid pointer within the gseg
+ */
+static inline void *gru_get_gseg_pointer (void *p)
+{
+        return (void *)((unsigned long)p & ~(GRU_GSEG_PAGESIZE - 1));
+}
 
 /*
  * Get a pointer to a control block
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c
index 679e01778286..38657cdaf54d 100644
--- a/drivers/misc/sgi-gru/grufault.c
+++ b/drivers/misc/sgi-gru/grufault.c
@@ -40,6 +40,12 @@
 #include "gru_instructions.h"
 #include <asm/uv/uv_hub.h>
 
+/* Return codes for vtop functions */
+#define VTOP_SUCCESS               0
+#define VTOP_INVALID               -1
+#define VTOP_RETRY                 -2
+
+
 /*
  * Test if a physical address is a valid GRU GSEG address
  */
@@ -90,19 +96,22 @@ static struct gru_thread_state *gru_alloc_locked_gts(unsigned long vaddr)
 {
         struct mm_struct *mm = current->mm;
         struct vm_area_struct *vma;
-        struct gru_thread_state *gts = NULL;
+        struct gru_thread_state *gts = ERR_PTR(-EINVAL);
 
         down_write(&mm->mmap_sem);
         vma = gru_find_vma(vaddr);
-        if (vma)
-                gts = gru_alloc_thread_state(vma, TSID(vaddr, vma));
-        if (gts) {
-                mutex_lock(&gts->ts_ctxlock);
-                downgrade_write(&mm->mmap_sem);
-        } else {
-                up_write(&mm->mmap_sem);
-        }
+        if (!vma)
+                goto err;
 
+        gts = gru_alloc_thread_state(vma, TSID(vaddr, vma));
+        if (IS_ERR(gts))
+                goto err;
+        mutex_lock(&gts->ts_ctxlock);
+        downgrade_write(&mm->mmap_sem);
+        return gts;
+
+err:
+        up_write(&mm->mmap_sem);
         return gts;
 }
 
@@ -122,39 +131,15 @@ static void gru_unlock_gts(struct gru_thread_state *gts)
  * is necessary to prevent the user from seeing a stale cb.istatus that will
  * change as soon as the TFH restart is complete. Races may cause an
  * occasional failure to clear the cb.istatus, but that is ok.
- *
- * If the cb address is not valid (should not happen, but...), nothing
- * bad will happen.. The get_user()/put_user() will fail but there
- * are no bad side-effects.
  */
-static void gru_cb_set_istatus_active(unsigned long __user *cb)
+static void gru_cb_set_istatus_active(struct gru_instruction_bits *cbk)
 {
-        union {
-                struct gru_instruction_bits bits;
-                unsigned long dw;
-        } u;
-
-        if (cb) {
-                get_user(u.dw, cb);
-                u.bits.istatus = CBS_ACTIVE;
-                put_user(u.dw, cb);
+        if (cbk) {
+                cbk->istatus = CBS_ACTIVE;
         }
 }
 
 /*
- * Convert a interrupt IRQ to a pointer to the GRU GTS that caused the
- * interrupt. Interrupts are always sent to a cpu on the blade that contains the
- * GRU (except for headless blades which are not currently supported). A blade
- * has N grus; a block of N consecutive IRQs is assigned to the GRUs. The IRQ
- * number uniquely identifies the GRU chiplet on the local blade that caused the
- * interrupt. Always called in interrupt context.
- */
-static inline struct gru_state *irq_to_gru(int irq)
-{
-        return &gru_base[uv_numa_blade_id()]->bs_grus[irq - IRQ_GRU];
-}
-
-/*
  * Read & clear a TFM
  *
  * The GRU has an array of fault maps. A map is private to a cpu
@@ -207,10 +192,11 @@ static int non_atomic_pte_lookup(struct vm_area_struct *vma,
 {
         struct page *page;
 
-        /* ZZZ Need to handle HUGE pages */
-        if (is_vm_hugetlb_page(vma))
-                return -EFAULT;
+#ifdef CONFIG_HUGETLB_PAGE
+        *pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT;
+#else
         *pageshift = PAGE_SHIFT;
+#endif
         if (get_user_pages
             (current, current->mm, vaddr, 1, write, 0, &page, NULL) <= 0)
                 return -EFAULT;
@@ -268,7 +254,6 @@ static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr,
         return 0;
 
 err:
-        local_irq_enable();
         return 1;
 }
 
@@ -301,14 +286,69 @@ static int gru_vtop(struct gru_thread_state *gts, unsigned long vaddr,
         paddr = paddr & ~((1UL << ps) - 1);
         *gpa = uv_soc_phys_ram_to_gpa(paddr);
         *pageshift = ps;
-        return 0;
+        return VTOP_SUCCESS;
 
 inval:
-        return -1;
+        return VTOP_INVALID;
 upm:
-        return -2;
+        return VTOP_RETRY;
+}
+
+
+/*
+ * Flush a CBE from cache. The CBE is clean in the cache. Dirty the
+ * CBE cacheline so that the line will be written back to home agent.
+ * Otherwise the line may be silently dropped. This has no impact
+ * except on performance.
+ */
+static void gru_flush_cache_cbe(struct gru_control_block_extended *cbe)
+{
+        if (unlikely(cbe)) {
+                cbe->cbrexecstatus = 0;         /* make CL dirty */
+                gru_flush_cache(cbe);
+        }
 }
 
+/*
+ * Preload the TLB with entries that may be required. Currently, preloading
+ * is implemented only for BCOPY. Preload  <tlb_preload_count> pages OR to
+ * the end of the bcopy tranfer, whichever is smaller.
+ */
+static void gru_preload_tlb(struct gru_state *gru,
+                        struct gru_thread_state *gts, int atomic,
+                        unsigned long fault_vaddr, int asid, int write,
+                        unsigned char tlb_preload_count,
+                        struct gru_tlb_fault_handle *tfh,
+                        struct gru_control_block_extended *cbe)
+{
+        unsigned long vaddr = 0, gpa;
+        int ret, pageshift;
+
+        if (cbe->opccpy != OP_BCOPY)
+                return;
+
+        if (fault_vaddr == cbe->cbe_baddr0)
+                vaddr = fault_vaddr + GRU_CACHE_LINE_BYTES * cbe->cbe_src_cl - 1;
+        else if (fault_vaddr == cbe->cbe_baddr1)
+                vaddr = fault_vaddr + (1 << cbe->xtypecpy) * cbe->cbe_nelemcur - 1;
+
+        fault_vaddr &= PAGE_MASK;
+        vaddr &= PAGE_MASK;
+        vaddr = min(vaddr, fault_vaddr + tlb_preload_count * PAGE_SIZE);
+
+        while (vaddr > fault_vaddr) {
+                ret = gru_vtop(gts, vaddr, write, atomic, &gpa, &pageshift);
+                if (ret || tfh_write_only(tfh, gpa, GAA_RAM, vaddr, asid, write,
+                                          GRU_PAGESIZE(pageshift)))
+                        return;
+                gru_dbg(grudev,
+                        "%s: gid %d, gts 0x%p, tfh 0x%p, vaddr 0x%lx, asid 0x%x, rw %d, ps %d, gpa 0x%lx\n",
+                        atomic ? "atomic" : "non-atomic", gru->gs_gid, gts, tfh,
+                        vaddr, asid, write, pageshift, gpa);
+                vaddr -= PAGE_SIZE;
+                STAT(tlb_preload_page);
+        }
+}
 
 /*
  * Drop a TLB entry into the GRU. The fault is described by info in an TFH.
@@ -320,11 +360,14 @@ upm:
  *              < 0 = error code
  *
  */
-static int gru_try_dropin(struct gru_thread_state *gts,
+static int gru_try_dropin(struct gru_state *gru,
+                          struct gru_thread_state *gts,
                           struct gru_tlb_fault_handle *tfh,
-                          unsigned long __user *cb)
+                          struct gru_instruction_bits *cbk)
 {
-        int pageshift = 0, asid, write, ret, atomic = !cb;
+        struct gru_control_block_extended *cbe = NULL;
+        unsigned char tlb_preload_count = gts->ts_tlb_preload_count;
+        int pageshift = 0, asid, write, ret, atomic = !cbk, indexway;
         unsigned long gpa = 0, vaddr = 0;
 
         /*
@@ -335,24 +378,34 @@ static int gru_try_dropin(struct gru_thread_state *gts,
          */
 
         /*
+         * Prefetch the CBE if doing TLB preloading
+         */
+        if (unlikely(tlb_preload_count)) {
+                cbe = gru_tfh_to_cbe(tfh);
+                prefetchw(cbe);
+        }
+
+        /*
          * Error if TFH state is IDLE or FMM mode & the user issuing a UPM call.
          * Might be a hardware race OR a stupid user. Ignore FMM because FMM
          * is a transient state.
          */
         if (tfh->status != TFHSTATUS_EXCEPTION) {
                 gru_flush_cache(tfh);
+                sync_core();
                 if (tfh->status != TFHSTATUS_EXCEPTION)
                         goto failnoexception;
                 STAT(tfh_stale_on_fault);
         }
         if (tfh->state == TFHSTATE_IDLE)
                 goto failidle;
-        if (tfh->state == TFHSTATE_MISS_FMM && cb)
+        if (tfh->state == TFHSTATE_MISS_FMM && cbk)
                 goto failfmm;
 
         write = (tfh->cause & TFHCAUSE_TLB_MOD) != 0;
         vaddr = tfh->missvaddr;
         asid = tfh->missasid;
+        indexway = tfh->indexway;
         if (asid == 0)
                 goto failnoasid;
 
@@ -366,41 +419,51 @@ static int gru_try_dropin(struct gru_thread_state *gts,
                 goto failactive;
 
         ret = gru_vtop(gts, vaddr, write, atomic, &gpa, &pageshift);
-        if (ret == -1)
+        if (ret == VTOP_INVALID)
                 goto failinval;
-        if (ret == -2)
+        if (ret == VTOP_RETRY)
                 goto failupm;
 
         if (!(gts->ts_sizeavail & GRU_SIZEAVAIL(pageshift))) {
                 gts->ts_sizeavail |= GRU_SIZEAVAIL(pageshift);
-                if (atomic || !gru_update_cch(gts, 0)) {
+                if (atomic || !gru_update_cch(gts)) {
                         gts->ts_force_cch_reload = 1;
                         goto failupm;
                 }
         }
-        gru_cb_set_istatus_active(cb);
+
+        if (unlikely(cbe) && pageshift == PAGE_SHIFT) {
+                gru_preload_tlb(gru, gts, atomic, vaddr, asid, write, tlb_preload_count, tfh, cbe);
+                gru_flush_cache_cbe(cbe);
+        }
+
+        gru_cb_set_istatus_active(cbk);
+        gts->ustats.tlbdropin++;
         tfh_write_restart(tfh, gpa, GAA_RAM, vaddr, asid, write,
                           GRU_PAGESIZE(pageshift));
-        STAT(tlb_dropin);
         gru_dbg(grudev,
-                "%s: tfh 0x%p, vaddr 0x%lx, asid 0x%x, ps %d, gpa 0x%lx\n",
-                ret ? "non-atomic" : "atomic", tfh, vaddr, asid,
-                pageshift, gpa);
+                "%s: gid %d, gts 0x%p, tfh 0x%p, vaddr 0x%lx, asid 0x%x, indexway 0x%x,"
+                " rw %d, ps %d, gpa 0x%lx\n",
+                atomic ? "atomic" : "non-atomic", gru->gs_gid, gts, tfh, vaddr, asid,
+                indexway, write, pageshift, gpa);
+        STAT(tlb_dropin);
         return 0;
 
 failnoasid:
         /* No asid (delayed unload). */
         STAT(tlb_dropin_fail_no_asid);
         gru_dbg(grudev, "FAILED no_asid tfh: 0x%p, vaddr 0x%lx\n", tfh, vaddr);
-        if (!cb)
+        if (!cbk)
                 tfh_user_polling_mode(tfh);
         else
                 gru_flush_cache(tfh);
+        gru_flush_cache_cbe(cbe);
         return -EAGAIN;
 
 failupm:
         /* Atomic failure switch CBR to UPM */
         tfh_user_polling_mode(tfh);
+        gru_flush_cache_cbe(cbe);
         STAT(tlb_dropin_fail_upm);
         gru_dbg(grudev, "FAILED upm tfh: 0x%p, vaddr 0x%lx\n", tfh, vaddr);
         return 1;
@@ -408,6 +471,7 @@ failupm:
 failfmm:
         /* FMM state on UPM call */
         gru_flush_cache(tfh);
+        gru_flush_cache_cbe(cbe);
         STAT(tlb_dropin_fail_fmm);
         gru_dbg(grudev, "FAILED fmm tfh: 0x%p, state %d\n", tfh, tfh->state);
         return 0;
@@ -415,17 +479,20 @@ failfmm:
 failnoexception:
         /* TFH status did not show exception pending */
         gru_flush_cache(tfh);
-        if (cb)
-                gru_flush_cache(cb);
+        gru_flush_cache_cbe(cbe);
+        if (cbk)
+                gru_flush_cache(cbk);
         STAT(tlb_dropin_fail_no_exception);
-        gru_dbg(grudev, "FAILED non-exception tfh: 0x%p, status %d, state %d\n", tfh, tfh->status, tfh->state);
+        gru_dbg(grudev, "FAILED non-exception tfh: 0x%p, status %d, state %d\n",
+                tfh, tfh->status, tfh->state);
         return 0;
 
 failidle:
         /* TFH state was idle  - no miss pending */
         gru_flush_cache(tfh);
-        if (cb)
-                gru_flush_cache(cb);
+        gru_flush_cache_cbe(cbe);
+        if (cbk)
+                gru_flush_cache(cbk);
         STAT(tlb_dropin_fail_idle);
         gru_dbg(grudev, "FAILED idle tfh: 0x%p, state %d\n", tfh, tfh->state);
         return 0;
@@ -433,16 +500,18 @@ failidle:
 failinval:
         /* All errors (atomic & non-atomic) switch CBR to EXCEPTION state */
         tfh_exception(tfh);
+        gru_flush_cache_cbe(cbe);
         STAT(tlb_dropin_fail_invalid);
         gru_dbg(grudev, "FAILED inval tfh: 0x%p, vaddr 0x%lx\n", tfh, vaddr);
         return -EFAULT;
 
 failactive:
         /* Range invalidate active. Switch to UPM iff atomic */
-        if (!cb)
+        if (!cbk)
                 tfh_user_polling_mode(tfh);
         else
                 gru_flush_cache(tfh);
+        gru_flush_cache_cbe(cbe);
         STAT(tlb_dropin_fail_range_active);
         gru_dbg(grudev, "FAILED range active: tfh 0x%p, vaddr 0x%lx\n",
                 tfh, vaddr);
@@ -455,31 +524,41 @@ failactive:
  * Note that this is the interrupt handler that is registered with linux
  * interrupt handlers.
  */
-irqreturn_t gru_intr(int irq, void *dev_id)
+static irqreturn_t gru_intr(int chiplet, int blade)
 {
         struct gru_state *gru;
         struct gru_tlb_fault_map imap, dmap;
         struct gru_thread_state *gts;
         struct gru_tlb_fault_handle *tfh = NULL;
+        struct completion *cmp;
         int cbrnum, ctxnum;
 
         STAT(intr);
 
-        gru = irq_to_gru(irq);
+        gru = &gru_base[blade]->bs_grus[chiplet];
         if (!gru) {
-                dev_err(grudev, "GRU: invalid interrupt: cpu %d, irq %d\n",
-                        raw_smp_processor_id(), irq);
+                dev_err(grudev, "GRU: invalid interrupt: cpu %d, chiplet %d\n",
+                        raw_smp_processor_id(), chiplet);
                 return IRQ_NONE;
         }
         get_clear_fault_map(gru, &imap, &dmap);
+        gru_dbg(grudev,
+                "cpu %d, chiplet %d, gid %d, imap %016lx %016lx, dmap %016lx %016lx\n",
+                smp_processor_id(), chiplet, gru->gs_gid,
+                imap.fault_bits[0], imap.fault_bits[1],
+                dmap.fault_bits[0], dmap.fault_bits[1]);
 
         for_each_cbr_in_tfm(cbrnum, dmap.fault_bits) {
-                complete(gru->gs_blade->bs_async_wq);
+                STAT(intr_cbr);
+                cmp = gru->gs_blade->bs_async_wq;
+                if (cmp)
+                        complete(cmp);
                 gru_dbg(grudev, "gid %d, cbr_done %d, done %d\n",
-                        gru->gs_gid, cbrnum, gru->gs_blade->bs_async_wq->done);
+                        gru->gs_gid, cbrnum, cmp ? cmp->done : -1);
         }
 
         for_each_cbr_in_tfm(cbrnum, imap.fault_bits) {
+                STAT(intr_tfh);
                 tfh = get_tfh_by_index(gru, cbrnum);
                 prefetchw(tfh); /* Helps on hdw, required for emulator */
 
@@ -492,14 +571,20 @@ irqreturn_t gru_intr(int irq, void *dev_id)
                 ctxnum = tfh->ctxnum;
                 gts = gru->gs_gts[ctxnum];
 
+                /* Spurious interrupts can cause this. Ignore. */
+                if (!gts) {
+                        STAT(intr_spurious);
+                        continue;
+                }
+
                 /*
                  * This is running in interrupt context. Trylock the mmap_sem.
                  * If it fails, retry the fault in user context.
                  */
+                gts->ustats.fmm_tlbmiss++;
                 if (!gts->ts_force_cch_reload &&
                                         down_read_trylock(&gts->ts_mm->mmap_sem)) {
-                        gts->ustats.fmm_tlbdropin++;
-                        gru_try_dropin(gts, tfh, NULL);
+                        gru_try_dropin(gru, gts, tfh, NULL);
                         up_read(&gts->ts_mm->mmap_sem);
                 } else {
                         tfh_user_polling_mode(tfh);
@@ -509,20 +594,43 @@ irqreturn_t gru_intr(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
+irqreturn_t gru0_intr(int irq, void *dev_id)
+{
+        return gru_intr(0, uv_numa_blade_id());
+}
+
+irqreturn_t gru1_intr(int irq, void *dev_id)
+{
+        return gru_intr(1, uv_numa_blade_id());
+}
+
+irqreturn_t gru_intr_mblade(int irq, void *dev_id)
+{
+        int blade;
+
+        for_each_possible_blade(blade) {
+                if (uv_blade_nr_possible_cpus(blade))
+                        continue;
+                 gru_intr(0, blade);
+                 gru_intr(1, blade);
+        }
+        return IRQ_HANDLED;
+}
+
 
 static int gru_user_dropin(struct gru_thread_state *gts,
                            struct gru_tlb_fault_handle *tfh,
-                           unsigned long __user *cb)
+                           void *cb)
 {
         struct gru_mm_struct *gms = gts->ts_gms;
         int ret;
 
-        gts->ustats.upm_tlbdropin++;
+        gts->ustats.upm_tlbmiss++;
         while (1) {
                 wait_event(gms->ms_wait_queue,
                            atomic_read(&gms->ms_range_active) == 0);
                 prefetchw(tfh); /* Helps on hdw, required for emulator */
-                ret = gru_try_dropin(gts, tfh, cb);
+                ret = gru_try_dropin(gts->ts_gru, gts, tfh, cb);
                 if (ret <= 0)
                         return ret;
                 STAT(call_os_wait_queue);
@@ -538,52 +646,41 @@ int gru_handle_user_call_os(unsigned long cb)
 {
         struct gru_tlb_fault_handle *tfh;
         struct gru_thread_state *gts;
-        unsigned long __user *cbp;
+        void *cbk;
         int ucbnum, cbrnum, ret = -EINVAL;
 
         STAT(call_os);
-        gru_dbg(grudev, "address 0x%lx\n", cb);
 
         /* sanity check the cb pointer */
         ucbnum = get_cb_number((void *)cb);
         if ((cb & (GRU_HANDLE_STRIDE - 1)) || ucbnum >= GRU_NUM_CB)
                 return -EINVAL;
-        cbp = (unsigned long *)cb;
 
         gts = gru_find_lock_gts(cb);
         if (!gts)
                 return -EINVAL;
+        gru_dbg(grudev, "address 0x%lx, gid %d, gts 0x%p\n", cb, gts->ts_gru ? gts->ts_gru->gs_gid : -1, gts);
 
         if (ucbnum >= gts->ts_cbr_au_count * GRU_CBR_AU_SIZE)
                 goto exit;
 
-        /*
-         * If force_unload is set, the UPM TLB fault is phony. The task
-         * has migrated to another node and the GSEG must be moved. Just
-         * unload the context. The task will page fault and assign a new
-         * context.
-         */
-        if (gts->ts_tgid_owner == current->tgid && gts->ts_blade >= 0 &&
-                                gts->ts_blade != uv_numa_blade_id()) {
-                STAT(call_os_offnode_reference);
-                gts->ts_force_unload = 1;
-        }
+        gru_check_context_placement(gts);
 
         /*
          * CCH may contain stale data if ts_force_cch_reload is set.
          */
         if (gts->ts_gru && gts->ts_force_cch_reload) {
                 gts->ts_force_cch_reload = 0;
-                gru_update_cch(gts, 0);
+                gru_update_cch(gts);
         }
 
         ret = -EAGAIN;
         cbrnum = thread_cbr_number(gts, ucbnum);
-        if (gts->ts_force_unload) {
-                gru_unload_context(gts, 1);
-        } else if (gts->ts_gru) {
+        if (gts->ts_gru) {
                 tfh = get_tfh_by_index(gts->ts_gru, cbrnum);
-                ret = gru_user_dropin(gts, tfh, cbp);
+                cbk = get_gseg_base_address_cb(gts->ts_gru->gs_gru_base_vaddr,
+                                gts->ts_ctxnum, ucbnum);
+                ret = gru_user_dropin(gts, tfh, cbk);
         }
 exit:
         gru_unlock_gts(gts);
@@ -605,11 +702,11 @@ int gru_get_exception_detail(unsigned long arg)
         if (copy_from_user(&excdet, (void __user *)arg, sizeof(excdet)))
                 return -EFAULT;
 
-        gru_dbg(grudev, "address 0x%lx\n", excdet.cb);
         gts = gru_find_lock_gts(excdet.cb);
         if (!gts)
                 return -EINVAL;
 
+        gru_dbg(grudev, "address 0x%lx, gid %d, gts 0x%p\n", excdet.cb, gts->ts_gru ? gts->ts_gru->gs_gid : -1, gts);
         ucbnum = get_cb_number((void *)excdet.cb);
         if (ucbnum >= gts->ts_cbr_au_count * GRU_CBR_AU_SIZE) {
                 ret = -EINVAL;
@@ -617,6 +714,7 @@ int gru_get_exception_detail(unsigned long arg)
                 cbrnum = thread_cbr_number(gts, ucbnum);
                 cbe = get_cbe_by_index(gts->ts_gru, cbrnum);
                 gru_flush_cache(cbe);   /* CBE not coherent */
+                sync_core();            /* make sure we are have current data */
                 excdet.opc = cbe->opccpy;
                 excdet.exopc = cbe->exopccpy;
                 excdet.ecause = cbe->ecause;
@@ -624,7 +722,7 @@ int gru_get_exception_detail(unsigned long arg)
                 excdet.exceptdet1 = cbe->idef3upd;
                 excdet.cbrstate = cbe->cbrstate;
                 excdet.cbrexecstatus = cbe->cbrexecstatus;
-                gru_flush_cache(cbe);
+                gru_flush_cache_cbe(cbe);
                 ret = 0;
         } else {
                 ret = -EAGAIN;
@@ -733,6 +831,11 @@ long gru_get_gseg_statistics(unsigned long arg)
         if (copy_from_user(&req, (void __user *)arg, sizeof(req)))
                 return -EFAULT;
 
+        /*
+         * The library creates arrays of contexts for threaded programs.
+         * If no gts exists in the array, the context has never been used & all
+         * statistics are implicitly 0.
+         */
         gts = gru_find_lock_gts(req.gseg);
         if (gts) {
                 memcpy(&req.stats, &gts->ustats, sizeof(gts->ustats));
@@ -762,11 +865,25 @@ int gru_set_context_option(unsigned long arg)
                 return -EFAULT;
         gru_dbg(grudev, "op %d, gseg 0x%lx, value1 0x%lx\n", req.op, req.gseg, req.val1);
 
-        gts = gru_alloc_locked_gts(req.gseg);
-        if (!gts)
-                return -EINVAL;
+        gts = gru_find_lock_gts(req.gseg);
+        if (!gts) {
+                gts = gru_alloc_locked_gts(req.gseg);
+                if (IS_ERR(gts))
+                        return PTR_ERR(gts);
+        }
 
         switch (req.op) {
+        case sco_blade_chiplet:
+                /* Select blade/chiplet for GRU context */
+                if (req.val1 < -1 || req.val1 >= GRU_MAX_BLADES || !gru_base[req.val1] ||
+                    req.val0 < -1 || req.val0 >= GRU_CHIPLETS_PER_HUB) {
+                        ret = -EINVAL;
+                } else {
+                        gts->ts_user_blade_id = req.val1;
+                        gts->ts_user_chiplet_id = req.val0;
+                        gru_check_context_placement(gts);
+                }
+                break;
         case sco_gseg_owner:
                 /* Register the current task as the GSEG owner */
                 gts->ts_tgid_owner = current->tgid;
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index ce5eda985ab0..cb3b4d228475 100644
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -35,6 +35,9 @@
 #include <linux/interrupt.h>
 #include <linux/proc_fs.h>
 #include <linux/uaccess.h>
+#ifdef CONFIG_X86_64
+#include <asm/uv/uv_irq.h>
+#endif
 #include <asm/uv/uv.h>
 #include "gru.h"
 #include "grulib.h"
@@ -130,7 +133,6 @@ static int gru_create_new_context(unsigned long arg)
         struct gru_vma_data *vdata;
         int ret = -EINVAL;
 
-
         if (copy_from_user(&req, (void __user *)arg, sizeof(req)))
                 return -EFAULT;
 
@@ -150,6 +152,7 @@ static int gru_create_new_context(unsigned long arg)
                 vdata->vd_dsr_au_count =
                     GRU_DS_BYTES_TO_AU(req.data_segment_bytes);
                 vdata->vd_cbr_au_count = GRU_CB_COUNT_TO_AU(req.control_blocks);
+                vdata->vd_tlb_preload_count = req.tlb_preload_count;
                 ret = 0;
         }
         up_write(&current->mm->mmap_sem);
@@ -190,7 +193,7 @@ static long gru_file_unlocked_ioctl(struct file *file, unsigned int req,
 {
         int err = -EBADRQC;
 
-        gru_dbg(grudev, "file %p\n", file);
+        gru_dbg(grudev, "file %p, req 0x%x, 0x%lx\n", file, req, arg);
 
         switch (req) {
         case GRU_CREATE_CONTEXT:
@@ -232,23 +235,24 @@ static long gru_file_unlocked_ioctl(struct file *file, unsigned int req,
  * system.
  */
 static void gru_init_chiplet(struct gru_state *gru, unsigned long paddr,
-                             void *vaddr, int nid, int bid, int grunum)
+                             void *vaddr, int blade_id, int chiplet_id)
 {
         spin_lock_init(&gru->gs_lock);
         spin_lock_init(&gru->gs_asid_lock);
         gru->gs_gru_base_paddr = paddr;
         gru->gs_gru_base_vaddr = vaddr;
-        gru->gs_gid = bid * GRU_CHIPLETS_PER_BLADE + grunum;
-        gru->gs_blade = gru_base[bid];
-        gru->gs_blade_id = bid;
+        gru->gs_gid = blade_id * GRU_CHIPLETS_PER_BLADE + chiplet_id;
+        gru->gs_blade = gru_base[blade_id];
+        gru->gs_blade_id = blade_id;
+        gru->gs_chiplet_id = chiplet_id;
         gru->gs_cbr_map = (GRU_CBR_AU == 64) ? ~0 : (1UL << GRU_CBR_AU) - 1;
         gru->gs_dsr_map = (1UL << GRU_DSR_AU) - 1;
         gru->gs_asid_limit = MAX_ASID;
         gru_tgh_flush_init(gru);
         if (gru->gs_gid >= gru_max_gids)
                 gru_max_gids = gru->gs_gid + 1;
-        gru_dbg(grudev, "bid %d, nid %d, gid %d, vaddr %p (0x%lx)\n",
-                bid, nid, gru->gs_gid, gru->gs_gru_base_vaddr,
+        gru_dbg(grudev, "bid %d, gid %d, vaddr %p (0x%lx)\n",
+                blade_id, gru->gs_gid, gru->gs_gru_base_vaddr,
                 gru->gs_gru_base_paddr);
 }
 
@@ -264,12 +268,10 @@ static int gru_init_tables(unsigned long gru_base_paddr, void *gru_base_vaddr)
 
         max_user_cbrs = GRU_NUM_CB;
         max_user_dsr_bytes = GRU_NUM_DSR_BYTES;
-        for_each_online_node(nid) {
-                bid = uv_node_to_blade_id(nid);
-                pnode = uv_node_to_pnode(nid);
-                if (bid < 0 || gru_base[bid])
-                        continue;
-                page = alloc_pages_exact_node(nid, GFP_KERNEL, order);
+        for_each_possible_blade(bid) {
+                pnode = uv_blade_to_pnode(bid);
+                nid = uv_blade_to_memory_nid(bid);/* -1 if no memory on blade */
+                page = alloc_pages_node(nid, GFP_KERNEL, order);
                 if (!page)
                         goto fail;
                 gru_base[bid] = page_address(page);
@@ -285,7 +287,7 @@ static int gru_init_tables(unsigned long gru_base_paddr, void *gru_base_vaddr)
                                 chip++, gru++) {
                         paddr = gru_chiplet_paddr(gru_base_paddr, pnode, chip);
                         vaddr = gru_chiplet_vaddr(gru_base_vaddr, pnode, chip);
-                        gru_init_chiplet(gru, paddr, vaddr, nid, bid, chip);
+                        gru_init_chiplet(gru, paddr, vaddr, bid, chip);
                         n = hweight64(gru->gs_cbr_map) * GRU_CBR_AU_SIZE;
                         cbrs = max(cbrs, n);
                         n = hweight64(gru->gs_dsr_map) * GRU_DSR_AU_BYTES;
@@ -298,39 +300,215 @@ static int gru_init_tables(unsigned long gru_base_paddr, void *gru_base_vaddr)
         return 0;
 
 fail:
-        for (nid--; nid >= 0; nid--)
-                free_pages((unsigned long)gru_base[nid], order);
+        for (bid--; bid >= 0; bid--)
+                free_pages((unsigned long)gru_base[bid], order);
         return -ENOMEM;
 }
 
-#ifdef CONFIG_IA64
+static void gru_free_tables(void)
+{
+        int bid;
+        int order = get_order(sizeof(struct gru_state) *
+                              GRU_CHIPLETS_PER_BLADE);
 
-static int get_base_irq(void)
+        for (bid = 0; bid < GRU_MAX_BLADES; bid++)
+                free_pages((unsigned long)gru_base[bid], order);
+}
+
+static unsigned long gru_chiplet_cpu_to_mmr(int chiplet, int cpu, int *corep)
 {
-        return IRQ_GRU;
+        unsigned long mmr = 0;
+        int core;
+
+        /*
+         * We target the cores of a blade and not the hyperthreads themselves.
+         * There is a max of 8 cores per socket and 2 sockets per blade,
+         * making for a max total of 16 cores (i.e., 16 CPUs without
+         * hyperthreading and 32 CPUs with hyperthreading).
+         */
+        core = uv_cpu_core_number(cpu) + UV_MAX_INT_CORES * uv_cpu_socket_number(cpu);
+        if (core >= GRU_NUM_TFM || uv_cpu_ht_number(cpu))
+                return 0;
+
+        if (chiplet == 0) {
+                mmr = UVH_GR0_TLB_INT0_CONFIG +
+                    core * (UVH_GR0_TLB_INT1_CONFIG - UVH_GR0_TLB_INT0_CONFIG);
+        } else if (chiplet == 1) {
+                mmr = UVH_GR1_TLB_INT0_CONFIG +
+                    core * (UVH_GR1_TLB_INT1_CONFIG - UVH_GR1_TLB_INT0_CONFIG);
+        } else {
+                BUG();
+        }
+
+        *corep = core;
+        return mmr;
 }
 
-#elif defined CONFIG_X86_64
+#ifdef CONFIG_IA64
 
-static void noop(unsigned int irq)
+static int gru_irq_count[GRU_CHIPLETS_PER_BLADE];
+
+static void gru_noop(unsigned int irq)
 {
 }
 
-static struct irq_chip gru_chip = {
-        .name           = "gru",
-        .mask           = noop,
-        .unmask         = noop,
-        .ack            = noop,
+static struct irq_chip gru_chip[GRU_CHIPLETS_PER_BLADE] = {
+        [0 ... GRU_CHIPLETS_PER_BLADE - 1] {
+                .mask           = gru_noop,
+                .unmask         = gru_noop,
+                .ack            = gru_noop
+        }
 };
 
-static int get_base_irq(void)
+static int gru_chiplet_setup_tlb_irq(int chiplet, char *irq_name,
+                        irq_handler_t irq_handler, int cpu, int blade)
+{
+        unsigned long mmr;
+        int irq = IRQ_GRU + chiplet;
+        int ret, core;
+
+        mmr = gru_chiplet_cpu_to_mmr(chiplet, cpu, &core);
+        if (mmr == 0)
+                return 0;
+
+        if (gru_irq_count[chiplet] == 0) {
+                gru_chip[chiplet].name = irq_name;
+                ret = set_irq_chip(irq, &gru_chip[chiplet]);
+                if (ret) {
+                        printk(KERN_ERR "%s: set_irq_chip failed, errno=%d\n",
+                               GRU_DRIVER_ID_STR, -ret);
+                        return ret;
+                }
+
+                ret = request_irq(irq, irq_handler, 0, irq_name, NULL);
+                if (ret) {
+                        printk(KERN_ERR "%s: request_irq failed, errno=%d\n",
+                               GRU_DRIVER_ID_STR, -ret);
+                        return ret;
+                }
+        }
+        gru_irq_count[chiplet]++;
+
+        return 0;
+}
+
+static void gru_chiplet_teardown_tlb_irq(int chiplet, int cpu, int blade)
+{
+        unsigned long mmr;
+        int core, irq = IRQ_GRU + chiplet;
+
+        if (gru_irq_count[chiplet] == 0)
+                return;
+
+        mmr = gru_chiplet_cpu_to_mmr(chiplet, cpu, &core);
+        if (mmr == 0)
+                return;
+
+        if (--gru_irq_count[chiplet] == 0)
+                free_irq(irq, NULL);
+}
+
+#elif defined CONFIG_X86_64
+
+static int gru_chiplet_setup_tlb_irq(int chiplet, char *irq_name,
+                        irq_handler_t irq_handler, int cpu, int blade)
+{
+        unsigned long mmr;
+        int irq, core;
+        int ret;
+
+        mmr = gru_chiplet_cpu_to_mmr(chiplet, cpu, &core);
+        if (mmr == 0)
+                return 0;
+
+        irq = uv_setup_irq(irq_name, cpu, blade, mmr, UV_AFFINITY_CPU);
+        if (irq < 0) {
+                printk(KERN_ERR "%s: uv_setup_irq failed, errno=%d\n",
+                       GRU_DRIVER_ID_STR, -irq);
+                return irq;
+        }
+
+        ret = request_irq(irq, irq_handler, 0, irq_name, NULL);
+        if (ret) {
+                uv_teardown_irq(irq);
+                printk(KERN_ERR "%s: request_irq failed, errno=%d\n",
+                       GRU_DRIVER_ID_STR, -ret);
+                return ret;
+        }
+        gru_base[blade]->bs_grus[chiplet].gs_irq[core] = irq;
+        return 0;
+}
+
+static void gru_chiplet_teardown_tlb_irq(int chiplet, int cpu, int blade)
 {
-        set_irq_chip(IRQ_GRU, &gru_chip);
-        set_irq_chip(IRQ_GRU + 1, &gru_chip);
-        return IRQ_GRU;
+        int irq, core;
+        unsigned long mmr;
+
+        mmr = gru_chiplet_cpu_to_mmr(chiplet, cpu, &core);
+        if (mmr) {
+                irq = gru_base[blade]->bs_grus[chiplet].gs_irq[core];
+                if (irq) {
+                        free_irq(irq, NULL);
+                        uv_teardown_irq(irq);
+                }
+        }
 }
+
 #endif
 
+static void gru_teardown_tlb_irqs(void)
+{
+        int blade;
+        int cpu;
+
+        for_each_online_cpu(cpu) {
+                blade = uv_cpu_to_blade_id(cpu);
+                gru_chiplet_teardown_tlb_irq(0, cpu, blade);
+                gru_chiplet_teardown_tlb_irq(1, cpu, blade);
+        }
+        for_each_possible_blade(blade) {
+                if (uv_blade_nr_possible_cpus(blade))
+                        continue;
+                gru_chiplet_teardown_tlb_irq(0, 0, blade);
+                gru_chiplet_teardown_tlb_irq(1, 0, blade);
+        }
+}
+
+static int gru_setup_tlb_irqs(void)
+{
+        int blade;
+        int cpu;
+        int ret;
+
+        for_each_online_cpu(cpu) {
+                blade = uv_cpu_to_blade_id(cpu);
+                ret = gru_chiplet_setup_tlb_irq(0, "GRU0_TLB", gru0_intr, cpu, blade);
+                if (ret != 0)
+                        goto exit1;
+
+                ret = gru_chiplet_setup_tlb_irq(1, "GRU1_TLB", gru1_intr, cpu, blade);
+                if (ret != 0)
+                        goto exit1;
+        }
+        for_each_possible_blade(blade) {
+                if (uv_blade_nr_possible_cpus(blade))
+                        continue;
+                ret = gru_chiplet_setup_tlb_irq(0, "GRU0_TLB", gru_intr_mblade, 0, blade);
+                if (ret != 0)
+                        goto exit1;
+
+                ret = gru_chiplet_setup_tlb_irq(1, "GRU1_TLB", gru_intr_mblade, 0, blade);
+                if (ret != 0)
+                        goto exit1;
+        }
+
+        return 0;
+
+exit1:
+        gru_teardown_tlb_irqs();
+        return ret;
+}
+
 /*
  * gru_init
  *
@@ -338,8 +516,7 @@ static int get_base_irq(void)
  */
 static int __init gru_init(void)
 {
-        int ret, irq, chip;
-        char id[10];
+        int ret;
 
         if (!is_uv_system())
                 return 0;
@@ -354,41 +531,29 @@ static int __init gru_init(void)
         gru_end_paddr = gru_start_paddr + GRU_MAX_BLADES * GRU_SIZE;
         printk(KERN_INFO "GRU space: 0x%lx - 0x%lx\n",
                gru_start_paddr, gru_end_paddr);
-        irq = get_base_irq();
-        for (chip = 0; chip < GRU_CHIPLETS_PER_BLADE; chip++) {
-                ret = request_irq(irq + chip, gru_intr, 0, id, NULL);
-                /* TODO: fix irq handling on x86. For now ignore failure because
-                 * interrupts are not required & not yet fully supported */
-                if (ret) {
-                        printk(KERN_WARNING
-                               "!!!WARNING: GRU ignoring request failure!!!\n");
-                        ret = 0;
-                }
-                if (ret) {
-                        printk(KERN_ERR "%s: request_irq failed\n",
-                               GRU_DRIVER_ID_STR);
-                        goto exit1;
-                }
-        }
-
         ret = misc_register(&gru_miscdev);
         if (ret) {
                 printk(KERN_ERR "%s: misc_register failed\n",
                        GRU_DRIVER_ID_STR);
-                goto exit1;
+                goto exit0;
         }
 
         ret = gru_proc_init();
         if (ret) {
                 printk(KERN_ERR "%s: proc init failed\n", GRU_DRIVER_ID_STR);
-                goto exit2;
+                goto exit1;
         }
 
         ret = gru_init_tables(gru_start_paddr, gru_start_vaddr);
         if (ret) {
                 printk(KERN_ERR "%s: init tables failed\n", GRU_DRIVER_ID_STR);
-                goto exit3;
+                goto exit2;
         }
+
+        ret = gru_setup_tlb_irqs();
+        if (ret != 0)
+                goto exit3;
+
         gru_kservices_init();
 
         printk(KERN_INFO "%s: v%s\n", GRU_DRIVER_ID_STR,
@@ -396,31 +561,24 @@ static int __init gru_init(void)
         return 0;
 
 exit3:
-        gru_proc_exit();
+        gru_free_tables();
 exit2:
-        misc_deregister(&gru_miscdev);
+        gru_proc_exit();
 exit1:
-        for (--chip; chip >= 0; chip--)
-                free_irq(irq + chip, NULL);
+        misc_deregister(&gru_miscdev);
+exit0:
         return ret;
 
 }
 
 static void __exit gru_exit(void)
 {
-        int i, bid;
-        int order = get_order(sizeof(struct gru_state) *
-                              GRU_CHIPLETS_PER_BLADE);
-
         if (!is_uv_system())
                 return;
 
-        for (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++)
-                free_irq(IRQ_GRU + i, NULL);
+        gru_teardown_tlb_irqs();
         gru_kservices_exit();
-        for (bid = 0; bid < GRU_MAX_BLADES; bid++)
-                free_pages((unsigned long)gru_base[bid], order);
-
+        gru_free_tables();
         misc_deregister(&gru_miscdev);
         gru_proc_exit();
 }
diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
index 37e7cfc53b9c..2f30badc6ffd 100644
--- a/drivers/misc/sgi-gru/gruhandles.c
+++ b/drivers/misc/sgi-gru/gruhandles.c
@@ -27,9 +27,11 @@
 #ifdef CONFIG_IA64
 #include <asm/processor.h>
 #define GRU_OPERATION_TIMEOUT   (((cycles_t) local_cpu_data->itc_freq)*10)
+#define CLKS2NSEC(c)            ((c) *1000000000 / local_cpu_data->itc_freq)
 #else
 #include <asm/tsc.h>
 #define GRU_OPERATION_TIMEOUT   ((cycles_t) tsc_khz*10*1000)
+#define CLKS2NSEC(c)            ((c) * 1000000 / tsc_khz)
 #endif
 
 /* Extract the status field from a kernel handle */
@@ -39,21 +41,39 @@ struct mcs_op_statistic mcs_op_statistics[mcsop_last];
 
 static void update_mcs_stats(enum mcs_op op, unsigned long clks)
 {
+        unsigned long nsec;
+
+        nsec = CLKS2NSEC(clks);
         atomic_long_inc(&mcs_op_statistics[op].count);
-        atomic_long_add(clks, &mcs_op_statistics[op].total);
-        if (mcs_op_statistics[op].max < clks)
-                mcs_op_statistics[op].max = clks;
+        atomic_long_add(nsec, &mcs_op_statistics[op].total);
+        if (mcs_op_statistics[op].max < nsec)
+                mcs_op_statistics[op].max = nsec;
 }
 
 static void start_instruction(void *h)
 {
         unsigned long *w0 = h;
 
-        wmb();          /* setting CMD bit must be last */
-        *w0 = *w0 | 1;
+        wmb();          /* setting CMD/STATUS bits must be last */
+        *w0 = *w0 | 0x20001;
         gru_flush_cache(h);
 }
 
+static void report_instruction_timeout(void *h)
+{
+        unsigned long goff = GSEGPOFF((unsigned long)h);
+        char *id = "???";
+
+        if (TYPE_IS(CCH, goff))
+                id = "CCH";
+        else if (TYPE_IS(TGH, goff))
+                id = "TGH";
+        else if (TYPE_IS(TFH, goff))
+                id = "TFH";
+
+        panic(KERN_ALERT "GRU %p (%s) is malfunctioning\n", h, id);
+}
+
 static int wait_instruction_complete(void *h, enum mcs_op opc)
 {
         int status;
@@ -64,9 +84,10 @@ static int wait_instruction_complete(void *h, enum mcs_op opc)
                 status = GET_MSEG_HANDLE_STATUS(h);
                 if (status != CCHSTATUS_ACTIVE)
                         break;
-                if (GRU_OPERATION_TIMEOUT < (get_cycles() - start_time))
-                        panic("GRU %p is malfunctioning: start %ld, end %ld\n",
-                              h, start_time, (unsigned long)get_cycles());
+                if (GRU_OPERATION_TIMEOUT < (get_cycles() - start_time)) {
+                        report_instruction_timeout(h);
+                        start_time = get_cycles();
+                }
         }
         if (gru_options & OPT_STATS)
                 update_mcs_stats(opc, get_cycles() - start_time);
@@ -75,9 +96,18 @@ static int wait_instruction_complete(void *h, enum mcs_op opc)
 
 int cch_allocate(struct gru_context_configuration_handle *cch)
 {
+        int ret;
+
         cch->opc = CCHOP_ALLOCATE;
         start_instruction(cch);
-        return wait_instruction_complete(cch, cchop_allocate);
+        ret = wait_instruction_complete(cch, cchop_allocate);
+
+        /*
+         * Stop speculation into the GSEG being mapped by the previous ALLOCATE.
+         * The GSEG memory does not exist until the ALLOCATE completes.
+         */
+        sync_core();
+        return ret;
 }
 
 int cch_start(struct gru_context_configuration_handle *cch)
@@ -96,9 +126,18 @@ int cch_interrupt(struct gru_context_configuration_handle *cch)
 
 int cch_deallocate(struct gru_context_configuration_handle *cch)
 {
+        int ret;
+
         cch->opc = CCHOP_DEALLOCATE;
         start_instruction(cch);
-        return wait_instruction_complete(cch, cchop_deallocate);
+        ret = wait_instruction_complete(cch, cchop_deallocate);
+
+        /*
+         * Stop speculation into the GSEG being unmapped by the previous
+         * DEALLOCATE.
+         */
+        sync_core();
+        return ret;
 }
 
 int cch_interrupt_sync(struct gru_context_configuration_handle
@@ -126,17 +165,20 @@ int tgh_invalidate(struct gru_tlb_global_handle *tgh,
         return wait_instruction_complete(tgh, tghop_invalidate);
 }
 
-void tfh_write_only(struct gru_tlb_fault_handle *tfh,
-                                  unsigned long pfn, unsigned long vaddr,
-                                  int asid, int dirty, int pagesize)
+int tfh_write_only(struct gru_tlb_fault_handle *tfh,
+                                  unsigned long paddr, int gaa,
+                                  unsigned long vaddr, int asid, int dirty,
+                                  int pagesize)
 {
         tfh->fillasid = asid;
         tfh->fillvaddr = vaddr;
-        tfh->pfn = pfn;
+        tfh->pfn = paddr >> GRU_PADDR_SHIFT;
+        tfh->gaa = gaa;
         tfh->dirty = dirty;
         tfh->pagesize = pagesize;
         tfh->opc = TFHOP_WRITE_ONLY;
         start_instruction(tfh);
+        return wait_instruction_complete(tfh, tfhop_write_only);
 }
 
 void tfh_write_restart(struct gru_tlb_fault_handle *tfh,
diff --git a/drivers/misc/sgi-gru/gruhandles.h b/drivers/misc/sgi-gru/gruhandles.h
index f44112242d00..3f998b924d8f 100644
--- a/drivers/misc/sgi-gru/gruhandles.h
+++ b/drivers/misc/sgi-gru/gruhandles.h
@@ -91,6 +91,12 @@
 /* Convert an arbitrary handle address to the beginning of the GRU segment */
 #define GRUBASE(h)              ((void *)((unsigned long)(h) & ~(GRU_SIZE - 1)))
 
+/* Test a valid handle address to determine the type */
+#define TYPE_IS(hn, h)          ((h) >= GRU_##hn##_BASE && (h) <        \
+                GRU_##hn##_BASE + GRU_NUM_##hn * GRU_HANDLE_STRIDE &&   \
+                (((h) & (GRU_HANDLE_STRIDE - 1)) == 0))
+
+
 /* General addressing macros. */
 static inline void *get_gseg_base_address(void *base, int ctxnum)
 {
@@ -158,6 +164,16 @@ static inline void *gru_chiplet_vaddr(void *vaddr, int pnode, int chiplet)
         return vaddr + GRU_SIZE * (2 * pnode  + chiplet);
 }
 
+static inline struct gru_control_block_extended *gru_tfh_to_cbe(
+                                        struct gru_tlb_fault_handle *tfh)
+{
+        unsigned long cbe;
+
+        cbe = (unsigned long)tfh - GRU_TFH_BASE + GRU_CBE_BASE;
+        return (struct gru_control_block_extended*)cbe;
+}
+
+
 
 
 /*
@@ -236,6 +252,17 @@ enum gru_tgh_state {
         TGHSTATE_RESTART_CTX,
 };
 
+enum gru_tgh_cause {
+        TGHCAUSE_RR_ECC,
+        TGHCAUSE_TLB_ECC,
+        TGHCAUSE_LRU_ECC,
+        TGHCAUSE_PS_ECC,
+        TGHCAUSE_MUL_ERR,
+        TGHCAUSE_DATA_ERR,
+        TGHCAUSE_SW_FORCE
+};
+
+
 /*
  * TFH - TLB Global Handle
  *      Used for TLB dropins into the GRU TLB.
@@ -440,6 +467,12 @@ struct gru_control_block_extended {
         unsigned int cbrexecstatus:8;
 };
 
+/* CBE fields for active BCOPY instructions */
+#define cbe_baddr0      idef1upd
+#define cbe_baddr1      idef3upd
+#define cbe_src_cl      idef6cpy
+#define cbe_nelemcur    idef5upd
+
 enum gru_cbr_state {
         CBRSTATE_INACTIVE,
         CBRSTATE_IDLE,
@@ -487,8 +520,8 @@ int cch_interrupt_sync(struct gru_context_configuration_handle *cch);
 int tgh_invalidate(struct gru_tlb_global_handle *tgh, unsigned long vaddr,
         unsigned long vaddrmask, int asid, int pagesize, int global, int n,
         unsigned short ctxbitmap);
-void tfh_write_only(struct gru_tlb_fault_handle *tfh, unsigned long pfn,
-        unsigned long vaddr, int asid, int dirty, int pagesize);
+int tfh_write_only(struct gru_tlb_fault_handle *tfh, unsigned long paddr,
+        int gaa, unsigned long vaddr, int asid, int dirty, int pagesize);
 void tfh_write_restart(struct gru_tlb_fault_handle *tfh, unsigned long paddr,
         int gaa, unsigned long vaddr, int asid, int dirty, int pagesize);
 void tfh_restart(struct gru_tlb_fault_handle *tfh);
diff --git a/drivers/misc/sgi-gru/grukdump.c b/drivers/misc/sgi-gru/grukdump.c
index 55eabfa85585..9b2062d17327 100644
--- a/drivers/misc/sgi-gru/grukdump.c
+++ b/drivers/misc/sgi-gru/grukdump.c
@@ -44,7 +44,8 @@ static int gru_user_copy_handle(void __user **dp, void *s)
 
 static int gru_dump_context_data(void *grubase,
                         struct gru_context_configuration_handle *cch,
-                        void __user *ubuf, int ctxnum, int dsrcnt)
+                        void __user *ubuf, int ctxnum, int dsrcnt,
+                        int flush_cbrs)
 {
         void *cb, *cbe, *tfh, *gseg;
         int i, scr;
@@ -55,6 +56,8 @@ static int gru_dump_context_data(void *grubase,
         tfh = grubase + GRU_TFH_BASE;
 
         for_each_cbr_in_allocation_map(i, &cch->cbr_allocation_map, scr) {
+                if (flush_cbrs)
+                        gru_flush_cache(cb);
                 if (gru_user_copy_handle(&ubuf, cb))
                         goto fail;
                 if (gru_user_copy_handle(&ubuf, tfh + i * GRU_HANDLE_STRIDE))
@@ -115,7 +118,7 @@ fail:
 
 static int gru_dump_context(struct gru_state *gru, int ctxnum,
                 void __user *ubuf, void __user *ubufend, char data_opt,
-                char lock_cch)
+                char lock_cch, char flush_cbrs)
 {
         struct gru_dump_context_header hdr;
         struct gru_dump_context_header __user *uhdr = ubuf;
@@ -159,8 +162,7 @@ static int gru_dump_context(struct gru_state *gru, int ctxnum,
                         ret = -EFBIG;
                 else
                         ret = gru_dump_context_data(grubase, cch, ubuf, ctxnum,
-                                                        dsrcnt);
-
+                                                        dsrcnt, flush_cbrs);
         }
         if (cch_locked)
                 unlock_cch_handle(cch);
@@ -215,7 +217,8 @@ int gru_dump_chiplet_request(unsigned long arg)
         for (ctxnum = 0; ctxnum < GRU_NUM_CCH; ctxnum++) {
                 if (req.ctxnum == ctxnum || req.ctxnum < 0) {
                         ret = gru_dump_context(gru, ctxnum, ubuf, ubufend,
-                                                req.data_opt, req.lock_cch);
+                                                req.data_opt, req.lock_cch,
+                                                req.flush_cbrs);
                         if (ret < 0)
                                 goto fail;
                         ubuf += ret;
diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c
index 766e21e15574..34749ee88dfa 100644
--- a/drivers/misc/sgi-gru/grukservices.c
+++ b/drivers/misc/sgi-gru/grukservices.c
@@ -31,6 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/uaccess.h>
 #include <linux/delay.h>
+#include <asm/io_apic.h>
 #include "gru.h"
 #include "grulib.h"
 #include "grutables.h"
@@ -97,9 +98,6 @@
 #define ASYNC_HAN_TO_BID(h)     ((h) - 1)
 #define ASYNC_BID_TO_HAN(b)     ((b) + 1)
 #define ASYNC_HAN_TO_BS(h)      gru_base[ASYNC_HAN_TO_BID(h)]
-#define KCB_TO_GID(cb)          ((cb - gru_start_vaddr) /               \
-                                        (GRU_SIZE * GRU_CHIPLETS_PER_BLADE))
-#define KCB_TO_BS(cb)           gru_base[KCB_TO_GID(cb)]
 
 #define GRU_NUM_KERNEL_CBR      1
 #define GRU_NUM_KERNEL_DSR_BYTES 256
@@ -160,8 +158,10 @@ static void gru_load_kernel_context(struct gru_blade_state *bs, int blade_id)
         up_read(&bs->bs_kgts_sema);
         down_write(&bs->bs_kgts_sema);
 
-        if (!bs->bs_kgts)
-                bs->bs_kgts = gru_alloc_gts(NULL, 0, 0, 0, 0);
+        if (!bs->bs_kgts) {
+                bs->bs_kgts = gru_alloc_gts(NULL, 0, 0, 0, 0, 0);
+                bs->bs_kgts->ts_user_blade_id = blade_id;
+        }
         kgts = bs->bs_kgts;
 
         if (!kgts->ts_gru) {
@@ -172,9 +172,9 @@ static void gru_load_kernel_context(struct gru_blade_state *bs, int blade_id)
                 kgts->ts_dsr_au_count = GRU_DS_BYTES_TO_AU(
                         GRU_NUM_KERNEL_DSR_BYTES * ncpus +
                                 bs->bs_async_dsr_bytes);
-                while (!gru_assign_gru_context(kgts, blade_id)) {
+                while (!gru_assign_gru_context(kgts)) {
                         msleep(1);
-                        gru_steal_context(kgts, blade_id);
+                        gru_steal_context(kgts);
                 }
                 gru_load_context(kgts);
                 gru = bs->bs_kgts->ts_gru;
@@ -200,13 +200,15 @@ static int gru_free_kernel_contexts(void)
                 bs = gru_base[bid];
                 if (!bs)
                         continue;
+
+                /* Ignore busy contexts. Don't want to block here.  */
                 if (down_write_trylock(&bs->bs_kgts_sema)) {
                         kgts = bs->bs_kgts;
                         if (kgts && kgts->ts_gru)
                                 gru_unload_context(kgts, 0);
-                        kfree(kgts);
                         bs->bs_kgts = NULL;
                         up_write(&bs->bs_kgts_sema);
+                        kfree(kgts);
                 } else {
                         ret++;
                 }
@@ -220,13 +222,21 @@ static int gru_free_kernel_contexts(void)
 static struct gru_blade_state *gru_lock_kernel_context(int blade_id)
 {
         struct gru_blade_state *bs;
+        int bid;
 
         STAT(lock_kernel_context);
-        bs = gru_base[blade_id];
+again:
+        bid = blade_id < 0 ? uv_numa_blade_id() : blade_id;
+        bs = gru_base[bid];
 
+        /* Handle the case where migration occured while waiting for the sema */
         down_read(&bs->bs_kgts_sema);
+        if (blade_id < 0 && bid != uv_numa_blade_id()) {
+                up_read(&bs->bs_kgts_sema);
+                goto again;
+        }
         if (!bs->bs_kgts || !bs->bs_kgts->ts_gru)
-                gru_load_kernel_context(bs, blade_id);
+                gru_load_kernel_context(bs, bid);
         return bs;
 
 }
@@ -255,7 +265,7 @@ static int gru_get_cpu_resources(int dsr_bytes, void **cb, void **dsr)
 
         BUG_ON(dsr_bytes > GRU_NUM_KERNEL_DSR_BYTES);
         preempt_disable();
-        bs = gru_lock_kernel_context(uv_numa_blade_id());
+        bs = gru_lock_kernel_context(-1);
         lcpu = uv_blade_processor_id();
         *cb = bs->kernel_cb + lcpu * GRU_HANDLE_STRIDE;
         *dsr = bs->kernel_dsr + lcpu * GRU_NUM_KERNEL_DSR_BYTES;
@@ -384,13 +394,31 @@ int gru_get_cb_exception_detail(void *cb,
                 struct control_block_extended_exc_detail *excdet)
 {
         struct gru_control_block_extended *cbe;
-        struct gru_blade_state *bs;
-        int cbrnum;
-
-        bs = KCB_TO_BS(cb);
-        cbrnum = thread_cbr_number(bs->bs_kgts, get_cb_number(cb));
+        struct gru_thread_state *kgts = NULL;
+        unsigned long off;
+        int cbrnum, bid;
+
+        /*
+         * Locate kgts for cb. This algorithm is SLOW but
+         * this function is rarely called (ie., almost never).
+         * Performance does not matter.
+         */
+        for_each_possible_blade(bid) {
+                if (!gru_base[bid])
+                        break;
+                kgts = gru_base[bid]->bs_kgts;
+                if (!kgts || !kgts->ts_gru)
+                        continue;
+                off = cb - kgts->ts_gru->gs_gru_base_vaddr;
+                if (off < GRU_SIZE)
+                        break;
+                kgts = NULL;
+        }
+        BUG_ON(!kgts);
+        cbrnum = thread_cbr_number(kgts, get_cb_number(cb));
         cbe = get_cbe(GRUBASE(cb), cbrnum);
         gru_flush_cache(cbe);   /* CBE not coherent */
+        sync_core();
         excdet->opc = cbe->opccpy;
         excdet->exopc = cbe->exopccpy;
         excdet->ecause = cbe->ecause;
@@ -409,8 +437,8 @@ char *gru_get_cb_exception_detail_str(int ret, void *cb,
         if (ret > 0 && gen->istatus == CBS_EXCEPTION) {
                 gru_get_cb_exception_detail(cb, &excdet);
                 snprintf(buf, size,
-                        "GRU exception: cb %p, opc %d, exopc %d, ecause 0x%x,"
-                        "excdet0 0x%lx, excdet1 0x%x",
+                        "GRU:%d exception: cb %p, opc %d, exopc %d, ecause 0x%x,"
+                        "excdet0 0x%lx, excdet1 0x%x", smp_processor_id(),
                         gen, excdet.opc, excdet.exopc, excdet.ecause,
                         excdet.exceptdet0, excdet.exceptdet1);
         } else {
@@ -457,9 +485,10 @@ int gru_check_status_proc(void *cb)
         int ret;
 
         ret = gen->istatus;
-        if (ret != CBS_EXCEPTION)
-                return ret;
-        return gru_retry_exception(cb);
+        if (ret == CBS_EXCEPTION)
+                ret = gru_retry_exception(cb);
+        rmb();
+        return ret;
 
 }
 
@@ -471,7 +500,7 @@ int gru_wait_proc(void *cb)
         ret = gru_wait_idle_or_exception(gen);
         if (ret == CBS_EXCEPTION)
                 ret = gru_retry_exception(cb);
-
+        rmb();
         return ret;
 }
 
@@ -538,7 +567,7 @@ int gru_create_message_queue(struct gru_message_queue_desc *mqd,
         mqd->mq = mq;
         mqd->mq_gpa = uv_gpa(mq);
         mqd->qlines = qlines;
-        mqd->interrupt_pnode = UV_NASID_TO_PNODE(nasid);
+        mqd->interrupt_pnode = nasid >> 1;
         mqd->interrupt_vector = vector;
         mqd->interrupt_apicid = apicid;
         return 0;
@@ -598,6 +627,8 @@ static int send_noop_message(void *cb, struct gru_message_queue_desc *mqd,
                                 ret = MQE_UNEXPECTED_CB_ERR;
                         break;
                 case CBSS_PAGE_OVERFLOW:
+                        STAT(mesq_noop_page_overflow);
+                        /* fallthru */
                 default:
                         BUG();
                 }
@@ -673,18 +704,6 @@ cberr:
 }
 
 /*
- * Send a cross-partition interrupt to the SSI that contains the target
- * message queue. Normally, the interrupt is automatically delivered by hardware
- * but some error conditions require explicit delivery.
- */
-static void send_message_queue_interrupt(struct gru_message_queue_desc *mqd)
-{
-        if (mqd->interrupt_vector)
-                uv_hub_send_ipi(mqd->interrupt_pnode, mqd->interrupt_apicid,
-                                mqd->interrupt_vector);
-}
-
-/*
  * Handle a PUT failure. Note: if message was a 2-line message, one of the
  * lines might have successfully have been written. Before sending the
  * message, "present" must be cleared in BOTH lines to prevent the receiver
@@ -693,7 +712,8 @@ static void send_message_queue_interrupt(struct gru_message_queue_desc *mqd)
 static int send_message_put_nacked(void *cb, struct gru_message_queue_desc *mqd,
                         void *mesg, int lines)
 {
-        unsigned long m;
+        unsigned long m, *val = mesg, gpa, save;
+        int ret;
 
         m = mqd->mq_gpa + (gru_get_amo_value_head(cb) << 6);
         if (lines == 2) {
@@ -704,7 +724,26 @@ static int send_message_put_nacked(void *cb, struct gru_message_queue_desc *mqd,
         gru_vstore(cb, m, gru_get_tri(mesg), XTYPE_CL, lines, 1, IMA);
         if (gru_wait(cb) != CBS_IDLE)
                 return MQE_UNEXPECTED_CB_ERR;
-        send_message_queue_interrupt(mqd);
+
+        if (!mqd->interrupt_vector)
+                return MQE_OK;
+
+        /*
+         * Send a cross-partition interrupt to the SSI that contains the target
+         * message queue. Normally, the interrupt is automatically delivered by
+         * hardware but some error conditions require explicit delivery.
+         * Use the GRU to deliver the interrupt. Otherwise partition failures
+         * could cause unrecovered errors.
+         */
+        gpa = uv_global_gru_mmr_address(mqd->interrupt_pnode, UVH_IPI_INT);
+        save = *val;
+        *val = uv_hub_ipi_value(mqd->interrupt_apicid, mqd->interrupt_vector,
+                                dest_Fixed);
+        gru_vstore_phys(cb, gpa, gru_get_tri(mesg), IAA_REGISTER, IMA);
+        ret = gru_wait(cb);
+        *val = save;
+        if (ret != CBS_IDLE)
+                return MQE_UNEXPECTED_CB_ERR;
         return MQE_OK;
 }
 
@@ -739,6 +778,9 @@ static int send_message_failure(void *cb, struct gru_message_queue_desc *mqd,
                 STAT(mesq_send_put_nacked);
                 ret = send_message_put_nacked(cb, mqd, mesg, lines);
                 break;
+        case CBSS_PAGE_OVERFLOW:
+                STAT(mesq_page_overflow);
+                /* fallthru */
         default:
                 BUG();
         }
@@ -831,7 +873,6 @@ void *gru_get_next_message(struct gru_message_queue_desc *mqd)
         int present = mhdr->present;
 
         /* skip NOOP messages */
-        STAT(mesq_receive);
         while (present == MQS_NOOP) {
                 gru_free_message(mqd, mhdr);
                 mhdr = mq->next;
@@ -851,6 +892,7 @@ void *gru_get_next_message(struct gru_message_queue_desc *mqd)
         if (mhdr->lines == 2)
                 restore_present2(mhdr, mhdr->present2);
 
+        STAT(mesq_receive);
         return mhdr;
 }
 EXPORT_SYMBOL_GPL(gru_get_next_message);
@@ -858,6 +900,29 @@ EXPORT_SYMBOL_GPL(gru_get_next_message);
 /* ---------------------- GRU DATA COPY FUNCTIONS ---------------------------*/
 
 /*
+ * Load a DW from a global GPA. The GPA can be a memory or MMR address.
+ */
+int gru_read_gpa(unsigned long *value, unsigned long gpa)
+{
+        void *cb;
+        void *dsr;
+        int ret, iaa;
+
+        STAT(read_gpa);
+        if (gru_get_cpu_resources(GRU_NUM_KERNEL_DSR_BYTES, &cb, &dsr))
+                return MQE_BUG_NO_RESOURCES;
+        iaa = gpa >> 62;
+        gru_vload_phys(cb, gpa, gru_get_tri(dsr), iaa, IMA);
+        ret = gru_wait(cb);
+        if (ret == CBS_IDLE)
+                *value = *(unsigned long *)dsr;
+        gru_free_cpu_resources(cb, dsr);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(gru_read_gpa);
+
+
+/*
  * Copy a block of data using the GRU resources
  */
 int gru_copy_gpa(unsigned long dest_gpa, unsigned long src_gpa,
@@ -898,24 +963,24 @@ static int quicktest0(unsigned long arg)
 
         gru_vload(cb, uv_gpa(&word0), gru_get_tri(dsr), XTYPE_DW, 1, 1, IMA);
         if (gru_wait(cb) != CBS_IDLE) {
-                printk(KERN_DEBUG "GRU quicktest0: CBR failure 1\n");
+                printk(KERN_DEBUG "GRU:%d quicktest0: CBR failure 1\n", smp_processor_id());
                 goto done;
         }
 
         if (*p != MAGIC) {
-                printk(KERN_DEBUG "GRU: quicktest0 bad magic 0x%lx\n", *p);
+                printk(KERN_DEBUG "GRU:%d quicktest0 bad magic 0x%lx\n", smp_processor_id(), *p);
                 goto done;
         }
         gru_vstore(cb, uv_gpa(&word1), gru_get_tri(dsr), XTYPE_DW, 1, 1, IMA);
         if (gru_wait(cb) != CBS_IDLE) {
-                printk(KERN_DEBUG "GRU quicktest0: CBR failure 2\n");
+                printk(KERN_DEBUG "GRU:%d quicktest0: CBR failure 2\n", smp_processor_id());
                 goto done;
         }
 
         if (word0 != word1 || word1 != MAGIC) {
                 printk(KERN_DEBUG
-                       "GRU quicktest0 err: found 0x%lx, expected 0x%lx\n",
-                     word1, MAGIC);
+                       "GRU:%d quicktest0 err: found 0x%lx, expected 0x%lx\n",
+                     smp_processor_id(), word1, MAGIC);
                 goto done;
         }
         ret = 0;
@@ -952,8 +1017,11 @@ static int quicktest1(unsigned long arg)
                 if (ret)
                         break;
         }
-        if (ret != MQE_QUEUE_FULL || i != 4)
+        if (ret != MQE_QUEUE_FULL || i != 4) {
+                printk(KERN_DEBUG "GRU:%d quicktest1: unexpect status %d, i %d\n",
+                       smp_processor_id(), ret, i);
                 goto done;
+        }
 
         for (i = 0; i < 6; i++) {
                 m = gru_get_next_message(&mqd);
@@ -961,7 +1029,12 @@ static int quicktest1(unsigned long arg)
                         break;
                 gru_free_message(&mqd, m);
         }
-        ret = (i == 4) ? 0 : -EIO;
+        if (i != 4) {
+                printk(KERN_DEBUG "GRU:%d quicktest2: bad message, i %d, m %p, m8 %d\n",
+                        smp_processor_id(), i, m, m ? m[8] : -1);
+                goto done;
+        }
+        ret = 0;
 
 done:
         kfree(p);
@@ -977,6 +1050,7 @@ static int quicktest2(unsigned long arg)
         int ret = 0;
         unsigned long *buf;
         void *cb0, *cb;
+        struct gru_control_block_status *gen;
         int i, k, istatus, bytes;
 
         bytes = numcb * 4 * 8;
@@ -996,20 +1070,30 @@ static int quicktest2(unsigned long arg)
                                 XTYPE_DW, 4, 1, IMA_INTERRUPT);
 
         ret = 0;
-        for (k = 0; k < numcb; k++) {
+        k = numcb;
+        do {
                 gru_wait_async_cbr(han);
                 for (i = 0; i < numcb; i++) {
                         cb = cb0 + i * GRU_HANDLE_STRIDE;
                         istatus = gru_check_status(cb);
-                        if (istatus == CBS_ACTIVE)
-                                continue;
-                        if (istatus == CBS_EXCEPTION)
-                                ret = -EFAULT;
-                        else if (buf[i] || buf[i + 1] || buf[i + 2] ||
-                                        buf[i + 3])
-                                ret = -EIO;
+                        if (istatus != CBS_ACTIVE && istatus != CBS_CALL_OS)
+                                break;
                 }
-        }
+                if (i == numcb)
+                        continue;
+                if (istatus != CBS_IDLE) {
+                        printk(KERN_DEBUG "GRU:%d quicktest2: cb %d, exception\n", smp_processor_id(), i);
+                        ret = -EFAULT;
+                } else if (buf[4 * i] || buf[4 * i + 1] || buf[4 * i + 2] ||
+                                buf[4 * i + 3]) {
+                        printk(KERN_DEBUG "GRU:%d quicktest2:cb %d,  buf 0x%lx, 0x%lx, 0x%lx, 0x%lx\n",
+                               smp_processor_id(), i, buf[4 * i], buf[4 * i + 1], buf[4 * i + 2], buf[4 * i + 3]);
+                        ret = -EIO;
+                }
+                k--;
+                gen = cb;
+                gen->istatus = CBS_CALL_OS; /* don't handle this CBR again */
+        } while (k);
         BUG_ON(cmp.done);
 
         gru_unlock_async_resource(han);
@@ -1019,6 +1103,22 @@ done:
         return ret;
 }
 
+#define BUFSIZE 200
+static int quicktest3(unsigned long arg)
+{
+        char buf1[BUFSIZE], buf2[BUFSIZE];
+        int ret = 0;
+
+        memset(buf2, 0, sizeof(buf2));
+        memset(buf1, get_cycles() & 255, sizeof(buf1));
+        gru_copy_gpa(uv_gpa(buf2), uv_gpa(buf1), BUFSIZE);
+        if (memcmp(buf1, buf2, BUFSIZE)) {
+                printk(KERN_DEBUG "GRU:%d quicktest3 error\n", smp_processor_id());
+                ret = -EIO;
+        }
+        return ret;
+}
+
 /*
  * Debugging only. User hook for various kernel tests
  * of driver & gru.
@@ -1037,6 +1137,9 @@ int gru_ktest(unsigned long arg)
         case 2:
                 ret = quicktest2(arg);
                 break;
+        case 3:
+                ret = quicktest3(arg);
+                break;
         case 99:
                 ret = gru_free_kernel_contexts();
                 break;
diff --git a/drivers/misc/sgi-gru/grukservices.h b/drivers/misc/sgi-gru/grukservices.h
index d60d34bca44d..02aa94d8484a 100644
--- a/drivers/misc/sgi-gru/grukservices.h
+++ b/drivers/misc/sgi-gru/grukservices.h
@@ -131,6 +131,20 @@ extern void *gru_get_next_message(struct gru_message_queue_desc *mqd);
 
 
 /*
+ * Read a GRU global GPA. Source can be located in a remote partition.
+ *
+ *    Input:
+ *      value           memory address where MMR value is returned
+ *      gpa             source numalink physical address of GPA
+ *
+ *    Output:
+ *      0               OK
+ *      >0              error
+ */
+int gru_read_gpa(unsigned long *value, unsigned long gpa);
+
+
+/*
  * Copy data using the GRU. Source or destination can be located in a remote
  * partition.
  *
diff --git a/drivers/misc/sgi-gru/grulib.h b/drivers/misc/sgi-gru/grulib.h
index 889bc442a3e8..e77d1b1f9d05 100644
--- a/drivers/misc/sgi-gru/grulib.h
+++ b/drivers/misc/sgi-gru/grulib.h
@@ -63,18 +63,9 @@
 #define THREAD_POINTER(p, th)           (p + GRU_GSEG_PAGESIZE * (th))
 #define GSEG_START(cb)                  ((void *)((unsigned long)(cb) & ~(GRU_GSEG_PAGESIZE - 1)))
 
-/*
- * Statictics kept on a per-GTS basis.
- */
-struct gts_statistics {
-        unsigned long   fmm_tlbdropin;
-        unsigned long   upm_tlbdropin;
-        unsigned long   context_stolen;
-};
-
 struct gru_get_gseg_statistics_req {
-        unsigned long           gseg;
-        struct gts_statistics   stats;
+        unsigned long                   gseg;
+        struct gru_gseg_statistics      stats;
 };
 
 /*
@@ -86,6 +77,7 @@ struct gru_create_context_req {
         unsigned int            control_blocks;
         unsigned int            maximum_thread_count;
         unsigned int            options;
+        unsigned char           tlb_preload_count;
 };
 
 /*
@@ -98,11 +90,12 @@ struct gru_unload_context_req {
 /*
  * Structure used to set context options
  */
-enum {sco_gseg_owner, sco_cch_req_slice};
+enum {sco_gseg_owner, sco_cch_req_slice, sco_blade_chiplet};
 struct gru_set_context_option_req {
         unsigned long   gseg;
         int             op;
-        unsigned long   val1;
+        int             val0;
+        long            val1;
 };
 
 /*
@@ -124,6 +117,8 @@ struct gru_dump_chiplet_state_req {
         int             ctxnum;
         char            data_opt;
         char            lock_cch;
+        char            flush_cbrs;
+        char            fill[10];
         pid_t           pid;
         void            *buf;
         size_t          buflen;
diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c
index 3bc643dad606..f8538bbd0bfa 100644
--- a/drivers/misc/sgi-gru/grumain.c
+++ b/drivers/misc/sgi-gru/grumain.c
@@ -27,6 +27,7 @@
 #include <linux/sched.h>
 #include <linux/device.h>
 #include <linux/list.h>
+#include <linux/err.h>
 #include <asm/uv/uv_hub.h>
 #include "gru.h"
 #include "grutables.h"
@@ -48,12 +49,20 @@ struct device *grudev = &gru_device;
 /*
  * Select a gru fault map to be used by the current cpu. Note that
  * multiple cpus may be using the same map.
- *      ZZZ should "shift" be used?? Depends on HT cpu numbering
  *      ZZZ should be inline but did not work on emulator
  */
 int gru_cpu_fault_map_id(void)
 {
+#ifdef CONFIG_IA64
         return uv_blade_processor_id() % GRU_NUM_TFM;
+#else
+        int cpu = smp_processor_id();
+        int id, core;
+
+        core = uv_cpu_core_number(cpu);
+        id = core + UV_MAX_INT_CORES * uv_cpu_socket_number(cpu);
+        return id;
+#endif
 }
 
 /*--------- ASID Management -------------------------------------------
@@ -286,7 +295,8 @@ static void gru_unload_mm_tracker(struct gru_state *gru,
 void gts_drop(struct gru_thread_state *gts)
 {
         if (gts && atomic_dec_return(&gts->ts_refcnt) == 0) {
-                gru_drop_mmu_notifier(gts->ts_gms);
+                if (gts->ts_gms)
+                        gru_drop_mmu_notifier(gts->ts_gms);
                 kfree(gts);
                 STAT(gts_free);
         }
@@ -310,16 +320,18 @@ static struct gru_thread_state *gru_find_current_gts_nolock(struct gru_vma_data
  * Allocate a thread state structure.
  */
 struct gru_thread_state *gru_alloc_gts(struct vm_area_struct *vma,
-                int cbr_au_count, int dsr_au_count, int options, int tsid)
+                int cbr_au_count, int dsr_au_count,
+                unsigned char tlb_preload_count, int options, int tsid)
 {
         struct gru_thread_state *gts;
+        struct gru_mm_struct *gms;
         int bytes;
 
         bytes = DSR_BYTES(dsr_au_count) + CBR_BYTES(cbr_au_count);
         bytes += sizeof(struct gru_thread_state);
         gts = kmalloc(bytes, GFP_KERNEL);
         if (!gts)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         STAT(gts_alloc);
         memset(gts, 0, sizeof(struct gru_thread_state)); /* zero out header */
@@ -327,7 +339,10 @@ struct gru_thread_state *gru_alloc_gts(struct vm_area_struct *vma,
         mutex_init(&gts->ts_ctxlock);
         gts->ts_cbr_au_count = cbr_au_count;
         gts->ts_dsr_au_count = dsr_au_count;
+        gts->ts_tlb_preload_count = tlb_preload_count;
         gts->ts_user_options = options;
+        gts->ts_user_blade_id = -1;
+        gts->ts_user_chiplet_id = -1;
         gts->ts_tsid = tsid;
         gts->ts_ctxnum = NULLCTX;
         gts->ts_tlb_int_select = -1;
@@ -336,9 +351,10 @@ struct gru_thread_state *gru_alloc_gts(struct vm_area_struct *vma,
         if (vma) {
                 gts->ts_mm = current->mm;
                 gts->ts_vma = vma;
-                gts->ts_gms = gru_register_mmu_notifier();
-                if (!gts->ts_gms)
+                gms = gru_register_mmu_notifier();
+                if (IS_ERR(gms))
                         goto err;
+                gts->ts_gms = gms;
         }
 
         gru_dbg(grudev, "alloc gts %p\n", gts);
@@ -346,7 +362,7 @@ struct gru_thread_state *gru_alloc_gts(struct vm_area_struct *vma,
 
 err:
         gts_drop(gts);
-        return NULL;
+        return ERR_CAST(gms);
 }
 
 /*
@@ -360,6 +376,7 @@ struct gru_vma_data *gru_alloc_vma_data(struct vm_area_struct *vma, int tsid)
         if (!vdata)
                 return NULL;
 
+        STAT(vdata_alloc);
         INIT_LIST_HEAD(&vdata->vd_head);
         spin_lock_init(&vdata->vd_lock);
         gru_dbg(grudev, "alloc vdata %p\n", vdata);
@@ -392,10 +409,12 @@ struct gru_thread_state *gru_alloc_thread_state(struct vm_area_struct *vma,
         struct gru_vma_data *vdata = vma->vm_private_data;
         struct gru_thread_state *gts, *ngts;
 
-        gts = gru_alloc_gts(vma, vdata->vd_cbr_au_count, vdata->vd_dsr_au_count,
+        gts = gru_alloc_gts(vma, vdata->vd_cbr_au_count,
+                            vdata->vd_dsr_au_count,
+                            vdata->vd_tlb_preload_count,
                             vdata->vd_user_options, tsid);
-        if (!gts)
-                return NULL;
+        if (IS_ERR(gts))
+                return gts;
 
         spin_lock(&vdata->vd_lock);
         ngts = gru_find_current_gts_nolock(vdata, tsid);
@@ -493,6 +512,9 @@ static void gru_load_context_data(void *save, void *grubase, int ctxnum,
                         memset(cbe + i * GRU_HANDLE_STRIDE, 0,
                                                 GRU_CACHE_LINE_BYTES);
                 }
+                /* Flush CBE to hide race in context restart */
+                mb();
+                gru_flush_cache(cbe + i * GRU_HANDLE_STRIDE);
                 cb += GRU_HANDLE_STRIDE;
         }
 
@@ -513,6 +535,12 @@ static void gru_unload_context_data(void *save, void *grubase, int ctxnum,
         cb = gseg + GRU_CB_BASE;
         cbe = grubase + GRU_CBE_BASE;
         length = hweight64(dsrmap) * GRU_DSR_AU_BYTES;
+
+        /* CBEs may not be coherent. Flush them from cache */
+        for_each_cbr_in_allocation_map(i, &cbrmap, scr)
+                gru_flush_cache(cbe + i * GRU_HANDLE_STRIDE);
+        mb();           /* Let the CL flush complete */
+
         gru_prefetch_context(gseg, cb, cbe, cbrmap, length);
 
         for_each_cbr_in_allocation_map(i, &cbrmap, scr) {
@@ -533,7 +561,8 @@ void gru_unload_context(struct gru_thread_state *gts, int savestate)
                 zap_vma_ptes(gts->ts_vma, UGRUADDR(gts), GRU_GSEG_PAGESIZE);
         cch = get_cch(gru->gs_gru_base_vaddr, ctxnum);
 
-        gru_dbg(grudev, "gts %p\n", gts);
+        gru_dbg(grudev, "gts %p, cbrmap 0x%lx, dsrmap 0x%lx\n",
+                gts, gts->ts_cbr_map, gts->ts_dsr_map);
         lock_cch_handle(cch);
         if (cch_interrupt_sync(cch))
                 BUG();
@@ -549,7 +578,6 @@ void gru_unload_context(struct gru_thread_state *gts, int savestate)
 
         if (cch_deallocate(cch))
                 BUG();
-        gts->ts_force_unload = 0;       /* ts_force_unload locked by CCH lock */
         unlock_cch_handle(cch);
 
         gru_free_gru_context(gts);
@@ -565,9 +593,7 @@ void gru_load_context(struct gru_thread_state *gts)
         struct gru_context_configuration_handle *cch;
         int i, err, asid, ctxnum = gts->ts_ctxnum;
 
-        gru_dbg(grudev, "gts %p\n", gts);
         cch = get_cch(gru->gs_gru_base_vaddr, ctxnum);
-
         lock_cch_handle(cch);
         cch->tfm_fault_bit_enable =
             (gts->ts_user_options == GRU_OPT_MISS_FMM_POLL
@@ -591,6 +617,7 @@ void gru_load_context(struct gru_thread_state *gts)
                 cch->unmap_enable = 1;
                 cch->tfm_done_bit_enable = 1;
                 cch->cb_int_enable = 1;
+                cch->tlb_int_select = 0;        /* For now, ints go to cpu 0 */
         } else {
                 cch->unmap_enable = 0;
                 cch->tfm_done_bit_enable = 0;
@@ -616,17 +643,18 @@ void gru_load_context(struct gru_thread_state *gts)
         if (cch_start(cch))
                 BUG();
         unlock_cch_handle(cch);
+
+        gru_dbg(grudev, "gid %d, gts %p, cbrmap 0x%lx, dsrmap 0x%lx, tie %d, tis %d\n",
+                gts->ts_gru->gs_gid, gts, gts->ts_cbr_map, gts->ts_dsr_map,
+                (gts->ts_user_options == GRU_OPT_MISS_FMM_INTR), gts->ts_tlb_int_select);
 }
 
 /*
  * Update fields in an active CCH:
  *      - retarget interrupts on local blade
  *      - update sizeavail mask
- *      - force a delayed context unload by clearing the CCH asids. This
- *        forces TLB misses for new GRU instructions. The context is unloaded
- *        when the next TLB miss occurs.
  */
-int gru_update_cch(struct gru_thread_state *gts, int force_unload)
+int gru_update_cch(struct gru_thread_state *gts)
 {
         struct gru_context_configuration_handle *cch;
         struct gru_state *gru = gts->ts_gru;
@@ -640,21 +668,13 @@ int gru_update_cch(struct gru_thread_state *gts, int force_unload)
                         goto exit;
                 if (cch_interrupt(cch))
                         BUG();
-                if (!force_unload) {
-                        for (i = 0; i < 8; i++)
-                                cch->sizeavail[i] = gts->ts_sizeavail;
-                        gts->ts_tlb_int_select = gru_cpu_fault_map_id();
-                        cch->tlb_int_select = gru_cpu_fault_map_id();
-                        cch->tfm_fault_bit_enable =
-                          (gts->ts_user_options == GRU_OPT_MISS_FMM_POLL
-                            || gts->ts_user_options == GRU_OPT_MISS_FMM_INTR);
-                } else {
-                        for (i = 0; i < 8; i++)
-                                cch->asid[i] = 0;
-                        cch->tfm_fault_bit_enable = 0;
-                        cch->tlb_int_enable = 0;
-                        gts->ts_force_unload = 1;
-                }
+                for (i = 0; i < 8; i++)
+                        cch->sizeavail[i] = gts->ts_sizeavail;
+                gts->ts_tlb_int_select = gru_cpu_fault_map_id();
+                cch->tlb_int_select = gru_cpu_fault_map_id();
+                cch->tfm_fault_bit_enable =
+                  (gts->ts_user_options == GRU_OPT_MISS_FMM_POLL
+                    || gts->ts_user_options == GRU_OPT_MISS_FMM_INTR);
                 if (cch_start(cch))
                         BUG();
                 ret = 1;
@@ -679,7 +699,54 @@ static int gru_retarget_intr(struct gru_thread_state *gts)
 
         gru_dbg(grudev, "retarget from %d to %d\n", gts->ts_tlb_int_select,
                 gru_cpu_fault_map_id());
-        return gru_update_cch(gts, 0);
+        return gru_update_cch(gts);
+}
+
+/*
+ * Check if a GRU context is allowed to use a specific chiplet. By default
+ * a context is assigned to any blade-local chiplet. However, users can
+ * override this.
+ *      Returns 1 if assignment allowed, 0 otherwise
+ */
+static int gru_check_chiplet_assignment(struct gru_state *gru,
+                                        struct gru_thread_state *gts)
+{
+        int blade_id;
+        int chiplet_id;
+
+        blade_id = gts->ts_user_blade_id;
+        if (blade_id < 0)
+                blade_id = uv_numa_blade_id();
+
+        chiplet_id = gts->ts_user_chiplet_id;
+        return gru->gs_blade_id == blade_id &&
+                (chiplet_id < 0 || chiplet_id == gru->gs_chiplet_id);
+}
+
+/*
+ * Unload the gru context if it is not assigned to the correct blade or
+ * chiplet. Misassignment can occur if the process migrates to a different
+ * blade or if the user changes the selected blade/chiplet.
+ */
+void gru_check_context_placement(struct gru_thread_state *gts)
+{
+        struct gru_state *gru;
+
+        /*
+         * If the current task is the context owner, verify that the
+         * context is correctly placed. This test is skipped for non-owner
+         * references. Pthread apps use non-owner references to the CBRs.
+         */
+        gru = gts->ts_gru;
+        if (!gru || gts->ts_tgid_owner != current->tgid)
+                return;
+
+        if (!gru_check_chiplet_assignment(gru, gts)) {
+                STAT(check_context_unload);
+                gru_unload_context(gts, 1);
+        } else if (gru_retarget_intr(gts)) {
+                STAT(check_context_retarget_intr);
+        }
 }
 
 
@@ -712,13 +779,17 @@ static void gts_stolen(struct gru_thread_state *gts,
         }
 }
 
-void gru_steal_context(struct gru_thread_state *gts, int blade_id)
+void gru_steal_context(struct gru_thread_state *gts)
 {
         struct gru_blade_state *blade;
         struct gru_state *gru, *gru0;
         struct gru_thread_state *ngts = NULL;
         int ctxnum, ctxnum0, flag = 0, cbr, dsr;
+        int blade_id;
 
+        blade_id = gts->ts_user_blade_id;
+        if (blade_id < 0)
+                blade_id = uv_numa_blade_id();
         cbr = gts->ts_cbr_au_count;
         dsr = gts->ts_dsr_au_count;
 
@@ -729,35 +800,39 @@ void gru_steal_context(struct gru_thread_state *gts, int blade_id)
         gru = blade->bs_lru_gru;
         if (ctxnum == 0)
                 gru = next_gru(blade, gru);
+        blade->bs_lru_gru = gru;
+        blade->bs_lru_ctxnum = ctxnum;
         ctxnum0 = ctxnum;
         gru0 = gru;
         while (1) {
-                if (check_gru_resources(gru, cbr, dsr, GRU_NUM_CCH))
-                        break;
-                spin_lock(&gru->gs_lock);
-                for (; ctxnum < GRU_NUM_CCH; ctxnum++) {
-                        if (flag && gru == gru0 && ctxnum == ctxnum0)
+                if (gru_check_chiplet_assignment(gru, gts)) {
+                        if (check_gru_resources(gru, cbr, dsr, GRU_NUM_CCH))
                                 break;
-                        ngts = gru->gs_gts[ctxnum];
-                        /*
-                         * We are grabbing locks out of order, so trylock is
-                         * needed. GTSs are usually not locked, so the odds of
-                         * success are high. If trylock fails, try to steal a
-                         * different GSEG.
-                         */
-                        if (ngts && is_gts_stealable(ngts, blade))
+                        spin_lock(&gru->gs_lock);
+                        for (; ctxnum < GRU_NUM_CCH; ctxnum++) {
+                                if (flag && gru == gru0 && ctxnum == ctxnum0)
+                                        break;
+                                ngts = gru->gs_gts[ctxnum];
+                                /*
+                                * We are grabbing locks out of order, so trylock is
+                                * needed. GTSs are usually not locked, so the odds of
+                                * success are high. If trylock fails, try to steal a
+                                * different GSEG.
+                                */
+                                if (ngts && is_gts_stealable(ngts, blade))
+                                        break;
+                                ngts = NULL;
+                        }
+                        spin_unlock(&gru->gs_lock);
+                        if (ngts || (flag && gru == gru0 && ctxnum == ctxnum0))
                                 break;
-                        ngts = NULL;
-                        flag = 1;
                 }
-                spin_unlock(&gru->gs_lock);
-                if (ngts || (flag && gru == gru0 && ctxnum == ctxnum0))
+                if (flag && gru == gru0)
                         break;
+                flag = 1;
                 ctxnum = 0;
                 gru = next_gru(blade, gru);
         }
-        blade->bs_lru_gru = gru;
-        blade->bs_lru_ctxnum = ctxnum;
         spin_unlock(&blade->bs_lock);
 
         if (ngts) {
@@ -776,19 +851,34 @@ void gru_steal_context(struct gru_thread_state *gts, int blade_id)
 }
 
 /*
+ * Assign a gru context.
+ */
+static int gru_assign_context_number(struct gru_state *gru)
+{
+        int ctxnum;
+
+        ctxnum = find_first_zero_bit(&gru->gs_context_map, GRU_NUM_CCH);
+        __set_bit(ctxnum, &gru->gs_context_map);
+        return ctxnum;
+}
+
+/*
  * Scan the GRUs on the local blade & assign a GRU context.
  */
-struct gru_state *gru_assign_gru_context(struct gru_thread_state *gts,
-                                                int blade)
+struct gru_state *gru_assign_gru_context(struct gru_thread_state *gts)
 {
         struct gru_state *gru, *grux;
         int i, max_active_contexts;
+        int blade_id = gts->ts_user_blade_id;
 
-
+        if (blade_id < 0)
+                blade_id = uv_numa_blade_id();
 again:
         gru = NULL;
         max_active_contexts = GRU_NUM_CCH;
-        for_each_gru_on_blade(grux, blade, i) {
+        for_each_gru_on_blade(grux, blade_id, i) {
+                if (!gru_check_chiplet_assignment(grux, gts))
+                        continue;
                 if (check_gru_resources(grux, gts->ts_cbr_au_count,
                                         gts->ts_dsr_au_count,
                                         max_active_contexts)) {
@@ -809,12 +899,9 @@ again:
                 reserve_gru_resources(gru, gts);
                 gts->ts_gru = gru;
                 gts->ts_blade = gru->gs_blade_id;
-                gts->ts_ctxnum =
-                    find_first_zero_bit(&gru->gs_context_map, GRU_NUM_CCH);
-                BUG_ON(gts->ts_ctxnum == GRU_NUM_CCH);
+                gts->ts_ctxnum = gru_assign_context_number(gru);
                 atomic_inc(&gts->ts_refcnt);
                 gru->gs_gts[gts->ts_ctxnum] = gts;
-                __set_bit(gts->ts_ctxnum, &gru->gs_context_map);
                 spin_unlock(&gru->gs_lock);
 
                 STAT(assign_context);
@@ -842,7 +929,6 @@ int gru_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct gru_thread_state *gts;
         unsigned long paddr, vaddr;
-        int blade_id;
 
         vaddr = (unsigned long)vmf->virtual_address;
         gru_dbg(grudev, "vma %p, vaddr 0x%lx (0x%lx)\n",
@@ -857,28 +943,18 @@ int gru_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 again:
         mutex_lock(&gts->ts_ctxlock);
         preempt_disable();
-        blade_id = uv_numa_blade_id();
 
-        if (gts->ts_gru) {
-                if (gts->ts_gru->gs_blade_id != blade_id) {
-                        STAT(migrated_nopfn_unload);
-                        gru_unload_context(gts, 1);
-                } else {
-                        if (gru_retarget_intr(gts))
-                                STAT(migrated_nopfn_retarget);
-                }
-        }
+        gru_check_context_placement(gts);
 
         if (!gts->ts_gru) {
                 STAT(load_user_context);
-                if (!gru_assign_gru_context(gts, blade_id)) {
+                if (!gru_assign_gru_context(gts)) {
                         preempt_enable();
                         mutex_unlock(&gts->ts_ctxlock);
                         set_current_state(TASK_INTERRUPTIBLE);
                         schedule_timeout(GRU_ASSIGN_DELAY);  /* true hack ZZZ */
-                        blade_id = uv_numa_blade_id();
                         if (gts->ts_steal_jiffies + GRU_STEAL_DELAY < jiffies)
-                                gru_steal_context(gts, blade_id);
+                                gru_steal_context(gts);
                         goto again;
                 }
                 gru_load_context(gts);
diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
index 3f2375c5ba5b..7768b87d995b 100644
--- a/drivers/misc/sgi-gru/gruprocfs.c
+++ b/drivers/misc/sgi-gru/gruprocfs.c
@@ -36,8 +36,7 @@ static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
 {
         unsigned long val = atomic_long_read(v);
 
-        if (val)
-                seq_printf(s, "%16lu %s\n", val, id);
+        seq_printf(s, "%16lu %s\n", val, id);
 }
 
 static int statistics_show(struct seq_file *s, void *p)
@@ -46,7 +45,8 @@ static int statistics_show(struct seq_file *s, void *p)
         printstat(s, vdata_free);
         printstat(s, gts_alloc);
         printstat(s, gts_free);
-        printstat(s, vdata_double_alloc);
+        printstat(s, gms_alloc);
+        printstat(s, gms_free);
         printstat(s, gts_double_allocate);
         printstat(s, assign_context);
         printstat(s, assign_context_failed);
@@ -59,28 +59,25 @@ static int statistics_show(struct seq_file *s, void *p)
         printstat(s, steal_kernel_context);
         printstat(s, steal_context_failed);
         printstat(s, nopfn);
-        printstat(s, break_cow);
         printstat(s, asid_new);
         printstat(s, asid_next);
         printstat(s, asid_wrap);
         printstat(s, asid_reuse);
         printstat(s, intr);
+        printstat(s, intr_cbr);
+        printstat(s, intr_tfh);
+        printstat(s, intr_spurious);
         printstat(s, intr_mm_lock_failed);
         printstat(s, call_os);
-        printstat(s, call_os_offnode_reference);
-        printstat(s, call_os_check_for_bug);
         printstat(s, call_os_wait_queue);
         printstat(s, user_flush_tlb);
         printstat(s, user_unload_context);
         printstat(s, user_exception);
         printstat(s, set_context_option);
-        printstat(s, migrate_check);
-        printstat(s, migrated_retarget);
-        printstat(s, migrated_unload);
-        printstat(s, migrated_unload_delay);
-        printstat(s, migrated_nopfn_retarget);
-        printstat(s, migrated_nopfn_unload);
+        printstat(s, check_context_retarget_intr);
+        printstat(s, check_context_unload);
         printstat(s, tlb_dropin);
+        printstat(s, tlb_preload_page);
         printstat(s, tlb_dropin_fail_no_asid);
         printstat(s, tlb_dropin_fail_upm);
         printstat(s, tlb_dropin_fail_invalid);
@@ -88,16 +85,15 @@ static int statistics_show(struct seq_file *s, void *p)
         printstat(s, tlb_dropin_fail_idle);
         printstat(s, tlb_dropin_fail_fmm);
         printstat(s, tlb_dropin_fail_no_exception);
-        printstat(s, tlb_dropin_fail_no_exception_war);
         printstat(s, tfh_stale_on_fault);
         printstat(s, mmu_invalidate_range);
         printstat(s, mmu_invalidate_page);
-        printstat(s, mmu_clear_flush_young);
         printstat(s, flush_tlb);
         printstat(s, flush_tlb_gru);
         printstat(s, flush_tlb_gru_tgh);
         printstat(s, flush_tlb_gru_zero_asid);
         printstat(s, copy_gpa);
+        printstat(s, read_gpa);
         printstat(s, mesq_receive);
         printstat(s, mesq_receive_none);
         printstat(s, mesq_send);
@@ -108,7 +104,6 @@ static int statistics_show(struct seq_file *s, void *p)
         printstat(s, mesq_send_qlimit_reached);
         printstat(s, mesq_send_amo_nacked);
         printstat(s, mesq_send_put_nacked);
-        printstat(s, mesq_qf_not_full);
         printstat(s, mesq_qf_locked);
         printstat(s, mesq_qf_noop_not_full);
         printstat(s, mesq_qf_switch_head_failed);
@@ -118,6 +113,7 @@ static int statistics_show(struct seq_file *s, void *p)
         printstat(s, mesq_noop_qlimit_reached);
         printstat(s, mesq_noop_amo_nacked);
         printstat(s, mesq_noop_put_nacked);
+        printstat(s, mesq_noop_page_overflow);
         return 0;
 }
 
@@ -133,8 +129,10 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
         int op;
         unsigned long total, count, max;
         static char *id[] = {"cch_allocate", "cch_start", "cch_interrupt",
-                "cch_interrupt_sync", "cch_deallocate", "tgh_invalidate"};
+                "cch_interrupt_sync", "cch_deallocate", "tfh_write_only",
+                "tfh_write_restart", "tgh_invalidate"};
 
+        seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
         for (op = 0; op < mcsop_last; op++) {
                 count = atomic_long_read(&mcs_op_statistics[op].count);
                 total = atomic_long_read(&mcs_op_statistics[op].total);
@@ -154,6 +152,7 @@ static ssize_t mcs_statistics_write(struct file *file,
 
 static int options_show(struct seq_file *s, void *p)
 {
+        seq_printf(s, "#bitmask: 1=trace, 2=statistics\n");
         seq_printf(s, "0x%lx\n", gru_options);
         return 0;
 }
@@ -183,16 +182,17 @@ static int cch_seq_show(struct seq_file *file, void *data)
         const char *mode[] = { "??", "UPM", "INTR", "OS_POLL" };
 
         if (gid == 0)
-                seq_printf(file, "#%5s%5s%6s%9s%6s%8s%8s\n", "gid", "bid",
-                           "ctx#", "pid", "cbrs", "dsbytes", "mode");
+                seq_printf(file, "#%5s%5s%6s%7s%9s%6s%8s%8s\n", "gid", "bid",
+                           "ctx#", "asid", "pid", "cbrs", "dsbytes", "mode");
         if (gru)
                 for (i = 0; i < GRU_NUM_CCH; i++) {
                         ts = gru->gs_gts[i];
                         if (!ts)
                                 continue;
-                        seq_printf(file, " %5d%5d%6d%9d%6d%8d%8s\n",
+                        seq_printf(file, " %5d%5d%6d%7d%9d%6d%8d%8s\n",
                                    gru->gs_gid, gru->gs_blade_id, i,
-                                   ts->ts_tgid_owner,
+                                   is_kernel_context(ts) ? 0 : ts->ts_gms->ms_asids[gid].mt_asid,
+                                   is_kernel_context(ts) ? 0 : ts->ts_tgid_owner,
                                    ts->ts_cbr_au_count * GRU_CBR_AU_SIZE,
                                    ts->ts_cbr_au_count * GRU_DSR_AU_BYTES,
                                    mode[ts->ts_user_options &
@@ -355,7 +355,7 @@ static void delete_proc_files(void)
                 for (p = proc_files; p->name; p++)
                         if (p->entry)
                                 remove_proc_entry(p->name, proc_gru);
-                remove_proc_entry("gru", NULL);
+                remove_proc_entry("gru", proc_gru->parent);
         }
 }
 
diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
index 46990bcfa536..02a77b8b8eef 100644
--- a/drivers/misc/sgi-gru/grutables.h
+++ b/drivers/misc/sgi-gru/grutables.h
@@ -161,7 +161,7 @@ extern unsigned int gru_max_gids;
 #define GRU_MAX_GRUS            (GRU_MAX_BLADES * GRU_CHIPLETS_PER_BLADE)
 
 #define GRU_DRIVER_ID_STR       "SGI GRU Device Driver"
-#define GRU_DRIVER_VERSION_STR  "0.80"
+#define GRU_DRIVER_VERSION_STR  "0.85"
 
 /*
  * GRU statistics.
@@ -171,7 +171,8 @@ struct gru_stats_s {
         atomic_long_t vdata_free;
         atomic_long_t gts_alloc;
         atomic_long_t gts_free;
-        atomic_long_t vdata_double_alloc;
+        atomic_long_t gms_alloc;
+        atomic_long_t gms_free;
         atomic_long_t gts_double_allocate;
         atomic_long_t assign_context;
         atomic_long_t assign_context_failed;
@@ -184,28 +185,25 @@ struct gru_stats_s {
         atomic_long_t steal_kernel_context;
         atomic_long_t steal_context_failed;
         atomic_long_t nopfn;
-        atomic_long_t break_cow;
         atomic_long_t asid_new;
         atomic_long_t asid_next;
         atomic_long_t asid_wrap;
         atomic_long_t asid_reuse;
         atomic_long_t intr;
+        atomic_long_t intr_cbr;
+        atomic_long_t intr_tfh;
+        atomic_long_t intr_spurious;
         atomic_long_t intr_mm_lock_failed;
         atomic_long_t call_os;
-        atomic_long_t call_os_offnode_reference;
-        atomic_long_t call_os_check_for_bug;
         atomic_long_t call_os_wait_queue;
         atomic_long_t user_flush_tlb;
         atomic_long_t user_unload_context;
         atomic_long_t user_exception;
         atomic_long_t set_context_option;
-        atomic_long_t migrate_check;
-        atomic_long_t migrated_retarget;
-        atomic_long_t migrated_unload;
-        atomic_long_t migrated_unload_delay;
-        atomic_long_t migrated_nopfn_retarget;
-        atomic_long_t migrated_nopfn_unload;
+        atomic_long_t check_context_retarget_intr;
+        atomic_long_t check_context_unload;
         atomic_long_t tlb_dropin;
+        atomic_long_t tlb_preload_page;
         atomic_long_t tlb_dropin_fail_no_asid;
         atomic_long_t tlb_dropin_fail_upm;
         atomic_long_t tlb_dropin_fail_invalid;
@@ -213,17 +211,16 @@ struct gru_stats_s {
         atomic_long_t tlb_dropin_fail_idle;
         atomic_long_t tlb_dropin_fail_fmm;
         atomic_long_t tlb_dropin_fail_no_exception;
-        atomic_long_t tlb_dropin_fail_no_exception_war;
         atomic_long_t tfh_stale_on_fault;
         atomic_long_t mmu_invalidate_range;
         atomic_long_t mmu_invalidate_page;
-        atomic_long_t mmu_clear_flush_young;
         atomic_long_t flush_tlb;
         atomic_long_t flush_tlb_gru;
         atomic_long_t flush_tlb_gru_tgh;
         atomic_long_t flush_tlb_gru_zero_asid;
 
         atomic_long_t copy_gpa;
+        atomic_long_t read_gpa;
 
         atomic_long_t mesq_receive;
         atomic_long_t mesq_receive_none;
@@ -235,7 +232,7 @@ struct gru_stats_s {
         atomic_long_t mesq_send_qlimit_reached;
         atomic_long_t mesq_send_amo_nacked;
         atomic_long_t mesq_send_put_nacked;
-        atomic_long_t mesq_qf_not_full;
+        atomic_long_t mesq_page_overflow;
         atomic_long_t mesq_qf_locked;
         atomic_long_t mesq_qf_noop_not_full;
         atomic_long_t mesq_qf_switch_head_failed;
@@ -245,11 +242,13 @@ struct gru_stats_s {
         atomic_long_t mesq_noop_qlimit_reached;
         atomic_long_t mesq_noop_amo_nacked;
         atomic_long_t mesq_noop_put_nacked;
+        atomic_long_t mesq_noop_page_overflow;
 
 };
 
 enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
-        cchop_deallocate, tghop_invalidate, mcsop_last};
+        cchop_deallocate, tfhop_write_only, tfhop_write_restart,
+        tghop_invalidate, mcsop_last};
 
 struct mcs_op_statistic {
         atomic_long_t   count;
@@ -259,8 +258,8 @@ struct mcs_op_statistic {
 
 extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
 
-#define OPT_DPRINT      1
-#define OPT_STATS       2
+#define OPT_DPRINT              1
+#define OPT_STATS               2
 
 
 #define IRQ_GRU                 110     /* Starting IRQ number for interrupts */
@@ -283,7 +282,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
 #define gru_dbg(dev, fmt, x...)                                         \
         do {                                                            \
                 if (gru_options & OPT_DPRINT)                           \
-                        dev_dbg(dev, "%s: " fmt, __func__, x);          \
+                        printk(KERN_DEBUG "GRU:%d %s: " fmt, smp_processor_id(), __func__, x);\
         } while (0)
 #else
 #define gru_dbg(x...)
@@ -297,13 +296,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
 #define ASID_INC        8       /* number of regions */
 
 /* Generate a GRU asid value from a GRU base asid & a virtual address. */
-#if defined CONFIG_IA64
 #define VADDR_HI_BIT            64
-#elif defined CONFIG_X86_64
-#define VADDR_HI_BIT            48
-#else
-#error "Unsupported architecture"
-#endif
 #define GRUREGION(addr)         ((addr) >> (VADDR_HI_BIT - 3) & 3)
 #define GRUASID(asid, addr)     ((asid) + GRUREGION(addr))
 
@@ -345,6 +338,7 @@ struct gru_vma_data {
         long                    vd_user_options;/* misc user option flags */
         int                     vd_cbr_au_count;
         int                     vd_dsr_au_count;
+        unsigned char           vd_tlb_preload_count;
 };
 
 /*
@@ -360,6 +354,7 @@ struct gru_thread_state {
         struct gru_state        *ts_gru;        /* GRU where the context is
                                                    loaded */
         struct gru_mm_struct    *ts_gms;        /* asid & ioproc struct */
+        unsigned char           ts_tlb_preload_count; /* TLB preload pages */
         unsigned long           ts_cbr_map;     /* map of allocated CBRs */
         unsigned long           ts_dsr_map;     /* map of allocated DATA
                                                    resources */
@@ -368,6 +363,8 @@ struct gru_thread_state {
         long                    ts_user_options;/* misc user option flags */
         pid_t                   ts_tgid_owner;  /* task that is using the
                                                    context - for migration */
+        short                   ts_user_blade_id;/* user selected blade */
+        char                    ts_user_chiplet_id;/* user selected chiplet */
         unsigned short          ts_sizeavail;   /* Pagesizes in use */
         int                     ts_tsid;        /* thread that owns the
                                                    structure */
@@ -384,13 +381,11 @@ struct gru_thread_state {
         char                    ts_blade;       /* If >= 0, migrate context if
                                                    ref from diferent blade */
         char                    ts_force_cch_reload;
-        char                    ts_force_unload;/* force context to be unloaded
-                                                   after migration */
         char                    ts_cbr_idx[GRU_CBR_AU];/* CBR numbers of each
                                                           allocated CB */
         int                     ts_data_valid;  /* Indicates if ts_gdata has
                                                    valid data */
-        struct gts_statistics   ustats;         /* User statistics */
+        struct gru_gseg_statistics ustats;      /* User statistics */
         unsigned long           ts_gdata[0];    /* save area for GRU data (CB,
                                                    DS, CBE) */
 };
@@ -422,6 +417,7 @@ struct gru_state {
                                                            gru segments (64) */
         unsigned short          gs_gid;                 /* unique GRU number */
         unsigned short          gs_blade_id;            /* blade of GRU */
+        unsigned char           gs_chiplet_id;          /* blade chiplet of GRU */
         unsigned char           gs_tgh_local_shift;     /* used to pick TGH for
                                                            local flush */
         unsigned char           gs_tgh_first_remote;    /* starting TGH# for
@@ -453,6 +449,7 @@ struct gru_state {
                                                            in use */
         struct gru_thread_state *gs_gts[GRU_NUM_CCH];   /* GTS currently using
                                                            the context */
+        int                     gs_irq[GRU_NUM_TFM];    /* Interrupt irqs */
 };
 
 /*
@@ -619,6 +616,15 @@ static inline int is_kernel_context(struct gru_thread_state *gts)
         return !gts->ts_mm;
 }
 
+/*
+ * The following are for Nehelem-EX. A more general scheme is needed for
+ * future processors.
+ */
+#define UV_MAX_INT_CORES                8
+#define uv_cpu_socket_number(p)         ((cpu_physical_id(p) >> 5) & 1)
+#define uv_cpu_ht_number(p)             (cpu_physical_id(p) & 1)
+#define uv_cpu_core_number(p)           (((cpu_physical_id(p) >> 2) & 4) |      \
+                                        ((cpu_physical_id(p) >> 1) & 3))
 /*-----------------------------------------------------------------------------
  * Function prototypes & externs
  */
@@ -633,24 +639,26 @@ extern struct gru_thread_state *gru_find_thread_state(struct vm_area_struct
                                 *vma, int tsid);
 extern struct gru_thread_state *gru_alloc_thread_state(struct vm_area_struct
                                 *vma, int tsid);
-extern struct gru_state *gru_assign_gru_context(struct gru_thread_state *gts,
-                int blade);
+extern struct gru_state *gru_assign_gru_context(struct gru_thread_state *gts);
 extern void gru_load_context(struct gru_thread_state *gts);
-extern void gru_steal_context(struct gru_thread_state *gts, int blade_id);
+extern void gru_steal_context(struct gru_thread_state *gts);
 extern void gru_unload_context(struct gru_thread_state *gts, int savestate);
-extern int gru_update_cch(struct gru_thread_state *gts, int force_unload);
+extern int gru_update_cch(struct gru_thread_state *gts);
 extern void gts_drop(struct gru_thread_state *gts);
 extern void gru_tgh_flush_init(struct gru_state *gru);
 extern int gru_kservices_init(void);
 extern void gru_kservices_exit(void);
+extern irqreturn_t gru0_intr(int irq, void *dev_id);
+extern irqreturn_t gru1_intr(int irq, void *dev_id);
+extern irqreturn_t gru_intr_mblade(int irq, void *dev_id);
 extern int gru_dump_chiplet_request(unsigned long arg);
 extern long gru_get_gseg_statistics(unsigned long arg);
-extern irqreturn_t gru_intr(int irq, void *dev_id);
 extern int gru_handle_user_call_os(unsigned long address);
 extern int gru_user_flush_tlb(unsigned long arg);
 extern int gru_user_unload_context(unsigned long arg);
 extern int gru_get_exception_detail(unsigned long arg);
 extern int gru_set_context_option(unsigned long address);
+extern void gru_check_context_placement(struct gru_thread_state *gts);
 extern int gru_cpu_fault_map_id(void);
 extern struct vm_area_struct *gru_find_vma(unsigned long vaddr);
 extern void gru_flush_all_tlb(struct gru_state *gru);
@@ -658,7 +666,8 @@ extern int gru_proc_init(void);
 extern void gru_proc_exit(void);
 
 extern struct gru_thread_state *gru_alloc_gts(struct vm_area_struct *vma,
-                int cbr_au_count, int dsr_au_count, int options, int tsid);
+                int cbr_au_count, int dsr_au_count,
+                unsigned char tlb_preload_count, int options, int tsid);
 extern unsigned long gru_reserve_cb_resources(struct gru_state *gru,
                 int cbr_au_count, char *cbmap);
 extern unsigned long gru_reserve_ds_resources(struct gru_state *gru,
diff --git a/drivers/misc/sgi-gru/grutlbpurge.c b/drivers/misc/sgi-gru/grutlbpurge.c
index 1d125091f5e7..240a6d361665 100644
--- a/drivers/misc/sgi-gru/grutlbpurge.c
+++ b/drivers/misc/sgi-gru/grutlbpurge.c
@@ -184,8 +184,8 @@ void gru_flush_tlb_range(struct gru_mm_struct *gms, unsigned long start,
                         STAT(flush_tlb_gru_tgh);
                         asid = GRUASID(asid, start);
                         gru_dbg(grudev,
-        "  FLUSH gruid %d, asid 0x%x, num %ld, cbmap 0x%x\n",
-                                gid, asid, num, asids->mt_ctxbitmap);
+        "  FLUSH gruid %d, asid 0x%x, vaddr 0x%lx, vamask 0x%x, num %ld, cbmap 0x%x\n",
+                              gid, asid, start, grupagesize, num, asids->mt_ctxbitmap);
                         tgh = get_lock_tgh_handle(gru);
                         tgh_invalidate(tgh, start, ~0, asid, grupagesize, 0,
                                        num - 1, asids->mt_ctxbitmap);
@@ -299,6 +299,7 @@ struct gru_mm_struct *gru_register_mmu_notifier(void)
 {
         struct gru_mm_struct *gms;
         struct mmu_notifier *mn;
+        int err;
 
         mn = mmu_find_ops(current->mm, &gru_mmuops);
         if (mn) {
@@ -307,16 +308,22 @@ struct gru_mm_struct *gru_register_mmu_notifier(void)
         } else {
                 gms = kzalloc(sizeof(*gms), GFP_KERNEL);
                 if (gms) {
+                        STAT(gms_alloc);
                         spin_lock_init(&gms->ms_asid_lock);
                         gms->ms_notifier.ops = &gru_mmuops;
                         atomic_set(&gms->ms_refcnt, 1);
                         init_waitqueue_head(&gms->ms_wait_queue);
-                        __mmu_notifier_register(&gms->ms_notifier, current->mm);
+                        err = __mmu_notifier_register(&gms->ms_notifier, current->mm);
+                        if (err)
+                                goto error;
                 }
         }
         gru_dbg(grudev, "gms %p, refcnt %d\n", gms,
                 atomic_read(&gms->ms_refcnt));
         return gms;
+error:
+        kfree(gms);
+        return ERR_PTR(err);
 }
 
 void gru_drop_mmu_notifier(struct gru_mm_struct *gms)
@@ -327,6 +334,7 @@ void gru_drop_mmu_notifier(struct gru_mm_struct *gms)
                 if (!gms->ms_released)
                         mmu_notifier_unregister(&gms->ms_notifier, current->mm);
                 kfree(gms);
+                STAT(gms_free);
         }
 }
 
diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
index 2275126cb334..851b2f25ce0e 100644
--- a/drivers/misc/sgi-xp/xp.h
+++ b/drivers/misc/sgi-xp/xp.h
@@ -339,6 +339,7 @@ extern short xp_partition_id;
 extern u8 xp_region_size;
 
 extern unsigned long (*xp_pa) (void *);
+extern unsigned long (*xp_socket_pa) (unsigned long);
 extern enum xp_retval (*xp_remote_memcpy) (unsigned long, const unsigned long,
                        size_t);
 extern int (*xp_cpu_to_nasid) (int);
diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
index 7896849b16dc..01be66d02ca8 100644
--- a/drivers/misc/sgi-xp/xp_main.c
+++ b/drivers/misc/sgi-xp/xp_main.c
@@ -44,6 +44,9 @@ EXPORT_SYMBOL_GPL(xp_region_size);
 unsigned long (*xp_pa) (void *addr);
 EXPORT_SYMBOL_GPL(xp_pa);
 
+unsigned long (*xp_socket_pa) (unsigned long gpa);
+EXPORT_SYMBOL_GPL(xp_socket_pa);
+
 enum xp_retval (*xp_remote_memcpy) (unsigned long dst_gpa,
                                     const unsigned long src_gpa, size_t len);
 EXPORT_SYMBOL_GPL(xp_remote_memcpy);
diff --git a/drivers/misc/sgi-xp/xp_sn2.c b/drivers/misc/sgi-xp/xp_sn2.c
index fb3ec9d735a9..d8e463f87241 100644
--- a/drivers/misc/sgi-xp/xp_sn2.c
+++ b/drivers/misc/sgi-xp/xp_sn2.c
@@ -84,6 +84,15 @@ xp_pa_sn2(void *addr)
 }
 
 /*
+ * Convert a global physical to a socket physical address.
+ */
+static unsigned long
+xp_socket_pa_sn2(unsigned long gpa)
+{
+        return gpa;
+}
+
+/*
  * Wrapper for bte_copy().
  *
  *      dst_pa - physical address of the destination of the transfer.
@@ -162,6 +171,7 @@ xp_init_sn2(void)
         xp_region_size = sn_region_size;
 
         xp_pa = xp_pa_sn2;
+        xp_socket_pa = xp_socket_pa_sn2;
         xp_remote_memcpy = xp_remote_memcpy_sn2;
         xp_cpu_to_nasid = xp_cpu_to_nasid_sn2;
         xp_expand_memprotect = xp_expand_memprotect_sn2;
diff --git a/drivers/misc/sgi-xp/xp_uv.c b/drivers/misc/sgi-xp/xp_uv.c
index d238576b26fa..a0d093274dc0 100644
--- a/drivers/misc/sgi-xp/xp_uv.c
+++ b/drivers/misc/sgi-xp/xp_uv.c
@@ -32,12 +32,44 @@ xp_pa_uv(void *addr)
         return uv_gpa(addr);
 }
 
+/*
+ * Convert a global physical to socket physical address.
+ */
+static unsigned long
+xp_socket_pa_uv(unsigned long gpa)
+{
+        return uv_gpa_to_soc_phys_ram(gpa);
+}
+
+static enum xp_retval
+xp_remote_mmr_read(unsigned long dst_gpa, const unsigned long src_gpa,
+                   size_t len)
+{
+        int ret;
+        unsigned long *dst_va = __va(uv_gpa_to_soc_phys_ram(dst_gpa));
+
+        BUG_ON(!uv_gpa_in_mmr_space(src_gpa));
+        BUG_ON(len != 8);
+
+        ret = gru_read_gpa(dst_va, src_gpa);
+        if (ret == 0)
+                return xpSuccess;
+
+        dev_err(xp, "gru_read_gpa() failed, dst_gpa=0x%016lx src_gpa=0x%016lx "
+                "len=%ld\n", dst_gpa, src_gpa, len);
+        return xpGruCopyError;
+}
+
+
 static enum xp_retval
 xp_remote_memcpy_uv(unsigned long dst_gpa, const unsigned long src_gpa,
                     size_t len)
 {
         int ret;
 
+        if (uv_gpa_in_mmr_space(src_gpa))
+                return xp_remote_mmr_read(dst_gpa, src_gpa, len);
+
         ret = gru_copy_gpa(dst_gpa, src_gpa, len);
         if (ret == 0)
                 return xpSuccess;
@@ -123,6 +155,7 @@ xp_init_uv(void)
         xp_region_size = sn_region_size;
 
         xp_pa = xp_pa_uv;
+        xp_socket_pa = xp_socket_pa_uv;
         xp_remote_memcpy = xp_remote_memcpy_uv;
         xp_cpu_to_nasid = xp_cpu_to_nasid_uv;
         xp_expand_memprotect = xp_expand_memprotect_uv;
diff --git a/drivers/misc/sgi-xp/xpc_partition.c b/drivers/misc/sgi-xp/xpc_partition.c
index 65877bc5edaa..9a6268c89fdd 100644
--- a/drivers/misc/sgi-xp/xpc_partition.c
+++ b/drivers/misc/sgi-xp/xpc_partition.c
@@ -18,6 +18,7 @@
 #include <linux/device.h>
 #include <linux/hardirq.h>
 #include "xpc.h"
+#include <asm/uv/uv_hub.h>
 
 /* XPC is exiting flag */
 int xpc_exiting;
@@ -92,8 +93,12 @@ xpc_get_rsvd_page_pa(int nasid)
                         break;
 
                 /* !!! L1_CACHE_ALIGN() is only a sn2-bte_copy requirement */
-                if (L1_CACHE_ALIGN(len) > buf_len) {
-                        kfree(buf_base);
+                if (is_shub())
+                        len = L1_CACHE_ALIGN(len);
+
+                if (len > buf_len) {
+                        if (buf_base != NULL)
+                                kfree(buf_base);
                         buf_len = L1_CACHE_ALIGN(len);
                         buf = xpc_kmalloc_cacheline_aligned(buf_len, GFP_KERNEL,
                                                             &buf_base);
@@ -105,7 +110,7 @@ xpc_get_rsvd_page_pa(int nasid)
                         }
                 }
 
-                ret = xp_remote_memcpy(xp_pa(buf), rp_pa, buf_len);
+                ret = xp_remote_memcpy(xp_pa(buf), rp_pa, len);
                 if (ret != xpSuccess) {
                         dev_dbg(xpc_part, "xp_remote_memcpy failed %d\n", ret);
                         break;
@@ -143,7 +148,7 @@ xpc_setup_rsvd_page(void)
                 dev_err(xpc_part, "SAL failed to locate the reserved page\n");
                 return -ESRCH;
         }
-        rp = (struct xpc_rsvd_page *)__va(rp_pa);
+        rp = (struct xpc_rsvd_page *)__va(xp_socket_pa(rp_pa));
 
         if (rp->SAL_version < 3) {
                 /* SAL_versions < 3 had a SAL_partid defined as a u8 */
diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c
index b5bbe59f9c57..8725d5e8ab0c 100644
--- a/drivers/misc/sgi-xp/xpc_uv.c
+++ b/drivers/misc/sgi-xp/xpc_uv.c
@@ -157,22 +157,24 @@ xpc_gru_mq_watchlist_alloc_uv(struct xpc_gru_mq_uv *mq)
 {
         int ret;
 
-#if defined CONFIG_X86_64
-        ret = uv_bios_mq_watchlist_alloc(mq->mmr_blade, uv_gpa(mq->address),
-                                         mq->order, &mq->mmr_offset);
-        if (ret < 0) {
-                dev_err(xpc_part, "uv_bios_mq_watchlist_alloc() failed, "
-                        "ret=%d\n", ret);
-                return ret;
-        }
-#elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV
-        ret = sn_mq_watchlist_alloc(mq->mmr_blade, (void *)uv_gpa(mq->address),
+#if defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV
+        int mmr_pnode = uv_blade_to_pnode(mq->mmr_blade);
+
+        ret = sn_mq_watchlist_alloc(mmr_pnode, (void *)uv_gpa(mq->address),
                                     mq->order, &mq->mmr_offset);
         if (ret < 0) {
                 dev_err(xpc_part, "sn_mq_watchlist_alloc() failed, ret=%d\n",
                         ret);
                 return -EBUSY;
         }
+#elif defined CONFIG_X86_64
+        ret = uv_bios_mq_watchlist_alloc(uv_gpa(mq->address),
+                                         mq->order, &mq->mmr_offset);
+        if (ret < 0) {
+                dev_err(xpc_part, "uv_bios_mq_watchlist_alloc() failed, "
+                        "ret=%d\n", ret);
+                return ret;
+        }
 #else
         #error not a supported configuration
 #endif
@@ -185,12 +187,13 @@ static void
 xpc_gru_mq_watchlist_free_uv(struct xpc_gru_mq_uv *mq)
 {
         int ret;
+        int mmr_pnode = uv_blade_to_pnode(mq->mmr_blade);
 
 #if defined CONFIG_X86_64
-        ret = uv_bios_mq_watchlist_free(mq->mmr_blade, mq->watchlist_num);
+        ret = uv_bios_mq_watchlist_free(mmr_pnode, mq->watchlist_num);
         BUG_ON(ret != BIOS_STATUS_SUCCESS);
 #elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV
-        ret = sn_mq_watchlist_free(mq->mmr_blade, mq->watchlist_num);
+        ret = sn_mq_watchlist_free(mmr_pnode, mq->watchlist_num);
         BUG_ON(ret != SALRET_OK);
 #else
         #error not a supported configuration
@@ -204,6 +207,7 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name,
         enum xp_retval xp_ret;
         int ret;
         int nid;
+        int nasid;
         int pg_order;
         struct page *page;
         struct xpc_gru_mq_uv *mq;
@@ -259,9 +263,11 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name,
                 goto out_5;
         }
 
+        nasid = UV_PNODE_TO_NASID(uv_cpu_to_pnode(cpu));
+
         mmr_value = (struct uv_IO_APIC_route_entry *)&mq->mmr_value;
         ret = gru_create_message_queue(mq->gru_mq_desc, mq->address, mq_size,
-                                       nid, mmr_value->vector, mmr_value->dest);
+                                     nasid, mmr_value->vector, mmr_value->dest);
         if (ret != 0) {
                 dev_err(xpc_part, "gru_create_message_queue() returned "
                         "error=%d\n", ret);
@@ -946,11 +952,13 @@ xpc_get_fifo_entry_uv(struct xpc_fifo_head_uv *head)
                 head->first = first->next;
                 if (head->first == NULL)
                         head->last = NULL;
+
+                head->n_entries--;
+                BUG_ON(head->n_entries < 0);
+
+                first->next = NULL;
         }
-        head->n_entries--;
-        BUG_ON(head->n_entries < 0);
         spin_unlock_irqrestore(&head->lock, irq_flags);
-        first->next = NULL;
         return first;
 }
 
@@ -1019,7 +1027,8 @@ xpc_make_first_contact_uv(struct xpc_partition *part)
         xpc_send_activate_IRQ_part_uv(part, &msg, sizeof(msg),
                                       XPC_ACTIVATE_MQ_MSG_SYNC_ACT_STATE_UV);
 
-        while (part->sn.uv.remote_act_state != XPC_P_AS_ACTIVATING) {
+        while (!((part->sn.uv.remote_act_state == XPC_P_AS_ACTIVATING) ||
+                 (part->sn.uv.remote_act_state == XPC_P_AS_ACTIVE))) {
 
                 dev_dbg(xpc_part, "waiting to make first contact with "
                         "partition %d\n", XPC_PARTID(part));
@@ -1422,7 +1431,6 @@ xpc_handle_notify_mq_msg_uv(struct xpc_partition *part,
         msg_slot = ch_uv->recv_msg_slots +
             (msg->hdr.msg_slot_number % ch->remote_nentries) * ch->entry_size;
 
-        BUG_ON(msg->hdr.msg_slot_number != msg_slot->hdr.msg_slot_number);
         BUG_ON(msg_slot->hdr.size != 0);
 
         memcpy(msg_slot, msg, msg->hdr.size);
@@ -1646,8 +1654,6 @@ xpc_received_payload_uv(struct xpc_channel *ch, void *payload)
                                sizeof(struct xpc_notify_mq_msghdr_uv));
         if (ret != xpSuccess)
                 XPC_DEACTIVATE_PARTITION(&xpc_partitions[ch->partid], ret);
-
-        msg->hdr.msg_slot_number += ch->remote_nentries;
 }
 
 static struct xpc_arch_operations xpc_arch_ops_uv = {
diff --git a/drivers/misc/ti_dac7512.c b/drivers/misc/ti_dac7512.c
new file mode 100644
index 000000000000..d3f229a3a77e
--- /dev/null
+++ b/drivers/misc/ti_dac7512.c
@@ -0,0 +1,101 @@
+/*
+ *  dac7512.c - Linux kernel module for
+ *      Texas Instruments DAC7512
+ *
+ *  Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
+ *
+ *  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.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/spi/spi.h>
+
+#define DAC7512_DRV_NAME        "dac7512"
+#define DRIVER_VERSION          "1.0"
+
+static ssize_t dac7512_store_val(struct device *dev,
+                                 struct device_attribute *attr,
+                                 const char *buf, size_t count)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        unsigned char tmp[2];
+        unsigned long val;
+
+        if (strict_strtoul(buf, 10, &val) < 0)
+                return -EINVAL;
+
+        tmp[0] = val >> 8;
+        tmp[1] = val & 0xff;
+        spi_write(spi, tmp, sizeof(tmp));
+        return count;
+}
+
+static DEVICE_ATTR(value, S_IWUSR, NULL, dac7512_store_val);
+
+static struct attribute *dac7512_attributes[] = {
+        &dev_attr_value.attr,
+        NULL
+};
+
+static const struct attribute_group dac7512_attr_group = {
+        .attrs = dac7512_attributes,
+};
+
+static int __devinit dac7512_probe(struct spi_device *spi)
+{
+        int ret;
+
+        spi->bits_per_word = 8;
+        spi->mode = SPI_MODE_0;
+        ret = spi_setup(spi);
+        if (ret < 0)
+                return ret;
+
+        return sysfs_create_group(&spi->dev.kobj, &dac7512_attr_group);
+}
+
+static int __devexit dac7512_remove(struct spi_device *spi)
+{
+        sysfs_remove_group(&spi->dev.kobj, &dac7512_attr_group);
+        return 0;
+}
+
+static struct spi_driver dac7512_driver = {
+        .driver = {
+                .name   = DAC7512_DRV_NAME,
+                .owner  = THIS_MODULE,
+        },
+        .probe  = dac7512_probe,
+        .remove = __devexit_p(dac7512_remove),
+};
+
+static int __init dac7512_init(void)
+{
+        return spi_register_driver(&dac7512_driver);
+}
+
+static void __exit dac7512_exit(void)
+{
+        spi_unregister_driver(&dac7512_driver);
+}
+
+MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
+MODULE_DESCRIPTION("DAC7512 16-bit DAC");
+MODULE_LICENSE("GPL v2");
+MODULE_VERSION(DRIVER_VERSION);
+
+module_init(dac7512_init);
+module_exit(dac7512_exit);
diff --git a/drivers/mmc/core/Kconfig b/drivers/mmc/core/Kconfig
index ab37a6d9d32a..bb22ffd76ef8 100644
--- a/drivers/mmc/core/Kconfig
+++ b/drivers/mmc/core/Kconfig
@@ -3,7 +3,7 @@
 #
 
 config MMC_UNSAFE_RESUME
-        bool "Allow unsafe resume (DANGEROUS)"
+        bool "Assume MMC/SD cards are non-removable (DANGEROUS)"
         help
           If you say Y here, the MMC layer will assume that all cards
           stayed in their respective slots during the suspend. The
@@ -14,3 +14,5 @@ config MMC_UNSAFE_RESUME
           This option is usually just for embedded systems which use
           a MMC/SD card for rootfs. Most people should say N here.
 
+          This option sets a default which can be overridden by the
+          module parameter "removable=0" or "removable=1".
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 7dab2e5f4bc9..30acd5265821 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -48,6 +48,22 @@ int use_spi_crc = 1;
 module_param(use_spi_crc, bool, 0);
 
 /*
+ * We normally treat cards as removed during suspend if they are not
+ * known to be on a non-removable bus, to avoid the risk of writing
+ * back data to a different card after resume.  Allow this to be
+ * overridden if necessary.
+ */
+#ifdef CONFIG_MMC_UNSAFE_RESUME
+int mmc_assume_removable;
+#else
+int mmc_assume_removable = 1;
+#endif
+module_param_named(removable, mmc_assume_removable, bool, 0644);
+MODULE_PARM_DESC(
+        removable,
+        "MMC/SD cards are removable and may be removed during suspend");
+
+/*
  * Internal function. Schedule delayed work in the MMC work queue.
  */
 static int mmc_schedule_delayed_work(struct delayed_work *work,
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index 67ae6abc4230..a811c52a1659 100644
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -54,7 +54,9 @@ int mmc_attach_mmc(struct mmc_host *host, u32 ocr);
 int mmc_attach_sd(struct mmc_host *host, u32 ocr);
 int mmc_attach_sdio(struct mmc_host *host, u32 ocr);
 
+/* Module parameters */
 extern int use_spi_crc;
+extern int mmc_assume_removable;
 
 /* Debugfs information for hosts and cards */
 void mmc_add_host_debugfs(struct mmc_host *host);
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index bfefce365ae7..c11189446a1f 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -602,25 +602,6 @@ static int mmc_awake(struct mmc_host *host)
         return err;
 }
 
-#ifdef CONFIG_MMC_UNSAFE_RESUME
-
-static const struct mmc_bus_ops mmc_ops = {
-        .awake = mmc_awake,
-        .sleep = mmc_sleep,
-        .remove = mmc_remove,
-        .detect = mmc_detect,
-        .suspend = mmc_suspend,
-        .resume = mmc_resume,
-        .power_restore = mmc_power_restore,
-};
-
-static void mmc_attach_bus_ops(struct mmc_host *host)
-{
-        mmc_attach_bus(host, &mmc_ops);
-}
-
-#else
-
 static const struct mmc_bus_ops mmc_ops = {
         .awake = mmc_awake,
         .sleep = mmc_sleep,
@@ -645,15 +626,13 @@ static void mmc_attach_bus_ops(struct mmc_host *host)
 {
         const struct mmc_bus_ops *bus_ops;
 
-        if (host->caps & MMC_CAP_NONREMOVABLE)
+        if (host->caps & MMC_CAP_NONREMOVABLE || !mmc_assume_removable)
                 bus_ops = &mmc_ops_unsafe;
         else
                 bus_ops = &mmc_ops;
         mmc_attach_bus(host, bus_ops);
 }
 
-#endif
-
 /*
  * Starting point for MMC card init.
  */
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 10b2a4d20f5a..fdd414eded09 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -606,23 +606,6 @@ static void mmc_sd_power_restore(struct mmc_host *host)
         mmc_release_host(host);
 }
 
-#ifdef CONFIG_MMC_UNSAFE_RESUME
-
-static const struct mmc_bus_ops mmc_sd_ops = {
-        .remove = mmc_sd_remove,
-        .detect = mmc_sd_detect,
-        .suspend = mmc_sd_suspend,
-        .resume = mmc_sd_resume,
-        .power_restore = mmc_sd_power_restore,
-};
-
-static void mmc_sd_attach_bus_ops(struct mmc_host *host)
-{
-        mmc_attach_bus(host, &mmc_sd_ops);
-}
-
-#else
-
 static const struct mmc_bus_ops mmc_sd_ops = {
         .remove = mmc_sd_remove,
         .detect = mmc_sd_detect,
@@ -643,15 +626,13 @@ static void mmc_sd_attach_bus_ops(struct mmc_host *host)
 {
         const struct mmc_bus_ops *bus_ops;
 
-        if (host->caps & MMC_CAP_NONREMOVABLE)
+        if (host->caps & MMC_CAP_NONREMOVABLE || !mmc_assume_removable)
                 bus_ops = &mmc_sd_ops_unsafe;
         else
                 bus_ops = &mmc_sd_ops;
         mmc_attach_bus(host, bus_ops);
 }
 
-#endif
-
 /*
  * Starting point for SD card init.
  */
diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c
index f85dcd536508..9538389783c1 100644
--- a/drivers/mmc/core/sdio_cis.c
+++ b/drivers/mmc/core/sdio_cis.c
@@ -97,26 +97,56 @@ static const unsigned char speed_val[16] =
 static const unsigned int speed_unit[8] =
         { 10000, 100000, 1000000, 10000000, 0, 0, 0, 0 };
 
-/* FUNCE tuples with these types get passed to SDIO drivers */
-static const unsigned char funce_type_whitelist[] = {
-        4 /* CISTPL_FUNCE_LAN_NODE_ID used in Broadcom cards */
+
+typedef int (tpl_parse_t)(struct mmc_card *, struct sdio_func *,
+                           const unsigned char *, unsigned);
+
+struct cis_tpl {
+        unsigned char code;
+        unsigned char min_size;
+        tpl_parse_t *parse;
 };
 
-static int cistpl_funce_whitelisted(unsigned char type)
+static int cis_tpl_parse(struct mmc_card *card, struct sdio_func *func,
+                         const char *tpl_descr,
+                         const struct cis_tpl *tpl, int tpl_count,
+                         unsigned char code,
+                         const unsigned char *buf, unsigned size)
 {
-        int i;
+        int i, ret;
 
-        for (i = 0; i < ARRAY_SIZE(funce_type_whitelist); i++) {
-                if (funce_type_whitelist[i] == type)
-                        return 1;
+        /* look for a matching code in the table */
+        for (i = 0; i < tpl_count; i++, tpl++) {
+                if (tpl->code == code)
+                        break;
         }
-        return 0;
+        if (i < tpl_count) {
+                if (size >= tpl->min_size) {
+                        if (tpl->parse)
+                                ret = tpl->parse(card, func, buf, size);
+                        else
+                                ret = -EILSEQ;  /* known tuple, not parsed */
+                } else {
+                        /* invalid tuple */
+                        ret = -EINVAL;
+                }
+                if (ret && ret != -EILSEQ && ret != -ENOENT) {
+                        printk(KERN_ERR "%s: bad %s tuple 0x%02x (%u bytes)\n",
+                               mmc_hostname(card->host), tpl_descr, code, size);
+                }
+        } else {
+                /* unknown tuple */
+                ret = -ENOENT;
+        }
+
+        return ret;
 }
 
-static int cistpl_funce_common(struct mmc_card *card,
+static int cistpl_funce_common(struct mmc_card *card, struct sdio_func *func,
                                const unsigned char *buf, unsigned size)
 {
-        if (size < 0x04 || buf[0] != 0)
+        /* Only valid for the common CIS (function 0) */
+        if (func)
                 return -EINVAL;
 
         /* TPLFE_FN0_BLK_SIZE */
@@ -129,20 +159,24 @@ static int cistpl_funce_common(struct mmc_card *card,
         return 0;
 }
 
-static int cistpl_funce_func(struct sdio_func *func,
+static int cistpl_funce_func(struct mmc_card *card, struct sdio_func *func,
                              const unsigned char *buf, unsigned size)
 {
         unsigned vsn;
         unsigned min_size;
 
-        /* let SDIO drivers take care of whitelisted FUNCE tuples */
-        if (cistpl_funce_whitelisted(buf[0]))
-                return -EILSEQ;
+        /* Only valid for the individual function's CIS (1-7) */
+        if (!func)
+                return -EINVAL;
 
+        /*
+         * This tuple has a different length depending on the SDIO spec
+         * version.
+         */
         vsn = func->card->cccr.sdio_vsn;
         min_size = (vsn == SDIO_SDIO_REV_1_00) ? 28 : 42;
 
-        if (size < min_size || buf[0] != 1)
+        if (size < min_size)
                 return -EINVAL;
 
         /* TPLFE_MAX_BLK_SIZE */
@@ -157,39 +191,32 @@ static int cistpl_funce_func(struct sdio_func *func,
         return 0;
 }
 
+/*
+ * Known TPLFE_TYPEs table for CISTPL_FUNCE tuples.
+ *
+ * Note that, unlike PCMCIA, CISTPL_FUNCE tuples are not parsed depending
+ * on the TPLFID_FUNCTION value of the previous CISTPL_FUNCID as on SDIO
+ * TPLFID_FUNCTION is always hardcoded to 0x0C.
+ */
+static const struct cis_tpl cis_tpl_funce_list[] = {
+        {       0x00,   4,      cistpl_funce_common             },
+        {       0x01,   0,      cistpl_funce_func               },
+        {       0x04,   1+1+6,  /* CISTPL_FUNCE_LAN_NODE_ID */  },
+};
+
 static int cistpl_funce(struct mmc_card *card, struct sdio_func *func,
                         const unsigned char *buf, unsigned size)
 {
-        int ret;
-
-        /*
-         * There should be two versions of the CISTPL_FUNCE tuple,
-         * one for the common CIS (function 0) and a version used by
-         * the individual function's CIS (1-7). Yet, the later has a
-         * different length depending on the SDIO spec version.
-         */
-        if (func)
-                ret = cistpl_funce_func(func, buf, size);
-        else
-                ret = cistpl_funce_common(card, buf, size);
-
-        if (ret && ret != -EILSEQ) {
-                printk(KERN_ERR "%s: bad CISTPL_FUNCE size %u "
-                       "type %u\n", mmc_hostname(card->host), size, buf[0]);
-        }
+        if (size < 1)
+                return -EINVAL;
 
-        return ret;
+        return cis_tpl_parse(card, func, "CISTPL_FUNCE",
+                             cis_tpl_funce_list,
+                             ARRAY_SIZE(cis_tpl_funce_list),
+                             buf[0], buf, size);
 }
 
-typedef int (tpl_parse_t)(struct mmc_card *, struct sdio_func *,
-                           const unsigned char *, unsigned);
-
-struct cis_tpl {
-        unsigned char code;
-        unsigned char min_size;
-        tpl_parse_t *parse;
-};
-
+/* Known TPL_CODEs table for CIS tuples */
 static const struct cis_tpl cis_tpl_list[] = {
         {       0x15,   3,      cistpl_vers_1           },
         {       0x20,   4,      cistpl_manfid           },
@@ -268,46 +295,38 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func)
                         break;
                 }
 
-                for (i = 0; i < ARRAY_SIZE(cis_tpl_list); i++)
-                        if (cis_tpl_list[i].code == tpl_code)
-                                break;
-                if (i < ARRAY_SIZE(cis_tpl_list)) {
-                        const struct cis_tpl *tpl = cis_tpl_list + i;
-                        if (tpl_link < tpl->min_size) {
-                                printk(KERN_ERR
-                                       "%s: bad CIS tuple 0x%02x"
-                                       " (length = %u, expected >= %u)\n",
-                                       mmc_hostname(card->host),
-                                       tpl_code, tpl_link, tpl->min_size);
-                                ret = -EINVAL;
-                        } else if (tpl->parse) {
-                                ret = tpl->parse(card, func,
-                                                 this->data, tpl_link);
-                        }
+                /* Try to parse the CIS tuple */
+                ret = cis_tpl_parse(card, func, "CIS",
+                                    cis_tpl_list, ARRAY_SIZE(cis_tpl_list),
+                                    tpl_code, this->data, tpl_link);
+                if (ret == -EILSEQ || ret == -ENOENT) {
                         /*
-                         * We don't need the tuple anymore if it was
-                         * successfully parsed by the SDIO core or if it is
-                         * not going to be parsed by SDIO drivers.
+                         * The tuple is unknown or known but not parsed.
+                         * Queue the tuple for the function driver.
                          */
-                        if (!ret || ret != -EILSEQ)
-                                kfree(this);
-                } else {
-                        /* unknown tuple */
-                        ret = -EILSEQ;
-                }
-
-                if (ret == -EILSEQ) {
-                        /* this tuple is unknown to the core or whitelisted */
                         this->next = NULL;
                         this->code = tpl_code;
                         this->size = tpl_link;
                         *prev = this;
                         prev = &this->next;
-                        printk(KERN_DEBUG
-                               "%s: queuing CIS tuple 0x%02x length %u\n",
-                               mmc_hostname(card->host), tpl_code, tpl_link);
+
+                        if (ret == -ENOENT) {
+                                /* warn about unknown tuples */
+                                printk(KERN_WARNING "%s: queuing unknown"
+                                       " CIS tuple 0x%02x (%u bytes)\n",
+                                       mmc_hostname(card->host),
+                                       tpl_code, tpl_link);
+                        }
+
                         /* keep on analyzing tuples */
                         ret = 0;
+                } else {
+                        /*
+                         * We don't need the tuple anymore if it was
+                         * successfully parsed by the SDIO core or if it is
+                         * not going to be queued for a driver.
+                         */
+                        kfree(this);
                 }
 
                 ptr += tpl_link;
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index e04b751680d0..9d405b181781 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -251,6 +251,14 @@ config MMC_MVSDIO
           To compile this driver as a module, choose M here: the
           module will be called mvsdio.
 
+config MMC_DAVINCI
+        tristate "TI DAVINCI Multimedia Card Interface support"
+        depends on ARCH_DAVINCI
+        help
+          This selects the TI DAVINCI Multimedia card Interface.
+          If you have an DAVINCI board with a Multimedia Card slot,
+          say Y or M here.  If unsure, say N.
+
 config MMC_SPI
         tristate "MMC/SD/SDIO over SPI"
         depends on SPI_MASTER && !HIGHMEM && HAS_DMA
@@ -357,3 +365,22 @@ config MMC_VIA_SDMMC
           If you have a controller with this interface, say Y or M here.
 
           If unsure, say N.
+
+config SDH_BFIN
+        tristate "Blackfin Secure Digital Host support"
+        depends on MMC && ((BF54x && !BF544) || (BF51x && !BF512))
+        help
+          If you say yes here you will get support for the Blackfin on-chip
+          Secure Digital Host interface.  This includes support for MMC and
+          SD cards.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bfin_sdh.
+
+          If unsure, say N.
+
+config SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND
+        bool "Blackfin EZkit Missing SDH_CMD Pull Up Resistor Workaround"
+        depends on SDH_BFIN
+        help
+          If you say yes here SD-Cards may work on the EZkit.
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index abcb0400e06d..ded4d8cdd9d7 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_MMC_ATMELMCI)	+= atmel-mci.o
 obj-$(CONFIG_MMC_TIFM_SD)       += tifm_sd.o
 obj-$(CONFIG_MMC_MSM7X00A)      += msm_sdcc.o
 obj-$(CONFIG_MMC_MVSDIO)        += mvsdio.o
+obj-$(CONFIG_MMC_DAVINCI)       += davinci_mmc.o
 obj-$(CONFIG_MMC_SPI)           += mmc_spi.o
 ifeq ($(CONFIG_OF),y)
 obj-$(CONFIG_MMC_SPI)           += of_mmc_spi.o
@@ -34,6 +35,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_cs.o
 obj-$(CONFIG_MMC_TMIO)          += tmio_mmc.o
 obj-$(CONFIG_MMC_CB710) += cb710-mmc.o
 obj-$(CONFIG_MMC_VIA_SDMMC)     += via-sdmmc.o
+obj-$(CONFIG_SDH_BFIN)          += bfin_sdh.o
 
 ifeq ($(CONFIG_CB710_DEBUG),y)
         CFLAGS-cb710-mmc        += -DDEBUG
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index fc25586b7ee1..8072128e933b 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -25,6 +25,8 @@
 #include <linux/stat.h>
 
 #include <linux/mmc/host.h>
+
+#include <mach/atmel-mci.h>
 #include <linux/atmel-mci.h>
 
 #include <asm/io.h>
@@ -92,6 +94,7 @@ struct atmel_mci_dma {
  * @need_clock_update: Update the clock rate before the next request.
  * @need_reset: Reset controller before next request.
  * @mode_reg: Value of the MR register.
+ * @cfg_reg: Value of the CFG register.
  * @bus_hz: The rate of @mck in Hz. This forms the basis for MMC bus
  *      rate and timeout calculations.
  * @mapbase: Physical address of the MMIO registers.
@@ -155,6 +158,7 @@ struct atmel_mci {
         bool                    need_clock_update;
         bool                    need_reset;
         u32                     mode_reg;
+        u32                     cfg_reg;
         unsigned long           bus_hz;
         unsigned long           mapbase;
         struct clk              *mck;
@@ -223,6 +227,19 @@ static bool mci_has_rwproof(void)
 }
 
 /*
+ * The new MCI2 module isn't 100% compatible with the old MCI module,
+ * and it has a few nice features which we want to use...
+ */
+static inline bool atmci_is_mci2(void)
+{
+        if (cpu_is_at91sam9g45())
+                return true;
+
+        return false;
+}
+
+
+/*
  * The debugfs stuff below is mostly optimized away when
  * CONFIG_DEBUG_FS is not set.
  */
@@ -357,12 +374,33 @@ static int atmci_regs_show(struct seq_file *s, void *v)
                         buf[MCI_BLKR / 4],
                         buf[MCI_BLKR / 4] & 0xffff,
                         (buf[MCI_BLKR / 4] >> 16) & 0xffff);
+        if (atmci_is_mci2())
+                seq_printf(s, "CSTOR:\t0x%08x\n", buf[MCI_CSTOR / 4]);
 
         /* Don't read RSPR and RDR; it will consume the data there */
 
         atmci_show_status_reg(s, "SR", buf[MCI_SR / 4]);
         atmci_show_status_reg(s, "IMR", buf[MCI_IMR / 4]);
 
+        if (atmci_is_mci2()) {
+                u32 val;
+
+                val = buf[MCI_DMA / 4];
+                seq_printf(s, "DMA:\t0x%08x OFFSET=%u CHKSIZE=%u%s\n",
+                                val, val & 3,
+                                ((val >> 4) & 3) ?
+                                        1 << (((val >> 4) & 3) + 1) : 1,
+                                val & MCI_DMAEN ? " DMAEN" : "");
+
+                val = buf[MCI_CFG / 4];
+                seq_printf(s, "CFG:\t0x%08x%s%s%s%s\n",
+                                val,
+                                val & MCI_CFG_FIFOMODE_1DATA ? " FIFOMODE_ONE_DATA" : "",
+                                val & MCI_CFG_FERRCTRL_COR ? " FERRCTRL_CLEAR_ON_READ" : "",
+                                val & MCI_CFG_HSMODE ? " HSMODE" : "",
+                                val & MCI_CFG_LSYNC ? " LSYNC" : "");
+        }
+
         kfree(buf);
 
         return 0;
@@ -557,6 +595,10 @@ static void atmci_dma_complete(void *arg)
 
         dev_vdbg(&host->pdev->dev, "DMA complete\n");
 
+        if (atmci_is_mci2())
+                /* Disable DMA hardware handshaking on MCI */
+                mci_writel(host, DMA, mci_readl(host, DMA) & ~MCI_DMAEN);
+
         atmci_dma_cleanup(host);
 
         /*
@@ -592,7 +634,7 @@ static void atmci_dma_complete(void *arg)
 }
 
 static int
-atmci_submit_data_dma(struct atmel_mci *host, struct mmc_data *data)
+atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data)
 {
         struct dma_chan                 *chan;
         struct dma_async_tx_descriptor  *desc;
@@ -624,6 +666,9 @@ atmci_submit_data_dma(struct atmel_mci *host, struct mmc_data *data)
         if (!chan)
                 return -ENODEV;
 
+        if (atmci_is_mci2())
+                mci_writel(host, DMA, MCI_DMA_CHKSIZE(3) | MCI_DMAEN);
+
         if (data->flags & MMC_DATA_READ)
                 direction = DMA_FROM_DEVICE;
         else
@@ -641,10 +686,6 @@ atmci_submit_data_dma(struct atmel_mci *host, struct mmc_data *data)
         host->dma.data_desc = desc;
         desc->callback = atmci_dma_complete;
         desc->callback_param = host;
-        desc->tx_submit(desc);
-
-        /* Go! */
-        chan->device->device_issue_pending(chan);
 
         return 0;
 unmap_exit:
@@ -652,13 +693,26 @@ unmap_exit:
         return -ENOMEM;
 }
 
+static void atmci_submit_data(struct atmel_mci *host)
+{
+        struct dma_chan                 *chan = host->data_chan;
+        struct dma_async_tx_descriptor  *desc = host->dma.data_desc;
+
+        if (chan) {
+                desc->tx_submit(desc);
+                chan->device->device_issue_pending(chan);
+        }
+}
+
 #else /* CONFIG_MMC_ATMELMCI_DMA */
 
-static int atmci_submit_data_dma(struct atmel_mci *host, struct mmc_data *data)
+static int atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data)
 {
         return -ENOSYS;
 }
 
+static void atmci_submit_data(struct atmel_mci *host) {}
+
 static void atmci_stop_dma(struct atmel_mci *host)
 {
         /* Data transfer was stopped by the interrupt handler */
@@ -672,7 +726,7 @@ static void atmci_stop_dma(struct atmel_mci *host)
  * Returns a mask of interrupt flags to be enabled after the whole
  * request has been prepared.
  */
-static u32 atmci_submit_data(struct atmel_mci *host, struct mmc_data *data)
+static u32 atmci_prepare_data(struct atmel_mci *host, struct mmc_data *data)
 {
         u32 iflags;
 
@@ -683,7 +737,7 @@ static u32 atmci_submit_data(struct atmel_mci *host, struct mmc_data *data)
         host->data = data;
 
         iflags = ATMCI_DATA_ERROR_FLAGS;
-        if (atmci_submit_data_dma(host, data)) {
+        if (atmci_prepare_data_dma(host, data)) {
                 host->data_chan = NULL;
 
                 /*
@@ -729,6 +783,8 @@ static void atmci_start_request(struct atmel_mci *host,
                 mci_writel(host, CR, MCI_CR_SWRST);
                 mci_writel(host, CR, MCI_CR_MCIEN);
                 mci_writel(host, MR, host->mode_reg);
+                if (atmci_is_mci2())
+                        mci_writel(host, CFG, host->cfg_reg);
                 host->need_reset = false;
         }
         mci_writel(host, SDCR, slot->sdc_reg);
@@ -744,6 +800,7 @@ static void atmci_start_request(struct atmel_mci *host,
                 while (!(mci_readl(host, SR) & MCI_CMDRDY))
                         cpu_relax();
         }
+        iflags = 0;
         data = mrq->data;
         if (data) {
                 atmci_set_timeout(host, slot, data);
@@ -753,15 +810,17 @@ static void atmci_start_request(struct atmel_mci *host,
                                 | MCI_BLKLEN(data->blksz));
                 dev_vdbg(&slot->mmc->class_dev, "BLKR=0x%08x\n",
                         MCI_BCNT(data->blocks) | MCI_BLKLEN(data->blksz));
+
+                iflags |= atmci_prepare_data(host, data);
         }
 
-        iflags = MCI_CMDRDY;
+        iflags |= MCI_CMDRDY;
         cmd = mrq->cmd;
         cmdflags = atmci_prepare_command(slot->mmc, cmd);
         atmci_start_command(host, cmd, cmdflags);
 
         if (data)
-                iflags |= atmci_submit_data(host, data);
+                atmci_submit_data(host);
 
         if (mrq->stop) {
                 host->stop_cmdr = atmci_prepare_command(slot->mmc, mrq->stop);
@@ -857,6 +916,8 @@ static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                         clk_enable(host->mck);
                         mci_writel(host, CR, MCI_CR_SWRST);
                         mci_writel(host, CR, MCI_CR_MCIEN);
+                        if (atmci_is_mci2())
+                                mci_writel(host, CFG, host->cfg_reg);
                 }
 
                 /*
@@ -1095,6 +1156,8 @@ static void atmci_detect_change(unsigned long data)
                                 mci_writel(host, CR, MCI_CR_SWRST);
                                 mci_writel(host, CR, MCI_CR_MCIEN);
                                 mci_writel(host, MR, host->mode_reg);
+                                if (atmci_is_mci2())
+                                        mci_writel(host, CFG, host->cfg_reg);
 
                                 host->data = NULL;
                                 host->cmd = NULL;
@@ -1584,14 +1647,47 @@ static void __exit atmci_cleanup_slot(struct atmel_mci_slot *slot,
 #ifdef CONFIG_MMC_ATMELMCI_DMA
 static bool filter(struct dma_chan *chan, void *slave)
 {
-        struct dw_dma_slave *dws = slave;
+        struct mci_dma_data     *sl = slave;
 
-        if (dws->dma_dev == chan->device->dev) {
-                chan->private = dws;
+        if (sl && find_slave_dev(sl) == chan->device->dev) {
+                chan->private = slave_data_ptr(sl);
                 return true;
-        } else
+        } else {
                 return false;
+        }
 }
+
+static void atmci_configure_dma(struct atmel_mci *host)
+{
+        struct mci_platform_data        *pdata;
+
+        if (host == NULL)
+                return;
+
+        pdata = host->pdev->dev.platform_data;
+
+        if (pdata && find_slave_dev(pdata->dma_slave)) {
+                dma_cap_mask_t mask;
+
+                setup_dma_addr(pdata->dma_slave,
+                               host->mapbase + MCI_TDR,
+                               host->mapbase + MCI_RDR);
+
+                /* Try to grab a DMA channel */
+                dma_cap_zero(mask);
+                dma_cap_set(DMA_SLAVE, mask);
+                host->dma.chan =
+                        dma_request_channel(mask, filter, pdata->dma_slave);
+        }
+        if (!host->dma.chan)
+                dev_notice(&host->pdev->dev, "DMA not available, using PIO\n");
+        else
+                dev_info(&host->pdev->dev,
+                                        "Using %s for DMA transfers\n",
+                                        dma_chan_name(host->dma.chan));
+}
+#else
+static void atmci_configure_dma(struct atmel_mci *host) {}
 #endif
 
 static int __init atmci_probe(struct platform_device *pdev)
@@ -1645,22 +1741,7 @@ static int __init atmci_probe(struct platform_device *pdev)
         if (ret)
                 goto err_request_irq;
 
-#ifdef CONFIG_MMC_ATMELMCI_DMA
-        if (pdata->dma_slave.dma_dev) {
-                struct dw_dma_slave *dws = &pdata->dma_slave;
-                dma_cap_mask_t mask;
-
-                dws->tx_reg = regs->start + MCI_TDR;
-                dws->rx_reg = regs->start + MCI_RDR;
-
-                /* Try to grab a DMA channel */
-                dma_cap_zero(mask);
-                dma_cap_set(DMA_SLAVE, mask);
-                host->dma.chan = dma_request_channel(mask, filter, dws);
-        }
-        if (!host->dma.chan)
-                dev_notice(&pdev->dev, "DMA not available, using PIO\n");
-#endif /* CONFIG_MMC_ATMELMCI_DMA */
+        atmci_configure_dma(host);
 
         platform_set_drvdata(pdev, host);
 
diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c
new file mode 100644
index 000000000000..3343a57355cc
--- /dev/null
+++ b/drivers/mmc/host/bfin_sdh.c
@@ -0,0 +1,639 @@
+/*
+ * bfin_sdh.c - Analog Devices Blackfin SDH Controller
+ *
+ * Copyright (C) 2007-2009 Analog Device Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#define DRIVER_NAME     "bfin-sdh"
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+#include <linux/mmc/host.h>
+#include <linux/proc_fs.h>
+
+#include <asm/cacheflush.h>
+#include <asm/dma.h>
+#include <asm/portmux.h>
+#include <asm/bfin_sdh.h>
+
+#if defined(CONFIG_BF51x)
+#define bfin_read_SDH_PWR_CTL           bfin_read_RSI_PWR_CTL
+#define bfin_write_SDH_PWR_CTL          bfin_write_RSI_PWR_CTL
+#define bfin_read_SDH_CLK_CTL           bfin_read_RSI_CLK_CTL
+#define bfin_write_SDH_CLK_CTL          bfin_write_RSI_CLK_CTL
+#define bfin_write_SDH_ARGUMENT         bfin_write_RSI_ARGUMENT
+#define bfin_write_SDH_COMMAND          bfin_write_RSI_COMMAND
+#define bfin_write_SDH_DATA_TIMER       bfin_write_RSI_DATA_TIMER
+#define bfin_read_SDH_RESPONSE0         bfin_read_RSI_RESPONSE0
+#define bfin_read_SDH_RESPONSE1         bfin_read_RSI_RESPONSE1
+#define bfin_read_SDH_RESPONSE2         bfin_read_RSI_RESPONSE2
+#define bfin_read_SDH_RESPONSE3         bfin_read_RSI_RESPONSE3
+#define bfin_write_SDH_DATA_LGTH        bfin_write_RSI_DATA_LGTH
+#define bfin_read_SDH_DATA_CTL          bfin_read_RSI_DATA_CTL
+#define bfin_write_SDH_DATA_CTL         bfin_write_RSI_DATA_CTL
+#define bfin_read_SDH_DATA_CNT          bfin_read_RSI_DATA_CNT
+#define bfin_write_SDH_STATUS_CLR       bfin_write_RSI_STATUS_CLR
+#define bfin_read_SDH_E_STATUS          bfin_read_RSI_E_STATUS
+#define bfin_write_SDH_E_STATUS         bfin_write_RSI_E_STATUS
+#define bfin_read_SDH_STATUS            bfin_read_RSI_STATUS
+#define bfin_write_SDH_MASK0            bfin_write_RSI_MASK0
+#define bfin_read_SDH_CFG               bfin_read_RSI_CFG
+#define bfin_write_SDH_CFG              bfin_write_RSI_CFG
+#endif
+
+struct dma_desc_array {
+        unsigned long   start_addr;
+        unsigned short  cfg;
+        unsigned short  x_count;
+        short           x_modify;
+} __packed;
+
+struct sdh_host {
+        struct mmc_host         *mmc;
+        spinlock_t              lock;
+        struct resource         *res;
+        void __iomem            *base;
+        int                     irq;
+        int                     stat_irq;
+        int                     dma_ch;
+        int                     dma_dir;
+        struct dma_desc_array   *sg_cpu;
+        dma_addr_t              sg_dma;
+        int                     dma_len;
+
+        unsigned int            imask;
+        unsigned int            power_mode;
+        unsigned int            clk_div;
+
+        struct mmc_request      *mrq;
+        struct mmc_command      *cmd;
+        struct mmc_data         *data;
+};
+
+static struct bfin_sd_host *get_sdh_data(struct platform_device *pdev)
+{
+        return pdev->dev.platform_data;
+}
+
+static void sdh_stop_clock(struct sdh_host *host)
+{
+        bfin_write_SDH_CLK_CTL(bfin_read_SDH_CLK_CTL() & ~CLK_E);
+        SSYNC();
+}
+
+static void sdh_enable_stat_irq(struct sdh_host *host, unsigned int mask)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&host->lock, flags);
+        host->imask |= mask;
+        bfin_write_SDH_MASK0(mask);
+        SSYNC();
+        spin_unlock_irqrestore(&host->lock, flags);
+}
+
+static void sdh_disable_stat_irq(struct sdh_host *host, unsigned int mask)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&host->lock, flags);
+        host->imask &= ~mask;
+        bfin_write_SDH_MASK0(host->imask);
+        SSYNC();
+        spin_unlock_irqrestore(&host->lock, flags);
+}
+
+static int sdh_setup_data(struct sdh_host *host, struct mmc_data *data)
+{
+        unsigned int length;
+        unsigned int data_ctl;
+        unsigned int dma_cfg;
+        struct scatterlist *sg;
+
+        dev_dbg(mmc_dev(host->mmc), "%s enter flags: 0x%x\n", __func__, data->flags);
+        host->data = data;
+        data_ctl = 0;
+        dma_cfg = 0;
+
+        length = data->blksz * data->blocks;
+        bfin_write_SDH_DATA_LGTH(length);
+
+        if (data->flags & MMC_DATA_STREAM)
+                data_ctl |= DTX_MODE;
+
+        if (data->flags & MMC_DATA_READ)
+                data_ctl |= DTX_DIR;
+        /* Only supports power-of-2 block size */
+        if (data->blksz & (data->blksz - 1))
+                return -EINVAL;
+        data_ctl |= ((ffs(data->blksz) - 1) << 4);
+
+        bfin_write_SDH_DATA_CTL(data_ctl);
+
+        bfin_write_SDH_DATA_TIMER(0xFFFF);
+        SSYNC();
+
+        if (data->flags & MMC_DATA_READ) {
+                host->dma_dir = DMA_FROM_DEVICE;
+                dma_cfg |= WNR;
+        } else
+                host->dma_dir = DMA_TO_DEVICE;
+
+        sdh_enable_stat_irq(host, (DAT_CRC_FAIL | DAT_TIME_OUT | DAT_END));
+        host->dma_len = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len, host->dma_dir);
+#if defined(CONFIG_BF54x)
+        dma_cfg |= DMAFLOW_ARRAY | NDSIZE_5 | RESTART | WDSIZE_32 | DMAEN;
+        {
+                int i;
+                for_each_sg(data->sg, sg, host->dma_len, i) {
+                        host->sg_cpu[i].start_addr = sg_dma_address(sg);
+                        host->sg_cpu[i].cfg = dma_cfg;
+                        host->sg_cpu[i].x_count = sg_dma_len(sg) / 4;
+                        host->sg_cpu[i].x_modify = 4;
+                        dev_dbg(mmc_dev(host->mmc), "%d: start_addr:0x%lx, "
+                                "cfg:0x%x, x_count:0x%x, x_modify:0x%x\n",
+                                i, host->sg_cpu[i].start_addr,
+                                host->sg_cpu[i].cfg, host->sg_cpu[i].x_count,
+                                host->sg_cpu[i].x_modify);
+                }
+        }
+        flush_dcache_range((unsigned int)host->sg_cpu,
+                (unsigned int)host->sg_cpu +
+                        host->dma_len * sizeof(struct dma_desc_array));
+        /* Set the last descriptor to stop mode */
+        host->sg_cpu[host->dma_len - 1].cfg &= ~(DMAFLOW | NDSIZE);
+        host->sg_cpu[host->dma_len - 1].cfg |= DI_EN;
+
+        set_dma_curr_desc_addr(host->dma_ch, (unsigned long *)host->sg_dma);
+        set_dma_x_count(host->dma_ch, 0);
+        set_dma_x_modify(host->dma_ch, 0);
+        set_dma_config(host->dma_ch, dma_cfg);
+#elif defined(CONFIG_BF51x)
+        /* RSI DMA doesn't work in array mode */
+        dma_cfg |= WDSIZE_32 | DMAEN;
+        set_dma_start_addr(host->dma_ch, sg_dma_address(&data->sg[0]));
+        set_dma_x_count(host->dma_ch, length / 4);
+        set_dma_x_modify(host->dma_ch, 4);
+        set_dma_config(host->dma_ch, dma_cfg);
+#endif
+        bfin_write_SDH_DATA_CTL(bfin_read_SDH_DATA_CTL() | DTX_DMA_E | DTX_E);
+
+        SSYNC();
+
+        dev_dbg(mmc_dev(host->mmc), "%s exit\n", __func__);
+        return 0;
+}
+
+static void sdh_start_cmd(struct sdh_host *host, struct mmc_command *cmd)
+{
+        unsigned int sdh_cmd;
+        unsigned int stat_mask;
+
+        dev_dbg(mmc_dev(host->mmc), "%s enter cmd: 0x%p\n", __func__, cmd);
+        WARN_ON(host->cmd != NULL);
+        host->cmd = cmd;
+
+        sdh_cmd = 0;
+        stat_mask = 0;
+
+        sdh_cmd |= cmd->opcode;
+
+        if (cmd->flags & MMC_RSP_PRESENT) {
+                sdh_cmd |= CMD_RSP;
+                stat_mask |= CMD_RESP_END;
+        } else {
+                stat_mask |= CMD_SENT;
+        }
+
+        if (cmd->flags & MMC_RSP_136)
+                sdh_cmd |= CMD_L_RSP;
+
+        stat_mask |= CMD_CRC_FAIL | CMD_TIME_OUT;
+
+        sdh_enable_stat_irq(host, stat_mask);
+
+        bfin_write_SDH_ARGUMENT(cmd->arg);
+        bfin_write_SDH_COMMAND(sdh_cmd | CMD_E);
+        bfin_write_SDH_CLK_CTL(bfin_read_SDH_CLK_CTL() | CLK_E);
+        SSYNC();
+}
+
+static void sdh_finish_request(struct sdh_host *host, struct mmc_request *mrq)
+{
+        dev_dbg(mmc_dev(host->mmc), "%s enter\n", __func__);
+        host->mrq = NULL;
+        host->cmd = NULL;
+        host->data = NULL;
+        mmc_request_done(host->mmc, mrq);
+}
+
+static int sdh_cmd_done(struct sdh_host *host, unsigned int stat)
+{
+        struct mmc_command *cmd = host->cmd;
+        int ret = 0;
+
+        dev_dbg(mmc_dev(host->mmc), "%s enter cmd: %p\n", __func__, cmd);
+        if (!cmd)
+                return 0;
+
+        host->cmd = NULL;
+
+        if (cmd->flags & MMC_RSP_PRESENT) {
+                cmd->resp[0] = bfin_read_SDH_RESPONSE0();
+                if (cmd->flags & MMC_RSP_136) {
+                        cmd->resp[1] = bfin_read_SDH_RESPONSE1();
+                        cmd->resp[2] = bfin_read_SDH_RESPONSE2();
+                        cmd->resp[3] = bfin_read_SDH_RESPONSE3();
+                }
+        }
+        if (stat & CMD_TIME_OUT)
+                cmd->error = -ETIMEDOUT;
+        else if (stat & CMD_CRC_FAIL && cmd->flags & MMC_RSP_CRC)
+                cmd->error = -EILSEQ;
+
+        sdh_disable_stat_irq(host, (CMD_SENT | CMD_RESP_END | CMD_TIME_OUT | CMD_CRC_FAIL));
+
+        if (host->data && !cmd->error) {
+                if (host->data->flags & MMC_DATA_WRITE) {
+                        ret = sdh_setup_data(host, host->data);
+                        if (ret)
+                                return 0;
+                }
+
+                sdh_enable_stat_irq(host, DAT_END | RX_OVERRUN | TX_UNDERRUN | DAT_TIME_OUT);
+        } else
+                sdh_finish_request(host, host->mrq);
+
+        return 1;
+}
+
+static int sdh_data_done(struct sdh_host *host, unsigned int stat)
+{
+        struct mmc_data *data = host->data;
+
+        dev_dbg(mmc_dev(host->mmc), "%s enter stat: 0x%x\n", __func__, stat);
+        if (!data)
+                return 0;
+
+        disable_dma(host->dma_ch);
+        dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
+                     host->dma_dir);
+
+        if (stat & DAT_TIME_OUT)
+                data->error = -ETIMEDOUT;
+        else if (stat & DAT_CRC_FAIL)
+                data->error = -EILSEQ;
+        else if (stat & (RX_OVERRUN | TX_UNDERRUN))
+                data->error = -EIO;
+
+        if (!data->error)
+                data->bytes_xfered = data->blocks * data->blksz;
+        else
+                data->bytes_xfered = 0;
+
+        sdh_disable_stat_irq(host, DAT_END | DAT_TIME_OUT | DAT_CRC_FAIL | RX_OVERRUN | TX_UNDERRUN);
+        bfin_write_SDH_STATUS_CLR(DAT_END_STAT | DAT_TIMEOUT_STAT | \
+                        DAT_CRC_FAIL_STAT | DAT_BLK_END_STAT | RX_OVERRUN | TX_UNDERRUN);
+        bfin_write_SDH_DATA_CTL(0);
+        SSYNC();
+
+        host->data = NULL;
+        if (host->mrq->stop) {
+                sdh_stop_clock(host);
+                sdh_start_cmd(host, host->mrq->stop);
+        } else {
+                sdh_finish_request(host, host->mrq);
+        }
+
+        return 1;
+}
+
+static void sdh_request(struct mmc_host *mmc, struct mmc_request *mrq)
+{
+        struct sdh_host *host = mmc_priv(mmc);
+        int ret = 0;
+
+        dev_dbg(mmc_dev(host->mmc), "%s enter, mrp:%p, cmd:%p\n", __func__, mrq, mrq->cmd);
+        WARN_ON(host->mrq != NULL);
+
+        host->mrq = mrq;
+        host->data = mrq->data;
+
+        if (mrq->data && mrq->data->flags & MMC_DATA_READ) {
+                ret = sdh_setup_data(host, mrq->data);
+                if (ret)
+                        return;
+        }
+
+        sdh_start_cmd(host, mrq->cmd);
+}
+
+static void sdh_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+{
+        struct sdh_host *host;
+        unsigned long flags;
+        u16 clk_ctl = 0;
+        u16 pwr_ctl = 0;
+        u16 cfg;
+        host = mmc_priv(mmc);
+
+        spin_lock_irqsave(&host->lock, flags);
+        if (ios->clock) {
+                unsigned long  sys_clk, ios_clk;
+                unsigned char clk_div;
+                ios_clk = 2 * ios->clock;
+                sys_clk = get_sclk();
+                clk_div = sys_clk / ios_clk;
+                if (sys_clk % ios_clk == 0)
+                        clk_div -= 1;
+                clk_div = min_t(unsigned char, clk_div, 0xFF);
+                clk_ctl |= clk_div;
+                clk_ctl |= CLK_E;
+                host->clk_div = clk_div;
+        } else
+                sdh_stop_clock(host);
+
+        if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN)
+#ifdef CONFIG_SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND
+                pwr_ctl |= ROD_CTL;
+#else
+                pwr_ctl |= SD_CMD_OD | ROD_CTL;
+#endif
+
+        if (ios->bus_width == MMC_BUS_WIDTH_4) {
+                cfg = bfin_read_SDH_CFG();
+                cfg &= ~PD_SDDAT3;
+                cfg |= PUP_SDDAT3;
+                /* Enable 4 bit SDIO */
+                cfg |= (SD4E | MWE);
+                bfin_write_SDH_CFG(cfg);
+                clk_ctl |= WIDE_BUS;
+        } else {
+                cfg = bfin_read_SDH_CFG();
+                cfg |= MWE;
+                bfin_write_SDH_CFG(cfg);
+        }
+
+        bfin_write_SDH_CLK_CTL(clk_ctl);
+
+        host->power_mode = ios->power_mode;
+        if (ios->power_mode == MMC_POWER_ON)
+                pwr_ctl |= PWR_ON;
+
+        bfin_write_SDH_PWR_CTL(pwr_ctl);
+        SSYNC();
+
+        spin_unlock_irqrestore(&host->lock, flags);
+
+        dev_dbg(mmc_dev(host->mmc), "SDH: clk_div = 0x%x actual clock:%ld expected clock:%d\n",
+                host->clk_div,
+                host->clk_div ? get_sclk() / (2 * (host->clk_div + 1)) : 0,
+                ios->clock);
+}
+
+static const struct mmc_host_ops sdh_ops = {
+        .request        = sdh_request,
+        .set_ios        = sdh_set_ios,
+};
+
+static irqreturn_t sdh_dma_irq(int irq, void *devid)
+{
+        struct sdh_host *host = devid;
+
+        dev_dbg(mmc_dev(host->mmc), "%s enter, irq_stat: 0x%04x\n", __func__,
+                get_dma_curr_irqstat(host->dma_ch));
+        clear_dma_irqstat(host->dma_ch);
+        SSYNC();
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t sdh_stat_irq(int irq, void *devid)
+{
+        struct sdh_host *host = devid;
+        unsigned int status;
+        int handled = 0;
+
+        dev_dbg(mmc_dev(host->mmc), "%s enter\n", __func__);
+        status = bfin_read_SDH_E_STATUS();
+        if (status & SD_CARD_DET) {
+                mmc_detect_change(host->mmc, 0);
+                bfin_write_SDH_E_STATUS(SD_CARD_DET);
+        }
+        status = bfin_read_SDH_STATUS();
+        if (status & (CMD_SENT | CMD_RESP_END | CMD_TIME_OUT | CMD_CRC_FAIL)) {
+                handled |= sdh_cmd_done(host, status);
+                bfin_write_SDH_STATUS_CLR(CMD_SENT_STAT | CMD_RESP_END_STAT | \
+                                CMD_TIMEOUT_STAT | CMD_CRC_FAIL_STAT);
+                SSYNC();
+        }
+
+        status = bfin_read_SDH_STATUS();
+        if (status & (DAT_END | DAT_TIME_OUT | DAT_CRC_FAIL | RX_OVERRUN | TX_UNDERRUN))
+                handled |= sdh_data_done(host, status);
+
+        dev_dbg(mmc_dev(host->mmc), "%s exit\n\n", __func__);
+
+        return IRQ_RETVAL(handled);
+}
+
+static int __devinit sdh_probe(struct platform_device *pdev)
+{
+        struct mmc_host *mmc;
+        struct sdh_host *host;
+        struct bfin_sd_host *drv_data = get_sdh_data(pdev);
+        int ret;
+
+        if (!drv_data) {
+                dev_err(&pdev->dev, "missing platform driver data\n");
+                ret = -EINVAL;
+                goto out;
+        }
+
+        mmc = mmc_alloc_host(sizeof(*mmc), &pdev->dev);
+        if (!mmc) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        mmc->ops = &sdh_ops;
+        mmc->max_phys_segs = 32;
+        mmc->max_seg_size = 1 << 16;
+        mmc->max_blk_size = 1 << 11;
+        mmc->max_blk_count = 1 << 11;
+        mmc->max_req_size = PAGE_SIZE;
+        mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
+        mmc->f_max = get_sclk();
+        mmc->f_min = mmc->f_max >> 9;
+        mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_NEEDS_POLL;
+        host = mmc_priv(mmc);
+        host->mmc = mmc;
+
+        spin_lock_init(&host->lock);
+        host->irq = drv_data->irq_int0;
+        host->dma_ch = drv_data->dma_chan;
+
+        ret = request_dma(host->dma_ch, DRIVER_NAME "DMA");
+        if (ret) {
+                dev_err(&pdev->dev, "unable to request DMA channel\n");
+                goto out1;
+        }
+
+        ret = set_dma_callback(host->dma_ch, sdh_dma_irq, host);
+        if (ret) {
+                dev_err(&pdev->dev, "unable to request DMA irq\n");
+                goto out2;
+        }
+
+        host->sg_cpu = dma_alloc_coherent(&pdev->dev, PAGE_SIZE, &host->sg_dma, GFP_KERNEL);
+        if (host->sg_cpu == NULL) {
+                ret = -ENOMEM;
+                goto out2;
+        }
+
+        platform_set_drvdata(pdev, mmc);
+        mmc_add_host(mmc);
+
+        ret = request_irq(host->irq, sdh_stat_irq, 0, "SDH Status IRQ", host);
+        if (ret) {
+                dev_err(&pdev->dev, "unable to request status irq\n");
+                goto out3;
+        }
+
+        ret = peripheral_request_list(drv_data->pin_req, DRIVER_NAME);
+        if (ret) {
+                dev_err(&pdev->dev, "unable to request peripheral pins\n");
+                goto out4;
+        }
+#if defined(CONFIG_BF54x)
+        /* Secure Digital Host shares DMA with Nand controller */
+        bfin_write_DMAC1_PERIMUX(bfin_read_DMAC1_PERIMUX() | 0x1);
+#endif
+
+        bfin_write_SDH_CFG(bfin_read_SDH_CFG() | CLKS_EN);
+        SSYNC();
+
+        /* Disable card inserting detection pin. set MMC_CAP_NEES_POLL, and
+         * mmc stack will do the detection.
+         */
+        bfin_write_SDH_CFG((bfin_read_SDH_CFG() & 0x1F) | (PUP_SDDAT | PUP_SDDAT3));
+        SSYNC();
+
+        return 0;
+
+out4:
+        free_irq(host->irq, host);
+out3:
+        mmc_remove_host(mmc);
+        dma_free_coherent(&pdev->dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
+out2:
+        free_dma(host->dma_ch);
+out1:
+        mmc_free_host(mmc);
+ out:
+        return ret;
+}
+
+static int __devexit sdh_remove(struct platform_device *pdev)
+{
+        struct mmc_host *mmc = platform_get_drvdata(pdev);
+
+        platform_set_drvdata(pdev, NULL);
+
+        if (mmc) {
+                struct sdh_host *host = mmc_priv(mmc);
+
+                mmc_remove_host(mmc);
+
+                sdh_stop_clock(host);
+                free_irq(host->irq, host);
+                free_dma(host->dma_ch);
+                dma_free_coherent(&pdev->dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
+
+                mmc_free_host(mmc);
+        }
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int sdh_suspend(struct platform_device *dev, pm_message_t state)
+{
+        struct mmc_host *mmc = platform_get_drvdata(dev);
+        struct bfin_sd_host *drv_data = get_sdh_data(dev);
+        int ret = 0;
+
+        if (mmc)
+                ret = mmc_suspend_host(mmc, state);
+
+        bfin_write_SDH_PWR_CTL(bfin_read_SDH_PWR_CTL() & ~PWR_ON);
+        peripheral_free_list(drv_data->pin_req);
+
+        return ret;
+}
+
+static int sdh_resume(struct platform_device *dev)
+{
+        struct mmc_host *mmc = platform_get_drvdata(dev);
+        struct bfin_sd_host *drv_data = get_sdh_data(dev);
+        int ret = 0;
+
+        ret = peripheral_request_list(drv_data->pin_req, DRIVER_NAME);
+        if (ret) {
+                dev_err(&dev->dev, "unable to request peripheral pins\n");
+                return ret;
+        }
+
+        bfin_write_SDH_PWR_CTL(bfin_read_SDH_PWR_CTL() | PWR_ON);
+#if defined(CONFIG_BF54x)
+        /* Secure Digital Host shares DMA with Nand controller */
+        bfin_write_DMAC1_PERIMUX(bfin_read_DMAC1_PERIMUX() | 0x1);
+#endif
+        bfin_write_SDH_CFG(bfin_read_SDH_CFG() | CLKS_EN);
+        SSYNC();
+
+        bfin_write_SDH_CFG((bfin_read_SDH_CFG() & 0x1F) | (PUP_SDDAT | PUP_SDDAT3));
+        SSYNC();
+
+        if (mmc)
+                ret = mmc_resume_host(mmc);
+
+        return ret;
+}
+#else
+# define sdh_suspend NULL
+# define sdh_resume  NULL
+#endif
+
+static struct platform_driver sdh_driver = {
+        .probe   = sdh_probe,
+        .remove  = __devexit_p(sdh_remove),
+        .suspend = sdh_suspend,
+        .resume  = sdh_resume,
+        .driver  = {
+                .name = DRIVER_NAME,
+        },
+};
+
+static int __init sdh_init(void)
+{
+        return platform_driver_register(&sdh_driver);
+}
+module_init(sdh_init);
+
+static void __exit sdh_exit(void)
+{
+        platform_driver_unregister(&sdh_driver);
+}
+module_exit(sdh_exit);
+
+MODULE_DESCRIPTION("Blackfin Secure Digital Host Driver");
+MODULE_AUTHOR("Cliff Cai, Roy Huang");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
new file mode 100644
index 000000000000..dd45e7c3517e
--- /dev/null
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -0,0 +1,1349 @@
+/*
+ * davinci_mmc.c - TI DaVinci MMC/SD/SDIO driver
+ *
+ * Copyright (C) 2006 Texas Instruments.
+ *       Original author: Purushotam Kumar
+ * Copyright (C) 2009 David Brownell
+ *
+ * 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.
+ */
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/cpufreq.h>
+#include <linux/mmc/host.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/mmc/mmc.h>
+
+#include <mach/mmc.h>
+#include <mach/edma.h>
+
+/*
+ * Register Definitions
+ */
+#define DAVINCI_MMCCTL       0x00 /* Control Register                  */
+#define DAVINCI_MMCCLK       0x04 /* Memory Clock Control Register     */
+#define DAVINCI_MMCST0       0x08 /* Status Register 0                 */
+#define DAVINCI_MMCST1       0x0C /* Status Register 1                 */
+#define DAVINCI_MMCIM        0x10 /* Interrupt Mask Register           */
+#define DAVINCI_MMCTOR       0x14 /* Response Time-Out Register        */
+#define DAVINCI_MMCTOD       0x18 /* Data Read Time-Out Register       */
+#define DAVINCI_MMCBLEN      0x1C /* Block Length Register             */
+#define DAVINCI_MMCNBLK      0x20 /* Number of Blocks Register         */
+#define DAVINCI_MMCNBLC      0x24 /* Number of Blocks Counter Register */
+#define DAVINCI_MMCDRR       0x28 /* Data Receive Register             */
+#define DAVINCI_MMCDXR       0x2C /* Data Transmit Register            */
+#define DAVINCI_MMCCMD       0x30 /* Command Register                  */
+#define DAVINCI_MMCARGHL     0x34 /* Argument Register                 */
+#define DAVINCI_MMCRSP01     0x38 /* Response Register 0 and 1         */
+#define DAVINCI_MMCRSP23     0x3C /* Response Register 0 and 1         */
+#define DAVINCI_MMCRSP45     0x40 /* Response Register 0 and 1         */
+#define DAVINCI_MMCRSP67     0x44 /* Response Register 0 and 1         */
+#define DAVINCI_MMCDRSP      0x48 /* Data Response Register            */
+#define DAVINCI_MMCETOK      0x4C
+#define DAVINCI_MMCCIDX      0x50 /* Command Index Register            */
+#define DAVINCI_MMCCKC       0x54
+#define DAVINCI_MMCTORC      0x58
+#define DAVINCI_MMCTODC      0x5C
+#define DAVINCI_MMCBLNC      0x60
+#define DAVINCI_SDIOCTL      0x64
+#define DAVINCI_SDIOST0      0x68
+#define DAVINCI_SDIOEN       0x6C
+#define DAVINCI_SDIOST       0x70
+#define DAVINCI_MMCFIFOCTL   0x74 /* FIFO Control Register             */
+
+/* DAVINCI_MMCCTL definitions */
+#define MMCCTL_DATRST         (1 << 0)
+#define MMCCTL_CMDRST         (1 << 1)
+#define MMCCTL_WIDTH_4_BIT    (1 << 2)
+#define MMCCTL_DATEG_DISABLED (0 << 6)
+#define MMCCTL_DATEG_RISING   (1 << 6)
+#define MMCCTL_DATEG_FALLING  (2 << 6)
+#define MMCCTL_DATEG_BOTH     (3 << 6)
+#define MMCCTL_PERMDR_LE      (0 << 9)
+#define MMCCTL_PERMDR_BE      (1 << 9)
+#define MMCCTL_PERMDX_LE      (0 << 10)
+#define MMCCTL_PERMDX_BE      (1 << 10)
+
+/* DAVINCI_MMCCLK definitions */
+#define MMCCLK_CLKEN          (1 << 8)
+#define MMCCLK_CLKRT_MASK     (0xFF << 0)
+
+/* IRQ bit definitions, for DAVINCI_MMCST0 and DAVINCI_MMCIM */
+#define MMCST0_DATDNE         BIT(0)    /* data done */
+#define MMCST0_BSYDNE         BIT(1)    /* busy done */
+#define MMCST0_RSPDNE         BIT(2)    /* command done */
+#define MMCST0_TOUTRD         BIT(3)    /* data read timeout */
+#define MMCST0_TOUTRS         BIT(4)    /* command response timeout */
+#define MMCST0_CRCWR          BIT(5)    /* data write CRC error */
+#define MMCST0_CRCRD          BIT(6)    /* data read CRC error */
+#define MMCST0_CRCRS          BIT(7)    /* command response CRC error */
+#define MMCST0_DXRDY          BIT(9)    /* data transmit ready (fifo empty) */
+#define MMCST0_DRRDY          BIT(10)   /* data receive ready (data in fifo)*/
+#define MMCST0_DATED          BIT(11)   /* DAT3 edge detect */
+#define MMCST0_TRNDNE         BIT(12)   /* transfer done */
+
+/* DAVINCI_MMCST1 definitions */
+#define MMCST1_BUSY           (1 << 0)
+
+/* DAVINCI_MMCCMD definitions */
+#define MMCCMD_CMD_MASK       (0x3F << 0)
+#define MMCCMD_PPLEN          (1 << 7)
+#define MMCCMD_BSYEXP         (1 << 8)
+#define MMCCMD_RSPFMT_MASK    (3 << 9)
+#define MMCCMD_RSPFMT_NONE    (0 << 9)
+#define MMCCMD_RSPFMT_R1456   (1 << 9)
+#define MMCCMD_RSPFMT_R2      (2 << 9)
+#define MMCCMD_RSPFMT_R3      (3 << 9)
+#define MMCCMD_DTRW           (1 << 11)
+#define MMCCMD_STRMTP         (1 << 12)
+#define MMCCMD_WDATX          (1 << 13)
+#define MMCCMD_INITCK         (1 << 14)
+#define MMCCMD_DCLR           (1 << 15)
+#define MMCCMD_DMATRIG        (1 << 16)
+
+/* DAVINCI_MMCFIFOCTL definitions */
+#define MMCFIFOCTL_FIFORST    (1 << 0)
+#define MMCFIFOCTL_FIFODIR_WR (1 << 1)
+#define MMCFIFOCTL_FIFODIR_RD (0 << 1)
+#define MMCFIFOCTL_FIFOLEV    (1 << 2) /* 0 = 128 bits, 1 = 256 bits */
+#define MMCFIFOCTL_ACCWD_4    (0 << 3) /* access width of 4 bytes    */
+#define MMCFIFOCTL_ACCWD_3    (1 << 3) /* access width of 3 bytes    */
+#define MMCFIFOCTL_ACCWD_2    (2 << 3) /* access width of 2 bytes    */
+#define MMCFIFOCTL_ACCWD_1    (3 << 3) /* access width of 1 byte     */
+
+
+/* MMCSD Init clock in Hz in opendrain mode */
+#define MMCSD_INIT_CLOCK                200000
+
+/*
+ * One scatterlist dma "segment" is at most MAX_CCNT rw_threshold units,
+ * and we handle up to NR_SG segments.  MMC_BLOCK_BOUNCE kicks in only
+ * for drivers with max_hw_segs == 1, making the segments bigger (64KB)
+ * than the page or two that's otherwise typical.  NR_SG == 16 gives at
+ * least the same throughput boost, using EDMA transfer linkage instead
+ * of spending CPU time copying pages.
+ */
+#define MAX_CCNT        ((1 << 16) - 1)
+
+#define NR_SG           16
+
+static unsigned rw_threshold = 32;
+module_param(rw_threshold, uint, S_IRUGO);
+MODULE_PARM_DESC(rw_threshold,
+                "Read/Write threshold. Default = 32");
+
+static unsigned __initdata use_dma = 1;
+module_param(use_dma, uint, 0);
+MODULE_PARM_DESC(use_dma, "Whether to use DMA or not. Default = 1");
+
+struct mmc_davinci_host {
+        struct mmc_command *cmd;
+        struct mmc_data *data;
+        struct mmc_host *mmc;
+        struct clk *clk;
+        unsigned int mmc_input_clk;
+        void __iomem *base;
+        struct resource *mem_res;
+        int irq;
+        unsigned char bus_mode;
+
+#define DAVINCI_MMC_DATADIR_NONE        0
+#define DAVINCI_MMC_DATADIR_READ        1
+#define DAVINCI_MMC_DATADIR_WRITE       2
+        unsigned char data_dir;
+
+        /* buffer is used during PIO of one scatterlist segment, and
+         * is updated along with buffer_bytes_left.  bytes_left applies
+         * to all N blocks of the PIO transfer.
+         */
+        u8 *buffer;
+        u32 buffer_bytes_left;
+        u32 bytes_left;
+
+        u32 rxdma, txdma;
+        bool use_dma;
+        bool do_dma;
+
+        /* Scatterlist DMA uses one or more parameter RAM entries:
+         * the main one (associated with rxdma or txdma) plus zero or
+         * more links.  The entries for a given transfer differ only
+         * by memory buffer (address, length) and link field.
+         */
+        struct edmacc_param     tx_template;
+        struct edmacc_param     rx_template;
+        unsigned                n_link;
+        u32                     links[NR_SG - 1];
+
+        /* For PIO we walk scatterlists one segment at a time. */
+        unsigned int            sg_len;
+        struct scatterlist *sg;
+
+        /* Version of the MMC/SD controller */
+        u8 version;
+        /* for ns in one cycle calculation */
+        unsigned ns_in_one_cycle;
+#ifdef CONFIG_CPU_FREQ
+        struct notifier_block   freq_transition;
+#endif
+};
+
+
+/* PIO only */
+static void mmc_davinci_sg_to_buf(struct mmc_davinci_host *host)
+{
+        host->buffer_bytes_left = sg_dma_len(host->sg);
+        host->buffer = sg_virt(host->sg);
+        if (host->buffer_bytes_left > host->bytes_left)
+                host->buffer_bytes_left = host->bytes_left;
+}
+
+static void davinci_fifo_data_trans(struct mmc_davinci_host *host,
+                                        unsigned int n)
+{
+        u8 *p;
+        unsigned int i;
+
+        if (host->buffer_bytes_left == 0) {
+                host->sg = sg_next(host->data->sg);
+                mmc_davinci_sg_to_buf(host);
+        }
+
+        p = host->buffer;
+        if (n > host->buffer_bytes_left)
+                n = host->buffer_bytes_left;
+        host->buffer_bytes_left -= n;
+        host->bytes_left -= n;
+
+        /* NOTE:  we never transfer more than rw_threshold bytes
+         * to/from the fifo here; there's no I/O overlap.
+         * This also assumes that access width( i.e. ACCWD) is 4 bytes
+         */
+        if (host->data_dir == DAVINCI_MMC_DATADIR_WRITE) {
+                for (i = 0; i < (n >> 2); i++) {
+                        writel(*((u32 *)p), host->base + DAVINCI_MMCDXR);
+                        p = p + 4;
+                }
+                if (n & 3) {
+                        iowrite8_rep(host->base + DAVINCI_MMCDXR, p, (n & 3));
+                        p = p + (n & 3);
+                }
+        } else {
+                for (i = 0; i < (n >> 2); i++) {
+                        *((u32 *)p) = readl(host->base + DAVINCI_MMCDRR);
+                        p  = p + 4;
+                }
+                if (n & 3) {
+                        ioread8_rep(host->base + DAVINCI_MMCDRR, p, (n & 3));
+                        p = p + (n & 3);
+                }
+        }
+        host->buffer = p;
+}
+
+static void mmc_davinci_start_command(struct mmc_davinci_host *host,
+                struct mmc_command *cmd)
+{
+        u32 cmd_reg = 0;
+        u32 im_val;
+
+        dev_dbg(mmc_dev(host->mmc), "CMD%d, arg 0x%08x%s\n",
+                cmd->opcode, cmd->arg,
+                ({ char *s;
+                switch (mmc_resp_type(cmd)) {
+                case MMC_RSP_R1:
+                        s = ", R1/R5/R6/R7 response";
+                        break;
+                case MMC_RSP_R1B:
+                        s = ", R1b response";
+                        break;
+                case MMC_RSP_R2:
+                        s = ", R2 response";
+                        break;
+                case MMC_RSP_R3:
+                        s = ", R3/R4 response";
+                        break;
+                default:
+                        s = ", (R? response)";
+                        break;
+                }; s; }));
+        host->cmd = cmd;
+
+        switch (mmc_resp_type(cmd)) {
+        case MMC_RSP_R1B:
+                /* There's some spec confusion about when R1B is
+                 * allowed, but if the card doesn't issue a BUSY
+                 * then it's harmless for us to allow it.
+                 */
+                cmd_reg |= MMCCMD_BSYEXP;
+                /* FALLTHROUGH */
+        case MMC_RSP_R1:                /* 48 bits, CRC */
+                cmd_reg |= MMCCMD_RSPFMT_R1456;
+                break;
+        case MMC_RSP_R2:                /* 136 bits, CRC */
+                cmd_reg |= MMCCMD_RSPFMT_R2;
+                break;
+        case MMC_RSP_R3:                /* 48 bits, no CRC */
+                cmd_reg |= MMCCMD_RSPFMT_R3;
+                break;
+        default:
+                cmd_reg |= MMCCMD_RSPFMT_NONE;
+                dev_dbg(mmc_dev(host->mmc), "unknown resp_type %04x\n",
+                        mmc_resp_type(cmd));
+                break;
+        }
+
+        /* Set command index */
+        cmd_reg |= cmd->opcode;
+
+        /* Enable EDMA transfer triggers */
+        if (host->do_dma)
+                cmd_reg |= MMCCMD_DMATRIG;
+
+        if (host->version == MMC_CTLR_VERSION_2 && host->data != NULL &&
+                        host->data_dir == DAVINCI_MMC_DATADIR_READ)
+                cmd_reg |= MMCCMD_DMATRIG;
+
+        /* Setting whether command involves data transfer or not */
+        if (cmd->data)
+                cmd_reg |= MMCCMD_WDATX;
+
+        /* Setting whether stream or block transfer */
+        if (cmd->flags & MMC_DATA_STREAM)
+                cmd_reg |= MMCCMD_STRMTP;
+
+        /* Setting whether data read or write */
+        if (host->data_dir == DAVINCI_MMC_DATADIR_WRITE)
+                cmd_reg |= MMCCMD_DTRW;
+
+        if (host->bus_mode == MMC_BUSMODE_PUSHPULL)
+                cmd_reg |= MMCCMD_PPLEN;
+
+        /* set Command timeout */
+        writel(0x1FFF, host->base + DAVINCI_MMCTOR);
+
+        /* Enable interrupt (calculate here, defer until FIFO is stuffed). */
+        im_val =  MMCST0_RSPDNE | MMCST0_CRCRS | MMCST0_TOUTRS;
+        if (host->data_dir == DAVINCI_MMC_DATADIR_WRITE) {
+                im_val |= MMCST0_DATDNE | MMCST0_CRCWR;
+
+                if (!host->do_dma)
+                        im_val |= MMCST0_DXRDY;
+        } else if (host->data_dir == DAVINCI_MMC_DATADIR_READ) {
+                im_val |= MMCST0_DATDNE | MMCST0_CRCRD | MMCST0_TOUTRD;
+
+                if (!host->do_dma)
+                        im_val |= MMCST0_DRRDY;
+        }
+
+        /*
+         * Before non-DMA WRITE commands the controller needs priming:
+         * FIFO should be populated with 32 bytes i.e. whatever is the FIFO size
+         */
+        if (!host->do_dma && (host->data_dir == DAVINCI_MMC_DATADIR_WRITE))
+                davinci_fifo_data_trans(host, rw_threshold);
+
+        writel(cmd->arg, host->base + DAVINCI_MMCARGHL);
+        writel(cmd_reg,  host->base + DAVINCI_MMCCMD);
+        writel(im_val, host->base + DAVINCI_MMCIM);
+}
+
+/*----------------------------------------------------------------------*/
+
+/* DMA infrastructure */
+
+static void davinci_abort_dma(struct mmc_davinci_host *host)
+{
+        int sync_dev;
+
+        if (host->data_dir == DAVINCI_MMC_DATADIR_READ)
+                sync_dev = host->rxdma;
+        else
+                sync_dev = host->txdma;
+
+        edma_stop(sync_dev);
+        edma_clean_channel(sync_dev);
+}
+
+static void
+mmc_davinci_xfer_done(struct mmc_davinci_host *host, struct mmc_data *data);
+
+static void mmc_davinci_dma_cb(unsigned channel, u16 ch_status, void *data)
+{
+        if (DMA_COMPLETE != ch_status) {
+                struct mmc_davinci_host *host = data;
+
+                /* Currently means:  DMA Event Missed, or "null" transfer
+                 * request was seen.  In the future, TC errors (like bad
+                 * addresses) might be presented too.
+                 */
+                dev_warn(mmc_dev(host->mmc), "DMA %s error\n",
+                        (host->data->flags & MMC_DATA_WRITE)
+                                ? "write" : "read");
+                host->data->error = -EIO;
+                mmc_davinci_xfer_done(host, host->data);
+        }
+}
+
+/* Set up tx or rx template, to be modified and updated later */
+static void __init mmc_davinci_dma_setup(struct mmc_davinci_host *host,
+                bool tx, struct edmacc_param *template)
+{
+        unsigned        sync_dev;
+        const u16       acnt = 4;
+        const u16       bcnt = rw_threshold >> 2;
+        const u16       ccnt = 0;
+        u32             src_port = 0;
+        u32             dst_port = 0;
+        s16             src_bidx, dst_bidx;
+        s16             src_cidx, dst_cidx;
+
+        /*
+         * A-B Sync transfer:  each DMA request is for one "frame" of
+         * rw_threshold bytes, broken into "acnt"-size chunks repeated
+         * "bcnt" times.  Each segment needs "ccnt" such frames; since
+         * we tell the block layer our mmc->max_seg_size limit, we can
+         * trust (later) that it's within bounds.
+         *
+         * The FIFOs are read/written in 4-byte chunks (acnt == 4) and
+         * EDMA will optimize memory operations to use larger bursts.
+         */
+        if (tx) {
+                sync_dev = host->txdma;
+
+                /* src_prt, ccnt, and link to be set up later */
+                src_bidx = acnt;
+                src_cidx = acnt * bcnt;
+
+                dst_port = host->mem_res->start + DAVINCI_MMCDXR;
+                dst_bidx = 0;
+                dst_cidx = 0;
+        } else {
+                sync_dev = host->rxdma;
+
+                src_port = host->mem_res->start + DAVINCI_MMCDRR;
+                src_bidx = 0;
+                src_cidx = 0;
+
+                /* dst_prt, ccnt, and link to be set up later */
+                dst_bidx = acnt;
+                dst_cidx = acnt * bcnt;
+        }
+
+        /*
+         * We can't use FIFO mode for the FIFOs because MMC FIFO addresses
+         * are not 256-bit (32-byte) aligned.  So we use INCR, and the W8BIT
+         * parameter is ignored.
+         */
+        edma_set_src(sync_dev, src_port, INCR, W8BIT);
+        edma_set_dest(sync_dev, dst_port, INCR, W8BIT);
+
+        edma_set_src_index(sync_dev, src_bidx, src_cidx);
+        edma_set_dest_index(sync_dev, dst_bidx, dst_cidx);
+
+        edma_set_transfer_params(sync_dev, acnt, bcnt, ccnt, 8, ABSYNC);
+
+        edma_read_slot(sync_dev, template);
+
+        /* don't bother with irqs or chaining */
+        template->opt |= EDMA_CHAN_SLOT(sync_dev) << 12;
+}
+
+static void mmc_davinci_send_dma_request(struct mmc_davinci_host *host,
+                struct mmc_data *data)
+{
+        struct edmacc_param     *template;
+        int                     channel, slot;
+        unsigned                link;
+        struct scatterlist      *sg;
+        unsigned                sg_len;
+        unsigned                bytes_left = host->bytes_left;
+        const unsigned          shift = ffs(rw_threshold) - 1;;
+
+        if (host->data_dir == DAVINCI_MMC_DATADIR_WRITE) {
+                template = &host->tx_template;
+                channel = host->txdma;
+        } else {
+                template = &host->rx_template;
+                channel = host->rxdma;
+        }
+
+        /* We know sg_len and ccnt will never be out of range because
+         * we told the mmc layer which in turn tells the block layer
+         * to ensure that it only hands us one scatterlist segment
+         * per EDMA PARAM entry.  Update the PARAM
+         * entries needed for each segment of this scatterlist.
+         */
+        for (slot = channel, link = 0, sg = data->sg, sg_len = host->sg_len;
+                        sg_len-- != 0 && bytes_left;
+                        sg = sg_next(sg), slot = host->links[link++]) {
+                u32             buf = sg_dma_address(sg);
+                unsigned        count = sg_dma_len(sg);
+
+                template->link_bcntrld = sg_len
+                                ? (EDMA_CHAN_SLOT(host->links[link]) << 5)
+                                : 0xffff;
+
+                if (count > bytes_left)
+                        count = bytes_left;
+                bytes_left -= count;
+
+                if (host->data_dir == DAVINCI_MMC_DATADIR_WRITE)
+                        template->src = buf;
+                else
+                        template->dst = buf;
+                template->ccnt = count >> shift;
+
+                edma_write_slot(slot, template);
+        }
+
+        if (host->version == MMC_CTLR_VERSION_2)
+                edma_clear_event(channel);
+
+        edma_start(channel);
+}
+
+static int mmc_davinci_start_dma_transfer(struct mmc_davinci_host *host,
+                struct mmc_data *data)
+{
+        int i;
+        int mask = rw_threshold - 1;
+
+        host->sg_len = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
+                                ((data->flags & MMC_DATA_WRITE)
+                                ? DMA_TO_DEVICE
+                                : DMA_FROM_DEVICE));
+
+        /* no individual DMA segment should need a partial FIFO */
+        for (i = 0; i < host->sg_len; i++) {
+                if (sg_dma_len(data->sg + i) & mask) {
+                        dma_unmap_sg(mmc_dev(host->mmc),
+                                        data->sg, data->sg_len,
+                                        (data->flags & MMC_DATA_WRITE)
+                                        ? DMA_TO_DEVICE
+                                        : DMA_FROM_DEVICE);
+                        return -1;
+                }
+        }
+
+        host->do_dma = 1;
+        mmc_davinci_send_dma_request(host, data);
+
+        return 0;
+}
+
+static void __init_or_module
+davinci_release_dma_channels(struct mmc_davinci_host *host)
+{
+        unsigned        i;
+
+        if (!host->use_dma)
+                return;
+
+        for (i = 0; i < host->n_link; i++)
+                edma_free_slot(host->links[i]);
+
+        edma_free_channel(host->txdma);
+        edma_free_channel(host->rxdma);
+}
+
+static int __init davinci_acquire_dma_channels(struct mmc_davinci_host *host)
+{
+        int r, i;
+
+        /* Acquire master DMA write channel */
+        r = edma_alloc_channel(host->txdma, mmc_davinci_dma_cb, host,
+                        EVENTQ_DEFAULT);
+        if (r < 0) {
+                dev_warn(mmc_dev(host->mmc), "alloc %s channel err %d\n",
+                                "tx", r);
+                return r;
+        }
+        mmc_davinci_dma_setup(host, true, &host->tx_template);
+
+        /* Acquire master DMA read channel */
+        r = edma_alloc_channel(host->rxdma, mmc_davinci_dma_cb, host,
+                        EVENTQ_DEFAULT);
+        if (r < 0) {
+                dev_warn(mmc_dev(host->mmc), "alloc %s channel err %d\n",
+                                "rx", r);
+                goto free_master_write;
+        }
+        mmc_davinci_dma_setup(host, false, &host->rx_template);
+
+        /* Allocate parameter RAM slots, which will later be bound to a
+         * channel as needed to handle a scatterlist.
+         */
+        for (i = 0; i < ARRAY_SIZE(host->links); i++) {
+                r = edma_alloc_slot(EDMA_CTLR(host->txdma), EDMA_SLOT_ANY);
+                if (r < 0) {
+                        dev_dbg(mmc_dev(host->mmc), "dma PaRAM alloc --> %d\n",
+                                r);
+                        break;
+                }
+                host->links[i] = r;
+        }
+        host->n_link = i;
+
+        return 0;
+
+free_master_write:
+        edma_free_channel(host->txdma);
+
+        return r;
+}
+
+/*----------------------------------------------------------------------*/
+
+static void
+mmc_davinci_prepare_data(struct mmc_davinci_host *host, struct mmc_request *req)
+{
+        int fifo_lev = (rw_threshold == 32) ? MMCFIFOCTL_FIFOLEV : 0;
+        int timeout;
+        struct mmc_data *data = req->data;
+
+        if (host->version == MMC_CTLR_VERSION_2)
+                fifo_lev = (rw_threshold == 64) ? MMCFIFOCTL_FIFOLEV : 0;
+
+        host->data = data;
+        if (data == NULL) {
+                host->data_dir = DAVINCI_MMC_DATADIR_NONE;
+                writel(0, host->base + DAVINCI_MMCBLEN);
+                writel(0, host->base + DAVINCI_MMCNBLK);
+                return;
+        }
+
+        dev_dbg(mmc_dev(host->mmc), "%s %s, %d blocks of %d bytes\n",
+                (data->flags & MMC_DATA_STREAM) ? "stream" : "block",
+                (data->flags & MMC_DATA_WRITE) ? "write" : "read",
+                data->blocks, data->blksz);
+        dev_dbg(mmc_dev(host->mmc), "  DTO %d cycles + %d ns\n",
+                data->timeout_clks, data->timeout_ns);
+        timeout = data->timeout_clks +
+                (data->timeout_ns / host->ns_in_one_cycle);
+        if (timeout > 0xffff)
+                timeout = 0xffff;
+
+        writel(timeout, host->base + DAVINCI_MMCTOD);
+        writel(data->blocks, host->base + DAVINCI_MMCNBLK);
+        writel(data->blksz, host->base + DAVINCI_MMCBLEN);
+
+        /* Configure the FIFO */
+        switch (data->flags & MMC_DATA_WRITE) {
+        case MMC_DATA_WRITE:
+                host->data_dir = DAVINCI_MMC_DATADIR_WRITE;
+                writel(fifo_lev | MMCFIFOCTL_FIFODIR_WR | MMCFIFOCTL_FIFORST,
+                        host->base + DAVINCI_MMCFIFOCTL);
+                writel(fifo_lev | MMCFIFOCTL_FIFODIR_WR,
+                        host->base + DAVINCI_MMCFIFOCTL);
+                break;
+
+        default:
+                host->data_dir = DAVINCI_MMC_DATADIR_READ;
+                writel(fifo_lev | MMCFIFOCTL_FIFODIR_RD | MMCFIFOCTL_FIFORST,
+                        host->base + DAVINCI_MMCFIFOCTL);
+                writel(fifo_lev | MMCFIFOCTL_FIFODIR_RD,
+                        host->base + DAVINCI_MMCFIFOCTL);
+                break;
+        }
+
+        host->buffer = NULL;
+        host->bytes_left = data->blocks * data->blksz;
+
+        /* For now we try to use DMA whenever we won't need partial FIFO
+         * reads or writes, either for the whole transfer (as tested here)
+         * or for any individual scatterlist segment (tested when we call
+         * start_dma_transfer).
+         *
+         * While we *could* change that, unusual block sizes are rarely
+         * used.  The occasional fallback to PIO should't hurt.
+         */
+        if (host->use_dma && (host->bytes_left & (rw_threshold - 1)) == 0
+                        && mmc_davinci_start_dma_transfer(host, data) == 0) {
+                /* zero this to ensure we take no PIO paths */
+                host->bytes_left = 0;
+        } else {
+                /* Revert to CPU Copy */
+                host->sg_len = data->sg_len;
+                host->sg = host->data->sg;
+                mmc_davinci_sg_to_buf(host);
+        }
+}
+
+static void mmc_davinci_request(struct mmc_host *mmc, struct mmc_request *req)
+{
+        struct mmc_davinci_host *host = mmc_priv(mmc);
+        unsigned long timeout = jiffies + msecs_to_jiffies(900);
+        u32 mmcst1 = 0;
+
+        /* Card may still be sending BUSY after a previous operation,
+         * typically some kind of write.  If so, we can't proceed yet.
+         */
+        while (time_before(jiffies, timeout)) {
+                mmcst1  = readl(host->base + DAVINCI_MMCST1);
+                if (!(mmcst1 & MMCST1_BUSY))
+                        break;
+                cpu_relax();
+        }
+        if (mmcst1 & MMCST1_BUSY) {
+                dev_err(mmc_dev(host->mmc), "still BUSY? bad ... \n");
+                req->cmd->error = -ETIMEDOUT;
+                mmc_request_done(mmc, req);
+                return;
+        }
+
+        host->do_dma = 0;
+        mmc_davinci_prepare_data(host, req);
+        mmc_davinci_start_command(host, req->cmd);
+}
+
+static unsigned int calculate_freq_for_card(struct mmc_davinci_host *host,
+        unsigned int mmc_req_freq)
+{
+        unsigned int mmc_freq = 0, mmc_pclk = 0, mmc_push_pull_divisor = 0;
+
+        mmc_pclk = host->mmc_input_clk;
+        if (mmc_req_freq && mmc_pclk > (2 * mmc_req_freq))
+                mmc_push_pull_divisor = ((unsigned int)mmc_pclk
+                                / (2 * mmc_req_freq)) - 1;
+        else
+                mmc_push_pull_divisor = 0;
+
+        mmc_freq = (unsigned int)mmc_pclk
+                / (2 * (mmc_push_pull_divisor + 1));
+
+        if (mmc_freq > mmc_req_freq)
+                mmc_push_pull_divisor = mmc_push_pull_divisor + 1;
+        /* Convert ns to clock cycles */
+        if (mmc_req_freq <= 400000)
+                host->ns_in_one_cycle = (1000000) / (((mmc_pclk
+                                / (2 * (mmc_push_pull_divisor + 1)))/1000));
+        else
+                host->ns_in_one_cycle = (1000000) / (((mmc_pclk
+                                / (2 * (mmc_push_pull_divisor + 1)))/1000000));
+
+        return mmc_push_pull_divisor;
+}
+
+static void calculate_clk_divider(struct mmc_host *mmc, struct mmc_ios *ios)
+{
+        unsigned int open_drain_freq = 0, mmc_pclk = 0;
+        unsigned int mmc_push_pull_freq = 0;
+        struct mmc_davinci_host *host = mmc_priv(mmc);
+
+        if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN) {
+                u32 temp;
+
+                /* Ignoring the init clock value passed for fixing the inter
+                 * operability with different cards.
+                 */
+                open_drain_freq = ((unsigned int)mmc_pclk
+                                / (2 * MMCSD_INIT_CLOCK)) - 1;
+
+                if (open_drain_freq > 0xFF)
+                        open_drain_freq = 0xFF;
+
+                temp = readl(host->base + DAVINCI_MMCCLK) & ~MMCCLK_CLKRT_MASK;
+                temp |= open_drain_freq;
+                writel(temp, host->base + DAVINCI_MMCCLK);
+
+                /* Convert ns to clock cycles */
+                host->ns_in_one_cycle = (1000000) / (MMCSD_INIT_CLOCK/1000);
+        } else {
+                u32 temp;
+                mmc_push_pull_freq = calculate_freq_for_card(host, ios->clock);
+
+                if (mmc_push_pull_freq > 0xFF)
+                        mmc_push_pull_freq = 0xFF;
+
+                temp = readl(host->base + DAVINCI_MMCCLK) & ~MMCCLK_CLKEN;
+                writel(temp, host->base + DAVINCI_MMCCLK);
+
+                udelay(10);
+
+                temp = readl(host->base + DAVINCI_MMCCLK) & ~MMCCLK_CLKRT_MASK;
+                temp |= mmc_push_pull_freq;
+                writel(temp, host->base + DAVINCI_MMCCLK);
+
+                writel(temp | MMCCLK_CLKEN, host->base + DAVINCI_MMCCLK);
+
+                udelay(10);
+        }
+}
+
+static void mmc_davinci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+{
+        unsigned int mmc_pclk = 0;
+        struct mmc_davinci_host *host = mmc_priv(mmc);
+
+        mmc_pclk = host->mmc_input_clk;
+        dev_dbg(mmc_dev(host->mmc),
+                "clock %dHz busmode %d powermode %d Vdd %04x\n",
+                ios->clock, ios->bus_mode, ios->power_mode,
+                ios->vdd);
+        if (ios->bus_width == MMC_BUS_WIDTH_4) {
+                dev_dbg(mmc_dev(host->mmc), "Enabling 4 bit mode\n");
+                writel(readl(host->base + DAVINCI_MMCCTL) | MMCCTL_WIDTH_4_BIT,
+                        host->base + DAVINCI_MMCCTL);
+        } else {
+                dev_dbg(mmc_dev(host->mmc), "Disabling 4 bit mode\n");
+                writel(readl(host->base + DAVINCI_MMCCTL) & ~MMCCTL_WIDTH_4_BIT,
+                        host->base + DAVINCI_MMCCTL);
+        }
+
+        calculate_clk_divider(mmc, ios);
+
+        host->bus_mode = ios->bus_mode;
+        if (ios->power_mode == MMC_POWER_UP) {
+                unsigned long timeout = jiffies + msecs_to_jiffies(50);
+                bool lose = true;
+
+                /* Send clock cycles, poll completion */
+                writel(0, host->base + DAVINCI_MMCARGHL);
+                writel(MMCCMD_INITCK, host->base + DAVINCI_MMCCMD);
+                while (time_before(jiffies, timeout)) {
+                        u32 tmp = readl(host->base + DAVINCI_MMCST0);
+
+                        if (tmp & MMCST0_RSPDNE) {
+                                lose = false;
+                                break;
+                        }
+                        cpu_relax();
+                }
+                if (lose)
+                        dev_warn(mmc_dev(host->mmc), "powerup timeout\n");
+        }
+
+        /* FIXME on power OFF, reset things ... */
+}
+
+static void
+mmc_davinci_xfer_done(struct mmc_davinci_host *host, struct mmc_data *data)
+{
+        host->data = NULL;
+
+        if (host->do_dma) {
+                davinci_abort_dma(host);
+
+                dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
+                             (data->flags & MMC_DATA_WRITE)
+                             ? DMA_TO_DEVICE
+                             : DMA_FROM_DEVICE);
+                host->do_dma = false;
+        }
+        host->data_dir = DAVINCI_MMC_DATADIR_NONE;
+
+        if (!data->stop || (host->cmd && host->cmd->error)) {
+                mmc_request_done(host->mmc, data->mrq);
+                writel(0, host->base + DAVINCI_MMCIM);
+        } else
+                mmc_davinci_start_command(host, data->stop);
+}
+
+static void mmc_davinci_cmd_done(struct mmc_davinci_host *host,
+                                 struct mmc_command *cmd)
+{
+        host->cmd = NULL;
+
+        if (cmd->flags & MMC_RSP_PRESENT) {
+                if (cmd->flags & MMC_RSP_136) {
+                        /* response type 2 */
+                        cmd->resp[3] = readl(host->base + DAVINCI_MMCRSP01);
+                        cmd->resp[2] = readl(host->base + DAVINCI_MMCRSP23);
+                        cmd->resp[1] = readl(host->base + DAVINCI_MMCRSP45);
+                        cmd->resp[0] = readl(host->base + DAVINCI_MMCRSP67);
+                } else {
+                        /* response types 1, 1b, 3, 4, 5, 6 */
+                        cmd->resp[0] = readl(host->base + DAVINCI_MMCRSP67);
+                }
+        }
+
+        if (host->data == NULL || cmd->error) {
+                if (cmd->error == -ETIMEDOUT)
+                        cmd->mrq->cmd->retries = 0;
+                mmc_request_done(host->mmc, cmd->mrq);
+                writel(0, host->base + DAVINCI_MMCIM);
+        }
+}
+
+static void
+davinci_abort_data(struct mmc_davinci_host *host, struct mmc_data *data)
+{
+        u32 temp;
+
+        /* reset command and data state machines */
+        temp = readl(host->base + DAVINCI_MMCCTL);
+        writel(temp | MMCCTL_CMDRST | MMCCTL_DATRST,
+                host->base + DAVINCI_MMCCTL);
+
+        temp &= ~(MMCCTL_CMDRST | MMCCTL_DATRST);
+        udelay(10);
+        writel(temp, host->base + DAVINCI_MMCCTL);
+}
+
+static irqreturn_t mmc_davinci_irq(int irq, void *dev_id)
+{
+        struct mmc_davinci_host *host = (struct mmc_davinci_host *)dev_id;
+        unsigned int status, qstatus;
+        int end_command = 0;
+        int end_transfer = 0;
+        struct mmc_data *data = host->data;
+
+        if (host->cmd == NULL && host->data == NULL) {
+                status = readl(host->base + DAVINCI_MMCST0);
+                dev_dbg(mmc_dev(host->mmc),
+                        "Spurious interrupt 0x%04x\n", status);
+                /* Disable the interrupt from mmcsd */
+                writel(0, host->base + DAVINCI_MMCIM);
+                return IRQ_NONE;
+        }
+
+        status = readl(host->base + DAVINCI_MMCST0);
+        qstatus = status;
+
+        /* handle FIFO first when using PIO for data.
+         * bytes_left will decrease to zero as I/O progress and status will
+         * read zero over iteration because this controller status
+         * register(MMCST0) reports any status only once and it is cleared
+         * by read. So, it is not unbouned loop even in the case of
+         * non-dma.
+         */
+        while (host->bytes_left && (status & (MMCST0_DXRDY | MMCST0_DRRDY))) {
+                davinci_fifo_data_trans(host, rw_threshold);
+                status = readl(host->base + DAVINCI_MMCST0);
+                if (!status)
+                        break;
+                qstatus |= status;
+        }
+
+        if (qstatus & MMCST0_DATDNE) {
+                /* All blocks sent/received, and CRC checks passed */
+                if (data != NULL) {
+                        if ((host->do_dma == 0) && (host->bytes_left > 0)) {
+                                /* if datasize < rw_threshold
+                                 * no RX ints are generated
+                                 */
+                                davinci_fifo_data_trans(host, host->bytes_left);
+                        }
+                        end_transfer = 1;
+                        data->bytes_xfered = data->blocks * data->blksz;
+                } else {
+                        dev_err(mmc_dev(host->mmc),
+                                        "DATDNE with no host->data\n");
+                }
+        }
+
+        if (qstatus & MMCST0_TOUTRD) {
+                /* Read data timeout */
+                data->error = -ETIMEDOUT;
+                end_transfer = 1;
+
+                dev_dbg(mmc_dev(host->mmc),
+                        "read data timeout, status %x\n",
+                        qstatus);
+
+                davinci_abort_data(host, data);
+        }
+
+        if (qstatus & (MMCST0_CRCWR | MMCST0_CRCRD)) {
+                /* Data CRC error */
+                data->error = -EILSEQ;
+                end_transfer = 1;
+
+                /* NOTE:  this controller uses CRCWR to report both CRC
+                 * errors and timeouts (on writes).  MMCDRSP values are
+                 * only weakly documented, but 0x9f was clearly a timeout
+                 * case and the two three-bit patterns in various SD specs
+                 * (101, 010) aren't part of it ...
+                 */
+                if (qstatus & MMCST0_CRCWR) {
+                        u32 temp = readb(host->base + DAVINCI_MMCDRSP);
+
+                        if (temp == 0x9f)
+                                data->error = -ETIMEDOUT;
+                }
+                dev_dbg(mmc_dev(host->mmc), "data %s %s error\n",
+                        (qstatus & MMCST0_CRCWR) ? "write" : "read",
+                        (data->error == -ETIMEDOUT) ? "timeout" : "CRC");
+
+                davinci_abort_data(host, data);
+        }
+
+        if (qstatus & MMCST0_TOUTRS) {
+                /* Command timeout */
+                if (host->cmd) {
+                        dev_dbg(mmc_dev(host->mmc),
+                                "CMD%d timeout, status %x\n",
+                                host->cmd->opcode, qstatus);
+                        host->cmd->error = -ETIMEDOUT;
+                        if (data) {
+                                end_transfer = 1;
+                                davinci_abort_data(host, data);
+                        } else
+                                end_command = 1;
+                }
+        }
+
+        if (qstatus & MMCST0_CRCRS) {
+                /* Command CRC error */
+                dev_dbg(mmc_dev(host->mmc), "Command CRC error\n");
+                if (host->cmd) {
+                        host->cmd->error = -EILSEQ;
+                        end_command = 1;
+                }
+        }
+
+        if (qstatus & MMCST0_RSPDNE) {
+                /* End of command phase */
+                end_command = (int) host->cmd;
+        }
+
+        if (end_command)
+                mmc_davinci_cmd_done(host, host->cmd);
+        if (end_transfer)
+                mmc_davinci_xfer_done(host, data);
+        return IRQ_HANDLED;
+}
+
+static int mmc_davinci_get_cd(struct mmc_host *mmc)
+{
+        struct platform_device *pdev = to_platform_device(mmc->parent);
+        struct davinci_mmc_config *config = pdev->dev.platform_data;
+
+        if (!config || !config->get_cd)
+                return -ENOSYS;
+        return config->get_cd(pdev->id);
+}
+
+static int mmc_davinci_get_ro(struct mmc_host *mmc)
+{
+        struct platform_device *pdev = to_platform_device(mmc->parent);
+        struct davinci_mmc_config *config = pdev->dev.platform_data;
+
+        if (!config || !config->get_ro)
+                return -ENOSYS;
+        return config->get_ro(pdev->id);
+}
+
+static struct mmc_host_ops mmc_davinci_ops = {
+        .request        = mmc_davinci_request,
+        .set_ios        = mmc_davinci_set_ios,
+        .get_cd         = mmc_davinci_get_cd,
+        .get_ro         = mmc_davinci_get_ro,
+};
+
+/*----------------------------------------------------------------------*/
+
+#ifdef CONFIG_CPU_FREQ
+static int mmc_davinci_cpufreq_transition(struct notifier_block *nb,
+                                     unsigned long val, void *data)
+{
+        struct mmc_davinci_host *host;
+        unsigned int mmc_pclk;
+        struct mmc_host *mmc;
+        unsigned long flags;
+
+        host = container_of(nb, struct mmc_davinci_host, freq_transition);
+        mmc = host->mmc;
+        mmc_pclk = clk_get_rate(host->clk);
+
+        if (val == CPUFREQ_POSTCHANGE) {
+                spin_lock_irqsave(&mmc->lock, flags);
+                host->mmc_input_clk = mmc_pclk;
+                calculate_clk_divider(mmc, &mmc->ios);
+                spin_unlock_irqrestore(&mmc->lock, flags);
+        }
+
+        return 0;
+}
+
+static inline int mmc_davinci_cpufreq_register(struct mmc_davinci_host *host)
+{
+        host->freq_transition.notifier_call = mmc_davinci_cpufreq_transition;
+
+        return cpufreq_register_notifier(&host->freq_transition,
+                                         CPUFREQ_TRANSITION_NOTIFIER);
+}
+
+static inline void mmc_davinci_cpufreq_deregister(struct mmc_davinci_host *host)
+{
+        cpufreq_unregister_notifier(&host->freq_transition,
+                                    CPUFREQ_TRANSITION_NOTIFIER);
+}
+#else
+static inline int mmc_davinci_cpufreq_register(struct mmc_davinci_host *host)
+{
+        return 0;
+}
+
+static inline void mmc_davinci_cpufreq_deregister(struct mmc_davinci_host *host)
+{
+}
+#endif
+static void __init init_mmcsd_host(struct mmc_davinci_host *host)
+{
+        /* DAT line portion is diabled and in reset state */
+        writel(readl(host->base + DAVINCI_MMCCTL) | MMCCTL_DATRST,
+                host->base + DAVINCI_MMCCTL);
+
+        /* CMD line portion is diabled and in reset state */
+        writel(readl(host->base + DAVINCI_MMCCTL) | MMCCTL_CMDRST,
+                host->base + DAVINCI_MMCCTL);
+
+        udelay(10);
+
+        writel(0, host->base + DAVINCI_MMCCLK);
+        writel(MMCCLK_CLKEN, host->base + DAVINCI_MMCCLK);
+
+        writel(0x1FFF, host->base + DAVINCI_MMCTOR);
+        writel(0xFFFF, host->base + DAVINCI_MMCTOD);
+
+        writel(readl(host->base + DAVINCI_MMCCTL) & ~MMCCTL_DATRST,
+                host->base + DAVINCI_MMCCTL);
+        writel(readl(host->base + DAVINCI_MMCCTL) & ~MMCCTL_CMDRST,
+                host->base + DAVINCI_MMCCTL);
+
+        udelay(10);
+}
+
+static int __init davinci_mmcsd_probe(struct platform_device *pdev)
+{
+        struct davinci_mmc_config *pdata = pdev->dev.platform_data;
+        struct mmc_davinci_host *host = NULL;
+        struct mmc_host *mmc = NULL;
+        struct resource *r, *mem = NULL;
+        int ret = 0, irq = 0;
+        size_t mem_size;
+
+        /* REVISIT:  when we're fully converted, fail if pdata is NULL */
+
+        ret = -ENODEV;
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        irq = platform_get_irq(pdev, 0);
+        if (!r || irq == NO_IRQ)
+                goto out;
+
+        ret = -EBUSY;
+        mem_size = resource_size(r);
+        mem = request_mem_region(r->start, mem_size, pdev->name);
+        if (!mem)
+                goto out;
+
+        ret = -ENOMEM;
+        mmc = mmc_alloc_host(sizeof(struct mmc_davinci_host), &pdev->dev);
+        if (!mmc)
+                goto out;
+
+        host = mmc_priv(mmc);
+        host->mmc = mmc;        /* Important */
+
+        r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
+        if (!r)
+                goto out;
+        host->rxdma = r->start;
+
+        r = platform_get_resource(pdev, IORESOURCE_DMA, 1);
+        if (!r)
+                goto out;
+        host->txdma = r->start;
+
+        host->mem_res = mem;
+        host->base = ioremap(mem->start, mem_size);
+        if (!host->base)
+                goto out;
+
+        ret = -ENXIO;
+        host->clk = clk_get(&pdev->dev, "MMCSDCLK");
+        if (IS_ERR(host->clk)) {
+                ret = PTR_ERR(host->clk);
+                goto out;
+        }
+        clk_enable(host->clk);
+        host->mmc_input_clk = clk_get_rate(host->clk);
+
+        init_mmcsd_host(host);
+
+        host->use_dma = use_dma;
+        host->irq = irq;
+
+        if (host->use_dma && davinci_acquire_dma_channels(host) != 0)
+                host->use_dma = 0;
+
+        /* REVISIT:  someday, support IRQ-driven card detection.  */
+        mmc->caps |= MMC_CAP_NEEDS_POLL;
+
+        if (!pdata || pdata->wires == 4 || pdata->wires == 0)
+                mmc->caps |= MMC_CAP_4_BIT_DATA;
+
+        host->version = pdata->version;
+
+        mmc->ops = &mmc_davinci_ops;
+        mmc->f_min = 312500;
+        mmc->f_max = 25000000;
+        if (pdata && pdata->max_freq)
+                mmc->f_max = pdata->max_freq;
+        if (pdata && pdata->caps)
+                mmc->caps |= pdata->caps;
+        mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
+
+        /* With no iommu coalescing pages, each phys_seg is a hw_seg.
+         * Each hw_seg uses one EDMA parameter RAM slot, always one
+         * channel and then usually some linked slots.
+         */
+        mmc->max_hw_segs        = 1 + host->n_link;
+        mmc->max_phys_segs      = mmc->max_hw_segs;
+
+        /* EDMA limit per hw segment (one or two MBytes) */
+        mmc->max_seg_size       = MAX_CCNT * rw_threshold;
+
+        /* MMC/SD controller limits for multiblock requests */
+        mmc->max_blk_size       = 4095;  /* BLEN is 12 bits */
+        mmc->max_blk_count      = 65535; /* NBLK is 16 bits */
+        mmc->max_req_size       = mmc->max_blk_size * mmc->max_blk_count;
+
+        dev_dbg(mmc_dev(host->mmc), "max_phys_segs=%d\n", mmc->max_phys_segs);
+        dev_dbg(mmc_dev(host->mmc), "max_hw_segs=%d\n", mmc->max_hw_segs);
+        dev_dbg(mmc_dev(host->mmc), "max_blk_size=%d\n", mmc->max_blk_size);
+        dev_dbg(mmc_dev(host->mmc), "max_req_size=%d\n", mmc->max_req_size);
+        dev_dbg(mmc_dev(host->mmc), "max_seg_size=%d\n", mmc->max_seg_size);
+
+        platform_set_drvdata(pdev, host);
+
+        ret = mmc_davinci_cpufreq_register(host);
+        if (ret) {
+                dev_err(&pdev->dev, "failed to register cpufreq\n");
+                goto cpu_freq_fail;
+        }
+
+        ret = mmc_add_host(mmc);
+        if (ret < 0)
+                goto out;
+
+        ret = request_irq(irq, mmc_davinci_irq, 0, mmc_hostname(mmc), host);
+        if (ret)
+                goto out;
+
+        rename_region(mem, mmc_hostname(mmc));
+
+        dev_info(mmc_dev(host->mmc), "Using %s, %d-bit mode\n",
+                host->use_dma ? "DMA" : "PIO",
+                (mmc->caps & MMC_CAP_4_BIT_DATA) ? 4 : 1);
+
+        return 0;
+
+out:
+        mmc_davinci_cpufreq_deregister(host);
+cpu_freq_fail:
+        if (host) {
+                davinci_release_dma_channels(host);
+
+                if (host->clk) {
+                        clk_disable(host->clk);
+                        clk_put(host->clk);
+                }
+
+                if (host->base)
+                        iounmap(host->base);
+        }
+
+        if (mmc)
+                mmc_free_host(mmc);
+
+        if (mem)
+                release_resource(mem);
+
+        dev_dbg(&pdev->dev, "probe err %d\n", ret);
+
+        return ret;
+}
+
+static int __exit davinci_mmcsd_remove(struct platform_device *pdev)
+{
+        struct mmc_davinci_host *host = platform_get_drvdata(pdev);
+
+        platform_set_drvdata(pdev, NULL);
+        if (host) {
+                mmc_davinci_cpufreq_deregister(host);
+
+                mmc_remove_host(host->mmc);
+                free_irq(host->irq, host);
+
+                davinci_release_dma_channels(host);
+
+                clk_disable(host->clk);
+                clk_put(host->clk);
+
+                iounmap(host->base);
+
+                release_resource(host->mem_res);
+
+                mmc_free_host(host->mmc);
+        }
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int davinci_mmcsd_suspend(struct platform_device *pdev, pm_message_t msg)
+{
+        struct mmc_davinci_host *host = platform_get_drvdata(pdev);
+
+        return mmc_suspend_host(host->mmc, msg);
+}
+
+static int davinci_mmcsd_resume(struct platform_device *pdev)
+{
+        struct mmc_davinci_host *host = platform_get_drvdata(pdev);
+
+        return mmc_resume_host(host->mmc);
+}
+#else
+#define davinci_mmcsd_suspend   NULL
+#define davinci_mmcsd_resume    NULL
+#endif
+
+static struct platform_driver davinci_mmcsd_driver = {
+        .driver         = {
+                .name   = "davinci_mmc",
+                .owner  = THIS_MODULE,
+        },
+        .remove         = __exit_p(davinci_mmcsd_remove),
+        .suspend        = davinci_mmcsd_suspend,
+        .resume         = davinci_mmcsd_resume,
+};
+
+static int __init davinci_mmcsd_init(void)
+{
+        return platform_driver_probe(&davinci_mmcsd_driver,
+                                     davinci_mmcsd_probe);
+}
+module_init(davinci_mmcsd_init);
+
+static void __exit davinci_mmcsd_exit(void)
+{
+        platform_driver_unregister(&davinci_mmcsd_driver);
+}
+module_exit(davinci_mmcsd_exit);
+
+MODULE_AUTHOR("Texas Instruments India");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("MMC/SD driver for Davinci MMC controller");
+
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index 88671529c45d..60a2b69e54f5 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -679,17 +679,17 @@ static int mxcmci_probe(struct platform_device *pdev)
 {
         struct mmc_host *mmc;
         struct mxcmci_host *host = NULL;
-        struct resource *r;
+        struct resource *iores, *r;
         int ret = 0, irq;
 
         printk(KERN_INFO "i.MX SDHC driver\n");
 
-        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         irq = platform_get_irq(pdev, 0);
-        if (!r || irq < 0)
+        if (!iores || irq < 0)
                 return -EINVAL;
 
-        r = request_mem_region(r->start, resource_size(r), pdev->name);
+        r = request_mem_region(iores->start, resource_size(iores), pdev->name);
         if (!r)
                 return -EBUSY;
 
@@ -809,7 +809,7 @@ out_iounmap:
 out_free:
         mmc_free_host(mmc);
 out_release_mem:
-        release_mem_region(host->res->start, resource_size(host->res));
+        release_mem_region(iores->start, resource_size(iores));
         return ret;
 }
 
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 5f970e253e50..c6d7e8ecadbf 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1459,8 +1459,10 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
                 goto err_ioremap;
 
         host->iclk = clk_get(&pdev->dev, "ick");
-        if (IS_ERR(host->iclk))
+        if (IS_ERR(host->iclk)) {
+                ret = PTR_ERR(host->iclk);
                 goto err_free_mmc_host;
+        }
         clk_enable(host->iclk);
 
         host->fclk = clk_get(&pdev->dev, "fck");
@@ -1500,10 +1502,8 @@ err_free_irq:
 err_free_fclk:
         clk_put(host->fclk);
 err_free_iclk:
-        if (host->iclk != NULL) {
-                clk_disable(host->iclk);
-                clk_put(host->iclk);
-        }
+        clk_disable(host->iclk);
+        clk_put(host->iclk);
 err_free_mmc_host:
         iounmap(host->virt_base);
 err_ioremap:
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index bb47ff465c04..0d783f3e79ed 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -828,7 +828,7 @@ static int pxamci_resume(struct device *dev)
         return ret;
 }
 
-static struct dev_pm_ops pxamci_pm_ops = {
+static const struct dev_pm_ops pxamci_pm_ops = {
         .suspend        = pxamci_suspend,
         .resume         = pxamci_resume,
 };
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 941a4d35ef8d..d96e1abf2d64 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -820,7 +820,7 @@ fail_request:
 static void finalize_request(struct s3cmci_host *host)
 {
         struct mmc_request *mrq = host->mrq;
-        struct mmc_command *cmd = host->cmd_is_stop ? mrq->stop : mrq->cmd;
+        struct mmc_command *cmd;
         int debug_as_failure = 0;
 
         if (host->complete_what != COMPLETION_FINALIZE)
@@ -828,6 +828,7 @@ static void finalize_request(struct s3cmci_host *host)
 
         if (!mrq)
                 return;
+        cmd = host->cmd_is_stop ? mrq->stop : mrq->cmd;
 
         if (cmd->data && (cmd->error == 0) &&
             (cmd->data->error == 0)) {
@@ -1302,10 +1303,8 @@ static int s3cmci_get_ro(struct mmc_host *mmc)
         if (pdata->no_wprotect)
                 return 0;
 
-        ret = s3c2410_gpio_getpin(pdata->gpio_wprotect);
-
-        if (pdata->wprotect_invert)
-                ret = !ret;
+        ret = gpio_get_value(pdata->gpio_wprotect) ? 1 : 0;
+        ret ^= pdata->wprotect_invert;
 
         return ret;
 }
@@ -1654,7 +1653,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)
                         goto probe_free_irq;
                 }
 
-                host->irq_cd = s3c2410_gpio_getirq(host->pdata->gpio_detect);
+                host->irq_cd = gpio_to_irq(host->pdata->gpio_detect);
 
                 if (host->irq_cd >= 0) {
                         if (request_irq(host->irq_cd, s3cmci_irq_cd,
@@ -1892,7 +1891,7 @@ static int s3cmci_resume(struct device *dev)
         return mmc_resume_host(mmc);
 }
 
-static struct dev_pm_ops s3cmci_pm = {
+static const struct dev_pm_ops s3cmci_pm = {
         .suspend        = s3cmci_suspend,
         .resume         = s3cmci_resume,
 };
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index e0356644d1aa..5c3a1767770a 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -285,6 +285,73 @@ static const struct sdhci_pci_fixes sdhci_jmicron = {
         .resume         = jmicron_resume,
 };
 
+/* SysKonnect CardBus2SDIO extra registers */
+#define SYSKT_CTRL              0x200
+#define SYSKT_RDFIFO_STAT       0x204
+#define SYSKT_WRFIFO_STAT       0x208
+#define SYSKT_POWER_DATA        0x20c
+#define   SYSKT_POWER_330       0xef
+#define   SYSKT_POWER_300       0xf8
+#define   SYSKT_POWER_184       0xcc
+#define SYSKT_POWER_CMD         0x20d
+#define   SYSKT_POWER_START     (1 << 7)
+#define SYSKT_POWER_STATUS      0x20e
+#define   SYSKT_POWER_STATUS_OK (1 << 0)
+#define SYSKT_BOARD_REV         0x210
+#define SYSKT_CHIP_REV          0x211
+#define SYSKT_CONF_DATA         0x212
+#define   SYSKT_CONF_DATA_1V8   (1 << 2)
+#define   SYSKT_CONF_DATA_2V5   (1 << 1)
+#define   SYSKT_CONF_DATA_3V3   (1 << 0)
+
+static int syskt_probe(struct sdhci_pci_chip *chip)
+{
+        if ((chip->pdev->class & 0x0000FF) == PCI_SDHCI_IFVENDOR) {
+                chip->pdev->class &= ~0x0000FF;
+                chip->pdev->class |= PCI_SDHCI_IFDMA;
+        }
+        return 0;
+}
+
+static int syskt_probe_slot(struct sdhci_pci_slot *slot)
+{
+        int tm, ps;
+
+        u8 board_rev = readb(slot->host->ioaddr + SYSKT_BOARD_REV);
+        u8  chip_rev = readb(slot->host->ioaddr + SYSKT_CHIP_REV);
+        dev_info(&slot->chip->pdev->dev, "SysKonnect CardBus2SDIO, "
+                                         "board rev %d.%d, chip rev %d.%d\n",
+                                         board_rev >> 4, board_rev & 0xf,
+                                         chip_rev >> 4,  chip_rev & 0xf);
+        if (chip_rev >= 0x20)
+                slot->host->quirks |= SDHCI_QUIRK_FORCE_DMA;
+
+        writeb(SYSKT_POWER_330, slot->host->ioaddr + SYSKT_POWER_DATA);
+        writeb(SYSKT_POWER_START, slot->host->ioaddr + SYSKT_POWER_CMD);
+        udelay(50);
+        tm = 10;  /* Wait max 1 ms */
+        do {
+                ps = readw(slot->host->ioaddr + SYSKT_POWER_STATUS);
+                if (ps & SYSKT_POWER_STATUS_OK)
+                        break;
+                udelay(100);
+        } while (--tm);
+        if (!tm) {
+                dev_err(&slot->chip->pdev->dev,
+                        "power regulator never stabilized");
+                writeb(0, slot->host->ioaddr + SYSKT_POWER_CMD);
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+static const struct sdhci_pci_fixes sdhci_syskt = {
+        .quirks         = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER,
+        .probe          = syskt_probe,
+        .probe_slot     = syskt_probe_slot,
+};
+
 static int via_probe(struct sdhci_pci_chip *chip)
 {
         if (chip->pdev->revision == 0x10)
@@ -363,6 +430,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = {
         },
 
         {
+                .vendor         = PCI_VENDOR_ID_SYSKONNECT,
+                .device         = 0x8000,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .driver_data    = (kernel_ulong_t)&sdhci_syskt,
+        },
+
+        {
                 .vendor         = PCI_VENDOR_ID_VIA,
                 .device         = 0x95d0,
                 .subvendor      = PCI_ANY_ID,
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index 91991b460c45..7cccc8523747 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -591,7 +591,7 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
         disable_mmc_irqs(host, TMIO_MASK_ALL);
 
         ret = request_irq(host->irq, tmio_mmc_irq, IRQF_DISABLED |
-                IRQF_TRIGGER_FALLING, "tmio-mmc", host);
+                IRQF_TRIGGER_FALLING, dev_name(&dev->dev), host);
         if (ret)
                 goto unmap_cnf;
 
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index e7563a9872d0..5fbf29e1e64f 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -43,15 +43,17 @@
 // debugging, turns off buffer write mode if set to 1
 #define FORCE_WORD_WRITE 0
 
-#define MANUFACTURER_INTEL      0x0089
+/* Intel chips */
 #define I82802AB        0x00ad
 #define I82802AC        0x00ac
 #define PF38F4476       0x881c
-#define MANUFACTURER_ST         0x0020
+/* STMicroelectronics chips */
 #define M50LPW080       0x002F
 #define M50FLW080A      0x0080
 #define M50FLW080B      0x0081
+/* Atmel chips */
 #define AT49BV640D      0x02de
+#define AT49BV640DT     0x02db
 
 static int cfi_intelext_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
 static int cfi_intelext_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
@@ -199,6 +201,16 @@ static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
         cfi->cfiq->BufWriteTimeoutMax = 0;
 }
 
+static void fixup_at49bv640dx_lock(struct mtd_info *mtd, void *param)
+{
+        struct map_info *map = mtd->priv;
+        struct cfi_private *cfi = map->fldrv_priv;
+        struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
+
+        cfip->FeatureSupport |= (1 << 5);
+        mtd->flags |= MTD_POWERUP_LOCK;
+}
+
 #ifdef CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE
 /* Some Intel Strata Flash prior to FPO revision C has bugs in this area */
 static void fixup_intel_strataflash(struct mtd_info *mtd, void* param)
@@ -283,6 +295,8 @@ static void fixup_unlock_powerup_lock(struct mtd_info *mtd, void *param)
 
 static struct cfi_fixup cfi_fixup_table[] = {
         { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
+        { CFI_MFR_ATMEL, AT49BV640D, fixup_at49bv640dx_lock, NULL },
+        { CFI_MFR_ATMEL, AT49BV640DT, fixup_at49bv640dx_lock, NULL },
 #ifdef CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE
         { CFI_MFR_ANY, CFI_ID_ANY, fixup_intel_strataflash, NULL },
 #endif
@@ -294,16 +308,16 @@ static struct cfi_fixup cfi_fixup_table[] = {
 #endif
         { CFI_MFR_ST, 0x00ba, /* M28W320CT */ fixup_st_m28w320ct, NULL },
         { CFI_MFR_ST, 0x00bb, /* M28W320CB */ fixup_st_m28w320cb, NULL },
-        { MANUFACTURER_INTEL, CFI_ID_ANY, fixup_unlock_powerup_lock, NULL, },
+        { CFI_MFR_INTEL, CFI_ID_ANY, fixup_unlock_powerup_lock, NULL, },
         { 0, 0, NULL, NULL }
 };
 
 static struct cfi_fixup jedec_fixup_table[] = {
-        { MANUFACTURER_INTEL, I82802AB,   fixup_use_fwh_lock, NULL, },
-        { MANUFACTURER_INTEL, I82802AC,   fixup_use_fwh_lock, NULL, },
-        { MANUFACTURER_ST,    M50LPW080,  fixup_use_fwh_lock, NULL, },
-        { MANUFACTURER_ST,    M50FLW080A, fixup_use_fwh_lock, NULL, },
-        { MANUFACTURER_ST,    M50FLW080B, fixup_use_fwh_lock, NULL, },
+        { CFI_MFR_INTEL, I82802AB,   fixup_use_fwh_lock, NULL, },
+        { CFI_MFR_INTEL, I82802AC,   fixup_use_fwh_lock, NULL, },
+        { CFI_MFR_ST,    M50LPW080,  fixup_use_fwh_lock, NULL, },
+        { CFI_MFR_ST,    M50FLW080A, fixup_use_fwh_lock, NULL, },
+        { CFI_MFR_ST,    M50FLW080B, fixup_use_fwh_lock, NULL, },
         { 0, 0, NULL, NULL }
 };
 static struct cfi_fixup fixup_table[] = {
@@ -319,7 +333,7 @@ static struct cfi_fixup fixup_table[] = {
 static void cfi_fixup_major_minor(struct cfi_private *cfi,
                                                 struct cfi_pri_intelext *extp)
 {
-        if (cfi->mfr == MANUFACTURER_INTEL &&
+        if (cfi->mfr == CFI_MFR_INTEL &&
                         cfi->id == PF38F4476 && extp->MinorVersion == '3')
                 extp->MinorVersion = '1';
 }
@@ -2235,7 +2249,7 @@ static int cfi_intelext_otp_walk(struct mtd_info *mtd, loff_t from, size_t len,
 
         /* Some chips have OTP located in the _top_ partition only.
            For example: Intel 28F256L18T (T means top-parameter device) */
-        if (cfi->mfr == MANUFACTURER_INTEL) {
+        if (cfi->mfr == CFI_MFR_INTEL) {
                 switch (cfi->id) {
                 case 0x880b:
                 case 0x880c:
@@ -2564,6 +2578,7 @@ static int cfi_intelext_reset(struct mtd_info *mtd)
                 if (!ret) {
                         map_write(map, CMD(0xff), chip->start);
                         chip->state = FL_SHUTDOWN;
+                        put_chip(map, chip, chip->start);
                 }
                 spin_unlock(chip->mutex);
         }
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 94bb61e19047..f3600e8d5382 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -490,10 +490,6 @@ static struct mtd_info *cfi_amdstd_setup(struct mtd_info *mtd)
         }
 #endif
 
-        /* FIXME: erase-suspend-program is broken.  See
-           http://lists.infradead.org/pipermail/linux-mtd/2003-December/009001.html */
-        printk(KERN_NOTICE "cfi_cmdset_0002: Disabling erase-suspend-program due to code brokenness.\n");
-
         __module_get(THIS_MODULE);
         return mtd;
 
@@ -573,7 +569,6 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
 
                         if (time_after(jiffies, timeo)) {
                                 printk(KERN_ERR "Waiting for chip to be ready timed out.\n");
-                                spin_unlock(chip->mutex);
                                 return -EIO;
                         }
                         spin_unlock(chip->mutex);
@@ -589,15 +584,9 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
                 return 0;
 
         case FL_ERASING:
-                if (mode == FL_WRITING) /* FIXME: Erase-suspend-program appears broken. */
-                        goto sleep;
-
-                if (!(   mode == FL_READY
-                      || mode == FL_POINT
-                      || !cfip
-                      || (mode == FL_WRITING && (cfip->EraseSuspend & 0x2))
-                      || (mode == FL_WRITING && (cfip->EraseSuspend & 0x1)
-                    )))
+                if (!cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
+                    !(mode == FL_READY || mode == FL_POINT ||
+                    (mode == FL_WRITING && (cfip->EraseSuspend & 0x2))))
                         goto sleep;
 
                 /* We could check to see if we're trying to access the sector
diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c
index c5a84fda5410..ca584d0380b4 100755
--- a/drivers/mtd/chips/cfi_util.c
+++ b/drivers/mtd/chips/cfi_util.c
@@ -71,6 +71,13 @@ int __xipram cfi_qry_mode_on(uint32_t base, struct map_info *map,
         cfi_send_gen_cmd(0x98, 0x555, base, map, cfi, cfi->device_type, NULL);
         if (cfi_qry_present(map, base, cfi))
                 return 1;
+        /* some old SST chips, e.g. 39VF160x/39VF320x */
+        cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
+        cfi_send_gen_cmd(0xAA, 0x5555, base, map, cfi, cfi->device_type, NULL);
+        cfi_send_gen_cmd(0x55, 0x2AAA, base, map, cfi, cfi->device_type, NULL);
+        cfi_send_gen_cmd(0x98, 0x5555, base, map, cfi, cfi->device_type, NULL);
+        if (cfi_qry_present(map, base, cfi))
+                return 1;
         /* QRY not found */
         return 0;
 }
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index 736a3be265f2..1bec5e1ce6ac 100644
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -142,8 +142,8 @@
 
 /* ST - www.st.com */
 #define M29F800AB       0x0058
-#define M29W800DT       0x00D7
-#define M29W800DB       0x005B
+#define M29W800DT       0x22D7
+#define M29W800DB       0x225B
 #define M29W400DT       0x00EE
 #define M29W400DB       0x00EF
 #define M29W160DT       0x22C4
@@ -1575,7 +1575,7 @@ static const struct amd_flash_info jedec_table[] = {
                 .dev_id         = M29W800DT,
                 .name           = "ST M29W800DT",
                 .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
-                .uaddr          = MTD_UADDR_0x5555_0x2AAA,      /* ???? */
+                .uaddr          = MTD_UADDR_0x0AAA_0x0555,
                 .dev_size       = SIZE_1MiB,
                 .cmd_set        = P_ID_AMD_STD,
                 .nr_regions     = 4,
@@ -1590,7 +1590,7 @@ static const struct amd_flash_info jedec_table[] = {
                 .dev_id         = M29W800DB,
                 .name           = "ST M29W800DB",
                 .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
-                .uaddr          = MTD_UADDR_0x5555_0x2AAA,      /* ???? */
+                .uaddr          = MTD_UADDR_0x0AAA_0x0555,
                 .dev_size       = SIZE_1MiB,
                 .cmd_set        = P_ID_AMD_STD,
                 .nr_regions     = 4,
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 4c19269de91a..f3f4768d6e18 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -22,6 +22,7 @@
 #include <linux/mutex.h>
 #include <linux/math64.h>
 #include <linux/sched.h>
+#include <linux/mod_devicetable.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -29,9 +30,6 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 
-
-#define FLASH_PAGESIZE          256
-
 /* Flash opcodes. */
 #define OPCODE_WREN             0x06    /* Write enable */
 #define OPCODE_RDSR             0x05    /* Read status register */
@@ -61,7 +59,7 @@
 
 /* Define max times to check status register before we give up. */
 #define MAX_READY_WAIT_JIFFIES  (40 * HZ)       /* M25P16 specs 40s max chip erase */
-#define CMD_SIZE                4
+#define MAX_CMD_SIZE            4
 
 #ifdef CONFIG_M25PXX_USE_FAST_READ
 #define OPCODE_READ     OPCODE_FAST_READ
@@ -78,8 +76,10 @@ struct m25p {
         struct mutex            lock;
         struct mtd_info         mtd;
         unsigned                partitioned:1;
+        u16                     page_size;
+        u16                     addr_width;
         u8                      erase_opcode;
-        u8                      command[CMD_SIZE + FAST_READ_DUMMY_BYTE];
+        u8                      *command;
 };
 
 static inline struct m25p *mtd_to_m25p(struct mtd_info *mtd)
@@ -198,6 +198,19 @@ static int erase_chip(struct m25p *flash)
         return 0;
 }
 
+static void m25p_addr2cmd(struct m25p *flash, unsigned int addr, u8 *cmd)
+{
+        /* opcode is in cmd[0] */
+        cmd[1] = addr >> (flash->addr_width * 8 -  8);
+        cmd[2] = addr >> (flash->addr_width * 8 - 16);
+        cmd[3] = addr >> (flash->addr_width * 8 - 24);
+}
+
+static int m25p_cmdsz(struct m25p *flash)
+{
+        return 1 + flash->addr_width;
+}
+
 /*
  * Erase one sector of flash memory at offset ``offset'' which is any
  * address within the sector which should be erased.
@@ -219,11 +232,9 @@ static int erase_sector(struct m25p *flash, u32 offset)
 
         /* Set up command buffer. */
         flash->command[0] = flash->erase_opcode;
-        flash->command[1] = offset >> 16;
-        flash->command[2] = offset >> 8;
-        flash->command[3] = offset;
+        m25p_addr2cmd(flash, offset, flash->command);
 
-        spi_write(flash->spi, flash->command, CMD_SIZE);
+        spi_write(flash->spi, flash->command, m25p_cmdsz(flash));
 
         return 0;
 }
@@ -325,7 +336,7 @@ static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
          * Should add 1 byte DUMMY_BYTE.
          */
         t[0].tx_buf = flash->command;
-        t[0].len = CMD_SIZE + FAST_READ_DUMMY_BYTE;
+        t[0].len = m25p_cmdsz(flash) + FAST_READ_DUMMY_BYTE;
         spi_message_add_tail(&t[0], &m);
 
         t[1].rx_buf = buf;
@@ -352,13 +363,11 @@ static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
 
         /* Set up the write data buffer. */
         flash->command[0] = OPCODE_READ;
-        flash->command[1] = from >> 16;
-        flash->command[2] = from >> 8;
-        flash->command[3] = from;
+        m25p_addr2cmd(flash, from, flash->command);
 
         spi_sync(flash->spi, &m);
 
-        *retlen = m.actual_length - CMD_SIZE - FAST_READ_DUMMY_BYTE;
+        *retlen = m.actual_length - m25p_cmdsz(flash) - FAST_READ_DUMMY_BYTE;
 
         mutex_unlock(&flash->lock);
 
@@ -396,7 +405,7 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
         memset(t, 0, (sizeof t));
 
         t[0].tx_buf = flash->command;
-        t[0].len = CMD_SIZE;
+        t[0].len = m25p_cmdsz(flash);
         spi_message_add_tail(&t[0], &m);
 
         t[1].tx_buf = buf;
@@ -414,41 +423,36 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
 
         /* Set up the opcode in the write buffer. */
         flash->command[0] = OPCODE_PP;
-        flash->command[1] = to >> 16;
-        flash->command[2] = to >> 8;
-        flash->command[3] = to;
+        m25p_addr2cmd(flash, to, flash->command);
 
-        /* what page do we start with? */
-        page_offset = to % FLASH_PAGESIZE;
+        page_offset = to & (flash->page_size - 1);
 
         /* do all the bytes fit onto one page? */
-        if (page_offset + len <= FLASH_PAGESIZE) {
+        if (page_offset + len <= flash->page_size) {
                 t[1].len = len;
 
                 spi_sync(flash->spi, &m);
 
-                *retlen = m.actual_length - CMD_SIZE;
+                *retlen = m.actual_length - m25p_cmdsz(flash);
         } else {
                 u32 i;
 
                 /* the size of data remaining on the first page */
-                page_size = FLASH_PAGESIZE - page_offset;
+                page_size = flash->page_size - page_offset;
 
                 t[1].len = page_size;
                 spi_sync(flash->spi, &m);
 
-                *retlen = m.actual_length - CMD_SIZE;
+                *retlen = m.actual_length - m25p_cmdsz(flash);
 
-                /* write everything in PAGESIZE chunks */
+                /* write everything in flash->page_size chunks */
                 for (i = page_size; i < len; i += page_size) {
                         page_size = len - i;
-                        if (page_size > FLASH_PAGESIZE)
-                                page_size = FLASH_PAGESIZE;
+                        if (page_size > flash->page_size)
+                                page_size = flash->page_size;
 
                         /* write the next page to flash */
-                        flash->command[1] = (to + i) >> 16;
-                        flash->command[2] = (to + i) >> 8;
-                        flash->command[3] = (to + i);
+                        m25p_addr2cmd(flash, to + i, flash->command);
 
                         t[1].tx_buf = buf + i;
                         t[1].len = page_size;
@@ -460,7 +464,7 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
                         spi_sync(flash->spi, &m);
 
                         if (retlen)
-                                *retlen += m.actual_length - CMD_SIZE;
+                                *retlen += m.actual_length - m25p_cmdsz(flash);
                 }
         }
 
@@ -492,7 +496,7 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
         memset(t, 0, (sizeof t));
 
         t[0].tx_buf = flash->command;
-        t[0].len = CMD_SIZE;
+        t[0].len = m25p_cmdsz(flash);
         spi_message_add_tail(&t[0], &m);
 
         t[1].tx_buf = buf;
@@ -511,9 +515,7 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
         /* Start write from odd address. */
         if (actual) {
                 flash->command[0] = OPCODE_BP;
-                flash->command[1] = to >> 16;
-                flash->command[2] = to >> 8;
-                flash->command[3] = to;
+                m25p_addr2cmd(flash, to, flash->command);
 
                 /* write one byte. */
                 t[1].len = 1;
@@ -521,17 +523,15 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
                 ret = wait_till_ready(flash);
                 if (ret)
                         goto time_out;
-                *retlen += m.actual_length - CMD_SIZE;
+                *retlen += m.actual_length - m25p_cmdsz(flash);
         }
         to += actual;
 
         flash->command[0] = OPCODE_AAI_WP;
-        flash->command[1] = to >> 16;
-        flash->command[2] = to >> 8;
-        flash->command[3] = to;
+        m25p_addr2cmd(flash, to, flash->command);
 
         /* Write out most of the data here. */
-        cmd_sz = CMD_SIZE;
+        cmd_sz = m25p_cmdsz(flash);
         for (; actual < len - 1; actual += 2) {
                 t[0].len = cmd_sz;
                 /* write two bytes. */
@@ -555,10 +555,8 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
         if (actual != len) {
                 write_enable(flash);
                 flash->command[0] = OPCODE_BP;
-                flash->command[1] = to >> 16;
-                flash->command[2] = to >> 8;
-                flash->command[3] = to;
-                t[0].len = CMD_SIZE;
+                m25p_addr2cmd(flash, to, flash->command);
+                t[0].len = m25p_cmdsz(flash);
                 t[1].len = 1;
                 t[1].tx_buf = buf + actual;
 
@@ -566,7 +564,7 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
                 ret = wait_till_ready(flash);
                 if (ret)
                         goto time_out;
-                *retlen += m.actual_length - CMD_SIZE;
+                *retlen += m.actual_length - m25p_cmdsz(flash);
                 write_disable(flash);
         }
 
@@ -582,8 +580,6 @@ time_out:
  */
 
 struct flash_info {
-        char            *name;
-
         /* JEDEC id zero means "no ID" (most older chips); otherwise it has
          * a high byte of zero plus three data bytes: the manufacturer id,
          * then a two byte device id.
@@ -597,87 +593,119 @@ struct flash_info {
         unsigned        sector_size;
         u16             n_sectors;
 
+        u16             page_size;
+        u16             addr_width;
+
         u16             flags;
 #define SECT_4K         0x01            /* OPCODE_BE_4K works uniformly */
+#define M25P_NO_ERASE   0x02            /* No erase command needed */
 };
 
+#define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags)      \
+        ((kernel_ulong_t)&(struct flash_info) {                         \
+                .jedec_id = (_jedec_id),                                \
+                .ext_id = (_ext_id),                                    \
+                .sector_size = (_sector_size),                          \
+                .n_sectors = (_n_sectors),                              \
+                .page_size = 256,                                       \
+                .addr_width = 3,                                        \
+                .flags = (_flags),                                      \
+        })
+
+#define CAT25_INFO(_sector_size, _n_sectors, _page_size, _addr_width)   \
+        ((kernel_ulong_t)&(struct flash_info) {                         \
+                .sector_size = (_sector_size),                          \
+                .n_sectors = (_n_sectors),                              \
+                .page_size = (_page_size),                              \
+                .addr_width = (_addr_width),                            \
+                .flags = M25P_NO_ERASE,                                 \
+        })
 
 /* NOTE: double check command sets and memory organization when you add
  * more flash chips.  This current list focusses on newer chips, which
  * have been converging on command sets which including JEDEC ID.
  */
-static struct flash_info __devinitdata m25p_data [] = {
-
+static const struct spi_device_id m25p_ids[] = {
         /* Atmel -- some are (confusingly) marketed as "DataFlash" */
-        { "at25fs010",  0x1f6601, 0, 32 * 1024, 4, SECT_4K, },
-        { "at25fs040",  0x1f6604, 0, 64 * 1024, 8, SECT_4K, },
+        { "at25fs010",  INFO(0x1f6601, 0, 32 * 1024,   4, SECT_4K) },
+        { "at25fs040",  INFO(0x1f6604, 0, 64 * 1024,   8, SECT_4K) },
 
-        { "at25df041a", 0x1f4401, 0, 64 * 1024, 8, SECT_4K, },
-        { "at25df641",  0x1f4800, 0, 64 * 1024, 128, SECT_4K, },
+        { "at25df041a", INFO(0x1f4401, 0, 64 * 1024,   8, SECT_4K) },
+        { "at25df641",  INFO(0x1f4800, 0, 64 * 1024, 128, SECT_4K) },
 
-        { "at26f004",   0x1f0400, 0, 64 * 1024, 8, SECT_4K, },
-        { "at26df081a", 0x1f4501, 0, 64 * 1024, 16, SECT_4K, },
-        { "at26df161a", 0x1f4601, 0, 64 * 1024, 32, SECT_4K, },
-        { "at26df321",  0x1f4701, 0, 64 * 1024, 64, SECT_4K, },
+        { "at26f004",   INFO(0x1f0400, 0, 64 * 1024,  8, SECT_4K) },
+        { "at26df081a", INFO(0x1f4501, 0, 64 * 1024, 16, SECT_4K) },
+        { "at26df161a", INFO(0x1f4601, 0, 64 * 1024, 32, SECT_4K) },
+        { "at26df321",  INFO(0x1f4701, 0, 64 * 1024, 64, SECT_4K) },
 
         /* Macronix */
-        { "mx25l3205d", 0xc22016, 0, 64 * 1024, 64, },
-        { "mx25l6405d", 0xc22017, 0, 64 * 1024, 128, },
-        { "mx25l12805d", 0xc22018, 0, 64 * 1024, 256, },
-        { "mx25l12855e", 0xc22618, 0, 64 * 1024, 256, },
+        { "mx25l4005a",  INFO(0xc22013, 0, 64 * 1024,   8, SECT_4K) },
+        { "mx25l3205d",  INFO(0xc22016, 0, 64 * 1024,  64, 0) },
+        { "mx25l6405d",  INFO(0xc22017, 0, 64 * 1024, 128, 0) },
+        { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
+        { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
 
         /* Spansion -- single (large) sector size only, at least
          * for the chips listed here (without boot sectors).
          */
-        { "s25sl004a", 0x010212, 0, 64 * 1024, 8, },
-        { "s25sl008a", 0x010213, 0, 64 * 1024, 16, },
-        { "s25sl016a", 0x010214, 0, 64 * 1024, 32, },
-        { "s25sl032a", 0x010215, 0, 64 * 1024, 64, },
-        { "s25sl064a", 0x010216, 0, 64 * 1024, 128, },
-        { "s25sl12800", 0x012018, 0x0300, 256 * 1024, 64, },
-        { "s25sl12801", 0x012018, 0x0301, 64 * 1024, 256, },
-        { "s25fl129p0", 0x012018, 0x4d00, 256 * 1024, 64, },
-        { "s25fl129p1", 0x012018, 0x4d01, 64 * 1024, 256, },
+        { "s25sl004a",  INFO(0x010212,      0,  64 * 1024,   8, 0) },
+        { "s25sl008a",  INFO(0x010213,      0,  64 * 1024,  16, 0) },
+        { "s25sl016a",  INFO(0x010214,      0,  64 * 1024,  32, 0) },
+        { "s25sl032a",  INFO(0x010215,      0,  64 * 1024,  64, 0) },
+        { "s25sl064a",  INFO(0x010216,      0,  64 * 1024, 128, 0) },
+        { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024,  64, 0) },
+        { "s25sl12801", INFO(0x012018, 0x0301,  64 * 1024, 256, 0) },
+        { "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024,  64, 0) },
+        { "s25fl129p1", INFO(0x012018, 0x4d01,  64 * 1024, 256, 0) },
 
         /* SST -- large erase sizes are "overlays", "sectors" are 4K */
-        { "sst25vf040b", 0xbf258d, 0, 64 * 1024, 8, SECT_4K, },
-        { "sst25vf080b", 0xbf258e, 0, 64 * 1024, 16, SECT_4K, },
-        { "sst25vf016b", 0xbf2541, 0, 64 * 1024, 32, SECT_4K, },
-        { "sst25vf032b", 0xbf254a, 0, 64 * 1024, 64, SECT_4K, },
-        { "sst25wf512",  0xbf2501, 0, 64 * 1024, 1, SECT_4K, },
-        { "sst25wf010",  0xbf2502, 0, 64 * 1024, 2, SECT_4K, },
-        { "sst25wf020",  0xbf2503, 0, 64 * 1024, 4, SECT_4K, },
-        { "sst25wf040",  0xbf2504, 0, 64 * 1024, 8, SECT_4K, },
+        { "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024,  8, SECT_4K) },
+        { "sst25vf080b", INFO(0xbf258e, 0, 64 * 1024, 16, SECT_4K) },
+        { "sst25vf016b", INFO(0xbf2541, 0, 64 * 1024, 32, SECT_4K) },
+        { "sst25vf032b", INFO(0xbf254a, 0, 64 * 1024, 64, SECT_4K) },
+        { "sst25wf512",  INFO(0xbf2501, 0, 64 * 1024,  1, SECT_4K) },
+        { "sst25wf010",  INFO(0xbf2502, 0, 64 * 1024,  2, SECT_4K) },
+        { "sst25wf020",  INFO(0xbf2503, 0, 64 * 1024,  4, SECT_4K) },
+        { "sst25wf040",  INFO(0xbf2504, 0, 64 * 1024,  8, SECT_4K) },
 
         /* ST Microelectronics -- newer production may have feature updates */
-        { "m25p05",  0x202010,  0, 32 * 1024, 2, },
-        { "m25p10",  0x202011,  0, 32 * 1024, 4, },
-        { "m25p20",  0x202012,  0, 64 * 1024, 4, },
-        { "m25p40",  0x202013,  0, 64 * 1024, 8, },
-        { "m25p80",         0,  0, 64 * 1024, 16, },
-        { "m25p16",  0x202015,  0, 64 * 1024, 32, },
-        { "m25p32",  0x202016,  0, 64 * 1024, 64, },
-        { "m25p64",  0x202017,  0, 64 * 1024, 128, },
-        { "m25p128", 0x202018, 0, 256 * 1024, 64, },
-
-        { "m45pe10", 0x204011,  0, 64 * 1024, 2, },
-        { "m45pe80", 0x204014,  0, 64 * 1024, 16, },
-        { "m45pe16", 0x204015,  0, 64 * 1024, 32, },
-
-        { "m25pe80", 0x208014,  0, 64 * 1024, 16, },
-        { "m25pe16", 0x208015,  0, 64 * 1024, 32, SECT_4K, },
+        { "m25p05",  INFO(0x202010,  0,  32 * 1024,   2, 0) },
+        { "m25p10",  INFO(0x202011,  0,  32 * 1024,   4, 0) },
+        { "m25p20",  INFO(0x202012,  0,  64 * 1024,   4, 0) },
+        { "m25p40",  INFO(0x202013,  0,  64 * 1024,   8, 0) },
+        { "m25p80",  INFO(0x202014,  0,  64 * 1024,  16, 0) },
+        { "m25p16",  INFO(0x202015,  0,  64 * 1024,  32, 0) },
+        { "m25p32",  INFO(0x202016,  0,  64 * 1024,  64, 0) },
+        { "m25p64",  INFO(0x202017,  0,  64 * 1024, 128, 0) },
+        { "m25p128", INFO(0x202018,  0, 256 * 1024,  64, 0) },
+
+        { "m45pe10", INFO(0x204011,  0, 64 * 1024,    2, 0) },
+        { "m45pe80", INFO(0x204014,  0, 64 * 1024,   16, 0) },
+        { "m45pe16", INFO(0x204015,  0, 64 * 1024,   32, 0) },
+
+        { "m25pe80", INFO(0x208014,  0, 64 * 1024, 16,       0) },
+        { "m25pe16", INFO(0x208015,  0, 64 * 1024, 32, SECT_4K) },
 
         /* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
-        { "w25x10", 0xef3011, 0, 64 * 1024, 2, SECT_4K, },
-        { "w25x20", 0xef3012, 0, 64 * 1024, 4, SECT_4K, },
-        { "w25x40", 0xef3013, 0, 64 * 1024, 8, SECT_4K, },
-        { "w25x80", 0xef3014, 0, 64 * 1024, 16, SECT_4K, },
-        { "w25x16", 0xef3015, 0, 64 * 1024, 32, SECT_4K, },
-        { "w25x32", 0xef3016, 0, 64 * 1024, 64, SECT_4K, },
-        { "w25x64", 0xef3017, 0, 64 * 1024, 128, SECT_4K, },
+        { "w25x10", INFO(0xef3011, 0, 64 * 1024,  2,  SECT_4K) },
+        { "w25x20", INFO(0xef3012, 0, 64 * 1024,  4,  SECT_4K) },
+        { "w25x40", INFO(0xef3013, 0, 64 * 1024,  8,  SECT_4K) },
+        { "w25x80", INFO(0xef3014, 0, 64 * 1024,  16, SECT_4K) },
+        { "w25x16", INFO(0xef3015, 0, 64 * 1024,  32, SECT_4K) },
+        { "w25x32", INFO(0xef3016, 0, 64 * 1024,  64, SECT_4K) },
+        { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
+
+        /* Catalyst / On Semiconductor -- non-JEDEC */
+        { "cat25c11", CAT25_INFO(  16, 8, 16, 1) },
+        { "cat25c03", CAT25_INFO(  32, 8, 16, 2) },
+        { "cat25c09", CAT25_INFO( 128, 8, 32, 2) },
+        { "cat25c17", CAT25_INFO( 256, 8, 32, 2) },
+        { "cat25128", CAT25_INFO(2048, 8, 64, 2) },
+        { },
 };
+MODULE_DEVICE_TABLE(spi, m25p_ids);
 
-static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
+static const struct spi_device_id *__devinit jedec_probe(struct spi_device *spi)
 {
         int                     tmp;
         u8                      code = OPCODE_RDID;
@@ -702,18 +730,24 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
         jedec = jedec << 8;
         jedec |= id[2];
 
+        /*
+         * Some chips (like Numonyx M25P80) have JEDEC and non-JEDEC variants,
+         * which depend on technology process. Officially RDID command doesn't
+         * exist for non-JEDEC chips, but for compatibility they return ID 0.
+         */
+        if (jedec == 0)
+                return NULL;
+
         ext_jedec = id[3] << 8 | id[4];
 
-        for (tmp = 0, info = m25p_data;
-                        tmp < ARRAY_SIZE(m25p_data);
-                        tmp++, info++) {
+        for (tmp = 0; tmp < ARRAY_SIZE(m25p_ids) - 1; tmp++) {
+                info = (void *)m25p_ids[tmp].driver_data;
                 if (info->jedec_id == jedec) {
                         if (info->ext_id != 0 && info->ext_id != ext_jedec)
                                 continue;
-                        return info;
+                        return &m25p_ids[tmp];
                 }
         }
-        dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec);
         return NULL;
 }
 
@@ -725,6 +759,7 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
  */
 static int __devinit m25p_probe(struct spi_device *spi)
 {
+        const struct spi_device_id      *id = spi_get_device_id(spi);
         struct flash_platform_data      *data;
         struct m25p                     *flash;
         struct flash_info               *info;
@@ -737,50 +772,65 @@ static int __devinit m25p_probe(struct spi_device *spi)
          */
         data = spi->dev.platform_data;
         if (data && data->type) {
-                for (i = 0, info = m25p_data;
-                                i < ARRAY_SIZE(m25p_data);
-                                i++, info++) {
-                        if (strcmp(data->type, info->name) == 0)
-                                break;
-                }
+                const struct spi_device_id *plat_id;
 
-                /* unrecognized chip? */
-                if (i == ARRAY_SIZE(m25p_data)) {
-                        DEBUG(MTD_DEBUG_LEVEL0, "%s: unrecognized id %s\n",
-                                        dev_name(&spi->dev), data->type);
-                        info = NULL;
-
-                /* recognized; is that chip really what's there? */
-                } else if (info->jedec_id) {
-                        struct flash_info       *chip = jedec_probe(spi);
-
-                        if (!chip || chip != info) {
-                                dev_warn(&spi->dev, "found %s, expected %s\n",
-                                                chip ? chip->name : "UNKNOWN",
-                                                info->name);
-                                info = NULL;
-                        }
+                for (i = 0; i < ARRAY_SIZE(m25p_ids) - 1; i++) {
+                        plat_id = &m25p_ids[i];
+                        if (strcmp(data->type, plat_id->name))
+                                continue;
+                        break;
                 }
-        } else
-                info = jedec_probe(spi);
 
-        if (!info)
-                return -ENODEV;
+                if (plat_id)
+                        id = plat_id;
+                else
+                        dev_warn(&spi->dev, "unrecognized id %s\n", data->type);
+        }
+
+        info = (void *)id->driver_data;
+
+        if (info->jedec_id) {
+                const struct spi_device_id *jid;
+
+                jid = jedec_probe(spi);
+                if (!jid) {
+                        dev_info(&spi->dev, "non-JEDEC variant of %s\n",
+                                 id->name);
+                } else if (jid != id) {
+                        /*
+                         * JEDEC knows better, so overwrite platform ID. We
+                         * can't trust partitions any longer, but we'll let
+                         * mtd apply them anyway, since some partitions may be
+                         * marked read-only, and we don't want to lose that
+                         * information, even if it's not 100% accurate.
+                         */
+                        dev_warn(&spi->dev, "found %s, expected %s\n",
+                                 jid->name, id->name);
+                        id = jid;
+                        info = (void *)jid->driver_data;
+                }
+        }
 
         flash = kzalloc(sizeof *flash, GFP_KERNEL);
         if (!flash)
                 return -ENOMEM;
+        flash->command = kmalloc(MAX_CMD_SIZE + FAST_READ_DUMMY_BYTE, GFP_KERNEL);
+        if (!flash->command) {
+                kfree(flash);
+                return -ENOMEM;
+        }
 
         flash->spi = spi;
         mutex_init(&flash->lock);
         dev_set_drvdata(&spi->dev, flash);
 
         /*
-         * Atmel serial flash tend to power up
-         * with the software protection bits set
+         * Atmel and SST serial flash tend to power
+         * up with the software protection bits set
          */
 
-        if (info->jedec_id >> 16 == 0x1f) {
+        if (info->jedec_id >> 16 == 0x1f ||
+            info->jedec_id >> 16 == 0xbf) {
                 write_enable(flash);
                 write_sr(flash, 0);
         }
@@ -812,9 +862,14 @@ static int __devinit m25p_probe(struct spi_device *spi)
                 flash->mtd.erasesize = info->sector_size;
         }
 
+        if (info->flags & M25P_NO_ERASE)
+                flash->mtd.flags |= MTD_NO_ERASE;
+
         flash->mtd.dev.parent = &spi->dev;
+        flash->page_size = info->page_size;
+        flash->addr_width = info->addr_width;
 
-        dev_info(&spi->dev, "%s (%lld Kbytes)\n", info->name,
+        dev_info(&spi->dev, "%s (%lld Kbytes)\n", id->name,
                         (long long)flash->mtd.size >> 10);
 
         DEBUG(MTD_DEBUG_LEVEL2,
@@ -888,8 +943,10 @@ static int __devexit m25p_remove(struct spi_device *spi)
                 status = del_mtd_partitions(&flash->mtd);
         else
                 status = del_mtd_device(&flash->mtd);
-        if (status == 0)
+        if (status == 0) {
+                kfree(flash->command);
                 kfree(flash);
+        }
         return 0;
 }
 
@@ -900,6 +957,7 @@ static struct spi_driver m25p80_driver = {
                 .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
+        .id_table       = m25p_ids,
         .probe  = m25p_probe,
         .remove = __devexit_p(m25p_remove),
 
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 93e3627be74c..19817404ce7d 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -636,6 +636,7 @@ add_dataflash_otp(struct spi_device *spi, char *name,
         struct mtd_info                 *device;
         struct flash_platform_data      *pdata = spi->dev.platform_data;
         char                            *otp_tag = "";
+        int                             err = 0;
 
         priv = kzalloc(sizeof *priv, GFP_KERNEL);
         if (!priv)
@@ -693,13 +694,23 @@ add_dataflash_otp(struct spi_device *spi, char *name,
 
                 if (nr_parts > 0) {
                         priv->partitioned = 1;
-                        return add_mtd_partitions(device, parts, nr_parts);
+                        err = add_mtd_partitions(device, parts, nr_parts);
+                        goto out;
                 }
         } else if (pdata && pdata->nr_parts)
                 dev_warn(&spi->dev, "ignoring %d default partitions on %s\n",
                                 pdata->nr_parts, device->name);
 
-        return add_mtd_device(device) == 1 ? -ENODEV : 0;
+        if (add_mtd_device(device) == 1)
+                err = -ENODEV;
+
+out:
+        if (!err)
+                return 0;
+
+        dev_set_drvdata(&spi->dev, NULL);
+        kfree(priv);
+        return err;
 }
 
 static inline int __devinit
@@ -932,8 +943,10 @@ static int __devexit dataflash_remove(struct spi_device *spi)
                 status = del_mtd_partitions(&flash->mtd);
         else
                 status = del_mtd_device(&flash->mtd);
-        if (status == 0)
+        if (status == 0) {
+                dev_set_drvdata(&spi->dev, NULL);
                 kfree(flash);
+        }
         return status;
 }
 
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 847e214ade59..4c364d44ad59 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -359,12 +359,6 @@ config MTD_SA1100
           the SA1100 and SA1110, including the Assabet and the Compaq iPAQ.
           If you have such a board, say 'Y'.
 
-config MTD_IPAQ
-        tristate "CFI Flash device mapped on Compaq/HP iPAQ"
-        depends on IPAQ_HANDHELD && MTD_CFI
-        help
-          This provides a driver for the on-board flash of the iPAQ.
-
 config MTD_DC21285
         tristate "CFI Flash device mapped on DC21285 Footbridge"
         depends on MTD_CFI && ARCH_FOOTBRIDGE && MTD_COMPLEX_MAPPINGS
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index ae2f6dbe43c3..ce315214ff2b 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -24,12 +24,12 @@ obj-$(CONFIG_MTD_CEIVA)		+= ceiva.o
 obj-$(CONFIG_MTD_OCTAGON)       += octagon-5066.o
 obj-$(CONFIG_MTD_PHYSMAP)       += physmap.o
 obj-$(CONFIG_MTD_PHYSMAP_OF)    += physmap_of.o
+obj-$(CONFIG_MTD_PISMO)         += pismo.o
 obj-$(CONFIG_MTD_PMC_MSP_EVM)   += pmcmsp-flash.o
 obj-$(CONFIG_MTD_PCMCIA)        += pcmciamtd.o
 obj-$(CONFIG_MTD_RPXLITE)       += rpxlite.o
 obj-$(CONFIG_MTD_TQM8XXL)       += tqm8xxl.o
 obj-$(CONFIG_MTD_SA1100)        += sa1100-flash.o
-obj-$(CONFIG_MTD_IPAQ)          += ipaq-flash.o
 obj-$(CONFIG_MTD_SBC_GXX)       += sbc_gxx.o
 obj-$(CONFIG_MTD_SC520CDP)      += sc520cdp.o
 obj-$(CONFIG_MTD_NETSC520)      += netsc520.o
diff --git a/drivers/mtd/maps/ipaq-flash.c b/drivers/mtd/maps/ipaq-flash.c
deleted file mode 100644
index 76708e796b70..000000000000
--- a/drivers/mtd/maps/ipaq-flash.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * Flash memory access on iPAQ Handhelds (either SA1100 or PXA250 based)
- *
- * (C) 2000 Nicolas Pitre <nico@fluxnic.net>
- * (C) 2002 Hewlett-Packard Company <jamey.hicks@hp.com>
- * (C) 2003 Christian Pellegrin <chri@ascensit.com>, <chri@infis.univ.ts.it>: concatenation of multiple flashes
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/spinlock.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <asm/page.h>
-#include <asm/mach-types.h>
-#include <asm/system.h>
-#include <asm/errno.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-#ifdef CONFIG_MTD_CONCAT
-#include <linux/mtd/concat.h>
-#endif
-
-#include <mach/hardware.h>
-#include <mach/h3600.h>
-#include <asm/io.h>
-
-
-#ifndef CONFIG_IPAQ_HANDHELD
-#error This is for iPAQ Handhelds only
-#endif
-#ifdef CONFIG_SA1100_JORNADA56X
-
-static void jornada56x_set_vpp(struct map_info *map, int vpp)
-{
-        if (vpp)
-                GPSR = GPIO_GPIO26;
-        else
-                GPCR = GPIO_GPIO26;
-        GPDR |= GPIO_GPIO26;
-}
-
-#endif
-
-#ifdef CONFIG_SA1100_JORNADA720
-
-static void jornada720_set_vpp(struct map_info *map, int vpp)
-{
-        if (vpp)
-                PPSR |= 0x80;
-        else
-                PPSR &= ~0x80;
-        PPDR |= 0x80;
-}
-
-#endif
-
-#define MAX_IPAQ_CS 2           /* Number of CS we are going to test */
-
-#define IPAQ_MAP_INIT(X) \
-        { \
-                name:           "IPAQ flash " X, \
-        }
-
-
-static struct map_info ipaq_map[MAX_IPAQ_CS] = {
-        IPAQ_MAP_INIT("bank 1"),
-        IPAQ_MAP_INIT("bank 2")
-};
-
-static struct mtd_info *my_sub_mtd[MAX_IPAQ_CS] = {
-        NULL,
-        NULL
-};
-
-/*
- * Here are partition information for all known IPAQ-based devices.
- * See include/linux/mtd/partitions.h for definition of the mtd_partition
- * structure.
- *
- * The *_max_flash_size is the maximum possible mapped flash size which
- * is not necessarily the actual flash size.  It must be no more than
- * the value specified in the "struct map_desc *_io_desc" mapping
- * definition for the corresponding machine.
- *
- * Please keep these in alphabetical order, and formatted as per existing
- * entries.  Thanks.
- */
-
-#ifdef CONFIG_IPAQ_HANDHELD
-static unsigned long h3xxx_max_flash_size = 0x04000000;
-static struct mtd_partition h3xxx_partitions[] = {
-        {
-                name:           "H3XXX boot firmware",
-#ifndef CONFIG_LAB
-                size:           0x00040000,
-#else
-                size:           0x00080000,
-#endif
-                offset:         0,
-#ifndef CONFIG_LAB
-                mask_flags:     MTD_WRITEABLE,  /* force read-only */
-#endif
-        },
-        {
-                name:           "H3XXX root jffs2",
-#ifndef CONFIG_LAB
-                size:           0x2000000 - 2*0x40000, /* Warning, this is fixed later */
-                offset:         0x00040000,
-#else
-                size:           0x2000000 - 0x40000 - 0x80000, /* Warning, this is fixed later */
-                offset:         0x00080000,
-#endif
-        },
-        {
-                name:           "asset",
-                size:           0x40000,
-                offset:         0x2000000 - 0x40000, /* Warning, this is fixed later */
-                mask_flags:     MTD_WRITEABLE,  /* force read-only */
-        }
-};
-
-#ifndef CONFIG_MTD_CONCAT
-static struct mtd_partition h3xxx_partitions_bank2[] = {
-        /* this is used only on 2 CS machines when concat is not present */
-        {
-                name:           "second H3XXX root jffs2",
-                size:           0x1000000 - 0x40000, /* Warning, this is fixed later */
-                offset:         0x00000000,
-        },
-        {
-                name:           "second asset",
-                size:           0x40000,
-                offset:         0x1000000 - 0x40000, /* Warning, this is fixed later */
-                mask_flags:     MTD_WRITEABLE,  /* force read-only */
-        }
-};
-#endif
-
-static DEFINE_SPINLOCK(ipaq_vpp_lock);
-
-static void h3xxx_set_vpp(struct map_info *map, int vpp)
-{
-        static int nest = 0;
-
-        spin_lock(&ipaq_vpp_lock);
-        if (vpp)
-                nest++;
-        else
-                nest--;
-        if (nest)
-                assign_h3600_egpio(IPAQ_EGPIO_VPP_ON, 1);
-        else
-                assign_h3600_egpio(IPAQ_EGPIO_VPP_ON, 0);
-        spin_unlock(&ipaq_vpp_lock);
-}
-
-#endif
-
-#if defined(CONFIG_SA1100_JORNADA56X) || defined(CONFIG_SA1100_JORNADA720)
-static unsigned long jornada_max_flash_size = 0x02000000;
-static struct mtd_partition jornada_partitions[] = {
-        {
-                name:           "Jornada boot firmware",
-                size:           0x00040000,
-                offset:         0,
-                mask_flags:     MTD_WRITEABLE,  /* force read-only */
-        }, {
-                name:           "Jornada root jffs2",
-                size:           MTDPART_SIZ_FULL,
-                offset:         0x00040000,
-        }
-};
-#endif
-
-
-static struct mtd_partition *parsed_parts;
-static struct mtd_info *mymtd;
-
-static unsigned long cs_phys[] = {
-#ifdef CONFIG_ARCH_SA1100
-        SA1100_CS0_PHYS,
-        SA1100_CS1_PHYS,
-        SA1100_CS2_PHYS,
-        SA1100_CS3_PHYS,
-        SA1100_CS4_PHYS,
-        SA1100_CS5_PHYS,
-#else
-        PXA_CS0_PHYS,
-        PXA_CS1_PHYS,
-        PXA_CS2_PHYS,
-        PXA_CS3_PHYS,
-        PXA_CS4_PHYS,
-        PXA_CS5_PHYS,
-#endif
-};
-
-static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
-
-static int __init h1900_special_case(void);
-
-static int __init ipaq_mtd_init(void)
-{
-        struct mtd_partition *parts = NULL;
-        int nb_parts = 0;
-        int parsed_nr_parts = 0;
-        const char *part_type;
-        int i; /* used when we have >1 flash chips */
-        unsigned long tot_flashsize = 0; /* used when we have >1 flash chips */
-
-        /* Default flash bankwidth */
-        // ipaq_map.bankwidth = (MSC0 & MSC_RBW) ? 2 : 4;
-
-        if (machine_is_h1900())
-        {
-                /* For our intents, the h1900 is not a real iPAQ, so we special-case it. */
-                return h1900_special_case();
-        }
-
-        if (machine_is_h3100() || machine_is_h1900())
-                for(i=0; i<MAX_IPAQ_CS; i++)
-                        ipaq_map[i].bankwidth = 2;
-        else
-                for(i=0; i<MAX_IPAQ_CS; i++)
-                        ipaq_map[i].bankwidth = 4;
-
-        /*
-         * Static partition definition selection
-         */
-        part_type = "static";
-
-        simple_map_init(&ipaq_map[0]);
-        simple_map_init(&ipaq_map[1]);
-
-#ifdef CONFIG_IPAQ_HANDHELD
-        if (machine_is_ipaq()) {
-                parts = h3xxx_partitions;
-                nb_parts = ARRAY_SIZE(h3xxx_partitions);
-                for(i=0; i<MAX_IPAQ_CS; i++) {
-                        ipaq_map[i].size = h3xxx_max_flash_size;
-                        ipaq_map[i].set_vpp = h3xxx_set_vpp;
-                        ipaq_map[i].phys = cs_phys[i];
-                        ipaq_map[i].virt = ioremap(cs_phys[i], 0x04000000);
-                        if (machine_is_h3100 () || machine_is_h1900())
-                                ipaq_map[i].bankwidth = 2;
-                }
-                if (machine_is_h3600()) {
-                        /* No asset partition here */
-                        h3xxx_partitions[1].size += 0x40000;
-                        nb_parts--;
-                }
-        }
-#endif
-#ifdef CONFIG_ARCH_H5400
-        if (machine_is_h5400()) {
-                ipaq_map[0].size = 0x02000000;
-                ipaq_map[1].size = 0x02000000;
-                ipaq_map[1].phys = 0x02000000;
-                ipaq_map[1].virt = ipaq_map[0].virt + 0x02000000;
-        }
-#endif
-#ifdef CONFIG_ARCH_H1900
-        if (machine_is_h1900()) {
-                ipaq_map[0].size = 0x00400000;
-                ipaq_map[1].size = 0x02000000;
-                ipaq_map[1].phys = 0x00080000;
-                ipaq_map[1].virt = ipaq_map[0].virt + 0x00080000;
-        }
-#endif
-
-#ifdef CONFIG_SA1100_JORNADA56X
-        if (machine_is_jornada56x()) {
-                parts = jornada_partitions;
-                nb_parts = ARRAY_SIZE(jornada_partitions);
-                ipaq_map[0].size = jornada_max_flash_size;
-                ipaq_map[0].set_vpp = jornada56x_set_vpp;
-                ipaq_map[0].virt = (__u32)ioremap(0x0, 0x04000000);
-        }
-#endif
-#ifdef CONFIG_SA1100_JORNADA720
-        if (machine_is_jornada720()) {
-                parts = jornada_partitions;
-                nb_parts = ARRAY_SIZE(jornada_partitions);
-                ipaq_map[0].size = jornada_max_flash_size;
-                ipaq_map[0].set_vpp = jornada720_set_vpp;
-        }
-#endif
-
-
-        if (machine_is_ipaq()) { /* for iPAQs only */
-                for(i=0; i<MAX_IPAQ_CS; i++) {
-                        printk(KERN_NOTICE "iPAQ flash: probing %d-bit flash bus, window=%lx with CFI.\n", ipaq_map[i].bankwidth*8, ipaq_map[i].virt);
-                        my_sub_mtd[i] = do_map_probe("cfi_probe", &ipaq_map[i]);
-                        if (!my_sub_mtd[i]) {
-                                printk(KERN_NOTICE "iPAQ flash: probing %d-bit flash bus, window=%lx with JEDEC.\n", ipaq_map[i].bankwidth*8, ipaq_map[i].virt);
-                                my_sub_mtd[i] = do_map_probe("jedec_probe", &ipaq_map[i]);
-                        }
-                        if (!my_sub_mtd[i]) {
-                                printk(KERN_NOTICE "iPAQ flash: failed to find flash.\n");
-                                if (i)
-                                        break;
-                                else
-                                        return -ENXIO;
-                        } else
-                                printk(KERN_NOTICE "iPAQ flash: found %d bytes\n", my_sub_mtd[i]->size);
-
-                        /* do we really need this debugging? --joshua 20030703 */
-                        // printk("my_sub_mtd[%d]=%p\n", i, my_sub_mtd[i]);
-                        my_sub_mtd[i]->owner = THIS_MODULE;
-                        tot_flashsize += my_sub_mtd[i]->size;
-                }
-#ifdef CONFIG_MTD_CONCAT
-                /* fix the asset location */
-#       ifdef CONFIG_LAB
-                h3xxx_partitions[1].size = tot_flashsize - 0x40000 - 0x80000 /* extra big boot block */;
-#       else
-                h3xxx_partitions[1].size = tot_flashsize - 2 * 0x40000;
-#       endif
-                h3xxx_partitions[2].offset = tot_flashsize - 0x40000;
-                /* and concat the devices */
-                mymtd = mtd_concat_create(&my_sub_mtd[0], i,
-                                          "ipaq");
-                if (!mymtd) {
-                        printk("Cannot create iPAQ concat device\n");
-                        return -ENXIO;
-                }
-#else
-                mymtd = my_sub_mtd[0];
-
-                /*
-                 *In the very near future, command line partition parsing
-                 * will use the device name as 'mtd-id' instead of a value
-                 * passed to the parse_cmdline_partitions() routine. Since
-                 * the bootldr says 'ipaq', make sure it continues to work.
-                 */
-                mymtd->name = "ipaq";
-
-                if ((machine_is_h3600())) {
-#       ifdef CONFIG_LAB
-                        h3xxx_partitions[1].size = my_sub_mtd[0]->size - 0x80000;
-#       else
-                        h3xxx_partitions[1].size = my_sub_mtd[0]->size - 0x40000;
-#       endif
-                        nb_parts = 2;
-                } else {
-#       ifdef CONFIG_LAB
-                        h3xxx_partitions[1].size = my_sub_mtd[0]->size - 0x40000 - 0x80000; /* extra big boot block */
-#       else
-                        h3xxx_partitions[1].size = my_sub_mtd[0]->size - 2*0x40000;
-#       endif
-                        h3xxx_partitions[2].offset = my_sub_mtd[0]->size - 0x40000;
-                }
-
-                if (my_sub_mtd[1]) {
-#       ifdef CONFIG_LAB
-                        h3xxx_partitions_bank2[0].size = my_sub_mtd[1]->size - 0x80000;
-#       else
-                        h3xxx_partitions_bank2[0].size = my_sub_mtd[1]->size - 0x40000;
-#       endif
-                        h3xxx_partitions_bank2[1].offset = my_sub_mtd[1]->size - 0x40000;
-                }
-#endif
-        }
-        else {
-                /*
-                 * Now let's probe for the actual flash.  Do it here since
-                 * specific machine settings might have been set above.
-                 */
-                printk(KERN_NOTICE "IPAQ flash: probing %d-bit flash bus, window=%lx\n", ipaq_map[0].bankwidth*8, ipaq_map[0].virt);
-                mymtd = do_map_probe("cfi_probe", &ipaq_map[0]);
-                if (!mymtd)
-                        return -ENXIO;
-                mymtd->owner = THIS_MODULE;
-        }
-
-
-        /*
-         * Dynamic partition selection stuff (might override the static ones)
-         */
-
-         i = parse_mtd_partitions(mymtd, part_probes, &parsed_parts, 0);
-
-         if (i > 0) {
-                 nb_parts = parsed_nr_parts = i;
-                 parts = parsed_parts;
-                 part_type = "dynamic";
-         }
-
-         if (!parts) {
-                 printk(KERN_NOTICE "IPAQ flash: no partition info available, registering whole flash at once\n");
-                 add_mtd_device(mymtd);
-#ifndef CONFIG_MTD_CONCAT
-                 if (my_sub_mtd[1])
-                         add_mtd_device(my_sub_mtd[1]);
-#endif
-         } else {
-                 printk(KERN_NOTICE "Using %s partition definition\n", part_type);
-                 add_mtd_partitions(mymtd, parts, nb_parts);
-#ifndef CONFIG_MTD_CONCAT
-                 if (my_sub_mtd[1])
-                         add_mtd_partitions(my_sub_mtd[1], h3xxx_partitions_bank2, ARRAY_SIZE(h3xxx_partitions_bank2));
-#endif
-         }
-
-         return 0;
-}
-
-static void __exit ipaq_mtd_cleanup(void)
-{
-        int i;
-
-        if (mymtd) {
-                del_mtd_partitions(mymtd);
-#ifndef CONFIG_MTD_CONCAT
-                if (my_sub_mtd[1])
-                        del_mtd_partitions(my_sub_mtd[1]);
-#endif
-                map_destroy(mymtd);
-#ifdef CONFIG_MTD_CONCAT
-                for(i=0; i<MAX_IPAQ_CS; i++)
-#else
-                        for(i=1; i<MAX_IPAQ_CS; i++)
-#endif
-                        {
-                                if (my_sub_mtd[i])
-                                        map_destroy(my_sub_mtd[i]);
-                        }
-                kfree(parsed_parts);
-        }
-}
-
-static int __init h1900_special_case(void)
-{
-        /* The iPAQ h1900 is a special case - it has weird ROM. */
-        simple_map_init(&ipaq_map[0]);
-        ipaq_map[0].size = 0x80000;
-        ipaq_map[0].set_vpp = h3xxx_set_vpp;
-        ipaq_map[0].phys = 0x0;
-        ipaq_map[0].virt = ioremap(0x0, 0x04000000);
-        ipaq_map[0].bankwidth = 2;
-
-        printk(KERN_NOTICE "iPAQ flash: probing %d-bit flash bus, window=%lx with JEDEC.\n", ipaq_map[0].bankwidth*8, ipaq_map[0].virt);
-        mymtd = do_map_probe("jedec_probe", &ipaq_map[0]);
-        if (!mymtd)
-                return -ENODEV;
-        add_mtd_device(mymtd);
-        printk(KERN_NOTICE "iPAQ flash: registered h1910 flash\n");
-
-        return 0;
-}
-
-module_init(ipaq_mtd_init);
-module_exit(ipaq_mtd_cleanup);
-
-MODULE_AUTHOR("Jamey Hicks");
-MODULE_DESCRIPTION("IPAQ CFI map driver");
-MODULE_LICENSE("MIT");
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 7214b876feba..7b0515297411 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -210,7 +210,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
          * not attempt to do a direct access on us.
          */
         info->map.phys = NO_XIP;
-        info->map.size = dev->resource->end - dev->resource->start + 1;
+        info->map.size = resource_size(dev->resource);
 
         /*
          * We only support 16-bit accesses for now. If and when
@@ -224,7 +224,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
         info->map.copy_from = ixp4xx_copy_from,
 
         info->res = request_mem_region(dev->resource->start,
-                        dev->resource->end - dev->resource->start + 1,
+                        resource_size(dev->resource),
                         "IXP4XXFlash");
         if (!info->res) {
                 printk(KERN_ERR "IXP4XXFlash: Could not reserve memory region\n");
@@ -233,7 +233,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
         }
 
         info->map.virt = ioremap(dev->resource->start,
-                                 dev->resource->end - dev->resource->start + 1);
+                                 resource_size(dev->resource));
         if (!info->map.virt) {
                 printk(KERN_ERR "IXP4XXFlash: Failed to ioremap region\n");
                 err = -EIO;
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 380648e9051a..d9603f7f9652 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -48,23 +48,22 @@ static int physmap_flash_remove(struct platform_device *dev)
 
         if (info->cmtd) {
 #ifdef CONFIG_MTD_PARTITIONS
-                if (info->nr_parts || physmap_data->nr_parts)
+                if (info->nr_parts || physmap_data->nr_parts) {
                         del_mtd_partitions(info->cmtd);
-                else
+
+                        if (info->nr_parts)
+                                kfree(info->parts);
+                } else {
                         del_mtd_device(info->cmtd);
+                }
 #else
                 del_mtd_device(info->cmtd);
 #endif
-        }
-#ifdef CONFIG_MTD_PARTITIONS
-        if (info->nr_parts)
-                kfree(info->parts);
-#endif
-
 #ifdef CONFIG_MTD_CONCAT
-        if (info->cmtd != info->mtd[0])
-                mtd_concat_destroy(info->cmtd);
+                if (info->cmtd != info->mtd[0])
+                        mtd_concat_destroy(info->cmtd);
 #endif
+        }
 
         for (i = 0; i < MAX_RESOURCES; i++) {
                 if (info->mtd[i] != NULL)
@@ -130,7 +129,7 @@ static int physmap_flash_probe(struct platform_device *dev)
                                                  info->map[i].size);
                 if (info->map[i].virt == NULL) {
                         dev_err(&dev->dev, "Failed to ioremap flash region\n");
-                        err = EIO;
+                        err = -EIO;
                         goto err_out;
                 }
 
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index d7a47574d21e..f3af87e08ecd 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -248,7 +248,7 @@ static void sa1100_destroy(struct sa_info *info, struct flash_platform_data *pla
                 plat->exit();
 }
 
-static struct sa_info *__init
+static struct sa_info *__devinit
 sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
 {
         struct sa_info *info;
diff --git a/drivers/mtd/maps/vmu-flash.c b/drivers/mtd/maps/vmu-flash.c
index 1f73297e7776..82afad0ddd72 100644
--- a/drivers/mtd/maps/vmu-flash.c
+++ b/drivers/mtd/maps/vmu-flash.c
@@ -612,16 +612,15 @@ static int __devinit vmu_connect(struct maple_device *mdev)
 
         test_flash_data = be32_to_cpu(mdev->devinfo.function);
         /* Need to count how many bits are set - to find out which
-         * function_data element has details of the memory card:
-         * using Brian Kernighan's/Peter Wegner's method */
-        for (c = 0; test_flash_data; c++)
-                test_flash_data &= test_flash_data - 1;
+         * function_data element has details of the memory card
+         */
+        c = hweight_long(test_flash_data);
 
         basic_flash_data = be32_to_cpu(mdev->devinfo.function_data[c - 1]);
 
         card = kmalloc(sizeof(struct memcard), GFP_KERNEL);
         if (!card) {
-                error = ENOMEM;
+                error = -ENOMEM;
                 goto fail_nomem;
         }
 
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 64e2b379a350..c82e09bbc5fd 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -84,9 +84,6 @@ static int mtd_blktrans_thread(void *arg)
         struct request_queue *rq = tr->blkcore_priv->rq;
         struct request *req = NULL;
 
-        /* we might get involved when memory gets low, so use PF_MEMALLOC */
-        current->flags |= PF_MEMALLOC;
-
         spin_lock_irq(rq->queue_lock);
 
         while (!kthread_should_stop()) {
@@ -381,7 +378,7 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
         tr->blkcore_priv->thread = kthread_run(mtd_blktrans_thread, tr,
                         "%sd", tr->name);
         if (IS_ERR(tr->blkcore_priv->thread)) {
-                int ret = PTR_ERR(tr->blkcore_priv->thread);
+                ret = PTR_ERR(tr->blkcore_priv->thread);
                 blk_cleanup_queue(tr->blkcore_priv->rq);
                 unregister_blkdev(tr->major, tr->name);
                 kfree(tr->blkcore_priv);
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 467a4f177bfb..c356c0a30c3e 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -447,7 +447,7 @@ struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num)
                 for (i=0; i< MAX_MTD_DEVICES; i++)
                         if (mtd_table[i] == mtd)
                                 ret = mtd_table[i];
-        } else if (num < MAX_MTD_DEVICES) {
+        } else if (num >= 0 && num < MAX_MTD_DEVICES) {
                 ret = mtd_table[num];
                 if (mtd && mtd != ret)
                         ret = NULL;
diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index 1060337c06df..a714ec482761 100644
--- a/drivers/mtd/mtdoops.c
+++ b/drivers/mtd/mtdoops.c
@@ -29,14 +29,34 @@
 #include <linux/sched.h>
 #include <linux/wait.h>
 #include <linux/delay.h>
-#include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/mtd/mtd.h>
+#include <linux/kmsg_dump.h>
+
+/* Maximum MTD partition size */
+#define MTDOOPS_MAX_MTD_SIZE (8 * 1024 * 1024)
 
 #define MTDOOPS_KERNMSG_MAGIC 0x5d005d00
-#define OOPS_PAGE_SIZE 4096
+#define MTDOOPS_HEADER_SIZE   8
+
+static unsigned long record_size = 4096;
+module_param(record_size, ulong, 0400);
+MODULE_PARM_DESC(record_size,
+                "record size for MTD OOPS pages in bytes (default 4096)");
+
+static char mtddev[80];
+module_param_string(mtddev, mtddev, 80, 0400);
+MODULE_PARM_DESC(mtddev,
+                "name or index number of the MTD device to use");
+
+static int dump_oops = 1;
+module_param(dump_oops, int, 0600);
+MODULE_PARM_DESC(dump_oops,
+                "set to 1 to dump oopses, 0 to only dump panics (default 1)");
 
 static struct mtdoops_context {
+        struct kmsg_dumper dump;
+
         int mtd_index;
         struct work_struct work_erase;
         struct work_struct work_write;
@@ -44,28 +64,43 @@ static struct mtdoops_context {
         int oops_pages;
         int nextpage;
         int nextcount;
-        char *name;
+        unsigned long *oops_page_used;
 
         void *oops_buf;
-
-        /* writecount and disabling ready are spin lock protected */
-        spinlock_t writecount_lock;
-        int ready;
-        int writecount;
 } oops_cxt;
 
+static void mark_page_used(struct mtdoops_context *cxt, int page)
+{
+        set_bit(page, cxt->oops_page_used);
+}
+
+static void mark_page_unused(struct mtdoops_context *cxt, int page)
+{
+        clear_bit(page, cxt->oops_page_used);
+}
+
+static int page_is_used(struct mtdoops_context *cxt, int page)
+{
+        return test_bit(page, cxt->oops_page_used);
+}
+
 static void mtdoops_erase_callback(struct erase_info *done)
 {
         wait_queue_head_t *wait_q = (wait_queue_head_t *)done->priv;
         wake_up(wait_q);
 }
 
-static int mtdoops_erase_block(struct mtd_info *mtd, int offset)
+static int mtdoops_erase_block(struct mtdoops_context *cxt, int offset)
 {
+        struct mtd_info *mtd = cxt->mtd;
+        u32 start_page_offset = mtd_div_by_eb(offset, mtd) * mtd->erasesize;
+        u32 start_page = start_page_offset / record_size;
+        u32 erase_pages = mtd->erasesize / record_size;
         struct erase_info erase;
         DECLARE_WAITQUEUE(wait, current);
         wait_queue_head_t wait_q;
         int ret;
+        int page;
 
         init_waitqueue_head(&wait_q);
         erase.mtd = mtd;
@@ -81,25 +116,24 @@ static int mtdoops_erase_block(struct mtd_info *mtd, int offset)
         if (ret) {
                 set_current_state(TASK_RUNNING);
                 remove_wait_queue(&wait_q, &wait);
-                printk (KERN_WARNING "mtdoops: erase of region [0x%llx, 0x%llx] "
-                                     "on \"%s\" failed\n",
-                        (unsigned long long)erase.addr, (unsigned long long)erase.len, mtd->name);
+                printk(KERN_WARNING "mtdoops: erase of region [0x%llx, 0x%llx] on \"%s\" failed\n",
+                       (unsigned long long)erase.addr,
+                       (unsigned long long)erase.len, mtddev);
                 return ret;
         }
 
         schedule();  /* Wait for erase to finish. */
         remove_wait_queue(&wait_q, &wait);
 
+        /* Mark pages as unused */
+        for (page = start_page; page < start_page + erase_pages; page++)
+                mark_page_unused(cxt, page);
+
         return 0;
 }
 
 static void mtdoops_inc_counter(struct mtdoops_context *cxt)
 {
-        struct mtd_info *mtd = cxt->mtd;
-        size_t retlen;
-        u32 count;
-        int ret;
-
         cxt->nextpage++;
         if (cxt->nextpage >= cxt->oops_pages)
                 cxt->nextpage = 0;
@@ -107,25 +141,13 @@ static void mtdoops_inc_counter(struct mtdoops_context *cxt)
         if (cxt->nextcount == 0xffffffff)
                 cxt->nextcount = 0;
 
-        ret = mtd->read(mtd, cxt->nextpage * OOPS_PAGE_SIZE, 4,
-                        &retlen, (u_char *) &count);
-        if ((retlen != 4) || ((ret < 0) && (ret != -EUCLEAN))) {
-                printk(KERN_ERR "mtdoops: Read failure at %d (%td of 4 read)"
-                                ", err %d.\n", cxt->nextpage * OOPS_PAGE_SIZE,
-                                retlen, ret);
+        if (page_is_used(cxt, cxt->nextpage)) {
                 schedule_work(&cxt->work_erase);
                 return;
         }
 
-        /* See if we need to erase the next block */
-        if (count != 0xffffffff) {
-                schedule_work(&cxt->work_erase);
-                return;
-        }
-
-        printk(KERN_DEBUG "mtdoops: Ready %d, %d (no erase)\n",
-                        cxt->nextpage, cxt->nextcount);
-        cxt->ready = 1;
+        printk(KERN_DEBUG "mtdoops: ready %d, %d (no erase)\n",
+               cxt->nextpage, cxt->nextcount);
 }
 
 /* Scheduled work - when we can't proceed without erasing a block */
@@ -140,47 +162,47 @@ static void mtdoops_workfunc_erase(struct work_struct *work)
         if (!mtd)
                 return;
 
-        mod = (cxt->nextpage * OOPS_PAGE_SIZE) % mtd->erasesize;
+        mod = (cxt->nextpage * record_size) % mtd->erasesize;
         if (mod != 0) {
-                cxt->nextpage = cxt->nextpage + ((mtd->erasesize - mod) / OOPS_PAGE_SIZE);
+                cxt->nextpage = cxt->nextpage + ((mtd->erasesize - mod) / record_size);
                 if (cxt->nextpage >= cxt->oops_pages)
                         cxt->nextpage = 0;
         }
 
         while (mtd->block_isbad) {
-                ret = mtd->block_isbad(mtd, cxt->nextpage * OOPS_PAGE_SIZE);
+                ret = mtd->block_isbad(mtd, cxt->nextpage * record_size);
                 if (!ret)
                         break;
                 if (ret < 0) {
-                        printk(KERN_ERR "mtdoops: block_isbad failed, aborting.\n");
+                        printk(KERN_ERR "mtdoops: block_isbad failed, aborting\n");
                         return;
                 }
 badblock:
-                printk(KERN_WARNING "mtdoops: Bad block at %08x\n",
-                                cxt->nextpage * OOPS_PAGE_SIZE);
+                printk(KERN_WARNING "mtdoops: bad block at %08lx\n",
+                       cxt->nextpage * record_size);
                 i++;
-                cxt->nextpage = cxt->nextpage + (mtd->erasesize / OOPS_PAGE_SIZE);
+                cxt->nextpage = cxt->nextpage + (mtd->erasesize / record_size);
                 if (cxt->nextpage >= cxt->oops_pages)
                         cxt->nextpage = 0;
-                if (i == (cxt->oops_pages / (mtd->erasesize / OOPS_PAGE_SIZE))) {
-                        printk(KERN_ERR "mtdoops: All blocks bad!\n");
+                if (i == cxt->oops_pages / (mtd->erasesize / record_size)) {
+                        printk(KERN_ERR "mtdoops: all blocks bad!\n");
                         return;
                 }
         }
 
         for (j = 0, ret = -1; (j < 3) && (ret < 0); j++)
-                ret = mtdoops_erase_block(mtd, cxt->nextpage * OOPS_PAGE_SIZE);
+                ret = mtdoops_erase_block(cxt, cxt->nextpage * record_size);
 
         if (ret >= 0) {
-                printk(KERN_DEBUG "mtdoops: Ready %d, %d \n", cxt->nextpage, cxt->nextcount);
-                cxt->ready = 1;
+                printk(KERN_DEBUG "mtdoops: ready %d, %d\n",
+                       cxt->nextpage, cxt->nextcount);
                 return;
         }
 
-        if (mtd->block_markbad && (ret == -EIO)) {
-                ret = mtd->block_markbad(mtd, cxt->nextpage * OOPS_PAGE_SIZE);
+        if (mtd->block_markbad && ret == -EIO) {
+                ret = mtd->block_markbad(mtd, cxt->nextpage * record_size);
                 if (ret < 0) {
-                        printk(KERN_ERR "mtdoops: block_markbad failed, aborting.\n");
+                        printk(KERN_ERR "mtdoops: block_markbad failed, aborting\n");
                         return;
                 }
         }
@@ -191,36 +213,37 @@ static void mtdoops_write(struct mtdoops_context *cxt, int panic)
 {
         struct mtd_info *mtd = cxt->mtd;
         size_t retlen;
+        u32 *hdr;
         int ret;
 
-        if (cxt->writecount < OOPS_PAGE_SIZE)
-                memset(cxt->oops_buf + cxt->writecount, 0xff,
-                                        OOPS_PAGE_SIZE - cxt->writecount);
+        /* Add mtdoops header to the buffer */
+        hdr = cxt->oops_buf;
+        hdr[0] = cxt->nextcount;
+        hdr[1] = MTDOOPS_KERNMSG_MAGIC;
 
         if (panic)
-                ret = mtd->panic_write(mtd, cxt->nextpage * OOPS_PAGE_SIZE,
-                                        OOPS_PAGE_SIZE, &retlen, cxt->oops_buf);
+                ret = mtd->panic_write(mtd, cxt->nextpage * record_size,
+                                        record_size, &retlen, cxt->oops_buf);
         else
-                ret = mtd->write(mtd, cxt->nextpage * OOPS_PAGE_SIZE,
-                                        OOPS_PAGE_SIZE, &retlen, cxt->oops_buf);
-
-        cxt->writecount = 0;
+                ret = mtd->write(mtd, cxt->nextpage * record_size,
+                                        record_size, &retlen, cxt->oops_buf);
 
-        if ((retlen != OOPS_PAGE_SIZE) || (ret < 0))
-                printk(KERN_ERR "mtdoops: Write failure at %d (%td of %d written), err %d.\n",
-                        cxt->nextpage * OOPS_PAGE_SIZE, retlen, OOPS_PAGE_SIZE, ret);
+        if (retlen != record_size || ret < 0)
+                printk(KERN_ERR "mtdoops: write failure at %ld (%td of %ld written), error %d\n",
+                       cxt->nextpage * record_size, retlen, record_size, ret);
+        mark_page_used(cxt, cxt->nextpage);
+        memset(cxt->oops_buf, 0xff, record_size);
 
         mtdoops_inc_counter(cxt);
 }
 
-
 static void mtdoops_workfunc_write(struct work_struct *work)
 {
         struct mtdoops_context *cxt =
                         container_of(work, struct mtdoops_context, work_write);
 
         mtdoops_write(cxt, 0);
-}                                       
+}
 
 static void find_next_position(struct mtdoops_context *cxt)
 {
@@ -230,28 +253,33 @@ static void find_next_position(struct mtdoops_context *cxt)
         size_t retlen;
 
         for (page = 0; page < cxt->oops_pages; page++) {
-                ret = mtd->read(mtd, page * OOPS_PAGE_SIZE, 8, &retlen, (u_char *) &count[0]);
-                if ((retlen != 8) || ((ret < 0) && (ret != -EUCLEAN))) {
-                        printk(KERN_ERR "mtdoops: Read failure at %d (%td of 8 read)"
-                                ", err %d.\n", page * OOPS_PAGE_SIZE, retlen, ret);
+                /* Assume the page is used */
+                mark_page_used(cxt, page);
+                ret = mtd->read(mtd, page * record_size, MTDOOPS_HEADER_SIZE,
+                                &retlen, (u_char *) &count[0]);
+                if (retlen != MTDOOPS_HEADER_SIZE ||
+                                (ret < 0 && ret != -EUCLEAN)) {
+                        printk(KERN_ERR "mtdoops: read failure at %ld (%td of %d read), err %d\n",
+                               page * record_size, retlen,
+                               MTDOOPS_HEADER_SIZE, ret);
                         continue;
                 }
 
-                if (count[1] != MTDOOPS_KERNMSG_MAGIC)
-                        continue;
+                if (count[0] == 0xffffffff && count[1] == 0xffffffff)
+                        mark_page_unused(cxt, page);
                 if (count[0] == 0xffffffff)
                         continue;
                 if (maxcount == 0xffffffff) {
                         maxcount = count[0];
                         maxpos = page;
-                } else if ((count[0] < 0x40000000) && (maxcount > 0xc0000000)) {
+                } else if (count[0] < 0x40000000 && maxcount > 0xc0000000) {
                         maxcount = count[0];
                         maxpos = page;
-                } else if ((count[0] > maxcount) && (count[0] < 0xc0000000)) {
+                } else if (count[0] > maxcount && count[0] < 0xc0000000) {
                         maxcount = count[0];
                         maxpos = page;
-                } else if ((count[0] > maxcount) && (count[0] > 0xc0000000)
-                                        && (maxcount > 0x80000000)) {
+                } else if (count[0] > maxcount && count[0] > 0xc0000000
+                                        && maxcount > 0x80000000) {
                         maxcount = count[0];
                         maxpos = page;
                 }
@@ -269,187 +297,170 @@ static void find_next_position(struct mtdoops_context *cxt)
         mtdoops_inc_counter(cxt);
 }
 
-
-static void mtdoops_notify_add(struct mtd_info *mtd)
+static void mtdoops_do_dump(struct kmsg_dumper *dumper,
+                enum kmsg_dump_reason reason, const char *s1, unsigned long l1,
+                const char *s2, unsigned long l2)
 {
-        struct mtdoops_context *cxt = &oops_cxt;
+        struct mtdoops_context *cxt = container_of(dumper,
+                        struct mtdoops_context, dump);
+        unsigned long s1_start, s2_start;
+        unsigned long l1_cpy, l2_cpy;
+        char *dst;
+
+        /* Only dump oopses if dump_oops is set */
+        if (reason == KMSG_DUMP_OOPS && !dump_oops)
+                return;
 
-        if (cxt->name && !strcmp(mtd->name, cxt->name))
-                cxt->mtd_index = mtd->index;
+        dst = cxt->oops_buf + MTDOOPS_HEADER_SIZE; /* Skip the header */
+        l2_cpy = min(l2, record_size - MTDOOPS_HEADER_SIZE);
+        l1_cpy = min(l1, record_size - MTDOOPS_HEADER_SIZE - l2_cpy);
 
-        if ((mtd->index != cxt->mtd_index) || cxt->mtd_index < 0)
-                return;
+        s2_start = l2 - l2_cpy;
+        s1_start = l1 - l1_cpy;
 
-        if (mtd->size < (mtd->erasesize * 2)) {
-                printk(KERN_ERR "MTD partition %d not big enough for mtdoops\n",
-                                mtd->index);
-                return;
-        }
+        memcpy(dst, s1 + s1_start, l1_cpy);
+        memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy);
 
-        if (mtd->erasesize < OOPS_PAGE_SIZE) {
-                printk(KERN_ERR "Eraseblock size of MTD partition %d too small\n",
-                                mtd->index);
+        /* Panics must be written immediately */
+        if (reason == KMSG_DUMP_PANIC) {
+                if (!cxt->mtd->panic_write)
+                        printk(KERN_ERR "mtdoops: Cannot write from panic without panic_write\n");
+                else
+                        mtdoops_write(cxt, 1);
                 return;
         }
 
-        cxt->mtd = mtd;
-        if (mtd->size > INT_MAX)
-                cxt->oops_pages = INT_MAX / OOPS_PAGE_SIZE;
-        else
-                cxt->oops_pages = (int)mtd->size / OOPS_PAGE_SIZE;
-
-        find_next_position(cxt);
-
-        printk(KERN_INFO "mtdoops: Attached to MTD device %d\n", mtd->index);
+        /* For other cases, schedule work to write it "nicely" */
+        schedule_work(&cxt->work_write);
 }
 
-static void mtdoops_notify_remove(struct mtd_info *mtd)
+static void mtdoops_notify_add(struct mtd_info *mtd)
 {
         struct mtdoops_context *cxt = &oops_cxt;
+        u64 mtdoops_pages = div_u64(mtd->size, record_size);
+        int err;
 
-        if ((mtd->index != cxt->mtd_index) || cxt->mtd_index < 0)
-                return;
-
-        cxt->mtd = NULL;
-        flush_scheduled_work();
-}
-
-static void mtdoops_console_sync(void)
-{
-        struct mtdoops_context *cxt = &oops_cxt;
-        struct mtd_info *mtd = cxt->mtd;
-        unsigned long flags;
+        if (!strcmp(mtd->name, mtddev))
+                cxt->mtd_index = mtd->index;
 
-        if (!cxt->ready || !mtd || cxt->writecount == 0)
+        if (mtd->index != cxt->mtd_index || cxt->mtd_index < 0)
                 return;
 
-        /* 
-         *  Once ready is 0 and we've held the lock no further writes to the 
-         *  buffer will happen
-         */
-        spin_lock_irqsave(&cxt->writecount_lock, flags);
-        if (!cxt->ready) {
-                spin_unlock_irqrestore(&cxt->writecount_lock, flags);
+        if (mtd->size < mtd->erasesize * 2) {
+                printk(KERN_ERR "mtdoops: MTD partition %d not big enough for mtdoops\n",
+                       mtd->index);
                 return;
         }
-        cxt->ready = 0;
-        spin_unlock_irqrestore(&cxt->writecount_lock, flags);
-
-        if (mtd->panic_write && in_interrupt())
-                /* Interrupt context, we're going to panic so try and log */
-                mtdoops_write(cxt, 1);
-        else
-                schedule_work(&cxt->work_write);
-}
-
-static void
-mtdoops_console_write(struct console *co, const char *s, unsigned int count)
-{
-        struct mtdoops_context *cxt = co->data;
-        struct mtd_info *mtd = cxt->mtd;
-        unsigned long flags;
-
-        if (!oops_in_progress) {
-                mtdoops_console_sync();
+        if (mtd->erasesize < record_size) {
+                printk(KERN_ERR "mtdoops: eraseblock size of MTD partition %d too small\n",
+                       mtd->index);
                 return;
         }
-
-        if (!cxt->ready || !mtd)
+        if (mtd->size > MTDOOPS_MAX_MTD_SIZE) {
+                printk(KERN_ERR "mtdoops: mtd%d is too large (limit is %d MiB)\n",
+                       mtd->index, MTDOOPS_MAX_MTD_SIZE / 1024 / 1024);
                 return;
+        }
 
-        /* Locking on writecount ensures sequential writes to the buffer */
-        spin_lock_irqsave(&cxt->writecount_lock, flags);
-
-        /* Check ready status didn't change whilst waiting for the lock */
-        if (!cxt->ready) {
-                spin_unlock_irqrestore(&cxt->writecount_lock, flags);
+        /* oops_page_used is a bit field */
+        cxt->oops_page_used = vmalloc(DIV_ROUND_UP(mtdoops_pages,
+                        BITS_PER_LONG));
+        if (!cxt->oops_page_used) {
+                printk(KERN_ERR "mtdoops: could not allocate page array\n");
                 return;
         }
 
-        if (cxt->writecount == 0) {
-                u32 *stamp = cxt->oops_buf;
-                *stamp++ = cxt->nextcount;
-                *stamp = MTDOOPS_KERNMSG_MAGIC;
-                cxt->writecount = 8;
+        cxt->dump.dump = mtdoops_do_dump;
+        err = kmsg_dump_register(&cxt->dump);
+        if (err) {
+                printk(KERN_ERR "mtdoops: registering kmsg dumper failed, error %d\n", err);
+                vfree(cxt->oops_page_used);
+                cxt->oops_page_used = NULL;
+                return;
         }
 
-        if ((count + cxt->writecount) > OOPS_PAGE_SIZE)
-                count = OOPS_PAGE_SIZE - cxt->writecount;
-
-        memcpy(cxt->oops_buf + cxt->writecount, s, count);
-        cxt->writecount += count;
-
-        spin_unlock_irqrestore(&cxt->writecount_lock, flags);
-
-        if (cxt->writecount == OOPS_PAGE_SIZE)
-                mtdoops_console_sync();
+        cxt->mtd = mtd;
+        cxt->oops_pages = (int)mtd->size / record_size;
+        find_next_position(cxt);
+        printk(KERN_INFO "mtdoops: Attached to MTD device %d\n", mtd->index);
 }
 
-static int __init mtdoops_console_setup(struct console *co, char *options)
+static void mtdoops_notify_remove(struct mtd_info *mtd)
 {
-        struct mtdoops_context *cxt = co->data;
+        struct mtdoops_context *cxt = &oops_cxt;
 
-        if (cxt->mtd_index != -1 || cxt->name)
-                return -EBUSY;
-        if (options) {
-                cxt->name = kstrdup(options, GFP_KERNEL);
-                return 0;
-        }
-        if (co->index == -1)
-                return -EINVAL;
+        if (mtd->index != cxt->mtd_index || cxt->mtd_index < 0)
+                return;
 
-        cxt->mtd_index = co->index;
-        return 0;
+        if (kmsg_dump_unregister(&cxt->dump) < 0)
+                printk(KERN_WARNING "mtdoops: could not unregister kmsg_dumper\n");
+
+        cxt->mtd = NULL;
+        flush_scheduled_work();
 }
 
+
 static struct mtd_notifier mtdoops_notifier = {
         .add    = mtdoops_notify_add,
         .remove = mtdoops_notify_remove,
 };
 
-static struct console mtdoops_console = {
-        .name           = "ttyMTD",
-        .write          = mtdoops_console_write,
-        .setup          = mtdoops_console_setup,
-        .unblank        = mtdoops_console_sync,
-        .index          = -1,
-        .data           = &oops_cxt,
-};
-
-static int __init mtdoops_console_init(void)
+static int __init mtdoops_init(void)
 {
         struct mtdoops_context *cxt = &oops_cxt;
+        int mtd_index;
+        char *endp;
 
+        if (strlen(mtddev) == 0) {
+                printk(KERN_ERR "mtdoops: mtd device (mtddev=name/number) must be supplied\n");
+                return -EINVAL;
+        }
+        if ((record_size & 4095) != 0) {
+                printk(KERN_ERR "mtdoops: record_size must be a multiple of 4096\n");
+                return -EINVAL;
+        }
+        if (record_size < 4096) {
+                printk(KERN_ERR "mtdoops: record_size must be over 4096 bytes\n");
+                return -EINVAL;
+        }
+
+        /* Setup the MTD device to use */
         cxt->mtd_index = -1;
-        cxt->oops_buf = vmalloc(OOPS_PAGE_SIZE);
-        spin_lock_init(&cxt->writecount_lock);
+        mtd_index = simple_strtoul(mtddev, &endp, 0);
+        if (*endp == '\0')
+                cxt->mtd_index = mtd_index;
+        if (cxt->mtd_index > MAX_MTD_DEVICES) {
+                printk(KERN_ERR "mtdoops: invalid mtd device number (%u) given\n",
+                                mtd_index);
+                return -EINVAL;
+        }
 
+        cxt->oops_buf = vmalloc(record_size);
         if (!cxt->oops_buf) {
-                printk(KERN_ERR "Failed to allocate mtdoops buffer workspace\n");
+                printk(KERN_ERR "mtdoops: failed to allocate buffer workspace\n");
                 return -ENOMEM;
         }
+        memset(cxt->oops_buf, 0xff, record_size);
 
         INIT_WORK(&cxt->work_erase, mtdoops_workfunc_erase);
         INIT_WORK(&cxt->work_write, mtdoops_workfunc_write);
 
-        register_console(&mtdoops_console);
         register_mtd_user(&mtdoops_notifier);
         return 0;
 }
 
-static void __exit mtdoops_console_exit(void)
+static void __exit mtdoops_exit(void)
 {
         struct mtdoops_context *cxt = &oops_cxt;
 
         unregister_mtd_user(&mtdoops_notifier);
-        unregister_console(&mtdoops_console);
-        kfree(cxt->name);
         vfree(cxt->oops_buf);
+        vfree(cxt->oops_page_used);
 }
 
 
-subsys_initcall(mtdoops_console_init);
-module_exit(mtdoops_console_exit);
+module_init(mtdoops_init);
+module_exit(mtdoops_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Richard Purdie <rpurdie@openedhand.com>");
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 0e35e1aefd22..7678538344f4 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -201,6 +201,22 @@ config MTD_NAND_S3C2410_CLKSTOP
           when the is NAND chip selected or released, but will save
           approximately 5mA of power when there is nothing happening.
 
+config MTD_NAND_BCM_UMI
+        tristate "NAND Flash support for BCM Reference Boards"
+        depends on ARCH_BCMRING && MTD_NAND
+        help
+          This enables the NAND flash controller on the BCM UMI block.
+
+          No board specfic support is done by this driver, each board
+          must advertise a platform_device for the driver to attach.
+
+config MTD_NAND_BCM_UMI_HWCS
+        bool "BCM UMI NAND Hardware CS"
+        depends on MTD_NAND_BCM_UMI
+        help
+          Enable the use of the BCM UMI block's internal CS using NAND.
+          This should only be used if you know the external NAND CS can toggle.
+
 config MTD_NAND_DISKONCHIP
         tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"
         depends on EXPERIMENTAL
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 6950d3dabf10..460a1f39a8d1 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -42,5 +42,6 @@ obj-$(CONFIG_MTD_NAND_SOCRATES)		+= socrates_nand.o
 obj-$(CONFIG_MTD_NAND_TXX9NDFMC)        += txx9ndfmc.o
 obj-$(CONFIG_MTD_NAND_W90P910)          += w90p910_nand.o
 obj-$(CONFIG_MTD_NAND_NOMADIK)          += nomadik_nand.o
+obj-$(CONFIG_MTD_NAND_BCM_UMI)          += bcm_umi_nand.o nand_bcm_umi.o
 
 nand-objs := nand_base.o nand_bbt.o
diff --git a/drivers/mtd/nand/alauda.c b/drivers/mtd/nand/alauda.c
index 6d9649159a18..2d6773281fd9 100644
--- a/drivers/mtd/nand/alauda.c
+++ b/drivers/mtd/nand/alauda.c
@@ -372,15 +372,6 @@ static int alauda_read_oob(struct mtd_info *mtd, loff_t from, void *oob)
         return __alauda_read_page(mtd, from, ignore_buf, oob);
 }
 
-static int popcount8(u8 c)
-{
-        int ret = 0;
-
-        for ( ; c; c>>=1)
-                ret += c & 1;
-        return ret;
-}
-
 static int alauda_isbad(struct mtd_info *mtd, loff_t ofs)
 {
         u8 oob[16];
@@ -391,7 +382,7 @@ static int alauda_isbad(struct mtd_info *mtd, loff_t ofs)
                 return err;
 
         /* A block is marked bad if two or more bits are zero */
-        return popcount8(oob[5]) >= 7 ? 0 : 1;
+        return hweight8(oob[5]) >= 7 ? 0 : 1;
 }
 
 static int alauda_bounce_read(struct mtd_info *mtd, loff_t from, size_t len,
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index f8e9975c86e5..524e6c9e0672 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -192,7 +192,6 @@ static int atmel_nand_calculate(struct mtd_info *mtd,
 {
         struct nand_chip *nand_chip = mtd->priv;
         struct atmel_nand_host *host = nand_chip->priv;
-        uint32_t *eccpos = nand_chip->ecc.layout->eccpos;
         unsigned int ecc_value;
 
         /* get the first 2 ECC bytes */
@@ -464,7 +463,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
         if (host->board->det_pin) {
                 if (gpio_get_value(host->board->det_pin)) {
                         printk(KERN_INFO "No SmartMedia card inserted.\n");
-                        res = ENXIO;
+                        res = -ENXIO;
                         goto err_no_card;
                 }
         }
@@ -535,7 +534,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 
         if ((!partitions) || (num_partitions == 0)) {
                 printk(KERN_ERR "atmel_nand: No partitions defined, or unsupported device.\n");
-                res = ENXIO;
+                res = -ENXIO;
                 goto err_no_partitions;
         }
 
diff --git a/drivers/mtd/nand/bcm_umi_bch.c b/drivers/mtd/nand/bcm_umi_bch.c
new file mode 100644
index 000000000000..a930666d0687
--- /dev/null
+++ b/drivers/mtd/nand/bcm_umi_bch.c
@@ -0,0 +1,213 @@
+/*****************************************************************************
+* Copyright 2004 - 2009 Broadcom Corporation.  All rights reserved.
+*
+* Unless you and Broadcom execute a separate written software license
+* agreement governing use of this software, this software is licensed to you
+* under the terms of the GNU General Public License version 2, available at
+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
+*
+* Notwithstanding the above, under no circumstances may you combine this
+* software in any way with any other Broadcom software provided under a
+* license other than the GPL, without Broadcom's express prior written
+* consent.
+*****************************************************************************/
+
+/* ---- Include Files ---------------------------------------------------- */
+#include "nand_bcm_umi.h"
+
+/* ---- External Variable Declarations ----------------------------------- */
+/* ---- External Function Prototypes ------------------------------------- */
+/* ---- Public Variables ------------------------------------------------- */
+/* ---- Private Constants and Types -------------------------------------- */
+
+/* ---- Private Function Prototypes -------------------------------------- */
+static int bcm_umi_bch_read_page_hwecc(struct mtd_info *mtd,
+        struct nand_chip *chip, uint8_t *buf, int page);
+static void bcm_umi_bch_write_page_hwecc(struct mtd_info *mtd,
+        struct nand_chip *chip, const uint8_t *buf);
+
+/* ---- Private Variables ------------------------------------------------ */
+
+/*
+** nand_hw_eccoob
+** New oob placement block for use with hardware ecc generation.
+*/
+static struct nand_ecclayout nand_hw_eccoob_512 = {
+        /* Reserve 5 for BI indicator */
+        .oobfree = {
+#if (NAND_ECC_NUM_BYTES > 3)
+                    {.offset = 0, .length = 2}
+#else
+                    {.offset = 0, .length = 5},
+                    {.offset = 6, .length = 7}
+#endif
+                    }
+};
+
+/*
+** We treat the OOB for a 2K page as if it were 4 512 byte oobs,
+** except the BI is at byte 0.
+*/
+static struct nand_ecclayout nand_hw_eccoob_2048 = {
+        /* Reserve 0 as BI indicator */
+        .oobfree = {
+#if (NAND_ECC_NUM_BYTES > 10)
+                    {.offset = 1, .length = 2},
+#elif (NAND_ECC_NUM_BYTES > 7)
+                    {.offset = 1, .length = 5},
+                    {.offset = 16, .length = 6},
+                    {.offset = 32, .length = 6},
+                    {.offset = 48, .length = 6}
+#else
+                    {.offset = 1, .length = 8},
+                    {.offset = 16, .length = 9},
+                    {.offset = 32, .length = 9},
+                    {.offset = 48, .length = 9}
+#endif
+                    }
+};
+
+/* We treat the OOB for a 4K page as if it were 8 512 byte oobs,
+ * except the BI is at byte 0. */
+static struct nand_ecclayout nand_hw_eccoob_4096 = {
+        /* Reserve 0 as BI indicator */
+        .oobfree = {
+#if (NAND_ECC_NUM_BYTES > 10)
+                    {.offset = 1, .length = 2},
+                    {.offset = 16, .length = 3},
+                    {.offset = 32, .length = 3},
+                    {.offset = 48, .length = 3},
+                    {.offset = 64, .length = 3},
+                    {.offset = 80, .length = 3},
+                    {.offset = 96, .length = 3},
+                    {.offset = 112, .length = 3}
+#else
+                    {.offset = 1, .length = 5},
+                    {.offset = 16, .length = 6},
+                    {.offset = 32, .length = 6},
+                    {.offset = 48, .length = 6},
+                    {.offset = 64, .length = 6},
+                    {.offset = 80, .length = 6},
+                    {.offset = 96, .length = 6},
+                    {.offset = 112, .length = 6}
+#endif
+                    }
+};
+
+/* ---- Private Functions ------------------------------------------------ */
+/* ==== Public Functions ================================================= */
+
+/****************************************************************************
+*
+*  bcm_umi_bch_read_page_hwecc - hardware ecc based page read function
+*  @mtd:        mtd info structure
+*  @chip:       nand chip info structure
+*  @buf:        buffer to store read data
+*
+***************************************************************************/
+static int bcm_umi_bch_read_page_hwecc(struct mtd_info *mtd,
+                                       struct nand_chip *chip, uint8_t * buf,
+                                                 int page)
+{
+        int sectorIdx = 0;
+        int eccsize = chip->ecc.size;
+        int eccsteps = chip->ecc.steps;
+        uint8_t *datap = buf;
+        uint8_t eccCalc[NAND_ECC_NUM_BYTES];
+        int sectorOobSize = mtd->oobsize / eccsteps;
+        int stat;
+
+        for (sectorIdx = 0; sectorIdx < eccsteps;
+                        sectorIdx++, datap += eccsize) {
+                if (sectorIdx > 0) {
+                        /* Seek to page location within sector */
+                        chip->cmdfunc(mtd, NAND_CMD_RNDOUT, sectorIdx * eccsize,
+                                      -1);
+                }
+
+                /* Enable hardware ECC before reading the buf */
+                nand_bcm_umi_bch_enable_read_hwecc();
+
+                /* Read in data */
+                bcm_umi_nand_read_buf(mtd, datap, eccsize);
+
+                /* Pause hardware ECC after reading the buf */
+                nand_bcm_umi_bch_pause_read_ecc_calc();
+
+                /* Read the OOB ECC */
+                chip->cmdfunc(mtd, NAND_CMD_RNDOUT,
+                              mtd->writesize + sectorIdx * sectorOobSize, -1);
+                nand_bcm_umi_bch_read_oobEcc(mtd->writesize, eccCalc,
+                                             NAND_ECC_NUM_BYTES,
+                                             chip->oob_poi +
+                                             sectorIdx * sectorOobSize);
+
+                /* Correct any ECC detected errors */
+                stat =
+                    nand_bcm_umi_bch_correct_page(datap, eccCalc,
+                                                  NAND_ECC_NUM_BYTES);
+
+                /* Update Stats */
+                if (stat < 0) {
+#if defined(NAND_BCM_UMI_DEBUG)
+                        printk(KERN_WARNING "%s uncorr_err sectorIdx=%d\n",
+                               __func__, sectorIdx);
+                        printk(KERN_WARNING
+                               "%s data %02x %02x %02x %02x "
+                                         "%02x %02x %02x %02x\n",
+                               __func__, datap[0], datap[1], datap[2], datap[3],
+                               datap[4], datap[5], datap[6], datap[7]);
+                        printk(KERN_WARNING
+                               "%s ecc  %02x %02x %02x %02x "
+                                         "%02x %02x %02x %02x %02x %02x "
+                                         "%02x %02x %02x\n",
+                               __func__, eccCalc[0], eccCalc[1], eccCalc[2],
+                               eccCalc[3], eccCalc[4], eccCalc[5], eccCalc[6],
+                               eccCalc[7], eccCalc[8], eccCalc[9], eccCalc[10],
+                               eccCalc[11], eccCalc[12]);
+                        BUG();
+#endif
+                        mtd->ecc_stats.failed++;
+                } else {
+#if defined(NAND_BCM_UMI_DEBUG)
+                        if (stat > 0) {
+                                printk(KERN_INFO
+                                       "%s %d correctable_errors detected\n",
+                                       __func__, stat);
+                        }
+#endif
+                        mtd->ecc_stats.corrected += stat;
+                }
+        }
+        return 0;
+}
+
+/****************************************************************************
+*
+*  bcm_umi_bch_write_page_hwecc - hardware ecc based page write function
+*  @mtd:        mtd info structure
+*  @chip:       nand chip info structure
+*  @buf:        data buffer
+*
+***************************************************************************/
+static void bcm_umi_bch_write_page_hwecc(struct mtd_info *mtd,
+        struct nand_chip *chip, const uint8_t *buf)
+{
+        int sectorIdx = 0;
+        int eccsize = chip->ecc.size;
+        int eccsteps = chip->ecc.steps;
+        const uint8_t *datap = buf;
+        uint8_t *oobp = chip->oob_poi;
+        int sectorOobSize = mtd->oobsize / eccsteps;
+
+        for (sectorIdx = 0; sectorIdx < eccsteps;
+             sectorIdx++, datap += eccsize, oobp += sectorOobSize) {
+                /* Enable hardware ECC before writing the buf */
+                nand_bcm_umi_bch_enable_write_hwecc();
+                bcm_umi_nand_write_buf(mtd, datap, eccsize);
+                nand_bcm_umi_bch_write_oobEcc(mtd->writesize, oobp,
+                                              NAND_ECC_NUM_BYTES);
+        }
+
+        bcm_umi_nand_write_buf(mtd, chip->oob_poi, mtd->oobsize);
+}
diff --git a/drivers/mtd/nand/bcm_umi_nand.c b/drivers/mtd/nand/bcm_umi_nand.c
new file mode 100644
index 000000000000..087bcd745bb7
--- /dev/null
+++ b/drivers/mtd/nand/bcm_umi_nand.c
@@ -0,0 +1,581 @@
+/*****************************************************************************
+* Copyright 2004 - 2009 Broadcom Corporation.  All rights reserved.
+*
+* Unless you and Broadcom execute a separate written software license
+* agreement governing use of this software, this software is licensed to you
+* under the terms of the GNU General Public License version 2, available at
+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
+*
+* Notwithstanding the above, under no circumstances may you combine this
+* software in any way with any other Broadcom software provided under a
+* license other than the GPL, without Broadcom's express prior written
+* consent.
+*****************************************************************************/
+
+/* ---- Include Files ---------------------------------------------------- */
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_ecc.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/mach-types.h>
+#include <asm/system.h>
+
+#include <mach/reg_nand.h>
+#include <mach/reg_umi.h>
+
+#include "nand_bcm_umi.h"
+
+#include <mach/memory_settings.h>
+
+#define USE_DMA 1
+#include <mach/dma.h>
+#include <linux/dma-mapping.h>
+#include <linux/completion.h>
+
+/* ---- External Variable Declarations ----------------------------------- */
+/* ---- External Function Prototypes ------------------------------------- */
+/* ---- Public Variables ------------------------------------------------- */
+/* ---- Private Constants and Types -------------------------------------- */
+static const __devinitconst char gBanner[] = KERN_INFO \
+        "BCM UMI MTD NAND Driver: 1.00\n";
+
+#ifdef CONFIG_MTD_PARTITIONS
+const char *part_probes[] = { "cmdlinepart", NULL };
+#endif
+
+#if NAND_ECC_BCH
+static uint8_t scan_ff_pattern[] = { 0xff };
+
+static struct nand_bbt_descr largepage_bbt = {
+        .options = 0,
+        .offs = 0,
+        .len = 1,
+        .pattern = scan_ff_pattern
+};
+#endif
+
+/*
+** Preallocate a buffer to avoid having to do this every dma operation.
+** This is the size of the preallocated coherent DMA buffer.
+*/
+#if USE_DMA
+#define DMA_MIN_BUFLEN  512
+#define DMA_MAX_BUFLEN  PAGE_SIZE
+#define USE_DIRECT_IO(len)      (((len) < DMA_MIN_BUFLEN) || \
+        ((len) > DMA_MAX_BUFLEN))
+
+/*
+ * The current NAND data space goes from 0x80001900 to 0x80001FFF,
+ * which is only 0x700 = 1792 bytes long. This is too small for 2K, 4K page
+ * size NAND flash. Need to break the DMA down to multiple 1Ks.
+ *
+ * Need to make sure REG_NAND_DATA_PADDR + DMA_MAX_LEN < 0x80002000
+ */
+#define DMA_MAX_LEN             1024
+
+#else /* !USE_DMA */
+#define DMA_MIN_BUFLEN          0
+#define DMA_MAX_BUFLEN          0
+#define USE_DIRECT_IO(len)      1
+#endif
+/* ---- Private Function Prototypes -------------------------------------- */
+static void bcm_umi_nand_read_buf(struct mtd_info *mtd, u_char * buf, int len);
+static void bcm_umi_nand_write_buf(struct mtd_info *mtd, const u_char * buf,
+                                   int len);
+
+/* ---- Private Variables ------------------------------------------------ */
+static struct mtd_info *board_mtd;
+static void __iomem *bcm_umi_io_base;
+static void *virtPtr;
+static dma_addr_t physPtr;
+static struct completion nand_comp;
+
+/* ---- Private Functions ------------------------------------------------ */
+#if NAND_ECC_BCH
+#include "bcm_umi_bch.c"
+#else
+#include "bcm_umi_hamming.c"
+#endif
+
+#if USE_DMA
+
+/* Handler called when the DMA finishes. */
+static void nand_dma_handler(DMA_Device_t dev, int reason, void *userData)
+{
+        complete(&nand_comp);
+}
+
+static int nand_dma_init(void)
+{
+        int rc;
+
+        rc = dma_set_device_handler(DMA_DEVICE_NAND_MEM_TO_MEM,
+                nand_dma_handler, NULL);
+        if (rc != 0) {
+                printk(KERN_ERR "dma_set_device_handler failed: %d\n", rc);
+                return rc;
+        }
+
+        virtPtr =
+            dma_alloc_coherent(NULL, DMA_MAX_BUFLEN, &physPtr, GFP_KERNEL);
+        if (virtPtr == NULL) {
+                printk(KERN_ERR "NAND - Failed to allocate memory for DMA buffer\n");
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+static void nand_dma_term(void)
+{
+        if (virtPtr != NULL)
+                dma_free_coherent(NULL, DMA_MAX_BUFLEN, virtPtr, physPtr);
+}
+
+static void nand_dma_read(void *buf, int len)
+{
+        int offset = 0;
+        int tmp_len = 0;
+        int len_left = len;
+        DMA_Handle_t hndl;
+
+        if (virtPtr == NULL)
+                panic("nand_dma_read: virtPtr == NULL\n");
+
+        if ((void *)physPtr == NULL)
+                panic("nand_dma_read: physPtr == NULL\n");
+
+        hndl = dma_request_channel(DMA_DEVICE_NAND_MEM_TO_MEM);
+        if (hndl < 0) {
+                printk(KERN_ERR
+                       "nand_dma_read: unable to allocate dma channel: %d\n",
+                       (int)hndl);
+                panic("\n");
+        }
+
+        while (len_left > 0) {
+                if (len_left > DMA_MAX_LEN) {
+                        tmp_len = DMA_MAX_LEN;
+                        len_left -= DMA_MAX_LEN;
+                } else {
+                        tmp_len = len_left;
+                        len_left = 0;
+                }
+
+                init_completion(&nand_comp);
+                dma_transfer_mem_to_mem(hndl, REG_NAND_DATA_PADDR,
+                                        physPtr + offset, tmp_len);
+                wait_for_completion(&nand_comp);
+
+                offset += tmp_len;
+        }
+
+        dma_free_channel(hndl);
+
+        if (buf != NULL)
+                memcpy(buf, virtPtr, len);
+}
+
+static void nand_dma_write(const void *buf, int len)
+{
+        int offset = 0;
+        int tmp_len = 0;
+        int len_left = len;
+        DMA_Handle_t hndl;
+
+        if (buf == NULL)
+                panic("nand_dma_write: buf == NULL\n");
+
+        if (virtPtr == NULL)
+                panic("nand_dma_write: virtPtr == NULL\n");
+
+        if ((void *)physPtr == NULL)
+                panic("nand_dma_write: physPtr == NULL\n");
+
+        memcpy(virtPtr, buf, len);
+
+
+        hndl = dma_request_channel(DMA_DEVICE_NAND_MEM_TO_MEM);
+        if (hndl < 0) {
+                printk(KERN_ERR
+                       "nand_dma_write: unable to allocate dma channel: %d\n",
+                       (int)hndl);
+                panic("\n");
+        }
+
+        while (len_left > 0) {
+                if (len_left > DMA_MAX_LEN) {
+                        tmp_len = DMA_MAX_LEN;
+                        len_left -= DMA_MAX_LEN;
+                } else {
+                        tmp_len = len_left;
+                        len_left = 0;
+                }
+
+                init_completion(&nand_comp);
+                dma_transfer_mem_to_mem(hndl, physPtr + offset,
+                                        REG_NAND_DATA_PADDR, tmp_len);
+                wait_for_completion(&nand_comp);
+
+                offset += tmp_len;
+        }
+
+        dma_free_channel(hndl);
+}
+
+#endif
+
+static int nand_dev_ready(struct mtd_info *mtd)
+{
+        return nand_bcm_umi_dev_ready();
+}
+
+/****************************************************************************
+*
+*  bcm_umi_nand_inithw
+*
+*   This routine does the necessary hardware (board-specific)
+*   initializations.  This includes setting up the timings, etc.
+*
+***************************************************************************/
+int bcm_umi_nand_inithw(void)
+{
+        /* Configure nand timing parameters */
+        REG_UMI_NAND_TCR &= ~0x7ffff;
+        REG_UMI_NAND_TCR |= HW_CFG_NAND_TCR;
+
+#if !defined(CONFIG_MTD_NAND_BCM_UMI_HWCS)
+        /* enable software control of CS */
+        REG_UMI_NAND_TCR |= REG_UMI_NAND_TCR_CS_SWCTRL;
+#endif
+
+        /* keep NAND chip select asserted */
+        REG_UMI_NAND_RCSR |= REG_UMI_NAND_RCSR_CS_ASSERTED;
+
+        REG_UMI_NAND_TCR &= ~REG_UMI_NAND_TCR_WORD16;
+        /* enable writes to flash */
+        REG_UMI_MMD_ICR |= REG_UMI_MMD_ICR_FLASH_WP;
+
+        writel(NAND_CMD_RESET, bcm_umi_io_base + REG_NAND_CMD_OFFSET);
+        nand_bcm_umi_wait_till_ready();
+
+#if NAND_ECC_BCH
+        nand_bcm_umi_bch_config_ecc(NAND_ECC_NUM_BYTES);
+#endif
+
+        return 0;
+}
+
+/* Used to turn latch the proper register for access. */
+static void bcm_umi_nand_hwcontrol(struct mtd_info *mtd, int cmd,
+                                   unsigned int ctrl)
+{
+        /* send command to hardware */
+        struct nand_chip *chip = mtd->priv;
+        if (ctrl & NAND_CTRL_CHANGE) {
+                if (ctrl & NAND_CLE) {
+                        chip->IO_ADDR_W = bcm_umi_io_base + REG_NAND_CMD_OFFSET;
+                        goto CMD;
+                }
+                if (ctrl & NAND_ALE) {
+                        chip->IO_ADDR_W =
+                            bcm_umi_io_base + REG_NAND_ADDR_OFFSET;
+                        goto CMD;
+                }
+                chip->IO_ADDR_W = bcm_umi_io_base + REG_NAND_DATA8_OFFSET;
+        }
+
+CMD:
+        /* Send command to chip directly */
+        if (cmd != NAND_CMD_NONE)
+                writeb(cmd, chip->IO_ADDR_W);
+}
+
+static void bcm_umi_nand_write_buf(struct mtd_info *mtd, const u_char * buf,
+                                   int len)
+{
+        if (USE_DIRECT_IO(len)) {
+                /* Do it the old way if the buffer is small or too large.
+                 * Probably quicker than starting and checking dma. */
+                int i;
+                struct nand_chip *this = mtd->priv;
+
+                for (i = 0; i < len; i++)
+                        writeb(buf[i], this->IO_ADDR_W);
+        }
+#if USE_DMA
+        else
+                nand_dma_write(buf, len);
+#endif
+}
+
+static void bcm_umi_nand_read_buf(struct mtd_info *mtd, u_char * buf, int len)
+{
+        if (USE_DIRECT_IO(len)) {
+                int i;
+                struct nand_chip *this = mtd->priv;
+
+                for (i = 0; i < len; i++)
+                        buf[i] = readb(this->IO_ADDR_R);
+        }
+#if USE_DMA
+        else
+                nand_dma_read(buf, len);
+#endif
+}
+
+static uint8_t readbackbuf[NAND_MAX_PAGESIZE];
+static int bcm_umi_nand_verify_buf(struct mtd_info *mtd, const u_char * buf,
+                                   int len)
+{
+        /*
+         * Try to readback page with ECC correction. This is necessary
+         * for MLC parts which may have permanently stuck bits.
+         */
+        struct nand_chip *chip = mtd->priv;
+        int ret = chip->ecc.read_page(mtd, chip, readbackbuf, 0);
+        if (ret < 0)
+                return -EFAULT;
+        else {
+                if (memcmp(readbackbuf, buf, len) == 0)
+                        return 0;
+
+                return -EFAULT;
+        }
+        return 0;
+}
+
+static int __devinit bcm_umi_nand_probe(struct platform_device *pdev)
+{
+        struct nand_chip *this;
+        struct resource *r;
+        int err = 0;
+
+        printk(gBanner);
+
+        /* Allocate memory for MTD device structure and private data */
+        board_mtd =
+            kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip),
+                    GFP_KERNEL);
+        if (!board_mtd) {
+                printk(KERN_WARNING
+                       "Unable to allocate NAND MTD device structure.\n");
+                return -ENOMEM;
+        }
+
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+        if (!r)
+                return -ENXIO;
+
+        /* map physical adress */
+        bcm_umi_io_base = ioremap(r->start, r->end - r->start + 1);
+
+        if (!bcm_umi_io_base) {
+                printk(KERN_ERR "ioremap to access BCM UMI NAND chip failed\n");
+                kfree(board_mtd);
+                return -EIO;
+        }
+
+        /* Get pointer to private data */
+        this = (struct nand_chip *)(&board_mtd[1]);
+
+        /* Initialize structures */
+        memset((char *)board_mtd, 0, sizeof(struct mtd_info));
+        memset((char *)this, 0, sizeof(struct nand_chip));
+
+        /* Link the private data with the MTD structure */
+        board_mtd->priv = this;
+
+        /* Initialize the NAND hardware.  */
+        if (bcm_umi_nand_inithw() < 0) {
+                printk(KERN_ERR "BCM UMI NAND chip could not be initialized\n");
+                iounmap(bcm_umi_io_base);
+                kfree(board_mtd);
+                return -EIO;
+        }
+
+        /* Set address of NAND IO lines */
+        this->IO_ADDR_W = bcm_umi_io_base + REG_NAND_DATA8_OFFSET;
+        this->IO_ADDR_R = bcm_umi_io_base + REG_NAND_DATA8_OFFSET;
+
+        /* Set command delay time, see datasheet for correct value */
+        this->chip_delay = 0;
+        /* Assign the device ready function, if available */
+        this->dev_ready = nand_dev_ready;
+        this->options = 0;
+
+        this->write_buf = bcm_umi_nand_write_buf;
+        this->read_buf = bcm_umi_nand_read_buf;
+        this->verify_buf = bcm_umi_nand_verify_buf;
+
+        this->cmd_ctrl = bcm_umi_nand_hwcontrol;
+        this->ecc.mode = NAND_ECC_HW;
+        this->ecc.size = 512;
+        this->ecc.bytes = NAND_ECC_NUM_BYTES;
+#if NAND_ECC_BCH
+        this->ecc.read_page = bcm_umi_bch_read_page_hwecc;
+        this->ecc.write_page = bcm_umi_bch_write_page_hwecc;
+#else
+        this->ecc.correct = nand_correct_data512;
+        this->ecc.calculate = bcm_umi_hamming_get_hw_ecc;
+        this->ecc.hwctl = bcm_umi_hamming_enable_hwecc;
+#endif
+
+#if USE_DMA
+        err = nand_dma_init();
+        if (err != 0)
+                return err;
+#endif
+
+        /* Figure out the size of the device that we have.
+         * We need to do this to figure out which ECC
+         * layout we'll be using.
+         */
+
+        err = nand_scan_ident(board_mtd, 1);
+        if (err) {
+                printk(KERN_ERR "nand_scan failed: %d\n", err);
+                iounmap(bcm_umi_io_base);
+                kfree(board_mtd);
+                return err;
+        }
+
+        /* Now that we know the nand size, we can setup the ECC layout */
+
+        switch (board_mtd->writesize) { /* writesize is the pagesize */
+        case 4096:
+                this->ecc.layout = &nand_hw_eccoob_4096;
+                break;
+        case 2048:
+                this->ecc.layout = &nand_hw_eccoob_2048;
+                break;
+        case 512:
+                this->ecc.layout = &nand_hw_eccoob_512;
+                break;
+        default:
+                {
+                        printk(KERN_ERR "NAND - Unrecognized pagesize: %d\n",
+                                         board_mtd->writesize);
+                        return -EINVAL;
+                }
+        }
+
+#if NAND_ECC_BCH
+        if (board_mtd->writesize > 512) {
+                if (this->options & NAND_USE_FLASH_BBT)
+                        largepage_bbt.options = NAND_BBT_SCAN2NDPAGE;
+                this->badblock_pattern = &largepage_bbt;
+        }
+#endif
+
+        /* Now finish off the scan, now that ecc.layout has been initialized. */
+
+        err = nand_scan_tail(board_mtd);
+        if (err) {
+                printk(KERN_ERR "nand_scan failed: %d\n", err);
+                iounmap(bcm_umi_io_base);
+                kfree(board_mtd);
+                return err;
+        }
+
+        /* Register the partitions */
+        {
+                int nr_partitions;
+                struct mtd_partition *partition_info;
+
+                board_mtd->name = "bcm_umi-nand";
+                nr_partitions =
+                    parse_mtd_partitions(board_mtd, part_probes,
+                                         &partition_info, 0);
+
+                if (nr_partitions <= 0) {
+                        printk(KERN_ERR "BCM UMI NAND: Too few partitions - %d\n",
+                               nr_partitions);
+                        iounmap(bcm_umi_io_base);
+                        kfree(board_mtd);
+                        return -EIO;
+                }
+                add_mtd_partitions(board_mtd, partition_info, nr_partitions);
+        }
+
+        /* Return happy */
+        return 0;
+}
+
+static int bcm_umi_nand_remove(struct platform_device *pdev)
+{
+#if USE_DMA
+        nand_dma_term();
+#endif
+
+        /* Release resources, unregister device */
+        nand_release(board_mtd);
+
+        /* unmap physical adress */
+        iounmap(bcm_umi_io_base);
+
+        /* Free the MTD device structure */
+        kfree(board_mtd);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int bcm_umi_nand_suspend(struct platform_device *pdev,
+                                pm_message_t state)
+{
+        printk(KERN_ERR "MTD NAND suspend is being called\n");
+        return 0;
+}
+
+static int bcm_umi_nand_resume(struct platform_device *pdev)
+{
+        printk(KERN_ERR "MTD NAND resume is being called\n");
+        return 0;
+}
+#else
+#define bcm_umi_nand_suspend   NULL
+#define bcm_umi_nand_resume    NULL
+#endif
+
+static struct platform_driver nand_driver = {
+        .driver = {
+                   .name = "bcm-nand",
+                   .owner = THIS_MODULE,
+                   },
+        .probe = bcm_umi_nand_probe,
+        .remove = bcm_umi_nand_remove,
+        .suspend = bcm_umi_nand_suspend,
+        .resume = bcm_umi_nand_resume,
+};
+
+static int __init nand_init(void)
+{
+        return platform_driver_register(&nand_driver);
+}
+
+static void __exit nand_exit(void)
+{
+        platform_driver_unregister(&nand_driver);
+}
+
+module_init(nand_init);
+module_exit(nand_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Broadcom");
+MODULE_DESCRIPTION("BCM UMI MTD NAND driver");
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index f13f5b9afaf7..fe3eba87de40 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -591,6 +591,8 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
 
         /* options such as NAND_USE_FLASH_BBT or 16-bit widths */
         info->chip.options      = pdata->options;
+        info->chip.bbt_td       = pdata->bbt_td;
+        info->chip.bbt_md       = pdata->bbt_md;
 
         info->ioaddr            = (uint32_t __force) vaddr;
 
@@ -599,7 +601,7 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
         info->mask_chipsel      = pdata->mask_chipsel;
 
         /* use nandboot-capable ALE/CLE masks by default */
-        info->mask_ale          = pdata->mask_cle ? : MASK_ALE;
+        info->mask_ale          = pdata->mask_ale ? : MASK_ALE;
         info->mask_cle          = pdata->mask_cle ? : MASK_CLE;
 
         /* Set address of hardware control function */
diff --git a/drivers/mtd/nand/excite_nandflash.c b/drivers/mtd/nand/excite_nandflash.c
index 72446fb48d4b..af6a6a5399e1 100644
--- a/drivers/mtd/nand/excite_nandflash.c
+++ b/drivers/mtd/nand/excite_nandflash.c
@@ -128,7 +128,7 @@ static int excite_nand_devready(struct mtd_info *mtd)
  * The binding to the mtd and all allocated
  * resources are released.
  */
-static int __exit excite_nand_remove(struct platform_device *dev)
+static int __devexit excite_nand_remove(struct platform_device *dev)
 {
         struct excite_nand_drvdata * const this = platform_get_drvdata(dev);
 
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index ddd37d2554ed..ae30fb6eed97 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -237,12 +237,15 @@ static int fsl_elbc_run_command(struct mtd_info *mtd)
 
         ctrl->use_mdr = 0;
 
-        dev_vdbg(ctrl->dev,
-                 "fsl_elbc_run_command: stat=%08x mdr=%08x fmr=%08x\n",
-                 ctrl->status, ctrl->mdr, in_be32(&lbc->fmr));
+        if (ctrl->status != LTESR_CC) {
+                dev_info(ctrl->dev,
+                         "command failed: fir %x fcr %x status %x mdr %x\n",
+                         in_be32(&lbc->fir), in_be32(&lbc->fcr),
+                         ctrl->status, ctrl->mdr);
+                return -EIO;
+        }
 
-        /* returns 0 on success otherwise non-zero) */
-        return ctrl->status == LTESR_CC ? 0 : -EIO;
+        return 0;
 }
 
 static void fsl_elbc_do_read(struct nand_chip *chip, int oob)
@@ -253,17 +256,17 @@ static void fsl_elbc_do_read(struct nand_chip *chip, int oob)
 
         if (priv->page_size) {
                 out_be32(&lbc->fir,
-                         (FIR_OP_CW0 << FIR_OP0_SHIFT) |
+                         (FIR_OP_CM0 << FIR_OP0_SHIFT) |
                          (FIR_OP_CA  << FIR_OP1_SHIFT) |
                          (FIR_OP_PA  << FIR_OP2_SHIFT) |
-                         (FIR_OP_CW1 << FIR_OP3_SHIFT) |
+                         (FIR_OP_CM1 << FIR_OP3_SHIFT) |
                          (FIR_OP_RBW << FIR_OP4_SHIFT));
 
                 out_be32(&lbc->fcr, (NAND_CMD_READ0 << FCR_CMD0_SHIFT) |
                                     (NAND_CMD_READSTART << FCR_CMD1_SHIFT));
         } else {
                 out_be32(&lbc->fir,
-                         (FIR_OP_CW0 << FIR_OP0_SHIFT) |
+                         (FIR_OP_CM0 << FIR_OP0_SHIFT) |
                          (FIR_OP_CA  << FIR_OP1_SHIFT) |
                          (FIR_OP_PA  << FIR_OP2_SHIFT) |
                          (FIR_OP_RBW << FIR_OP3_SHIFT));
@@ -332,7 +335,7 @@ static void fsl_elbc_cmdfunc(struct mtd_info *mtd, unsigned int command,
         case NAND_CMD_READID:
                 dev_vdbg(ctrl->dev, "fsl_elbc_cmdfunc: NAND_CMD_READID.\n");
 
-                out_be32(&lbc->fir, (FIR_OP_CW0 << FIR_OP0_SHIFT) |
+                out_be32(&lbc->fir, (FIR_OP_CM0 << FIR_OP0_SHIFT) |
                                     (FIR_OP_UA  << FIR_OP1_SHIFT) |
                                     (FIR_OP_RBW << FIR_OP2_SHIFT));
                 out_be32(&lbc->fcr, NAND_CMD_READID << FCR_CMD0_SHIFT);
@@ -359,16 +362,20 @@ static void fsl_elbc_cmdfunc(struct mtd_info *mtd, unsigned int command,
                 dev_vdbg(ctrl->dev, "fsl_elbc_cmdfunc: NAND_CMD_ERASE2.\n");
 
                 out_be32(&lbc->fir,
-                         (FIR_OP_CW0 << FIR_OP0_SHIFT) |
+                         (FIR_OP_CM0 << FIR_OP0_SHIFT) |
                          (FIR_OP_PA  << FIR_OP1_SHIFT) |
-                         (FIR_OP_CM1 << FIR_OP2_SHIFT));
+                         (FIR_OP_CM2 << FIR_OP2_SHIFT) |
+                         (FIR_OP_CW1 << FIR_OP3_SHIFT) |
+                         (FIR_OP_RS  << FIR_OP4_SHIFT));
 
                 out_be32(&lbc->fcr,
                          (NAND_CMD_ERASE1 << FCR_CMD0_SHIFT) |
-                         (NAND_CMD_ERASE2 << FCR_CMD1_SHIFT));
+                         (NAND_CMD_STATUS << FCR_CMD1_SHIFT) |
+                         (NAND_CMD_ERASE2 << FCR_CMD2_SHIFT));
 
                 out_be32(&lbc->fbcr, 0);
                 ctrl->read_bytes = 0;
+                ctrl->use_mdr = 1;
 
                 fsl_elbc_run_command(mtd);
                 return;
@@ -383,40 +390,41 @@ static void fsl_elbc_cmdfunc(struct mtd_info *mtd, unsigned int command,
 
                 ctrl->column = column;
                 ctrl->oob = 0;
+                ctrl->use_mdr = 1;
 
-                if (priv->page_size) {
-                        fcr = (NAND_CMD_SEQIN << FCR_CMD0_SHIFT) |
-                              (NAND_CMD_PAGEPROG << FCR_CMD1_SHIFT);
+                fcr = (NAND_CMD_STATUS   << FCR_CMD1_SHIFT) |
+                      (NAND_CMD_SEQIN    << FCR_CMD2_SHIFT) |
+                      (NAND_CMD_PAGEPROG << FCR_CMD3_SHIFT);
 
+                if (priv->page_size) {
                         out_be32(&lbc->fir,
-                                 (FIR_OP_CW0 << FIR_OP0_SHIFT) |
+                                 (FIR_OP_CM2 << FIR_OP0_SHIFT) |
                                  (FIR_OP_CA  << FIR_OP1_SHIFT) |
                                  (FIR_OP_PA  << FIR_OP2_SHIFT) |
                                  (FIR_OP_WB  << FIR_OP3_SHIFT) |
-                                 (FIR_OP_CW1 << FIR_OP4_SHIFT));
+                                 (FIR_OP_CM3 << FIR_OP4_SHIFT) |
+                                 (FIR_OP_CW1 << FIR_OP5_SHIFT) |
+                                 (FIR_OP_RS  << FIR_OP6_SHIFT));
                 } else {
-                        fcr = (NAND_CMD_PAGEPROG << FCR_CMD1_SHIFT) |
-                              (NAND_CMD_SEQIN << FCR_CMD2_SHIFT);
-
                         out_be32(&lbc->fir,
-                                 (FIR_OP_CW0 << FIR_OP0_SHIFT) |
+                                 (FIR_OP_CM0 << FIR_OP0_SHIFT) |
                                  (FIR_OP_CM2 << FIR_OP1_SHIFT) |
                                  (FIR_OP_CA  << FIR_OP2_SHIFT) |
                                  (FIR_OP_PA  << FIR_OP3_SHIFT) |
                                  (FIR_OP_WB  << FIR_OP4_SHIFT) |
-                                 (FIR_OP_CW1 << FIR_OP5_SHIFT));
+                                 (FIR_OP_CM3 << FIR_OP5_SHIFT) |
+                                 (FIR_OP_CW1 << FIR_OP6_SHIFT) |
+                                 (FIR_OP_RS  << FIR_OP7_SHIFT));
 
                         if (column >= mtd->writesize) {
                                 /* OOB area --> READOOB */
                                 column -= mtd->writesize;
                                 fcr |= NAND_CMD_READOOB << FCR_CMD0_SHIFT;
                                 ctrl->oob = 1;
-                        } else if (column < 256) {
+                        } else {
+                                WARN_ON(column != 0);
                                 /* First 256 bytes --> READ0 */
                                 fcr |= NAND_CMD_READ0 << FCR_CMD0_SHIFT;
-                        } else {
-                                /* Second 256 bytes --> READ1 */
-                                fcr |= NAND_CMD_READ1 << FCR_CMD0_SHIFT;
                         }
                 }
 
@@ -628,22 +636,6 @@ static int fsl_elbc_wait(struct mtd_info *mtd, struct nand_chip *chip)
 {
         struct fsl_elbc_mtd *priv = chip->priv;
         struct fsl_elbc_ctrl *ctrl = priv->ctrl;
-        struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
-
-        if (ctrl->status != LTESR_CC)
-                return NAND_STATUS_FAIL;
-
-        /* Use READ_STATUS command, but wait for the device to be ready */
-        ctrl->use_mdr = 0;
-        out_be32(&lbc->fir,
-                 (FIR_OP_CW0 << FIR_OP0_SHIFT) |
-                 (FIR_OP_RBW << FIR_OP1_SHIFT));
-        out_be32(&lbc->fcr, NAND_CMD_STATUS << FCR_CMD0_SHIFT);
-        out_be32(&lbc->fbcr, 1);
-        set_addr(mtd, 0, 0, 0);
-        ctrl->read_bytes = 1;
-
-        fsl_elbc_run_command(mtd);
 
         if (ctrl->status != LTESR_CC)
                 return NAND_STATUS_FAIL;
@@ -651,8 +643,7 @@ static int fsl_elbc_wait(struct mtd_info *mtd, struct nand_chip *chip)
         /* The chip always seems to report that it is
          * write-protected, even when it is not.
          */
-        setbits8(ctrl->addr, NAND_STATUS_WP);
-        return fsl_elbc_read_byte(mtd);
+        return (ctrl->mdr & 0xff) | NAND_STATUS_WP;
 }
 
 static int fsl_elbc_chip_init_tail(struct mtd_info *mtd)
@@ -946,6 +937,13 @@ static int __devinit fsl_elbc_ctrl_init(struct fsl_elbc_ctrl *ctrl)
 {
         struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
 
+        /*
+         * NAND transactions can tie up the bus for a long time, so set the
+         * bus timeout to max by clearing LBCR[BMT] (highest base counter
+         * value) and setting LBCR[BMTPS] to the highest prescaler value.
+         */
+        clrsetbits_be32(&lbc->lbcr, LBCR_BMT, 15);
+
         /* clear event registers */
         setbits32(&lbc->ltesr, LTESR_NAND_MASK);
         out_be32(&lbc->lteatr, 0);
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index d120cd8d7267..071a60cb4204 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -112,7 +112,7 @@ static void fun_select_chip(struct mtd_info *mtd, int mchip_nr)
 
         if (mchip_nr == -1) {
                 chip->cmd_ctrl(mtd, NAND_CMD_NONE, 0 | NAND_CTRL_CHANGE);
-        } else if (mchip_nr >= 0) {
+        } else if (mchip_nr >= 0 && mchip_nr < NAND_MAX_CHIPS) {
                 fun->mchip_number = mchip_nr;
                 chip->IO_ADDR_R = fun->io_base + fun->mchip_offsets[mchip_nr];
                 chip->IO_ADDR_W = chip->IO_ADDR_R;
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 65b26d5a5c0d..45dec5770da0 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -33,9 +33,13 @@
 
 #include <asm/mach/flash.h>
 #include <mach/mxc_nand.h>
+#include <mach/hardware.h>
 
 #define DRIVER_NAME "mxc_nand"
 
+#define nfc_is_v21()            (cpu_is_mx25() || cpu_is_mx35())
+#define nfc_is_v1()             (cpu_is_mx31() || cpu_is_mx27())
+
 /* Addresses for NFC registers */
 #define NFC_BUF_SIZE            0xE00
 #define NFC_BUF_ADDR            0xE04
@@ -46,24 +50,14 @@
 #define NFC_RSLTMAIN_AREA       0xE0E
 #define NFC_RSLTSPARE_AREA      0xE10
 #define NFC_WRPROT              0xE12
-#define NFC_UNLOCKSTART_BLKADDR 0xE14
-#define NFC_UNLOCKEND_BLKADDR   0xE16
+#define NFC_V1_UNLOCKSTART_BLKADDR      0xe14
+#define NFC_V1_UNLOCKEND_BLKADDR        0xe16
+#define NFC_V21_UNLOCKSTART_BLKADDR     0xe20
+#define NFC_V21_UNLOCKEND_BLKADDR       0xe22
 #define NFC_NF_WRPRST           0xE18
 #define NFC_CONFIG1             0xE1A
 #define NFC_CONFIG2             0xE1C
 
-/* Addresses for NFC RAM BUFFER Main area 0 */
-#define MAIN_AREA0              0x000
-#define MAIN_AREA1              0x200
-#define MAIN_AREA2              0x400
-#define MAIN_AREA3              0x600
-
-/* Addresses for NFC SPARE BUFFER Spare area 0 */
-#define SPARE_AREA0             0x800
-#define SPARE_AREA1             0x810
-#define SPARE_AREA2             0x820
-#define SPARE_AREA3             0x830
-
 /* Set INT to 0, FCMD to 1, rest to 0 in NFC_CONFIG2 Register
  * for Command operation */
 #define NFC_CMD            0x1
@@ -106,48 +100,66 @@ struct mxc_nand_host {
         struct mtd_partition    *parts;
         struct device           *dev;
 
+        void                    *spare0;
+        void                    *main_area0;
+        void                    *main_area1;
+
+        void __iomem            *base;
         void __iomem            *regs;
-        int                     spare_only;
         int                     status_request;
-        int                     pagesize_2k;
-        uint16_t                col_addr;
         struct clk              *clk;
         int                     clk_act;
         int                     irq;
 
         wait_queue_head_t       irq_waitq;
-};
-
-/* Define delays in microsec for NAND device operations */
-#define TROP_US_DELAY   2000
-/* Macros to get byte and bit positions of ECC */
-#define COLPOS(x)  ((x) >> 3)
-#define BITPOS(x) ((x) & 0xf)
 
-/* Define single bit Error positions in Main & Spare area */
-#define MAIN_SINGLEBIT_ERROR 0x4
-#define SPARE_SINGLEBIT_ERROR 0x1
-
-/* OOB placement block for use with hardware ecc generation */
-static struct nand_ecclayout nand_hw_eccoob_8 = {
-        .eccbytes = 5,
-        .eccpos = {6, 7, 8, 9, 10},
-        .oobfree = {{0, 5}, {11, 5}, }
+        uint8_t                 *data_buf;
+        unsigned int            buf_start;
+        int                     spare_len;
 };
 
-static struct nand_ecclayout nand_hw_eccoob_16 = {
+/* OOB placement block for use with hardware ecc generation */
+static struct nand_ecclayout nandv1_hw_eccoob_smallpage = {
         .eccbytes = 5,
         .eccpos = {6, 7, 8, 9, 10},
-        .oobfree = {{0, 5}, {11, 5}, }
+        .oobfree = {{0, 5}, {12, 4}, }
 };
 
-static struct nand_ecclayout nand_hw_eccoob_64 = {
+static struct nand_ecclayout nandv1_hw_eccoob_largepage = {
         .eccbytes = 20,
         .eccpos = {6, 7, 8, 9, 10, 22, 23, 24, 25, 26,
                    38, 39, 40, 41, 42, 54, 55, 56, 57, 58},
         .oobfree = {{2, 4}, {11, 10}, {27, 10}, {43, 10}, {59, 5}, }
 };
 
+/* OOB description for 512 byte pages with 16 byte OOB */
+static struct nand_ecclayout nandv2_hw_eccoob_smallpage = {
+        .eccbytes = 1 * 9,
+        .eccpos = {
+                 7,  8,  9, 10, 11, 12, 13, 14, 15
+        },
+        .oobfree = {
+                {.offset = 0, .length = 5}
+        }
+};
+
+/* OOB description for 2048 byte pages with 64 byte OOB */
+static struct nand_ecclayout nandv2_hw_eccoob_largepage = {
+        .eccbytes = 4 * 9,
+        .eccpos = {
+                 7,  8,  9, 10, 11, 12, 13, 14, 15,
+                23, 24, 25, 26, 27, 28, 29, 30, 31,
+                39, 40, 41, 42, 43, 44, 45, 46, 47,
+                55, 56, 57, 58, 59, 60, 61, 62, 63
+        },
+        .oobfree = {
+                {.offset = 2, .length = 4},
+                {.offset = 16, .length = 7},
+                {.offset = 32, .length = 7},
+                {.offset = 48, .length = 7}
+        }
+};
+
 #ifdef CONFIG_MTD_PARTITIONS
 static const char *part_probes[] = { "RedBoot", "cmdlinepart", NULL };
 #endif
@@ -170,10 +182,10 @@ static irqreturn_t mxc_nfc_irq(int irq, void *dev_id)
 /* This function polls the NANDFC to wait for the basic operation to
  * complete by checking the INT bit of config2 register.
  */
-static void wait_op_done(struct mxc_nand_host *host, int max_retries,
-                                uint16_t param, int useirq)
+static void wait_op_done(struct mxc_nand_host *host, int useirq)
 {
         uint32_t tmp;
+        int max_retries = 2000;
 
         if (useirq) {
                 if ((readw(host->regs + NFC_CONFIG2) & NFC_INT) == 0) {
@@ -200,8 +212,8 @@ static void wait_op_done(struct mxc_nand_host *host, int max_retries,
                         udelay(1);
                 }
                 if (max_retries < 0)
-                        DEBUG(MTD_DEBUG_LEVEL0, "%s(%d): INT not set\n",
-                              __func__, param);
+                        DEBUG(MTD_DEBUG_LEVEL0, "%s: INT not set\n",
+                              __func__);
         }
 }
 
@@ -215,7 +227,7 @@ static void send_cmd(struct mxc_nand_host *host, uint16_t cmd, int useirq)
         writew(NFC_CMD, host->regs + NFC_CONFIG2);
 
         /* Wait for operation to complete */
-        wait_op_done(host, TROP_US_DELAY, cmd, useirq);
+        wait_op_done(host, useirq);
 }
 
 /* This function sends an address (or partial address) to the
@@ -229,82 +241,47 @@ static void send_addr(struct mxc_nand_host *host, uint16_t addr, int islast)
         writew(NFC_ADDR, host->regs + NFC_CONFIG2);
 
         /* Wait for operation to complete */
-        wait_op_done(host, TROP_US_DELAY, addr, islast);
+        wait_op_done(host, islast);
 }
 
-/* This function requests the NANDFC to initate the transfer
- * of data currently in the NANDFC RAM buffer to the NAND device. */
-static void send_prog_page(struct mxc_nand_host *host, uint8_t buf_id,
-                        int spare_only)
+static void send_page(struct mtd_info *mtd, unsigned int ops)
 {
-        DEBUG(MTD_DEBUG_LEVEL3, "send_prog_page (%d)\n", spare_only);
-
-        /* NANDFC buffer 0 is used for page read/write */
-        writew(buf_id, host->regs + NFC_BUF_ADDR);
-
-        /* Configure spare or page+spare access */
-        if (!host->pagesize_2k) {
-                uint16_t config1 = readw(host->regs + NFC_CONFIG1);
-                if (spare_only)
-                        config1 |= NFC_SP_EN;
-                else
-                        config1 &= ~(NFC_SP_EN);
-                writew(config1, host->regs + NFC_CONFIG1);
-        }
+        struct nand_chip *nand_chip = mtd->priv;
+        struct mxc_nand_host *host = nand_chip->priv;
+        int bufs, i;
 
-        writew(NFC_INPUT, host->regs + NFC_CONFIG2);
+        if (nfc_is_v1() && mtd->writesize > 512)
+                bufs = 4;
+        else
+                bufs = 1;
 
-        /* Wait for operation to complete */
-        wait_op_done(host, TROP_US_DELAY, spare_only, true);
-}
+        for (i = 0; i < bufs; i++) {
 
-/* Requests NANDFC to initated the transfer of data from the
- * NAND device into in the NANDFC ram buffer. */
-static void send_read_page(struct mxc_nand_host *host, uint8_t buf_id,
-                int spare_only)
-{
-        DEBUG(MTD_DEBUG_LEVEL3, "send_read_page (%d)\n", spare_only);
+                /* NANDFC buffer 0 is used for page read/write */
+                writew(i, host->regs + NFC_BUF_ADDR);
 
-        /* NANDFC buffer 0 is used for page read/write */
-        writew(buf_id, host->regs + NFC_BUF_ADDR);
+                writew(ops, host->regs + NFC_CONFIG2);
 
-        /* Configure spare or page+spare access */
-        if (!host->pagesize_2k) {
-                uint32_t config1 = readw(host->regs + NFC_CONFIG1);
-                if (spare_only)
-                        config1 |= NFC_SP_EN;
-                else
-                        config1 &= ~NFC_SP_EN;
-                writew(config1, host->regs + NFC_CONFIG1);
+                /* Wait for operation to complete */
+                wait_op_done(host, true);
         }
-
-        writew(NFC_OUTPUT, host->regs + NFC_CONFIG2);
-
-        /* Wait for operation to complete */
-        wait_op_done(host, TROP_US_DELAY, spare_only, true);
 }
 
 /* Request the NANDFC to perform a read of the NAND device ID. */
 static void send_read_id(struct mxc_nand_host *host)
 {
         struct nand_chip *this = &host->nand;
-        uint16_t tmp;
 
         /* NANDFC buffer 0 is used for device ID output */
         writew(0x0, host->regs + NFC_BUF_ADDR);
 
-        /* Read ID into main buffer */
-        tmp = readw(host->regs + NFC_CONFIG1);
-        tmp &= ~NFC_SP_EN;
-        writew(tmp, host->regs + NFC_CONFIG1);
-
         writew(NFC_ID, host->regs + NFC_CONFIG2);
 
         /* Wait for operation to complete */
-        wait_op_done(host, TROP_US_DELAY, 0, true);
+        wait_op_done(host, true);
 
         if (this->options & NAND_BUSWIDTH_16) {
-                void __iomem *main_buf = host->regs + MAIN_AREA0;
+                void __iomem *main_buf = host->main_area0;
                 /* compress the ID info */
                 writeb(readb(main_buf + 2), main_buf + 1);
                 writeb(readb(main_buf + 4), main_buf + 2);
@@ -312,15 +289,16 @@ static void send_read_id(struct mxc_nand_host *host)
                 writeb(readb(main_buf + 8), main_buf + 4);
                 writeb(readb(main_buf + 10), main_buf + 5);
         }
+        memcpy(host->data_buf, host->main_area0, 16);
 }
 
 /* This function requests the NANDFC to perform a read of the
  * NAND device status and returns the current status. */
 static uint16_t get_dev_status(struct mxc_nand_host *host)
 {
-        void __iomem *main_buf = host->regs + MAIN_AREA1;
+        void __iomem *main_buf = host->main_area1;
         uint32_t store;
-        uint16_t ret, tmp;
+        uint16_t ret;
         /* Issue status request to NAND device */
 
         /* store the main area1 first word, later do recovery */
@@ -329,15 +307,10 @@ static uint16_t get_dev_status(struct mxc_nand_host *host)
          * corruption of read/write buffer on status requests. */
         writew(1, host->regs + NFC_BUF_ADDR);
 
-        /* Read status into main buffer */
-        tmp = readw(host->regs + NFC_CONFIG1);
-        tmp &= ~NFC_SP_EN;
-        writew(tmp, host->regs + NFC_CONFIG1);
-
         writew(NFC_STATUS, host->regs + NFC_CONFIG2);
 
         /* Wait for operation to complete */
-        wait_op_done(host, TROP_US_DELAY, 0, true);
+        wait_op_done(host, true);
 
         /* Status is placed in first word of main buffer */
         /* get status, then recovery area 1 data */
@@ -397,32 +370,14 @@ static u_char mxc_nand_read_byte(struct mtd_info *mtd)
 {
         struct nand_chip *nand_chip = mtd->priv;
         struct mxc_nand_host *host = nand_chip->priv;
-        uint8_t ret = 0;
-        uint16_t col, rd_word;
-        uint16_t __iomem *main_buf = host->regs + MAIN_AREA0;
-        uint16_t __iomem *spare_buf = host->regs + SPARE_AREA0;
+        uint8_t ret;
 
         /* Check for status request */
         if (host->status_request)
                 return get_dev_status(host) & 0xFF;
 
-        /* Get column for 16-bit access */
-        col = host->col_addr >> 1;
-
-        /* If we are accessing the spare region */
-        if (host->spare_only)
-                rd_word = readw(&spare_buf[col]);
-        else
-                rd_word = readw(&main_buf[col]);
-
-        /* Pick upper/lower byte of word from RAM buffer */
-        if (host->col_addr & 0x1)
-                ret = (rd_word >> 8) & 0xFF;
-        else
-                ret = rd_word & 0xFF;
-
-        /* Update saved column address */
-        host->col_addr++;
+        ret = *(uint8_t *)(host->data_buf + host->buf_start);
+        host->buf_start++;
 
         return ret;
 }
@@ -431,33 +386,10 @@ static uint16_t mxc_nand_read_word(struct mtd_info *mtd)
 {
         struct nand_chip *nand_chip = mtd->priv;
         struct mxc_nand_host *host = nand_chip->priv;
-        uint16_t col, rd_word, ret;
-        uint16_t __iomem *p;
-
-        DEBUG(MTD_DEBUG_LEVEL3,
-              "mxc_nand_read_word(col = %d)\n", host->col_addr);
-
-        col = host->col_addr;
-        /* Adjust saved column address */
-        if (col < mtd->writesize && host->spare_only)
-                col += mtd->writesize;
+        uint16_t ret;
 
-        if (col < mtd->writesize)
-                p = (host->regs + MAIN_AREA0) + (col >> 1);
-        else
-                p = (host->regs + SPARE_AREA0) + ((col - mtd->writesize) >> 1);
-
-        if (col & 1) {
-                rd_word = readw(p);
-                ret = (rd_word >> 8) & 0xff;
-                rd_word = readw(&p[1]);
-                ret |= (rd_word << 8) & 0xff00;
-
-        } else
-                ret = readw(p);
-
-        /* Update saved column address */
-        host->col_addr = col + 2;
+        ret = *(uint16_t *)(host->data_buf + host->buf_start);
+        host->buf_start += 2;
 
         return ret;
 }
@@ -470,94 +402,14 @@ static void mxc_nand_write_buf(struct mtd_info *mtd,
 {
         struct nand_chip *nand_chip = mtd->priv;
         struct mxc_nand_host *host = nand_chip->priv;
-        int n, col, i = 0;
-
-        DEBUG(MTD_DEBUG_LEVEL3,
-              "mxc_nand_write_buf(col = %d, len = %d)\n", host->col_addr,
-              len);
-
-        col = host->col_addr;
+        u16 col = host->buf_start;
+        int n = mtd->oobsize + mtd->writesize - col;
 
-        /* Adjust saved column address */
-        if (col < mtd->writesize && host->spare_only)
-                col += mtd->writesize;
+        n = min(n, len);
 
-        n = mtd->writesize + mtd->oobsize - col;
-        n = min(len, n);
-
-        DEBUG(MTD_DEBUG_LEVEL3,
-              "%s:%d: col = %d, n = %d\n", __func__, __LINE__, col, n);
-
-        while (n) {
-                void __iomem *p;
-
-                if (col < mtd->writesize)
-                        p = host->regs + MAIN_AREA0 + (col & ~3);
-                else
-                        p = host->regs + SPARE_AREA0 -
-                                                mtd->writesize + (col & ~3);
-
-                DEBUG(MTD_DEBUG_LEVEL3, "%s:%d: p = %p\n", __func__,
-                      __LINE__, p);
-
-                if (((col | (int)&buf[i]) & 3) || n < 16) {
-                        uint32_t data = 0;
-
-                        if (col & 3 || n < 4)
-                                data = readl(p);
-
-                        switch (col & 3) {
-                        case 0:
-                                if (n) {
-                                        data = (data & 0xffffff00) |
-                                            (buf[i++] << 0);
-                                        n--;
-                                        col++;
-                                }
-                        case 1:
-                                if (n) {
-                                        data = (data & 0xffff00ff) |
-                                            (buf[i++] << 8);
-                                        n--;
-                                        col++;
-                                }
-                        case 2:
-                                if (n) {
-                                        data = (data & 0xff00ffff) |
-                                            (buf[i++] << 16);
-                                        n--;
-                                        col++;
-                                }
-                        case 3:
-                                if (n) {
-                                        data = (data & 0x00ffffff) |
-                                            (buf[i++] << 24);
-                                        n--;
-                                        col++;
-                                }
-                        }
-
-                        writel(data, p);
-                } else {
-                        int m = mtd->writesize - col;
+        memcpy(host->data_buf + col, buf, n);
 
-                        if (col >= mtd->writesize)
-                                m += mtd->oobsize;
-
-                        m = min(n, m) & ~3;
-
-                        DEBUG(MTD_DEBUG_LEVEL3,
-                              "%s:%d: n = %d, m = %d, i = %d, col = %d\n",
-                              __func__,  __LINE__, n, m, i, col);
-
-                        memcpy(p, &buf[i], m);
-                        col += m;
-                        i += m;
-                        n -= m;
-                }
-        }
-        /* Update saved column address */
-        host->col_addr = col;
+        host->buf_start += n;
 }
 
 /* Read the data buffer from the NAND Flash. To read the data from NAND
@@ -568,75 +420,14 @@ static void mxc_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
 {
         struct nand_chip *nand_chip = mtd->priv;
         struct mxc_nand_host *host = nand_chip->priv;
-        int n, col, i = 0;
-
-        DEBUG(MTD_DEBUG_LEVEL3,
-              "mxc_nand_read_buf(col = %d, len = %d)\n", host->col_addr, len);
-
-        col = host->col_addr;
+        u16 col = host->buf_start;
+        int n = mtd->oobsize + mtd->writesize - col;
 
-        /* Adjust saved column address */
-        if (col < mtd->writesize && host->spare_only)
-                col += mtd->writesize;
+        n = min(n, len);
 
-        n = mtd->writesize + mtd->oobsize - col;
-        n = min(len, n);
-
-        while (n) {
-                void __iomem *p;
-
-                if (col < mtd->writesize)
-                        p = host->regs + MAIN_AREA0 + (col & ~3);
-                else
-                        p = host->regs + SPARE_AREA0 -
-                                        mtd->writesize + (col & ~3);
-
-                if (((col | (int)&buf[i]) & 3) || n < 16) {
-                        uint32_t data;
-
-                        data = readl(p);
-                        switch (col & 3) {
-                        case 0:
-                                if (n) {
-                                        buf[i++] = (uint8_t) (data);
-                                        n--;
-                                        col++;
-                                }
-                        case 1:
-                                if (n) {
-                                        buf[i++] = (uint8_t) (data >> 8);
-                                        n--;
-                                        col++;
-                                }
-                        case 2:
-                                if (n) {
-                                        buf[i++] = (uint8_t) (data >> 16);
-                                        n--;
-                                        col++;
-                                }
-                        case 3:
-                                if (n) {
-                                        buf[i++] = (uint8_t) (data >> 24);
-                                        n--;
-                                        col++;
-                                }
-                        }
-                } else {
-                        int m = mtd->writesize - col;
-
-                        if (col >= mtd->writesize)
-                                m += mtd->oobsize;
-
-                        m = min(n, m) & ~3;
-                        memcpy(&buf[i], p, m);
-                        col += m;
-                        i += m;
-                        n -= m;
-                }
-        }
-        /* Update saved column address */
-        host->col_addr = col;
+        memcpy(buf, host->data_buf + col, len);
 
+        host->buf_start += len;
 }
 
 /* Used by the upper layer to verify the data in NAND Flash
@@ -654,23 +445,6 @@ static void mxc_nand_select_chip(struct mtd_info *mtd, int chip)
         struct nand_chip *nand_chip = mtd->priv;
         struct mxc_nand_host *host = nand_chip->priv;
 
-#ifdef CONFIG_MTD_NAND_MXC_FORCE_CE
-        if (chip > 0) {
-                DEBUG(MTD_DEBUG_LEVEL0,
-                      "ERROR:  Illegal chip select (chip = %d)\n", chip);
-                return;
-        }
-
-        if (chip == -1) {
-                writew(readw(host->regs + NFC_CONFIG1) & ~NFC_CE,
-                                host->regs + NFC_CONFIG1);
-                return;
-        }
-
-        writew(readw(host->regs + NFC_CONFIG1) | NFC_CE,
-                        host->regs + NFC_CONFIG1);
-#endif
-
         switch (chip) {
         case -1:
                 /* Disable the NFC clock */
@@ -692,94 +466,40 @@ static void mxc_nand_select_chip(struct mtd_info *mtd, int chip)
         }
 }
 
-/* Used by the upper layer to write command to NAND Flash for
- * different operations to be carried out on NAND Flash */
-static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
-                                int column, int page_addr)
+/*
+ * Function to transfer data to/from spare area.
+ */
+static void copy_spare(struct mtd_info *mtd, bool bfrom)
 {
-        struct nand_chip *nand_chip = mtd->priv;
-        struct mxc_nand_host *host = nand_chip->priv;
-        int useirq = true;
-
-        DEBUG(MTD_DEBUG_LEVEL3,
-              "mxc_nand_command (cmd = 0x%x, col = 0x%x, page = 0x%x)\n",
-              command, column, page_addr);
-
-        /* Reset command state information */
-        host->status_request = false;
-
-        /* Command pre-processing step */
-        switch (command) {
-
-        case NAND_CMD_STATUS:
-                host->col_addr = 0;
-                host->status_request = true;
-                break;
-
-        case NAND_CMD_READ0:
-                host->col_addr = column;
-                host->spare_only = false;
-                useirq = false;
-                break;
-
-        case NAND_CMD_READOOB:
-                host->col_addr = column;
-                host->spare_only = true;
-                useirq = false;
-                if (host->pagesize_2k)
-                        command = NAND_CMD_READ0; /* only READ0 is valid */
-                break;
-
-        case NAND_CMD_SEQIN:
-                if (column >= mtd->writesize) {
-                        /*
-                         * FIXME: before send SEQIN command for write OOB,
-                         * We must read one page out.
-                         * For K9F1GXX has no READ1 command to set current HW
-                         * pointer to spare area, we must write the whole page
-                         * including OOB together.
-                         */
-                        if (host->pagesize_2k)
-                                /* call ourself to read a page */
-                                mxc_nand_command(mtd, NAND_CMD_READ0, 0,
-                                                page_addr);
-
-                        host->col_addr = column - mtd->writesize;
-                        host->spare_only = true;
-
-                        /* Set program pointer to spare region */
-                        if (!host->pagesize_2k)
-                                send_cmd(host, NAND_CMD_READOOB, false);
-                } else {
-                        host->spare_only = false;
-                        host->col_addr = column;
-
-                        /* Set program pointer to page start */
-                        if (!host->pagesize_2k)
-                                send_cmd(host, NAND_CMD_READ0, false);
-                }
-                useirq = false;
-                break;
-
-        case NAND_CMD_PAGEPROG:
-                send_prog_page(host, 0, host->spare_only);
-
-                if (host->pagesize_2k) {
-                        /* data in 4 areas datas */
-                        send_prog_page(host, 1, host->spare_only);
-                        send_prog_page(host, 2, host->spare_only);
-                        send_prog_page(host, 3, host->spare_only);
-                }
-
-                break;
+        struct nand_chip *this = mtd->priv;
+        struct mxc_nand_host *host = this->priv;
+        u16 i, j;
+        u16 n = mtd->writesize >> 9;
+        u8 *d = host->data_buf + mtd->writesize;
+        u8 *s = host->spare0;
+        u16 t = host->spare_len;
+
+        j = (mtd->oobsize / n >> 1) << 1;
+
+        if (bfrom) {
+                for (i = 0; i < n - 1; i++)
+                        memcpy(d + i * j, s + i * t, j);
+
+                /* the last section */
+                memcpy(d + i * j, s + i * t, mtd->oobsize - i * j);
+        } else {
+                for (i = 0; i < n - 1; i++)
+                        memcpy(&s[i * t], &d[i * j], j);
 
-        case NAND_CMD_ERASE1:
-                useirq = false;
-                break;
+                /* the last section */
+                memcpy(&s[i * t], &d[i * j], mtd->oobsize - i * j);
         }
+}
 
-        /* Write out the command to the device. */
-        send_cmd(host, command, useirq);
+static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr)
+{
+        struct nand_chip *nand_chip = mtd->priv;
+        struct mxc_nand_host *host = nand_chip->priv;
 
         /* Write out column address, if necessary */
         if (column != -1) {
@@ -791,7 +511,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
                  * the full page.
                  */
                 send_addr(host, 0, page_addr == -1);
-                if (host->pagesize_2k)
+                if (mtd->writesize > 512)
                         /* another col addr cycle for 2k page */
                         send_addr(host, 0, false);
         }
@@ -801,7 +521,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
                 /* paddr_0 - p_addr_7 */
                 send_addr(host, (page_addr & 0xff), false);
 
-                if (host->pagesize_2k) {
+                if (mtd->writesize > 512) {
                         if (mtd->size >= 0x10000000) {
                                 /* paddr_8 - paddr_15 */
                                 send_addr(host, (page_addr >> 8) & 0xff, false);
@@ -820,52 +540,136 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
                                 send_addr(host, (page_addr >> 8) & 0xff, true);
                 }
         }
+}
+
+/* Used by the upper layer to write command to NAND Flash for
+ * different operations to be carried out on NAND Flash */
+static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
+                                int column, int page_addr)
+{
+        struct nand_chip *nand_chip = mtd->priv;
+        struct mxc_nand_host *host = nand_chip->priv;
+
+        DEBUG(MTD_DEBUG_LEVEL3,
+              "mxc_nand_command (cmd = 0x%x, col = 0x%x, page = 0x%x)\n",
+              command, column, page_addr);
+
+        /* Reset command state information */
+        host->status_request = false;
 
-        /* Command post-processing step */
+        /* Command pre-processing step */
         switch (command) {
 
-        case NAND_CMD_RESET:
+        case NAND_CMD_STATUS:
+                host->buf_start = 0;
+                host->status_request = true;
+
+                send_cmd(host, command, true);
+                mxc_do_addr_cycle(mtd, column, page_addr);
                 break;
 
-        case NAND_CMD_READOOB:
         case NAND_CMD_READ0:
-                if (host->pagesize_2k) {
-                        /* send read confirm command */
+        case NAND_CMD_READOOB:
+                if (command == NAND_CMD_READ0)
+                        host->buf_start = column;
+                else
+                        host->buf_start = column + mtd->writesize;
+
+                if (mtd->writesize > 512)
+                        command = NAND_CMD_READ0; /* only READ0 is valid */
+
+                send_cmd(host, command, false);
+                mxc_do_addr_cycle(mtd, column, page_addr);
+
+                if (mtd->writesize > 512)
                         send_cmd(host, NAND_CMD_READSTART, true);
-                        /* read for each AREA */
-                        send_read_page(host, 0, host->spare_only);
-                        send_read_page(host, 1, host->spare_only);
-                        send_read_page(host, 2, host->spare_only);
-                        send_read_page(host, 3, host->spare_only);
-                } else
-                        send_read_page(host, 0, host->spare_only);
+
+                send_page(mtd, NFC_OUTPUT);
+
+                memcpy(host->data_buf, host->main_area0, mtd->writesize);
+                copy_spare(mtd, true);
                 break;
 
-        case NAND_CMD_READID:
-                host->col_addr = 0;
-                send_read_id(host);
+        case NAND_CMD_SEQIN:
+                if (column >= mtd->writesize) {
+                        /*
+                         * FIXME: before send SEQIN command for write OOB,
+                         * We must read one page out.
+                         * For K9F1GXX has no READ1 command to set current HW
+                         * pointer to spare area, we must write the whole page
+                         * including OOB together.
+                         */
+                        if (mtd->writesize > 512)
+                                /* call ourself to read a page */
+                                mxc_nand_command(mtd, NAND_CMD_READ0, 0,
+                                                page_addr);
+
+                        host->buf_start = column;
+
+                        /* Set program pointer to spare region */
+                        if (mtd->writesize == 512)
+                                send_cmd(host, NAND_CMD_READOOB, false);
+                } else {
+                        host->buf_start = column;
+
+                        /* Set program pointer to page start */
+                        if (mtd->writesize == 512)
+                                send_cmd(host, NAND_CMD_READ0, false);
+                }
+
+                send_cmd(host, command, false);
+                mxc_do_addr_cycle(mtd, column, page_addr);
                 break;
 
         case NAND_CMD_PAGEPROG:
+                memcpy(host->main_area0, host->data_buf, mtd->writesize);
+                copy_spare(mtd, false);
+                send_page(mtd, NFC_INPUT);
+                send_cmd(host, command, true);
+                mxc_do_addr_cycle(mtd, column, page_addr);
                 break;
 
-        case NAND_CMD_STATUS:
+        case NAND_CMD_READID:
+                send_cmd(host, command, true);
+                mxc_do_addr_cycle(mtd, column, page_addr);
+                send_read_id(host);
+                host->buf_start = column;
                 break;
 
+        case NAND_CMD_ERASE1:
         case NAND_CMD_ERASE2:
+                send_cmd(host, command, false);
+                mxc_do_addr_cycle(mtd, column, page_addr);
+
                 break;
         }
 }
 
-/* Define some generic bad / good block scan pattern which are used
- * while scanning a device for factory marked good / bad blocks. */
-static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
+/*
+ * The generic flash bbt decriptors overlap with our ecc
+ * hardware, so define some i.MX specific ones.
+ */
+static uint8_t bbt_pattern[] = { 'B', 'b', 't', '0' };
+static uint8_t mirror_pattern[] = { '1', 't', 'b', 'B' };
+
+static struct nand_bbt_descr bbt_main_descr = {
+        .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
+            | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
+        .offs = 0,
+        .len = 4,
+        .veroffs = 4,
+        .maxblocks = 4,
+        .pattern = bbt_pattern,
+};
 
-static struct nand_bbt_descr smallpage_memorybased = {
-        .options = NAND_BBT_SCAN2NDPAGE,
-        .offs = 5,
-        .len = 1,
-        .pattern = scan_ff_pattern
+static struct nand_bbt_descr bbt_mirror_descr = {
+        .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
+            | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
+        .offs = 0,
+        .len = 4,
+        .veroffs = 4,
+        .maxblocks = 4,
+        .pattern = mirror_pattern,
 };
 
 static int __init mxcnd_probe(struct platform_device *pdev)
@@ -877,12 +681,16 @@ static int __init mxcnd_probe(struct platform_device *pdev)
         struct resource *res;
         uint16_t tmp;
         int err = 0, nr_parts = 0;
+        struct nand_ecclayout *oob_smallpage, *oob_largepage;
 
         /* Allocate memory for MTD device structure and private data */
-        host = kzalloc(sizeof(struct mxc_nand_host), GFP_KERNEL);
+        host = kzalloc(sizeof(struct mxc_nand_host) + NAND_MAX_PAGESIZE +
+                        NAND_MAX_OOBSIZE, GFP_KERNEL);
         if (!host)
                 return -ENOMEM;
 
+        host->data_buf = (uint8_t *)(host + 1);
+
         host->dev = &pdev->dev;
         /* structures must be linked */
         this = &host->nand;
@@ -890,7 +698,7 @@ static int __init mxcnd_probe(struct platform_device *pdev)
         mtd->priv = this;
         mtd->owner = THIS_MODULE;
         mtd->dev.parent = &pdev->dev;
-        mtd->name = "mxc_nand";
+        mtd->name = DRIVER_NAME;
 
         /* 50 us command delay time */
         this->chip_delay = 5;
@@ -920,62 +728,93 @@ static int __init mxcnd_probe(struct platform_device *pdev)
                 goto eres;
         }
 
-        host->regs = ioremap(res->start, res->end - res->start + 1);
-        if (!host->regs) {
+        host->base = ioremap(res->start, resource_size(res));
+        if (!host->base) {
                 err = -ENOMEM;
                 goto eres;
         }
 
+        host->main_area0 = host->base;
+        host->main_area1 = host->base + 0x200;
+
+        if (nfc_is_v21()) {
+                host->regs = host->base + 0x1000;
+                host->spare0 = host->base + 0x1000;
+                host->spare_len = 64;
+                oob_smallpage = &nandv2_hw_eccoob_smallpage;
+                oob_largepage = &nandv2_hw_eccoob_largepage;
+        } else if (nfc_is_v1()) {
+                host->regs = host->base;
+                host->spare0 = host->base + 0x800;
+                host->spare_len = 16;
+                oob_smallpage = &nandv1_hw_eccoob_smallpage;
+                oob_largepage = &nandv1_hw_eccoob_largepage;
+        } else
+                BUG();
+
+        /* disable interrupt and spare enable */
         tmp = readw(host->regs + NFC_CONFIG1);
         tmp |= NFC_INT_MSK;
+        tmp &= ~NFC_SP_EN;
         writew(tmp, host->regs + NFC_CONFIG1);
 
         init_waitqueue_head(&host->irq_waitq);
 
         host->irq = platform_get_irq(pdev, 0);
 
-        err = request_irq(host->irq, mxc_nfc_irq, 0, "mxc_nd", host);
+        err = request_irq(host->irq, mxc_nfc_irq, 0, DRIVER_NAME, host);
         if (err)
                 goto eirq;
 
+        /* Reset NAND */
+        this->cmdfunc(mtd, NAND_CMD_RESET, -1, -1);
+
+        /* preset operation */
+        /* Unlock the internal RAM Buffer */
+        writew(0x2, host->regs + NFC_CONFIG);
+
+        /* Blocks to be unlocked */
+        if (nfc_is_v21()) {
+                writew(0x0, host->regs + NFC_V21_UNLOCKSTART_BLKADDR);
+                writew(0xffff, host->regs + NFC_V21_UNLOCKEND_BLKADDR);
+                this->ecc.bytes = 9;
+        } else if (nfc_is_v1()) {
+                writew(0x0, host->regs + NFC_V1_UNLOCKSTART_BLKADDR);
+                writew(0x4000, host->regs + NFC_V1_UNLOCKEND_BLKADDR);
+                this->ecc.bytes = 3;
+        } else
+                BUG();
+
+        /* Unlock Block Command for given address range */
+        writew(0x4, host->regs + NFC_WRPROT);
+
+        this->ecc.size = 512;
+        this->ecc.layout = oob_smallpage;
+
         if (pdata->hw_ecc) {
                 this->ecc.calculate = mxc_nand_calculate_ecc;
                 this->ecc.hwctl = mxc_nand_enable_hwecc;
                 this->ecc.correct = mxc_nand_correct_data;
                 this->ecc.mode = NAND_ECC_HW;
-                this->ecc.size = 512;
-                this->ecc.bytes = 3;
                 tmp = readw(host->regs + NFC_CONFIG1);
                 tmp |= NFC_ECC_EN;
                 writew(tmp, host->regs + NFC_CONFIG1);
         } else {
-                this->ecc.size = 512;
-                this->ecc.bytes = 3;
-                this->ecc.layout = &nand_hw_eccoob_8;
                 this->ecc.mode = NAND_ECC_SOFT;
                 tmp = readw(host->regs + NFC_CONFIG1);
                 tmp &= ~NFC_ECC_EN;
                 writew(tmp, host->regs + NFC_CONFIG1);
         }
 
-        /* Reset NAND */
-        this->cmdfunc(mtd, NAND_CMD_RESET, -1, -1);
-
-        /* preset operation */
-        /* Unlock the internal RAM Buffer */
-        writew(0x2, host->regs + NFC_CONFIG);
-
-        /* Blocks to be unlocked */
-        writew(0x0, host->regs + NFC_UNLOCKSTART_BLKADDR);
-        writew(0x4000, host->regs + NFC_UNLOCKEND_BLKADDR);
-
-        /* Unlock Block Command for given address range */
-        writew(0x4, host->regs + NFC_WRPROT);
-
         /* NAND bus width determines access funtions used by upper layer */
-        if (pdata->width == 2) {
+        if (pdata->width == 2)
                 this->options |= NAND_BUSWIDTH_16;
-                this->ecc.layout = &nand_hw_eccoob_16;
+
+        if (pdata->flash_bbt) {
+                this->bbt_td = &bbt_main_descr;
+                this->bbt_md = &bbt_mirror_descr;
+                /* update flash based bbt */
+                this->options |= NAND_USE_FLASH_BBT;
         }
 
         /* first scan to find the device and get the page size */
@@ -984,38 +823,8 @@ static int __init mxcnd_probe(struct platform_device *pdev)
                 goto escan;
         }
 
-        if (mtd->writesize == 2048) {
-                host->pagesize_2k = 1;
-                this->badblock_pattern = &smallpage_memorybased;
-        }
-
-        if (this->ecc.mode == NAND_ECC_HW) {
-                switch (mtd->oobsize) {
-                case 8:
-                        this->ecc.layout = &nand_hw_eccoob_8;
-                        break;
-                case 16:
-                        this->ecc.layout = &nand_hw_eccoob_16;
-                        break;
-                case 64:
-                        this->ecc.layout = &nand_hw_eccoob_64;
-                        break;
-                default:
-                        /* page size not handled by HW ECC */
-                        /* switching back to soft ECC */
-                        this->ecc.size = 512;
-                        this->ecc.bytes = 3;
-                        this->ecc.layout = &nand_hw_eccoob_8;
-                        this->ecc.mode = NAND_ECC_SOFT;
-                        this->ecc.calculate = NULL;
-                        this->ecc.correct = NULL;
-                        this->ecc.hwctl = NULL;
-                        tmp = readw(host->regs + NFC_CONFIG1);
-                        tmp &= ~NFC_ECC_EN;
-                        writew(tmp, host->regs + NFC_CONFIG1);
-                        break;
-                }
-        }
+        if (mtd->writesize == 2048)
+                this->ecc.layout = oob_largepage;
 
         /* second phase scan */
         if (nand_scan_tail(mtd)) {
@@ -1043,7 +852,7 @@ static int __init mxcnd_probe(struct platform_device *pdev)
 escan:
         free_irq(host->irq, host);
 eirq:
-        iounmap(host->regs);
+        iounmap(host->base);
 eres:
         clk_put(host->clk);
 eclk:
@@ -1062,7 +871,7 @@ static int __devexit mxcnd_remove(struct platform_device *pdev)
 
         nand_release(&host->mtd);
         free_irq(host->irq, host);
-        iounmap(host->regs);
+        iounmap(host->base);
         kfree(host);
 
         return 0;
@@ -1113,7 +922,7 @@ static struct platform_driver mxcnd_driver = {
         .driver = {
                    .name = DRIVER_NAME,
                    },
-        .remove = __exit_p(mxcnd_remove),
+        .remove = __devexit_p(mxcnd_remove),
         .suspend = mxcnd_suspend,
         .resume = mxcnd_resume,
 };
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 2957cc70da3d..8f2958fe2148 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -428,6 +428,28 @@ static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip,
         return nand_isbad_bbt(mtd, ofs, allowbbt);
 }
 
+/**
+ * panic_nand_wait_ready - [GENERIC] Wait for the ready pin after commands.
+ * @mtd:        MTD device structure
+ * @timeo:      Timeout
+ *
+ * Helper function for nand_wait_ready used when needing to wait in interrupt
+ * context.
+ */
+static void panic_nand_wait_ready(struct mtd_info *mtd, unsigned long timeo)
+{
+        struct nand_chip *chip = mtd->priv;
+        int i;
+
+        /* Wait for the device to get ready */
+        for (i = 0; i < timeo; i++) {
+                if (chip->dev_ready(mtd))
+                        break;
+                touch_softlockup_watchdog();
+                mdelay(1);
+        }
+}
+
 /*
  * Wait for the ready pin, after a command
  * The timeout is catched later.
@@ -437,6 +459,10 @@ void nand_wait_ready(struct mtd_info *mtd)
         struct nand_chip *chip = mtd->priv;
         unsigned long timeo = jiffies + 2;
 
+        /* 400ms timeout */
+        if (in_interrupt() || oops_in_progress)
+                return panic_nand_wait_ready(mtd, 400);
+
         led_trigger_event(nand_led_trigger, LED_FULL);
         /* wait until command is processed or timeout occures */
         do {
@@ -672,6 +698,22 @@ static void nand_command_lp(struct mtd_info *mtd, unsigned int command,
 }
 
 /**
+ * panic_nand_get_device - [GENERIC] Get chip for selected access
+ * @chip:       the nand chip descriptor
+ * @mtd:        MTD device structure
+ * @new_state:  the state which is requested
+ *
+ * Used when in panic, no locks are taken.
+ */
+static void panic_nand_get_device(struct nand_chip *chip,
+                      struct mtd_info *mtd, int new_state)
+{
+        /* Hardware controller shared among independend devices */
+        chip->controller->active = chip;
+        chip->state = new_state;
+}
+
+/**
  * nand_get_device - [GENERIC] Get chip for selected access
  * @chip:       the nand chip descriptor
  * @mtd:        MTD device structure
@@ -698,8 +740,14 @@ nand_get_device(struct nand_chip *chip, struct mtd_info *mtd, int new_state)
                 return 0;
         }
         if (new_state == FL_PM_SUSPENDED) {
-                spin_unlock(lock);
-                return (chip->state == FL_PM_SUSPENDED) ? 0 : -EAGAIN;
+                if (chip->controller->active->state == FL_PM_SUSPENDED) {
+                        chip->state = FL_PM_SUSPENDED;
+                        spin_unlock(lock);
+                        return 0;
+                } else {
+                        spin_unlock(lock);
+                        return -EAGAIN;
+                }
         }
         set_current_state(TASK_UNINTERRUPTIBLE);
         add_wait_queue(wq, &wait);
@@ -710,6 +758,32 @@ nand_get_device(struct nand_chip *chip, struct mtd_info *mtd, int new_state)
 }
 
 /**
+ * panic_nand_wait - [GENERIC]  wait until the command is done
+ * @mtd:        MTD device structure
+ * @chip:       NAND chip structure
+ * @timeo:      Timeout
+ *
+ * Wait for command done. This is a helper function for nand_wait used when
+ * we are in interrupt context. May happen when in panic and trying to write
+ * an oops trough mtdoops.
+ */
+static void panic_nand_wait(struct mtd_info *mtd, struct nand_chip *chip,
+                            unsigned long timeo)
+{
+        int i;
+        for (i = 0; i < timeo; i++) {
+                if (chip->dev_ready) {
+                        if (chip->dev_ready(mtd))
+                                break;
+                } else {
+                        if (chip->read_byte(mtd) & NAND_STATUS_READY)
+                                break;
+                }
+                mdelay(1);
+        }
+}
+
+/**
  * nand_wait - [DEFAULT]  wait until the command is done
  * @mtd:        MTD device structure
  * @chip:       NAND chip structure
@@ -740,15 +814,19 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip)
         else
                 chip->cmdfunc(mtd, NAND_CMD_STATUS, -1, -1);
 
-        while (time_before(jiffies, timeo)) {
-                if (chip->dev_ready) {
-                        if (chip->dev_ready(mtd))
-                                break;
-                } else {
-                        if (chip->read_byte(mtd) & NAND_STATUS_READY)
-                                break;
+        if (in_interrupt() || oops_in_progress)
+                panic_nand_wait(mtd, chip, timeo);
+        else {
+                while (time_before(jiffies, timeo)) {
+                        if (chip->dev_ready) {
+                                if (chip->dev_ready(mtd))
+                                        break;
+                        } else {
+                                if (chip->read_byte(mtd) & NAND_STATUS_READY)
+                                        break;
+                        }
+                        cond_resched();
                 }
-                cond_resched();
         }
         led_trigger_event(nand_led_trigger, LED_OFF);
 
@@ -1949,6 +2027,45 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
 }
 
 /**
+ * panic_nand_write - [MTD Interface] NAND write with ECC
+ * @mtd:        MTD device structure
+ * @to:         offset to write to
+ * @len:        number of bytes to write
+ * @retlen:     pointer to variable to store the number of written bytes
+ * @buf:        the data to write
+ *
+ * NAND write with ECC. Used when performing writes in interrupt context, this
+ * may for example be called by mtdoops when writing an oops while in panic.
+ */
+static int panic_nand_write(struct mtd_info *mtd, loff_t to, size_t len,
+                            size_t *retlen, const uint8_t *buf)
+{
+        struct nand_chip *chip = mtd->priv;
+        int ret;
+
+        /* Do not allow reads past end of device */
+        if ((to + len) > mtd->size)
+                return -EINVAL;
+        if (!len)
+                return 0;
+
+        /* Wait for the device to get ready.  */
+        panic_nand_wait(mtd, chip, 400);
+
+        /* Grab the device.  */
+        panic_nand_get_device(chip, mtd, FL_WRITING);
+
+        chip->ops.len = len;
+        chip->ops.datbuf = (uint8_t *)buf;
+        chip->ops.oobbuf = NULL;
+
+        ret = nand_do_write_ops(mtd, to, &chip->ops);
+
+        *retlen = chip->ops.retlen;
+        return ret;
+}
+
+/**
  * nand_write - [MTD Interface] NAND write with ECC
  * @mtd:        MTD device structure
  * @to:         offset to write to
@@ -2645,7 +2762,8 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips)
         type = nand_get_flash_type(mtd, chip, busw, &nand_maf_id);
 
         if (IS_ERR(type)) {
-                printk(KERN_WARNING "No NAND device found!!!\n");
+                if (!(chip->options & NAND_SCAN_SILENT_NODEV))
+                        printk(KERN_WARNING "No NAND device found.\n");
                 chip->select_chip(mtd, -1);
                 return PTR_ERR(type);
         }
@@ -2877,6 +2995,7 @@ int nand_scan_tail(struct mtd_info *mtd)
         mtd->unpoint = NULL;
         mtd->read = nand_read;
         mtd->write = nand_write;
+        mtd->panic_write = panic_nand_write;
         mtd->read_oob = nand_read_oob;
         mtd->write_oob = nand_write_oob;
         mtd->sync = nand_sync;
diff --git a/drivers/mtd/nand/nand_bcm_umi.c b/drivers/mtd/nand/nand_bcm_umi.c
new file mode 100644
index 000000000000..46a6bc9c4b74
--- /dev/null
+++ b/drivers/mtd/nand/nand_bcm_umi.c
@@ -0,0 +1,149 @@
+/*****************************************************************************
+* Copyright 2004 - 2009 Broadcom Corporation.  All rights reserved.
+*
+* Unless you and Broadcom execute a separate written software license
+* agreement governing use of this software, this software is licensed to you
+* under the terms of the GNU General Public License version 2, available at
+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
+*
+* Notwithstanding the above, under no circumstances may you combine this
+* software in any way with any other Broadcom software provided under a
+* license other than the GPL, without Broadcom's express prior written
+* consent.
+*****************************************************************************/
+
+/* ---- Include Files ---------------------------------------------------- */
+#include <mach/reg_umi.h>
+#include "nand_bcm_umi.h"
+#ifdef BOOT0_BUILD
+#include <uart.h>
+#endif
+
+/* ---- External Variable Declarations ----------------------------------- */
+/* ---- External Function Prototypes ------------------------------------- */
+/* ---- Public Variables ------------------------------------------------- */
+/* ---- Private Constants and Types -------------------------------------- */
+/* ---- Private Function Prototypes -------------------------------------- */
+/* ---- Private Variables ------------------------------------------------ */
+/* ---- Private Functions ------------------------------------------------ */
+
+#if NAND_ECC_BCH
+/****************************************************************************
+*  nand_bch_ecc_flip_bit - Routine to flip an errored bit
+*
+*  PURPOSE:
+*     This is a helper routine that flips the bit (0 -> 1 or 1 -> 0) of the
+*     errored bit specified
+*
+*  PARAMETERS:
+*     datap - Container that holds the 512 byte data
+*     errorLocation - Location of the bit that needs to be flipped
+*
+*  RETURNS:
+*     None
+****************************************************************************/
+static void nand_bcm_umi_bch_ecc_flip_bit(uint8_t *datap, int errorLocation)
+{
+        int locWithinAByte = (errorLocation & REG_UMI_BCH_ERR_LOC_BYTE) >> 0;
+        int locWithinAWord = (errorLocation & REG_UMI_BCH_ERR_LOC_WORD) >> 3;
+        int locWithinAPage = (errorLocation & REG_UMI_BCH_ERR_LOC_PAGE) >> 5;
+
+        uint8_t errorByte = 0;
+        uint8_t byteMask = 1 << locWithinAByte;
+
+        /* BCH uses big endian, need to change the location
+         * bits to little endian */
+        locWithinAWord = 3 - locWithinAWord;
+
+        errorByte = datap[locWithinAPage * sizeof(uint32_t) + locWithinAWord];
+
+#ifdef BOOT0_BUILD
+        puthexs("\nECC Correct Offset: ",
+                locWithinAPage * sizeof(uint32_t) + locWithinAWord);
+        puthexs(" errorByte:", errorByte);
+        puthex8(" Bit: ", locWithinAByte);
+#endif
+
+        if (errorByte & byteMask) {
+                /* bit needs to be cleared */
+                errorByte &= ~byteMask;
+        } else {
+                /* bit needs to be set */
+                errorByte |= byteMask;
+        }
+
+        /* write back the value with the fixed bit */
+        datap[locWithinAPage * sizeof(uint32_t) + locWithinAWord] = errorByte;
+}
+
+/****************************************************************************
+*  nand_correct_page_bch - Routine to correct bit errors when reading NAND
+*
+*  PURPOSE:
+*     This routine reads the BCH registers to determine if there are any bit
+*     errors during the read of the last 512 bytes of data + ECC bytes.  If
+*     errors exists, the routine fixes it.
+*
+*  PARAMETERS:
+*     datap - Container that holds the 512 byte data
+*
+*  RETURNS:
+*     0 or greater = Number of errors corrected
+*                    (No errors are found or errors have been fixed)
+*    -1 = Error(s) cannot be fixed
+****************************************************************************/
+int nand_bcm_umi_bch_correct_page(uint8_t *datap, uint8_t *readEccData,
+                                  int numEccBytes)
+{
+        int numErrors;
+        int errorLocation;
+        int idx;
+        uint32_t regValue;
+
+        /* wait for read ECC to be valid */
+        regValue = nand_bcm_umi_bch_poll_read_ecc_calc();
+
+        /*
+         * read the control status register to determine if there
+         * are error'ed bits
+         * see if errors are correctible
+         */
+        if ((regValue & REG_UMI_BCH_CTRL_STATUS_UNCORR_ERR) > 0) {
+                int i;
+
+                for (i = 0; i < numEccBytes; i++) {
+                        if (readEccData[i] != 0xff) {
+                                /* errors cannot be fixed, return -1 */
+                                return -1;
+                        }
+                }
+                /* If ECC is unprogrammed then we can't correct,
+                 * assume everything OK */
+                return 0;
+        }
+
+        if ((regValue & REG_UMI_BCH_CTRL_STATUS_CORR_ERR) == 0) {
+                /* no errors */
+                return 0;
+        }
+
+        /*
+         * Fix errored bits by doing the following:
+         * 1. Read the number of errors in the control and status register
+         * 2. Read the error location registers that corresponds to the number
+         *    of errors reported
+         * 3. Invert the bit in the data
+         */
+        numErrors = (regValue & REG_UMI_BCH_CTRL_STATUS_NB_CORR_ERROR) >> 20;
+
+        for (idx = 0; idx < numErrors; idx++) {
+                errorLocation =
+                    REG_UMI_BCH_ERR_LOC_ADDR(idx) & REG_UMI_BCH_ERR_LOC_MASK;
+
+                /* Flip bit */
+                nand_bcm_umi_bch_ecc_flip_bit(datap, errorLocation);
+        }
+        /* Errors corrected */
+        return numErrors;
+}
+#endif
diff --git a/drivers/mtd/nand/nand_bcm_umi.h b/drivers/mtd/nand/nand_bcm_umi.h
new file mode 100644
index 000000000000..7cec2cd97854
--- /dev/null
+++ b/drivers/mtd/nand/nand_bcm_umi.h
@@ -0,0 +1,358 @@
+/*****************************************************************************
+* Copyright 2003 - 2009 Broadcom Corporation.  All rights reserved.
+*
+* Unless you and Broadcom execute a separate written software license
+* agreement governing use of this software, this software is licensed to you
+* under the terms of the GNU General Public License version 2, available at
+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
+*
+* Notwithstanding the above, under no circumstances may you combine this
+* software in any way with any other Broadcom software provided under a
+* license other than the GPL, without Broadcom's express prior written
+* consent.
+*****************************************************************************/
+#ifndef NAND_BCM_UMI_H
+#define NAND_BCM_UMI_H
+
+/* ---- Include Files ---------------------------------------------------- */
+#include <mach/reg_umi.h>
+#include <mach/reg_nand.h>
+#include <cfg_global.h>
+
+/* ---- Constants and Types ---------------------------------------------- */
+#if (CFG_GLOBAL_CHIP_FAMILY == CFG_GLOBAL_CHIP_FAMILY_BCMRING)
+#define NAND_ECC_BCH (CFG_GLOBAL_CHIP_REV > 0xA0)
+#else
+#define NAND_ECC_BCH 0
+#endif
+
+#define CFG_GLOBAL_NAND_ECC_BCH_NUM_BYTES       13
+
+#if NAND_ECC_BCH
+#ifdef BOOT0_BUILD
+#define NAND_ECC_NUM_BYTES 13
+#else
+#define NAND_ECC_NUM_BYTES CFG_GLOBAL_NAND_ECC_BCH_NUM_BYTES
+#endif
+#else
+#define NAND_ECC_NUM_BYTES 3
+#endif
+
+#define NAND_DATA_ACCESS_SIZE 512
+
+/* ---- Variable Externs ------------------------------------------ */
+/* ---- Function Prototypes --------------------------------------- */
+int nand_bcm_umi_bch_correct_page(uint8_t *datap, uint8_t *readEccData,
+                                  int numEccBytes);
+
+/* Check in device is ready */
+static inline int nand_bcm_umi_dev_ready(void)
+{
+        return REG_UMI_NAND_RCSR & REG_UMI_NAND_RCSR_RDY;
+}
+
+/* Wait until device is ready */
+static inline void nand_bcm_umi_wait_till_ready(void)
+{
+        while (nand_bcm_umi_dev_ready() == 0)
+                ;
+}
+
+/* Enable Hamming ECC */
+static inline void nand_bcm_umi_hamming_enable_hwecc(void)
+{
+        /* disable and reset ECC, 512 byte page */
+        REG_UMI_NAND_ECC_CSR &= ~(REG_UMI_NAND_ECC_CSR_ECC_ENABLE |
+                REG_UMI_NAND_ECC_CSR_256BYTE);
+        /* enable ECC */
+        REG_UMI_NAND_ECC_CSR |= REG_UMI_NAND_ECC_CSR_ECC_ENABLE;
+}
+
+#if NAND_ECC_BCH
+/* BCH ECC specifics */
+#define ECC_BITS_PER_CORRECTABLE_BIT 13
+
+/* Enable BCH Read ECC */
+static inline void nand_bcm_umi_bch_enable_read_hwecc(void)
+{
+        /* disable and reset ECC */
+        REG_UMI_BCH_CTRL_STATUS = REG_UMI_BCH_CTRL_STATUS_RD_ECC_VALID;
+        /* Turn on ECC */
+        REG_UMI_BCH_CTRL_STATUS = REG_UMI_BCH_CTRL_STATUS_ECC_RD_EN;
+}
+
+/* Enable BCH Write ECC */
+static inline void nand_bcm_umi_bch_enable_write_hwecc(void)
+{
+        /* disable and reset ECC */
+        REG_UMI_BCH_CTRL_STATUS = REG_UMI_BCH_CTRL_STATUS_WR_ECC_VALID;
+        /* Turn on ECC */
+        REG_UMI_BCH_CTRL_STATUS = REG_UMI_BCH_CTRL_STATUS_ECC_WR_EN;
+}
+
+/* Config number of BCH ECC bytes */
+static inline void nand_bcm_umi_bch_config_ecc(uint8_t numEccBytes)
+{
+        uint32_t nValue;
+        uint32_t tValue;
+        uint32_t kValue;
+        uint32_t numBits = numEccBytes * 8;
+
+        /* disable and reset ECC */
+        REG_UMI_BCH_CTRL_STATUS =
+            REG_UMI_BCH_CTRL_STATUS_WR_ECC_VALID |
+            REG_UMI_BCH_CTRL_STATUS_RD_ECC_VALID;
+
+        /* Every correctible bit requires 13 ECC bits */
+        tValue = (uint32_t) (numBits / ECC_BITS_PER_CORRECTABLE_BIT);
+
+        /* Total data in number of bits for generating and computing BCH ECC */
+        nValue = (NAND_DATA_ACCESS_SIZE + numEccBytes) * 8;
+
+        /* K parameter is used internally.  K = N - (T * 13) */
+        kValue = nValue - (tValue * ECC_BITS_PER_CORRECTABLE_BIT);
+
+        /* Write the settings */
+        REG_UMI_BCH_N = nValue;
+        REG_UMI_BCH_T = tValue;
+        REG_UMI_BCH_K = kValue;
+}
+
+/* Pause during ECC read calculation to skip bytes in OOB */
+static inline void nand_bcm_umi_bch_pause_read_ecc_calc(void)
+{
+        REG_UMI_BCH_CTRL_STATUS =
+            REG_UMI_BCH_CTRL_STATUS_ECC_RD_EN |
+            REG_UMI_BCH_CTRL_STATUS_PAUSE_ECC_DEC;
+}
+
+/* Resume during ECC read calculation after skipping bytes in OOB */
+static inline void nand_bcm_umi_bch_resume_read_ecc_calc(void)
+{
+        REG_UMI_BCH_CTRL_STATUS = REG_UMI_BCH_CTRL_STATUS_ECC_RD_EN;
+}
+
+/* Poll read ECC calc to check when hardware completes */
+static inline uint32_t nand_bcm_umi_bch_poll_read_ecc_calc(void)
+{
+        uint32_t regVal;
+
+        do {
+                /* wait for ECC to be valid */
+                regVal = REG_UMI_BCH_CTRL_STATUS;
+        } while ((regVal & REG_UMI_BCH_CTRL_STATUS_RD_ECC_VALID) == 0);
+
+        return regVal;
+}
+
+/* Poll write ECC calc to check when hardware completes */
+static inline void nand_bcm_umi_bch_poll_write_ecc_calc(void)
+{
+        /* wait for ECC to be valid */
+        while ((REG_UMI_BCH_CTRL_STATUS & REG_UMI_BCH_CTRL_STATUS_WR_ECC_VALID)
+               == 0)
+                ;
+}
+
+/* Read the OOB and ECC, for kernel write OOB to a buffer */
+#if defined(__KERNEL__) && !defined(STANDALONE)
+static inline void nand_bcm_umi_bch_read_oobEcc(uint32_t pageSize,
+        uint8_t *eccCalc, int numEccBytes, uint8_t *oobp)
+#else
+static inline void nand_bcm_umi_bch_read_oobEcc(uint32_t pageSize,
+        uint8_t *eccCalc, int numEccBytes)
+#endif
+{
+        int eccPos = 0;
+        int numToRead = 16;     /* There are 16 bytes per sector in the OOB */
+
+        /* ECC is already paused when this function is called */
+
+        if (pageSize == NAND_DATA_ACCESS_SIZE) {
+                while (numToRead > numEccBytes) {
+                        /* skip free oob region */
+#if defined(__KERNEL__) && !defined(STANDALONE)
+                        *oobp++ = REG_NAND_DATA8;
+#else
+                        REG_NAND_DATA8;
+#endif
+                        numToRead--;
+                }
+
+                /* read ECC bytes before BI */
+                nand_bcm_umi_bch_resume_read_ecc_calc();
+
+                while (numToRead > 11) {
+#if defined(__KERNEL__) && !defined(STANDALONE)
+                        *oobp = REG_NAND_DATA8;
+                        eccCalc[eccPos++] = *oobp;
+                        oobp++;
+#else
+                        eccCalc[eccPos++] = REG_NAND_DATA8;
+#endif
+                }
+
+                nand_bcm_umi_bch_pause_read_ecc_calc();
+
+                if (numToRead == 11) {
+                        /* read BI */
+#if defined(__KERNEL__) && !defined(STANDALONE)
+                        *oobp++ = REG_NAND_DATA8;
+#else
+                        REG_NAND_DATA8;
+#endif
+                        numToRead--;
+                }
+
+                /* read ECC bytes */
+                nand_bcm_umi_bch_resume_read_ecc_calc();
+                while (numToRead) {
+#if defined(__KERNEL__) && !defined(STANDALONE)
+                        *oobp = REG_NAND_DATA8;
+                        eccCalc[eccPos++] = *oobp;
+                        oobp++;
+#else
+                        eccCalc[eccPos++] = REG_NAND_DATA8;
+#endif
+                        numToRead--;
+                }
+        } else {
+                /* skip BI */
+#if defined(__KERNEL__) && !defined(STANDALONE)
+                *oobp++ = REG_NAND_DATA8;
+#else
+                REG_NAND_DATA8;
+#endif
+                numToRead--;
+
+                while (numToRead > numEccBytes) {
+                        /* skip free oob region */
+#if defined(__KERNEL__) && !defined(STANDALONE)
+                        *oobp++ = REG_NAND_DATA8;
+#else
+                        REG_NAND_DATA8;
+#endif
+                        numToRead--;
+                }
+
+                /* read ECC bytes */
+                nand_bcm_umi_bch_resume_read_ecc_calc();
+                while (numToRead) {
+#if defined(__KERNEL__) && !defined(STANDALONE)
+                        *oobp = REG_NAND_DATA8;
+                        eccCalc[eccPos++] = *oobp;
+                        oobp++;
+#else
+                        eccCalc[eccPos++] = REG_NAND_DATA8;
+#endif
+                        numToRead--;
+                }
+        }
+}
+
+/* Helper function to write ECC */
+static inline void NAND_BCM_UMI_ECC_WRITE(int numEccBytes, int eccBytePos,
+                                          uint8_t *oobp, uint8_t eccVal)
+{
+        if (eccBytePos <= numEccBytes)
+                *oobp = eccVal;
+}
+
+/* Write OOB with ECC */
+static inline void nand_bcm_umi_bch_write_oobEcc(uint32_t pageSize,
+                                                 uint8_t *oobp, int numEccBytes)
+{
+        uint32_t eccVal = 0xffffffff;
+
+        /* wait for write ECC to be valid */
+        nand_bcm_umi_bch_poll_write_ecc_calc();
+
+        /*
+         ** Get the hardware ecc from the 32-bit result registers.
+         ** Read after 512 byte accesses. Format B3B2B1B0
+         ** where B3 = ecc3, etc.
+         */
+
+        if (pageSize == NAND_DATA_ACCESS_SIZE) {
+                /* Now fill in the ECC bytes */
+                if (numEccBytes >= 13)
+                        eccVal = REG_UMI_BCH_WR_ECC_3;
+
+                /* Usually we skip CM in oob[0,1] */
+                NAND_BCM_UMI_ECC_WRITE(numEccBytes, 15, &oobp[0],
+                        (eccVal >> 16) & 0xff);
+                NAND_BCM_UMI_ECC_WRITE(numEccBytes, 14, &oobp[1],
+                        (eccVal >> 8) & 0xff);
+
+                /* Write ECC in oob[2,3,4] */
+                NAND_BCM_UMI_ECC_WRITE(numEccBytes, 13, &oobp[2],
+                        eccVal & 0xff); /* ECC 12 */
+
+                if (numEccBytes >= 9)
+                        eccVal = REG_UMI_BCH_WR_ECC_2;
+
+                NAND_BCM_UMI_ECC_WRITE(numEccBytes, 12, &oobp[3],
+                        (eccVal >> 24) & 0xff); /* ECC11 */
+                NAND_BCM_UMI_ECC_WRITE(numEccBytes, 11, &oobp[4],
+                        (eccVal >> 16) & 0xff); /* ECC10 */
+
+                /* Always Skip BI in oob[5] */
+        } else {
+                /* Always Skip BI in oob[0] */
+
+                /* Now fill in the ECC bytes */
+                if (numEccBytes >= 13)
+                        eccVal = REG_UMI_BCH_WR_ECC_3;
+
+                /* Usually skip CM in oob[1,2] */
+                NAND_BCM_UMI_ECC_WRITE(numEccBytes, 15, &oobp[1],
+                        (eccVal >> 16) & 0xff);
+                NAND_BCM_UMI_ECC_WRITE(numEccBytes, 14, &oobp[2],
+                        (eccVal >> 8) & 0xff);
+
+                /* Write ECC in oob[3-15] */
+                NAND_BCM_UMI_ECC_WRITE(numEccBytes, 13, &oobp[3],
+                        eccVal & 0xff); /* ECC12 */
+
+                if (numEccBytes >= 9)
+                        eccVal = REG_UMI_BCH_WR_ECC_2;
+
+                NAND_BCM_UMI_ECC_WRITE(numEccBytes, 12, &oobp[4],
+                        (eccVal >> 24) & 0xff); /* ECC11 */
+                NAND_BCM_UMI_ECC_WRITE(numEccBytes, 11, &oobp[5],
+                        (eccVal >> 16) & 0xff); /* ECC10 */
+        }
+
+        /* Fill in the remainder of ECC locations */
+        NAND_BCM_UMI_ECC_WRITE(numEccBytes, 10, &oobp[6],
+                (eccVal >> 8) & 0xff);  /* ECC9 */
+        NAND_BCM_UMI_ECC_WRITE(numEccBytes, 9, &oobp[7],
+                eccVal & 0xff); /* ECC8 */
+
+        if (numEccBytes >= 5)
+                eccVal = REG_UMI_BCH_WR_ECC_1;
+
+        NAND_BCM_UMI_ECC_WRITE(numEccBytes, 8, &oobp[8],
+                (eccVal >> 24) & 0xff); /* ECC7 */
+        NAND_BCM_UMI_ECC_WRITE(numEccBytes, 7, &oobp[9],
+                (eccVal >> 16) & 0xff); /* ECC6 */
+        NAND_BCM_UMI_ECC_WRITE(numEccBytes, 6, &oobp[10],
+                (eccVal >> 8) & 0xff);  /* ECC5 */
+        NAND_BCM_UMI_ECC_WRITE(numEccBytes, 5, &oobp[11],
+                eccVal & 0xff); /* ECC4 */
+
+        if (numEccBytes >= 1)
+                eccVal = REG_UMI_BCH_WR_ECC_0;
+
+        NAND_BCM_UMI_ECC_WRITE(numEccBytes, 4, &oobp[12],
+                (eccVal >> 24) & 0xff); /* ECC3 */
+        NAND_BCM_UMI_ECC_WRITE(numEccBytes, 3, &oobp[13],
+                (eccVal >> 16) & 0xff); /* ECC2 */
+        NAND_BCM_UMI_ECC_WRITE(numEccBytes, 2, &oobp[14],
+                (eccVal >> 8) & 0xff);  /* ECC1 */
+        NAND_BCM_UMI_ECC_WRITE(numEccBytes, 1, &oobp[15],
+                eccVal & 0xff); /* ECC0 */
+}
+#endif
+
+#endif /* NAND_BCM_UMI_H */
diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
index 92320a643275..271b8e735e8f 100644
--- a/drivers/mtd/nand/nand_ecc.c
+++ b/drivers/mtd/nand/nand_ecc.c
@@ -150,20 +150,19 @@ static const char addressbits[256] = {
 };
 
 /**
- * nand_calculate_ecc - [NAND Interface] Calculate 3-byte ECC for 256/512-byte
+ * __nand_calculate_ecc - [NAND Interface] Calculate 3-byte ECC for 256/512-byte
  *                       block
- * @mtd:        MTD block structure
  * @buf:        input buffer with raw data
+ * @eccsize:    data bytes per ecc step (256 or 512)
  * @code:       output buffer with ECC
  */
-int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf,
+void __nand_calculate_ecc(const unsigned char *buf, unsigned int eccsize,
                        unsigned char *code)
 {
         int i;
         const uint32_t *bp = (uint32_t *)buf;
         /* 256 or 512 bytes/ecc  */
-        const uint32_t eccsize_mult =
-                        (((struct nand_chip *)mtd->priv)->ecc.size) >> 8;
+        const uint32_t eccsize_mult = eccsize >> 8;
         uint32_t cur;           /* current value in buffer */
         /* rp0..rp15..rp17 are the various accumulated parities (per byte) */
         uint32_t rp0, rp1, rp2, rp3, rp4, rp5, rp6, rp7;
@@ -412,6 +411,22 @@ int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf,
                     (invparity[par & 0x55] << 2) |
                     (invparity[rp17] << 1) |
                     (invparity[rp16] << 0);
+}
+EXPORT_SYMBOL(__nand_calculate_ecc);
+
+/**
+ * nand_calculate_ecc - [NAND Interface] Calculate 3-byte ECC for 256/512-byte
+ *                       block
+ * @mtd:        MTD block structure
+ * @buf:        input buffer with raw data
+ * @code:       output buffer with ECC
+ */
+int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf,
+                       unsigned char *code)
+{
+        __nand_calculate_ecc(buf,
+                        ((struct nand_chip *)mtd->priv)->ecc.size, code);
+
         return 0;
 }
 EXPORT_SYMBOL(nand_calculate_ecc);
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index cd0711b83ac4..7281000fef2d 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -161,7 +161,7 @@ MODULE_PARM_DESC(overridesize,   "Specifies the NAND Flash size overriding the I
 MODULE_PARM_DESC(cache_file,     "File to use to cache nand pages instead of memory");
 
 /* The largest possible page size */
-#define NS_LARGEST_PAGE_SIZE    2048
+#define NS_LARGEST_PAGE_SIZE    4096
 
 /* The prefix for simulator output */
 #define NS_OUTPUT_PREFIX "[nandsim]"
@@ -259,7 +259,8 @@ MODULE_PARM_DESC(cache_file,     "File to use to cache nand pages instead of mem
 #define OPT_SMARTMEDIA   0x00000010 /* SmartMedia technology chips */
 #define OPT_AUTOINCR     0x00000020 /* page number auto inctimentation is possible */
 #define OPT_PAGE512_8BIT 0x00000040 /* 512-byte page chips with 8-bit bus width */
-#define OPT_LARGEPAGE    (OPT_PAGE2048) /* 2048-byte page chips */
+#define OPT_PAGE4096     0x00000080 /* 4096-byte page chips */
+#define OPT_LARGEPAGE    (OPT_PAGE2048 | OPT_PAGE4096) /* 2048 & 4096-byte page chips */
 #define OPT_SMALLPAGE    (OPT_PAGE256  | OPT_PAGE512)  /* 256 and 512-byte page chips */
 
 /* Remove action bits ftom state */
@@ -588,6 +589,8 @@ static int init_nandsim(struct mtd_info *mtd)
                         ns->options |= OPT_PAGE512_8BIT;
         } else if (ns->geom.pgsz == 2048) {
                 ns->options |= OPT_PAGE2048;
+        } else if (ns->geom.pgsz == 4096) {
+                ns->options |= OPT_PAGE4096;
         } else {
                 NS_ERR("init_nandsim: unknown page size %u\n", ns->geom.pgsz);
                 return -EIO;
diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c
index 7c302d55910e..66123419f65d 100644
--- a/drivers/mtd/nand/nomadik_nand.c
+++ b/drivers/mtd/nand/nomadik_nand.c
@@ -216,7 +216,7 @@ static int nomadik_nand_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops nomadik_nand_pm_ops = {
+static const struct dev_pm_ops nomadik_nand_pm_ops = {
         .suspend = nomadik_nand_suspend,
         .resume = nomadik_nand_resume,
 };
diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 4e16c6f5bdd5..8d467315f02b 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -34,7 +34,12 @@ static int __devinit plat_nand_probe(struct platform_device *pdev)
 {
         struct platform_nand_data *pdata = pdev->dev.platform_data;
         struct plat_nand_data *data;
-        int res = 0;
+        struct resource *res;
+        int err = 0;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -ENXIO;
 
         /* Allocate memory for the device structure (and zero it) */
         data = kzalloc(sizeof(struct plat_nand_data), GFP_KERNEL);
@@ -43,12 +48,18 @@ static int __devinit plat_nand_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
-        data->io_base = ioremap(pdev->resource[0].start,
-                                pdev->resource[0].end - pdev->resource[0].start + 1);
+        if (!request_mem_region(res->start, resource_size(res),
+                                dev_name(&pdev->dev))) {
+                dev_err(&pdev->dev, "request_mem_region failed\n");
+                err = -EBUSY;
+                goto out_free;
+        }
+
+        data->io_base = ioremap(res->start, resource_size(res));
         if (data->io_base == NULL) {
                 dev_err(&pdev->dev, "ioremap failed\n");
-                kfree(data);
-                return -EIO;
+                err = -EIO;
+                goto out_release_io;
         }
 
         data->chip.priv = &data;
@@ -74,24 +85,24 @@ static int __devinit plat_nand_probe(struct platform_device *pdev)
 
         /* Handle any platform specific setup */
         if (pdata->ctrl.probe) {
-                res = pdata->ctrl.probe(pdev);
-                if (res)
+                err = pdata->ctrl.probe(pdev);
+                if (err)
                         goto out;
         }
 
         /* Scan to find existance of the device */
         if (nand_scan(&data->mtd, 1)) {
-                res = -ENXIO;
+                err = -ENXIO;
                 goto out;
         }
 
 #ifdef CONFIG_MTD_PARTITIONS
         if (pdata->chip.part_probe_types) {
-                res = parse_mtd_partitions(&data->mtd,
+                err = parse_mtd_partitions(&data->mtd,
                                         pdata->chip.part_probe_types,
                                         &data->parts, 0);
-                if (res > 0) {
-                        add_mtd_partitions(&data->mtd, data->parts, res);
+                if (err > 0) {
+                        add_mtd_partitions(&data->mtd, data->parts, err);
                         return 0;
                 }
         }
@@ -99,14 +110,14 @@ static int __devinit plat_nand_probe(struct platform_device *pdev)
                 pdata->chip.set_parts(data->mtd.size, &pdata->chip);
         if (pdata->chip.partitions) {
                 data->parts = pdata->chip.partitions;
-                res = add_mtd_partitions(&data->mtd, data->parts,
+                err = add_mtd_partitions(&data->mtd, data->parts,
                         pdata->chip.nr_partitions);
         } else
 #endif
-        res = add_mtd_device(&data->mtd);
+        err = add_mtd_device(&data->mtd);
 
-        if (!res)
-                return res;
+        if (!err)
+                return err;
 
         nand_release(&data->mtd);
 out:
@@ -114,8 +125,11 @@ out:
                 pdata->ctrl.remove(pdev);
         platform_set_drvdata(pdev, NULL);
         iounmap(data->io_base);
+out_release_io:
+        release_mem_region(res->start, resource_size(res));
+out_free:
         kfree(data);
-        return res;
+        return err;
 }
 
 /*
@@ -125,6 +139,9 @@ static int __devexit plat_nand_remove(struct platform_device *pdev)
 {
         struct plat_nand_data *data = platform_get_drvdata(pdev);
         struct platform_nand_data *pdata = pdev->dev.platform_data;
+        struct resource *res;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
         nand_release(&data->mtd);
 #ifdef CONFIG_MTD_PARTITIONS
@@ -134,6 +151,7 @@ static int __devexit plat_nand_remove(struct platform_device *pdev)
         if (pdata->ctrl.remove)
                 pdata->ctrl.remove(pdev);
         iounmap(data->io_base);
+        release_mem_region(res->start, resource_size(res));
         kfree(data);
 
         return 0;
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 68b5b3a486a9..fa6e9c7fe511 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -774,7 +774,7 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
         chip->select_chip  = s3c2410_nand_select_chip;
         chip->chip_delay   = 50;
         chip->priv         = nmtd;
-        chip->options      = 0;
+        chip->options      = set->options;
         chip->controller   = &info->controller;
 
         switch (info->cpu_type) {
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 73af8324d0d0..863513c3b69a 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -429,11 +429,10 @@ static int __exit txx9ndfmc_remove(struct platform_device *dev)
                 chip = mtd->priv;
                 txx9_priv = chip->priv;
 
+                nand_release(mtd);
 #ifdef CONFIG_MTD_PARTITIONS
-                del_mtd_partitions(mtd);
                 kfree(drvdata->parts[i]);
 #endif
-                del_mtd_device(mtd);
                 kfree(txx9_priv->mtdname);
                 kfree(txx9_priv);
         }
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 86c4f6dcdc65..75f38b95811e 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -112,10 +112,24 @@ static int omap2_onenand_wait(struct mtd_info *mtd, int state)
         unsigned long timeout;
         u32 syscfg;
 
-        if (state == FL_RESETING) {
-                int i;
+        if (state == FL_RESETING || state == FL_PREPARING_ERASE ||
+            state == FL_VERIFYING_ERASE) {
+                int i = 21;
+                unsigned int intr_flags = ONENAND_INT_MASTER;
+
+                switch (state) {
+                case FL_RESETING:
+                        intr_flags |= ONENAND_INT_RESET;
+                        break;
+                case FL_PREPARING_ERASE:
+                        intr_flags |= ONENAND_INT_ERASE;
+                        break;
+                case FL_VERIFYING_ERASE:
+                        i = 101;
+                        break;
+                }
 
-                for (i = 0; i < 20; i++) {
+                while (--i) {
                         udelay(1);
                         intr = read_reg(c, ONENAND_REG_INTERRUPT);
                         if (intr & ONENAND_INT_MASTER)
@@ -126,7 +140,7 @@ static int omap2_onenand_wait(struct mtd_info *mtd, int state)
                         wait_err("controller error", state, ctrl, intr);
                         return -EIO;
                 }
-                if (!(intr & ONENAND_INT_RESET)) {
+                if ((intr & intr_flags) != intr_flags) {
                         wait_err("timeout", state, ctrl, intr);
                         return -EIO;
                 }
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index ff66e4330aa7..f63b1db3ffb3 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -1,17 +1,19 @@
 /*
  *  linux/drivers/mtd/onenand/onenand_base.c
  *
- *  Copyright (C) 2005-2007 Samsung Electronics
+ *  Copyright © 2005-2009 Samsung Electronics
+ *  Copyright © 2007 Nokia Corporation
+ *
  *  Kyungmin Park <kyungmin.park@samsung.com>
  *
  *  Credits:
  *      Adrian Hunter <ext-adrian.hunter@nokia.com>:
  *      auto-placement support, read-while load support, various fixes
- *      Copyright (C) Nokia Corporation, 2007
  *
  *      Vishak G <vishak.g at samsung.com>, Rohit Hagargundgi <h.rohit at samsung.com>
  *      Flex-OneNAND support
- *      Copyright (C) Samsung Electronics, 2008
+ *      Amul Kumar Saha <amul.saha at samsung.com>
+ *      OTP support
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -32,6 +34,13 @@
 
 #include <asm/io.h>
 
+/*
+ * Multiblock erase if number of blocks to erase is 2 or more.
+ * Maximum number of blocks for simultaneous erase is 64.
+ */
+#define MB_ERASE_MIN_BLK_COUNT 2
+#define MB_ERASE_MAX_BLK_COUNT 64
+
 /* Default Flex-OneNAND boundary and lock respectively */
 static int flex_bdry[MAX_DIES * 2] = { -1, 0, -1, 0 };
 
@@ -43,6 +52,18 @@ MODULE_PARM_DESC(flex_bdry,	"SLC Boundary information for Flex-OneNAND"
                                 "    : 0->Set boundary in unlocked status"
                                 "    : 1->Set boundary in locked status");
 
+/* Default OneNAND/Flex-OneNAND OTP options*/
+static int otp;
+
+module_param(otp, int, 0400);
+MODULE_PARM_DESC(otp,   "Corresponding behaviour of OneNAND in OTP"
+                        "Syntax : otp=LOCK_TYPE"
+                        "LOCK_TYPE : Keys issued, for specific OTP Lock type"
+                        "          : 0 -> Default (No Blocks Locked)"
+                        "          : 1 -> OTP Block lock"
+                        "          : 2 -> 1st Block lock"
+                        "          : 3 -> BOTH OTP Block and 1st Block lock");
+
 /**
  *  onenand_oob_128 - oob info for Flex-Onenand with 4KB page
  *  For now, we expose only 64 out of 80 ecc bytes
@@ -339,6 +360,8 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le
                 break;
 
         case ONENAND_CMD_ERASE:
+        case ONENAND_CMD_MULTIBLOCK_ERASE:
+        case ONENAND_CMD_ERASE_VERIFY:
         case ONENAND_CMD_BUFFERRAM:
         case ONENAND_CMD_OTP_ACCESS:
                 block = onenand_block(this, addr);
@@ -483,7 +506,7 @@ static int onenand_wait(struct mtd_info *mtd, int state)
                 if (interrupt & flags)
                         break;
 
-                if (state != FL_READING)
+                if (state != FL_READING && state != FL_PREPARING_ERASE)
                         cond_resched();
         }
         /* To get correct interrupt status in timeout case */
@@ -500,25 +523,40 @@ static int onenand_wait(struct mtd_info *mtd, int state)
                 int ecc = onenand_read_ecc(this);
                 if (ecc) {
                         if (ecc & ONENAND_ECC_2BIT_ALL) {
-                                printk(KERN_ERR "onenand_wait: ECC error = 0x%04x\n", ecc);
+                                printk(KERN_ERR "%s: ECC error = 0x%04x\n",
+                                        __func__, ecc);
                                 mtd->ecc_stats.failed++;
                                 return -EBADMSG;
                         } else if (ecc & ONENAND_ECC_1BIT_ALL) {
-                                printk(KERN_DEBUG "onenand_wait: correctable ECC error = 0x%04x\n", ecc);
+                                printk(KERN_DEBUG "%s: correctable ECC error = 0x%04x\n",
+                                        __func__, ecc);
                                 mtd->ecc_stats.corrected++;
                         }
                 }
         } else if (state == FL_READING) {
-                printk(KERN_ERR "onenand_wait: read timeout! ctrl=0x%04x intr=0x%04x\n", ctrl, interrupt);
+                printk(KERN_ERR "%s: read timeout! ctrl=0x%04x intr=0x%04x\n",
+                        __func__, ctrl, interrupt);
+                return -EIO;
+        }
+
+        if (state == FL_PREPARING_ERASE && !(interrupt & ONENAND_INT_ERASE)) {
+                printk(KERN_ERR "%s: mb erase timeout! ctrl=0x%04x intr=0x%04x\n",
+                       __func__, ctrl, interrupt);
+                return -EIO;
+        }
+
+        if (!(interrupt & ONENAND_INT_MASTER)) {
+                printk(KERN_ERR "%s: timeout! ctrl=0x%04x intr=0x%04x\n",
+                       __func__, ctrl, interrupt);
                 return -EIO;
         }
 
         /* If there's controller error, it's a real error */
         if (ctrl & ONENAND_CTRL_ERROR) {
-                printk(KERN_ERR "onenand_wait: controller error = 0x%04x\n",
-                        ctrl);
+                printk(KERN_ERR "%s: controller error = 0x%04x\n",
+                        __func__, ctrl);
                 if (ctrl & ONENAND_CTRL_LOCK)
-                        printk(KERN_ERR "onenand_wait: it's locked error.\n");
+                        printk(KERN_ERR "%s: it's locked error.\n", __func__);
                 return -EIO;
         }
 
@@ -1015,7 +1053,8 @@ static int onenand_recover_lsb(struct mtd_info *mtd, loff_t addr, int status)
         /* We are attempting to reread, so decrement stats.failed
          * which was incremented by onenand_wait due to read failure
          */
-        printk(KERN_INFO "onenand_recover_lsb: Attempting to recover from uncorrectable read\n");
+        printk(KERN_INFO "%s: Attempting to recover from uncorrectable read\n",
+                __func__);
         mtd->ecc_stats.failed--;
 
         /* Issue the LSB page recovery command */
@@ -1046,7 +1085,8 @@ static int onenand_mlc_read_ops_nolock(struct mtd_info *mtd, loff_t from,
         int ret = 0;
         int writesize = this->writesize;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "onenand_mlc_read_ops_nolock: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
+        DEBUG(MTD_DEBUG_LEVEL3, "%s: from = 0x%08x, len = %i\n",
+              __func__, (unsigned int) from, (int) len);
 
         if (ops->mode == MTD_OOB_AUTO)
                 oobsize = this->ecclayout->oobavail;
@@ -1057,7 +1097,8 @@ static int onenand_mlc_read_ops_nolock(struct mtd_info *mtd, loff_t from,
 
         /* Do not allow reads past end of device */
         if (from + len > mtd->size) {
-                printk(KERN_ERR "onenand_mlc_read_ops_nolock: Attempt read beyond end of device\n");
+                printk(KERN_ERR "%s: Attempt read beyond end of device\n",
+                        __func__);
                 ops->retlen = 0;
                 ops->oobretlen = 0;
                 return -EINVAL;
@@ -1146,7 +1187,8 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from,
         int ret = 0, boundary = 0;
         int writesize = this->writesize;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "onenand_read_ops_nolock: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
+        DEBUG(MTD_DEBUG_LEVEL3, "%s: from = 0x%08x, len = %i\n",
+                        __func__, (unsigned int) from, (int) len);
 
         if (ops->mode == MTD_OOB_AUTO)
                 oobsize = this->ecclayout->oobavail;
@@ -1157,7 +1199,8 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from,
 
         /* Do not allow reads past end of device */
         if ((from + len) > mtd->size) {
-                printk(KERN_ERR "onenand_read_ops_nolock: Attempt read beyond end of device\n");
+                printk(KERN_ERR "%s: Attempt read beyond end of device\n",
+                        __func__);
                 ops->retlen = 0;
                 ops->oobretlen = 0;
                 return -EINVAL;
@@ -1275,7 +1318,8 @@ static int onenand_read_oob_nolock(struct mtd_info *mtd, loff_t from,
 
         from += ops->ooboffs;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "onenand_read_oob_nolock: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
+        DEBUG(MTD_DEBUG_LEVEL3, "%s: from = 0x%08x, len = %i\n",
+                __func__, (unsigned int) from, (int) len);
 
         /* Initialize return length value */
         ops->oobretlen = 0;
@@ -1288,7 +1332,8 @@ static int onenand_read_oob_nolock(struct mtd_info *mtd, loff_t from,
         column = from & (mtd->oobsize - 1);
 
         if (unlikely(column >= oobsize)) {
-                printk(KERN_ERR "onenand_read_oob_nolock: Attempted to start read outside oob\n");
+                printk(KERN_ERR "%s: Attempted to start read outside oob\n",
+                        __func__);
                 return -EINVAL;
         }
 
@@ -1296,7 +1341,8 @@ static int onenand_read_oob_nolock(struct mtd_info *mtd, loff_t from,
         if (unlikely(from >= mtd->size ||
                      column + len > ((mtd->size >> this->page_shift) -
                                      (from >> this->page_shift)) * oobsize)) {
-                printk(KERN_ERR "onenand_read_oob_nolock: Attempted to read beyond end of device\n");
+                printk(KERN_ERR "%s: Attempted to read beyond end of device\n",
+                        __func__);
                 return -EINVAL;
         }
 
@@ -1319,7 +1365,8 @@ static int onenand_read_oob_nolock(struct mtd_info *mtd, loff_t from,
                         ret = onenand_recover_lsb(mtd, from, ret);
 
                 if (ret && ret != -EBADMSG) {
-                        printk(KERN_ERR "onenand_read_oob_nolock: read failed = 0x%x\n", ret);
+                        printk(KERN_ERR "%s: read failed = 0x%x\n",
+                                __func__, ret);
                         break;
                 }
 
@@ -1450,20 +1497,21 @@ static int onenand_bbt_wait(struct mtd_info *mtd, int state)
         if (interrupt & ONENAND_INT_READ) {
                 int ecc = onenand_read_ecc(this);
                 if (ecc & ONENAND_ECC_2BIT_ALL) {
-                        printk(KERN_INFO "onenand_bbt_wait: ecc error = 0x%04x"
-                                ", controller error 0x%04x\n", ecc, ctrl);
+                        printk(KERN_WARNING "%s: ecc error = 0x%04x, "
+                                "controller error 0x%04x\n",
+                                __func__, ecc, ctrl);
                         return ONENAND_BBT_READ_ECC_ERROR;
                 }
         } else {
-                printk(KERN_ERR "onenand_bbt_wait: read timeout!"
-                        "ctrl=0x%04x intr=0x%04x\n", ctrl, interrupt);
+                printk(KERN_ERR "%s: read timeout! ctrl=0x%04x intr=0x%04x\n",
+                        __func__, ctrl, interrupt);
                 return ONENAND_BBT_READ_FATAL_ERROR;
         }
 
         /* Initial bad block case: 0x2400 or 0x0400 */
         if (ctrl & ONENAND_CTRL_ERROR) {
-                printk(KERN_DEBUG "onenand_bbt_wait: "
-                        "controller error = 0x%04x\n", ctrl);
+                printk(KERN_DEBUG "%s: controller error = 0x%04x\n",
+                        __func__, ctrl);
                 return ONENAND_BBT_READ_ERROR;
         }
 
@@ -1487,14 +1535,16 @@ int onenand_bbt_read_oob(struct mtd_info *mtd, loff_t from,
         size_t len = ops->ooblen;
         u_char *buf = ops->oobbuf;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "onenand_bbt_read_oob: from = 0x%08x, len = %zi\n", (unsigned int) from, len);
+        DEBUG(MTD_DEBUG_LEVEL3, "%s: from = 0x%08x, len = %zi\n",
+                __func__, (unsigned int) from, len);
 
         /* Initialize return value */
         ops->oobretlen = 0;
 
         /* Do not allow reads past end of device */
         if (unlikely((from + len) > mtd->size)) {
-                printk(KERN_ERR "onenand_bbt_read_oob: Attempt read beyond end of device\n");
+                printk(KERN_ERR "%s: Attempt read beyond end of device\n",
+                        __func__);
                 return ONENAND_BBT_READ_FATAL_ERROR;
         }
 
@@ -1661,21 +1711,23 @@ static int onenand_panic_write(struct mtd_info *mtd, loff_t to, size_t len,
         /* Wait for any existing operation to clear */
         onenand_panic_wait(mtd);
 
-        DEBUG(MTD_DEBUG_LEVEL3, "onenand_panic_write: to = 0x%08x, len = %i\n",
-              (unsigned int) to, (int) len);
+        DEBUG(MTD_DEBUG_LEVEL3, "%s: to = 0x%08x, len = %i\n",
+                __func__, (unsigned int) to, (int) len);
 
         /* Initialize retlen, in case of early exit */
         *retlen = 0;
 
         /* Do not allow writes past end of device */
         if (unlikely((to + len) > mtd->size)) {
-                printk(KERN_ERR "onenand_panic_write: Attempt write to past end of device\n");
+                printk(KERN_ERR "%s: Attempt write to past end of device\n",
+                        __func__);
                 return -EINVAL;
         }
 
         /* Reject writes, which are not page aligned */
         if (unlikely(NOTALIGNED(to) || NOTALIGNED(len))) {
-                printk(KERN_ERR "onenand_panic_write: Attempt to write not page aligned data\n");
+                printk(KERN_ERR "%s: Attempt to write not page aligned data\n",
+                        __func__);
                 return -EINVAL;
         }
 
@@ -1711,7 +1763,7 @@ static int onenand_panic_write(struct mtd_info *mtd, loff_t to, size_t len,
                 }
 
                 if (ret) {
-                        printk(KERN_ERR "onenand_panic_write: write failed %d\n", ret);
+                        printk(KERN_ERR "%s: write failed %d\n", __func__, ret);
                         break;
                 }
 
@@ -1792,7 +1844,8 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
         u_char *oobbuf;
         int ret = 0;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "onenand_write_ops_nolock: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
+        DEBUG(MTD_DEBUG_LEVEL3, "%s: to = 0x%08x, len = %i\n",
+                __func__, (unsigned int) to, (int) len);
 
         /* Initialize retlen, in case of early exit */
         ops->retlen = 0;
@@ -1800,13 +1853,15 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
 
         /* Do not allow writes past end of device */
         if (unlikely((to + len) > mtd->size)) {
-                printk(KERN_ERR "onenand_write_ops_nolock: Attempt write to past end of device\n");
+                printk(KERN_ERR "%s: Attempt write to past end of device\n",
+                        __func__);
                 return -EINVAL;
         }
 
         /* Reject writes, which are not page aligned */
         if (unlikely(NOTALIGNED(to) || NOTALIGNED(len))) {
-                printk(KERN_ERR "onenand_write_ops_nolock: Attempt to write not page aligned data\n");
+                printk(KERN_ERR "%s: Attempt to write not page aligned data\n",
+                        __func__);
                 return -EINVAL;
         }
 
@@ -1879,7 +1934,8 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
                         onenand_update_bufferram(mtd, prev, !ret && !prev_subpage);
                         if (ret) {
                                 written -= prevlen;
-                                printk(KERN_ERR "onenand_write_ops_nolock: write failed %d\n", ret);
+                                printk(KERN_ERR "%s: write failed %d\n",
+                                        __func__, ret);
                                 break;
                         }
 
@@ -1887,7 +1943,8 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
                                 /* Only check verify write turn on */
                                 ret = onenand_verify(mtd, buf - len, to - len, len);
                                 if (ret)
-                                        printk(KERN_ERR "onenand_write_ops_nolock: verify failed %d\n", ret);
+                                        printk(KERN_ERR "%s: verify failed %d\n",
+                                                __func__, ret);
                                 break;
                         }
 
@@ -1905,14 +1962,16 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
                         /* In partial page write we don't update bufferram */
                         onenand_update_bufferram(mtd, to, !ret && !subpage);
                         if (ret) {
-                                printk(KERN_ERR "onenand_write_ops_nolock: write failed %d\n", ret);
+                                printk(KERN_ERR "%s: write failed %d\n",
+                                        __func__, ret);
                                 break;
                         }
 
                         /* Only check verify write turn on */
                         ret = onenand_verify(mtd, buf, to, thislen);
                         if (ret) {
-                                printk(KERN_ERR "onenand_write_ops_nolock: verify failed %d\n", ret);
+                                printk(KERN_ERR "%s: verify failed %d\n",
+                                        __func__, ret);
                                 break;
                         }
 
@@ -1968,7 +2027,8 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to,
 
         to += ops->ooboffs;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "onenand_write_oob_nolock: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
+        DEBUG(MTD_DEBUG_LEVEL3, "%s: to = 0x%08x, len = %i\n",
+                __func__, (unsigned int) to, (int) len);
 
         /* Initialize retlen, in case of early exit */
         ops->oobretlen = 0;
@@ -1981,14 +2041,15 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to,
         column = to & (mtd->oobsize - 1);
 
         if (unlikely(column >= oobsize)) {
-                printk(KERN_ERR "onenand_write_oob_nolock: Attempted to start write outside oob\n");
+                printk(KERN_ERR "%s: Attempted to start write outside oob\n",
+                        __func__);
                 return -EINVAL;
         }
 
         /* For compatibility with NAND: Do not allow write past end of page */
         if (unlikely(column + len > oobsize)) {
-                printk(KERN_ERR "onenand_write_oob_nolock: "
-                      "Attempt to write past end of page\n");
+                printk(KERN_ERR "%s: Attempt to write past end of page\n",
+                        __func__);
                 return -EINVAL;
         }
 
@@ -1996,7 +2057,8 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to,
         if (unlikely(to >= mtd->size ||
                      column + len > ((mtd->size >> this->page_shift) -
                                      (to >> this->page_shift)) * oobsize)) {
-                printk(KERN_ERR "onenand_write_oob_nolock: Attempted to write past end of device\n");
+                printk(KERN_ERR "%s: Attempted to write past end of device\n",
+                       __func__);
                 return -EINVAL;
         }
 
@@ -2038,13 +2100,14 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to,
 
                 ret = this->wait(mtd, FL_WRITING);
                 if (ret) {
-                        printk(KERN_ERR "onenand_write_oob_nolock: write failed %d\n", ret);
+                        printk(KERN_ERR "%s: write failed %d\n", __func__, ret);
                         break;
                 }
 
                 ret = onenand_verify_oob(mtd, oobbuf, to);
                 if (ret) {
-                        printk(KERN_ERR "onenand_write_oob_nolock: verify failed %d\n", ret);
+                        printk(KERN_ERR "%s: verify failed %d\n",
+                                __func__, ret);
                         break;
                 }
 
@@ -2140,78 +2203,186 @@ static int onenand_block_isbad_nolock(struct mtd_info *mtd, loff_t ofs, int allo
         return bbm->isbad_bbt(mtd, ofs, allowbbt);
 }
 
+
+static int onenand_multiblock_erase_verify(struct mtd_info *mtd,
+                                           struct erase_info *instr)
+{
+        struct onenand_chip *this = mtd->priv;
+        loff_t addr = instr->addr;
+        int len = instr->len;
+        unsigned int block_size = (1 << this->erase_shift);
+        int ret = 0;
+
+        while (len) {
+                this->command(mtd, ONENAND_CMD_ERASE_VERIFY, addr, block_size);
+                ret = this->wait(mtd, FL_VERIFYING_ERASE);
+                if (ret) {
+                        printk(KERN_ERR "%s: Failed verify, block %d\n",
+                               __func__, onenand_block(this, addr));
+                        instr->state = MTD_ERASE_FAILED;
+                        instr->fail_addr = addr;
+                        return -1;
+                }
+                len -= block_size;
+                addr += block_size;
+        }
+        return 0;
+}
+
 /**
- * onenand_erase - [MTD Interface] erase block(s)
+ * onenand_multiblock_erase - [Internal] erase block(s) using multiblock erase
  * @param mtd           MTD device structure
  * @param instr         erase instruction
+ * @param region        erase region
  *
- * Erase one ore more blocks
+ * Erase one or more blocks up to 64 block at a time
  */
-static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)
+static int onenand_multiblock_erase(struct mtd_info *mtd,
+                                    struct erase_info *instr,
+                                    unsigned int block_size)
 {
         struct onenand_chip *this = mtd->priv;
-        unsigned int block_size;
         loff_t addr = instr->addr;
-        loff_t len = instr->len;
-        int ret = 0, i;
-        struct mtd_erase_region_info *region = NULL;
-        loff_t region_end = 0;
+        int len = instr->len;
+        int eb_count = 0;
+        int ret = 0;
+        int bdry_block = 0;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "onenand_erase: start = 0x%012llx, len = %llu\n", (unsigned long long) instr->addr, (unsigned long long) instr->len);
+        instr->state = MTD_ERASING;
 
-        /* Do not allow erase past end of device */
-        if (unlikely((len + addr) > mtd->size)) {
-                printk(KERN_ERR "onenand_erase: Erase past end of device\n");
-                return -EINVAL;
+        if (ONENAND_IS_DDP(this)) {
+                loff_t bdry_addr = this->chipsize >> 1;
+                if (addr < bdry_addr && (addr + len) > bdry_addr)
+                        bdry_block = bdry_addr >> this->erase_shift;
         }
 
-        if (FLEXONENAND(this)) {
-                /* Find the eraseregion of this address */
-                i = flexonenand_region(mtd, addr);
-                region = &mtd->eraseregions[i];
+        /* Pre-check bbs */
+        while (len) {
+                /* Check if we have a bad block, we do not erase bad blocks */
+                if (onenand_block_isbad_nolock(mtd, addr, 0)) {
+                        printk(KERN_WARNING "%s: attempt to erase a bad block "
+                               "at addr 0x%012llx\n",
+                               __func__, (unsigned long long) addr);
+                        instr->state = MTD_ERASE_FAILED;
+                        return -EIO;
+                }
+                len -= block_size;
+                addr += block_size;
+        }
 
-                block_size = region->erasesize;
-                region_end = region->offset + region->erasesize * region->numblocks;
+        len = instr->len;
+        addr = instr->addr;
 
-                /* Start address within region must align on block boundary.
-                 * Erase region's start offset is always block start address.
-                 */
-                if (unlikely((addr - region->offset) & (block_size - 1))) {
-                        printk(KERN_ERR "onenand_erase: Unaligned address\n");
-                        return -EINVAL;
+        /* loop over 64 eb batches */
+        while (len) {
+                struct erase_info verify_instr = *instr;
+                int max_eb_count = MB_ERASE_MAX_BLK_COUNT;
+
+                verify_instr.addr = addr;
+                verify_instr.len = 0;
+
+                /* do not cross chip boundary */
+                if (bdry_block) {
+                        int this_block = (addr >> this->erase_shift);
+
+                        if (this_block < bdry_block) {
+                                max_eb_count = min(max_eb_count,
+                                                   (bdry_block - this_block));
+                        }
                 }
-        } else {
-                block_size = 1 << this->erase_shift;
 
-                /* Start address must align on block boundary */
-                if (unlikely(addr & (block_size - 1))) {
-                        printk(KERN_ERR "onenand_erase: Unaligned address\n");
-                        return -EINVAL;
+                eb_count = 0;
+
+                while (len > block_size && eb_count < (max_eb_count - 1)) {
+                        this->command(mtd, ONENAND_CMD_MULTIBLOCK_ERASE,
+                                      addr, block_size);
+                        onenand_invalidate_bufferram(mtd, addr, block_size);
+
+                        ret = this->wait(mtd, FL_PREPARING_ERASE);
+                        if (ret) {
+                                printk(KERN_ERR "%s: Failed multiblock erase, "
+                                       "block %d\n", __func__,
+                                       onenand_block(this, addr));
+                                instr->state = MTD_ERASE_FAILED;
+                                instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN;
+                                return -EIO;
+                        }
+
+                        len -= block_size;
+                        addr += block_size;
+                        eb_count++;
+                }
+
+                /* last block of 64-eb series */
+                cond_resched();
+                this->command(mtd, ONENAND_CMD_ERASE, addr, block_size);
+                onenand_invalidate_bufferram(mtd, addr, block_size);
+
+                ret = this->wait(mtd, FL_ERASING);
+                /* Check if it is write protected */
+                if (ret) {
+                        printk(KERN_ERR "%s: Failed erase, block %d\n",
+                               __func__, onenand_block(this, addr));
+                        instr->state = MTD_ERASE_FAILED;
+                        instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN;
+                        return -EIO;
+                }
+
+                len -= block_size;
+                addr += block_size;
+                eb_count++;
+
+                /* verify */
+                verify_instr.len = eb_count * block_size;
+                if (onenand_multiblock_erase_verify(mtd, &verify_instr)) {
+                        instr->state = verify_instr.state;
+                        instr->fail_addr = verify_instr.fail_addr;
+                        return -EIO;
                 }
-        }
 
-        /* Length must align on block boundary */
-        if (unlikely(len & (block_size - 1))) {
-                printk(KERN_ERR "onenand_erase: Length not block aligned\n");
-                return -EINVAL;
         }
+        return 0;
+}
 
-        instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN;
 
-        /* Grab the lock and see if the device is available */
-        onenand_get_device(mtd, FL_ERASING);
+/**
+ * onenand_block_by_block_erase - [Internal] erase block(s) using regular erase
+ * @param mtd           MTD device structure
+ * @param instr         erase instruction
+ * @param region        erase region
+ * @param block_size    erase block size
+ *
+ * Erase one or more blocks one block at a time
+ */
+static int onenand_block_by_block_erase(struct mtd_info *mtd,
+                                        struct erase_info *instr,
+                                        struct mtd_erase_region_info *region,
+                                        unsigned int block_size)
+{
+        struct onenand_chip *this = mtd->priv;
+        loff_t addr = instr->addr;
+        int len = instr->len;
+        loff_t region_end = 0;
+        int ret = 0;
+
+        if (region) {
+                /* region is set for Flex-OneNAND */
+                region_end = region->offset + region->erasesize * region->numblocks;
+        }
 
-        /* Loop through the blocks */
         instr->state = MTD_ERASING;
 
+        /* Loop through the blocks */
         while (len) {
                 cond_resched();
 
                 /* Check if we have a bad block, we do not erase bad blocks */
                 if (onenand_block_isbad_nolock(mtd, addr, 0)) {
-                        printk (KERN_WARNING "onenand_erase: attempt to erase a bad block at addr 0x%012llx\n", (unsigned long long) addr);
+                        printk(KERN_WARNING "%s: attempt to erase a bad block "
+                                        "at addr 0x%012llx\n",
+                                        __func__, (unsigned long long) addr);
                         instr->state = MTD_ERASE_FAILED;
-                        goto erase_exit;
+                        return -EIO;
                 }
 
                 this->command(mtd, ONENAND_CMD_ERASE, addr, block_size);
@@ -2221,11 +2392,11 @@ static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)
                 ret = this->wait(mtd, FL_ERASING);
                 /* Check, if it is write protected */
                 if (ret) {
-                        printk(KERN_ERR "onenand_erase: Failed erase, block %d\n",
-                                                 onenand_block(this, addr));
+                        printk(KERN_ERR "%s: Failed erase, block %d\n",
+                                __func__, onenand_block(this, addr));
                         instr->state = MTD_ERASE_FAILED;
                         instr->fail_addr = addr;
-                        goto erase_exit;
+                        return -EIO;
                 }
 
                 len -= block_size;
@@ -2241,25 +2412,88 @@ static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)
 
                         if (len & (block_size - 1)) {
                                 /* FIXME: This should be handled at MTD partitioning level. */
-                                printk(KERN_ERR "onenand_erase: Unaligned address\n");
-                                goto erase_exit;
+                                printk(KERN_ERR "%s: Unaligned address\n",
+                                        __func__);
+                                return -EIO;
                         }
                 }
+        }
+        return 0;
+}
+
+/**
+ * onenand_erase - [MTD Interface] erase block(s)
+ * @param mtd           MTD device structure
+ * @param instr         erase instruction
+ *
+ * Erase one or more blocks
+ */
+static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)
+{
+        struct onenand_chip *this = mtd->priv;
+        unsigned int block_size;
+        loff_t addr = instr->addr;
+        loff_t len = instr->len;
+        int ret = 0;
+        struct mtd_erase_region_info *region = NULL;
+        loff_t region_offset = 0;
+
+        DEBUG(MTD_DEBUG_LEVEL3, "%s: start=0x%012llx, len=%llu\n", __func__,
+              (unsigned long long) instr->addr, (unsigned long long) instr->len);
+
+        /* Do not allow erase past end of device */
+        if (unlikely((len + addr) > mtd->size)) {
+                printk(KERN_ERR "%s: Erase past end of device\n", __func__);
+                return -EINVAL;
+        }
+
+        if (FLEXONENAND(this)) {
+                /* Find the eraseregion of this address */
+                int i = flexonenand_region(mtd, addr);
+
+                region = &mtd->eraseregions[i];
+                block_size = region->erasesize;
+
+                /* Start address within region must align on block boundary.
+                 * Erase region's start offset is always block start address.
+                 */
+                region_offset = region->offset;
+        } else
+                block_size = 1 << this->erase_shift;
+
+        /* Start address must align on block boundary */
+        if (unlikely((addr - region_offset) & (block_size - 1))) {
+                printk(KERN_ERR "%s: Unaligned address\n", __func__);
+                return -EINVAL;
+        }
 
+        /* Length must align on block boundary */
+        if (unlikely(len & (block_size - 1))) {
+                printk(KERN_ERR "%s: Length not block aligned\n", __func__);
+                return -EINVAL;
         }
 
-        instr->state = MTD_ERASE_DONE;
+        instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN;
 
-erase_exit:
+        /* Grab the lock and see if the device is available */
+        onenand_get_device(mtd, FL_ERASING);
 
-        ret = instr->state == MTD_ERASE_DONE ? 0 : -EIO;
+        if (region || instr->len < MB_ERASE_MIN_BLK_COUNT * block_size) {
+                /* region is set for Flex-OneNAND (no mb erase) */
+                ret = onenand_block_by_block_erase(mtd, instr,
+                                                   region, block_size);
+        } else {
+                ret = onenand_multiblock_erase(mtd, instr, block_size);
+        }
 
         /* Deselect and wake up anyone waiting on the device */
         onenand_release_device(mtd);
 
         /* Do call back function */
-        if (!ret)
+        if (!ret) {
+                instr->state = MTD_ERASE_DONE;
                 mtd_erase_callback(instr);
+        }
 
         return ret;
 }
@@ -2272,7 +2506,7 @@ erase_exit:
  */
 static void onenand_sync(struct mtd_info *mtd)
 {
-        DEBUG(MTD_DEBUG_LEVEL3, "onenand_sync: called\n");
+        DEBUG(MTD_DEBUG_LEVEL3, "%s: called\n", __func__);
 
         /* Grab the lock and see if the device is available */
         onenand_get_device(mtd, FL_SYNCING);
@@ -2406,7 +2640,8 @@ static int onenand_do_lock_cmd(struct mtd_info *mtd, loff_t ofs, size_t len, int
                 /* Check lock status */
                 status = this->read_word(this->base + ONENAND_REG_WP_STATUS);
                 if (!(status & wp_status_mask))
-                        printk(KERN_ERR "wp status = 0x%x\n", status);
+                        printk(KERN_ERR "%s: wp status = 0x%x\n",
+                                __func__, status);
 
                 return 0;
         }
@@ -2435,7 +2670,8 @@ static int onenand_do_lock_cmd(struct mtd_info *mtd, loff_t ofs, size_t len, int
                 /* Check lock status */
                 status = this->read_word(this->base + ONENAND_REG_WP_STATUS);
                 if (!(status & wp_status_mask))
-                        printk(KERN_ERR "block = %d, wp status = 0x%x\n", block, status);
+                        printk(KERN_ERR "%s: block = %d, wp status = 0x%x\n",
+                                __func__, block, status);
         }
 
         return 0;
@@ -2502,7 +2738,8 @@ static int onenand_check_lock_status(struct onenand_chip *this)
                 /* Check lock status */
                 status = this->read_word(this->base + ONENAND_REG_WP_STATUS);
                 if (!(status & ONENAND_WP_US)) {
-                        printk(KERN_ERR "block = %d, wp status = 0x%x\n", block, status);
+                        printk(KERN_ERR "%s: block = %d, wp status = 0x%x\n",
+                                __func__, block, status);
                         return 0;
                 }
         }
@@ -2557,6 +2794,208 @@ static void onenand_unlock_all(struct mtd_info *mtd)
 
 #ifdef CONFIG_MTD_ONENAND_OTP
 
+/**
+ * onenand_otp_command - Send OTP specific command to OneNAND device
+ * @param mtd    MTD device structure
+ * @param cmd    the command to be sent
+ * @param addr   offset to read from or write to
+ * @param len    number of bytes to read or write
+ */
+static int onenand_otp_command(struct mtd_info *mtd, int cmd, loff_t addr,
+                                size_t len)
+{
+        struct onenand_chip *this = mtd->priv;
+        int value, block, page;
+
+        /* Address translation */
+        switch (cmd) {
+        case ONENAND_CMD_OTP_ACCESS:
+                block = (int) (addr >> this->erase_shift);
+                page = -1;
+                break;
+
+        default:
+                block = (int) (addr >> this->erase_shift);
+                page = (int) (addr >> this->page_shift);
+
+                if (ONENAND_IS_2PLANE(this)) {
+                        /* Make the even block number */
+                        block &= ~1;
+                        /* Is it the odd plane? */
+                        if (addr & this->writesize)
+                                block++;
+                        page >>= 1;
+                }
+                page &= this->page_mask;
+                break;
+        }
+
+        if (block != -1) {
+                /* Write 'DFS, FBA' of Flash */
+                value = onenand_block_address(this, block);
+                this->write_word(value, this->base +
+                                ONENAND_REG_START_ADDRESS1);
+        }
+
+        if (page != -1) {
+                /* Now we use page size operation */
+                int sectors = 4, count = 4;
+                int dataram;
+
+                switch (cmd) {
+                default:
+                        if (ONENAND_IS_2PLANE(this) && cmd == ONENAND_CMD_PROG)
+                                cmd = ONENAND_CMD_2X_PROG;
+                        dataram = ONENAND_CURRENT_BUFFERRAM(this);
+                        break;
+                }
+
+                /* Write 'FPA, FSA' of Flash */
+                value = onenand_page_address(page, sectors);
+                this->write_word(value, this->base +
+                                ONENAND_REG_START_ADDRESS8);
+
+                /* Write 'BSA, BSC' of DataRAM */
+                value = onenand_buffer_address(dataram, sectors, count);
+                this->write_word(value, this->base + ONENAND_REG_START_BUFFER);
+        }
+
+        /* Interrupt clear */
+        this->write_word(ONENAND_INT_CLEAR, this->base + ONENAND_REG_INTERRUPT);
+
+        /* Write command */
+        this->write_word(cmd, this->base + ONENAND_REG_COMMAND);
+
+        return 0;
+}
+
+/**
+ * onenand_otp_write_oob_nolock - [Internal] OneNAND write out-of-band, specific to OTP
+ * @param mtd           MTD device structure
+ * @param to            offset to write to
+ * @param len           number of bytes to write
+ * @param retlen        pointer to variable to store the number of written bytes
+ * @param buf           the data to write
+ *
+ * OneNAND write out-of-band only for OTP
+ */
+static int onenand_otp_write_oob_nolock(struct mtd_info *mtd, loff_t to,
+                                    struct mtd_oob_ops *ops)
+{
+        struct onenand_chip *this = mtd->priv;
+        int column, ret = 0, oobsize;
+        int written = 0;
+        u_char *oobbuf;
+        size_t len = ops->ooblen;
+        const u_char *buf = ops->oobbuf;
+        int block, value, status;
+
+        to += ops->ooboffs;
+
+        /* Initialize retlen, in case of early exit */
+        ops->oobretlen = 0;
+
+        oobsize = mtd->oobsize;
+
+        column = to & (mtd->oobsize - 1);
+
+        oobbuf = this->oob_buf;
+
+        /* Loop until all data write */
+        while (written < len) {
+                int thislen = min_t(int, oobsize, len - written);
+
+                cond_resched();
+
+                block = (int) (to >> this->erase_shift);
+                /*
+                 * Write 'DFS, FBA' of Flash
+                 * Add: F100h DQ=DFS, FBA
+                 */
+
+                value = onenand_block_address(this, block);
+                this->write_word(value, this->base +
+                                ONENAND_REG_START_ADDRESS1);
+
+                /*
+                 * Select DataRAM for DDP
+                 * Add: F101h DQ=DBS
+                 */
+
+                value = onenand_bufferram_address(this, block);
+                this->write_word(value, this->base +
+                                ONENAND_REG_START_ADDRESS2);
+                ONENAND_SET_NEXT_BUFFERRAM(this);
+
+                /*
+                 * Enter OTP access mode
+                 */
+                this->command(mtd, ONENAND_CMD_OTP_ACCESS, 0, 0);
+                this->wait(mtd, FL_OTPING);
+
+                /* We send data to spare ram with oobsize
+                 * to prevent byte access */
+                memcpy(oobbuf + column, buf, thislen);
+
+                /*
+                 * Write Data into DataRAM
+                 * Add: 8th Word
+                 * in sector0/spare/page0
+                 * DQ=XXFCh
+                 */
+                this->write_bufferram(mtd, ONENAND_SPARERAM,
+                                        oobbuf, 0, mtd->oobsize);
+
+                onenand_otp_command(mtd, ONENAND_CMD_PROGOOB, to, mtd->oobsize);
+                onenand_update_bufferram(mtd, to, 0);
+                if (ONENAND_IS_2PLANE(this)) {
+                        ONENAND_SET_BUFFERRAM1(this);
+                        onenand_update_bufferram(mtd, to + this->writesize, 0);
+                }
+
+                ret = this->wait(mtd, FL_WRITING);
+                if (ret) {
+                        printk(KERN_ERR "%s: write failed %d\n", __func__, ret);
+                        break;
+                }
+
+                /* Exit OTP access mode */
+                this->command(mtd, ONENAND_CMD_RESET, 0, 0);
+                this->wait(mtd, FL_RESETING);
+
+                status = this->read_word(this->base + ONENAND_REG_CTRL_STATUS);
+                status &= 0x60;
+
+                if (status == 0x60) {
+                        printk(KERN_DEBUG "\nBLOCK\tSTATUS\n");
+                        printk(KERN_DEBUG "1st Block\tLOCKED\n");
+                        printk(KERN_DEBUG "OTP Block\tLOCKED\n");
+                } else if (status == 0x20) {
+                        printk(KERN_DEBUG "\nBLOCK\tSTATUS\n");
+                        printk(KERN_DEBUG "1st Block\tLOCKED\n");
+                        printk(KERN_DEBUG "OTP Block\tUN-LOCKED\n");
+                } else if (status == 0x40) {
+                        printk(KERN_DEBUG "\nBLOCK\tSTATUS\n");
+                        printk(KERN_DEBUG "1st Block\tUN-LOCKED\n");
+                        printk(KERN_DEBUG "OTP Block\tLOCKED\n");
+                } else {
+                        printk(KERN_DEBUG "Reboot to check\n");
+                }
+
+                written += thislen;
+                if (written == len)
+                        break;
+
+                to += mtd->writesize;
+                buf += thislen;
+                column = 0;
+        }
+
+        ops->oobretlen = written;
+
+        return ret;
+}
+
 /* Internal OTP operation */
 typedef int (*otp_op_t)(struct mtd_info *mtd, loff_t form, size_t len,
                 size_t *retlen, u_char *buf);
@@ -2659,11 +3098,11 @@ static int do_otp_lock(struct mtd_info *mtd, loff_t from, size_t len,
         struct mtd_oob_ops ops;
         int ret;
 
-        /* Enter OTP access mode */
-        this->command(mtd, ONENAND_CMD_OTP_ACCESS, 0, 0);
-        this->wait(mtd, FL_OTPING);
-
         if (FLEXONENAND(this)) {
+
+                /* Enter OTP access mode */
+                this->command(mtd, ONENAND_CMD_OTP_ACCESS, 0, 0);
+                this->wait(mtd, FL_OTPING);
                 /*
                  * For Flex-OneNAND, we write lock mark to 1st word of sector 4 of
                  * main area of page 49.
@@ -2674,19 +3113,19 @@ static int do_otp_lock(struct mtd_info *mtd, loff_t from, size_t len,
                 ops.oobbuf = NULL;
                 ret = onenand_write_ops_nolock(mtd, mtd->writesize * 49, &ops);
                 *retlen = ops.retlen;
+
+                /* Exit OTP access mode */
+                this->command(mtd, ONENAND_CMD_RESET, 0, 0);
+                this->wait(mtd, FL_RESETING);
         } else {
                 ops.mode = MTD_OOB_PLACE;
                 ops.ooblen = len;
                 ops.oobbuf = buf;
                 ops.ooboffs = 0;
-                ret = onenand_write_oob_nolock(mtd, from, &ops);
+                ret = onenand_otp_write_oob_nolock(mtd, from, &ops);
                 *retlen = ops.oobretlen;
         }
 
-        /* Exit OTP access mode */
-        this->command(mtd, ONENAND_CMD_RESET, 0, 0);
-        this->wait(mtd, FL_RESETING);
-
         return ret;
 }
 
@@ -2717,16 +3156,21 @@ static int onenand_otp_walk(struct mtd_info *mtd, loff_t from, size_t len,
         if (density < ONENAND_DEVICE_DENSITY_512Mb)
                 otp_pages = 20;
         else
-                otp_pages = 10;
+                otp_pages = 50;
 
         if (mode == MTD_OTP_FACTORY) {
                 from += mtd->writesize * otp_pages;
-                otp_pages = 64 - otp_pages;
+                otp_pages = ONENAND_PAGES_PER_BLOCK - otp_pages;
         }
 
         /* Check User/Factory boundary */
-        if (((mtd->writesize * otp_pages) - (from + len)) < 0)
-                return 0;
+        if (mode == MTD_OTP_USER) {
+                if (mtd->writesize * otp_pages < from + len)
+                        return 0;
+        } else {
+                if (mtd->writesize * otp_pages <  len)
+                        return 0;
+        }
 
         onenand_get_device(mtd, FL_OTPING);
         while (len > 0 && otp_pages > 0) {
@@ -2749,13 +3193,12 @@ static int onenand_otp_walk(struct mtd_info *mtd, loff_t from, size_t len,
                         *retlen += sizeof(struct otp_info);
                 } else {
                         size_t tmp_retlen;
-                        int size = len;
 
                         ret = action(mtd, from, len, &tmp_retlen, buf);
 
-                        buf += size;
-                        len -= size;
-                        *retlen += size;
+                        buf += tmp_retlen;
+                        len -= tmp_retlen;
+                        *retlen += tmp_retlen;
 
                         if (ret)
                                 break;
@@ -2868,21 +3311,11 @@ static int onenand_lock_user_prot_reg(struct mtd_info *mtd, loff_t from,
         u_char *buf = FLEXONENAND(this) ? this->page_buf : this->oob_buf;
         size_t retlen;
         int ret;
+        unsigned int otp_lock_offset = ONENAND_OTP_LOCK_OFFSET;
 
         memset(buf, 0xff, FLEXONENAND(this) ? this->writesize
                                                  : mtd->oobsize);
         /*
-         * Note: OTP lock operation
-         *       OTP block : 0xXXFC
-         *       1st block : 0xXXF3 (If chip support)
-         *       Both      : 0xXXF0 (If chip support)
-         */
-        if (FLEXONENAND(this))
-                buf[FLEXONENAND_OTP_LOCK_OFFSET] = 0xFC;
-        else
-                buf[ONENAND_OTP_LOCK_OFFSET] = 0xFC;
-
-        /*
          * Write lock mark to 8th word of sector0 of page0 of the spare0.
          * We write 16 bytes spare area instead of 2 bytes.
          * For Flex-OneNAND, we write lock mark to 1st word of sector 4 of
@@ -2892,10 +3325,30 @@ static int onenand_lock_user_prot_reg(struct mtd_info *mtd, loff_t from,
         from = 0;
         len = FLEXONENAND(this) ? mtd->writesize : 16;
 
+        /*
+         * Note: OTP lock operation
+         *       OTP block : 0xXXFC                     XX 1111 1100
+         *       1st block : 0xXXF3 (If chip support)   XX 1111 0011
+         *       Both      : 0xXXF0 (If chip support)   XX 1111 0000
+         */
+        if (FLEXONENAND(this))
+                otp_lock_offset = FLEXONENAND_OTP_LOCK_OFFSET;
+
+        /* ONENAND_OTP_AREA | ONENAND_OTP_BLOCK0 | ONENAND_OTP_AREA_BLOCK0 */
+        if (otp == 1)
+                buf[otp_lock_offset] = 0xFC;
+        else if (otp == 2)
+                buf[otp_lock_offset] = 0xF3;
+        else if (otp == 3)
+                buf[otp_lock_offset] = 0xF0;
+        else if (otp != 0)
+                printk(KERN_DEBUG "[OneNAND] Invalid option selected for OTP\n");
+
         ret = onenand_otp_walk(mtd, from, len, &retlen, buf, do_otp_lock, MTD_OTP_USER);
 
         return ret ? : retlen;
 }
+
 #endif  /* CONFIG_MTD_ONENAND_OTP */
 
 /**
@@ -3172,7 +3625,8 @@ static int flexonenand_check_blocks_erased(struct mtd_info *mtd, int start, int
                                 break;
 
                 if (i != mtd->oobsize) {
-                        printk(KERN_WARNING "Block %d not erased.\n", block);
+                        printk(KERN_WARNING "%s: Block %d not erased.\n",
+                                __func__, block);
                         return 1;
                 }
         }
@@ -3204,8 +3658,8 @@ int flexonenand_set_boundary(struct mtd_info *mtd, int die,
         blksperdie >>= ONENAND_IS_DDP(this) ? 1 : 0;
 
         if (boundary >= blksperdie) {
-                printk(KERN_ERR "flexonenand_set_boundary: Invalid boundary value. "
-                                "Boundary not changed.\n");
+                printk(KERN_ERR "%s: Invalid boundary value. "
+                                "Boundary not changed.\n", __func__);
                 return -EINVAL;
         }
 
@@ -3214,7 +3668,8 @@ int flexonenand_set_boundary(struct mtd_info *mtd, int die,
         new = boundary + (die * this->density_mask);
         ret = flexonenand_check_blocks_erased(mtd, min(old, new) + 1, max(old, new));
         if (ret) {
-                printk(KERN_ERR "flexonenand_set_boundary: Please erase blocks before boundary change\n");
+                printk(KERN_ERR "%s: Please erase blocks "
+                                "before boundary change\n", __func__);
                 return ret;
         }
 
@@ -3227,12 +3682,12 @@ int flexonenand_set_boundary(struct mtd_info *mtd, int die,
 
         thisboundary = this->read_word(this->base + ONENAND_DATARAM);
         if ((thisboundary >> FLEXONENAND_PI_UNLOCK_SHIFT) != 3) {
-                printk(KERN_ERR "flexonenand_set_boundary: boundary locked\n");
+                printk(KERN_ERR "%s: boundary locked\n", __func__);
                 ret = 1;
                 goto out;
         }
 
-        printk(KERN_INFO "flexonenand_set_boundary: Changing die %d boundary: %d%s\n",
+        printk(KERN_INFO "Changing die %d boundary: %d%s\n",
                         die, boundary, lock ? "(Locked)" : "(Unlocked)");
 
         addr = die ? this->diesize[0] : 0;
@@ -3243,7 +3698,8 @@ int flexonenand_set_boundary(struct mtd_info *mtd, int die,
         this->command(mtd, ONENAND_CMD_ERASE, addr, 0);
         ret = this->wait(mtd, FL_ERASING);
         if (ret) {
-                printk(KERN_ERR "flexonenand_set_boundary: Failed PI erase for Die %d\n", die);
+                printk(KERN_ERR "%s: Failed PI erase for Die %d\n",
+                       __func__, die);
                 goto out;
         }
 
@@ -3251,7 +3707,8 @@ int flexonenand_set_boundary(struct mtd_info *mtd, int die,
         this->command(mtd, ONENAND_CMD_PROG, addr, 0);
         ret = this->wait(mtd, FL_WRITING);
         if (ret) {
-                printk(KERN_ERR "flexonenand_set_boundary: Failed PI write for Die %d\n", die);
+                printk(KERN_ERR "%s: Failed PI write for Die %d\n",
+                        __func__, die);
                 goto out;
         }
 
@@ -3408,8 +3865,8 @@ static void onenand_resume(struct mtd_info *mtd)
         if (this->state == FL_PM_SUSPENDED)
                 onenand_release_device(mtd);
         else
-                printk(KERN_ERR "resume() called for the chip which is not"
-                                "in suspended state\n");
+                printk(KERN_ERR "%s: resume() called for the chip which is not "
+                                "in suspended state\n", __func__);
 }
 
 /**
@@ -3464,7 +3921,8 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
         if (!this->page_buf) {
                 this->page_buf = kzalloc(mtd->writesize, GFP_KERNEL);
                 if (!this->page_buf) {
-                        printk(KERN_ERR "onenand_scan(): Can't allocate page_buf\n");
+                        printk(KERN_ERR "%s: Can't allocate page_buf\n",
+                                __func__);
                         return -ENOMEM;
                 }
                 this->options |= ONENAND_PAGEBUF_ALLOC;
@@ -3472,7 +3930,8 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
         if (!this->oob_buf) {
                 this->oob_buf = kzalloc(mtd->oobsize, GFP_KERNEL);
                 if (!this->oob_buf) {
-                        printk(KERN_ERR "onenand_scan(): Can't allocate oob_buf\n");
+                        printk(KERN_ERR "%s: Can't allocate oob_buf\n",
+                                __func__);
                         if (this->options & ONENAND_PAGEBUF_ALLOC) {
                                 this->options &= ~ONENAND_PAGEBUF_ALLOC;
                                 kfree(this->page_buf);
@@ -3505,8 +3964,8 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
                 break;
 
         default:
-                printk(KERN_WARNING "No OOB scheme defined for oobsize %d\n",
-                        mtd->oobsize);
+                printk(KERN_WARNING "%s: No OOB scheme defined for oobsize %d\n",
+                        __func__, mtd->oobsize);
                 mtd->subpage_sft = 0;
                 /* To prevent kernel oops */
                 this->ecclayout = &onenand_oob_32;
diff --git a/drivers/mtd/tests/Makefile b/drivers/mtd/tests/Makefile
index c1d501335006..b44dcab940d8 100644
--- a/drivers/mtd/tests/Makefile
+++ b/drivers/mtd/tests/Makefile
@@ -5,3 +5,4 @@ obj-$(CONFIG_MTD_TESTS) += mtd_speedtest.o
 obj-$(CONFIG_MTD_TESTS) += mtd_stresstest.o
 obj-$(CONFIG_MTD_TESTS) += mtd_subpagetest.o
 obj-$(CONFIG_MTD_TESTS) += mtd_torturetest.o
+obj-$(CONFIG_MTD_TESTS) += mtd_nandecctest.o
diff --git a/drivers/mtd/tests/mtd_nandecctest.c b/drivers/mtd/tests/mtd_nandecctest.c
new file mode 100644
index 000000000000..c1f31051784c
--- /dev/null
+++ b/drivers/mtd/tests/mtd_nandecctest.c
@@ -0,0 +1,87 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/random.h>
+#include <linux/string.h>
+#include <linux/bitops.h>
+#include <linux/jiffies.h>
+#include <linux/mtd/nand_ecc.h>
+
+#if defined(CONFIG_MTD_NAND) || defined(CONFIG_MTD_NAND_MODULE)
+
+static void inject_single_bit_error(void *data, size_t size)
+{
+        unsigned long offset = random32() % (size * BITS_PER_BYTE);
+
+        __change_bit(offset, data);
+}
+
+static unsigned char data[512];
+static unsigned char error_data[512];
+
+static int nand_ecc_test(const size_t size)
+{
+        unsigned char code[3];
+        unsigned char error_code[3];
+        char testname[30];
+
+        BUG_ON(sizeof(data) < size);
+
+        sprintf(testname, "nand-ecc-%zu", size);
+
+        get_random_bytes(data, size);
+
+        memcpy(error_data, data, size);
+        inject_single_bit_error(error_data, size);
+
+        __nand_calculate_ecc(data, size, code);
+        __nand_calculate_ecc(error_data, size, error_code);
+        __nand_correct_data(error_data, code, error_code, size);
+
+        if (!memcmp(data, error_data, size)) {
+                printk(KERN_INFO "mtd_nandecctest: ok - %s\n", testname);
+                return 0;
+        }
+
+        printk(KERN_ERR "mtd_nandecctest: not ok - %s\n", testname);
+
+        printk(KERN_DEBUG "hexdump of data:\n");
+        print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 4,
+                        data, size, false);
+        printk(KERN_DEBUG "hexdump of error data:\n");
+        print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 4,
+                        error_data, size, false);
+
+        return -1;
+}
+
+#else
+
+static int nand_ecc_test(const size_t size)
+{
+        return 0;
+}
+
+#endif
+
+static int __init ecc_test_init(void)
+{
+        srandom32(jiffies);
+
+        nand_ecc_test(256);
+        nand_ecc_test(512);
+
+        return 0;
+}
+
+static void __exit ecc_test_exit(void)
+{
+}
+
+module_init(ecc_test_init);
+module_exit(ecc_test_exit);
+
+MODULE_DESCRIPTION("NAND ECC function test module");
+MODULE_AUTHOR("Akinobu Mita");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/tests/mtd_oobtest.c b/drivers/mtd/tests/mtd_oobtest.c
index 5553cd4eab20..5813920e79a5 100644
--- a/drivers/mtd/tests/mtd_oobtest.c
+++ b/drivers/mtd/tests/mtd_oobtest.c
@@ -343,7 +343,6 @@ static int scan_for_bad_eraseblocks(void)
                 printk(PRINT_PREF "error: cannot allocate memory\n");
                 return -ENOMEM;
         }
-        memset(bbt, 0 , ebcnt);
 
         printk(PRINT_PREF "scanning for bad eraseblocks\n");
         for (i = 0; i < ebcnt; ++i) {
@@ -392,7 +391,6 @@ static int __init mtd_oobtest_init(void)
                mtd->writesize, ebcnt, pgcnt, mtd->oobsize);
 
         err = -ENOMEM;
-        mtd->erasesize = mtd->erasesize;
         readbuf = kmalloc(mtd->erasesize, GFP_KERNEL);
         if (!readbuf) {
                 printk(PRINT_PREF "error: cannot allocate memory\n");
@@ -476,18 +474,10 @@ static int __init mtd_oobtest_init(void)
         use_len_max = mtd->ecclayout->oobavail;
         vary_offset = 1;
         simple_srand(5);
-        printk(PRINT_PREF "writing OOBs of whole device\n");
-        for (i = 0; i < ebcnt; ++i) {
-                if (bbt[i])
-                        continue;
-                err = write_eraseblock(i);
-                if (err)
-                        goto out;
-                if (i % 256 == 0)
-                        printk(PRINT_PREF "written up to eraseblock %u\n", i);
-                cond_resched();
-        }
-        printk(PRINT_PREF "written %u eraseblocks\n", i);
+
+        err = write_whole_device();
+        if (err)
+                goto out;
 
         /* Check all eraseblocks */
         use_offset = 0;
diff --git a/drivers/mtd/tests/mtd_pagetest.c b/drivers/mtd/tests/mtd_pagetest.c
index 103cac480fee..ce17cbe918c5 100644
--- a/drivers/mtd/tests/mtd_pagetest.c
+++ b/drivers/mtd/tests/mtd_pagetest.c
@@ -523,6 +523,7 @@ static int __init mtd_pagetest_init(void)
         do_div(tmp, mtd->erasesize);
         ebcnt = tmp;
         pgcnt = mtd->erasesize / mtd->writesize;
+        pgsize = mtd->writesize;
 
         printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, "
                "page size %u, count of eraseblocks %u, pages per "
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 78b7167a8ce3..39db0e96815d 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -837,7 +837,7 @@ static int vortex_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops vortex_pm_ops = {
+static const struct dev_pm_ops vortex_pm_ops = {
         .suspend = vortex_suspend,
         .resume = vortex_resume,
         .freeze = vortex_suspend,
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index 1f6c5486d715..0bd47d32ec42 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -1245,9 +1245,15 @@ static void bcm_enet_get_drvinfo(struct net_device *netdev,
         drvinfo->n_stats = BCM_ENET_STATS_LEN;
 }
 
-static int bcm_enet_get_stats_count(struct net_device *netdev)
+static int bcm_enet_get_sset_count(struct net_device *netdev,
+                                        int string_set)
 {
-        return BCM_ENET_STATS_LEN;
+        switch (string_set) {
+        case ETH_SS_STATS:
+                return BCM_ENET_STATS_LEN;
+        default:
+                return -EINVAL;
+        }
 }
 
 static void bcm_enet_get_strings(struct net_device *netdev,
@@ -1473,7 +1479,7 @@ static int bcm_enet_set_pauseparam(struct net_device *dev,
 
 static struct ethtool_ops bcm_enet_ethtool_ops = {
         .get_strings            = bcm_enet_get_strings,
-        .get_stats_count        = bcm_enet_get_stats_count,
+        .get_sset_count         = bcm_enet_get_sset_count,
         .get_ethtool_stats      = bcm_enet_get_ethtool_stats,
         .get_settings           = bcm_enet_get_settings,
         .set_settings           = bcm_enet_set_settings,
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index d69e6838f21e..0fb7a4964e75 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -20,6 +20,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/skbuff.h>
 #include <linux/if_ether.h>
 #include <linux/netdevice.h>
@@ -352,7 +354,8 @@ static u16 __get_link_speed(struct port *port)
                 }
         }
 
-        pr_debug("Port %d Received link speed %d update from adapter\n", port->actor_port_number, speed);
+        pr_debug("Port %d Received link speed %d update from adapter\n",
+                 port->actor_port_number, speed);
         return speed;
 }
 
@@ -378,12 +381,14 @@ static u8 __get_duplex(struct port *port)
                 switch (slave->duplex) {
                 case DUPLEX_FULL:
                         retval=0x1;
-                        pr_debug("Port %d Received status full duplex update from adapter\n", port->actor_port_number);
+                        pr_debug("Port %d Received status full duplex update from adapter\n",
+                                 port->actor_port_number);
                         break;
                 case DUPLEX_HALF:
                 default:
                         retval=0x0;
-                        pr_debug("Port %d Received status NOT full duplex update from adapter\n", port->actor_port_number);
+                        pr_debug("Port %d Received status NOT full duplex update from adapter\n",
+                                 port->actor_port_number);
                         break;
                 }
         }
@@ -980,7 +985,9 @@ static void ad_mux_machine(struct port *port)
 
         // check if the state machine was changed
         if (port->sm_mux_state != last_state) {
-                pr_debug("Mux Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_mux_state);
+                pr_debug("Mux Machine: Port=%d, Last State=%d, Curr State=%d\n",
+                         port->actor_port_number, last_state,
+                         port->sm_mux_state);
                 switch (port->sm_mux_state) {
                 case AD_MUX_DETACHED:
                         __detach_bond_from_agg(port);
@@ -1079,7 +1086,9 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
 
         // check if the State machine was changed or new lacpdu arrived
         if ((port->sm_rx_state != last_state) || (lacpdu)) {
-                pr_debug("Rx Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_rx_state);
+                pr_debug("Rx Machine: Port=%d, Last State=%d, Curr State=%d\n",
+                         port->actor_port_number, last_state,
+                         port->sm_rx_state);
                 switch (port->sm_rx_state) {
                 case AD_RX_INITIALIZE:
                         if (!(port->actor_oper_port_key & AD_DUPLEX_KEY_BITS)) {
@@ -1126,9 +1135,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
                         // detect loopback situation
                         if (!MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->actor_system))) {
                                 // INFO_RECEIVED_LOOPBACK_FRAMES
-                                pr_err(DRV_NAME ": %s: An illegal loopback occurred on "
-                                       "adapter (%s). Check the configuration to verify that all "
-                                       "Adapters are connected to 802.3ad compliant switch ports\n",
+                                pr_err("%s: An illegal loopback occurred on adapter (%s).\n"
+                                       "Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n",
                                        port->slave->dev->master->name, port->slave->dev->name);
                                 __release_rx_machine_lock(port);
                                 return;
@@ -1166,7 +1174,8 @@ static void ad_tx_machine(struct port *port)
                         __update_lacpdu_from_port(port);
 
                         if (ad_lacpdu_send(port) >= 0) {
-                                pr_debug("Sent LACPDU on port %d\n", port->actor_port_number);
+                                pr_debug("Sent LACPDU on port %d\n",
+                                         port->actor_port_number);
 
                                 /* mark ntt as false, so it will not be sent again until
                                    demanded */
@@ -1241,7 +1250,9 @@ static void ad_periodic_machine(struct port *port)
 
         // check if the state machine was changed
         if (port->sm_periodic_state != last_state) {
-                pr_debug("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_periodic_state);
+                pr_debug("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n",
+                         port->actor_port_number, last_state,
+                         port->sm_periodic_state);
                 switch (port->sm_periodic_state) {
                 case AD_NO_PERIODIC:
                         port->sm_periodic_timer_counter = 0;       // zero timer
@@ -1298,7 +1309,9 @@ static void ad_port_selection_logic(struct port *port)
                                 port->next_port_in_aggregator=NULL;
                                 port->actor_port_aggregator_identifier=0;
 
-                                pr_debug("Port %d left LAG %d\n", port->actor_port_number, temp_aggregator->aggregator_identifier);
+                                pr_debug("Port %d left LAG %d\n",
+                                         port->actor_port_number,
+                                         temp_aggregator->aggregator_identifier);
                                 // if the aggregator is empty, clear its parameters, and set it ready to be attached
                                 if (!temp_aggregator->lag_ports) {
                                         ad_clear_agg(temp_aggregator);
@@ -1307,9 +1320,7 @@ static void ad_port_selection_logic(struct port *port)
                         }
                 }
                 if (!curr_port) { // meaning: the port was related to an aggregator but was not on the aggregator port list
-                        pr_warning(DRV_NAME ": %s: Warning: Port %d (on %s) "
-                                   "was related to aggregator %d but was not "
-                                   "on its port list\n",
+                        pr_warning("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",
                                    port->slave->dev->master->name,
                                    port->actor_port_number,
                                    port->slave->dev->name,
@@ -1343,7 +1354,9 @@ static void ad_port_selection_logic(struct port *port)
                         port->next_port_in_aggregator=aggregator->lag_ports;
                         port->aggregator->num_of_ports++;
                         aggregator->lag_ports=port;
-                        pr_debug("Port %d joined LAG %d(existing LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+                        pr_debug("Port %d joined LAG %d(existing LAG)\n",
+                                 port->actor_port_number,
+                                 port->aggregator->aggregator_identifier);
 
                         // mark this port as selected
                         port->sm_vars |= AD_PORT_SELECTED;
@@ -1380,10 +1393,11 @@ static void ad_port_selection_logic(struct port *port)
                         // mark this port as selected
                         port->sm_vars |= AD_PORT_SELECTED;
 
-                        pr_debug("Port %d joined LAG %d(new LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+                        pr_debug("Port %d joined LAG %d(new LAG)\n",
+                                 port->actor_port_number,
+                                 port->aggregator->aggregator_identifier);
                 } else {
-                        pr_err(DRV_NAME ": %s: Port %d (on %s) did not find "
-                               "a suitable aggregator\n",
+                        pr_err("%s: Port %d (on %s) did not find a suitable aggregator\n",
                                port->slave->dev->master->name,
                                port->actor_port_number, port->slave->dev->name);
                 }
@@ -1460,8 +1474,7 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best,
                 break;
 
         default:
-                pr_warning(DRV_NAME
-                           ": %s: Impossible agg select mode %d\n",
+                pr_warning("%s: Impossible agg select mode %d\n",
                            curr->slave->dev->master->name,
                            __get_agg_selection_mode(curr->lag_ports));
                 break;
@@ -1546,40 +1559,38 @@ static void ad_agg_selection_logic(struct aggregator *agg)
         // if there is new best aggregator, activate it
         if (best) {
                 pr_debug("best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
-                       best->aggregator_identifier, best->num_of_ports,
-                       best->actor_oper_aggregator_key,
-                       best->partner_oper_aggregator_key,
-                       best->is_individual, best->is_active);
+                         best->aggregator_identifier, best->num_of_ports,
+                         best->actor_oper_aggregator_key,
+                         best->partner_oper_aggregator_key,
+                         best->is_individual, best->is_active);
                 pr_debug("best ports %p slave %p %s\n",
-                       best->lag_ports, best->slave,
-                       best->slave ? best->slave->dev->name : "NULL");
+                         best->lag_ports, best->slave,
+                         best->slave ? best->slave->dev->name : "NULL");
 
                 for (agg = __get_first_agg(best->lag_ports); agg;
                      agg = __get_next_agg(agg)) {
 
                         pr_debug("Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
-                                agg->aggregator_identifier, agg->num_of_ports,
-                                agg->actor_oper_aggregator_key,
-                                agg->partner_oper_aggregator_key,
-                                agg->is_individual, agg->is_active);
+                                 agg->aggregator_identifier, agg->num_of_ports,
+                                 agg->actor_oper_aggregator_key,
+                                 agg->partner_oper_aggregator_key,
+                                 agg->is_individual, agg->is_active);
                 }
 
                 // check if any partner replys
                 if (best->is_individual) {
-                        pr_warning(DRV_NAME ": %s: Warning: No 802.3ad"
-                               " response from the link partner for any"
-                               " adapters in the bond\n",
-                               best->slave->dev->master->name);
+                        pr_warning("%s: Warning: No 802.3ad response from the link partner for any adapters in the bond\n",
+                                   best->slave->dev->master->name);
                 }
 
                 best->is_active = 1;
                 pr_debug("LAG %d chosen as the active LAG\n",
-                        best->aggregator_identifier);
+                         best->aggregator_identifier);
                 pr_debug("Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
-                        best->aggregator_identifier, best->num_of_ports,
-                        best->actor_oper_aggregator_key,
-                        best->partner_oper_aggregator_key,
-                        best->is_individual, best->is_active);
+                         best->aggregator_identifier, best->num_of_ports,
+                         best->actor_oper_aggregator_key,
+                         best->partner_oper_aggregator_key,
+                         best->is_individual, best->is_active);
 
                 // disable the ports that were related to the former active_aggregator
                 if (active) {
@@ -1633,7 +1644,8 @@ static void ad_clear_agg(struct aggregator *aggregator)
                 aggregator->lag_ports = NULL;
                 aggregator->is_active = 0;
                 aggregator->num_of_ports = 0;
-                pr_debug("LAG %d was cleared\n", aggregator->aggregator_identifier);
+                pr_debug("LAG %d was cleared\n",
+                         aggregator->aggregator_identifier);
         }
 }
 
@@ -1728,7 +1740,9 @@ static void ad_initialize_port(struct port *port, int lacp_fast)
 static void ad_enable_collecting_distributing(struct port *port)
 {
         if (port->aggregator->is_active) {
-                pr_debug("Enabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+                pr_debug("Enabling port %d(LAG %d)\n",
+                         port->actor_port_number,
+                         port->aggregator->aggregator_identifier);
                 __enable_port(port);
         }
 }
@@ -1741,7 +1755,9 @@ static void ad_enable_collecting_distributing(struct port *port)
 static void ad_disable_collecting_distributing(struct port *port)
 {
         if (port->aggregator && MAC_ADDRESS_COMPARE(&(port->aggregator->partner_system), &(null_mac_addr))) {
-                pr_debug("Disabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+                pr_debug("Disabling port %d(LAG %d)\n",
+                         port->actor_port_number,
+                         port->aggregator->aggregator_identifier);
                 __disable_port(port);
         }
 }
@@ -1779,7 +1795,8 @@ static void ad_marker_info_send(struct port *port)
 
         // send the marker information
         if (ad_marker_send(port, &marker) >= 0) {
-                pr_debug("Sent Marker Information on port %d\n", port->actor_port_number);
+                pr_debug("Sent Marker Information on port %d\n",
+                         port->actor_port_number);
         }
 }
 #endif
@@ -1803,7 +1820,8 @@ static void ad_marker_info_received(struct bond_marker *marker_info,
         // send the marker response
 
         if (ad_marker_send(port, &marker) >= 0) {
-                pr_debug("Sent Marker Response on port %d\n", port->actor_port_number);
+                pr_debug("Sent Marker Response on port %d\n",
+                         port->actor_port_number);
         }
 }
 
@@ -1889,8 +1907,7 @@ int bond_3ad_bind_slave(struct slave *slave)
         struct aggregator *aggregator;
 
         if (bond == NULL) {
-                pr_err(DRV_NAME ": %s: The slave %s is not attached to "
-                       "its bond\n",
+                pr_err("%s: The slave %s is not attached to its bond\n",
                        slave->dev->master->name, slave->dev->name);
                 return -1;
         }
@@ -1966,13 +1983,13 @@ void bond_3ad_unbind_slave(struct slave *slave)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                pr_warning(DRV_NAME ": Warning: %s: Trying to "
-                           "unbind an uninitialized port on %s\n",
+                pr_warning("Warning: %s: Trying to unbind an uninitialized port on %s\n",
                            slave->dev->master->name, slave->dev->name);
                 return;
         }
 
-        pr_debug("Unbinding Link Aggregation Group %d\n", aggregator->aggregator_identifier);
+        pr_debug("Unbinding Link Aggregation Group %d\n",
+                 aggregator->aggregator_identifier);
 
         /* Tell the partner that this port is not suitable for aggregation */
         port->actor_oper_port_state &= ~AD_STATE_AGGREGATION;
@@ -1996,10 +2013,12 @@ void bond_3ad_unbind_slave(struct slave *slave)
                         // if new aggregator found, copy the aggregator's parameters
                         // and connect the related lag_ports to the new aggregator
                         if ((new_aggregator) && ((!new_aggregator->lag_ports) || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator))) {
-                                pr_debug("Some port(s) related to LAG %d - replaceing with LAG %d\n", aggregator->aggregator_identifier, new_aggregator->aggregator_identifier);
+                                pr_debug("Some port(s) related to LAG %d - replaceing with LAG %d\n",
+                                         aggregator->aggregator_identifier,
+                                         new_aggregator->aggregator_identifier);
 
                                 if ((new_aggregator->lag_ports == port) && new_aggregator->is_active) {
-                                        pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                                        pr_info("%s: Removing an active aggregator\n",
                                                 aggregator->slave->dev->master->name);
                                         // select new active aggregator
                                          select_new_active_agg = 1;
@@ -2030,8 +2049,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                         ad_agg_selection_logic(__get_first_agg(port));
                                 }
                         } else {
-                                pr_warning(DRV_NAME ": %s: Warning: unbinding aggregator, "
-                                           "and could not find a new aggregator for its ports\n",
+                                pr_warning("%s: Warning: unbinding aggregator, and could not find a new aggregator for its ports\n",
                                            slave->dev->master->name);
                         }
                 } else { // in case that the only port related to this aggregator is the one we want to remove
@@ -2039,7 +2057,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                         // clear the aggregator
                         ad_clear_agg(aggregator);
                         if (select_new_active_agg) {
-                                pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                                pr_info("%s: Removing an active aggregator\n",
                                         slave->dev->master->name);
                                 // select new active aggregator
                                 ad_agg_selection_logic(__get_first_agg(port));
@@ -2066,7 +2084,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                         // clear the aggregator
                                         ad_clear_agg(temp_aggregator);
                                         if (select_new_active_agg) {
-                                                pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                                                pr_info("%s: Removing an active aggregator\n",
                                                         slave->dev->master->name);
                                                 // select new active aggregator
                                                 ad_agg_selection_logic(__get_first_agg(port));
@@ -2115,8 +2133,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
                 // select the active aggregator for the bond
                 if ((port = __get_first_port(bond))) {
                         if (!port->slave) {
-                                pr_warning(DRV_NAME ": %s: Warning: bond's first port is "
-                                           "uninitialized\n", bond->dev->name);
+                                pr_warning("%s: Warning: bond's first port is uninitialized\n",
+                                           bond->dev->name);
                                 goto re_arm;
                         }
 
@@ -2129,8 +2147,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
         // for each port run the state machines
         for (port = __get_first_port(bond); port; port = __get_next_port(port)) {
                 if (!port->slave) {
-                        pr_warning(DRV_NAME ": %s: Warning: Found an uninitialized "
-                                   "port\n", bond->dev->name);
+                        pr_warning("%s: Warning: Found an uninitialized port\n",
+                                   bond->dev->name);
                         goto re_arm;
                 }
 
@@ -2171,15 +2189,15 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                 port = &(SLAVE_AD_INFO(slave).port);
 
                 if (!port->slave) {
-                        pr_warning(DRV_NAME ": %s: Warning: port of slave %s "
-                                   "is uninitialized\n",
+                        pr_warning("%s: Warning: port of slave %s is uninitialized\n",
                                    slave->dev->name, slave->dev->master->name);
                         return;
                 }
 
                 switch (lacpdu->subtype) {
                 case AD_TYPE_LACPDU:
-                        pr_debug("Received LACPDU on port %d\n", port->actor_port_number);
+                        pr_debug("Received LACPDU on port %d\n",
+                                 port->actor_port_number);
                         ad_rx_machine(lacpdu, port);
                         break;
 
@@ -2188,17 +2206,20 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
 
                         switch (((struct bond_marker *)lacpdu)->tlv_type) {
                         case AD_MARKER_INFORMATION_SUBTYPE:
-                                pr_debug("Received Marker Information on port %d\n", port->actor_port_number);
+                                pr_debug("Received Marker Information on port %d\n",
+                                         port->actor_port_number);
                                 ad_marker_info_received((struct bond_marker *)lacpdu, port);
                                 break;
 
                         case AD_MARKER_RESPONSE_SUBTYPE:
-                                pr_debug("Received Marker Response on port %d\n", port->actor_port_number);
+                                pr_debug("Received Marker Response on port %d\n",
+                                         port->actor_port_number);
                                 ad_marker_response_received((struct bond_marker *)lacpdu, port);
                                 break;
 
                         default:
-                                pr_debug("Received an unknown Marker subtype on slot %d\n", port->actor_port_number);
+                                pr_debug("Received an unknown Marker subtype on slot %d\n",
+                                         port->actor_port_number);
                         }
                 }
         }
@@ -2218,8 +2239,7 @@ void bond_3ad_adapter_speed_changed(struct slave *slave)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                pr_warning(DRV_NAME ": Warning: %s: speed "
-                           "changed for uninitialized port on %s\n",
+                pr_warning("Warning: %s: speed changed for uninitialized port on %s\n",
                            slave->dev->master->name, slave->dev->name);
                 return;
         }
@@ -2246,8 +2266,7 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                pr_warning(DRV_NAME ": %s: Warning: duplex changed "
-                           "for uninitialized port on %s\n",
+                pr_warning("%s: Warning: duplex changed for uninitialized port on %s\n",
                            slave->dev->master->name, slave->dev->name);
                 return;
         }
@@ -2275,8 +2294,7 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                pr_warning(DRV_NAME ": Warning: %s: link status changed for "
-                           "uninitialized port on %s\n",
+                pr_warning("Warning: %s: link status changed for uninitialized port on %s\n",
                            slave->dev->master->name, slave->dev->name);
                 return;
         }
@@ -2381,8 +2399,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
         }
 
         if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
-                pr_debug(DRV_NAME ": %s: Error: "
-                         "bond_3ad_get_active_agg_info failed\n", dev->name);
+                pr_debug("%s: Error: bond_3ad_get_active_agg_info failed\n",
+                         dev->name);
                 goto out;
         }
 
@@ -2391,8 +2409,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
 
         if (slaves_in_agg == 0) {
                 /*the aggregator is empty*/
-                pr_debug(DRV_NAME ": %s: Error: active aggregator is empty\n",
-                         dev->name);
+                pr_debug("%s: Error: active aggregator is empty\n", dev->name);
                 goto out;
         }
 
@@ -2410,8 +2427,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
         }
 
         if (slave_agg_no >= 0) {
-                pr_err(DRV_NAME ": %s: Error: Couldn't find a slave to tx on "
-                       "for aggregator ID %d\n", dev->name, agg_id);
+                pr_err("%s: Error: Couldn't find a slave to tx on for aggregator ID %d\n",
+                       dev->name, agg_id);
                 goto out;
         }
 
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 00ab51ef3129..40fdc41446cc 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -20,6 +20,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -201,8 +203,7 @@ static int tlb_initialize(struct bonding *bond)
 
         new_hashtbl = kzalloc(size, GFP_KERNEL);
         if (!new_hashtbl) {
-                pr_err(DRV_NAME
-                       ": %s: Error: Failed to allocate TLB hash table\n",
+                pr_err("%s: Error: Failed to allocate TLB hash table\n",
                        bond->dev->name);
                 return -1;
         }
@@ -514,8 +515,7 @@ static void rlb_update_client(struct rlb_client_info *client_info)
                                  client_info->slave->dev->dev_addr,
                                  client_info->mac_dst);
                 if (!skb) {
-                        pr_err(DRV_NAME
-                               ": %s: Error: failed to create an ARP packet\n",
+                        pr_err("%s: Error: failed to create an ARP packet\n",
                                client_info->slave->dev->master->name);
                         continue;
                 }
@@ -525,8 +525,7 @@ static void rlb_update_client(struct rlb_client_info *client_info)
                 if (client_info->tag) {
                         skb = vlan_put_tag(skb, client_info->vlan_id);
                         if (!skb) {
-                                pr_err(DRV_NAME
-                                       ": %s: Error: failed to insert VLAN tag\n",
+                                pr_err("%s: Error: failed to insert VLAN tag\n",
                                        client_info->slave->dev->master->name);
                                 continue;
                         }
@@ -609,9 +608,7 @@ static void rlb_req_update_subnet_clients(struct bonding *bond, __be32 src_ip)
                 client_info = &(bond_info->rx_hashtbl[hash_index]);
 
                 if (!client_info->slave) {
-                        pr_err(DRV_NAME
-                               ": %s: Error: found a client with no channel in "
-                               "the client's hash table\n",
+                        pr_err("%s: Error: found a client with no channel in the client's hash table\n",
                                bond->dev->name);
                         continue;
                 }
@@ -806,8 +803,7 @@ static int rlb_initialize(struct bonding *bond)
 
         new_hashtbl = kmalloc(size, GFP_KERNEL);
         if (!new_hashtbl) {
-                pr_err(DRV_NAME
-                       ": %s: Error: Failed to allocate RLB hash table\n",
+                pr_err("%s: Error: Failed to allocate RLB hash table\n",
                        bond->dev->name);
                 return -1;
         }
@@ -928,8 +924,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
 
                         skb = vlan_put_tag(skb, vlan->vlan_id);
                         if (!skb) {
-                                pr_err(DRV_NAME
-                                       ": %s: Error: failed to insert VLAN tag\n",
+                                pr_err("%s: Error: failed to insert VLAN tag\n",
                                        bond->dev->name);
                                 continue;
                         }
@@ -958,11 +953,8 @@ static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[], int hw)
         memcpy(s_addr.sa_data, addr, dev->addr_len);
         s_addr.sa_family = dev->type;
         if (dev_set_mac_address(dev, &s_addr)) {
-                pr_err(DRV_NAME
-                       ": %s: Error: dev_set_mac_address of dev %s failed! ALB "
-                       "mode requires that the base driver support setting "
-                       "the hw address also when the network device's "
-                       "interface is open\n",
+                pr_err("%s: Error: dev_set_mac_address of dev %s failed!\n"
+                       "ALB mode requires that the base driver support setting the hw address also when the network device's interface is open\n",
                        dev->master->name, dev->name);
                 return -EOPNOTSUPP;
         }
@@ -1169,18 +1161,12 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
                 alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr,
                                        bond->alb_info.rlb_enabled);
 
-                pr_warning(DRV_NAME
-                           ": %s: Warning: the hw address of slave %s is "
-                           "in use by the bond; giving it the hw address "
-                           "of %s\n",
+                pr_warning("%s: Warning: the hw address of slave %s is in use by the bond; giving it the hw address of %s\n",
                            bond->dev->name, slave->dev->name,
                            free_mac_slave->dev->name);
 
         } else if (has_bond_addr) {
-                pr_err(DRV_NAME
-                       ": %s: Error: the hw address of slave %s is in use by the "
-                       "bond; couldn't find a slave with a free hw address to "
-                       "give it (this should not have happened)\n",
+                pr_err("%s: Error: the hw address of slave %s is in use by the bond; couldn't find a slave with a free hw address to give it (this should not have happened)\n",
                        bond->dev->name, slave->dev->name);
                 return -EFAULT;
         }
diff --git a/drivers/net/bonding/bond_ipv6.c b/drivers/net/bonding/bond_ipv6.c
index b72e1dc8cf8f..6dd64cf3cb76 100644
--- a/drivers/net/bonding/bond_ipv6.c
+++ b/drivers/net/bonding/bond_ipv6.c
@@ -20,6 +20,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/if_vlan.h>
 #include <net/ipv6.h>
@@ -74,20 +76,20 @@ static void bond_na_send(struct net_device *slave_dev,
         addrconf_addr_solict_mult(daddr, &mcaddr);
 
         pr_debug("ipv6 na on slave %s: dest %pI6, src %pI6\n",
-               slave_dev->name, &mcaddr, daddr);
+                 slave_dev->name, &mcaddr, daddr);
 
         skb = ndisc_build_skb(slave_dev, &mcaddr, daddr, &icmp6h, daddr,
                               ND_OPT_TARGET_LL_ADDR);
 
         if (!skb) {
-                pr_err(DRV_NAME ": NA packet allocation failed\n");
+                pr_err("NA packet allocation failed\n");
                 return;
         }
 
         if (vlan_id) {
                 skb = vlan_put_tag(skb, vlan_id);
                 if (!skb) {
-                        pr_err(DRV_NAME ": failed to insert VLAN tag\n");
+                        pr_err("failed to insert VLAN tag\n");
                         return;
                 }
         }
@@ -109,8 +111,8 @@ void bond_send_unsolicited_na(struct bonding *bond)
         struct inet6_dev *idev;
         int is_router;
 
-        pr_debug("bond_send_unsol_na: bond %s slave %s\n", bond->dev->name,
-                                slave ? slave->dev->name : "NULL");
+        pr_debug("%s: bond %s slave %s\n", bond->dev->name,
+                 __func__, slave ? slave->dev->name : "NULL");
 
         if (!slave || !bond->send_unsol_na ||
             test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state))
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index af9b9c4eb496..3f0071cfe56b 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -31,6 +31,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/types.h>
@@ -260,7 +262,7 @@ static int bond_add_vlan(struct bonding *bond, unsigned short vlan_id)
         struct vlan_entry *vlan;
 
         pr_debug("bond: %s, vlan id %d\n",
-                (bond ? bond->dev->name : "None"), vlan_id);
+                 (bond ? bond->dev->name : "None"), vlan_id);
 
         vlan = kzalloc(sizeof(struct vlan_entry), GFP_KERNEL);
         if (!vlan)
@@ -303,8 +305,8 @@ static int bond_del_vlan(struct bonding *bond, unsigned short vlan_id)
                         if (bond_is_lb(bond))
                                 bond_alb_clear_vlan(bond, vlan_id);
 
-                        pr_debug("removed VLAN ID %d from bond %s\n", vlan_id,
-                                bond->dev->name);
+                        pr_debug("removed VLAN ID %d from bond %s\n",
+                                 vlan_id, bond->dev->name);
 
                         kfree(vlan);
 
@@ -323,8 +325,8 @@ static int bond_del_vlan(struct bonding *bond, unsigned short vlan_id)
                 }
         }
 
-        pr_debug("couldn't find VLAN ID %d in bond %s\n", vlan_id,
-                bond->dev->name);
+        pr_debug("couldn't find VLAN ID %d in bond %s\n",
+                 vlan_id, bond->dev->name);
 
 out:
         write_unlock_bh(&bond->lock);
@@ -348,7 +350,7 @@ static int bond_has_challenged_slaves(struct bonding *bond)
         bond_for_each_slave(bond, slave, i) {
                 if (slave->dev->features & NETIF_F_VLAN_CHALLENGED) {
                         pr_debug("found VLAN challenged slave - %s\n",
-                                slave->dev->name);
+                                 slave->dev->name);
                         return 1;
                 }
         }
@@ -499,8 +501,7 @@ static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)
 
         res = bond_add_vlan(bond, vid);
         if (res) {
-                pr_err(DRV_NAME
-                       ": %s: Error: Failed to add vlan id %d\n",
+                pr_err("%s: Error: Failed to add vlan id %d\n",
                        bond_dev->name, vid);
         }
 }
@@ -534,8 +535,7 @@ static void bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)
 
         res = bond_del_vlan(bond, vid);
         if (res) {
-                pr_err(DRV_NAME
-                       ": %s: Error: Failed to remove vlan id %d\n",
+                pr_err("%s: Error: Failed to remove vlan id %d\n",
                        bond_dev->name, vid);
         }
 }
@@ -1053,8 +1053,7 @@ static void bond_do_fail_over_mac(struct bonding *bond,
 
                 rv = dev_set_mac_address(new_active->dev, &saddr);
                 if (rv) {
-                        pr_err(DRV_NAME
-                               ": %s: Error %d setting MAC of slave %s\n",
+                        pr_err("%s: Error %d setting MAC of slave %s\n",
                                bond->dev->name, -rv, new_active->dev->name);
                         goto out;
                 }
@@ -1067,16 +1066,14 @@ static void bond_do_fail_over_mac(struct bonding *bond,
 
                 rv = dev_set_mac_address(old_active->dev, &saddr);
                 if (rv)
-                        pr_err(DRV_NAME
-                               ": %s: Error %d setting MAC of slave %s\n",
+                        pr_err("%s: Error %d setting MAC of slave %s\n",
                                bond->dev->name, -rv, new_active->dev->name);
 out:
                 read_lock(&bond->lock);
                 write_lock_bh(&bond->curr_slave_lock);
                 break;
         default:
-                pr_err(DRV_NAME
-                       ": %s: bond_do_fail_over_mac impossible: bad policy %d\n",
+                pr_err("%s: bond_do_fail_over_mac impossible: bad policy %d\n",
                        bond->dev->name, bond->params.fail_over_mac);
                 break;
         }
@@ -1178,11 +1175,9 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
 
                 if (new_active->link == BOND_LINK_BACK) {
                         if (USES_PRIMARY(bond->params.mode)) {
-                                pr_info(DRV_NAME
-                                       ": %s: making interface %s the new "
-                                       "active one %d ms earlier.\n",
-                                       bond->dev->name, new_active->dev->name,
-                                       (bond->params.updelay - new_active->delay) * bond->params.miimon);
+                                pr_info("%s: making interface %s the new active one %d ms earlier.\n",
+                                        bond->dev->name, new_active->dev->name,
+                                        (bond->params.updelay - new_active->delay) * bond->params.miimon);
                         }
 
                         new_active->delay = 0;
@@ -1195,10 +1190,8 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
                                 bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP);
                 } else {
                         if (USES_PRIMARY(bond->params.mode)) {
-                                pr_info(DRV_NAME
-                                       ": %s: making interface %s the new "
-                                       "active one.\n",
-                                       bond->dev->name, new_active->dev->name);
+                                pr_info("%s: making interface %s the new active one.\n",
+                                        bond->dev->name, new_active->dev->name);
                         }
                 }
         }
@@ -1268,13 +1261,11 @@ void bond_select_active_slave(struct bonding *bond)
                         return;
 
                 if (netif_carrier_ok(bond->dev)) {
-                        pr_info(DRV_NAME
-                               ": %s: first active interface up!\n",
-                               bond->dev->name);
+                        pr_info("%s: first active interface up!\n",
+                                bond->dev->name);
                 } else {
-                        pr_info(DRV_NAME ": %s: "
-                               "now running without any active interface !\n",
-                               bond->dev->name);
+                        pr_info("%s: now running without any active interface !\n",
+                                bond->dev->name);
                 }
         }
 }
@@ -1423,16 +1414,14 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 
         if (!bond->params.use_carrier && slave_dev->ethtool_ops == NULL &&
                 slave_ops->ndo_do_ioctl == NULL) {
-                pr_warning(DRV_NAME
-                       ": %s: Warning: no link monitoring support for %s\n",
-                       bond_dev->name, slave_dev->name);
+                pr_warning("%s: Warning: no link monitoring support for %s\n",
+                           bond_dev->name, slave_dev->name);
         }
 
         /* bond must be initialized by bond_open() before enslaving */
         if (!(bond_dev->flags & IFF_UP)) {
-                pr_warning(DRV_NAME
-                        " %s: master_dev is not up in bond_enslave\n",
-                        bond_dev->name);
+                pr_warning("%s: master_dev is not up in bond_enslave\n",
+                           bond_dev->name);
         }
 
         /* already enslaved */
@@ -1446,19 +1435,13 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         if (slave_dev->features & NETIF_F_VLAN_CHALLENGED) {
                 pr_debug("%s: NETIF_F_VLAN_CHALLENGED\n", slave_dev->name);
                 if (!list_empty(&bond->vlan_list)) {
-                        pr_err(DRV_NAME
-                               ": %s: Error: cannot enslave VLAN "
-                               "challenged slave %s on VLAN enabled "
-                               "bond %s\n", bond_dev->name, slave_dev->name,
-                               bond_dev->name);
+                        pr_err("%s: Error: cannot enslave VLAN challenged slave %s on VLAN enabled bond %s\n",
+                               bond_dev->name, slave_dev->name, bond_dev->name);
                         return -EPERM;
                 } else {
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: enslaved VLAN challenged "
-                               "slave %s. Adding VLANs will be blocked as "
-                               "long as %s is part of bond %s\n",
-                               bond_dev->name, slave_dev->name, slave_dev->name,
-                               bond_dev->name);
+                        pr_warning("%s: Warning: enslaved VLAN challenged slave %s. Adding VLANs will be blocked as long as %s is part of bond %s\n",
+                                   bond_dev->name, slave_dev->name,
+                                   slave_dev->name, bond_dev->name);
                         bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
                 }
         } else {
@@ -1478,8 +1461,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
          * enslaving it; the old ifenslave will not.
          */
         if ((slave_dev->flags & IFF_UP)) {
-                pr_err(DRV_NAME ": %s is up. "
-                       "This may be due to an out of date ifenslave.\n",
+                pr_err("%s is up. This may be due to an out of date ifenslave.\n",
                        slave_dev->name);
                 res = -EPERM;
                 goto err_undo_flags;
@@ -1495,7 +1477,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         if (bond->slave_cnt == 0) {
                 if (bond_dev->type != slave_dev->type) {
                         pr_debug("%s: change device type from %d to %d\n",
-                                bond_dev->name, bond_dev->type, slave_dev->type);
+                                 bond_dev->name,
+                                 bond_dev->type, slave_dev->type);
 
                         netdev_bonding_change(bond_dev, NETDEV_BONDING_OLDTYPE);
 
@@ -1507,28 +1490,21 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                         netdev_bonding_change(bond_dev, NETDEV_BONDING_NEWTYPE);
                 }
         } else if (bond_dev->type != slave_dev->type) {
-                pr_err(DRV_NAME ": %s ether type (%d) is different "
-                        "from other slaves (%d), can not enslave it.\n",
-                        slave_dev->name,
-                        slave_dev->type, bond_dev->type);
-                        res = -EINVAL;
-                        goto err_undo_flags;
+                pr_err("%s ether type (%d) is different from other slaves (%d), can not enslave it.\n",
+                       slave_dev->name,
+                       slave_dev->type, bond_dev->type);
+                res = -EINVAL;
+                goto err_undo_flags;
         }
 
         if (slave_ops->ndo_set_mac_address == NULL) {
                 if (bond->slave_cnt == 0) {
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: The first slave device "
-                               "specified does not support setting the MAC "
-                               "address. Setting fail_over_mac to active.",
-                               bond_dev->name);
+                        pr_warning("%s: Warning: The first slave device specified does not support setting the MAC address. Setting fail_over_mac to active.",
+                                   bond_dev->name);
                         bond->params.fail_over_mac = BOND_FOM_ACTIVE;
                 } else if (bond->params.fail_over_mac != BOND_FOM_ACTIVE) {
-                        pr_err(DRV_NAME
-                                ": %s: Error: The slave device specified "
-                                "does not support setting the MAC address, "
-                                "but fail_over_mac is not set to active.\n"
-                                , bond_dev->name);
+                        pr_err("%s: Error: The slave device specified does not support setting the MAC address, but fail_over_mac is not set to active.\n",
+                               bond_dev->name);
                         res = -EOPNOTSUPP;
                         goto err_undo_flags;
                 }
@@ -1655,22 +1631,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                          * supported); thus, we don't need to change
                          * the messages for netif_carrier.
                          */
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: MII and ETHTOOL support not "
-                               "available for interface %s, and "
-                               "arp_interval/arp_ip_target module parameters "
-                               "not specified, thus bonding will not detect "
-                               "link failures! see bonding.txt for details.\n",
+                        pr_warning("%s: Warning: MII and ETHTOOL support not available for interface %s, and arp_interval/arp_ip_target module parameters not specified, thus bonding will not detect link failures! see bonding.txt for details.\n",
                                bond_dev->name, slave_dev->name);
                 } else if (link_reporting == -1) {
                         /* unable get link status using mii/ethtool */
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: can't get link status from "
-                               "interface %s; the network driver associated "
-                               "with this interface does not support MII or "
-                               "ETHTOOL link status reporting, thus miimon "
-                               "has no effect on this interface.\n",
-                               bond_dev->name, slave_dev->name);
+                        pr_warning("%s: Warning: can't get link status from interface %s; the network driver associated with this interface does not support MII or ETHTOOL link status reporting, thus miimon has no effect on this interface.\n",
+                                   bond_dev->name, slave_dev->name);
                 }
         }
 
@@ -1678,34 +1644,27 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         if (!bond->params.miimon ||
             (bond_check_dev_link(bond, slave_dev, 0) == BMSR_LSTATUS)) {
                 if (bond->params.updelay) {
-                        pr_debug("Initial state of slave_dev is "
-                                "BOND_LINK_BACK\n");
+                        pr_debug("Initial state of slave_dev is BOND_LINK_BACK\n");
                         new_slave->link  = BOND_LINK_BACK;
                         new_slave->delay = bond->params.updelay;
                 } else {
-                        pr_debug("Initial state of slave_dev is "
-                                "BOND_LINK_UP\n");
+                        pr_debug("Initial state of slave_dev is BOND_LINK_UP\n");
                         new_slave->link  = BOND_LINK_UP;
                 }
                 new_slave->jiffies = jiffies;
         } else {
-                pr_debug("Initial state of slave_dev is "
-                        "BOND_LINK_DOWN\n");
+                pr_debug("Initial state of slave_dev is BOND_LINK_DOWN\n");
                 new_slave->link  = BOND_LINK_DOWN;
         }
 
         if (bond_update_speed_duplex(new_slave) &&
             (new_slave->link != BOND_LINK_DOWN)) {
-                pr_warning(DRV_NAME
-                       ": %s: Warning: failed to get speed and duplex from %s, "
-                       "assumed to be 100Mb/sec and Full.\n",
-                       bond_dev->name, new_slave->dev->name);
+                pr_warning("%s: Warning: failed to get speed and duplex from %s, assumed to be 100Mb/sec and Full.\n",
+                           bond_dev->name, new_slave->dev->name);
 
                 if (bond->params.mode == BOND_MODE_8023AD) {
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: Operation of 802.3ad mode requires ETHTOOL "
-                               "support in base driver for proper aggregator "
-                               "selection.\n", bond_dev->name);
+                        pr_warning("%s: Warning: Operation of 802.3ad mode requires ETHTOOL support in base driver for proper aggregator selection.\n",
+                                   bond_dev->name);
                 }
         }
 
@@ -1777,11 +1736,10 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         if (res)
                 goto err_close;
 
-        pr_info(DRV_NAME
-               ": %s: enslaving %s as a%s interface with a%s link.\n",
-               bond_dev->name, slave_dev->name,
-               new_slave->state == BOND_STATE_ACTIVE ? "n active" : " backup",
-               new_slave->link != BOND_LINK_DOWN ? "n up" : " down");
+        pr_info("%s: enslaving %s as a%s interface with a%s link.\n",
+                bond_dev->name, slave_dev->name,
+                new_slave->state == BOND_STATE_ACTIVE ? "n active" : " backup",
+                new_slave->link != BOND_LINK_DOWN ? "n up" : " down");
 
         /* enslave is successful */
         return 0;
@@ -1833,8 +1791,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
         /* slave is not a slave or master is not master of this slave */
         if (!(slave_dev->flags & IFF_SLAVE) ||
             (slave_dev->master != bond_dev)) {
-                pr_err(DRV_NAME
-                       ": %s: Error: cannot release %s.\n",
+                pr_err("%s: Error: cannot release %s.\n",
                        bond_dev->name, slave_dev->name);
                 return -EINVAL;
         }
@@ -1844,9 +1801,8 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
         slave = bond_get_slave_by_dev(bond, slave_dev);
         if (!slave) {
                 /* not a slave of this bond */
-                pr_info(DRV_NAME
-                       ": %s: %s not enslaved\n",
-                       bond_dev->name, slave_dev->name);
+                pr_info("%s: %s not enslaved\n",
+                        bond_dev->name, slave_dev->name);
                 write_unlock_bh(&bond->lock);
                 return -EINVAL;
         }
@@ -1854,14 +1810,10 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
         if (!bond->params.fail_over_mac) {
                 if (!compare_ether_addr(bond_dev->dev_addr, slave->perm_hwaddr) &&
                     bond->slave_cnt > 1)
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: the permanent HWaddr of %s - "
-                               "%pM - is still in use by %s. "
-                               "Set the HWaddr of %s to a different address "
-                               "to avoid conflicts.\n",
-                               bond_dev->name, slave_dev->name,
-                               slave->perm_hwaddr,
-                               bond_dev->name, slave_dev->name);
+                        pr_warning("%s: Warning: the permanent HWaddr of %s - %pM - is still in use by %s. Set the HWaddr of %s to a different address to avoid conflicts.\n",
+                                   bond_dev->name, slave_dev->name,
+                                   slave->perm_hwaddr,
+                                   bond_dev->name, slave_dev->name);
         }
 
         /* Inform AD package of unbinding of slave. */
@@ -1872,12 +1824,10 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 bond_3ad_unbind_slave(slave);
         }
 
-        pr_info(DRV_NAME
-               ": %s: releasing %s interface %s\n",
-               bond_dev->name,
-               (slave->state == BOND_STATE_ACTIVE)
-               ? "active" : "backup",
-               slave_dev->name);
+        pr_info("%s: releasing %s interface %s\n",
+                bond_dev->name,
+                (slave->state == BOND_STATE_ACTIVE) ? "active" : "backup",
+                slave_dev->name);
 
         oldcurrent = bond->curr_active_slave;
 
@@ -1934,21 +1884,15 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 if (list_empty(&bond->vlan_list)) {
                         bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
                 } else {
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: clearing HW address of %s while it "
-                               "still has VLANs.\n",
-                               bond_dev->name, bond_dev->name);
-                        pr_warning(DRV_NAME
-                               ": %s: When re-adding slaves, make sure the bond's "
-                               "HW address matches its VLANs'.\n",
-                               bond_dev->name);
+                        pr_warning("%s: Warning: clearing HW address of %s while it still has VLANs.\n",
+                                   bond_dev->name, bond_dev->name);
+                        pr_warning("%s: When re-adding slaves, make sure the bond's HW address matches its VLANs'.\n",
+                                   bond_dev->name);
                 }
         } else if ((bond_dev->features & NETIF_F_VLAN_CHALLENGED) &&
                    !bond_has_challenged_slaves(bond)) {
-                pr_info(DRV_NAME
-                       ": %s: last VLAN challenged slave %s "
-                       "left bond %s. VLAN blocking is removed\n",
-                       bond_dev->name, slave_dev->name, bond_dev->name);
+                pr_info("%s: last VLAN challenged slave %s left bond %s. VLAN blocking is removed\n",
+                        bond_dev->name, slave_dev->name, bond_dev->name);
                 bond_dev->features &= ~NETIF_F_VLAN_CHALLENGED;
         }
 
@@ -2011,8 +1955,8 @@ int  bond_release_and_destroy(struct net_device *bond_dev,
 
         ret = bond_release(bond_dev, slave_dev);
         if ((ret == 0) && (bond->slave_cnt == 0)) {
-                pr_info(DRV_NAME ": %s: destroying bond %s.\n",
-                       bond_dev->name, bond_dev->name);
+                pr_info("%s: destroying bond %s.\n",
+                        bond_dev->name, bond_dev->name);
                 unregister_netdevice(bond_dev);
         }
         return ret;
@@ -2116,19 +2060,13 @@ static int bond_release_all(struct net_device *bond_dev)
         if (list_empty(&bond->vlan_list))
                 bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
         else {
-                pr_warning(DRV_NAME
-                       ": %s: Warning: clearing HW address of %s while it "
-                       "still has VLANs.\n",
-                       bond_dev->name, bond_dev->name);
-                pr_warning(DRV_NAME
-                       ": %s: When re-adding slaves, make sure the bond's "
-                       "HW address matches its VLANs'.\n",
-                       bond_dev->name);
+                pr_warning("%s: Warning: clearing HW address of %s while it still has VLANs.\n",
+                           bond_dev->name, bond_dev->name);
+                pr_warning("%s: When re-adding slaves, make sure the bond's HW address matches its VLANs'.\n",
+                           bond_dev->name);
         }
 
-        pr_info(DRV_NAME
-               ": %s: released all slaves\n",
-               bond_dev->name);
+        pr_info("%s: released all slaves\n", bond_dev->name);
 
 out:
         write_unlock_bh(&bond->lock);
@@ -2254,16 +2192,14 @@ static int bond_miimon_inspect(struct bonding *bond)
                         slave->link = BOND_LINK_FAIL;
                         slave->delay = bond->params.downdelay;
                         if (slave->delay) {
-                                pr_info(DRV_NAME
-                                       ": %s: link status down for %s"
-                                       "interface %s, disabling it in %d ms.\n",
-                                       bond->dev->name,
-                                       (bond->params.mode ==
-                                        BOND_MODE_ACTIVEBACKUP) ?
-                                       ((slave->state == BOND_STATE_ACTIVE) ?
-                                        "active " : "backup ") : "",
-                                       slave->dev->name,
-                                       bond->params.downdelay * bond->params.miimon);
+                                pr_info("%s: link status down for %sinterface %s, disabling it in %d ms.\n",
+                                        bond->dev->name,
+                                        (bond->params.mode ==
+                                         BOND_MODE_ACTIVEBACKUP) ?
+                                        ((slave->state == BOND_STATE_ACTIVE) ?
+                                         "active " : "backup ") : "",
+                                        slave->dev->name,
+                                        bond->params.downdelay * bond->params.miimon);
                         }
                         /*FALLTHRU*/
                 case BOND_LINK_FAIL:
@@ -2273,13 +2209,11 @@ static int bond_miimon_inspect(struct bonding *bond)
                                  */
                                 slave->link = BOND_LINK_UP;
                                 slave->jiffies = jiffies;
-                                pr_info(DRV_NAME
-                                       ": %s: link status up again after %d "
-                                       "ms for interface %s.\n",
-                                       bond->dev->name,
-                                       (bond->params.downdelay - slave->delay) *
-                                       bond->params.miimon,
-                                       slave->dev->name);
+                                pr_info("%s: link status up again after %d ms for interface %s.\n",
+                                        bond->dev->name,
+                                        (bond->params.downdelay - slave->delay) *
+                                        bond->params.miimon,
+                                        slave->dev->name);
                                 continue;
                         }
 
@@ -2300,25 +2234,21 @@ static int bond_miimon_inspect(struct bonding *bond)
                         slave->delay = bond->params.updelay;
 
                         if (slave->delay) {
-                                pr_info(DRV_NAME
-                                       ": %s: link status up for "
-                                       "interface %s, enabling it in %d ms.\n",
-                                       bond->dev->name, slave->dev->name,
-                                       ignore_updelay ? 0 :
-                                       bond->params.updelay *
-                                       bond->params.miimon);
+                                pr_info("%s: link status up for interface %s, enabling it in %d ms.\n",
+                                        bond->dev->name, slave->dev->name,
+                                        ignore_updelay ? 0 :
+                                        bond->params.updelay *
+                                        bond->params.miimon);
                         }
                         /*FALLTHRU*/
                 case BOND_LINK_BACK:
                         if (!link_state) {
                                 slave->link = BOND_LINK_DOWN;
-                                pr_info(DRV_NAME
-                                       ": %s: link status down again after %d "
-                                       "ms for interface %s.\n",
-                                       bond->dev->name,
-                                       (bond->params.updelay - slave->delay) *
-                                       bond->params.miimon,
-                                       slave->dev->name);
+                                pr_info("%s: link status down again after %d ms for interface %s.\n",
+                                        bond->dev->name,
+                                        (bond->params.updelay - slave->delay) *
+                                        bond->params.miimon,
+                                        slave->dev->name);
 
                                 continue;
                         }
@@ -2366,10 +2296,8 @@ static void bond_miimon_commit(struct bonding *bond)
                                 slave->state = BOND_STATE_BACKUP;
                         }
 
-                        pr_info(DRV_NAME
-                               ": %s: link status definitely "
-                               "up for interface %s.\n",
-                               bond->dev->name, slave->dev->name);
+                        pr_info("%s: link status definitely up for interface %s.\n",
+                                bond->dev->name, slave->dev->name);
 
                         /* notify ad that the link status has changed */
                         if (bond->params.mode == BOND_MODE_8023AD)
@@ -2395,10 +2323,8 @@ static void bond_miimon_commit(struct bonding *bond)
                             bond->params.mode == BOND_MODE_8023AD)
                                 bond_set_slave_inactive_flags(slave);
 
-                        pr_info(DRV_NAME
-                               ": %s: link status definitely down for "
-                               "interface %s, disabling it\n",
-                               bond->dev->name, slave->dev->name);
+                        pr_info("%s: link status definitely down for interface %s, disabling it\n",
+                                bond->dev->name, slave->dev->name);
 
                         if (bond->params.mode == BOND_MODE_8023AD)
                                 bond_3ad_handle_link_change(slave,
@@ -2414,8 +2340,7 @@ static void bond_miimon_commit(struct bonding *bond)
                         continue;
 
                 default:
-                        pr_err(DRV_NAME
-                               ": %s: invalid new link %d on slave %s\n",
+                        pr_err("%s: invalid new link %d on slave %s\n",
                                bond->dev->name, slave->new_link,
                                slave->dev->name);
                         slave->new_link = BOND_LINK_NOCHANGE;
@@ -2534,19 +2459,19 @@ static void bond_arp_send(struct net_device *slave_dev, int arp_op, __be32 dest_
         struct sk_buff *skb;
 
         pr_debug("arp %d on slave %s: dst %x src %x vid %d\n", arp_op,
-               slave_dev->name, dest_ip, src_ip, vlan_id);
+                 slave_dev->name, dest_ip, src_ip, vlan_id);
 
         skb = arp_create(arp_op, ETH_P_ARP, dest_ip, slave_dev, src_ip,
                          NULL, slave_dev->dev_addr, NULL);
 
         if (!skb) {
-                pr_err(DRV_NAME ": ARP packet allocation failed\n");
+                pr_err("ARP packet allocation failed\n");
                 return;
         }
         if (vlan_id) {
                 skb = vlan_put_tag(skb, vlan_id);
                 if (!skb) {
-                        pr_err(DRV_NAME ": failed to insert VLAN tag\n");
+                        pr_err("failed to insert VLAN tag\n");
                         return;
                 }
         }
@@ -2586,9 +2511,8 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 rv = ip_route_output_key(dev_net(bond->dev), &rt, &fl);
                 if (rv) {
                         if (net_ratelimit()) {
-                                pr_warning(DRV_NAME
-                             ": %s: no route to arp_ip_target %pI4\n",
-                                       bond->dev->name, &fl.fl4_dst);
+                                pr_warning("%s: no route to arp_ip_target %pI4\n",
+                                           bond->dev->name, &fl.fl4_dst);
                         }
                         continue;
                 }
@@ -2623,10 +2547,9 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 }
 
                 if (net_ratelimit()) {
-                        pr_warning(DRV_NAME
-               ": %s: no path to arp_ip_target %pI4 via rt.dev %s\n",
-                               bond->dev->name, &fl.fl4_dst,
-                               rt->u.dst.dev ? rt->u.dst.dev->name : "NULL");
+                        pr_warning("%s: no path to arp_ip_target %pI4 via rt.dev %s\n",
+                                   bond->dev->name, &fl.fl4_dst,
+                                   rt->u.dst.dev ? rt->u.dst.dev->name : "NULL");
                 }
                 ip_rt_put(rt);
         }
@@ -2644,8 +2567,8 @@ static void bond_send_gratuitous_arp(struct bonding *bond)
         struct vlan_entry *vlan;
         struct net_device *vlan_dev;
 
-        pr_debug("bond_send_grat_arp: bond %s slave %s\n", bond->dev->name,
-                                slave ? slave->dev->name : "NULL");
+        pr_debug("bond_send_grat_arp: bond %s slave %s\n",
+                 bond->dev->name, slave ? slave->dev->name : "NULL");
 
         if (!slave || !bond->send_grat_arp ||
             test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state))
@@ -2674,7 +2597,8 @@ static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32
 
         for (i = 0; (i < BOND_MAX_ARP_TARGETS) && targets[i]; i++) {
                 pr_debug("bva: sip %pI4 tip %pI4 t[%d] %pI4 bhti(tip) %d\n",
-                        &sip, &tip, i, &targets[i], bond_has_this_ip(bond, tip));
+                         &sip, &tip, i, &targets[i],
+                         bond_has_this_ip(bond, tip));
                 if (sip == targets[i]) {
                         if (bond_has_this_ip(bond, tip))
                                 slave->last_arp_rx = jiffies;
@@ -2698,8 +2622,8 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
         read_lock(&bond->lock);
 
         pr_debug("bond_arp_rcv: bond %s skb->dev %s orig_dev %s\n",
-                bond->dev->name, skb->dev ? skb->dev->name : "NULL",
-                orig_dev ? orig_dev->name : "NULL");
+                 bond->dev->name, skb->dev ? skb->dev->name : "NULL",
+                 orig_dev ? orig_dev->name : "NULL");
 
         slave = bond_get_slave_by_dev(bond, orig_dev);
         if (!slave || !slave_do_arp_validate(bond, slave))
@@ -2724,9 +2648,9 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
         memcpy(&tip, arp_ptr, 4);
 
         pr_debug("bond_arp_rcv: %s %s/%d av %d sv %d sip %pI4 tip %pI4\n",
-                bond->dev->name, slave->dev->name, slave->state,
-                bond->params.arp_validate, slave_do_arp_validate(bond, slave),
-                &sip, &tip);
+                 bond->dev->name, slave->dev->name, slave->state,
+                 bond->params.arp_validate, slave_do_arp_validate(bond, slave),
+                 &sip, &tip);
 
         /*
          * Backup slaves won't see the ARP reply, but do come through
@@ -2800,17 +2724,14 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
                                  * is closed.
                                  */
                                 if (!oldcurrent) {
-                                        pr_info(DRV_NAME
-                                               ": %s: link status definitely "
-                                               "up for interface %s, ",
-                                               bond->dev->name,
-                                               slave->dev->name);
+                                        pr_info("%s: link status definitely up for interface %s, ",
+                                                bond->dev->name,
+                                                slave->dev->name);
                                         do_failover = 1;
                                 } else {
-                                        pr_info(DRV_NAME
-                                               ": %s: interface %s is now up\n",
-                                               bond->dev->name,
-                                               slave->dev->name);
+                                        pr_info("%s: interface %s is now up\n",
+                                                bond->dev->name,
+                                                slave->dev->name);
                                 }
                         }
                 } else {
@@ -2829,10 +2750,9 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
                                 if (slave->link_failure_count < UINT_MAX)
                                         slave->link_failure_count++;
 
-                                pr_info(DRV_NAME
-                                       ": %s: interface %s is now down.\n",
-                                       bond->dev->name,
-                                       slave->dev->name);
+                                pr_info("%s: interface %s is now down.\n",
+                                        bond->dev->name,
+                                        slave->dev->name);
 
                                 if (slave == oldcurrent)
                                         do_failover = 1;
@@ -2965,9 +2885,7 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
                                 slave->link = BOND_LINK_UP;
                                 bond->current_arp_slave = NULL;
 
-                                pr_info(DRV_NAME
-                                        ": %s: link status definitely "
-                                        "up for interface %s.\n",
+                                pr_info("%s: link status definitely up for interface %s.\n",
                                         bond->dev->name, slave->dev->name);
 
                                 if (!bond->curr_active_slave ||
@@ -2985,9 +2903,7 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
                         slave->link = BOND_LINK_DOWN;
                         bond_set_slave_inactive_flags(slave);
 
-                        pr_info(DRV_NAME
-                                ": %s: link status definitely down for "
-                                "interface %s, disabling it\n",
+                        pr_info("%s: link status definitely down for interface %s, disabling it\n",
                                 bond->dev->name, slave->dev->name);
 
                         if (slave == bond->curr_active_slave) {
@@ -2998,8 +2914,7 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
                         continue;
 
                 default:
-                        pr_err(DRV_NAME
-                               ": %s: impossible: new_link %d on slave %s\n",
+                        pr_err("%s: impossible: new_link %d on slave %s\n",
                                bond->dev->name, slave->new_link,
                                slave->dev->name);
                         continue;
@@ -3028,9 +2943,9 @@ static void bond_ab_arp_probe(struct bonding *bond)
         read_lock(&bond->curr_slave_lock);
 
         if (bond->current_arp_slave && bond->curr_active_slave)
-                pr_info(DRV_NAME "PROBE: c_arp %s && cas %s BAD\n",
-                       bond->current_arp_slave->dev->name,
-                       bond->curr_active_slave->dev->name);
+                pr_info("PROBE: c_arp %s && cas %s BAD\n",
+                        bond->current_arp_slave->dev->name,
+                        bond->curr_active_slave->dev->name);
 
         if (bond->curr_active_slave) {
                 bond_arp_send_all(bond, bond->curr_active_slave);
@@ -3078,9 +2993,8 @@ static void bond_ab_arp_probe(struct bonding *bond)
 
                         bond_set_slave_inactive_flags(slave);
 
-                        pr_info(DRV_NAME
-                               ": %s: backup interface %s is now down.\n",
-                               bond->dev->name, slave->dev->name);
+                        pr_info("%s: backup interface %s is now down.\n",
+                                bond->dev->name, slave->dev->name);
                 }
         }
 }
@@ -3360,9 +3274,8 @@ static void bond_create_proc_entry(struct bonding *bond)
                                                     S_IRUGO, bn->proc_dir,
                                                     &bond_info_fops, bond);
                 if (bond->proc_entry == NULL)
-                        pr_warning(DRV_NAME
-                               ": Warning: Cannot create /proc/net/%s/%s\n",
-                               DRV_NAME, bond_dev->name);
+                        pr_warning("Warning: Cannot create /proc/net/%s/%s\n",
+                                   DRV_NAME, bond_dev->name);
                 else
                         memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ);
         }
@@ -3388,9 +3301,8 @@ static void bond_create_proc_dir(struct bond_net *bn)
         if (!bn->proc_dir) {
                 bn->proc_dir = proc_mkdir(DRV_NAME, bn->net->proc_net);
                 if (!bn->proc_dir)
-                        pr_warning(DRV_NAME
-                                ": Warning: cannot create /proc/net/%s\n",
-                                DRV_NAME);
+                        pr_warning("Warning: cannot create /proc/net/%s\n",
+                                   DRV_NAME);
         }
 }
 
@@ -3539,8 +3451,8 @@ static int bond_netdev_event(struct notifier_block *this,
         struct net_device *event_dev = (struct net_device *)ptr;
 
         pr_debug("event_dev: %s, event: %lx\n",
-                (event_dev ? event_dev->name : "None"),
-                event);
+                 event_dev ? event_dev->name : "None",
+                 event);
 
         if (!(event_dev->priv_flags & IFF_BONDING))
                 return NOTIFY_DONE;
@@ -3875,8 +3787,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
         struct mii_ioctl_data *mii = NULL;
         int res = 0;
 
-        pr_debug("bond_ioctl: master=%s, cmd=%d\n",
-                bond_dev->name, cmd);
+        pr_debug("bond_ioctl: master=%s, cmd=%d\n", bond_dev->name, cmd);
 
         switch (cmd) {
         case SIOCGMIIPHY:
@@ -3945,12 +3856,12 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
 
         slave_dev = dev_get_by_name(dev_net(bond_dev), ifr->ifr_slave);
 
-        pr_debug("slave_dev=%p: \n", slave_dev);
+        pr_debug("slave_dev=%p:\n", slave_dev);
 
         if (!slave_dev)
                 res = -ENODEV;
         else {
-                pr_debug("slave_dev->name=%s: \n", slave_dev->name);
+                pr_debug("slave_dev->name=%s:\n", slave_dev->name);
                 switch (cmd) {
                 case BOND_ENSLAVE_OLD:
                 case SIOCBONDENSLAVE:
@@ -4059,7 +3970,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
         int i;
 
         pr_debug("bond=%p, name=%s, new_mtu=%d\n", bond,
-                (bond_dev ? bond_dev->name : "None"), new_mtu);
+                 (bond_dev ? bond_dev->name : "None"), new_mtu);
 
         /* Can't hold bond->lock with bh disabled here since
          * some base drivers panic. On the other hand we can't
@@ -4077,8 +3988,10 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
          */
 
         bond_for_each_slave(bond, slave, i) {
-                pr_debug("s %p s->p %p c_m %p\n", slave,
-                        slave->prev, slave->dev->netdev_ops->ndo_change_mtu);
+                pr_debug("s %p s->p %p c_m %p\n",
+                         slave,
+                         slave->prev,
+                         slave->dev->netdev_ops->ndo_change_mtu);
 
                 res = dev_set_mtu(slave->dev, new_mtu);
 
@@ -4108,8 +4021,8 @@ unwind:
 
                 tmp_res = dev_set_mtu(slave->dev, bond_dev->mtu);
                 if (tmp_res) {
-                        pr_debug("unwind err %d dev %s\n", tmp_res,
-                                slave->dev->name);
+                        pr_debug("unwind err %d dev %s\n",
+                                 tmp_res, slave->dev->name);
                 }
         }
 
@@ -4135,7 +4048,8 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr)
                 return bond_alb_set_mac_address(bond_dev, addr);
 
 
-        pr_debug("bond=%p, name=%s\n", bond, (bond_dev ? bond_dev->name : "None"));
+        pr_debug("bond=%p, name=%s\n",
+                 bond, bond_dev ? bond_dev->name : "None");
 
         /*
          * If fail_over_mac is set to active, do nothing and return
@@ -4200,8 +4114,8 @@ unwind:
 
                 tmp_res = dev_set_mac_address(slave->dev, &tmp_sa);
                 if (tmp_res) {
-                        pr_debug("unwind err %d dev %s\n", tmp_res,
-                                slave->dev->name);
+                        pr_debug("unwind err %d dev %s\n",
+                                 tmp_res, slave->dev->name);
                 }
         }
 
@@ -4357,9 +4271,7 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
                         if (tx_dev) {
                                 struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
                                 if (!skb2) {
-                                        pr_err(DRV_NAME
-                                               ": %s: Error: bond_xmit_broadcast(): "
-                                               "skb_clone() failed\n",
+                                        pr_err("%s: Error: bond_xmit_broadcast(): skb_clone() failed\n",
                                                bond_dev->name);
                                         continue;
                                 }
@@ -4425,8 +4337,8 @@ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 return bond_alb_xmit(skb, dev);
         default:
                 /* Should never happen, mode already checked */
-                pr_err(DRV_NAME ": %s: Error: Unknown bonding mode %d\n",
-                     dev->name, bond->params.mode);
+                pr_err("%s: Error: Unknown bonding mode %d\n",
+                       dev->name, bond->params.mode);
                 WARN_ON_ONCE(1);
                 dev_kfree_skb(skb);
                 return NETDEV_TX_OK;
@@ -4462,10 +4374,8 @@ void bond_set_mode_ops(struct bonding *bond, int mode)
                 break;
         default:
                 /* Should never happen, mode already checked */
-                pr_err(DRV_NAME
-                       ": %s: Error: Unknown bonding mode %d\n",
-                       bond_dev->name,
-                       mode);
+                pr_err("%s: Error: Unknown bonding mode %d\n",
+                       bond_dev->name, mode);
                 break;
         }
 }
@@ -4650,8 +4560,7 @@ static int bond_check_params(struct bond_params *params)
         if (mode) {
                 bond_mode = bond_parse_parm(mode, bond_mode_tbl);
                 if (bond_mode == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: Invalid bonding mode \"%s\"\n",
+                        pr_err("Error: Invalid bonding mode \"%s\"\n",
                                mode == NULL ? "NULL" : mode);
                         return -EINVAL;
                 }
@@ -4660,16 +4569,13 @@ static int bond_check_params(struct bond_params *params)
         if (xmit_hash_policy) {
                 if ((bond_mode != BOND_MODE_XOR) &&
                     (bond_mode != BOND_MODE_8023AD)) {
-                        pr_info(DRV_NAME
-                                ": xmit_hash_policy param is irrelevant in"
-                                " mode %s\n",
+                        pr_info("xmit_hash_policy param is irrelevant in mode %s\n",
                                bond_mode_name(bond_mode));
                 } else {
                         xmit_hashtype = bond_parse_parm(xmit_hash_policy,
                                                         xmit_hashtype_tbl);
                         if (xmit_hashtype == -1) {
-                                pr_err(DRV_NAME
-                                       ": Error: Invalid xmit_hash_policy \"%s\"\n",
+                                pr_err("Error: Invalid xmit_hash_policy \"%s\"\n",
                                        xmit_hash_policy == NULL ? "NULL" :
                                        xmit_hash_policy);
                                 return -EINVAL;
@@ -4679,14 +4585,12 @@ static int bond_check_params(struct bond_params *params)
 
         if (lacp_rate) {
                 if (bond_mode != BOND_MODE_8023AD) {
-                        pr_info(DRV_NAME
-                               ": lacp_rate param is irrelevant in mode %s\n",
-                               bond_mode_name(bond_mode));
+                        pr_info("lacp_rate param is irrelevant in mode %s\n",
+                                bond_mode_name(bond_mode));
                 } else {
                         lacp_fast = bond_parse_parm(lacp_rate, bond_lacp_tbl);
                         if (lacp_fast == -1) {
-                                pr_err(DRV_NAME
-                                       ": Error: Invalid lacp rate \"%s\"\n",
+                                pr_err("Error: Invalid lacp rate \"%s\"\n",
                                        lacp_rate == NULL ? "NULL" : lacp_rate);
                                 return -EINVAL;
                         }
@@ -4696,82 +4600,64 @@ static int bond_check_params(struct bond_params *params)
         if (ad_select) {
                 params->ad_select = bond_parse_parm(ad_select, ad_select_tbl);
                 if (params->ad_select == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: Invalid ad_select \"%s\"\n",
+                        pr_err("Error: Invalid ad_select \"%s\"\n",
                                ad_select == NULL ? "NULL" : ad_select);
                         return -EINVAL;
                 }
 
                 if (bond_mode != BOND_MODE_8023AD) {
-                        pr_warning(DRV_NAME
-                               ": ad_select param only affects 802.3ad mode\n");
+                        pr_warning("ad_select param only affects 802.3ad mode\n");
                 }
         } else {
                 params->ad_select = BOND_AD_STABLE;
         }
 
         if (max_bonds < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: max_bonds (%d) not in range %d-%d, so it "
-                       "was reset to BOND_DEFAULT_MAX_BONDS (%d)\n",
-                       max_bonds, 0, INT_MAX, BOND_DEFAULT_MAX_BONDS);
+                pr_warning("Warning: max_bonds (%d) not in range %d-%d, so it was reset to BOND_DEFAULT_MAX_BONDS (%d)\n",
+                           max_bonds, 0, INT_MAX, BOND_DEFAULT_MAX_BONDS);
                 max_bonds = BOND_DEFAULT_MAX_BONDS;
         }
 
         if (miimon < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: miimon module parameter (%d), "
-                       "not in range 0-%d, so it was reset to %d\n",
-                       miimon, INT_MAX, BOND_LINK_MON_INTERV);
+                pr_warning("Warning: miimon module parameter (%d), not in range 0-%d, so it was reset to %d\n",
+                           miimon, INT_MAX, BOND_LINK_MON_INTERV);
                 miimon = BOND_LINK_MON_INTERV;
         }
 
         if (updelay < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: updelay module parameter (%d), "
-                       "not in range 0-%d, so it was reset to 0\n",
-                       updelay, INT_MAX);
+                pr_warning("Warning: updelay module parameter (%d), not in range 0-%d, so it was reset to 0\n",
+                           updelay, INT_MAX);
                 updelay = 0;
         }
 
         if (downdelay < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: downdelay module parameter (%d), "
-                       "not in range 0-%d, so it was reset to 0\n",
-                       downdelay, INT_MAX);
+                pr_warning("Warning: downdelay module parameter (%d), not in range 0-%d, so it was reset to 0\n",
+                           downdelay, INT_MAX);
                 downdelay = 0;
         }
 
         if ((use_carrier != 0) && (use_carrier != 1)) {
-                pr_warning(DRV_NAME
-                       ": Warning: use_carrier module parameter (%d), "
-                       "not of valid value (0/1), so it was set to 1\n",
-                       use_carrier);
+                pr_warning("Warning: use_carrier module parameter (%d), not of valid value (0/1), so it was set to 1\n",
+                           use_carrier);
                 use_carrier = 1;
         }
 
         if (num_grat_arp < 0 || num_grat_arp > 255) {
-                pr_warning(DRV_NAME
-                       ": Warning: num_grat_arp (%d) not in range 0-255 so it "
-                       "was reset to 1 \n", num_grat_arp);
+                pr_warning("Warning: num_grat_arp (%d) not in range 0-255 so it was reset to 1 \n",
+                           num_grat_arp);
                 num_grat_arp = 1;
         }
 
         if (num_unsol_na < 0 || num_unsol_na > 255) {
-                pr_warning(DRV_NAME
-                       ": Warning: num_unsol_na (%d) not in range 0-255 so it "
-                       "was reset to 1 \n", num_unsol_na);
+                pr_warning("Warning: num_unsol_na (%d) not in range 0-255 so it was reset to 1 \n",
+                           num_unsol_na);
                 num_unsol_na = 1;
         }
 
         /* reset values for 802.3ad */
         if (bond_mode == BOND_MODE_8023AD) {
                 if (!miimon) {
-                        pr_warning(DRV_NAME
-                               ": Warning: miimon must be specified, "
-                               "otherwise bonding will not detect link "
-                               "failure, speed and duplex which are "
-                               "essential for 802.3ad operation\n");
+                        pr_warning("Warning: miimon must be specified, otherwise bonding will not detect link failure, speed and duplex which are essential for 802.3ad operation\n");
                         pr_warning("Forcing miimon to 100msec\n");
                         miimon = 100;
                 }
@@ -4781,24 +4667,15 @@ static int bond_check_params(struct bond_params *params)
         if ((bond_mode == BOND_MODE_TLB) ||
             (bond_mode == BOND_MODE_ALB)) {
                 if (!miimon) {
-                        pr_warning(DRV_NAME
-                               ": Warning: miimon must be specified, "
-                               "otherwise bonding will not detect link "
-                               "failure and link speed which are essential "
-                               "for TLB/ALB load balancing\n");
+                        pr_warning("Warning: miimon must be specified, otherwise bonding will not detect link failure and link speed which are essential for TLB/ALB load balancing\n");
                         pr_warning("Forcing miimon to 100msec\n");
                         miimon = 100;
                 }
         }
 
         if (bond_mode == BOND_MODE_ALB) {
-                pr_notice(DRV_NAME
-                       ": In ALB mode you might experience client "
-                       "disconnections upon reconnection of a link if the "
-                       "bonding module updelay parameter (%d msec) is "
-                       "incompatible with the forwarding delay time of the "
-                       "switch\n",
-                       updelay);
+                pr_notice("In ALB mode you might experience client disconnections upon reconnection of a link if the bonding module updelay parameter (%d msec) is incompatible with the forwarding delay time of the switch\n",
+                          updelay);
         }
 
         if (!miimon) {
@@ -4806,49 +4683,37 @@ static int bond_check_params(struct bond_params *params)
                         /* just warn the user the up/down delay will have
                          * no effect since miimon is zero...
                          */
-                        pr_warning(DRV_NAME
-                               ": Warning: miimon module parameter not set "
-                               "and updelay (%d) or downdelay (%d) module "
-                               "parameter is set; updelay and downdelay have "
-                               "no effect unless miimon is set\n",
-                               updelay, downdelay);
+                        pr_warning("Warning: miimon module parameter not set and updelay (%d) or downdelay (%d) module parameter is set; updelay and downdelay have no effect unless miimon is set\n",
+                                   updelay, downdelay);
                 }
         } else {
                 /* don't allow arp monitoring */
                 if (arp_interval) {
-                        pr_warning(DRV_NAME
-                               ": Warning: miimon (%d) and arp_interval (%d) "
-                               "can't be used simultaneously, disabling ARP "
-                               "monitoring\n",
-                               miimon, arp_interval);
+                        pr_warning("Warning: miimon (%d) and arp_interval (%d) can't be used simultaneously, disabling ARP monitoring\n",
+                                   miimon, arp_interval);
                         arp_interval = 0;
                 }
 
                 if ((updelay % miimon) != 0) {
-                        pr_warning(DRV_NAME
-                               ": Warning: updelay (%d) is not a multiple "
-                               "of miimon (%d), updelay rounded to %d ms\n",
-                               updelay, miimon, (updelay / miimon) * miimon);
+                        pr_warning("Warning: updelay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",
+                                   updelay, miimon,
+                                   (updelay / miimon) * miimon);
                 }
 
                 updelay /= miimon;
 
                 if ((downdelay % miimon) != 0) {
-                        pr_warning(DRV_NAME
-                               ": Warning: downdelay (%d) is not a multiple "
-                               "of miimon (%d), downdelay rounded to %d ms\n",
-                               downdelay, miimon,
-                               (downdelay / miimon) * miimon);
+                        pr_warning("Warning: downdelay (%d) is not a multiple of miimon (%d), downdelay rounded to %d ms\n",
+                                   downdelay, miimon,
+                                   (downdelay / miimon) * miimon);
                 }
 
                 downdelay /= miimon;
         }
 
         if (arp_interval < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: arp_interval module parameter (%d) "
-                       ", not in range 0-%d, so it was reset to %d\n",
-                       arp_interval, INT_MAX, BOND_LINK_ARP_INTERV);
+                pr_warning("Warning: arp_interval module parameter (%d) , not in range 0-%d, so it was reset to %d\n",
+                           arp_interval, INT_MAX, BOND_LINK_ARP_INTERV);
                 arp_interval = BOND_LINK_ARP_INTERV;
         }
 
@@ -4858,10 +4723,8 @@ static int bond_check_params(struct bond_params *params)
                 /* not complete check, but should be good enough to
                    catch mistakes */
                 if (!isdigit(arp_ip_target[arp_ip_count][0])) {
-                        pr_warning(DRV_NAME
-                               ": Warning: bad arp_ip_target module parameter "
-                               "(%s), ARP monitoring will not be performed\n",
-                               arp_ip_target[arp_ip_count]);
+                        pr_warning("Warning: bad arp_ip_target module parameter (%s), ARP monitoring will not be performed\n",
+                                   arp_ip_target[arp_ip_count]);
                         arp_interval = 0;
                 } else {
                         __be32 ip = in_aton(arp_ip_target[arp_ip_count]);
@@ -4871,31 +4734,25 @@ static int bond_check_params(struct bond_params *params)
 
         if (arp_interval && !arp_ip_count) {
                 /* don't allow arping if no arp_ip_target given... */
-                pr_warning(DRV_NAME
-                       ": Warning: arp_interval module parameter (%d) "
-                       "specified without providing an arp_ip_target "
-                       "parameter, arp_interval was reset to 0\n",
-                       arp_interval);
+                pr_warning("Warning: arp_interval module parameter (%d) specified without providing an arp_ip_target parameter, arp_interval was reset to 0\n",
+                           arp_interval);
                 arp_interval = 0;
         }
 
         if (arp_validate) {
                 if (bond_mode != BOND_MODE_ACTIVEBACKUP) {
-                        pr_err(DRV_NAME
-                               ": arp_validate only supported in active-backup mode\n");
+                        pr_err("arp_validate only supported in active-backup mode\n");
                         return -EINVAL;
                 }
                 if (!arp_interval) {
-                        pr_err(DRV_NAME
-                               ": arp_validate requires arp_interval\n");
+                        pr_err("arp_validate requires arp_interval\n");
                         return -EINVAL;
                 }
 
                 arp_validate_value = bond_parse_parm(arp_validate,
                                                      arp_validate_tbl);
                 if (arp_validate_value == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: invalid arp_validate \"%s\"\n",
+                        pr_err("Error: invalid arp_validate \"%s\"\n",
                                arp_validate == NULL ? "NULL" : arp_validate);
                         return -EINVAL;
                 }
@@ -4903,17 +4760,14 @@ static int bond_check_params(struct bond_params *params)
                 arp_validate_value = 0;
 
         if (miimon) {
-                pr_info(DRV_NAME
-                       ": MII link monitoring set to %d ms\n",
-                       miimon);
+                pr_info("MII link monitoring set to %d ms\n", miimon);
         } else if (arp_interval) {
                 int i;
 
-                pr_info(DRV_NAME ": ARP monitoring set to %d ms,"
-                       " validate %s, with %d target(s):",
-                       arp_interval,
-                       arp_validate_tbl[arp_validate_value].modename,
-                       arp_ip_count);
+                pr_info("ARP monitoring set to %d ms, validate %s, with %d target(s):",
+                        arp_interval,
+                        arp_validate_tbl[arp_validate_value].modename,
+                        arp_ip_count);
 
                 for (i = 0; i < arp_ip_count; i++)
                         pr_info(" %s", arp_ip_target[i]);
@@ -4924,21 +4778,15 @@ static int bond_check_params(struct bond_params *params)
                 /* miimon and arp_interval not set, we need one so things
                  * work as expected, see bonding.txt for details
                  */
-                pr_warning(DRV_NAME
-                       ": Warning: either miimon or arp_interval and "
-                       "arp_ip_target module parameters must be specified, "
-                       "otherwise bonding will not detect link failures! see "
-                       "bonding.txt for details.\n");
+                pr_warning("Warning: either miimon or arp_interval and arp_ip_target module parameters must be specified, otherwise bonding will not detect link failures! see bonding.txt for details.\n");
         }
 
         if (primary && !USES_PRIMARY(bond_mode)) {
                 /* currently, using a primary only makes sense
                  * in active backup, TLB or ALB modes
                  */
-                pr_warning(DRV_NAME
-                       ": Warning: %s primary device specified but has no "
-                       "effect in %s mode\n",
-                       primary, bond_mode_name(bond_mode));
+                pr_warning("Warning: %s primary device specified but has no effect in %s mode\n",
+                           primary, bond_mode_name(bond_mode));
                 primary = NULL;
         }
 
@@ -4946,8 +4794,7 @@ static int bond_check_params(struct bond_params *params)
                 primary_reselect_value = bond_parse_parm(primary_reselect,
                                                          pri_reselect_tbl);
                 if (primary_reselect_value == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: Invalid primary_reselect \"%s\"\n",
+                        pr_err("Error: Invalid primary_reselect \"%s\"\n",
                                primary_reselect ==
                                         NULL ? "NULL" : primary_reselect);
                         return -EINVAL;
@@ -4960,16 +4807,13 @@ static int bond_check_params(struct bond_params *params)
                 fail_over_mac_value = bond_parse_parm(fail_over_mac,
                                                       fail_over_mac_tbl);
                 if (fail_over_mac_value == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: invalid fail_over_mac \"%s\"\n",
+                        pr_err("Error: invalid fail_over_mac \"%s\"\n",
                                arp_validate == NULL ? "NULL" : arp_validate);
                         return -EINVAL;
                 }
 
                 if (bond_mode != BOND_MODE_ACTIVEBACKUP)
-                        pr_warning(DRV_NAME
-                               ": Warning: fail_over_mac only affects "
-                               "active-backup mode.\n");
+                        pr_warning("Warning: fail_over_mac only affects active-backup mode.\n");
         } else {
                 fail_over_mac_value = BOND_FOM_NONE;
         }
@@ -5076,8 +4920,7 @@ int bond_create(struct net *net, const char *name)
         bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",
                                 bond_setup);
         if (!bond_dev) {
-                pr_err(DRV_NAME ": %s: eek! can't alloc netdev!\n",
-                       name);
+                pr_err("%s: eek! can't alloc netdev!\n", name);
                 res = -ENOMEM;
                 goto out;
         }
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 4e00b4f83641..5acd557cea9b 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -19,6 +19,9 @@
  * file called LICENSE.
  *
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/device.h>
@@ -109,11 +112,10 @@ static ssize_t bonding_store_bonds(struct class *cls,
                 goto err_no_cmd;
 
         if (command[0] == '+') {
-                pr_info(DRV_NAME
-                        ": %s is being created...\n", ifname);
+                pr_info("%s is being created...\n", ifname);
                 rv = bond_create(net, ifname);
                 if (rv) {
-                        pr_info(DRV_NAME ": Bond creation failed.\n");
+                        pr_info("Bond creation failed.\n");
                         res = rv;
                 }
         } else if (command[0] == '-') {
@@ -122,12 +124,10 @@ static ssize_t bonding_store_bonds(struct class *cls,
                 rtnl_lock();
                 bond_dev = bond_get_by_name(net, ifname);
                 if (bond_dev) {
-                        pr_info(DRV_NAME ": %s is being deleted...\n",
-                                ifname);
+                        pr_info("%s is being deleted...\n", ifname);
                         unregister_netdevice(bond_dev);
                 } else {
-                        pr_err(DRV_NAME ": unable to delete non-existent %s\n",
-                               ifname);
+                        pr_err("unable to delete non-existent %s\n", ifname);
                         res = -ENODEV;
                 }
                 rtnl_unlock();
@@ -140,8 +140,7 @@ static ssize_t bonding_store_bonds(struct class *cls,
         return res;
 
 err_no_cmd:
-        pr_err(DRV_NAME ": no command found in bonding_masters."
-               " Use +ifname or -ifname.\n");
+        pr_err("no command found in bonding_masters. Use +ifname or -ifname.\n");
         return -EPERM;
 }
 
@@ -225,8 +224,8 @@ static ssize_t bonding_store_slaves(struct device *d,
 
         /* Quick sanity check -- is the bond interface up? */
         if (!(bond->dev->flags & IFF_UP)) {
-                pr_warning(DRV_NAME ": %s: doing slave updates when "
-                           "interface is down.\n", bond->dev->name);
+                pr_warning("%s: doing slave updates when interface is down.\n",
+                           bond->dev->name);
         }
 
         /* Note:  We can't hold bond->lock here, as bond_create grabs it. */
@@ -247,17 +246,14 @@ static ssize_t bonding_store_slaves(struct device *d,
 
                 dev = __dev_get_by_name(dev_net(bond->dev), ifname);
                 if (!dev) {
-                        pr_info(DRV_NAME
-                               ": %s: Interface %s does not exist!\n",
-                               bond->dev->name, ifname);
+                        pr_info("%s: Interface %s does not exist!\n",
+                                bond->dev->name, ifname);
                         ret = -ENODEV;
                         goto out;
                 }
 
                 if (dev->flags & IFF_UP) {
-                        pr_err(DRV_NAME
-                               ": %s: Error: Unable to enslave %s "
-                               "because it is already up.\n",
+                        pr_err("%s: Error: Unable to enslave %s because it is already up.\n",
                                bond->dev->name, dev->name);
                         ret = -EPERM;
                         goto out;
@@ -266,8 +262,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                 read_lock(&bond->lock);
                 bond_for_each_slave(bond, slave, i)
                         if (slave->dev == dev) {
-                                pr_err(DRV_NAME
-                                       ": %s: Interface %s is already enslaved!\n",
+                                pr_err("%s: Interface %s is already enslaved!\n",
                                        bond->dev->name, ifname);
                                 ret = -EPERM;
                                 read_unlock(&bond->lock);
@@ -275,8 +270,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                         }
                 read_unlock(&bond->lock);
 
-                pr_info(DRV_NAME ": %s: Adding slave %s.\n",
-                        bond->dev->name, ifname);
+                pr_info("%s: Adding slave %s.\n", bond->dev->name, ifname);
 
                 /* If this is the first slave, then we need to set
                    the master's hardware address to be the same as the
@@ -313,7 +307,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                                 break;
                         }
                 if (dev) {
-                        pr_info(DRV_NAME ": %s: Removing slave %s\n",
+                        pr_info("%s: Removing slave %s\n",
                                 bond->dev->name, dev->name);
                                 res = bond_release(bond->dev, dev);
                         if (res) {
@@ -323,16 +317,16 @@ static ssize_t bonding_store_slaves(struct device *d,
                         /* set the slave MTU to the default */
                         dev_set_mtu(dev, original_mtu);
                 } else {
-                        pr_err(DRV_NAME ": unable to remove non-existent"
-                               " slave %s for bond %s.\n",
-                                ifname, bond->dev->name);
+                        pr_err("unable to remove non-existent slave %s for bond %s.\n",
+                               ifname, bond->dev->name);
                         ret = -ENODEV;
                 }
                 goto out;
         }
 
 err_no_cmd:
-        pr_err(DRV_NAME ": no command found in slaves file for bond %s. Use +ifname or -ifname.\n", bond->dev->name);
+        pr_err("no command found in slaves file for bond %s. Use +ifname or -ifname.\n",
+               bond->dev->name);
         ret = -EPERM;
 
 out:
@@ -365,18 +359,16 @@ static ssize_t bonding_store_mode(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                pr_err(DRV_NAME ": unable to update mode of %s"
-                       " because interface is up.\n", bond->dev->name);
+                pr_err("unable to update mode of %s because interface is up.\n",
+                       bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
 
         new_value = bond_parse_parm(buf, bond_mode_tbl);
         if (new_value < 0)  {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid mode value %.*s.\n",
-                       bond->dev->name,
-                       (int)strlen(buf) - 1, buf);
+                pr_err("%s: Ignoring invalid mode value %.*s.\n",
+                       bond->dev->name, (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
                 goto out;
         } else {
@@ -388,8 +380,8 @@ static ssize_t bonding_store_mode(struct device *d,
 
                 bond->params.mode = new_value;
                 bond_set_mode_ops(bond, bond->params.mode);
-                pr_info(DRV_NAME ": %s: setting mode to %s (%d).\n",
-                       bond->dev->name, bond_mode_tbl[new_value].modename,
+                pr_info("%s: setting mode to %s (%d).\n",
+                        bond->dev->name, bond_mode_tbl[new_value].modename,
                        new_value);
         }
 out:
@@ -421,8 +413,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                pr_err(DRV_NAME
-                       "%s: Interface is up. Unable to update xmit policy.\n",
+                pr_err("%s: Interface is up. Unable to update xmit policy.\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
@@ -430,8 +421,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
 
         new_value = bond_parse_parm(buf, xmit_hashtype_tbl);
         if (new_value < 0)  {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid xmit hash policy value %.*s.\n",
+                pr_err("%s: Ignoring invalid xmit hash policy value %.*s.\n",
                        bond->dev->name,
                        (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
@@ -439,7 +429,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
         } else {
                 bond->params.xmit_policy = new_value;
                 bond_set_mode_ops(bond, bond->params.mode);
-                pr_info(DRV_NAME ": %s: setting xmit hash policy to %s (%d).\n",
+                pr_info("%s: setting xmit hash policy to %s (%d).\n",
                         bond->dev->name,
                         xmit_hashtype_tbl[new_value].modename, new_value);
         }
@@ -472,20 +462,18 @@ static ssize_t bonding_store_arp_validate(struct device *d,
 
         new_value = bond_parse_parm(buf, arp_validate_tbl);
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid arp_validate value %s\n",
+                pr_err("%s: Ignoring invalid arp_validate value %s\n",
                        bond->dev->name, buf);
                 return -EINVAL;
         }
         if (new_value && (bond->params.mode != BOND_MODE_ACTIVEBACKUP)) {
-                pr_err(DRV_NAME
-                       ": %s: arp_validate only supported in active-backup mode.\n",
+                pr_err("%s: arp_validate only supported in active-backup mode.\n",
                        bond->dev->name);
                 return -EINVAL;
         }
-        pr_info(DRV_NAME ": %s: setting arp_validate to %s (%d).\n",
-               bond->dev->name, arp_validate_tbl[new_value].modename,
-               new_value);
+        pr_info("%s: setting arp_validate to %s (%d).\n",
+                bond->dev->name, arp_validate_tbl[new_value].modename,
+                new_value);
 
         if (!bond->params.arp_validate && new_value)
                 bond_register_arp(bond);
@@ -523,24 +511,22 @@ static ssize_t bonding_store_fail_over_mac(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->slave_cnt != 0) {
-                pr_err(DRV_NAME
-                       ": %s: Can't alter fail_over_mac with slaves in bond.\n",
+                pr_err("%s: Can't alter fail_over_mac with slaves in bond.\n",
                        bond->dev->name);
                 return -EPERM;
         }
 
         new_value = bond_parse_parm(buf, fail_over_mac_tbl);
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid fail_over_mac value %s.\n",
+                pr_err("%s: Ignoring invalid fail_over_mac value %s.\n",
                        bond->dev->name, buf);
                 return -EINVAL;
         }
 
         bond->params.fail_over_mac = new_value;
-        pr_info(DRV_NAME ": %s: Setting fail_over_mac to %s (%d).\n",
-               bond->dev->name, fail_over_mac_tbl[new_value].modename,
-               new_value);
+        pr_info("%s: Setting fail_over_mac to %s (%d).\n",
+                bond->dev->name, fail_over_mac_tbl[new_value].modename,
+                new_value);
 
         return count;
 }
@@ -571,31 +557,26 @@ static ssize_t bonding_store_arp_interval(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no arp_interval value specified.\n",
+                pr_err("%s: no arp_interval value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid arp_interval value %d not in range 1-%d; rejected.\n",
+                pr_err("%s: Invalid arp_interval value %d not in range 1-%d; rejected.\n",
                        bond->dev->name, new_value, INT_MAX);
                 ret = -EINVAL;
                 goto out;
         }
 
-        pr_info(DRV_NAME
-               ": %s: Setting ARP monitoring interval to %d.\n",
-               bond->dev->name, new_value);
+        pr_info("%s: Setting ARP monitoring interval to %d.\n",
+                bond->dev->name, new_value);
         bond->params.arp_interval = new_value;
         if (bond->params.arp_interval)
                 bond->dev->priv_flags |= IFF_MASTER_ARPMON;
         if (bond->params.miimon) {
-                pr_info(DRV_NAME
-                       ": %s: ARP monitoring cannot be used with MII monitoring. "
-                       "%s Disabling MII monitoring.\n",
-                       bond->dev->name, bond->dev->name);
+                pr_info("%s: ARP monitoring cannot be used with MII monitoring. %s Disabling MII monitoring.\n",
+                        bond->dev->name, bond->dev->name);
                 bond->params.miimon = 0;
                 if (delayed_work_pending(&bond->mii_work)) {
                         cancel_delayed_work(&bond->mii_work);
@@ -603,10 +584,8 @@ static ssize_t bonding_store_arp_interval(struct device *d,
                 }
         }
         if (!bond->params.arp_targets[0]) {
-                pr_info(DRV_NAME
-                       ": %s: ARP monitoring has been set up, "
-                       "but no ARP targets have been specified.\n",
-                       bond->dev->name);
+                pr_info("%s: ARP monitoring has been set up, but no ARP targets have been specified.\n",
+                        bond->dev->name);
         }
         if (bond->dev->flags & IFF_UP) {
                 /* If the interface is up, we may need to fire off
@@ -666,8 +645,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
         /* look for adds */
         if (buf[0] == '+') {
                 if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
-                        pr_err(DRV_NAME
-                               ": %s: invalid ARP target %pI4 specified for addition\n",
+                        pr_err("%s: invalid ARP target %pI4 specified for addition\n",
                                bond->dev->name, &newtarget);
                         ret = -EINVAL;
                         goto out;
@@ -675,23 +653,20 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                 /* look for an empty slot to put the target in, and check for dupes */
                 for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
                         if (targets[i] == newtarget) { /* duplicate */
-                                pr_err(DRV_NAME
-                                       ": %s: ARP target %pI4 is already present\n",
+                                pr_err("%s: ARP target %pI4 is already present\n",
                                        bond->dev->name, &newtarget);
                                 ret = -EINVAL;
                                 goto out;
                         }
                         if (targets[i] == 0) {
-                                pr_info(DRV_NAME
-                                       ": %s: adding ARP target %pI4.\n",
-                                       bond->dev->name, &newtarget);
+                                pr_info("%s: adding ARP target %pI4.\n",
+                                        bond->dev->name, &newtarget);
                                 done = 1;
                                 targets[i] = newtarget;
                         }
                 }
                 if (!done) {
-                        pr_err(DRV_NAME
-                               ": %s: ARP target table is full!\n",
+                        pr_err("%s: ARP target table is full!\n",
                                bond->dev->name);
                         ret = -EINVAL;
                         goto out;
@@ -699,8 +674,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
 
         } else if (buf[0] == '-')       {
                 if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
-                        pr_err(DRV_NAME
-                               ": %s: invalid ARP target %pI4 specified for removal\n",
+                        pr_err("%s: invalid ARP target %pI4 specified for removal\n",
                                bond->dev->name, &newtarget);
                         ret = -EINVAL;
                         goto out;
@@ -709,9 +683,8 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                 for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
                         if (targets[i] == newtarget) {
                                 int j;
-                                pr_info(DRV_NAME
-                                       ": %s: removing ARP target %pI4.\n",
-                                       bond->dev->name, &newtarget);
+                                pr_info("%s: removing ARP target %pI4.\n",
+                                        bond->dev->name, &newtarget);
                                 for (j = i; (j < (BOND_MAX_ARP_TARGETS-1)) && targets[j+1]; j++)
                                         targets[j] = targets[j+1];
 
@@ -720,16 +693,14 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                         }
                 }
                 if (!done) {
-                        pr_info(DRV_NAME
-                               ": %s: unable to remove nonexistent ARP target %pI4.\n",
-                               bond->dev->name, &newtarget);
+                        pr_info("%s: unable to remove nonexistent ARP target %pI4.\n",
+                                bond->dev->name, &newtarget);
                         ret = -EINVAL;
                         goto out;
                 }
         } else {
-                pr_err(DRV_NAME ": no command found in arp_ip_targets file"
-                       " for bond %s. Use +<addr> or -<addr>.\n",
-                        bond->dev->name);
+                pr_err("no command found in arp_ip_targets file for bond %s. Use +<addr> or -<addr>.\n",
+                       bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
@@ -761,41 +732,34 @@ static ssize_t bonding_store_downdelay(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (!(bond->params.miimon)) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to set down delay as MII monitoring is disabled\n",
+                pr_err("%s: Unable to set down delay as MII monitoring is disabled\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no down delay value specified.\n",
-                       bond->dev->name);
+                pr_err("%s: no down delay value specified.\n", bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
+                pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n",
                        bond->dev->name, new_value, 1, INT_MAX);
                 ret = -EINVAL;
                 goto out;
         } else {
                 if ((new_value % bond->params.miimon) != 0) {
-                        pr_warning(DRV_NAME
-                                   ": %s: Warning: down delay (%d) is not a "
-                                   "multiple of miimon (%d), delay rounded "
-                                   "to %d ms\n",
+                        pr_warning("%s: Warning: down delay (%d) is not a multiple of miimon (%d), delay rounded to %d ms\n",
                                    bond->dev->name, new_value,
                                    bond->params.miimon,
                                    (new_value / bond->params.miimon) *
                                    bond->params.miimon);
                 }
                 bond->params.downdelay = new_value / bond->params.miimon;
-                pr_info(DRV_NAME ": %s: Setting down delay to %d.\n",
-                       bond->dev->name,
-                       bond->params.downdelay * bond->params.miimon);
+                pr_info("%s: Setting down delay to %d.\n",
+                        bond->dev->name,
+                        bond->params.downdelay * bond->params.miimon);
 
         }
 
@@ -823,41 +787,35 @@ static ssize_t bonding_store_updelay(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (!(bond->params.miimon)) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to set up delay as MII monitoring is disabled\n",
+                pr_err("%s: Unable to set up delay as MII monitoring is disabled\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no up delay value specified.\n",
+                pr_err("%s: no up delay value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
+                pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n",
                        bond->dev->name, new_value, 1, INT_MAX);
                 ret = -EINVAL;
                 goto out;
         } else {
                 if ((new_value % bond->params.miimon) != 0) {
-                        pr_warning(DRV_NAME
-                                   ": %s: Warning: up delay (%d) is not a "
-                                   "multiple of miimon (%d), updelay rounded "
-                                   "to %d ms\n",
+                        pr_warning("%s: Warning: up delay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",
                                    bond->dev->name, new_value,
                                    bond->params.miimon,
                                    (new_value / bond->params.miimon) *
                                    bond->params.miimon);
                 }
                 bond->params.updelay = new_value / bond->params.miimon;
-                pr_info(DRV_NAME ": %s: Setting up delay to %d.\n",
-                       bond->dev->name, bond->params.updelay * bond->params.miimon);
-
+                pr_info("%s: Setting up delay to %d.\n",
+                        bond->dev->name,
+                        bond->params.updelay * bond->params.miimon);
         }
 
 out:
@@ -889,16 +847,14 @@ static ssize_t bonding_store_lacp(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to update LACP rate because interface is up.\n",
+                pr_err("%s: Unable to update LACP rate because interface is up.\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
 
         if (bond->params.mode != BOND_MODE_8023AD) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
+                pr_err("%s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
@@ -908,12 +864,11 @@ static ssize_t bonding_store_lacp(struct device *d,
 
         if ((new_value == 1) || (new_value == 0)) {
                 bond->params.lacp_fast = new_value;
-                pr_info(DRV_NAME ": %s: Setting LACP rate to %s (%d).\n",
+                pr_info("%s: Setting LACP rate to %s (%d).\n",
                         bond->dev->name, bond_lacp_tbl[new_value].modename,
                         new_value);
         } else {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid LACP rate value %.*s.\n",
+                pr_err("%s: Ignoring invalid LACP rate value %.*s.\n",
                        bond->dev->name, (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
         }
@@ -943,9 +898,8 @@ static ssize_t bonding_store_ad_select(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to update ad_select because interface "
-                       "is up.\n", bond->dev->name);
+                pr_err("%s: Unable to update ad_select because interface is up.\n",
+                       bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
@@ -954,13 +908,11 @@ static ssize_t bonding_store_ad_select(struct device *d,
 
         if (new_value != -1) {
                 bond->params.ad_select = new_value;
-                pr_info(DRV_NAME
-                       ": %s: Setting ad_select to %s (%d).\n",
-                       bond->dev->name, ad_select_tbl[new_value].modename,
-                       new_value);
+                pr_info("%s: Setting ad_select to %s (%d).\n",
+                        bond->dev->name, ad_select_tbl[new_value].modename,
+                        new_value);
         } else {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid ad_select value %.*s.\n",
+                pr_err("%s: Ignoring invalid ad_select value %.*s.\n",
                        bond->dev->name, (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
         }
@@ -990,15 +942,13 @@ static ssize_t bonding_store_n_grat_arp(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no num_grat_arp value specified.\n",
+                pr_err("%s: no num_grat_arp value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0 || new_value > 255) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid num_grat_arp value %d not in range 0-255; rejected.\n",
+                pr_err("%s: Invalid num_grat_arp value %d not in range 0-255; rejected.\n",
                        bond->dev->name, new_value);
                 ret = -EINVAL;
                 goto out;
@@ -1031,16 +981,14 @@ static ssize_t bonding_store_n_unsol_na(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no num_unsol_na value specified.\n",
+                pr_err("%s: no num_unsol_na value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
 
         if (new_value < 0 || new_value > 255) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid num_unsol_na value %d not in range 0-255; rejected.\n",
+                pr_err("%s: Invalid num_unsol_na value %d not in range 0-255; rejected.\n",
                        bond->dev->name, new_value);
                 ret = -EINVAL;
                 goto out;
@@ -1075,40 +1023,31 @@ static ssize_t bonding_store_miimon(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no miimon value specified.\n",
+                pr_err("%s: no miimon value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid miimon value %d not in range %d-%d; rejected.\n",
+                pr_err("%s: Invalid miimon value %d not in range %d-%d; rejected.\n",
                        bond->dev->name, new_value, 1, INT_MAX);
                 ret = -EINVAL;
                 goto out;
         } else {
-                pr_info(DRV_NAME
-                       ": %s: Setting MII monitoring interval to %d.\n",
-                       bond->dev->name, new_value);
+                pr_info("%s: Setting MII monitoring interval to %d.\n",
+                        bond->dev->name, new_value);
                 bond->params.miimon = new_value;
                 if (bond->params.updelay)
-                        pr_info(DRV_NAME
-                              ": %s: Note: Updating updelay (to %d) "
-                              "since it is a multiple of the miimon value.\n",
-                              bond->dev->name,
-                              bond->params.updelay * bond->params.miimon);
+                        pr_info("%s: Note: Updating updelay (to %d) since it is a multiple of the miimon value.\n",
+                                bond->dev->name,
+                                bond->params.updelay * bond->params.miimon);
                 if (bond->params.downdelay)
-                        pr_info(DRV_NAME
-                              ": %s: Note: Updating downdelay (to %d) "
-                              "since it is a multiple of the miimon value.\n",
-                              bond->dev->name,
-                              bond->params.downdelay * bond->params.miimon);
+                        pr_info("%s: Note: Updating downdelay (to %d) since it is a multiple of the miimon value.\n",
+                                bond->dev->name,
+                                bond->params.downdelay * bond->params.miimon);
                 if (bond->params.arp_interval) {
-                        pr_info(DRV_NAME
-                               ": %s: MII monitoring cannot be used with "
-                               "ARP monitoring. Disabling ARP monitoring...\n",
-                               bond->dev->name);
+                        pr_info("%s: MII monitoring cannot be used with ARP monitoring. Disabling ARP monitoring...\n",
+                                bond->dev->name);
                         bond->params.arp_interval = 0;
                         bond->dev->priv_flags &= ~IFF_MASTER_ARPMON;
                         if (bond->params.arp_validate) {
@@ -1176,17 +1115,15 @@ static ssize_t bonding_store_primary(struct device *d,
         write_lock_bh(&bond->curr_slave_lock);
 
         if (!USES_PRIMARY(bond->params.mode)) {
-                pr_info(DRV_NAME
-                       ": %s: Unable to set primary slave; %s is in mode %d\n",
-                       bond->dev->name, bond->dev->name, bond->params.mode);
+                pr_info("%s: Unable to set primary slave; %s is in mode %d\n",
+                        bond->dev->name, bond->dev->name, bond->params.mode);
         } else {
                 bond_for_each_slave(bond, slave, i) {
                         if (strnicmp
                             (slave->dev->name, buf,
                              strlen(slave->dev->name)) == 0) {
-                                pr_info(DRV_NAME
-                                       ": %s: Setting %s as primary slave.\n",
-                                       bond->dev->name, slave->dev->name);
+                                pr_info("%s: Setting %s as primary slave.\n",
+                                        bond->dev->name, slave->dev->name);
                                 bond->primary_slave = slave;
                                 strcpy(bond->params.primary, slave->dev->name);
                                 bond_select_active_slave(bond);
@@ -1197,15 +1134,13 @@ static ssize_t bonding_store_primary(struct device *d,
                 /* if we got here, then we didn't match the name of any slave */
 
                 if (strlen(buf) == 0 || buf[0] == '\n') {
-                        pr_info(DRV_NAME
-                               ": %s: Setting primary slave to None.\n",
-                               bond->dev->name);
+                        pr_info("%s: Setting primary slave to None.\n",
+                                bond->dev->name);
                         bond->primary_slave = NULL;
                                 bond_select_active_slave(bond);
                 } else {
-                        pr_info(DRV_NAME
-                               ": %s: Unable to set %.*s as primary slave as it is not a slave.\n",
-                               bond->dev->name, (int)strlen(buf) - 1, buf);
+                        pr_info("%s: Unable to set %.*s as primary slave as it is not a slave.\n",
+                                bond->dev->name, (int)strlen(buf) - 1, buf);
                 }
         }
 out:
@@ -1244,8 +1179,7 @@ static ssize_t bonding_store_primary_reselect(struct device *d,
 
         new_value = bond_parse_parm(buf, pri_reselect_tbl);
         if (new_value < 0)  {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid primary_reselect value %.*s.\n",
+                pr_err("%s: Ignoring invalid primary_reselect value %.*s.\n",
                        bond->dev->name,
                        (int) strlen(buf) - 1, buf);
                 ret = -EINVAL;
@@ -1253,7 +1187,7 @@ static ssize_t bonding_store_primary_reselect(struct device *d,
         }
 
         bond->params.primary_reselect = new_value;
-        pr_info(DRV_NAME ": %s: setting primary_reselect to %s (%d).\n",
+        pr_info("%s: setting primary_reselect to %s (%d).\n",
                 bond->dev->name, pri_reselect_tbl[new_value].modename,
                 new_value);
 
@@ -1291,20 +1225,18 @@ static ssize_t bonding_store_carrier(struct device *d,
 
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no use_carrier value specified.\n",
+                pr_err("%s: no use_carrier value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if ((new_value == 0) || (new_value == 1)) {
                 bond->params.use_carrier = new_value;
-                pr_info(DRV_NAME ": %s: Setting use_carrier to %d.\n",
-                       bond->dev->name, new_value);
+                pr_info("%s: Setting use_carrier to %d.\n",
+                        bond->dev->name, new_value);
         } else {
-                pr_info(DRV_NAME
-                       ": %s: Ignoring invalid use_carrier value %d.\n",
-                       bond->dev->name, new_value);
+                pr_info("%s: Ignoring invalid use_carrier value %d.\n",
+                        bond->dev->name, new_value);
         }
 out:
         return count;
@@ -1349,8 +1281,7 @@ static ssize_t bonding_store_active_slave(struct device *d,
         write_lock_bh(&bond->curr_slave_lock);
 
         if (!USES_PRIMARY(bond->params.mode))
-                pr_info(DRV_NAME ": %s: Unable to change active slave;"
-                        " %s is in mode %d\n",
+                pr_info("%s: Unable to change active slave; %s is in mode %d\n",
                         bond->dev->name, bond->dev->name, bond->params.mode);
         else {
                 bond_for_each_slave(bond, slave, i) {
@@ -1361,9 +1292,9 @@ static ssize_t bonding_store_active_slave(struct device *d,
                                 new_active = slave;
                                 if (new_active == old_active) {
                                         /* do nothing */
-                                        pr_info(DRV_NAME
-                                                ": %s: %s is already the current active slave.\n",
-                                                bond->dev->name, slave->dev->name);
+                                        pr_info("%s: %s is already the current active slave.\n",
+                                                bond->dev->name,
+                                                slave->dev->name);
                                         goto out;
                                 }
                                 else {
@@ -1371,16 +1302,15 @@ static ssize_t bonding_store_active_slave(struct device *d,
                                             (old_active) &&
                                             (new_active->link == BOND_LINK_UP) &&
                                             IS_UP(new_active->dev)) {
-                                                pr_info(DRV_NAME
-                                                        ": %s: Setting %s as active slave.\n",
-                                                        bond->dev->name, slave->dev->name);
+                                                pr_info("%s: Setting %s as active slave.\n",
+                                                        bond->dev->name,
+                                                        slave->dev->name);
                                                         bond_change_active_slave(bond, new_active);
                                         }
                                         else {
-                                                pr_info(DRV_NAME
-                                                        ": %s: Could not set %s as active slave; "
-                                                        "either %s is down or the link is down.\n",
-                                                        bond->dev->name, slave->dev->name,
+                                                pr_info("%s: Could not set %s as active slave; either %s is down or the link is down.\n",
+                                                        bond->dev->name,
+                                                        slave->dev->name,
                                                         slave->dev->name);
                                         }
                                         goto out;
@@ -1391,14 +1321,12 @@ static ssize_t bonding_store_active_slave(struct device *d,
                 /* if we got here, then we didn't match the name of any slave */
 
                 if (strlen(buf) == 0 || buf[0] == '\n') {
-                        pr_info(DRV_NAME
-                                ": %s: Setting active slave to None.\n",
+                        pr_info("%s: Setting active slave to None.\n",
                                 bond->dev->name);
                         bond->primary_slave = NULL;
                         bond_select_active_slave(bond);
                 } else {
-                        pr_info(DRV_NAME ": %s: Unable to set %.*s"
-                                " as active slave as it is not a slave.\n",
+                        pr_info("%s: Unable to set %.*s as active slave as it is not a slave.\n",
                                 bond->dev->name, (int)strlen(buf) - 1, buf);
                 }
         }
@@ -1600,8 +1528,7 @@ int bond_create_sysfs(void)
                 /* Is someone being kinky and naming a device bonding_master? */
                 if (__dev_get_by_name(&init_net,
                                       class_attr_bonding_masters.attr.name))
-                        pr_err("network device named %s already "
-                               "exists in sysfs",
+                        pr_err("network device named %s already exists in sysfs",
                                class_attr_bonding_masters.attr.name);
                 ret = 0;
         }
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index 8c485aad1b94..05b751719bd5 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -50,7 +50,7 @@ config CAN_TI_HECC
 
 config CAN_MCP251X
         tristate "Microchip MCP251x SPI CAN controllers"
-        depends on CAN_DEV && SPI
+        depends on CAN_DEV && SPI && HAS_DMA
         ---help---
           Driver for the Microchip MCP251x SPI CAN controllers.
 
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index cbe3fce53e3b..d0ec17878ffc 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -474,7 +474,7 @@ static void at91_read_mb(struct net_device *dev, unsigned int mb,
         reg_msr = at91_read(priv, AT91_MSR(mb));
         if (reg_msr & AT91_MSR_MRTR)
                 cf->can_id |= CAN_RTR_FLAG;
-        cf->can_dlc = min_t(__u8, (reg_msr >> 16) & 0xf, 8);
+        cf->can_dlc = get_can_dlc((reg_msr >> 16) & 0xf);
 
         *(u32 *)(cf->data + 0) = at91_read(priv, AT91_MDL(mb));
         *(u32 *)(cf->data + 4) = at91_read(priv, AT91_MDH(mb));
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
index c7fc1de28173..0ec1524523cc 100644
--- a/drivers/net/can/bfin_can.c
+++ b/drivers/net/can/bfin_can.c
@@ -392,7 +392,7 @@ static void bfin_can_rx(struct net_device *dev, u16 isrc)
                 cf->can_id |= CAN_RTR_FLAG;
 
         /* get data length code */
-        cf->can_dlc = bfin_read16(&reg->chl[obj].dlc);
+        cf->can_dlc = get_can_dlc(bfin_read16(&reg->chl[obj].dlc) & 0xF);
 
         /* get payload */
         for (i = 0; i < 8; i += 2) {
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 78b1b69b2921..9c5a1537939c 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -403,9 +403,8 @@ static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf,
 
                 for (i = 1; i < RXBDAT_OFF; i++)
                         buf[i] = mcp251x_read_reg(spi, RXBCTRL(buf_idx) + i);
-                len = buf[RXBDLC_OFF] & RXBDLC_LEN_MASK;
-                if (len > 8)
-                        len = 8;
+
+                len = get_can_dlc(buf[RXBDLC_OFF] & RXBDLC_LEN_MASK);
                 for (; i < (RXBDAT_OFF + len); i++)
                         buf[i] = mcp251x_read_reg(spi, RXBCTRL(buf_idx) + i);
         } else {
@@ -455,13 +454,7 @@ static void mcp251x_hw_rx(struct spi_device *spi, int buf_idx)
                         (buf[RXBSIDL_OFF] >> RXBSIDL_SHIFT);
         }
         /* Data length */
-        frame->can_dlc = buf[RXBDLC_OFF] & RXBDLC_LEN_MASK;
-        if (frame->can_dlc > 8) {
-                dev_warn(&spi->dev, "invalid frame recevied\n");
-                priv->net->stats.rx_errors++;
-                dev_kfree_skb(skb);
-                return;
-        }
+        frame->can_dlc = get_can_dlc(buf[RXBDLC_OFF] & RXBDLC_LEN_MASK);
         memcpy(frame->data, buf + RXBDAT_OFF, frame->can_dlc);
 
         priv->net->stats.rx_packets++;
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
index bb06dfb58f25..07346f880ca6 100644
--- a/drivers/net/can/mscan/mscan.c
+++ b/drivers/net/can/mscan/mscan.c
@@ -297,7 +297,8 @@ static void mscan_get_rx_frame(struct net_device *dev, struct can_frame *frame)
         frame->can_id |= can_id >> 1;
         if (can_id & 1)
                 frame->can_id |= CAN_RTR_FLAG;
-        frame->can_dlc = in_8(&regs->rx.dlr) & 0xf;
+
+        frame->can_dlc = get_can_dlc(in_8(&regs->rx.dlr) & 0xf);
 
         if (!(frame->can_id & CAN_RTR_FLAG)) {
                 void __iomem *data = &regs->rx.dsr1_0;
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index b4ba88a31075..542a4f7255b4 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -293,15 +293,14 @@ static void sja1000_rx(struct net_device *dev)
         uint8_t fi;
         uint8_t dreg;
         canid_t id;
-        uint8_t dlc;
         int i;
 
+        /* create zero'ed CAN frame buffer */
         skb = alloc_can_skb(dev, &cf);
         if (skb == NULL)
                 return;
 
         fi = priv->read_reg(priv, REG_FI);
-        dlc = fi & 0x0F;
 
         if (fi & FI_FF) {
                 /* extended frame format (EFF) */
@@ -318,16 +317,15 @@ static void sja1000_rx(struct net_device *dev)
                     | (priv->read_reg(priv, REG_ID2) >> 5);
         }
 
-        if (fi & FI_RTR)
+        if (fi & FI_RTR) {
                 id |= CAN_RTR_FLAG;
+        } else {
+                cf->can_dlc = get_can_dlc(fi & 0x0F);
+                for (i = 0; i < cf->can_dlc; i++)
+                        cf->data[i] = priv->read_reg(priv, dreg++);
+        }
 
         cf->can_id = id;
-        cf->can_dlc = dlc;
-        for (i = 0; i < dlc; i++)
-                cf->data[i] = priv->read_reg(priv, dreg++);
-
-        while (i < 8)
-                cf->data[i++] = 0;
 
         /* release receive buffer */
         priv->write_reg(priv, REG_CMR, CMD_RRB);
@@ -335,7 +333,7 @@ static void sja1000_rx(struct net_device *dev)
         netif_rx(skb);
 
         stats->rx_packets++;
-        stats->rx_bytes += dlc;
+        stats->rx_bytes += cf->can_dlc;
 }
 
 static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 07e8016b17ec..5c993c2da528 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -552,7 +552,7 @@ static int ti_hecc_rx_pkt(struct ti_hecc_priv *priv, int mbxno)
         data = hecc_read_mbx(priv, mbxno, HECC_CANMCF);
         if (data & HECC_CANMCF_RTR)
                 cf->can_id |= CAN_RTR_FLAG;
-        cf->can_dlc = data & 0xF;
+        cf->can_dlc = get_can_dlc(data & 0xF);
         data = hecc_read_mbx(priv, mbxno, HECC_CANMDL);
         *(u32 *)(cf->data) = cpu_to_be32(data);
         if (cf->can_dlc > 4) {
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 591eb0eb1c2b..efbb05c71bf4 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -316,7 +316,7 @@ static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg)
                 return;
 
         cf->can_id = le32_to_cpu(msg->msg.can_msg.id);
-        cf->can_dlc = min_t(u8, msg->msg.can_msg.length, 8);
+        cf->can_dlc = get_can_dlc(msg->msg.can_msg.length & 0xF);
 
         if (msg->type == CPC_MSG_TYPE_EXT_CAN_FRAME ||
             msg->type == CPC_MSG_TYPE_EXT_RTR_FRAME)
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index 678222389407..8d0be26f94e3 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -1163,7 +1163,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
         priv->dev = dev;
         priv->ring_size = 64;
         priv->msg_enable = netif_msg_init(debug_level, 0xff);
-        memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
+        memcpy(dev->dev_addr, pdata->dev_addr, sizeof(pdata->dev_addr));
 
         snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
 
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 0cbe3c0e7c06..b37730065688 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -1646,7 +1646,7 @@ dm9000_drv_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops dm9000_drv_pm_ops = {
+static const struct dev_pm_ops dm9000_drv_pm_ops = {
         .suspend        = dm9000_drv_suspend,
         .resume         = dm9000_drv_resume,
 };
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c
index e2d5343f1275..204177d78cec 100644
--- a/drivers/net/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ixgbe/ixgbe_82598.c
@@ -510,6 +510,40 @@ static s32 ixgbe_start_mac_link_82598(struct ixgbe_hw *hw,
 }
 
 /**
+ *  ixgbe_validate_link_ready - Function looks for phy link
+ *  @hw: pointer to hardware structure
+ *
+ *  Function indicates success when phy link is available. If phy is not ready
+ *  within 5 seconds of MAC indicating link, the function returns error.
+ **/
+static s32 ixgbe_validate_link_ready(struct ixgbe_hw *hw)
+{
+        u32 timeout;
+        u16 an_reg;
+
+        if (hw->device_id != IXGBE_DEV_ID_82598AT2)
+                return 0;
+
+        for (timeout = 0;
+             timeout < IXGBE_VALIDATE_LINK_READY_TIMEOUT; timeout++) {
+                hw->phy.ops.read_reg(hw, MDIO_STAT1, MDIO_MMD_AN, &an_reg);
+
+                if ((an_reg & MDIO_AN_STAT1_COMPLETE) &&
+                    (an_reg & MDIO_STAT1_LSTATUS))
+                        break;
+
+                msleep(100);
+        }
+
+        if (timeout == IXGBE_VALIDATE_LINK_READY_TIMEOUT) {
+                hw_dbg(hw, "Link was indicated but link is down\n");
+                return IXGBE_ERR_LINK_SETUP;
+        }
+
+        return 0;
+}
+
+/**
  *  ixgbe_check_mac_link_82598 - Get link/speed status
  *  @hw: pointer to hardware structure
  *  @speed: pointer to link speed
@@ -589,6 +623,10 @@ static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,
         else
                 *speed = IXGBE_LINK_SPEED_1GB_FULL;
 
+        if ((hw->device_id == IXGBE_DEV_ID_82598AT2) && (*link_up == true) &&
+            (ixgbe_validate_link_ready(hw) != 0))
+                *link_up = false;
+
         /* if link is down, zero out the current_mode */
         if (*link_up == false) {
                 hw->fc.current_mode = ixgbe_fc_none;
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 35ea8c93fd80..bd64387563f0 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -4511,6 +4511,7 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
         struct ixgbe_hw *hw = &adapter->hw;
         u64 total_mpc = 0;
         u32 i, missed_rx = 0, mpc, bprc, lxon, lxoff, xon_off_tot;
+        u64 non_eop_descs = 0, restart_queue = 0;
 
         if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
                 u64 rsc_count = 0;
@@ -4528,10 +4529,12 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
 
         /* gather some stats to the adapter struct that are per queue */
         for (i = 0; i < adapter->num_tx_queues; i++)
-                adapter->restart_queue += adapter->tx_ring[i].restart_queue;
+                restart_queue += adapter->tx_ring[i].restart_queue;
+        adapter->restart_queue = restart_queue;
 
         for (i = 0; i < adapter->num_rx_queues; i++)
-                adapter->non_eop_descs += adapter->tx_ring[i].non_eop_descs;
+                non_eop_descs += adapter->rx_ring[i].non_eop_descs;
+        adapter->non_eop_descs = non_eop_descs;
 
         adapter->stats.crcerrs += IXGBE_READ_REG(hw, IXGBE_CRCERRS);
         for (i = 0; i < 8; i++) {
@@ -5003,7 +5006,18 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter,
                                     IXGBE_ADVTXD_DTYP_CTXT);
 
                 if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                        switch (skb->protocol) {
+                        __be16 protocol;
+
+                        if (skb->protocol == cpu_to_be16(ETH_P_8021Q)) {
+                                const struct vlan_ethhdr *vhdr =
+                                        (const struct vlan_ethhdr *)skb->data;
+
+                                protocol = vhdr->h_vlan_encapsulated_proto;
+                        } else {
+                                protocol = skb->protocol;
+                        }
+
+                        switch (protocol) {
                         case cpu_to_be16(ETH_P_IP):
                                 type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4;
                                 if (ip_hdr(skb)->protocol == IPPROTO_TCP)
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index f3e8d52610b7..84650c6ebe03 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -841,6 +841,8 @@
 #define IXGBE_MPVC      0x04318
 #define IXGBE_SGMIIC    0x04314
 
+#define IXGBE_VALIDATE_LINK_READY_TIMEOUT 50
+
 /* Omer CORECTL */
 #define IXGBE_CORECTL           0x014F00
 /* BARCTRL */
diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/mlx4/alloc.c
index ad95d5f7b630..8c8515619b8e 100644
--- a/drivers/net/mlx4/alloc.c
+++ b/drivers/net/mlx4/alloc.c
@@ -72,35 +72,6 @@ void mlx4_bitmap_free(struct mlx4_bitmap *bitmap, u32 obj)
         mlx4_bitmap_free_range(bitmap, obj, 1);
 }
 
-static unsigned long find_aligned_range(unsigned long *bitmap,
-                                        u32 start, u32 nbits,
-                                        int len, int align)
-{
-        unsigned long end, i;
-
-again:
-        start = ALIGN(start, align);
-
-        while ((start < nbits) && test_bit(start, bitmap))
-                start += align;
-
-        if (start >= nbits)
-                return -1;
-
-        end = start+len;
-        if (end > nbits)
-                return -1;
-
-        for (i = start + 1; i < end; i++) {
-                if (test_bit(i, bitmap)) {
-                        start = i + 1;
-                        goto again;
-                }
-        }
-
-        return start;
-}
-
 u32 mlx4_bitmap_alloc_range(struct mlx4_bitmap *bitmap, int cnt, int align)
 {
         u32 obj, i;
@@ -110,13 +81,13 @@ u32 mlx4_bitmap_alloc_range(struct mlx4_bitmap *bitmap, int cnt, int align)
 
         spin_lock(&bitmap->lock);
 
-        obj = find_aligned_range(bitmap->table, bitmap->last,
-                                 bitmap->max, cnt, align);
+        obj = bitmap_find_next_zero_area(bitmap->table, bitmap->max,
+                                bitmap->last, cnt, align - 1);
         if (obj >= bitmap->max) {
                 bitmap->top = (bitmap->top + bitmap->max + bitmap->reserved_top)
                                 & bitmap->mask;
-                obj = find_aligned_range(bitmap->table, 0, bitmap->max,
-                                         cnt, align);
+                obj = bitmap_find_next_zero_area(bitmap->table, bitmap->max,
+                                                0, cnt, align - 1);
         }
 
         if (obj < bitmap->max) {
diff --git a/drivers/net/mlx4/fw.c b/drivers/net/mlx4/fw.c
index 3c16602172fc..04f42ae1eda0 100644
--- a/drivers/net/mlx4/fw.c
+++ b/drivers/net/mlx4/fw.c
@@ -90,6 +90,7 @@ static void dump_dev_cap_flags(struct mlx4_dev *dev, u32 flags)
                 [ 9] = "Q_Key violation counter",
                 [10] = "VMM",
                 [12] = "DPDP",
+                [15] = "Big LSO headers",
                 [16] = "MW support",
                 [17] = "APM support",
                 [18] = "Atomic ops support",
@@ -235,7 +236,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_MPT_OFFSET);
         dev_cap->max_mpts = 1 << (field & 0x3f);
         MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_EQ_OFFSET);
-        dev_cap->reserved_eqs = 1 << (field & 0xf);
+        dev_cap->reserved_eqs = field & 0xf;
         MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_EQ_OFFSET);
         dev_cap->max_eqs = 1 << (field & 0xf);
         MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_MTT_OFFSET);
diff --git a/drivers/net/mlx4/sense.c b/drivers/net/mlx4/sense.c
index f36ae691cab3..015fbe785c13 100644
--- a/drivers/net/mlx4/sense.c
+++ b/drivers/net/mlx4/sense.c
@@ -53,7 +53,7 @@ static int mlx4_SENSE_PORT(struct mlx4_dev *dev, int port,
 
         if (out_param > 2) {
                 mlx4_err(dev, "Sense returned illegal value: 0x%llx\n", out_param);
-                return EINVAL;
+                return -EINVAL;
         }
 
         *type = out_param;
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 17a27225cc98..98938ea9e0bd 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -912,7 +912,11 @@ static void media_check(unsigned long arg)
         if ((inw(ioaddr + EL3_STATUS) & IntLatch) && (inb(ioaddr + Timer) == 0xff)) {
                 if (!lp->fast_poll)
                         printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name);
+
+                local_irq_save(flags);
                 el3_interrupt(dev->irq, dev);
+                local_irq_restore(flags);
+
                 lp->fast_poll = HZ;
         }
         if (lp->fast_poll) {
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 6f8d7e2e5922..322e11df0097 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -711,7 +711,11 @@ static void media_check(unsigned long arg)
         (inb(ioaddr + EL3_TIMER) == 0xff)) {
         if (!lp->fast_poll)
             printk(KERN_WARNING "%s: interrupt(s) dropped!\n", dev->name);
+
+        local_irq_save(flags);
         el3_interrupt(dev->irq, dev);
+        local_irq_restore(flags);
+
         lp->fast_poll = HZ;
     }
     if (lp->fast_poll) {
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index acfc5a3aa490..60f96c468a24 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -4859,7 +4859,7 @@ out:
         return 0;
 }
 
-static struct dev_pm_ops rtl8169_pm_ops = {
+static const struct dev_pm_ops rtl8169_pm_ops = {
         .suspend = rtl8169_suspend,
         .resume = rtl8169_resume,
         .freeze = rtl8169_suspend,
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index 14949bb303a0..af3933579790 100644
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
@@ -47,7 +47,7 @@ static const unsigned char payload_source[ETH_ALEN] = {
         0x00, 0x0f, 0x53, 0x1b, 0x1b, 0x1b,
 };
 
-static const char *payload_msg =
+static const char payload_msg[] =
         "Hello world! This is an Efx loopback test in progress!";
 
 /**
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index c88bc1013047..ca6285016dfd 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -84,6 +84,8 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
         .mpr            = 1,
         .tpauser        = 1,
         .hw_swap        = 1,
+        .rpadir         = 1,
+        .rpadir_value   = 0x00020000, /* NET_IP_ALIGN assumed to be 2 */
 };
 
 #elif defined(CONFIG_CPU_SUBTYPE_SH7763)
@@ -175,7 +177,6 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
         .tpauser        = 1,
         .bculr          = 1,
         .hw_swap        = 1,
-        .rpadir         = 1,
         .no_trimd       = 1,
         .no_ade         = 1,
 };
@@ -501,6 +502,8 @@ static int sh_eth_ring_init(struct net_device *ndev)
          */
         mdp->rx_buf_sz = (ndev->mtu <= 1492 ? PKT_BUF_SZ :
                           (((ndev->mtu + 26 + 7) & ~7) + 2 + 16));
+        if (mdp->cd->rpadir)
+                mdp->rx_buf_sz += NET_IP_ALIGN;
 
         /* Allocate RX and TX skb rings */
         mdp->rx_skbuff = kmalloc(sizeof(*mdp->rx_skbuff) * RX_RING_SIZE,
@@ -715,6 +718,8 @@ static int sh_eth_rx(struct net_device *ndev)
                                         pkt_len + 2);
                         skb = mdp->rx_skbuff[entry];
                         mdp->rx_skbuff[entry] = NULL;
+                        if (mdp->cd->rpadir)
+                                skb_reserve(skb, NET_IP_ALIGN);
                         skb_put(skb, pkt_len);
                         skb->protocol = eth_type_trans(skb, ndev);
                         netif_rx(skb);
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 89a05d674ddc..1c01b96c9611 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -644,7 +644,6 @@ static void sky2_phy_power_up(struct sky2_hw *hw, unsigned port)
 {
         u32 reg1;
 
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
         reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
         reg1 &= ~phy_power[port];
 
@@ -652,7 +651,6 @@ static void sky2_phy_power_up(struct sky2_hw *hw, unsigned port)
                 reg1 |= coma_mode[port];
 
         sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         sky2_pci_read32(hw, PCI_DEV_REG1);
 
         if (hw->chip_id == CHIP_ID_YUKON_FE)
@@ -709,11 +707,9 @@ static void sky2_phy_power_down(struct sky2_hw *hw, unsigned port)
                 gm_phy_write(hw, port, PHY_MARV_CTRL, PHY_CT_PDOWN);
         }
 
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
         reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
         reg1 |= phy_power[port];                /* set PHY to PowerDown/COMA Mode */
         sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 }
 
 /* Force a renegotiation */
@@ -2152,9 +2148,7 @@ static void sky2_qlink_intr(struct sky2_hw *hw)
 
         /* reset PHY Link Detect */
         phy = sky2_pci_read16(hw, PSM_CONFIG_REG4);
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
         sky2_pci_write16(hw, PSM_CONFIG_REG4, phy | 1);
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
         sky2_link_up(sky2);
 }
@@ -2645,7 +2639,6 @@ static void sky2_hw_intr(struct sky2_hw *hw)
         if (status & (Y2_IS_MST_ERR | Y2_IS_IRQ_STAT)) {
                 u16 pci_err;
 
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
                 pci_err = sky2_pci_read16(hw, PCI_STATUS);
                 if (net_ratelimit())
                         dev_err(&pdev->dev, "PCI hardware error (0x%x)\n",
@@ -2653,14 +2646,12 @@ static void sky2_hw_intr(struct sky2_hw *hw)
 
                 sky2_pci_write16(hw, PCI_STATUS,
                                       pci_err | PCI_STATUS_ERROR_BITS);
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         }
 
         if (status & Y2_IS_PCI_EXP) {
                 /* PCI-Express uncorrectable Error occurred */
                 u32 err;
 
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
                 err = sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
                 sky2_write32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS,
                              0xfffffffful);
@@ -2668,7 +2659,6 @@ static void sky2_hw_intr(struct sky2_hw *hw)
                         dev_err(&pdev->dev, "PCI Express error (0x%x)\n", err);
 
                 sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         }
 
         if (status & Y2_HWE_L1_MASK)
@@ -3047,7 +3037,6 @@ static void sky2_reset(struct sky2_hw *hw)
         }
 
         sky2_power_on(hw);
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
         for (i = 0; i < hw->ports; i++) {
                 sky2_write8(hw, SK_REG(i, GMAC_LINK_CTRL), GMLC_RST_SET);
@@ -3084,7 +3073,6 @@ static void sky2_reset(struct sky2_hw *hw)
                 reg <<= PSM_CONFIG_REG4_TIMER_PHY_LINK_DETECT_BASE;
 
                 /* reset PHY Link Detect */
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
                 sky2_pci_write16(hw, PSM_CONFIG_REG4,
                                  reg | PSM_CONFIG_REG4_RST_PHY_LINK_DETECT);
                 sky2_pci_write16(hw, PSM_CONFIG_REG4, reg);
@@ -3102,7 +3090,6 @@ static void sky2_reset(struct sky2_hw *hw)
                         /* restore the PCIe Link Control register */
                         sky2_pci_write16(hw, cap + PCI_EXP_LNKCTL, reg);
                 }
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
                 /* re-enable PEX PM in PEX PHY debug reg. 8 (clear bit 12) */
                 sky2_write32(hw, Y2_PEX_PHY_DATA, PEX_DB_ACCESS | (0x08UL << 16));
@@ -4530,7 +4517,7 @@ static const char *sky2_name(u8 chipid, char *buf, int sz)
                 "Optima",       /* 0xbc */
         };
 
-        if (chipid >= CHIP_ID_YUKON_XL && chipid < CHIP_ID_YUKON_OPT)
+        if (chipid >= CHIP_ID_YUKON_XL && chipid <= CHIP_ID_YUKON_OPT)
                 strncpy(buf, name[chipid - CHIP_ID_YUKON_XL], sz);
         else
                 snprintf(buf, sz, "(chip %#x)", chipid);
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index 20d6095cf411..494cd91ea39c 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -2154,7 +2154,7 @@ static int smsc911x_resume(struct device *dev)
         return (to == 0) ? -EIO : 0;
 }
 
-static struct dev_pm_ops smsc911x_pm_ops = {
+static const struct dev_pm_ops smsc911x_pm_ops = {
         .suspend        = smsc911x_suspend,
         .resume         = smsc911x_resume,
 };
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index b091e20ca167..f14d225404da 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -324,7 +324,7 @@ static int rtl8150_set_mac_address(struct net_device *netdev, void *p)
                 dbg("%02X:", netdev->dev_addr[i]);
         dbg("%02X\n", netdev->dev_addr[i]);
         /* Set the IDR registers. */
-        set_registers(dev, IDR, sizeof(netdev->dev_addr), netdev->dev_addr);
+        set_registers(dev, IDR, netdev->addr_len, netdev->dev_addr);
 #ifdef EEPROM_WRITE
         {
         u8 cr;
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 1ceb9d0f8b97..9cc438282d77 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -2689,7 +2689,7 @@ vmxnet3_resume(struct device *device)
         return 0;
 }
 
-static struct dev_pm_ops vmxnet3_pm_ops = {
+static const struct dev_pm_ops vmxnet3_pm_ops = {
         .suspend = vmxnet3_suspend,
         .resume = vmxnet3_resume,
 };
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index d69bde6a2343..c542c7bb7454 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -354,7 +354,7 @@ static unsigned int dino_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip dino_interrupt_type = {
-        .typename       = "GSC-PCI",
+        .name           = "GSC-PCI",
         .startup        = dino_startup_irq,
         .shutdown       = dino_disable_irq,
         .enable         = dino_enable_irq, 
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c
index 51220749cb65..46f503fb7fc5 100644
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
@@ -189,7 +189,7 @@ static unsigned int eisa_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip eisa_interrupt_type = {
-        .typename =     "EISA",
+        .name    =      "EISA",
         .startup =      eisa_startup_irq,
         .shutdown =     eisa_disable_irq,
         .enable =       eisa_enable_irq,
diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index 647adc9f85ad..c4e1f3c3c2fa 100644
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -149,7 +149,7 @@ static unsigned int gsc_asic_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip gsc_asic_interrupt_type = {
-        .typename =     "GSC-ASIC",
+        .name    =      "GSC-ASIC",
         .startup =      gsc_asic_startup_irq,
         .shutdown =     gsc_asic_disable_irq,
         .enable =       gsc_asic_enable_irq,
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 88e333553212..c76836727cae 100644
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -730,7 +730,7 @@ static int iosapic_set_affinity_irq(unsigned int irq,
 #endif
 
 static struct irq_chip iosapic_interrupt_type = {
-        .typename =     "IO-SAPIC-level",
+        .name    =      "IO-SAPIC-level",
         .startup =      iosapic_startup_irq,
         .shutdown =     iosapic_disable_irq,
         .enable =       iosapic_enable_irq,
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 79caf1ca4a29..188bc8496a26 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -38,6 +38,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/reboot.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/ctype.h>
 #include <linux/blkdev.h>
 #include <linux/workqueue.h>
@@ -147,41 +148,34 @@ device_initcall(start_task);
 static void (*led_func_ptr) (unsigned char) __read_mostly;
 
 #ifdef CONFIG_PROC_FS
-static int led_proc_read(char *page, char **start, off_t off, int count, 
-        int *eof, void *data)
+static int led_proc_show(struct seq_file *m, void *v)
 {
-        char *out = page;
-        int len;
-
-        switch ((long)data)
+        switch ((long)m->private)
         {
         case LED_NOLCD:
-                out += sprintf(out, "Heartbeat: %d\n", led_heartbeat);
-                out += sprintf(out, "Disk IO: %d\n", led_diskio);
-                out += sprintf(out, "LAN Rx/Tx: %d\n", led_lanrxtx);
+                seq_printf(m, "Heartbeat: %d\n", led_heartbeat);
+                seq_printf(m, "Disk IO: %d\n", led_diskio);
+                seq_printf(m, "LAN Rx/Tx: %d\n", led_lanrxtx);
                 break;
         case LED_HASLCD:
-                out += sprintf(out, "%s\n", lcd_text);
+                seq_printf(m, "%s\n", lcd_text);
                 break;
         default:
-                *eof = 1;
                 return 0;
         }
+        return 0;
+}
 
-        len = out - page - off;
-        if (len < count) {
-                *eof = 1;
-                if (len <= 0) return 0;
-        } else {
-                len = count;
-        }
-        *start = page + off;
-        return len;
+static int led_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, led_proc_show, PDE(inode)->data);
 }
 
-static int led_proc_write(struct file *file, const char *buf, 
-        unsigned long count, void *data)
+
+static ssize_t led_proc_write(struct file *file, const char *buf,
+        size_t count, loff_t *pos)
 {
+        void *data = PDE(file->f_path.dentry->d_inode)->data;
         char *cur, lbuf[count + 1];
         int d;
 
@@ -234,6 +228,15 @@ parse_error:
         return -EINVAL;
 }
 
+static const struct file_operations led_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = led_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = led_proc_write,
+};
+
 static int __init led_create_procfs(void)
 {
         struct proc_dir_entry *proc_pdc_root = NULL;
@@ -243,19 +246,15 @@ static int __init led_create_procfs(void)
 
         proc_pdc_root = proc_mkdir("pdc", 0);
         if (!proc_pdc_root) return -1;
-        ent = create_proc_entry("led", S_IFREG|S_IRUGO|S_IWUSR, proc_pdc_root);
+        ent = proc_create_data("led", S_IRUGO|S_IWUSR, proc_pdc_root,
+                                &led_proc_fops, (void *)LED_NOLCD); /* LED */
         if (!ent) return -1;
-        ent->data = (void *)LED_NOLCD; /* LED */
-        ent->read_proc = led_proc_read;
-        ent->write_proc = led_proc_write;
 
         if (led_type == LED_HASLCD)
         {
-                ent = create_proc_entry("lcd", S_IFREG|S_IRUGO|S_IWUSR, proc_pdc_root);
+                ent = proc_create_data("lcd", S_IRUGO|S_IWUSR, proc_pdc_root,
+                                        &led_proc_fops, (void *)LED_HASLCD); /* LCD */
                 if (!ent) return -1;
-                ent->data = (void *)LED_HASLCD; /* LCD */
-                ent->read_proc = led_proc_read;
-                ent->write_proc = led_proc_write;
         }
 
         return 0;
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 13a64bc081b6..0bc5d474b168 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -779,12 +779,9 @@ static ssize_t pdcs_auto_write(struct kobject *kobj,
         read_unlock(&pathentry->rw_lock);
         
         DPRINTK("%s: flags before: 0x%X\n", __func__, flags);
-                        
-        temp = in;
-        
-        while (*temp && isspace(*temp))
-                temp++;
-        
+
+        temp = skip_spaces(in);
+
         c = *temp++ - '0';
         if ((c != 0) && (c != 1))
                 goto parse_error;
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 675f04e6597a..a35c9c5b89e8 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -326,7 +326,7 @@ static unsigned int superio_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip superio_interrupt_type = {
-        .typename =     SUPERIO,
+        .name    =      SUPERIO,
         .startup =      superio_startup_irq,
         .shutdown =     superio_disable_irq,
         .enable =       superio_enable_irq,
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 2597145a066e..ad113b0f62db 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -3403,7 +3403,7 @@ static int __init parport_parse_param(const char *s, int *val,
                 *val = automatic;
         else if (!strncmp(s, "none", 4))
                 *val = none;
-        else if (nofifo && !strncmp(s, "nofifo", 4))
+        else if (nofifo && !strncmp(s, "nofifo", 6))
                 *val = nofifo;
         else {
                 char *ep;
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 6cdc931f7c17..83aae4747594 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -339,6 +339,35 @@ found:
 }
 #endif
 
+#ifdef CONFIG_ACPI_NUMA
+static int __init
+dmar_parse_one_rhsa(struct acpi_dmar_header *header)
+{
+        struct acpi_dmar_rhsa *rhsa;
+        struct dmar_drhd_unit *drhd;
+
+        rhsa = (struct acpi_dmar_rhsa *)header;
+        for_each_drhd_unit(drhd) {
+                if (drhd->reg_base_addr == rhsa->base_address) {
+                        int node = acpi_map_pxm_to_node(rhsa->proximity_domain);
+
+                        if (!node_online(node))
+                                node = -1;
+                        drhd->iommu->node = node;
+                        return 0;
+                }
+        }
+        WARN(1, "Your BIOS is broken; RHSA refers to non-existent DMAR unit at %llx\n"
+             "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+             drhd->reg_base_addr,
+             dmi_get_system_info(DMI_BIOS_VENDOR),
+             dmi_get_system_info(DMI_BIOS_VERSION),
+             dmi_get_system_info(DMI_PRODUCT_VERSION));
+
+        return 0;
+}
+#endif
+
 static void __init
 dmar_table_print_dmar_entry(struct acpi_dmar_header *header)
 {
@@ -458,7 +487,9 @@ parse_dmar_table(void)
 #endif
                         break;
                 case ACPI_DMAR_HARDWARE_AFFINITY:
-                        /* We don't do anything with RHSA (yet?) */
+#ifdef CONFIG_ACPI_NUMA
+                        ret = dmar_parse_one_rhsa(entry_header);
+#endif
                         break;
                 default:
                         printk(KERN_WARNING PREFIX
@@ -582,6 +613,8 @@ int __init dmar_table_init(void)
         return 0;
 }
 
+static int bios_warned;
+
 int __init check_zero_address(void)
 {
         struct acpi_table_dmar *dmar;
@@ -601,6 +634,9 @@ int __init check_zero_address(void)
                 }
 
                 if (entry_header->type == ACPI_DMAR_TYPE_HARDWARE_UNIT) {
+                        void __iomem *addr;
+                        u64 cap, ecap;
+
                         drhd = (void *)entry_header;
                         if (!drhd->address) {
                                 /* Promote an attitude of violence to a BIOS engineer today */
@@ -609,17 +645,40 @@ int __init check_zero_address(void)
                                      dmi_get_system_info(DMI_BIOS_VENDOR),
                                      dmi_get_system_info(DMI_BIOS_VERSION),
                                      dmi_get_system_info(DMI_PRODUCT_VERSION));
-#ifdef CONFIG_DMAR
-                                dmar_disabled = 1;
-#endif
-                                return 0;
+                                bios_warned = 1;
+                                goto failed;
+                        }
+
+                        addr = early_ioremap(drhd->address, VTD_PAGE_SIZE);
+                        if (!addr ) {
+                                printk("IOMMU: can't validate: %llx\n", drhd->address);
+                                goto failed;
+                        }
+                        cap = dmar_readq(addr + DMAR_CAP_REG);
+                        ecap = dmar_readq(addr + DMAR_ECAP_REG);
+                        early_iounmap(addr, VTD_PAGE_SIZE);
+                        if (cap == (uint64_t)-1 && ecap == (uint64_t)-1) {
+                                /* Promote an attitude of violence to a BIOS engineer today */
+                                WARN(1, "Your BIOS is broken; DMAR reported at address %llx returns all ones!\n"
+                                     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+                                      drhd->address,
+                                      dmi_get_system_info(DMI_BIOS_VENDOR),
+                                      dmi_get_system_info(DMI_BIOS_VERSION),
+                                      dmi_get_system_info(DMI_PRODUCT_VERSION));
+                                bios_warned = 1;
+                                goto failed;
                         }
-                        break;
                 }
 
                 entry_header = ((void *)entry_header + entry_header->length);
         }
         return 1;
+
+failed:
+#ifdef CONFIG_DMAR
+        dmar_disabled = 1;
+#endif
+        return 0;
 }
 
 void __init detect_intel_iommu(void)
@@ -670,6 +729,18 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
         int agaw = 0;
         int msagaw = 0;
 
+        if (!drhd->reg_base_addr) {
+                if (!bios_warned) {
+                        WARN(1, "Your BIOS is broken; DMAR reported at address zero!\n"
+                             "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+                             dmi_get_system_info(DMI_BIOS_VENDOR),
+                             dmi_get_system_info(DMI_BIOS_VERSION),
+                             dmi_get_system_info(DMI_PRODUCT_VERSION));
+                        bios_warned = 1;
+                }
+                return -EINVAL;
+        }
+
         iommu = kzalloc(sizeof(*iommu), GFP_KERNEL);
         if (!iommu)
                 return -ENOMEM;
@@ -686,13 +757,16 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
         iommu->ecap = dmar_readq(iommu->reg + DMAR_ECAP_REG);
 
         if (iommu->cap == (uint64_t)-1 && iommu->ecap == (uint64_t)-1) {
-                /* Promote an attitude of violence to a BIOS engineer today */
-                WARN(1, "Your BIOS is broken; DMAR reported at address %llx returns all ones!\n"
-                     "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
-                     drhd->reg_base_addr,
-                     dmi_get_system_info(DMI_BIOS_VENDOR),
-                     dmi_get_system_info(DMI_BIOS_VERSION),
-                     dmi_get_system_info(DMI_PRODUCT_VERSION));
+                if (!bios_warned) {
+                        /* Promote an attitude of violence to a BIOS engineer today */
+                        WARN(1, "Your BIOS is broken; DMAR reported at address %llx returns all ones!\n"
+                             "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+                             drhd->reg_base_addr,
+                             dmi_get_system_info(DMI_BIOS_VENDOR),
+                             dmi_get_system_info(DMI_BIOS_VERSION),
+                             dmi_get_system_info(DMI_PRODUCT_VERSION));
+                        bios_warned = 1;
+                }
                 goto err_unmap;
         }
 
@@ -715,6 +789,8 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
         iommu->agaw = agaw;
         iommu->msagaw = msagaw;
 
+        iommu->node = -1;
+
         /* the registers might be more than one page */
         map_size = max_t(int, ecap_max_iotlb_offset(iommu->ecap),
                 cap_max_fault_reg_offset(iommu->cap));
@@ -1056,6 +1132,7 @@ static void __dmar_enable_qi(struct intel_iommu *iommu)
 int dmar_enable_qi(struct intel_iommu *iommu)
 {
         struct q_inval *qi;
+        struct page *desc_page;
 
         if (!ecap_qis(iommu->ecap))
                 return -ENOENT;
@@ -1072,13 +1149,16 @@ int dmar_enable_qi(struct intel_iommu *iommu)
 
         qi = iommu->qi;
 
-        qi->desc = (void *)(get_zeroed_page(GFP_ATOMIC));
-        if (!qi->desc) {
+
+        desc_page = alloc_pages_node(iommu->node, GFP_ATOMIC | __GFP_ZERO, 0);
+        if (!desc_page) {
                 kfree(qi);
                 iommu->qi = 0;
                 return -ENOMEM;
         }
 
+        qi->desc = page_address(desc_page);
+
         qi->desc_status = kmalloc(QI_LENGTH * sizeof(int), GFP_ATOMIC);
         if (!qi->desc_status) {
                 free_page((unsigned long) qi->desc);
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 8d6159426311..e56f9bed6f2b 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -277,6 +277,7 @@ static int hw_pass_through = 1;
 
 struct dmar_domain {
         int     id;                     /* domain id */
+        int     nid;                    /* node id */
         unsigned long iommu_bmp;        /* bitmap of iommus this domain uses*/
 
         struct list_head devices;       /* all devices' list */
@@ -386,30 +387,14 @@ static struct kmem_cache *iommu_domain_cache;
 static struct kmem_cache *iommu_devinfo_cache;
 static struct kmem_cache *iommu_iova_cache;
 
-static inline void *iommu_kmem_cache_alloc(struct kmem_cache *cachep)
+static inline void *alloc_pgtable_page(int node)
 {
-        unsigned int flags;
-        void *vaddr;
-
-        /* trying to avoid low memory issues */
-        flags = current->flags & PF_MEMALLOC;
-        current->flags |= PF_MEMALLOC;
-        vaddr = kmem_cache_alloc(cachep, GFP_ATOMIC);
-        current->flags &= (~PF_MEMALLOC | flags);
-        return vaddr;
-}
-
+        struct page *page;
+        void *vaddr = NULL;
 
-static inline void *alloc_pgtable_page(void)
-{
-        unsigned int flags;
-        void *vaddr;
-
-        /* trying to avoid low memory issues */
-        flags = current->flags & PF_MEMALLOC;
-        current->flags |= PF_MEMALLOC;
-        vaddr = (void *)get_zeroed_page(GFP_ATOMIC);
-        current->flags &= (~PF_MEMALLOC | flags);
+        page = alloc_pages_node(node, GFP_ATOMIC | __GFP_ZERO, 0);
+        if (page)
+                vaddr = page_address(page);
         return vaddr;
 }
 
@@ -420,7 +405,7 @@ static inline void free_pgtable_page(void *vaddr)
 
 static inline void *alloc_domain_mem(void)
 {
-        return iommu_kmem_cache_alloc(iommu_domain_cache);
+        return kmem_cache_alloc(iommu_domain_cache, GFP_ATOMIC);
 }
 
 static void free_domain_mem(void *vaddr)
@@ -430,7 +415,7 @@ static void free_domain_mem(void *vaddr)
 
 static inline void * alloc_devinfo_mem(void)
 {
-        return iommu_kmem_cache_alloc(iommu_devinfo_cache);
+        return kmem_cache_alloc(iommu_devinfo_cache, GFP_ATOMIC);
 }
 
 static inline void free_devinfo_mem(void *vaddr)
@@ -440,7 +425,7 @@ static inline void free_devinfo_mem(void *vaddr)
 
 struct iova *alloc_iova_mem(void)
 {
-        return iommu_kmem_cache_alloc(iommu_iova_cache);
+        return kmem_cache_alloc(iommu_iova_cache, GFP_ATOMIC);
 }
 
 void free_iova_mem(struct iova *iova)
@@ -589,7 +574,8 @@ static struct context_entry * device_to_context_entry(struct intel_iommu *iommu,
         root = &iommu->root_entry[bus];
         context = get_context_addr_from_root(root);
         if (!context) {
-                context = (struct context_entry *)alloc_pgtable_page();
+                context = (struct context_entry *)
+                                alloc_pgtable_page(iommu->node);
                 if (!context) {
                         spin_unlock_irqrestore(&iommu->lock, flags);
                         return NULL;
@@ -732,7 +718,7 @@ static struct dma_pte *pfn_to_dma_pte(struct dmar_domain *domain,
                 if (!dma_pte_present(pte)) {
                         uint64_t pteval;
 
-                        tmp_page = alloc_pgtable_page();
+                        tmp_page = alloc_pgtable_page(domain->nid);
 
                         if (!tmp_page)
                                 return NULL;
@@ -868,7 +854,7 @@ static int iommu_alloc_root_entry(struct intel_iommu *iommu)
         struct root_entry *root;
         unsigned long flags;
 
-        root = (struct root_entry *)alloc_pgtable_page();
+        root = (struct root_entry *)alloc_pgtable_page(iommu->node);
         if (!root)
                 return -ENOMEM;
 
@@ -1263,6 +1249,7 @@ static struct dmar_domain *alloc_domain(void)
         if (!domain)
                 return NULL;
 
+        domain->nid = -1;
         memset(&domain->iommu_bmp, 0, sizeof(unsigned long));
         domain->flags = 0;
 
@@ -1420,9 +1407,10 @@ static int domain_init(struct dmar_domain *domain, int guest_width)
                 domain->iommu_snooping = 0;
 
         domain->iommu_count = 1;
+        domain->nid = iommu->node;
 
         /* always allocate the top pgd */
-        domain->pgd = (struct dma_pte *)alloc_pgtable_page();
+        domain->pgd = (struct dma_pte *)alloc_pgtable_page(domain->nid);
         if (!domain->pgd)
                 return -ENOMEM;
         __iommu_flush_cache(iommu, domain->pgd, PAGE_SIZE);
@@ -1523,12 +1511,15 @@ static int domain_context_mapping_one(struct dmar_domain *domain, int segment,
 
                 /* Skip top levels of page tables for
                  * iommu which has less agaw than default.
+                 * Unnecessary for PT mode.
                  */
-                for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) {
-                        pgd = phys_to_virt(dma_pte_addr(pgd));
-                        if (!dma_pte_present(pgd)) {
-                                spin_unlock_irqrestore(&iommu->lock, flags);
-                                return -ENOMEM;
+                if (translation != CONTEXT_TT_PASS_THROUGH) {
+                        for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) {
+                                pgd = phys_to_virt(dma_pte_addr(pgd));
+                                if (!dma_pte_present(pgd)) {
+                                        spin_unlock_irqrestore(&iommu->lock, flags);
+                                        return -ENOMEM;
+                                }
                         }
                 }
         }
@@ -1577,6 +1568,8 @@ static int domain_context_mapping_one(struct dmar_domain *domain, int segment,
         spin_lock_irqsave(&domain->iommu_lock, flags);
         if (!test_and_set_bit(iommu->seq_id, &domain->iommu_bmp)) {
                 domain->iommu_count++;
+                if (domain->iommu_count == 1)
+                        domain->nid = iommu->node;
                 domain_update_iommu_cap(domain);
         }
         spin_unlock_irqrestore(&domain->iommu_lock, flags);
@@ -1991,6 +1984,16 @@ static int iommu_prepare_identity_map(struct pci_dev *pdev,
                "IOMMU: Setting identity map for device %s [0x%Lx - 0x%Lx]\n",
                pci_name(pdev), start, end);
         
+        if (end < start) {
+                WARN(1, "Your BIOS is broken; RMRR ends before it starts!\n"
+                        "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
+                        dmi_get_system_info(DMI_BIOS_VENDOR),
+                        dmi_get_system_info(DMI_BIOS_VERSION),
+                     dmi_get_system_info(DMI_PRODUCT_VERSION));
+                ret = -EIO;
+                goto error;
+        }
+
         if (end >> agaw_to_width(domain->agaw)) {
                 WARN(1, "Your BIOS is broken; RMRR exceeds permitted address width (%d bits)\n"
                      "BIOS vendor: %s; Ver: %s; Product Version: %s\n",
@@ -3228,6 +3231,9 @@ static int device_notifier(struct notifier_block *nb,
         struct pci_dev *pdev = to_pci_dev(dev);
         struct dmar_domain *domain;
 
+        if (iommu_no_mapping(dev))
+                return 0;
+
         domain = find_domain(pdev);
         if (!domain)
                 return 0;
@@ -3455,6 +3461,7 @@ static struct dmar_domain *iommu_alloc_vm_domain(void)
                 return NULL;
 
         domain->id = vm_domid++;
+        domain->nid = -1;
         memset(&domain->iommu_bmp, 0, sizeof(unsigned long));
         domain->flags = DOMAIN_FLAG_VIRTUAL_MACHINE;
 
@@ -3481,9 +3488,10 @@ static int md_domain_init(struct dmar_domain *domain, int guest_width)
         domain->iommu_coherency = 0;
         domain->iommu_snooping = 0;
         domain->max_addr = 0;
+        domain->nid = -1;
 
         /* always allocate the top pgd */
-        domain->pgd = (struct dma_pte *)alloc_pgtable_page();
+        domain->pgd = (struct dma_pte *)alloc_pgtable_page(domain->nid);
         if (!domain->pgd)
                 return -ENOMEM;
         domain_flush_cache(domain, domain->pgd, PAGE_SIZE);
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
index 1487bf2be863..8b65a489581b 100644
--- a/drivers/pci/intr_remapping.c
+++ b/drivers/pci/intr_remapping.c
@@ -590,7 +590,8 @@ static int setup_intr_remapping(struct intel_iommu *iommu, int mode)
         if (!iommu->ir_table)
                 return -ENOMEM;
 
-        pages = alloc_pages(GFP_ATOMIC | __GFP_ZERO, INTR_REMAP_PAGE_ORDER);
+        pages = alloc_pages_node(iommu->node, GFP_ATOMIC | __GFP_ZERO,
+                                 INTR_REMAP_PAGE_ORDER);
 
         if (!pages) {
                 printk(KERN_ERR "failed to allocate pages of order %d\n",
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index ce52ea34fee5..a49452e2aed9 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -43,7 +43,7 @@ static int pcie_portdrv_restore_config(struct pci_dev *dev)
 }
 
 #ifdef CONFIG_PM
-static struct dev_pm_ops pcie_portdrv_pm_ops = {
+static const struct dev_pm_ops pcie_portdrv_pm_ops = {
         .suspend        = pcie_port_device_suspend,
         .resume         = pcie_port_device_resume,
         .freeze         = pcie_port_device_suspend,
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index da346eb7e77e..3aabf1e37988 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -336,7 +336,7 @@ static int pxa2xx_drv_pcmcia_resume(struct device *dev)
         return pcmcia_socket_dev_resume(dev);
 }
 
-static struct dev_pm_ops  pxa2xx_drv_pcmcia_pm_ops = {
+static const struct dev_pm_ops pxa2xx_drv_pcmcia_pm_ops = {
         .suspend        = pxa2xx_drv_pcmcia_suspend,
         .resume         = pxa2xx_drv_pcmcia_resume,
 };
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index fe02cfd4b5e9..e4d12acdd525 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -1330,7 +1330,7 @@ static int yenta_dev_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops yenta_pm_ops = {
+static const struct dev_pm_ops yenta_pm_ops = {
         .suspend_noirq = yenta_dev_suspend_noirq,
         .resume_noirq = yenta_dev_resume_noirq,
         .resume = yenta_dev_resume,
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index ab64522aaa64..be27aa47e810 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -460,7 +460,7 @@ static int acerhdf_remove(struct platform_device *device)
         return 0;
 }
 
-static struct dev_pm_ops acerhdf_pm_ops = {
+static const struct dev_pm_ops acerhdf_pm_ops = {
         .suspend = acerhdf_suspend,
         .freeze  = acerhdf_suspend,
 };
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 4226e5352738..e647a856b9bf 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -154,7 +154,7 @@ static struct eeepc_hotk *ehotk;
 static int eeepc_hotk_thaw(struct device *device);
 static int eeepc_hotk_restore(struct device *device);
 
-static struct dev_pm_ops eeepc_pm_ops = {
+static const struct dev_pm_ops eeepc_pm_ops = {
         .thaw = eeepc_hotk_thaw,
         .restore = eeepc_hotk_restore,
 };
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index c2842171cec6..f00a71c58e69 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -94,7 +94,7 @@ static struct rfkill *wifi_rfkill;
 static struct rfkill *bluetooth_rfkill;
 static struct rfkill *wwan_rfkill;
 
-static struct dev_pm_ops hp_wmi_pm_ops = {
+static const struct dev_pm_ops hp_wmi_pm_ops = {
         .resume  = hp_wmi_resume_handler,
         .restore  = hp_wmi_resume_handler,
 };
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 0ed84806f8ae..cf61d6a8ef6f 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -1006,11 +1006,8 @@ static int parse_strtoul(const char *buf,
 {
         char *endp;
 
-        while (*buf && isspace(*buf))
-                buf++;
-        *value = simple_strtoul(buf, &endp, 0);
-        while (*endp && isspace(*endp))
-                endp++;
+        *value = simple_strtoul(skip_spaces(buf), &endp, 0);
+        endp = skip_spaces(endp);
         if (*endp || *value > max)
                 return -EINVAL;
 
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index c3f1c8e9d254..68b0c04987e4 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -310,8 +310,7 @@ static ssize_t pnp_set_current_resources(struct device *dmdev,
                 goto done;
         }
 
-        while (isspace(*buf))
-                ++buf;
+        buf = skip_spaces(buf);
         if (!strnicmp(buf, "disable", 7)) {
                 retval = pnp_disable_dev(dev);
                 goto done;
@@ -353,19 +352,13 @@ static ssize_t pnp_set_current_resources(struct device *dmdev,
                 pnp_init_resources(dev);
                 mutex_lock(&pnp_res_mutex);
                 while (1) {
-                        while (isspace(*buf))
-                                ++buf;
+                        buf = skip_spaces(buf);
                         if (!strnicmp(buf, "io", 2)) {
-                                buf += 2;
-                                while (isspace(*buf))
-                                        ++buf;
+                                buf = skip_spaces(buf + 2);
                                 start = simple_strtoul(buf, &buf, 0);
-                                while (isspace(*buf))
-                                        ++buf;
+                                buf = skip_spaces(buf);
                                 if (*buf == '-') {
-                                        buf += 1;
-                                        while (isspace(*buf))
-                                                ++buf;
+                                        buf = skip_spaces(buf + 1);
                                         end = simple_strtoul(buf, &buf, 0);
                                 } else
                                         end = start;
@@ -373,16 +366,11 @@ static ssize_t pnp_set_current_resources(struct device *dmdev,
                                 continue;
                         }
                         if (!strnicmp(buf, "mem", 3)) {
-                                buf += 3;
-                                while (isspace(*buf))
-                                        ++buf;
+                                buf = skip_spaces(buf + 3);
                                 start = simple_strtoul(buf, &buf, 0);
-                                while (isspace(*buf))
-                                        ++buf;
+                                buf = skip_spaces(buf);
                                 if (*buf == '-') {
-                                        buf += 1;
-                                        while (isspace(*buf))
-                                                ++buf;
+                                        buf = skip_spaces(buf + 1);
                                         end = simple_strtoul(buf, &buf, 0);
                                 } else
                                         end = start;
@@ -390,17 +378,13 @@ static ssize_t pnp_set_current_resources(struct device *dmdev,
                                 continue;
                         }
                         if (!strnicmp(buf, "irq", 3)) {
-                                buf += 3;
-                                while (isspace(*buf))
-                                        ++buf;
+                                buf = skip_spaces(buf + 3);
                                 start = simple_strtoul(buf, &buf, 0);
                                 pnp_add_irq_resource(dev, start, 0);
                                 continue;
                         }
                         if (!strnicmp(buf, "dma", 3)) {
-                                buf += 3;
-                                while (isspace(*buf))
-                                        ++buf;
+                                buf = skip_spaces(buf + 3);
                                 start = simple_strtoul(buf, &buf, 0);
                                 pnp_add_dma_resource(dev, start, 0);
                                 continue;
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index b35d921bac6e..2d8ac43f78e8 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -24,6 +24,7 @@
 #include <linux/types.h>
 #include <linux/proc_fs.h>
 #include <linux/pnp.h>
+#include <linux/seq_file.h>
 #include <linux/init.h>
 
 #include <asm/uaccess.h>
@@ -33,42 +34,65 @@
 static struct proc_dir_entry *proc_pnp = NULL;
 static struct proc_dir_entry *proc_pnp_boot = NULL;
 
-static int proc_read_pnpconfig(char *buf, char **start, off_t pos,
-                               int count, int *eof, void *data)
+static int pnpconfig_proc_show(struct seq_file *m, void *v)
 {
         struct pnp_isa_config_struc pnps;
 
         if (pnp_bios_isapnp_config(&pnps))
                 return -EIO;
-        return snprintf(buf, count,
-                        "structure_revision %d\n"
-                        "number_of_CSNs %d\n"
-                        "ISA_read_data_port 0x%x\n",
-                        pnps.revision, pnps.no_csns, pnps.isa_rd_data_port);
+        seq_printf(m, "structure_revision %d\n"
+                      "number_of_CSNs %d\n"
+                      "ISA_read_data_port 0x%x\n",
+                   pnps.revision, pnps.no_csns, pnps.isa_rd_data_port);
+        return 0;
 }
 
-static int proc_read_escdinfo(char *buf, char **start, off_t pos,
-                              int count, int *eof, void *data)
+static int pnpconfig_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, pnpconfig_proc_show, NULL);
+}
+
+static const struct file_operations pnpconfig_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = pnpconfig_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int escd_info_proc_show(struct seq_file *m, void *v)
 {
         struct escd_info_struc escd;
 
         if (pnp_bios_escd_info(&escd))
                 return -EIO;
-        return snprintf(buf, count,
-                        "min_ESCD_write_size %d\n"
+        seq_printf(m, "min_ESCD_write_size %d\n"
                         "ESCD_size %d\n"
                         "NVRAM_base 0x%x\n",
                         escd.min_escd_write_size,
                         escd.escd_size, escd.nv_storage_base);
+        return 0;
 }
 
+static int escd_info_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, escd_info_proc_show, NULL);
+}
+
+static const struct file_operations escd_info_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = escd_info_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 #define MAX_SANE_ESCD_SIZE (32*1024)
-static int proc_read_escd(char *buf, char **start, off_t pos,
-                          int count, int *eof, void *data)
+static int escd_proc_show(struct seq_file *m, void *v)
 {
         struct escd_info_struc escd;
         char *tmpbuf;
-        int escd_size, escd_left_to_read, n;
+        int escd_size;
 
         if (pnp_bios_escd_info(&escd))
                 return -EIO;
@@ -76,7 +100,7 @@ static int proc_read_escd(char *buf, char **start, off_t pos,
         /* sanity check */
         if (escd.escd_size > MAX_SANE_ESCD_SIZE) {
                 printk(KERN_ERR
-                       "PnPBIOS: proc_read_escd: ESCD size reported by BIOS escd_info call is too great\n");
+                       "PnPBIOS: %s: ESCD size reported by BIOS escd_info call is too great\n", __func__);
                 return -EFBIG;
         }
 
@@ -94,56 +118,75 @@ static int proc_read_escd(char *buf, char **start, off_t pos,
 
         /* sanity check */
         if (escd_size > MAX_SANE_ESCD_SIZE) {
-                printk(KERN_ERR "PnPBIOS: proc_read_escd: ESCD size reported by"
-                                " BIOS read_escd call is too great\n");
+                printk(KERN_ERR "PnPBIOS: %s: ESCD size reported by"
+                                " BIOS read_escd call is too great\n", __func__);
                 kfree(tmpbuf);
                 return -EFBIG;
         }
 
-        escd_left_to_read = escd_size - pos;
-        if (escd_left_to_read < 0)
-                escd_left_to_read = 0;
-        if (escd_left_to_read == 0)
-                *eof = 1;
-        n = min(count, escd_left_to_read);
-        memcpy(buf, tmpbuf + pos, n);
+        seq_write(m, tmpbuf, escd_size);
         kfree(tmpbuf);
-        *start = buf;
-        return n;
+        return 0;
 }
 
-static int proc_read_legacyres(char *buf, char **start, off_t pos,
-                               int count, int *eof, void *data)
+static int escd_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, escd_proc_show, NULL);
+}
+
+static const struct file_operations escd_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = escd_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int pnp_legacyres_proc_show(struct seq_file *m, void *v)
 {
-        /* Assume that the following won't overflow the buffer */
-        if (pnp_bios_get_stat_res(buf))
+        void *buf;
+
+        buf = kmalloc(65536, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+        if (pnp_bios_get_stat_res(buf)) {
+                kfree(buf);
                 return -EIO;
+        }
+
+        seq_write(m, buf, 65536);
+        kfree(buf);
+        return 0;
+}
 
-        return count;           // FIXME: Return actual length
+static int pnp_legacyres_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, pnp_legacyres_proc_show, NULL);
 }
 
-static int proc_read_devices(char *buf, char **start, off_t pos,
-                             int count, int *eof, void *data)
+static const struct file_operations pnp_legacyres_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = pnp_legacyres_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int pnp_devices_proc_show(struct seq_file *m, void *v)
 {
         struct pnp_bios_node *node;
         u8 nodenum;
-        char *p = buf;
-
-        if (pos >= 0xff)
-                return 0;
 
         node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -ENOMEM;
 
-        for (nodenum = pos; nodenum < 0xff;) {
+        for (nodenum = 0; nodenum < 0xff;) {
                 u8 thisnodenum = nodenum;
-                /* 26 = the number of characters per line sprintf'ed */
-                if ((p - buf + 26) > count)
-                        break;
+
                 if (pnp_bios_get_dev_node(&nodenum, PNPMODE_DYNAMIC, node))
                         break;
-                p += sprintf(p, "%02x\t%08x\t%02x:%02x:%02x\t%04x\n",
+                seq_printf(m, "%02x\t%08x\t%02x:%02x:%02x\t%04x\n",
                              node->handle, node->eisa_id,
                              node->type_code[0], node->type_code[1],
                              node->type_code[2], node->flags);
@@ -153,20 +196,29 @@ static int proc_read_devices(char *buf, char **start, off_t pos,
                                "PnPBIOS: proc_read_devices:",
                                (unsigned int)nodenum,
                                (unsigned int)thisnodenum);
-                        *eof = 1;
                         break;
                 }
         }
         kfree(node);
-        if (nodenum == 0xff)
-                *eof = 1;
-        *start = (char *)((off_t) nodenum - pos);
-        return p - buf;
+        return 0;
+}
+
+static int pnp_devices_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, pnp_devices_proc_show, NULL);
 }
 
-static int proc_read_node(char *buf, char **start, off_t pos,
-                          int count, int *eof, void *data)
+static const struct file_operations pnp_devices_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = pnp_devices_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int pnpbios_proc_show(struct seq_file *m, void *v)
 {
+        void *data = m->private;
         struct pnp_bios_node *node;
         int boot = (long)data >> 8;
         u8 nodenum = (long)data;
@@ -180,14 +232,20 @@ static int proc_read_node(char *buf, char **start, off_t pos,
                 return -EIO;
         }
         len = node->size - sizeof(struct pnp_bios_node);
-        memcpy(buf, node->data, len);
+        seq_write(m, node->data, len);
         kfree(node);
-        return len;
+        return 0;
+}
+
+static int pnpbios_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, pnpbios_proc_show, PDE(inode)->data);
 }
 
-static int proc_write_node(struct file *file, const char __user * buf,
-                           unsigned long count, void *data)
+static ssize_t pnpbios_proc_write(struct file *file, const char __user *buf,
+                                  size_t count, loff_t *pos)
 {
+        void *data = PDE(file->f_path.dentry->d_inode)->data;
         struct pnp_bios_node *node;
         int boot = (long)data >> 8;
         u8 nodenum = (long)data;
@@ -218,34 +276,33 @@ out:
         return ret;
 }
 
+static const struct file_operations pnpbios_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = pnpbios_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = pnpbios_proc_write,
+};
+
 int pnpbios_interface_attach_device(struct pnp_bios_node *node)
 {
         char name[3];
-        struct proc_dir_entry *ent;
 
         sprintf(name, "%02x", node->handle);
 
         if (!proc_pnp)
                 return -EIO;
         if (!pnpbios_dont_use_current_config) {
-                ent = create_proc_entry(name, 0, proc_pnp);
-                if (ent) {
-                        ent->read_proc = proc_read_node;
-                        ent->write_proc = proc_write_node;
-                        ent->data = (void *)(long)(node->handle);
-                }
+                proc_create_data(name, 0644, proc_pnp, &pnpbios_proc_fops,
+                                 (void *)(long)(node->handle));
         }
 
         if (!proc_pnp_boot)
                 return -EIO;
-        ent = create_proc_entry(name, 0, proc_pnp_boot);
-        if (ent) {
-                ent->read_proc = proc_read_node;
-                ent->write_proc = proc_write_node;
-                ent->data = (void *)(long)(node->handle + 0x100);
+        if (proc_create_data(name, 0644, proc_pnp_boot, &pnpbios_proc_fops,
+                             (void *)(long)(node->handle + 0x100)))
                 return 0;
-        }
-
         return -EIO;
 }
 
@@ -262,14 +319,11 @@ int __init pnpbios_proc_init(void)
         proc_pnp_boot = proc_mkdir("boot", proc_pnp);
         if (!proc_pnp_boot)
                 return -EIO;
-        create_proc_read_entry("devices", 0, proc_pnp, proc_read_devices, NULL);
-        create_proc_read_entry("configuration_info", 0, proc_pnp,
-                               proc_read_pnpconfig, NULL);
-        create_proc_read_entry("escd_info", 0, proc_pnp, proc_read_escdinfo,
-                               NULL);
-        create_proc_read_entry("escd", S_IRUSR, proc_pnp, proc_read_escd, NULL);
-        create_proc_read_entry("legacy_device_resources", 0, proc_pnp,
-                               proc_read_legacyres, NULL);
+        proc_create("devices", 0, proc_pnp, &pnp_devices_proc_fops);
+        proc_create("configuration_info", 0, proc_pnp, &pnpconfig_proc_fops);
+        proc_create("escd_info", 0, proc_pnp, &escd_info_proc_fops);
+        proc_create("escd", S_IRUSR, proc_pnp, &escd_proc_fops);
+        proc_create("legacy_device_resources", 0, proc_pnp, &pnp_legacyres_proc_fops);
 
         return 0;
 }
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 118674925516..d4b3d67f0548 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -29,6 +29,13 @@ config APM_POWER
           Say Y here to enable support APM status emulation using
           battery class devices.
 
+config WM831X_BACKUP
+        tristate "WM831X backup battery charger support"
+        depends on MFD_WM831X
+        help
+          Say Y here to enable support for the backup battery charger
+          in the Wolfson Microelectronics WM831x PMICs.
+
 config WM831X_POWER
         tristate "WM831X PMU support"
         depends on MFD_WM831X
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 356cdfd3c8b2..573597c683b4 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_POWER_SUPPLY)	+= power_supply.o
 
 obj-$(CONFIG_PDA_POWER)         += pda_power.o
 obj-$(CONFIG_APM_POWER)         += apm_power.o
+obj-$(CONFIG_WM831X_BACKUP)     += wm831x_backup.o
 obj-$(CONFIG_WM831X_POWER)      += wm831x_power.o
 obj-$(CONFIG_WM8350_POWER)      += wm8350_power.o
 
diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c
index 6a84a8eb8d7a..ea3fdfaca90d 100644
--- a/drivers/power/pcf50633-charger.c
+++ b/drivers/power/pcf50633-charger.c
@@ -29,15 +29,12 @@
 struct pcf50633_mbc {
         struct pcf50633 *pcf;
 
-        int adapter_active;
         int adapter_online;
-        int usb_active;
         int usb_online;
 
         struct power_supply usb;
         struct power_supply adapter;
-
-        struct delayed_work charging_restart_work;
+        struct power_supply ac;
 };
 
 int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma)
@@ -47,16 +44,21 @@ int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma)
         u8 bits;
         int charging_start = 1;
         u8 mbcs2, chgmod;
+        unsigned int mbcc5;
 
-        if (ma >= 1000)
+        if (ma >= 1000) {
                 bits = PCF50633_MBCC7_USB_1000mA;
-        else if (ma >= 500)
+                ma = 1000;
+        } else if (ma >= 500) {
                 bits = PCF50633_MBCC7_USB_500mA;
-        else if (ma >= 100)
+                ma = 500;
+        } else if (ma >= 100) {
                 bits = PCF50633_MBCC7_USB_100mA;
-        else {
+                ma = 100;
+        } else {
                 bits = PCF50633_MBCC7_USB_SUSPEND;
                 charging_start = 0;
+                ma = 0;
         }
 
         ret = pcf50633_reg_set_bit_mask(pcf, PCF50633_REG_MBCC7,
@@ -66,21 +68,40 @@ int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma)
         else
                 dev_info(pcf->dev, "usb curlim to %d mA\n", ma);
 
-        /* Manual charging start */
-        mbcs2 = pcf50633_reg_read(pcf, PCF50633_REG_MBCS2);
+        /*
+         * We limit the charging current to be the USB current limit.
+         * The reason is that on pcf50633, when it enters PMU Standby mode,
+         * which it does when the device goes "off", the USB current limit
+         * reverts to the variant default.  In at least one common case, that
+         * default is 500mA.  By setting the charging current to be the same
+         * as the USB limit we set here before PMU standby, we enforce it only
+         * using the correct amount of current even when the USB current limit
+         * gets reset to the wrong thing
+         */
+
+        if (mbc->pcf->pdata->charger_reference_current_ma) {
+                mbcc5 = (ma << 8) / mbc->pcf->pdata->charger_reference_current_ma;
+                if (mbcc5 > 255)
+                        mbcc5 = 255;
+                pcf50633_reg_write(mbc->pcf, PCF50633_REG_MBCC5, mbcc5);
+        }
+
+        mbcs2 = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCS2);
         chgmod = (mbcs2 & PCF50633_MBCS2_MBC_MASK);
 
         /* If chgmod == BATFULL, setting chgena has no effect.
-         * We need to set resume instead.
+         * Datasheet says we need to set resume instead but when autoresume is
+         * used resume doesn't work. Clear and set chgena instead.
          */
         if (chgmod != PCF50633_MBCS2_MBC_BAT_FULL)
                 pcf50633_reg_set_bit_mask(pcf, PCF50633_REG_MBCC1,
                                 PCF50633_MBCC1_CHGENA, PCF50633_MBCC1_CHGENA);
-        else
+        else {
+                pcf50633_reg_clear_bits(pcf, PCF50633_REG_MBCC1,
+                                PCF50633_MBCC1_CHGENA);
                 pcf50633_reg_set_bit_mask(pcf, PCF50633_REG_MBCC1,
-                                PCF50633_MBCC1_RESUME, PCF50633_MBCC1_RESUME);
-
-        mbc->usb_active = charging_start;
+                                PCF50633_MBCC1_CHGENA, PCF50633_MBCC1_CHGENA);
+        }
 
         power_supply_changed(&mbc->usb);
 
@@ -92,20 +113,44 @@ int pcf50633_mbc_get_status(struct pcf50633 *pcf)
 {
         struct pcf50633_mbc *mbc  = platform_get_drvdata(pcf->mbc_pdev);
         int status = 0;
+        u8 chgmod;
+
+        if (!mbc)
+                return 0;
+
+        chgmod = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCS2)
+                & PCF50633_MBCS2_MBC_MASK;
 
         if (mbc->usb_online)
                 status |= PCF50633_MBC_USB_ONLINE;
-        if (mbc->usb_active)
+        if (chgmod == PCF50633_MBCS2_MBC_USB_PRE ||
+            chgmod == PCF50633_MBCS2_MBC_USB_PRE_WAIT ||
+            chgmod == PCF50633_MBCS2_MBC_USB_FAST ||
+            chgmod == PCF50633_MBCS2_MBC_USB_FAST_WAIT)
                 status |= PCF50633_MBC_USB_ACTIVE;
         if (mbc->adapter_online)
                 status |= PCF50633_MBC_ADAPTER_ONLINE;
-        if (mbc->adapter_active)
+        if (chgmod == PCF50633_MBCS2_MBC_ADP_PRE ||
+            chgmod == PCF50633_MBCS2_MBC_ADP_PRE_WAIT ||
+            chgmod == PCF50633_MBCS2_MBC_ADP_FAST ||
+            chgmod == PCF50633_MBCS2_MBC_ADP_FAST_WAIT)
                 status |= PCF50633_MBC_ADAPTER_ACTIVE;
 
         return status;
 }
 EXPORT_SYMBOL_GPL(pcf50633_mbc_get_status);
 
+int pcf50633_mbc_get_usb_online_status(struct pcf50633 *pcf)
+{
+        struct pcf50633_mbc *mbc  = platform_get_drvdata(pcf->mbc_pdev);
+
+        if (!mbc)
+                return 0;
+
+        return mbc->usb_online;
+}
+EXPORT_SYMBOL_GPL(pcf50633_mbc_get_usb_online_status);
+
 static ssize_t
 show_chgmode(struct device *dev, struct device_attribute *attr, char *buf)
 {
@@ -156,9 +201,55 @@ static ssize_t set_usblim(struct device *dev,
 
 static DEVICE_ATTR(usb_curlim, S_IRUGO | S_IWUSR, show_usblim, set_usblim);
 
+static ssize_t
+show_chglim(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct pcf50633_mbc *mbc = dev_get_drvdata(dev);
+        u8 mbcc5 = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCC5);
+        unsigned int ma;
+
+        if (!mbc->pcf->pdata->charger_reference_current_ma)
+                return -ENODEV;
+
+        ma = (mbc->pcf->pdata->charger_reference_current_ma *  mbcc5) >> 8;
+
+        return sprintf(buf, "%u\n", ma);
+}
+
+static ssize_t set_chglim(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct pcf50633_mbc *mbc = dev_get_drvdata(dev);
+        unsigned long ma;
+        unsigned int mbcc5;
+        int ret;
+
+        if (!mbc->pcf->pdata->charger_reference_current_ma)
+                return -ENODEV;
+
+        ret = strict_strtoul(buf, 10, &ma);
+        if (ret)
+                return -EINVAL;
+
+        mbcc5 = (ma << 8) / mbc->pcf->pdata->charger_reference_current_ma;
+        if (mbcc5 > 255)
+                mbcc5 = 255;
+        pcf50633_reg_write(mbc->pcf, PCF50633_REG_MBCC5, mbcc5);
+
+        return count;
+}
+
+/*
+ * This attribute allows to change MBC charging limit on the fly
+ * independently of usb current limit. It also gets set automatically every
+ * time usb current limit is changed.
+ */
+static DEVICE_ATTR(chg_curlim, S_IRUGO | S_IWUSR, show_chglim, set_chglim);
+
 static struct attribute *pcf50633_mbc_sysfs_entries[] = {
         &dev_attr_chgmode.attr,
         &dev_attr_usb_curlim.attr,
+        &dev_attr_chg_curlim.attr,
         NULL,
 };
 
@@ -167,76 +258,26 @@ static struct attribute_group mbc_attr_group = {
         .attrs  = pcf50633_mbc_sysfs_entries,
 };
 
-/* MBC state machine switches into charging mode when the battery voltage
- * falls below 96% of a battery float voltage. But the voltage drop in Li-ion
- * batteries is marginal(1~2 %) till about 80% of its capacity - which means,
- * after a BATFULL, charging won't be restarted until 80%.
- *
- * This work_struct function restarts charging at regular intervals to make
- * sure we don't discharge too much
- */
-
-static void pcf50633_mbc_charging_restart(struct work_struct *work)
-{
-        struct pcf50633_mbc *mbc;
-        u8 mbcs2, chgmod;
-
-        mbc = container_of(work, struct pcf50633_mbc,
-                                charging_restart_work.work);
-
-        mbcs2 = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCS2);
-        chgmod = (mbcs2 & PCF50633_MBCS2_MBC_MASK);
-
-        if (chgmod != PCF50633_MBCS2_MBC_BAT_FULL)
-                return;
-
-        /* Restart charging */
-        pcf50633_reg_set_bit_mask(mbc->pcf, PCF50633_REG_MBCC1,
-                                PCF50633_MBCC1_RESUME, PCF50633_MBCC1_RESUME);
-        mbc->usb_active = 1;
-        power_supply_changed(&mbc->usb);
-
-        dev_info(mbc->pcf->dev, "Charging restarted\n");
-}
-
 static void
 pcf50633_mbc_irq_handler(int irq, void *data)
 {
         struct pcf50633_mbc *mbc = data;
-        int chg_restart_interval =
-                        mbc->pcf->pdata->charging_restart_interval;
 
         /* USB */
         if (irq == PCF50633_IRQ_USBINS) {
                 mbc->usb_online = 1;
         } else if (irq == PCF50633_IRQ_USBREM) {
                 mbc->usb_online = 0;
-                mbc->usb_active = 0;
                 pcf50633_mbc_usb_curlim_set(mbc->pcf, 0);
-                cancel_delayed_work_sync(&mbc->charging_restart_work);
         }
 
         /* Adapter */
-        if (irq == PCF50633_IRQ_ADPINS) {
+        if (irq == PCF50633_IRQ_ADPINS)
                 mbc->adapter_online = 1;
-                mbc->adapter_active = 1;
-        } else if (irq == PCF50633_IRQ_ADPREM) {
+        else if (irq == PCF50633_IRQ_ADPREM)
                 mbc->adapter_online = 0;
-                mbc->adapter_active = 0;
-        }
-
-        if (irq == PCF50633_IRQ_BATFULL) {
-                mbc->usb_active = 0;
-                mbc->adapter_active = 0;
-
-                if (chg_restart_interval > 0)
-                        schedule_delayed_work(&mbc->charging_restart_work,
-                                                        chg_restart_interval);
-        } else if (irq == PCF50633_IRQ_USBLIMON)
-                mbc->usb_active = 0;
-        else if (irq == PCF50633_IRQ_USBLIMOFF)
-                mbc->usb_active = 1;
 
+        power_supply_changed(&mbc->ac);
         power_supply_changed(&mbc->usb);
         power_supply_changed(&mbc->adapter);
 
@@ -269,10 +310,34 @@ static int usb_get_property(struct power_supply *psy,
 {
         struct pcf50633_mbc *mbc = container_of(psy, struct pcf50633_mbc, usb);
         int ret = 0;
+        u8 usblim = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCC7) &
+                                                PCF50633_MBCC7_USB_MASK;
 
         switch (psp) {
         case POWER_SUPPLY_PROP_ONLINE:
-                val->intval = mbc->usb_online;
+                val->intval = mbc->usb_online &&
+                                (usblim <= PCF50633_MBCC7_USB_500mA);
+                break;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+        return ret;
+}
+
+static int ac_get_property(struct power_supply *psy,
+                        enum power_supply_property psp,
+                        union power_supply_propval *val)
+{
+        struct pcf50633_mbc *mbc = container_of(psy, struct pcf50633_mbc, ac);
+        int ret = 0;
+        u8 usblim = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCC7) &
+                                                PCF50633_MBCC7_USB_MASK;
+
+        switch (psp) {
+        case POWER_SUPPLY_PROP_ONLINE:
+                val->intval = mbc->usb_online &&
+                                (usblim == PCF50633_MBCC7_USB_1000mA);
                 break;
         default:
                 ret = -EINVAL;
@@ -336,6 +401,14 @@ static int __devinit pcf50633_mbc_probe(struct platform_device *pdev)
         mbc->usb.supplied_to            = mbc->pcf->pdata->batteries;
         mbc->usb.num_supplicants        = mbc->pcf->pdata->num_batteries;
 
+        mbc->ac.name                    = "ac";
+        mbc->ac.type                    = POWER_SUPPLY_TYPE_MAINS;
+        mbc->ac.properties              = power_props;
+        mbc->ac.num_properties          = ARRAY_SIZE(power_props);
+        mbc->ac.get_property            = ac_get_property;
+        mbc->ac.supplied_to             = mbc->pcf->pdata->batteries;
+        mbc->ac.num_supplicants         = mbc->pcf->pdata->num_batteries;
+
         ret = power_supply_register(&pdev->dev, &mbc->adapter);
         if (ret) {
                 dev_err(mbc->pcf->dev, "failed to register adapter\n");
@@ -351,8 +424,14 @@ static int __devinit pcf50633_mbc_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        INIT_DELAYED_WORK(&mbc->charging_restart_work,
-                                pcf50633_mbc_charging_restart);
+        ret = power_supply_register(&pdev->dev, &mbc->ac);
+        if (ret) {
+                dev_err(mbc->pcf->dev, "failed to register ac\n");
+                power_supply_unregister(&mbc->adapter);
+                power_supply_unregister(&mbc->usb);
+                kfree(mbc);
+                return ret;
+        }
 
         ret = sysfs_create_group(&pdev->dev.kobj, &mbc_attr_group);
         if (ret)
@@ -378,8 +457,7 @@ static int __devexit pcf50633_mbc_remove(struct platform_device *pdev)
 
         power_supply_unregister(&mbc->usb);
         power_supply_unregister(&mbc->adapter);
-
-        cancel_delayed_work_sync(&mbc->charging_restart_work);
+        power_supply_unregister(&mbc->ac);
 
         kfree(mbc);
 
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 08144393d64b..c790e0c77d4b 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -65,7 +65,10 @@ static ssize_t power_supply_show_property(struct device *dev,
         ret = psy->get_property(psy, off, &value);
 
         if (ret < 0) {
-                if (ret != -ENODEV)
+                if (ret == -ENODATA)
+                        dev_dbg(dev, "driver has no data for `%s' property\n",
+                                attr->attr.name);
+                else if (ret != -ENODEV)
                         dev_err(dev, "driver failed to report `%s' property\n",
                                 attr->attr.name);
                 return ret;
diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c
new file mode 100644
index 000000000000..bf4f387a8009
--- /dev/null
+++ b/drivers/power/wm831x_backup.c
@@ -0,0 +1,233 @@
+/*
+ * Backup battery driver for Wolfson Microelectronics wm831x PMICs
+ *
+ * Copyright 2009 Wolfson Microelectronics PLC.
+ *
+ * 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/module.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/power_supply.h>
+
+#include <linux/mfd/wm831x/core.h>
+#include <linux/mfd/wm831x/auxadc.h>
+#include <linux/mfd/wm831x/pmu.h>
+#include <linux/mfd/wm831x/pdata.h>
+
+struct wm831x_backup {
+        struct wm831x *wm831x;
+        struct power_supply backup;
+};
+
+static int wm831x_backup_read_voltage(struct wm831x *wm831x,
+                                     enum wm831x_auxadc src,
+                                     union power_supply_propval *val)
+{
+        int ret;
+
+        ret = wm831x_auxadc_read_uv(wm831x, src);
+        if (ret >= 0)
+                val->intval = ret;
+
+        return ret;
+}
+
+/*********************************************************************
+ *              Backup supply properties
+ *********************************************************************/
+
+static void wm831x_config_backup(struct wm831x *wm831x)
+{
+        struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data;
+        struct wm831x_backup_pdata *pdata;
+        int ret, reg;
+
+        if (!wm831x_pdata || !wm831x_pdata->backup) {
+                dev_warn(wm831x->dev,
+                         "No backup battery charger configuration\n");
+                return;
+        }
+
+        pdata = wm831x_pdata->backup;
+
+        reg = 0;
+
+        if (pdata->charger_enable)
+                reg |= WM831X_BKUP_CHG_ENA | WM831X_BKUP_BATT_DET_ENA;
+        if (pdata->no_constant_voltage)
+                reg |= WM831X_BKUP_CHG_MODE;
+
+        switch (pdata->vlim) {
+        case 2500:
+                break;
+        case 3100:
+                reg |= WM831X_BKUP_CHG_VLIM;
+                break;
+        default:
+                dev_err(wm831x->dev, "Invalid backup voltage limit %dmV\n",
+                        pdata->vlim);
+        }
+
+        switch (pdata->ilim) {
+        case 100:
+                break;
+        case 200:
+                reg |= 1;
+                break;
+        case 300:
+                reg |= 2;
+                break;
+        case 400:
+                reg |= 3;
+                break;
+        default:
+                dev_err(wm831x->dev, "Invalid backup current limit %duA\n",
+                        pdata->ilim);
+        }
+
+        ret = wm831x_reg_unlock(wm831x);
+        if (ret != 0) {
+                dev_err(wm831x->dev, "Failed to unlock registers: %d\n", ret);
+                return;
+        }
+
+        ret = wm831x_set_bits(wm831x, WM831X_BACKUP_CHARGER_CONTROL,
+                              WM831X_BKUP_CHG_ENA_MASK |
+                              WM831X_BKUP_CHG_MODE_MASK |
+                              WM831X_BKUP_BATT_DET_ENA_MASK |
+                              WM831X_BKUP_CHG_VLIM_MASK |
+                              WM831X_BKUP_CHG_ILIM_MASK,
+                              reg);
+        if (ret != 0)
+                dev_err(wm831x->dev,
+                        "Failed to set backup charger config: %d\n", ret);
+
+        wm831x_reg_lock(wm831x);
+}
+
+static int wm831x_backup_get_prop(struct power_supply *psy,
+                                  enum power_supply_property psp,
+                                  union power_supply_propval *val)
+{
+        struct wm831x_backup *devdata = dev_get_drvdata(psy->dev->parent);
+        struct wm831x *wm831x = devdata->wm831x;
+        int ret = 0;
+
+        ret = wm831x_reg_read(wm831x, WM831X_BACKUP_CHARGER_CONTROL);
+        if (ret < 0)
+                return ret;
+
+        switch (psp) {
+        case POWER_SUPPLY_PROP_STATUS:
+                if (ret & WM831X_BKUP_CHG_STS)
+                        val->intval = POWER_SUPPLY_STATUS_CHARGING;
+                else
+                        val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
+                break;
+
+        case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+                ret = wm831x_backup_read_voltage(wm831x, WM831X_AUX_BKUP_BATT,
+                                                val);
+                break;
+
+        case POWER_SUPPLY_PROP_PRESENT:
+                if (ret & WM831X_BKUP_CHG_STS)
+                        val->intval = 1;
+                else
+                        val->intval = 0;
+                break;
+
+        default:
+                ret = -EINVAL;
+                break;
+        }
+
+        return ret;
+}
+
+static enum power_supply_property wm831x_backup_props[] = {
+        POWER_SUPPLY_PROP_STATUS,
+        POWER_SUPPLY_PROP_VOLTAGE_NOW,
+        POWER_SUPPLY_PROP_PRESENT,
+};
+
+/*********************************************************************
+ *              Initialisation
+ *********************************************************************/
+
+static __devinit int wm831x_backup_probe(struct platform_device *pdev)
+{
+        struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
+        struct wm831x_backup *devdata;
+        struct power_supply *backup;
+        int ret;
+
+        devdata = kzalloc(sizeof(struct wm831x_backup), GFP_KERNEL);
+        if (devdata == NULL)
+                return -ENOMEM;
+
+        devdata->wm831x = wm831x;
+        platform_set_drvdata(pdev, devdata);
+
+        backup = &devdata->backup;
+
+        /* We ignore configuration failures since we can still read
+         * back the status without enabling the charger (which may
+         * already be enabled anyway).
+         */
+        wm831x_config_backup(wm831x);
+
+        backup->name = "wm831x-backup";
+        backup->type = POWER_SUPPLY_TYPE_BATTERY;
+        backup->properties = wm831x_backup_props;
+        backup->num_properties = ARRAY_SIZE(wm831x_backup_props);
+        backup->get_property = wm831x_backup_get_prop;
+        ret = power_supply_register(&pdev->dev, backup);
+        if (ret)
+                goto err_kmalloc;
+
+        return ret;
+
+err_kmalloc:
+        kfree(devdata);
+        return ret;
+}
+
+static __devexit int wm831x_backup_remove(struct platform_device *pdev)
+{
+        struct wm831x_backup *devdata = platform_get_drvdata(pdev);
+
+        power_supply_unregister(&devdata->backup);
+        kfree(devdata);
+
+        return 0;
+}
+
+static struct platform_driver wm831x_backup_driver = {
+        .probe = wm831x_backup_probe,
+        .remove = __devexit_p(wm831x_backup_remove),
+        .driver = {
+                .name = "wm831x-backup",
+        },
+};
+
+static int __init wm831x_backup_init(void)
+{
+        return platform_driver_register(&wm831x_backup_driver);
+}
+module_init(wm831x_backup_init);
+
+static void __exit wm831x_backup_exit(void)
+{
+        platform_driver_unregister(&wm831x_backup_driver);
+}
+module_exit(wm831x_backup_exit);
+
+MODULE_DESCRIPTION("Backup battery charger driver for WM831x PMICs");
+MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:wm831x-backup");
diff --git a/drivers/power/wm831x_power.c b/drivers/power/wm831x_power.c
index 2a4c8b0b829c..f85e80b1b400 100644
--- a/drivers/power/wm831x_power.c
+++ b/drivers/power/wm831x_power.c
@@ -21,7 +21,6 @@
 struct wm831x_power {
         struct wm831x *wm831x;
         struct power_supply wall;
-        struct power_supply backup;
         struct power_supply usb;
         struct power_supply battery;
 };
@@ -454,125 +453,6 @@ static irqreturn_t wm831x_bat_irq(int irq, void *data)
 
 
 /*********************************************************************
- *              Backup supply properties
- *********************************************************************/
-
-static void wm831x_config_backup(struct wm831x *wm831x)
-{
-        struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data;
-        struct wm831x_backup_pdata *pdata;
-        int ret, reg;
-
-        if (!wm831x_pdata || !wm831x_pdata->backup) {
-                dev_warn(wm831x->dev,
-                         "No backup battery charger configuration\n");
-                return;
-        }
-
-        pdata = wm831x_pdata->backup;
-
-        reg = 0;
-
-        if (pdata->charger_enable)
-                reg |= WM831X_BKUP_CHG_ENA | WM831X_BKUP_BATT_DET_ENA;
-        if (pdata->no_constant_voltage)
-                reg |= WM831X_BKUP_CHG_MODE;
-
-        switch (pdata->vlim) {
-        case 2500:
-                break;
-        case 3100:
-                reg |= WM831X_BKUP_CHG_VLIM;
-                break;
-        default:
-                dev_err(wm831x->dev, "Invalid backup voltage limit %dmV\n",
-                        pdata->vlim);
-        }
-
-        switch (pdata->ilim) {
-        case 100:
-                break;
-        case 200:
-                reg |= 1;
-                break;
-        case 300:
-                reg |= 2;
-                break;
-        case 400:
-                reg |= 3;
-                break;
-        default:
-                dev_err(wm831x->dev, "Invalid backup current limit %duA\n",
-                        pdata->ilim);
-        }
-
-        ret = wm831x_reg_unlock(wm831x);
-        if (ret != 0) {
-                dev_err(wm831x->dev, "Failed to unlock registers: %d\n", ret);
-                return;
-        }
-
-        ret = wm831x_set_bits(wm831x, WM831X_BACKUP_CHARGER_CONTROL,
-                              WM831X_BKUP_CHG_ENA_MASK |
-                              WM831X_BKUP_CHG_MODE_MASK |
-                              WM831X_BKUP_BATT_DET_ENA_MASK |
-                              WM831X_BKUP_CHG_VLIM_MASK |
-                              WM831X_BKUP_CHG_ILIM_MASK,
-                              reg);
-        if (ret != 0)
-                dev_err(wm831x->dev,
-                        "Failed to set backup charger config: %d\n", ret);
-
-        wm831x_reg_lock(wm831x);
-}
-
-static int wm831x_backup_get_prop(struct power_supply *psy,
-                                  enum power_supply_property psp,
-                                  union power_supply_propval *val)
-{
-        struct wm831x_power *wm831x_power = dev_get_drvdata(psy->dev->parent);
-        struct wm831x *wm831x = wm831x_power->wm831x;
-        int ret = 0;
-
-        ret = wm831x_reg_read(wm831x, WM831X_BACKUP_CHARGER_CONTROL);
-        if (ret < 0)
-                return ret;
-
-        switch (psp) {
-        case POWER_SUPPLY_PROP_STATUS:
-                if (ret & WM831X_BKUP_CHG_STS)
-                        val->intval = POWER_SUPPLY_STATUS_CHARGING;
-                else
-                        val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
-                break;
-
-        case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-                ret = wm831x_power_read_voltage(wm831x, WM831X_AUX_BKUP_BATT,
-                                                val);
-                break;
-
-        case POWER_SUPPLY_PROP_PRESENT:
-                if (ret & WM831X_BKUP_CHG_STS)
-                        val->intval = 1;
-                else
-                        val->intval = 0;
-                break;
-
-        default:
-                ret = -EINVAL;
-                break;
-        }
-
-        return ret;
-}
-
-static enum power_supply_property wm831x_backup_props[] = {
-        POWER_SUPPLY_PROP_STATUS,
-        POWER_SUPPLY_PROP_VOLTAGE_NOW,
-        POWER_SUPPLY_PROP_PRESENT,
-};
-
-/*********************************************************************
  *              Initialisation
  *********************************************************************/
 
@@ -595,10 +475,7 @@ static irqreturn_t wm831x_pwr_src_irq(int irq, void *data)
 
         dev_dbg(wm831x->dev, "Power source changed\n");
 
-        /* Just notify for everything - little harm in overnotifying.
-         * The backup battery is not a power source while the system
-         * is running so skip that.
-         */
+        /* Just notify for everything - little harm in overnotifying. */
         power_supply_changed(&wm831x_power->battery);
         power_supply_changed(&wm831x_power->usb);
         power_supply_changed(&wm831x_power->wall);
@@ -613,7 +490,6 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)
         struct power_supply *usb;
         struct power_supply *battery;
         struct power_supply *wall;
-        struct power_supply *backup;
         int ret, irq, i;
 
         power = kzalloc(sizeof(struct wm831x_power), GFP_KERNEL);
@@ -626,13 +502,11 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)
         usb = &power->usb;
         battery = &power->battery;
         wall = &power->wall;
-        backup = &power->backup;
 
         /* We ignore configuration failures since we can still read back
-         * the status without enabling either of the chargers.
+         * the status without enabling the charger.
          */
         wm831x_config_battery(wm831x);
-        wm831x_config_backup(wm831x);
 
         wall->name = "wm831x-wall";
         wall->type = POWER_SUPPLY_TYPE_MAINS;
@@ -661,15 +535,6 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)
         if (ret)
                 goto err_battery;
 
-        backup->name = "wm831x-backup";
-        backup->type = POWER_SUPPLY_TYPE_BATTERY;
-        backup->properties = wm831x_backup_props;
-        backup->num_properties = ARRAY_SIZE(wm831x_backup_props);
-        backup->get_property = wm831x_backup_get_prop;
-        ret = power_supply_register(&pdev->dev, backup);
-        if (ret)
-                goto err_usb;
-
         irq = platform_get_irq_byname(pdev, "SYSLO");
         ret = wm831x_request_irq(wm831x, irq, wm831x_syslo_irq,
                                  IRQF_TRIGGER_RISING, "SYSLO",
@@ -677,7 +542,7 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)
         if (ret != 0) {
                 dev_err(&pdev->dev, "Failed to request SYSLO IRQ %d: %d\n",
                         irq, ret);
-                goto err_backup;
+                goto err_usb;
         }
 
         irq = platform_get_irq_byname(pdev, "PWR SRC");
@@ -716,8 +581,6 @@ err_bat_irq:
 err_syslo:
         irq = platform_get_irq_byname(pdev, "SYSLO");
         wm831x_free_irq(wm831x, irq, power);
-err_backup:
-        power_supply_unregister(backup);
 err_usb:
         power_supply_unregister(usb);
 err_battery:
@@ -746,7 +609,6 @@ static __devexit int wm831x_power_remove(struct platform_device *pdev)
         irq = platform_get_irq_byname(pdev, "SYSLO");
         wm831x_free_irq(wm831x, irq, wm831x_power);
 
-        power_supply_unregister(&wm831x_power->backup);
         power_supply_unregister(&wm831x_power->battery);
         power_supply_unregister(&wm831x_power->wall);
         power_supply_unregister(&wm831x_power->usb);
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c
index f2bfd296dbae..fa39e759a275 100644
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@ -157,7 +157,7 @@ static int wm97xx_bat_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops wm97xx_bat_pm_ops = {
+static const struct dev_pm_ops wm97xx_bat_pm_ops = {
         .suspend        = wm97xx_bat_suspend,
         .resume         = wm97xx_bat_resume,
 };
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 71fbd6e8edf7..8167e9e6827a 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -242,6 +242,15 @@ config RTC_DRV_M41T80_WDT
           If you say Y here you will get support for the
           watchdog timer in the ST M41T60 and M41T80 RTC chips series.
 
+config RTC_DRV_BQ32K
+        tristate "TI BQ32000"
+        help
+          If you say Y here you will get support for the TI
+          BQ32000 I2C RTC chip.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-bq32k.
+
 config RTC_DRV_DM355EVM
         tristate "TI DaVinci DM355 EVM RTC"
         depends on MFD_DM355EVM_MSP
@@ -592,15 +601,22 @@ config RTC_DRV_AB3100
           Select this to enable the ST-Ericsson AB3100 Mixed Signal IC RTC
           support. This chip contains a battery- and capacitor-backed RTC.
 
+config RTC_DRV_NUC900
+        tristate "NUC910/NUC920 RTC driver"
+        depends on RTC_CLASS && ARCH_W90X900
+        help
+          If you say yes here you get support for the RTC subsystem of the
+          NUC910/NUC920 used in embedded systems.
 
 comment "on-CPU RTC drivers"
 
 config RTC_DRV_OMAP
         tristate "TI OMAP1"
-        depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730
+        depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_DAVINCI_DA8XX
         help
-          Say "yes" here to support the real time clock on TI OMAP1 chips.
-          This driver can also be built as a module called rtc-omap.
+          Say "yes" here to support the real time clock on TI OMAP1 and
+          DA8xx/OMAP-L13x chips.  This driver can also be built as a
+          module called rtc-omap.
 
 config RTC_DRV_S3C
         tristate "Samsung S3C series SoC RTC"
@@ -846,4 +862,10 @@ config RTC_DRV_PCAP
           If you say Y here you will get support for the RTC found on
           the PCAP2 ASIC used on some Motorola phones.
 
+config RTC_DRV_MC13783
+        depends on MFD_MC13783
+        tristate "Freescale MC13783 RTC"
+        help
+          This enables support for the Freescale MC13783 PMIC RTC
+
 endif # RTC_CLASS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 7da6efb3e953..e5160fddc446 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o
 obj-$(CONFIG_RTC_DRV_AT91SAM9)  += rtc-at91sam9.o
 obj-$(CONFIG_RTC_DRV_AU1XXX)    += rtc-au1xxx.o
 obj-$(CONFIG_RTC_DRV_BFIN)      += rtc-bfin.o
+obj-$(CONFIG_RTC_DRV_BQ32K)     += rtc-bq32k.o
 obj-$(CONFIG_RTC_DRV_BQ4802)    += rtc-bq4802.o
 obj-$(CONFIG_RTC_DRV_CMOS)      += rtc-cmos.o
 obj-$(CONFIG_RTC_DRV_COH901331) += rtc-coh901331.o
@@ -52,8 +53,10 @@ obj-$(CONFIG_RTC_DRV_M48T86)	+= rtc-m48t86.o
 obj-$(CONFIG_RTC_MXC)           += rtc-mxc.o
 obj-$(CONFIG_RTC_DRV_MAX6900)   += rtc-max6900.o
 obj-$(CONFIG_RTC_DRV_MAX6902)   += rtc-max6902.o
+obj-$(CONFIG_RTC_DRV_MC13783)   += rtc-mc13783.o
 obj-$(CONFIG_RTC_DRV_MSM6242)   += rtc-msm6242.o
 obj-$(CONFIG_RTC_DRV_MV)        += rtc-mv.o
+obj-$(CONFIG_RTC_DRV_NUC900)    += rtc-nuc900.o
 obj-$(CONFIG_RTC_DRV_OMAP)      += rtc-omap.o
 obj-$(CONFIG_RTC_DRV_PCAP)      += rtc-pcap.o
 obj-$(CONFIG_RTC_DRV_PCF8563)   += rtc-pcf8563.o
diff --git a/drivers/rtc/rtc-at32ap700x.c b/drivers/rtc/rtc-at32ap700x.c
index e1ec33e40e38..8825695777df 100644
--- a/drivers/rtc/rtc-at32ap700x.c
+++ b/drivers/rtc/rtc-at32ap700x.c
@@ -256,6 +256,8 @@ static int __init at32_rtc_probe(struct platform_device *pdev)
                 goto out_iounmap;
         }
 
+        platform_set_drvdata(pdev, rtc);
+
         rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
                                 &at32_rtc_ops, THIS_MODULE);
         if (IS_ERR(rtc->rtc)) {
@@ -264,7 +266,6 @@ static int __init at32_rtc_probe(struct platform_device *pdev)
                 goto out_free_irq;
         }
 
-        platform_set_drvdata(pdev, rtc);
         device_init_wakeup(&pdev->dev, 1);
 
         dev_info(&pdev->dev, "Atmel RTC for AT32AP700x at %08lx irq %ld\n",
@@ -273,6 +274,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev)
         return 0;
 
 out_free_irq:
+        platform_set_drvdata(pdev, NULL);
         free_irq(irq, rtc);
 out_iounmap:
         iounmap(rtc->regs);
diff --git a/drivers/rtc/rtc-bq32k.c b/drivers/rtc/rtc-bq32k.c
new file mode 100644
index 000000000000..408cc8f735be
--- /dev/null
+++ b/drivers/rtc/rtc-bq32k.c
@@ -0,0 +1,204 @@
+/*
+ * Driver for TI BQ32000 RTC.
+ *
+ * Copyright (C) 2009 Semihalf.
+ *
+ * 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/module.h>
+#include <linux/i2c.h>
+#include <linux/rtc.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/bcd.h>
+
+#define BQ32K_SECONDS           0x00    /* Seconds register address */
+#define BQ32K_SECONDS_MASK      0x7F    /* Mask over seconds value */
+#define BQ32K_STOP              0x80    /* Oscillator Stop flat */
+
+#define BQ32K_MINUTES           0x01    /* Minutes register address */
+#define BQ32K_MINUTES_MASK      0x7F    /* Mask over minutes value */
+#define BQ32K_OF                0x80    /* Oscillator Failure flag */
+
+#define BQ32K_HOURS_MASK        0x3F    /* Mask over hours value */
+#define BQ32K_CENT              0x40    /* Century flag */
+#define BQ32K_CENT_EN           0x80    /* Century flag enable bit */
+
+struct bq32k_regs {
+        uint8_t         seconds;
+        uint8_t         minutes;
+        uint8_t         cent_hours;
+        uint8_t         day;
+        uint8_t         date;
+        uint8_t         month;
+        uint8_t         years;
+};
+
+static struct i2c_driver bq32k_driver;
+
+static int bq32k_read(struct device *dev, void *data, uint8_t off, uint8_t len)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct i2c_msg msgs[] = {
+                {
+                        .addr = client->addr,
+                        .flags = 0,
+                        .len = 1,
+                        .buf = &off,
+                }, {
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = len,
+                        .buf = data,
+                }
+        };
+
+        if (i2c_transfer(client->adapter, msgs, 2) == 2)
+                return 0;
+
+        return -EIO;
+}
+
+static int bq32k_write(struct device *dev, void *data, uint8_t off, uint8_t len)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        uint8_t buffer[len + 1];
+
+        buffer[0] = off;
+        memcpy(&buffer[1], data, len);
+
+        if (i2c_master_send(client, buffer, len + 1) == len + 1)
+                return 0;
+
+        return -EIO;
+}
+
+static int bq32k_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct bq32k_regs regs;
+        int error;
+
+        error = bq32k_read(dev, &regs, 0, sizeof(regs));
+        if (error)
+                return error;
+
+        tm->tm_sec = bcd2bin(regs.seconds & BQ32K_SECONDS_MASK);
+        tm->tm_min = bcd2bin(regs.minutes & BQ32K_SECONDS_MASK);
+        tm->tm_hour = bcd2bin(regs.cent_hours & BQ32K_HOURS_MASK);
+        tm->tm_mday = bcd2bin(regs.date);
+        tm->tm_wday = bcd2bin(regs.day) - 1;
+        tm->tm_mon = bcd2bin(regs.month) - 1;
+        tm->tm_year = bcd2bin(regs.years) +
+                                ((regs.cent_hours & BQ32K_CENT) ? 100 : 0);
+
+        return rtc_valid_tm(tm);
+}
+
+static int bq32k_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        struct bq32k_regs regs;
+
+        regs.seconds = bin2bcd(tm->tm_sec);
+        regs.minutes = bin2bcd(tm->tm_min);
+        regs.cent_hours = bin2bcd(tm->tm_hour) | BQ32K_CENT_EN;
+        regs.day = bin2bcd(tm->tm_wday + 1);
+        regs.date = bin2bcd(tm->tm_mday);
+        regs.month = bin2bcd(tm->tm_mon + 1);
+
+        if (tm->tm_year >= 100) {
+                regs.cent_hours |= BQ32K_CENT;
+                regs.years = bin2bcd(tm->tm_year - 100);
+        } else
+                regs.years = bin2bcd(tm->tm_year);
+
+        return bq32k_write(dev, &regs, 0, sizeof(regs));
+}
+
+static const struct rtc_class_ops bq32k_rtc_ops = {
+        .read_time      = bq32k_rtc_read_time,
+        .set_time       = bq32k_rtc_set_time,
+};
+
+static int bq32k_probe(struct i2c_client *client,
+                                const struct i2c_device_id *id)
+{
+        struct device *dev = &client->dev;
+        struct rtc_device *rtc;
+        uint8_t reg;
+        int error;
+
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
+                return -ENODEV;
+
+        /* Check Oscillator Stop flag */
+        error = bq32k_read(dev, &reg, BQ32K_SECONDS, 1);
+        if (!error && (reg & BQ32K_STOP)) {
+                dev_warn(dev, "Oscillator was halted. Restarting...\n");
+                reg &= ~BQ32K_STOP;
+                error = bq32k_write(dev, &reg, BQ32K_SECONDS, 1);
+        }
+        if (error)
+                return error;
+
+        /* Check Oscillator Failure flag */
+        error = bq32k_read(dev, &reg, BQ32K_MINUTES, 1);
+        if (!error && (reg & BQ32K_OF)) {
+                dev_warn(dev, "Oscillator Failure. Check RTC battery.\n");
+                reg &= ~BQ32K_OF;
+                error = bq32k_write(dev, &reg, BQ32K_MINUTES, 1);
+        }
+        if (error)
+                return error;
+
+        rtc = rtc_device_register(bq32k_driver.driver.name, &client->dev,
+                                                &bq32k_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
+
+        i2c_set_clientdata(client, rtc);
+
+        return 0;
+}
+
+static int __devexit bq32k_remove(struct i2c_client *client)
+{
+        struct rtc_device *rtc = i2c_get_clientdata(client);
+
+        rtc_device_unregister(rtc);
+        return 0;
+}
+
+static const struct i2c_device_id bq32k_id[] = {
+        { "bq32000", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, bq32k_id);
+
+static struct i2c_driver bq32k_driver = {
+        .driver = {
+                .name   = "bq32k",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = bq32k_probe,
+        .remove         = __devexit_p(bq32k_remove),
+        .id_table       = bq32k_id,
+};
+
+static __init int bq32k_init(void)
+{
+        return i2c_add_driver(&bq32k_driver);
+}
+module_init(bq32k_init);
+
+static __exit void bq32k_exit(void)
+{
+        i2c_del_driver(&bq32k_driver);
+}
+module_exit(bq32k_exit);
+
+MODULE_AUTHOR("Semihalf, Piotr Ziecik <kosmo@semihalf.com>");
+MODULE_DESCRIPTION("TI BQ32000 I2C RTC driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-bq4802.c b/drivers/rtc/rtc-bq4802.c
index d00a274df8fc..280fe48ada0b 100644
--- a/drivers/rtc/rtc-bq4802.c
+++ b/drivers/rtc/rtc-bq4802.c
@@ -169,6 +169,8 @@ static int __devinit bq4802_probe(struct platform_device *pdev)
                 goto out_free;
         }
 
+        platform_set_drvdata(pdev, p);
+
         p->rtc = rtc_device_register("bq4802", &pdev->dev,
                                      &bq4802_ops, THIS_MODULE);
         if (IS_ERR(p->rtc)) {
@@ -176,7 +178,6 @@ static int __devinit bq4802_probe(struct platform_device *pdev)
                 goto out_iounmap;
         }
 
-        platform_set_drvdata(pdev, p);
         err = 0;
 out:
         return err;
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index f7a4701bf863..eb154dc57164 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -420,49 +420,43 @@ static int cmos_irq_set_state(struct device *dev, int enabled)
         return 0;
 }
 
-#if defined(CONFIG_RTC_INTF_DEV) || defined(CONFIG_RTC_INTF_DEV_MODULE)
-
-static int
-cmos_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+static int cmos_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
         struct cmos_rtc *cmos = dev_get_drvdata(dev);
         unsigned long   flags;
 
-        switch (cmd) {
-        case RTC_AIE_OFF:
-        case RTC_AIE_ON:
-        case RTC_UIE_OFF:
-        case RTC_UIE_ON:
-                if (!is_valid_irq(cmos->irq))
-                        return -EINVAL;
-                break;
-        /* PIE ON/OFF is handled by cmos_irq_set_state() */
-        default:
-                return -ENOIOCTLCMD;
-        }
+        if (!is_valid_irq(cmos->irq))
+                return -EINVAL;
 
         spin_lock_irqsave(&rtc_lock, flags);
-        switch (cmd) {
-        case RTC_AIE_OFF:       /* alarm off */
-                cmos_irq_disable(cmos, RTC_AIE);
-                break;
-        case RTC_AIE_ON:        /* alarm on */
+
+        if (enabled)
                 cmos_irq_enable(cmos, RTC_AIE);
-                break;
-        case RTC_UIE_OFF:       /* update off */
-                cmos_irq_disable(cmos, RTC_UIE);
-                break;
-        case RTC_UIE_ON:        /* update on */
-                cmos_irq_enable(cmos, RTC_UIE);
-                break;
-        }
+        else
+                cmos_irq_disable(cmos, RTC_AIE);
+
         spin_unlock_irqrestore(&rtc_lock, flags);
         return 0;
 }
 
-#else
-#define cmos_rtc_ioctl  NULL
-#endif
+static int cmos_update_irq_enable(struct device *dev, unsigned int enabled)
+{
+        struct cmos_rtc *cmos = dev_get_drvdata(dev);
+        unsigned long   flags;
+
+        if (!is_valid_irq(cmos->irq))
+                return -EINVAL;
+
+        spin_lock_irqsave(&rtc_lock, flags);
+
+        if (enabled)
+                cmos_irq_enable(cmos, RTC_UIE);
+        else
+                cmos_irq_disable(cmos, RTC_UIE);
+
+        spin_unlock_irqrestore(&rtc_lock, flags);
+        return 0;
+}
 
 #if defined(CONFIG_RTC_INTF_PROC) || defined(CONFIG_RTC_INTF_PROC_MODULE)
 
@@ -503,14 +497,15 @@ static int cmos_procfs(struct device *dev, struct seq_file *seq)
 #endif
 
 static const struct rtc_class_ops cmos_rtc_ops = {
-        .ioctl          = cmos_rtc_ioctl,
-        .read_time      = cmos_read_time,
-        .set_time       = cmos_set_time,
-        .read_alarm     = cmos_read_alarm,
-        .set_alarm      = cmos_set_alarm,
-        .proc           = cmos_procfs,
-        .irq_set_freq   = cmos_irq_set_freq,
-        .irq_set_state  = cmos_irq_set_state,
+        .read_time              = cmos_read_time,
+        .set_time               = cmos_set_time,
+        .read_alarm             = cmos_read_alarm,
+        .set_alarm              = cmos_set_alarm,
+        .proc                   = cmos_procfs,
+        .irq_set_freq           = cmos_irq_set_freq,
+        .irq_set_state          = cmos_irq_set_state,
+        .alarm_irq_enable       = cmos_alarm_irq_enable,
+        .update_irq_enable      = cmos_update_irq_enable,
 };
 
 /*----------------------------------------------------------------*/
@@ -871,8 +866,9 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg)
                         mask = RTC_IRQMASK;
                 tmp &= ~mask;
                 CMOS_WRITE(tmp, RTC_CONTROL);
-                hpet_mask_rtc_irq_bit(mask);
 
+                /* shut down hpet emulation - we don't need it for alarm */
+                hpet_mask_rtc_irq_bit(RTC_PIE|RTC_AIE|RTC_UIE);
                 cmos_checkintr(cmos, tmp);
         }
         spin_unlock_irq(&rtc_lock);
diff --git a/drivers/rtc/rtc-ds1302.c b/drivers/rtc/rtc-ds1302.c
index 1e73c8f42e38..532acf9b05d8 100644
--- a/drivers/rtc/rtc-ds1302.c
+++ b/drivers/rtc/rtc-ds1302.c
@@ -143,7 +143,6 @@ static int ds1302_rtc_ioctl(struct device *dev, unsigned int cmd,
 #ifdef RTC_SET_CHARGE
         case RTC_SET_CHARGE:
         {
-                struct ds1302_rtc *rtc = dev_get_drvdata(dev);
                 int tcs_val;
 
                 if (copy_from_user(&tcs_val, (int __user *)arg, sizeof(int)))
diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c
index 2736b11a1b1e..259db7f3535b 100644
--- a/drivers/rtc/rtc-ds1305.c
+++ b/drivers/rtc/rtc-ds1305.c
@@ -617,7 +617,6 @@ static struct bin_attribute nvram = {
 static int __devinit ds1305_probe(struct spi_device *spi)
 {
         struct ds1305                   *ds1305;
-        struct rtc_device               *rtc;
         int                             status;
         u8                              addr, value;
         struct ds1305_platform_data     *pdata = spi->dev.platform_data;
@@ -756,14 +755,13 @@ static int __devinit ds1305_probe(struct spi_device *spi)
                 dev_dbg(&spi->dev, "AM/PM\n");
 
         /* register RTC ... from here on, ds1305->ctrl needs locking */
-        rtc = rtc_device_register("ds1305", &spi->dev,
+        ds1305->rtc = rtc_device_register("ds1305", &spi->dev,
                         &ds1305_ops, THIS_MODULE);
-        if (IS_ERR(rtc)) {
-                status = PTR_ERR(rtc);
+        if (IS_ERR(ds1305->rtc)) {
+                status = PTR_ERR(ds1305->rtc);
                 dev_dbg(&spi->dev, "register rtc --> %d\n", status);
                 goto fail0;
         }
-        ds1305->rtc = rtc;
 
         /* Maybe set up alarm IRQ; be ready to handle it triggering right
          * away.  NOTE that we don't share this.  The signal is active low,
@@ -774,7 +772,7 @@ static int __devinit ds1305_probe(struct spi_device *spi)
         if (spi->irq) {
                 INIT_WORK(&ds1305->work, ds1305_work);
                 status = request_irq(spi->irq, ds1305_irq,
-                                0, dev_name(&rtc->dev), ds1305);
+                                0, dev_name(&ds1305->rtc->dev), ds1305);
                 if (status < 0) {
                         dev_dbg(&spi->dev, "request_irq %d --> %d\n",
                                         spi->irq, status);
@@ -794,7 +792,7 @@ static int __devinit ds1305_probe(struct spi_device *spi)
 fail2:
         free_irq(spi->irq, ds1305);
 fail1:
-        rtc_device_unregister(rtc);
+        rtc_device_unregister(ds1305->rtc);
 fail0:
         kfree(ds1305);
         return status;
@@ -802,7 +800,7 @@ fail0:
 
 static int __devexit ds1305_remove(struct spi_device *spi)
 {
-        struct ds1305   *ds1305 = spi_get_drvdata(spi);
+        struct ds1305 *ds1305 = spi_get_drvdata(spi);
 
         sysfs_remove_bin_file(&spi->dev.kobj, &nvram);
 
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index eb99ee4fa0f5..8a99da6f2f24 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -874,7 +874,7 @@ read_rtc:
         }
 
         if (want_irq) {
-                err = request_irq(client->irq, ds1307_irq, 0,
+                err = request_irq(client->irq, ds1307_irq, IRQF_SHARED,
                           ds1307->rtc->name, client);
                 if (err) {
                         dev_err(&client->dev,
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index 539676e25fd8..4166b84cb514 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -87,7 +87,6 @@ enum ds1511reg {
 struct rtc_plat_data {
         struct rtc_device *rtc;
         void __iomem *ioaddr;           /* virtual base address */
-        unsigned long baseaddr;         /* physical base address */
         int size;                               /* amount of memory mapped */
         int irq;
         unsigned int irqen;
@@ -95,6 +94,7 @@ struct rtc_plat_data {
         int alrm_min;
         int alrm_hour;
         int alrm_mday;
+        spinlock_t lock;
 };
 
 static DEFINE_SPINLOCK(ds1511_lock);
@@ -302,7 +302,7 @@ ds1511_rtc_update_alarm(struct rtc_plat_data *pdata)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&pdata->rtc->irq_lock, flags);
+        spin_lock_irqsave(&pdata->lock, flags);
         rtc_write(pdata->alrm_mday < 0 || (pdata->irqen & RTC_UF) ?
                0x80 : bin2bcd(pdata->alrm_mday) & 0x3f,
                RTC_ALARM_DATE);
@@ -317,7 +317,7 @@ ds1511_rtc_update_alarm(struct rtc_plat_data *pdata)
                RTC_ALARM_SEC);
         rtc_write(rtc_read(RTC_CMD) | (pdata->irqen ? RTC_TIE : 0), RTC_CMD);
         rtc_read(RTC_CMD1);     /* clear interrupts */
-        spin_unlock_irqrestore(&pdata->rtc->irq_lock, flags);
+        spin_unlock_irqrestore(&pdata->lock, flags);
 }
 
  static int
@@ -362,61 +362,63 @@ ds1511_interrupt(int irq, void *dev_id)
 {
         struct platform_device *pdev = dev_id;
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
-        unsigned long events = RTC_IRQF;
+        unsigned long events = 0;
 
+        spin_lock(&pdata->lock);
         /*
          * read and clear interrupt
          */
-        if (!(rtc_read(RTC_CMD1) & DS1511_IRQF)) {
-                return IRQ_NONE;
-        }
-        if (rtc_read(RTC_ALARM_SEC) & 0x80) {
-                events |= RTC_UF;
-        } else {
-                events |= RTC_AF;
-        }
-        rtc_update_irq(pdata->rtc, 1, events);
-        return IRQ_HANDLED;
+        if (rtc_read(RTC_CMD1) & DS1511_IRQF) {
+                events = RTC_IRQF;
+                if (rtc_read(RTC_ALARM_SEC) & 0x80)
+                        events |= RTC_UF;
+                else
+                        events |= RTC_AF;
+                if (likely(pdata->rtc))
+                        rtc_update_irq(pdata->rtc, 1, events);
+        }
+        spin_unlock(&pdata->lock);
+        return events ? IRQ_HANDLED : IRQ_NONE;
 }
 
- static int
-ds1511_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+static int ds1511_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
 
-        if (pdata->irq <= 0) {
-                return -ENOIOCTLCMD; /* fall back into rtc-dev's emulation */
-        }
-        switch (cmd) {
-        case RTC_AIE_OFF:
-                pdata->irqen &= ~RTC_AF;
-                ds1511_rtc_update_alarm(pdata);
-                break;
-        case RTC_AIE_ON:
+        if (pdata->irq <= 0)
+                return -EINVAL;
+        if (enabled)
                 pdata->irqen |= RTC_AF;
-                ds1511_rtc_update_alarm(pdata);
-                break;
-        case RTC_UIE_OFF:
-                pdata->irqen &= ~RTC_UF;
-                ds1511_rtc_update_alarm(pdata);
-                break;
-        case RTC_UIE_ON:
+        else
+                pdata->irqen &= ~RTC_AF;
+        ds1511_rtc_update_alarm(pdata);
+        return 0;
+}
+
+static int ds1511_rtc_update_irq_enable(struct device *dev,
+        unsigned int enabled)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
+
+        if (pdata->irq <= 0)
+                return -EINVAL;
+        if (enabled)
                 pdata->irqen |= RTC_UF;
-                ds1511_rtc_update_alarm(pdata);
-                break;
-        default:
-                return -ENOIOCTLCMD;
-        }
+        else
+                pdata->irqen &= ~RTC_UF;
+        ds1511_rtc_update_alarm(pdata);
         return 0;
 }
 
 static const struct rtc_class_ops ds1511_rtc_ops = {
-        .read_time      = ds1511_rtc_read_time,
-        .set_time       = ds1511_rtc_set_time,
-        .read_alarm     = ds1511_rtc_read_alarm,
-        .set_alarm      = ds1511_rtc_set_alarm,
-        .ioctl          = ds1511_rtc_ioctl,
+        .read_time              = ds1511_rtc_read_time,
+        .set_time               = ds1511_rtc_set_time,
+        .read_alarm             = ds1511_rtc_read_alarm,
+        .set_alarm              = ds1511_rtc_set_alarm,
+        .alarm_irq_enable       = ds1511_rtc_alarm_irq_enable,
+        .update_irq_enable      = ds1511_rtc_update_irq_enable,
 };
 
  static ssize_t
@@ -492,29 +494,23 @@ ds1511_rtc_probe(struct platform_device *pdev)
 {
         struct rtc_device *rtc;
         struct resource *res;
-        struct rtc_plat_data *pdata = NULL;
+        struct rtc_plat_data *pdata;
         int ret = 0;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
                 return -ENODEV;
         }
-        pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
-        if (!pdata) {
+        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+        if (!pdata)
                 return -ENOMEM;
-        }
         pdata->size = res->end - res->start + 1;
-        if (!request_mem_region(res->start, pdata->size, pdev->name)) {
-                ret = -EBUSY;
-                goto out;
-        }
-        pdata->baseaddr = res->start;
-        pdata->size = pdata->size;
-        ds1511_base = ioremap(pdata->baseaddr, pdata->size);
-        if (!ds1511_base) {
-                ret = -ENOMEM;
-                goto out;
-        }
+        if (!devm_request_mem_region(&pdev->dev, res->start, pdata->size,
+                        pdev->name))
+                return -EBUSY;
+        ds1511_base = devm_ioremap(&pdev->dev, res->start, pdata->size);
+        if (!ds1511_base)
+                return -ENOMEM;
         pdata->ioaddr = ds1511_base;
         pdata->irq = platform_get_irq(pdev, 0);
 
@@ -540,13 +536,15 @@ ds1511_rtc_probe(struct platform_device *pdev)
                 dev_warn(&pdev->dev, "voltage-low detected.\n");
         }
 
+        spin_lock_init(&pdata->lock);
+        platform_set_drvdata(pdev, pdata);
         /*
          * if the platform has an interrupt in mind for this device,
          * then by all means, set it
          */
         if (pdata->irq > 0) {
                 rtc_read(RTC_CMD1);
-                if (request_irq(pdata->irq, ds1511_interrupt,
+                if (devm_request_irq(&pdev->dev, pdata->irq, ds1511_interrupt,
                         IRQF_DISABLED | IRQF_SHARED, pdev->name, pdev) < 0) {
 
                         dev_warn(&pdev->dev, "interrupt not available.\n");
@@ -556,33 +554,13 @@ ds1511_rtc_probe(struct platform_device *pdev)
 
         rtc = rtc_device_register(pdev->name, &pdev->dev, &ds1511_rtc_ops,
                 THIS_MODULE);
-        if (IS_ERR(rtc)) {
-                ret = PTR_ERR(rtc);
-                goto out;
-        }
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
         pdata->rtc = rtc;
-        platform_set_drvdata(pdev, pdata);
+
         ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1511_nvram_attr);
-        if (ret) {
-                goto out;
-        }
-        return 0;
- out:
-        if (pdata->rtc) {
+        if (ret)
                 rtc_device_unregister(pdata->rtc);
-        }
-        if (pdata->irq > 0) {
-                free_irq(pdata->irq, pdev);
-        }
-        if (ds1511_base) {
-                iounmap(ds1511_base);
-                ds1511_base = NULL;
-        }
-        if (pdata->baseaddr) {
-                release_mem_region(pdata->baseaddr, pdata->size);
-        }
-
-        kfree(pdata);
         return ret;
 }
 
@@ -593,19 +571,13 @@ ds1511_rtc_remove(struct platform_device *pdev)
 
         sysfs_remove_bin_file(&pdev->dev.kobj, &ds1511_nvram_attr);
         rtc_device_unregister(pdata->rtc);
-        pdata->rtc = NULL;
         if (pdata->irq > 0) {
                 /*
                  * disable the alarm interrupt
                  */
                 rtc_write(rtc_read(RTC_CMD) & ~RTC_TIE, RTC_CMD);
                 rtc_read(RTC_CMD1);
-                free_irq(pdata->irq, pdev);
         }
-        iounmap(pdata->ioaddr);
-        ds1511_base = NULL;
-        release_mem_region(pdata->baseaddr, pdata->size);
-        kfree(pdata);
         return 0;
 }
 
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index 717288527c6b..ed1ef7c9cc06 100644
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -18,7 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#define DRV_VERSION "0.2"
+#define DRV_VERSION "0.3"
 
 #define RTC_REG_SIZE            0x2000
 #define RTC_OFFSET              0x1ff0
@@ -61,7 +61,6 @@
 struct rtc_plat_data {
         struct rtc_device *rtc;
         void __iomem *ioaddr;
-        resource_size_t baseaddr;
         unsigned long last_jiffies;
         int irq;
         unsigned int irqen;
@@ -69,6 +68,7 @@ struct rtc_plat_data {
         int alrm_min;
         int alrm_hour;
         int alrm_mday;
+        spinlock_t lock;
 };
 
 static int ds1553_rtc_set_time(struct device *dev, struct rtc_time *tm)
@@ -139,7 +139,7 @@ static void ds1553_rtc_update_alarm(struct rtc_plat_data *pdata)
         void __iomem *ioaddr = pdata->ioaddr;
         unsigned long flags;
 
-        spin_lock_irqsave(&pdata->rtc->irq_lock, flags);
+        spin_lock_irqsave(&pdata->lock, flags);
         writeb(pdata->alrm_mday < 0 || (pdata->irqen & RTC_UF) ?
                0x80 : bin2bcd(pdata->alrm_mday),
                ioaddr + RTC_DATE_ALARM);
@@ -154,7 +154,7 @@ static void ds1553_rtc_update_alarm(struct rtc_plat_data *pdata)
                ioaddr + RTC_SECONDS_ALARM);
         writeb(pdata->irqen ? RTC_INTS_AE : 0, ioaddr + RTC_INTERRUPTS);
         readb(ioaddr + RTC_FLAGS);      /* clear interrupts */
-        spin_unlock_irqrestore(&pdata->rtc->irq_lock, flags);
+        spin_unlock_irqrestore(&pdata->lock, flags);
 }
 
 static int ds1553_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
@@ -194,64 +194,69 @@ static irqreturn_t ds1553_rtc_interrupt(int irq, void *dev_id)
         struct platform_device *pdev = dev_id;
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
         void __iomem *ioaddr = pdata->ioaddr;
-        unsigned long events = RTC_IRQF;
+        unsigned long events = 0;
 
+        spin_lock(&pdata->lock);
         /* read and clear interrupt */
-        if (!(readb(ioaddr + RTC_FLAGS) & RTC_FLAGS_AF))
-                return IRQ_NONE;
-        if (readb(ioaddr + RTC_SECONDS_ALARM) & 0x80)
-                events |= RTC_UF;
-        else
-                events |= RTC_AF;
-        rtc_update_irq(pdata->rtc, 1, events);
-        return IRQ_HANDLED;
+        if (readb(ioaddr + RTC_FLAGS) & RTC_FLAGS_AF) {
+                events = RTC_IRQF;
+                if (readb(ioaddr + RTC_SECONDS_ALARM) & 0x80)
+                        events |= RTC_UF;
+                else
+                        events |= RTC_AF;
+                if (likely(pdata->rtc))
+                        rtc_update_irq(pdata->rtc, 1, events);
+        }
+        spin_unlock(&pdata->lock);
+        return events ? IRQ_HANDLED : IRQ_NONE;
 }
 
-static int ds1553_rtc_ioctl(struct device *dev, unsigned int cmd,
-                            unsigned long arg)
+static int ds1553_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
 
         if (pdata->irq <= 0)
-                return -ENOIOCTLCMD; /* fall back into rtc-dev's emulation */
-        switch (cmd) {
-        case RTC_AIE_OFF:
-                pdata->irqen &= ~RTC_AF;
-                ds1553_rtc_update_alarm(pdata);
-                break;
-        case RTC_AIE_ON:
+                return -EINVAL;
+        if (enabled)
                 pdata->irqen |= RTC_AF;
-                ds1553_rtc_update_alarm(pdata);
-                break;
-        case RTC_UIE_OFF:
-                pdata->irqen &= ~RTC_UF;
-                ds1553_rtc_update_alarm(pdata);
-                break;
-        case RTC_UIE_ON:
+        else
+                pdata->irqen &= ~RTC_AF;
+        ds1553_rtc_update_alarm(pdata);
+        return 0;
+}
+
+static int ds1553_rtc_update_irq_enable(struct device *dev,
+        unsigned int enabled)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
+
+        if (pdata->irq <= 0)
+                return -EINVAL;
+        if (enabled)
                 pdata->irqen |= RTC_UF;
-                ds1553_rtc_update_alarm(pdata);
-                break;
-        default:
-                return -ENOIOCTLCMD;
-        }
+        else
+                pdata->irqen &= ~RTC_UF;
+        ds1553_rtc_update_alarm(pdata);
         return 0;
 }
 
 static const struct rtc_class_ops ds1553_rtc_ops = {
-        .read_time      = ds1553_rtc_read_time,
-        .set_time       = ds1553_rtc_set_time,
-        .read_alarm     = ds1553_rtc_read_alarm,
-        .set_alarm      = ds1553_rtc_set_alarm,
-        .ioctl          = ds1553_rtc_ioctl,
+        .read_time              = ds1553_rtc_read_time,
+        .set_time               = ds1553_rtc_set_time,
+        .read_alarm             = ds1553_rtc_read_alarm,
+        .set_alarm              = ds1553_rtc_set_alarm,
+        .alarm_irq_enable       = ds1553_rtc_alarm_irq_enable,
+        .update_irq_enable      = ds1553_rtc_update_irq_enable,
 };
 
 static ssize_t ds1553_nvram_read(struct kobject *kobj,
                                  struct bin_attribute *bin_attr,
                                  char *buf, loff_t pos, size_t size)
 {
-        struct platform_device *pdev =
-                to_platform_device(container_of(kobj, struct device, kobj));
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct platform_device *pdev = to_platform_device(dev);
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
         void __iomem *ioaddr = pdata->ioaddr;
         ssize_t count;
@@ -265,8 +270,8 @@ static ssize_t ds1553_nvram_write(struct kobject *kobj,
                                   struct bin_attribute *bin_attr,
                                   char *buf, loff_t pos, size_t size)
 {
-        struct platform_device *pdev =
-                to_platform_device(container_of(kobj, struct device, kobj));
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct platform_device *pdev = to_platform_device(dev);
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
         void __iomem *ioaddr = pdata->ioaddr;
         ssize_t count;
@@ -291,26 +296,23 @@ static int __devinit ds1553_rtc_probe(struct platform_device *pdev)
         struct rtc_device *rtc;
         struct resource *res;
         unsigned int cen, sec;
-        struct rtc_plat_data *pdata = NULL;
-        void __iomem *ioaddr = NULL;
+        struct rtc_plat_data *pdata;
+        void __iomem *ioaddr;
         int ret = 0;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res)
                 return -ENODEV;
-        pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
         if (!pdata)
                 return -ENOMEM;
-        if (!request_mem_region(res->start, RTC_REG_SIZE, pdev->name)) {
-                ret = -EBUSY;
-                goto out;
-        }
-        pdata->baseaddr = res->start;
-        ioaddr = ioremap(pdata->baseaddr, RTC_REG_SIZE);
-        if (!ioaddr) {
-                ret = -ENOMEM;
-                goto out;
-        }
+        if (!devm_request_mem_region(&pdev->dev, res->start, RTC_REG_SIZE,
+                        pdev->name))
+                return -EBUSY;
+
+        ioaddr = devm_ioremap(&pdev->dev, res->start, RTC_REG_SIZE);
+        if (!ioaddr)
+                return -ENOMEM;
         pdata->ioaddr = ioaddr;
         pdata->irq = platform_get_irq(pdev, 0);
 
@@ -326,9 +328,13 @@ static int __devinit ds1553_rtc_probe(struct platform_device *pdev)
         if (readb(ioaddr + RTC_FLAGS) & RTC_FLAGS_BLF)
                 dev_warn(&pdev->dev, "voltage-low detected.\n");
 
+        spin_lock_init(&pdata->lock);
+        pdata->last_jiffies = jiffies;
+        platform_set_drvdata(pdev, pdata);
         if (pdata->irq > 0) {
                 writeb(0, ioaddr + RTC_INTERRUPTS);
-                if (request_irq(pdata->irq, ds1553_rtc_interrupt,
+                if (devm_request_irq(&pdev->dev, pdata->irq,
+                                ds1553_rtc_interrupt,
                                 IRQF_DISABLED, pdev->name, pdev) < 0) {
                         dev_warn(&pdev->dev, "interrupt not available.\n");
                         pdata->irq = 0;
@@ -337,27 +343,13 @@ static int __devinit ds1553_rtc_probe(struct platform_device *pdev)
 
         rtc = rtc_device_register(pdev->name, &pdev->dev,
                                   &ds1553_rtc_ops, THIS_MODULE);
-        if (IS_ERR(rtc)) {
-                ret = PTR_ERR(rtc);
-                goto out;
-        }
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
         pdata->rtc = rtc;
-        pdata->last_jiffies = jiffies;
-        platform_set_drvdata(pdev, pdata);
+
         ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);
         if (ret)
-                goto out;
-        return 0;
- out:
-        if (pdata->rtc)
-                rtc_device_unregister(pdata->rtc);
-        if (pdata->irq > 0)
-                free_irq(pdata->irq, pdev);
-        if (ioaddr)
-                iounmap(ioaddr);
-        if (pdata->baseaddr)
-                release_mem_region(pdata->baseaddr, RTC_REG_SIZE);
-        kfree(pdata);
+                rtc_device_unregister(rtc);
         return ret;
 }
 
@@ -367,13 +359,8 @@ static int __devexit ds1553_rtc_remove(struct platform_device *pdev)
 
         sysfs_remove_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);
         rtc_device_unregister(pdata->rtc);
-        if (pdata->irq > 0) {
+        if (pdata->irq > 0)
                 writeb(0, pdata->ioaddr + RTC_INTERRUPTS);
-                free_irq(pdata->irq, pdev);
-        }
-        iounmap(pdata->ioaddr);
-        release_mem_region(pdata->baseaddr, RTC_REG_SIZE);
-        kfree(pdata);
         return 0;
 }
 
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index 09249459e9a4..a1273360a44e 100644
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -21,7 +21,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#define DRV_VERSION "0.3"
+#define DRV_VERSION "0.4"
 
 #define RTC_SIZE                8
 
@@ -55,7 +55,6 @@ struct rtc_plat_data {
         void __iomem *ioaddr_rtc;
         size_t size_nvram;
         size_t size;
-        resource_size_t baseaddr;
         unsigned long last_jiffies;
         struct bin_attribute nvram_attr;
 };
@@ -132,8 +131,8 @@ static ssize_t ds1742_nvram_read(struct kobject *kobj,
                                  struct bin_attribute *bin_attr,
                                  char *buf, loff_t pos, size_t size)
 {
-        struct platform_device *pdev =
-                to_platform_device(container_of(kobj, struct device, kobj));
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct platform_device *pdev = to_platform_device(dev);
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
         void __iomem *ioaddr = pdata->ioaddr_nvram;
         ssize_t count;
@@ -147,8 +146,8 @@ static ssize_t ds1742_nvram_write(struct kobject *kobj,
                                   struct bin_attribute *bin_attr,
                                   char *buf, loff_t pos, size_t size)
 {
-        struct platform_device *pdev =
-                to_platform_device(container_of(kobj, struct device, kobj));
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct platform_device *pdev = to_platform_device(dev);
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
         void __iomem *ioaddr = pdata->ioaddr_nvram;
         ssize_t count;
@@ -163,27 +162,24 @@ static int __devinit ds1742_rtc_probe(struct platform_device *pdev)
         struct rtc_device *rtc;
         struct resource *res;
         unsigned int cen, sec;
-        struct rtc_plat_data *pdata = NULL;
-        void __iomem *ioaddr = NULL;
+        struct rtc_plat_data *pdata;
+        void __iomem *ioaddr;
         int ret = 0;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res)
                 return -ENODEV;
-        pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
         if (!pdata)
                 return -ENOMEM;
         pdata->size = res->end - res->start + 1;
-        if (!request_mem_region(res->start, pdata->size, pdev->name)) {
-                ret = -EBUSY;
-                goto out;
-        }
-        pdata->baseaddr = res->start;
-        ioaddr = ioremap(pdata->baseaddr, pdata->size);
-        if (!ioaddr) {
-                ret = -ENOMEM;
-                goto out;
-        }
+        if (!devm_request_mem_region(&pdev->dev, res->start, pdata->size,
+                pdev->name))
+                return -EBUSY;
+        ioaddr = devm_ioremap(&pdev->dev, res->start, pdata->size);
+        if (!ioaddr)
+                return -ENOMEM;
+
         pdata->ioaddr_nvram = ioaddr;
         pdata->size_nvram = pdata->size - RTC_SIZE;
         pdata->ioaddr_rtc = ioaddr + pdata->size_nvram;
@@ -207,31 +203,19 @@ static int __devinit ds1742_rtc_probe(struct platform_device *pdev)
         if (!(readb(ioaddr + RTC_DAY) & RTC_BATT_FLAG))
                 dev_warn(&pdev->dev, "voltage-low detected.\n");
 
+        pdata->last_jiffies = jiffies;
+        platform_set_drvdata(pdev, pdata);
         rtc = rtc_device_register(pdev->name, &pdev->dev,
                                   &ds1742_rtc_ops, THIS_MODULE);
-        if (IS_ERR(rtc)) {
-                ret = PTR_ERR(rtc);
-                goto out;
-        }
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
         pdata->rtc = rtc;
-        pdata->last_jiffies = jiffies;
-        platform_set_drvdata(pdev, pdata);
 
         ret = sysfs_create_bin_file(&pdev->dev.kobj, &pdata->nvram_attr);
         if (ret) {
                 dev_err(&pdev->dev, "creating nvram file in sysfs failed\n");
-                goto out;
+                rtc_device_unregister(rtc);
         }
-
-        return 0;
- out:
-        if (pdata->rtc)
-                rtc_device_unregister(pdata->rtc);
-        if (pdata->ioaddr_nvram)
-                iounmap(pdata->ioaddr_nvram);
-        if (pdata->baseaddr)
-                release_mem_region(pdata->baseaddr, pdata->size);
-        kfree(pdata);
         return ret;
 }
 
@@ -241,9 +225,6 @@ static int __devexit ds1742_rtc_remove(struct platform_device *pdev)
 
         sysfs_remove_bin_file(&pdev->dev.kobj, &pdata->nvram_attr);
         rtc_device_unregister(pdata->rtc);
-        iounmap(pdata->ioaddr_nvram);
-        release_mem_region(pdata->baseaddr, pdata->size);
-        kfree(pdata);
         return 0;
 }
 
diff --git a/drivers/rtc/rtc-m48t35.c b/drivers/rtc/rtc-m48t35.c
index 0b2197559940..8cb5b8959e5b 100644
--- a/drivers/rtc/rtc-m48t35.c
+++ b/drivers/rtc/rtc-m48t35.c
@@ -142,7 +142,6 @@ static const struct rtc_class_ops m48t35_ops = {
 
 static int __devinit m48t35_probe(struct platform_device *pdev)
 {
-        struct rtc_device *rtc;
         struct resource *res;
         struct m48t35_priv *priv;
         int ret = 0;
@@ -171,20 +170,21 @@ static int __devinit m48t35_probe(struct platform_device *pdev)
                 ret = -ENOMEM;
                 goto out;
         }
+
         spin_lock_init(&priv->lock);
-        rtc = rtc_device_register("m48t35", &pdev->dev,
+
+        platform_set_drvdata(pdev, priv);
+
+        priv->rtc = rtc_device_register("m48t35", &pdev->dev,
                                   &m48t35_ops, THIS_MODULE);
-        if (IS_ERR(rtc)) {
-                ret = PTR_ERR(rtc);
+        if (IS_ERR(priv->rtc)) {
+                ret = PTR_ERR(priv->rtc);
                 goto out;
         }
-        priv->rtc = rtc;
-        platform_set_drvdata(pdev, priv);
+
         return 0;
 
 out:
-        if (priv->rtc)
-                rtc_device_unregister(priv->rtc);
         if (priv->reg)
                 iounmap(priv->reg);
         if (priv->baseaddr)
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index 33921a6b1707..ede43b846859 100644
--- a/drivers/rtc/rtc-m48t59.c
+++ b/drivers/rtc/rtc-m48t59.c
@@ -481,6 +481,9 @@ static int __devinit m48t59_rtc_probe(struct platform_device *pdev)
                 goto out;
         }
 
+        spin_lock_init(&m48t59->lock);
+        platform_set_drvdata(pdev, m48t59);
+
         m48t59->rtc = rtc_device_register(name, &pdev->dev, ops, THIS_MODULE);
         if (IS_ERR(m48t59->rtc)) {
                 ret = PTR_ERR(m48t59->rtc);
@@ -490,16 +493,14 @@ static int __devinit m48t59_rtc_probe(struct platform_device *pdev)
         m48t59_nvram_attr.size = pdata->offset;
 
         ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
-        if (ret)
+        if (ret) {
+                rtc_device_unregister(m48t59->rtc);
                 goto out;
+        }
 
-        spin_lock_init(&m48t59->lock);
-        platform_set_drvdata(pdev, m48t59);
         return 0;
 
 out:
-        if (!IS_ERR(m48t59->rtc))
-                rtc_device_unregister(m48t59->rtc);
         if (m48t59->irq != NO_IRQ)
                 free_irq(m48t59->irq, &pdev->dev);
         if (m48t59->ioaddr)
diff --git a/drivers/rtc/rtc-mc13783.c b/drivers/rtc/rtc-mc13783.c
new file mode 100644
index 000000000000..850f983c039c
--- /dev/null
+++ b/drivers/rtc/rtc-mc13783.c
@@ -0,0 +1,262 @@
+/*
+ * Real Time Clock driver for Freescale MC13783 PMIC
+ *
+ * (C) 2009 Sascha Hauer, Pengutronix
+ * (C) 2009 Uwe Kleine-Koenig, Pengutronix
+ *
+ * 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/mfd/mc13783.h>
+#include <linux/platform_device.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/rtc.h>
+
+#define DRIVER_NAME "mc13783-rtc"
+
+#define MC13783_RTCTOD  20
+#define MC13783_RTCTODA 21
+#define MC13783_RTCDAY  22
+#define MC13783_RTCDAYA 23
+
+struct mc13783_rtc {
+        struct rtc_device *rtc;
+        struct mc13783 *mc13783;
+        int valid;
+};
+
+static int mc13783_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct mc13783_rtc *priv = dev_get_drvdata(dev);
+        unsigned int seconds, days1, days2;
+        unsigned long s1970;
+        int ret;
+
+        mc13783_lock(priv->mc13783);
+
+        if (!priv->valid) {
+                ret = -ENODATA;
+                goto out;
+        }
+
+        ret = mc13783_reg_read(priv->mc13783, MC13783_RTCDAY, &days1);
+        if (unlikely(ret))
+                goto out;
+
+        ret = mc13783_reg_read(priv->mc13783, MC13783_RTCTOD, &seconds);
+        if (unlikely(ret))
+                goto out;
+
+        ret = mc13783_reg_read(priv->mc13783, MC13783_RTCDAY, &days2);
+out:
+        mc13783_unlock(priv->mc13783);
+
+        if (ret)
+                return ret;
+
+        if (days2 == days1 + 1) {
+                if (seconds >= 86400 / 2)
+                        days2 = days1;
+                else
+                        days1 = days2;
+        }
+
+        if (days1 != days2)
+                return -EIO;
+
+        s1970 = days1 * 86400 + seconds;
+
+        rtc_time_to_tm(s1970, tm);
+
+        return rtc_valid_tm(tm);
+}
+
+static int mc13783_rtc_set_mmss(struct device *dev, unsigned long secs)
+{
+        struct mc13783_rtc *priv = dev_get_drvdata(dev);
+        unsigned int seconds, days;
+        int ret;
+
+        seconds = secs % 86400;
+        days = secs / 86400;
+
+        mc13783_lock(priv->mc13783);
+
+        /*
+         * first write seconds=0 to prevent a day switch between writing days
+         * and seconds below
+         */
+        ret = mc13783_reg_write(priv->mc13783, MC13783_RTCTOD, 0);
+        if (unlikely(ret))
+                goto out;
+
+        ret = mc13783_reg_write(priv->mc13783, MC13783_RTCDAY, days);
+        if (unlikely(ret))
+                goto out;
+
+        ret = mc13783_reg_write(priv->mc13783, MC13783_RTCTOD, seconds);
+        if (unlikely(ret))
+                goto out;
+
+        ret = mc13783_ackirq(priv->mc13783, MC13783_IRQ_RTCRST);
+        if (unlikely(ret))
+                goto out;
+
+        ret = mc13783_unmask(priv->mc13783, MC13783_IRQ_RTCRST);
+out:
+        priv->valid = !ret;
+
+        mc13783_unlock(priv->mc13783);
+
+        return ret;
+}
+
+static irqreturn_t mc13783_rtc_update_handler(int irq, void *dev)
+{
+        struct mc13783_rtc *priv = dev;
+        struct mc13783 *mc13783 = priv->mc13783;
+
+        dev_dbg(&priv->rtc->dev, "1HZ\n");
+
+        rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_UF);
+
+        mc13783_ackirq(mc13783, irq);
+
+        return IRQ_HANDLED;
+}
+
+static int mc13783_rtc_update_irq_enable(struct device *dev,
+                unsigned int enabled)
+{
+        struct mc13783_rtc *priv = dev_get_drvdata(dev);
+        int ret = -ENODATA;
+
+        mc13783_lock(priv->mc13783);
+        if (!priv->valid)
+                goto out;
+
+        ret = (enabled ? mc13783_unmask : mc13783_mask)(priv->mc13783,
+                        MC13783_IRQ_1HZ);
+out:
+        mc13783_unlock(priv->mc13783);
+
+        return ret;
+}
+
+static const struct rtc_class_ops mc13783_rtc_ops = {
+        .read_time = mc13783_rtc_read_time,
+        .set_mmss = mc13783_rtc_set_mmss,
+        .update_irq_enable = mc13783_rtc_update_irq_enable,
+};
+
+static irqreturn_t mc13783_rtc_reset_handler(int irq, void *dev)
+{
+        struct mc13783_rtc *priv = dev;
+        struct mc13783 *mc13783 = priv->mc13783;
+
+        dev_dbg(&priv->rtc->dev, "RTCRST\n");
+        priv->valid = 0;
+
+        mc13783_mask(mc13783, irq);
+
+        return IRQ_HANDLED;
+}
+
+static int __devinit mc13783_rtc_probe(struct platform_device *pdev)
+{
+        int ret;
+        struct mc13783_rtc *priv;
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->mc13783 = dev_get_drvdata(pdev->dev.parent);
+        platform_set_drvdata(pdev, priv);
+
+        priv->valid = 1;
+
+        mc13783_lock(priv->mc13783);
+
+        ret = mc13783_irq_request(priv->mc13783, MC13783_IRQ_RTCRST,
+                        mc13783_rtc_reset_handler, DRIVER_NAME, priv);
+        if (ret)
+                goto err_reset_irq_request;
+
+        ret = mc13783_irq_request_nounmask(priv->mc13783, MC13783_IRQ_1HZ,
+                        mc13783_rtc_update_handler, DRIVER_NAME, priv);
+        if (ret)
+                goto err_update_irq_request;
+
+        mc13783_unlock(priv->mc13783);
+
+        priv->rtc = rtc_device_register(pdev->name,
+                        &pdev->dev, &mc13783_rtc_ops, THIS_MODULE);
+
+        if (IS_ERR(priv->rtc)) {
+                ret = PTR_ERR(priv->rtc);
+
+                mc13783_lock(priv->mc13783);
+
+                mc13783_irq_free(priv->mc13783, MC13783_IRQ_1HZ, priv);
+err_update_irq_request:
+
+                mc13783_irq_free(priv->mc13783, MC13783_IRQ_RTCRST, priv);
+err_reset_irq_request:
+
+                mc13783_unlock(priv->mc13783);
+
+                platform_set_drvdata(pdev, NULL);
+                kfree(priv);
+        }
+
+        return ret;
+}
+
+static int __devexit mc13783_rtc_remove(struct platform_device *pdev)
+{
+        struct mc13783_rtc *priv = platform_get_drvdata(pdev);
+
+        rtc_device_unregister(priv->rtc);
+
+        mc13783_lock(priv->mc13783);
+
+        mc13783_irq_free(priv->mc13783, MC13783_IRQ_1HZ, priv);
+        mc13783_irq_free(priv->mc13783, MC13783_IRQ_RTCRST, priv);
+
+        mc13783_unlock(priv->mc13783);
+
+        platform_set_drvdata(pdev, NULL);
+
+        kfree(priv);
+
+        return 0;
+}
+
+static struct platform_driver mc13783_rtc_driver = {
+        .remove = __devexit_p(mc13783_rtc_remove),
+        .driver = {
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+        },
+};
+
+static int __init mc13783_rtc_init(void)
+{
+        return platform_driver_probe(&mc13783_rtc_driver, &mc13783_rtc_probe);
+}
+module_init(mc13783_rtc_init);
+
+static void __exit mc13783_rtc_exit(void)
+{
+        platform_driver_unregister(&mc13783_rtc_driver);
+}
+module_exit(mc13783_rtc_exit);
+
+MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
+MODULE_DESCRIPTION("RTC driver for Freescale MC13783 PMIC");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c
index e0263d2005ee..dc052ce6e63a 100644
--- a/drivers/rtc/rtc-mv.c
+++ b/drivers/rtc/rtc-mv.c
@@ -27,10 +27,17 @@
 #define RTC_MONTH_OFFS          8
 #define RTC_YEAR_OFFS           16
 
+#define RTC_ALARM_TIME_REG_OFFS 8
+#define RTC_ALARM_DATE_REG_OFFS 0xc
+#define RTC_ALARM_VALID         (1 << 7)
+
+#define RTC_ALARM_INTERRUPT_MASK_REG_OFFS       0x10
+#define RTC_ALARM_INTERRUPT_CASUE_REG_OFFS      0x14
 
 struct rtc_plat_data {
         struct rtc_device *rtc;
         void __iomem *ioaddr;
+        int             irq;
 };
 
 static int mv_rtc_set_time(struct device *dev, struct rtc_time *tm)
@@ -84,12 +91,134 @@ static int mv_rtc_read_time(struct device *dev, struct rtc_time *tm)
         return rtc_valid_tm(tm);
 }
 
+static int mv_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+        struct rtc_plat_data *pdata = dev_get_drvdata(dev);
+        void __iomem *ioaddr = pdata->ioaddr;
+        u32     rtc_time, rtc_date;
+        unsigned int year, month, day, hour, minute, second, wday;
+
+        rtc_time = readl(ioaddr + RTC_ALARM_TIME_REG_OFFS);
+        rtc_date = readl(ioaddr + RTC_ALARM_DATE_REG_OFFS);
+
+        second = rtc_time & 0x7f;
+        minute = (rtc_time >> RTC_MINUTES_OFFS) & 0x7f;
+        hour = (rtc_time >> RTC_HOURS_OFFS) & 0x3f; /* assume 24 hours mode */
+        wday = (rtc_time >> RTC_WDAY_OFFS) & 0x7;
+
+        day = rtc_date & 0x3f;
+        month = (rtc_date >> RTC_MONTH_OFFS) & 0x3f;
+        year = (rtc_date >> RTC_YEAR_OFFS) & 0xff;
+
+        alm->time.tm_sec = bcd2bin(second);
+        alm->time.tm_min = bcd2bin(minute);
+        alm->time.tm_hour = bcd2bin(hour);
+        alm->time.tm_mday = bcd2bin(day);
+        alm->time.tm_wday = bcd2bin(wday);
+        alm->time.tm_mon = bcd2bin(month) - 1;
+        /* hw counts from year 2000, but tm_year is relative to 1900 */
+        alm->time.tm_year = bcd2bin(year) + 100;
+
+        if (rtc_valid_tm(&alm->time) < 0) {
+                dev_err(dev, "retrieved alarm date/time is not valid.\n");
+                rtc_time_to_tm(0, &alm->time);
+        }
+
+        alm->enabled = !!readl(ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS);
+        return 0;
+}
+
+static int mv_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+        struct rtc_plat_data *pdata = dev_get_drvdata(dev);
+        void __iomem *ioaddr = pdata->ioaddr;
+        u32 rtc_reg = 0;
+
+        if (alm->time.tm_sec >= 0)
+                rtc_reg |= (RTC_ALARM_VALID | bin2bcd(alm->time.tm_sec))
+                        << RTC_SECONDS_OFFS;
+        if (alm->time.tm_min >= 0)
+                rtc_reg |= (RTC_ALARM_VALID | bin2bcd(alm->time.tm_min))
+                        << RTC_MINUTES_OFFS;
+        if (alm->time.tm_hour >= 0)
+                rtc_reg |= (RTC_ALARM_VALID | bin2bcd(alm->time.tm_hour))
+                        << RTC_HOURS_OFFS;
+
+        writel(rtc_reg, ioaddr + RTC_ALARM_TIME_REG_OFFS);
+
+        if (alm->time.tm_mday >= 0)
+                rtc_reg = (RTC_ALARM_VALID | bin2bcd(alm->time.tm_mday))
+                        << RTC_MDAY_OFFS;
+        else
+                rtc_reg = 0;
+
+        if (alm->time.tm_mon >= 0)
+                rtc_reg |= (RTC_ALARM_VALID | bin2bcd(alm->time.tm_mon + 1))
+                        << RTC_MONTH_OFFS;
+
+        if (alm->time.tm_year >= 0)
+                rtc_reg |= (RTC_ALARM_VALID | bin2bcd(alm->time.tm_year % 100))
+                        << RTC_YEAR_OFFS;
+
+        writel(rtc_reg, ioaddr + RTC_ALARM_DATE_REG_OFFS);
+        writel(0, ioaddr + RTC_ALARM_INTERRUPT_CASUE_REG_OFFS);
+        writel(alm->enabled ? 1 : 0,
+               ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS);
+
+        return 0;
+}
+
+static int mv_rtc_ioctl(struct device *dev, unsigned int cmd,
+                        unsigned long arg)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
+        void __iomem *ioaddr = pdata->ioaddr;
+
+        if (pdata->irq < 0)
+                return -ENOIOCTLCMD; /* fall back into rtc-dev's emulation */
+        switch (cmd) {
+        case RTC_AIE_OFF:
+                writel(0, ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS);
+                break;
+        case RTC_AIE_ON:
+                writel(1, ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS);
+                break;
+        default:
+                return -ENOIOCTLCMD;
+        }
+        return 0;
+}
+
+static irqreturn_t mv_rtc_interrupt(int irq, void *data)
+{
+        struct rtc_plat_data *pdata = data;
+        void __iomem *ioaddr = pdata->ioaddr;
+
+        /* alarm irq? */
+        if (!readl(ioaddr + RTC_ALARM_INTERRUPT_CASUE_REG_OFFS))
+                return IRQ_NONE;
+
+        /* clear interrupt */
+        writel(0, ioaddr + RTC_ALARM_INTERRUPT_CASUE_REG_OFFS);
+        rtc_update_irq(pdata->rtc, 1, RTC_IRQF | RTC_AF);
+        return IRQ_HANDLED;
+}
+
 static const struct rtc_class_ops mv_rtc_ops = {
         .read_time      = mv_rtc_read_time,
         .set_time       = mv_rtc_set_time,
 };
 
-static int __init mv_rtc_probe(struct platform_device *pdev)
+static const struct rtc_class_ops mv_rtc_alarm_ops = {
+        .read_time      = mv_rtc_read_time,
+        .set_time       = mv_rtc_set_time,
+        .read_alarm     = mv_rtc_read_alarm,
+        .set_alarm      = mv_rtc_set_alarm,
+        .ioctl          = mv_rtc_ioctl,
+};
+
+static int __devinit mv_rtc_probe(struct platform_device *pdev)
 {
         struct resource *res;
         struct rtc_plat_data *pdata;
@@ -130,12 +259,31 @@ static int __init mv_rtc_probe(struct platform_device *pdev)
                 }
         }
 
+        pdata->irq = platform_get_irq(pdev, 0);
+
         platform_set_drvdata(pdev, pdata);
-        pdata->rtc = rtc_device_register(pdev->name, &pdev->dev,
-                                         &mv_rtc_ops, THIS_MODULE);
+
+        if (pdata->irq >= 0) {
+                device_init_wakeup(&pdev->dev, 1);
+                pdata->rtc = rtc_device_register(pdev->name, &pdev->dev,
+                                                 &mv_rtc_alarm_ops,
+                                                 THIS_MODULE);
+        } else
+                pdata->rtc = rtc_device_register(pdev->name, &pdev->dev,
+                                                 &mv_rtc_ops, THIS_MODULE);
         if (IS_ERR(pdata->rtc))
                 return PTR_ERR(pdata->rtc);
 
+        if (pdata->irq >= 0) {
+                writel(0, pdata->ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS);
+                if (devm_request_irq(&pdev->dev, pdata->irq, mv_rtc_interrupt,
+                                     IRQF_DISABLED | IRQF_SHARED,
+                                     pdev->name, pdata) < 0) {
+                        dev_warn(&pdev->dev, "interrupt not available.\n");
+                        pdata->irq = -1;
+                }
+        }
+
         return 0;
 }
 
@@ -143,6 +291,9 @@ static int __exit mv_rtc_remove(struct platform_device *pdev)
 {
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
 
+        if (pdata->irq >= 0)
+                device_init_wakeup(&pdev->dev, 0);
+
         rtc_device_unregister(pdata->rtc);
         return 0;
 }
diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c
new file mode 100644
index 000000000000..bf59c9c586b2
--- /dev/null
+++ b/drivers/rtc/rtc-nuc900.c
@@ -0,0 +1,342 @@
+/*
+ * Copyright (c) 2008-2009 Nuvoton technology corporation.
+ *
+ * Wan ZongShun <mcuos.com@gmail.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.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/rtc.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/bcd.h>
+
+/* RTC Control Registers */
+#define REG_RTC_INIR            0x00
+#define REG_RTC_AER             0x04
+#define REG_RTC_FCR             0x08
+#define REG_RTC_TLR             0x0C
+#define REG_RTC_CLR             0x10
+#define REG_RTC_TSSR            0x14
+#define REG_RTC_DWR             0x18
+#define REG_RTC_TAR             0x1C
+#define REG_RTC_CAR             0x20
+#define REG_RTC_LIR             0x24
+#define REG_RTC_RIER            0x28
+#define REG_RTC_RIIR            0x2C
+#define REG_RTC_TTR             0x30
+
+#define RTCSET                  0x01
+#define AERRWENB                0x10000
+#define INIRRESET               0xa5eb1357
+#define AERPOWERON              0xA965
+#define AERPOWEROFF             0x0000
+#define LEAPYEAR                0x0001
+#define TICKENB                 0x80
+#define TICKINTENB              0x0002
+#define ALARMINTENB             0x0001
+#define MODE24                  0x0001
+
+struct nuc900_rtc {
+        int                     irq_num;
+        void __iomem            *rtc_reg;
+        struct rtc_device       *rtcdev;
+};
+
+struct nuc900_bcd_time {
+        int bcd_sec;
+        int bcd_min;
+        int bcd_hour;
+        int bcd_mday;
+        int bcd_mon;
+        int bcd_year;
+};
+
+static irqreturn_t nuc900_rtc_interrupt(int irq, void *_rtc)
+{
+        struct nuc900_rtc *rtc = _rtc;
+        unsigned long events = 0, rtc_irq;
+
+        rtc_irq = __raw_readl(rtc->rtc_reg + REG_RTC_RIIR);
+
+        if (rtc_irq & ALARMINTENB) {
+                rtc_irq &= ~ALARMINTENB;
+                __raw_writel(rtc_irq, rtc->rtc_reg + REG_RTC_RIIR);
+                events |= RTC_AF | RTC_IRQF;
+        }
+
+        if (rtc_irq & TICKINTENB) {
+                rtc_irq &= ~TICKINTENB;
+                __raw_writel(rtc_irq, rtc->rtc_reg + REG_RTC_RIIR);
+                events |= RTC_UF | RTC_IRQF;
+        }
+
+        rtc_update_irq(rtc->rtcdev, 1, events);
+
+        return IRQ_HANDLED;
+}
+
+static int *check_rtc_access_enable(struct nuc900_rtc *nuc900_rtc)
+{
+        unsigned int i;
+        __raw_writel(INIRRESET, nuc900_rtc->rtc_reg + REG_RTC_INIR);
+
+        mdelay(10);
+
+        __raw_writel(AERPOWERON, nuc900_rtc->rtc_reg + REG_RTC_AER);
+
+        for (i = 0; i < 1000; i++) {
+                if (__raw_readl(nuc900_rtc->rtc_reg + REG_RTC_AER) & AERRWENB)
+                        return 0;
+        }
+
+        if ((__raw_readl(nuc900_rtc->rtc_reg + REG_RTC_AER) & AERRWENB) == 0x0)
+                return ERR_PTR(-ENODEV);
+
+        return ERR_PTR(-EPERM);
+}
+
+static void nuc900_rtc_bcd2bin(unsigned int timereg,
+                                unsigned int calreg, struct rtc_time *tm)
+{
+        tm->tm_mday     = bcd2bin(calreg >> 0);
+        tm->tm_mon      = bcd2bin(calreg >> 8);
+        tm->tm_year     = bcd2bin(calreg >> 16) + 100;
+
+        tm->tm_sec      = bcd2bin(timereg >> 0);
+        tm->tm_min      = bcd2bin(timereg >> 8);
+        tm->tm_hour     = bcd2bin(timereg >> 16);
+
+        rtc_valid_tm(tm);
+}
+
+static void nuc900_rtc_bin2bcd(struct rtc_time *settm,
+                                                struct nuc900_bcd_time *gettm)
+{
+        gettm->bcd_mday = bin2bcd(settm->tm_mday) << 0;
+        gettm->bcd_mon  = bin2bcd(settm->tm_mon) << 8;
+        gettm->bcd_year = bin2bcd(settm->tm_year - 100) << 16;
+
+        gettm->bcd_sec  = bin2bcd(settm->tm_sec) << 0;
+        gettm->bcd_min  = bin2bcd(settm->tm_min) << 8;
+        gettm->bcd_hour = bin2bcd(settm->tm_hour) << 16;
+}
+
+static int nuc900_update_irq_enable(struct device *dev, unsigned int enabled)
+{
+        struct nuc900_rtc *rtc = dev_get_drvdata(dev);
+
+        if (enabled)
+                __raw_writel(__raw_readl(rtc->rtc_reg + REG_RTC_RIER)|
+                                (TICKINTENB), rtc->rtc_reg + REG_RTC_RIER);
+        else
+                __raw_writel(__raw_readl(rtc->rtc_reg + REG_RTC_RIER)&
+                                (~TICKINTENB), rtc->rtc_reg + REG_RTC_RIER);
+
+        return 0;
+}
+
+static int nuc900_alarm_irq_enable(struct device *dev, unsigned int enabled)
+{
+        struct nuc900_rtc *rtc = dev_get_drvdata(dev);
+
+        if (enabled)
+                __raw_writel(__raw_readl(rtc->rtc_reg + REG_RTC_RIER)|
+                                (ALARMINTENB), rtc->rtc_reg + REG_RTC_RIER);
+        else
+                __raw_writel(__raw_readl(rtc->rtc_reg + REG_RTC_RIER)&
+                                (~ALARMINTENB), rtc->rtc_reg + REG_RTC_RIER);
+
+        return 0;
+}
+
+static int nuc900_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct nuc900_rtc *rtc = dev_get_drvdata(dev);
+        unsigned int timeval, clrval;
+
+        timeval = __raw_readl(rtc->rtc_reg + REG_RTC_TLR);
+        clrval  = __raw_readl(rtc->rtc_reg + REG_RTC_CLR);
+
+        nuc900_rtc_bcd2bin(timeval, clrval, tm);
+
+        return 0;
+}
+
+static int nuc900_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        struct nuc900_rtc *rtc = dev_get_drvdata(dev);
+        struct nuc900_bcd_time gettm;
+        unsigned long val;
+        int *err;
+
+        nuc900_rtc_bin2bcd(tm, &gettm);
+
+        err = check_rtc_access_enable(rtc);
+        if (IS_ERR(err))
+                return PTR_ERR(err);
+
+        val = gettm.bcd_mday | gettm.bcd_mon | gettm.bcd_year;
+        __raw_writel(val, rtc->rtc_reg + REG_RTC_CLR);
+
+        val = gettm.bcd_sec | gettm.bcd_min | gettm.bcd_hour;
+        __raw_writel(val, rtc->rtc_reg + REG_RTC_TLR);
+
+        return 0;
+}
+
+static int nuc900_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        struct nuc900_rtc *rtc = dev_get_drvdata(dev);
+        unsigned int timeval, carval;
+
+        timeval = __raw_readl(rtc->rtc_reg + REG_RTC_TAR);
+        carval  = __raw_readl(rtc->rtc_reg + REG_RTC_CAR);
+
+        nuc900_rtc_bcd2bin(timeval, carval, &alrm->time);
+
+        return 0;
+}
+
+static int nuc900_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        struct nuc900_rtc *rtc = dev_get_drvdata(dev);
+        struct nuc900_bcd_time tm;
+        unsigned long val;
+        int *err;
+
+        nuc900_rtc_bin2bcd(&alrm->time, &tm);
+
+        err = check_rtc_access_enable(rtc);
+        if (IS_ERR(err))
+                return PTR_ERR(err);
+
+        val = tm.bcd_mday | tm.bcd_mon | tm.bcd_year;
+        __raw_writel(val, rtc->rtc_reg + REG_RTC_CAR);
+
+        val = tm.bcd_sec | tm.bcd_min | tm.bcd_hour;
+        __raw_writel(val, rtc->rtc_reg + REG_RTC_TAR);
+
+        return 0;
+}
+
+static struct rtc_class_ops nuc900_rtc_ops = {
+        .read_time = nuc900_rtc_read_time,
+        .set_time = nuc900_rtc_set_time,
+        .read_alarm = nuc900_rtc_read_alarm,
+        .set_alarm = nuc900_rtc_set_alarm,
+        .alarm_irq_enable = nuc900_alarm_irq_enable,
+        .update_irq_enable = nuc900_update_irq_enable,
+};
+
+static int __devinit nuc900_rtc_probe(struct platform_device *pdev)
+{
+        struct resource *res;
+        struct nuc900_rtc *nuc900_rtc;
+        int err = 0;
+
+        nuc900_rtc = kzalloc(sizeof(struct nuc900_rtc), GFP_KERNEL);
+        if (!nuc900_rtc) {
+                dev_err(&pdev->dev, "kzalloc nuc900_rtc failed\n");
+                return -ENOMEM;
+        }
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "platform_get_resource failed\n");
+                err = -ENXIO;
+                goto fail1;
+        }
+
+        if (!request_mem_region(res->start, resource_size(res),
+                                pdev->name)) {
+                dev_err(&pdev->dev, "request_mem_region failed\n");
+                err = -EBUSY;
+                goto fail1;
+        }
+
+        nuc900_rtc->rtc_reg = ioremap(res->start, resource_size(res));
+        if (!nuc900_rtc->rtc_reg) {
+                dev_err(&pdev->dev, "ioremap rtc_reg failed\n");
+                err = -ENOMEM;
+                goto fail2;
+        }
+
+        nuc900_rtc->irq_num = platform_get_irq(pdev, 0);
+        if (request_irq(nuc900_rtc->irq_num, nuc900_rtc_interrupt,
+                                IRQF_DISABLED, "nuc900rtc", nuc900_rtc)) {
+                dev_err(&pdev->dev, "NUC900 RTC request irq failed\n");
+                err = -EBUSY;
+                goto fail3;
+        }
+
+        nuc900_rtc->rtcdev = rtc_device_register(pdev->name, &pdev->dev,
+                                                &nuc900_rtc_ops, THIS_MODULE);
+        if (IS_ERR(nuc900_rtc->rtcdev)) {
+                dev_err(&pdev->dev, "rtc device register faild\n");
+                err = PTR_ERR(nuc900_rtc->rtcdev);
+                goto fail4;
+        }
+
+        platform_set_drvdata(pdev, nuc900_rtc);
+        __raw_writel(__raw_readl(nuc900_rtc->rtc_reg + REG_RTC_TSSR) | MODE24,
+                                        nuc900_rtc->rtc_reg + REG_RTC_TSSR);
+
+        return 0;
+
+fail4:  free_irq(nuc900_rtc->irq_num, nuc900_rtc);
+fail3:  iounmap(nuc900_rtc->rtc_reg);
+fail2:  release_mem_region(res->start, resource_size(res));
+fail1:  kfree(nuc900_rtc);
+        return err;
+}
+
+static int __devexit nuc900_rtc_remove(struct platform_device *pdev)
+{
+        struct nuc900_rtc *nuc900_rtc = platform_get_drvdata(pdev);
+        struct resource *res;
+
+        rtc_device_unregister(nuc900_rtc->rtcdev);
+        free_irq(nuc900_rtc->irq_num, nuc900_rtc);
+        iounmap(nuc900_rtc->rtc_reg);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(res->start, resource_size(res));
+
+        kfree(nuc900_rtc);
+
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+static struct platform_driver nuc900_rtc_driver = {
+        .remove         = __devexit_p(nuc900_rtc_remove),
+        .driver         = {
+                .name   = "nuc900-rtc",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init nuc900_rtc_init(void)
+{
+        return platform_driver_probe(&nuc900_rtc_driver, nuc900_rtc_probe);
+}
+
+static void __exit nuc900_rtc_exit(void)
+{
+        platform_driver_unregister(&nuc900_rtc_driver);
+}
+
+module_init(nuc900_rtc_init);
+module_exit(nuc900_rtc_exit);
+
+MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
+MODULE_DESCRIPTION("nuc910/nuc920 RTC driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:nuc900-rtc");
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 0587d53987fe..64d9727b7229 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -87,9 +87,10 @@
 #define OMAP_RTC_INTERRUPTS_IT_ALARM    (1<<3)
 #define OMAP_RTC_INTERRUPTS_IT_TIMER    (1<<2)
 
+static void __iomem     *rtc_base;
 
-#define rtc_read(addr)          omap_readb(OMAP_RTC_BASE + (addr))
-#define rtc_write(val, addr)    omap_writeb(val, OMAP_RTC_BASE + (addr))
+#define rtc_read(addr)          __raw_readb(rtc_base + (addr))
+#define rtc_write(val, addr)    __raw_writeb(val, rtc_base + (addr))
 
 
 /* we rely on the rtc framework to handle locking (rtc->ops_lock),
@@ -330,32 +331,31 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        /* NOTE:  using static mapping for RTC registers */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (res && res->start != OMAP_RTC_BASE) {
-                pr_debug("%s: RTC registers at %08x, expected %08x\n",
-                        pdev->name, (unsigned) res->start, OMAP_RTC_BASE);
+        if (!res) {
+                pr_debug("%s: RTC resource data missing\n", pdev->name);
                 return -ENOENT;
         }
 
-        if (res)
-                mem = request_mem_region(res->start,
-                                res->end - res->start + 1,
-                                pdev->name);
-        else
-                mem = NULL;
+        mem = request_mem_region(res->start, resource_size(res), pdev->name);
         if (!mem) {
                 pr_debug("%s: RTC registers at %08x are not free\n",
-                        pdev->name, OMAP_RTC_BASE);
+                        pdev->name, res->start);
                 return -EBUSY;
         }
 
+        rtc_base = ioremap(res->start, resource_size(res));
+        if (!rtc_base) {
+                pr_debug("%s: RTC registers can't be mapped\n", pdev->name);
+                goto fail;
+        }
+
         rtc = rtc_device_register(pdev->name, &pdev->dev,
                         &omap_rtc_ops, THIS_MODULE);
         if (IS_ERR(rtc)) {
                 pr_debug("%s: can't register RTC device, err %ld\n",
                         pdev->name, PTR_ERR(rtc));
-                goto fail;
+                goto fail0;
         }
         platform_set_drvdata(pdev, rtc);
         dev_set_drvdata(&rtc->dev, mem);
@@ -380,13 +380,14 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
                         dev_name(&rtc->dev), rtc)) {
                 pr_debug("%s: RTC timer interrupt IRQ%d already claimed\n",
                         pdev->name, omap_rtc_timer);
-                goto fail0;
+                goto fail1;
         }
-        if (request_irq(omap_rtc_alarm, rtc_irq, IRQF_DISABLED,
-                        dev_name(&rtc->dev), rtc)) {
+        if ((omap_rtc_timer != omap_rtc_alarm) &&
+                (request_irq(omap_rtc_alarm, rtc_irq, IRQF_DISABLED,
+                        dev_name(&rtc->dev), rtc))) {
                 pr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n",
                         pdev->name, omap_rtc_alarm);
-                goto fail1;
+                goto fail2;
         }
 
         /* On boards with split power, RTC_ON_NOFF won't reset the RTC */
@@ -419,10 +420,12 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
 
         return 0;
 
-fail1:
+fail2:
         free_irq(omap_rtc_timer, NULL);
-fail0:
+fail1:
         rtc_device_unregister(rtc);
+fail0:
+        iounmap(rtc_base);
 fail:
         release_resource(mem);
         return -EIO;
@@ -438,7 +441,9 @@ static int __exit omap_rtc_remove(struct platform_device *pdev)
         rtc_write(0, OMAP_RTC_INTERRUPTS_REG);
 
         free_irq(omap_rtc_timer, rtc);
-        free_irq(omap_rtc_alarm, rtc);
+
+        if (omap_rtc_timer != omap_rtc_alarm)
+                free_irq(omap_rtc_alarm, rtc);
 
         release_resource(dev_get_drvdata(&rtc->dev));
         rtc_device_unregister(rtc);
diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c
index 9b74e9c9151c..854c3cb365a1 100644
--- a/drivers/rtc/rtc-pcf50633.c
+++ b/drivers/rtc/rtc-pcf50633.c
@@ -58,6 +58,7 @@ struct pcf50633_time {
 struct pcf50633_rtc {
         int alarm_enabled;
         int second_enabled;
+        int alarm_pending;
 
         struct pcf50633 *pcf;
         struct rtc_device *rtc_dev;
@@ -209,6 +210,7 @@ static int pcf50633_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         rtc = dev_get_drvdata(dev);
 
         alrm->enabled = rtc->alarm_enabled;
+        alrm->pending = rtc->alarm_pending;
 
         ret = pcf50633_read_block(rtc->pcf, PCF50633_REG_RTCSCA,
                                 PCF50633_TI_EXTENT, &pcf_tm.time[0]);
@@ -244,6 +246,8 @@ static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         /* Returns 0 on success */
         ret = pcf50633_write_block(rtc->pcf, PCF50633_REG_RTCSCA,
                                 PCF50633_TI_EXTENT, &pcf_tm.time[0]);
+        if (!alrm->enabled)
+                rtc->alarm_pending = 0;
 
         if (!alarm_masked || alrm->enabled)
                 pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_ALARM);
@@ -268,6 +272,7 @@ static void pcf50633_rtc_irq(int irq, void *data)
         switch (irq) {
         case PCF50633_IRQ_ALARM:
                 rtc_update_irq(rtc->rtc_dev, 1, RTC_AF | RTC_IRQF);
+                rtc->alarm_pending = 1;
                 break;
         case PCF50633_IRQ_SECOND:
                 rtc_update_irq(rtc->rtc_dev, 1, RTC_UF | RTC_IRQF);
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index b725913ccbe8..65f346b2fbae 100644
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -212,6 +212,8 @@ static int pcf8563_probe(struct i2c_client *client,
 
         dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
 
+        i2c_set_clientdata(client, pcf8563);
+
         pcf8563->rtc = rtc_device_register(pcf8563_driver.driver.name,
                                 &client->dev, &pcf8563_rtc_ops, THIS_MODULE);
 
@@ -220,8 +222,6 @@ static int pcf8563_probe(struct i2c_client *client,
                 goto exit_kfree;
         }
 
-        i2c_set_clientdata(client, pcf8563);
-
         return 0;
 
 exit_kfree:
diff --git a/drivers/rtc/rtc-pcf8583.c b/drivers/rtc/rtc-pcf8583.c
index 7d33cda3f8f6..2d201afead3b 100644
--- a/drivers/rtc/rtc-pcf8583.c
+++ b/drivers/rtc/rtc-pcf8583.c
@@ -277,6 +277,8 @@ static int pcf8583_probe(struct i2c_client *client,
         if (!pcf8583)
                 return -ENOMEM;
 
+        i2c_set_clientdata(client, pcf8583);
+
         pcf8583->rtc = rtc_device_register(pcf8583_driver.driver.name,
                         &client->dev, &pcf8583_rtc_ops, THIS_MODULE);
 
@@ -285,7 +287,6 @@ static int pcf8583_probe(struct i2c_client *client,
                 goto exit_kfree;
         }
 
-        i2c_set_clientdata(client, pcf8583);
         return 0;
 
 exit_kfree:
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index f41873f98f66..0264b117893b 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -51,10 +51,10 @@ static int pl031_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
 
         switch (cmd) {
         case RTC_AIE_OFF:
-                __raw_writel(1, ldata->base + RTC_MIS);
+                writel(1, ldata->base + RTC_MIS);
                 return 0;
         case RTC_AIE_ON:
-                __raw_writel(0, ldata->base + RTC_MIS);
+                writel(0, ldata->base + RTC_MIS);
                 return 0;
         }
 
@@ -65,7 +65,7 @@ static int pl031_read_time(struct device *dev, struct rtc_time *tm)
 {
         struct pl031_local *ldata = dev_get_drvdata(dev);
 
-        rtc_time_to_tm(__raw_readl(ldata->base + RTC_DR), tm);
+        rtc_time_to_tm(readl(ldata->base + RTC_DR), tm);
 
         return 0;
 }
@@ -76,7 +76,7 @@ static int pl031_set_time(struct device *dev, struct rtc_time *tm)
         struct pl031_local *ldata = dev_get_drvdata(dev);
 
         rtc_tm_to_time(tm, &time);
-        __raw_writel(time, ldata->base + RTC_LR);
+        writel(time, ldata->base + RTC_LR);
 
         return 0;
 }
@@ -85,9 +85,9 @@ static int pl031_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
 {
         struct pl031_local *ldata = dev_get_drvdata(dev);
 
-        rtc_time_to_tm(__raw_readl(ldata->base + RTC_MR), &alarm->time);
-        alarm->pending = __raw_readl(ldata->base + RTC_RIS);
-        alarm->enabled = __raw_readl(ldata->base + RTC_IMSC);
+        rtc_time_to_tm(readl(ldata->base + RTC_MR), &alarm->time);
+        alarm->pending = readl(ldata->base + RTC_RIS);
+        alarm->enabled = readl(ldata->base + RTC_IMSC);
 
         return 0;
 }
@@ -99,8 +99,8 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
 
         rtc_tm_to_time(&alarm->time, &time);
 
-        __raw_writel(time, ldata->base + RTC_MR);
-        __raw_writel(!alarm->enabled, ldata->base + RTC_MIS);
+        writel(time, ldata->base + RTC_MR);
+        writel(!alarm->enabled, ldata->base + RTC_MIS);
 
         return 0;
 }
@@ -180,8 +180,9 @@ err_req:
 
 static struct amba_id pl031_ids[] __initdata = {
         {
-                 .id = 0x00041031,
-                .mask = 0x000fffff, },
+                .id = 0x00041031,
+                .mask = 0x000fffff,
+        },
         {0, 0},
 };
 
diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c
index 747ca194fad4..e6351b743da6 100644
--- a/drivers/rtc/rtc-pxa.c
+++ b/drivers/rtc/rtc-pxa.c
@@ -456,7 +456,7 @@ static int pxa_rtc_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops pxa_rtc_pm_ops = {
+static const struct dev_pm_ops pxa_rtc_pm_ops = {
         .suspend        = pxa_rtc_suspend,
         .resume         = pxa_rtc_resume,
 };
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 29f98a70586e..e4a44b641702 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -407,7 +407,7 @@ static int sa1100_rtc_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops sa1100_rtc_pm_ops = {
+static const struct dev_pm_ops sa1100_rtc_pm_ops = {
         .suspend        = sa1100_rtc_suspend,
         .resume         = sa1100_rtc_resume,
 };
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index e6ed5404bca0..e95cc6f8d61e 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -826,7 +826,7 @@ static int sh_rtc_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops sh_rtc_dev_pm_ops = {
+static const struct dev_pm_ops sh_rtc_dev_pm_ops = {
         .suspend = sh_rtc_suspend,
         .resume = sh_rtc_resume,
 };
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c
index d491eb265c38..67700831b5c9 100644
--- a/drivers/rtc/rtc-stk17ta8.c
+++ b/drivers/rtc/rtc-stk17ta8.c
@@ -62,7 +62,6 @@
 struct rtc_plat_data {
         struct rtc_device *rtc;
         void __iomem *ioaddr;
-        unsigned long baseaddr;
         unsigned long last_jiffies;
         int irq;
         unsigned int irqen;
@@ -70,6 +69,7 @@ struct rtc_plat_data {
         int alrm_min;
         int alrm_hour;
         int alrm_mday;
+        spinlock_t lock;
 };
 
 static int stk17ta8_rtc_set_time(struct device *dev, struct rtc_time *tm)
@@ -142,7 +142,7 @@ static void stk17ta8_rtc_update_alarm(struct rtc_plat_data *pdata)
         unsigned long irqflags;
         u8 flags;
 
-        spin_lock_irqsave(&pdata->rtc->irq_lock, irqflags);
+        spin_lock_irqsave(&pdata->lock, irqflags);
 
         flags = readb(ioaddr + RTC_FLAGS);
         writeb(flags | RTC_WRITE, ioaddr + RTC_FLAGS);
@@ -162,7 +162,7 @@ static void stk17ta8_rtc_update_alarm(struct rtc_plat_data *pdata)
         writeb(pdata->irqen ? RTC_INTS_AIE : 0, ioaddr + RTC_INTERRUPTS);
         readb(ioaddr + RTC_FLAGS);      /* clear interrupts */
         writeb(flags & ~RTC_WRITE, ioaddr + RTC_FLAGS);
-        spin_unlock_irqrestore(&pdata->rtc->irq_lock, irqflags);
+        spin_unlock_irqrestore(&pdata->lock, irqflags);
 }
 
 static int stk17ta8_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
@@ -202,56 +202,53 @@ static irqreturn_t stk17ta8_rtc_interrupt(int irq, void *dev_id)
         struct platform_device *pdev = dev_id;
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
         void __iomem *ioaddr = pdata->ioaddr;
-        unsigned long events = RTC_IRQF;
+        unsigned long events = 0;
 
+        spin_lock(&pdata->lock);
         /* read and clear interrupt */
-        if (!(readb(ioaddr + RTC_FLAGS) & RTC_FLAGS_AF))
-                return IRQ_NONE;
-        if (readb(ioaddr + RTC_SECONDS_ALARM) & 0x80)
-                events |= RTC_UF;
-        else
-                events |= RTC_AF;
-        rtc_update_irq(pdata->rtc, 1, events);
-        return IRQ_HANDLED;
+        if (readb(ioaddr + RTC_FLAGS) & RTC_FLAGS_AF) {
+                events = RTC_IRQF;
+                if (readb(ioaddr + RTC_SECONDS_ALARM) & 0x80)
+                        events |= RTC_UF;
+                else
+                        events |= RTC_AF;
+                if (likely(pdata->rtc))
+                        rtc_update_irq(pdata->rtc, 1, events);
+        }
+        spin_unlock(&pdata->lock);
+        return events ? IRQ_HANDLED : IRQ_NONE;
 }
 
-static int stk17ta8_rtc_ioctl(struct device *dev, unsigned int cmd,
-                            unsigned long arg)
+static int stk17ta8_rtc_alarm_irq_enable(struct device *dev,
+        unsigned int enabled)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
 
         if (pdata->irq <= 0)
-                return -ENOIOCTLCMD; /* fall back into rtc-dev's emulation */
-        switch (cmd) {
-        case RTC_AIE_OFF:
-                pdata->irqen &= ~RTC_AF;
-                stk17ta8_rtc_update_alarm(pdata);
-                break;
-        case RTC_AIE_ON:
+                return -EINVAL;
+        if (enabled)
                 pdata->irqen |= RTC_AF;
-                stk17ta8_rtc_update_alarm(pdata);
-                break;
-        default:
-                return -ENOIOCTLCMD;
-        }
+        else
+                pdata->irqen &= ~RTC_AF;
+        stk17ta8_rtc_update_alarm(pdata);
         return 0;
 }
 
 static const struct rtc_class_ops stk17ta8_rtc_ops = {
-        .read_time      = stk17ta8_rtc_read_time,
-        .set_time       = stk17ta8_rtc_set_time,
-        .read_alarm     = stk17ta8_rtc_read_alarm,
-        .set_alarm      = stk17ta8_rtc_set_alarm,
-        .ioctl          = stk17ta8_rtc_ioctl,
+        .read_time              = stk17ta8_rtc_read_time,
+        .set_time               = stk17ta8_rtc_set_time,
+        .read_alarm             = stk17ta8_rtc_read_alarm,
+        .set_alarm              = stk17ta8_rtc_set_alarm,
+        .alarm_irq_enable       = stk17ta8_rtc_alarm_irq_enable,
 };
 
 static ssize_t stk17ta8_nvram_read(struct kobject *kobj,
                                  struct bin_attribute *attr, char *buf,
                                  loff_t pos, size_t size)
 {
-        struct platform_device *pdev =
-                to_platform_device(container_of(kobj, struct device, kobj));
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct platform_device *pdev = to_platform_device(dev);
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
         void __iomem *ioaddr = pdata->ioaddr;
         ssize_t count;
@@ -265,8 +262,8 @@ static ssize_t stk17ta8_nvram_write(struct kobject *kobj,
                                   struct bin_attribute *attr, char *buf,
                                   loff_t pos, size_t size)
 {
-        struct platform_device *pdev =
-                to_platform_device(container_of(kobj, struct device, kobj));
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct platform_device *pdev = to_platform_device(dev);
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
         void __iomem *ioaddr = pdata->ioaddr;
         ssize_t count;
@@ -288,31 +285,26 @@ static struct bin_attribute stk17ta8_nvram_attr = {
 
 static int __devinit stk17ta8_rtc_probe(struct platform_device *pdev)
 {
-        struct rtc_device *rtc;
         struct resource *res;
         unsigned int cal;
         unsigned int flags;
         struct rtc_plat_data *pdata;
-        void __iomem *ioaddr = NULL;
+        void __iomem *ioaddr;
         int ret = 0;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res)
                 return -ENODEV;
 
-        pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
         if (!pdata)
                 return -ENOMEM;
-        if (!request_mem_region(res->start, RTC_REG_SIZE, pdev->name)) {
-                ret = -EBUSY;
-                goto out;
-        }
-        pdata->baseaddr = res->start;
-        ioaddr = ioremap(pdata->baseaddr, RTC_REG_SIZE);
-        if (!ioaddr) {
-                ret = -ENOMEM;
-                goto out;
-        }
+        if (!devm_request_mem_region(&pdev->dev, res->start, RTC_REG_SIZE,
+                        pdev->name))
+                return -EBUSY;
+        ioaddr = devm_ioremap(&pdev->dev, res->start, RTC_REG_SIZE);
+        if (!ioaddr)
+                return -ENOMEM;
         pdata->ioaddr = ioaddr;
         pdata->irq = platform_get_irq(pdev, 0);
 
@@ -328,9 +320,13 @@ static int __devinit stk17ta8_rtc_probe(struct platform_device *pdev)
         if (readb(ioaddr + RTC_FLAGS) & RTC_FLAGS_PF)
                 dev_warn(&pdev->dev, "voltage-low detected.\n");
 
+        spin_lock_init(&pdata->lock);
+        pdata->last_jiffies = jiffies;
+        platform_set_drvdata(pdev, pdata);
         if (pdata->irq > 0) {
                 writeb(0, ioaddr + RTC_INTERRUPTS);
-                if (request_irq(pdata->irq, stk17ta8_rtc_interrupt,
+                if (devm_request_irq(&pdev->dev, pdata->irq,
+                                stk17ta8_rtc_interrupt,
                                 IRQF_DISABLED | IRQF_SHARED,
                                 pdev->name, pdev) < 0) {
                         dev_warn(&pdev->dev, "interrupt not available.\n");
@@ -338,29 +334,14 @@ static int __devinit stk17ta8_rtc_probe(struct platform_device *pdev)
                 }
         }
 
-        rtc = rtc_device_register(pdev->name, &pdev->dev,
+        pdata->rtc = rtc_device_register(pdev->name, &pdev->dev,
                                   &stk17ta8_rtc_ops, THIS_MODULE);
-        if (IS_ERR(rtc)) {
-                ret = PTR_ERR(rtc);
-                goto out;
-        }
-        pdata->rtc = rtc;
-        pdata->last_jiffies = jiffies;
-        platform_set_drvdata(pdev, pdata);
+        if (IS_ERR(pdata->rtc))
+                return PTR_ERR(pdata->rtc);
+
         ret = sysfs_create_bin_file(&pdev->dev.kobj, &stk17ta8_nvram_attr);
         if (ret)
-                goto out;
-        return 0;
- out:
-        if (pdata->rtc)
                 rtc_device_unregister(pdata->rtc);
-        if (pdata->irq > 0)
-                free_irq(pdata->irq, pdev);
-        if (ioaddr)
-                iounmap(ioaddr);
-        if (pdata->baseaddr)
-                release_mem_region(pdata->baseaddr, RTC_REG_SIZE);
-        kfree(pdata);
         return ret;
 }
 
@@ -370,13 +351,8 @@ static int __devexit stk17ta8_rtc_remove(struct platform_device *pdev)
 
         sysfs_remove_bin_file(&pdev->dev.kobj, &stk17ta8_nvram_attr);
         rtc_device_unregister(pdata->rtc);
-        if (pdata->irq > 0) {
+        if (pdata->irq > 0)
                 writeb(0, pdata->ioaddr + RTC_INTERRUPTS);
-                free_irq(pdata->irq, pdev);
-        }
-        iounmap(pdata->ioaddr);
-        release_mem_region(pdata->baseaddr, RTC_REG_SIZE);
-        kfree(pdata);
         return 0;
 }
 
diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c
index 4a6ed1104fbb..9ee81d8aa7c0 100644
--- a/drivers/rtc/rtc-tx4939.c
+++ b/drivers/rtc/rtc-tx4939.c
@@ -17,6 +17,7 @@
 struct tx4939rtc_plat_data {
         struct rtc_device *rtc;
         struct tx4939_rtc_reg __iomem *rtcreg;
+        spinlock_t lock;
 };
 
 static struct tx4939rtc_plat_data *get_tx4939rtc_plat_data(struct device *dev)
@@ -52,14 +53,14 @@ static int tx4939_rtc_set_mmss(struct device *dev, unsigned long secs)
         buf[3] = secs >> 8;
         buf[4] = secs >> 16;
         buf[5] = secs >> 24;
-        spin_lock_irq(&pdata->rtc->irq_lock);
+        spin_lock_irq(&pdata->lock);
         __raw_writel(0, &rtcreg->adr);
         for (i = 0; i < 6; i++)
                 __raw_writel(buf[i], &rtcreg->dat);
         ret = tx4939_rtc_cmd(rtcreg,
                              TX4939_RTCCTL_COMMAND_SETTIME |
                              (__raw_readl(&rtcreg->ctl) & TX4939_RTCCTL_ALME));
-        spin_unlock_irq(&pdata->rtc->irq_lock);
+        spin_unlock_irq(&pdata->lock);
         return ret;
 }
 
@@ -71,18 +72,18 @@ static int tx4939_rtc_read_time(struct device *dev, struct rtc_time *tm)
         unsigned long sec;
         unsigned char buf[6];
 
-        spin_lock_irq(&pdata->rtc->irq_lock);
+        spin_lock_irq(&pdata->lock);
         ret = tx4939_rtc_cmd(rtcreg,
                              TX4939_RTCCTL_COMMAND_GETTIME |
                              (__raw_readl(&rtcreg->ctl) & TX4939_RTCCTL_ALME));
         if (ret) {
-                spin_unlock_irq(&pdata->rtc->irq_lock);
+                spin_unlock_irq(&pdata->lock);
                 return ret;
         }
         __raw_writel(2, &rtcreg->adr);
         for (i = 2; i < 6; i++)
                 buf[i] = __raw_readl(&rtcreg->dat);
-        spin_unlock_irq(&pdata->rtc->irq_lock);
+        spin_unlock_irq(&pdata->lock);
         sec = (buf[5] << 24) | (buf[4] << 16) | (buf[3] << 8) | buf[2];
         rtc_time_to_tm(sec, tm);
         return rtc_valid_tm(tm);
@@ -110,13 +111,13 @@ static int tx4939_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         buf[3] = sec >> 8;
         buf[4] = sec >> 16;
         buf[5] = sec >> 24;
-        spin_lock_irq(&pdata->rtc->irq_lock);
+        spin_lock_irq(&pdata->lock);
         __raw_writel(0, &rtcreg->adr);
         for (i = 0; i < 6; i++)
                 __raw_writel(buf[i], &rtcreg->dat);
         ret = tx4939_rtc_cmd(rtcreg, TX4939_RTCCTL_COMMAND_SETALARM |
                              (alrm->enabled ? TX4939_RTCCTL_ALME : 0));
-        spin_unlock_irq(&pdata->rtc->irq_lock);
+        spin_unlock_irq(&pdata->lock);
         return ret;
 }
 
@@ -129,12 +130,12 @@ static int tx4939_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         unsigned char buf[6];
         u32 ctl;
 
-        spin_lock_irq(&pdata->rtc->irq_lock);
+        spin_lock_irq(&pdata->lock);
         ret = tx4939_rtc_cmd(rtcreg,
                              TX4939_RTCCTL_COMMAND_GETALARM |
                              (__raw_readl(&rtcreg->ctl) & TX4939_RTCCTL_ALME));
         if (ret) {
-                spin_unlock_irq(&pdata->rtc->irq_lock);
+                spin_unlock_irq(&pdata->lock);
                 return ret;
         }
         __raw_writel(2, &rtcreg->adr);
@@ -143,7 +144,7 @@ static int tx4939_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         ctl = __raw_readl(&rtcreg->ctl);
         alrm->enabled = (ctl & TX4939_RTCCTL_ALME) ? 1 : 0;
         alrm->pending = (ctl & TX4939_RTCCTL_ALMD) ? 1 : 0;
-        spin_unlock_irq(&pdata->rtc->irq_lock);
+        spin_unlock_irq(&pdata->lock);
         sec = (buf[5] << 24) | (buf[4] << 16) | (buf[3] << 8) | buf[2];
         rtc_time_to_tm(sec, &alrm->time);
         return rtc_valid_tm(&alrm->time);
@@ -153,11 +154,11 @@ static int tx4939_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
         struct tx4939rtc_plat_data *pdata = get_tx4939rtc_plat_data(dev);
 
-        spin_lock_irq(&pdata->rtc->irq_lock);
+        spin_lock_irq(&pdata->lock);
         tx4939_rtc_cmd(pdata->rtcreg,
                        TX4939_RTCCTL_COMMAND_NOP |
                        (enabled ? TX4939_RTCCTL_ALME : 0));
-        spin_unlock_irq(&pdata->rtc->irq_lock);
+        spin_unlock_irq(&pdata->lock);
         return 0;
 }
 
@@ -167,13 +168,14 @@ static irqreturn_t tx4939_rtc_interrupt(int irq, void *dev_id)
         struct tx4939_rtc_reg __iomem *rtcreg = pdata->rtcreg;
         unsigned long events = RTC_IRQF;
 
-        spin_lock(&pdata->rtc->irq_lock);
+        spin_lock(&pdata->lock);
         if (__raw_readl(&rtcreg->ctl) & TX4939_RTCCTL_ALMD) {
                 events |= RTC_AF;
                 tx4939_rtc_cmd(rtcreg, TX4939_RTCCTL_COMMAND_NOP);
         }
-        spin_unlock(&pdata->rtc->irq_lock);
-        rtc_update_irq(pdata->rtc, 1, events);
+        spin_unlock(&pdata->lock);
+        if (likely(pdata->rtc))
+                rtc_update_irq(pdata->rtc, 1, events);
         return IRQ_HANDLED;
 }
 
@@ -194,13 +196,13 @@ static ssize_t tx4939_rtc_nvram_read(struct kobject *kobj,
         struct tx4939_rtc_reg __iomem *rtcreg = pdata->rtcreg;
         ssize_t count;
 
-        spin_lock_irq(&pdata->rtc->irq_lock);
+        spin_lock_irq(&pdata->lock);
         for (count = 0; size > 0 && pos < TX4939_RTC_REG_RAMSIZE;
              count++, size--) {
                 __raw_writel(pos++, &rtcreg->adr);
                 *buf++ = __raw_readl(&rtcreg->dat);
         }
-        spin_unlock_irq(&pdata->rtc->irq_lock);
+        spin_unlock_irq(&pdata->lock);
         return count;
 }
 
@@ -213,13 +215,13 @@ static ssize_t tx4939_rtc_nvram_write(struct kobject *kobj,
         struct tx4939_rtc_reg __iomem *rtcreg = pdata->rtcreg;
         ssize_t count;
 
-        spin_lock_irq(&pdata->rtc->irq_lock);
+        spin_lock_irq(&pdata->lock);
         for (count = 0; size > 0 && pos < TX4939_RTC_REG_RAMSIZE;
              count++, size--) {
                 __raw_writel(pos++, &rtcreg->adr);
                 __raw_writel(*buf++, &rtcreg->dat);
         }
-        spin_unlock_irq(&pdata->rtc->irq_lock);
+        spin_unlock_irq(&pdata->lock);
         return count;
 }
 
@@ -259,6 +261,7 @@ static int __init tx4939_rtc_probe(struct platform_device *pdev)
         if (!pdata->rtcreg)
                 return -EBUSY;
 
+        spin_lock_init(&pdata->lock);
         tx4939_rtc_cmd(pdata->rtcreg, TX4939_RTCCTL_COMMAND_NOP);
         if (devm_request_irq(&pdev->dev, irq, tx4939_rtc_interrupt,
                              IRQF_DISABLED, pdev->name, &pdev->dev) < 0)
@@ -277,14 +280,12 @@ static int __init tx4939_rtc_probe(struct platform_device *pdev)
 static int __exit tx4939_rtc_remove(struct platform_device *pdev)
 {
         struct tx4939rtc_plat_data *pdata = platform_get_drvdata(pdev);
-        struct rtc_device *rtc = pdata->rtc;
 
-        spin_lock_irq(&rtc->irq_lock);
-        tx4939_rtc_cmd(pdata->rtcreg, TX4939_RTCCTL_COMMAND_NOP);
-        spin_unlock_irq(&rtc->irq_lock);
         sysfs_remove_bin_file(&pdev->dev.kobj, &tx4939_rtc_nvram_attr);
-        rtc_device_unregister(rtc);
-        platform_set_drvdata(pdev, NULL);
+        rtc_device_unregister(pdata->rtc);
+        spin_lock_irq(&pdata->lock);
+        tx4939_rtc_cmd(pdata->rtcreg, TX4939_RTCCTL_COMMAND_NOP);
+        spin_unlock_irq(&pdata->lock);
         return 0;
 }
 
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c
index ad741afd47d8..bed4cab07043 100644
--- a/drivers/rtc/rtc-v3020.c
+++ b/drivers/rtc/rtc-v3020.c
@@ -304,7 +304,6 @@ static int rtc_probe(struct platform_device *pdev)
 {
         struct v3020_platform_data *pdata = pdev->dev.platform_data;
         struct v3020 *chip;
-        struct rtc_device *rtc;
         int retval = -EBUSY;
         int i;
         int temp;
@@ -353,13 +352,12 @@ static int rtc_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, chip);
 
-        rtc = rtc_device_register("v3020",
+        chip->rtc = rtc_device_register("v3020",
                                 &pdev->dev, &v3020_rtc_ops, THIS_MODULE);
-        if (IS_ERR(rtc)) {
-                retval = PTR_ERR(rtc);
+        if (IS_ERR(chip->rtc)) {
+                retval = PTR_ERR(chip->rtc);
                 goto err_io;
         }
-        chip->rtc = rtc;
 
         return 0;
 
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index fadddac1e5a4..c3244244e8cf 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -327,7 +327,7 @@ static int __devinit rtc_probe(struct platform_device *pdev)
         if (!res)
                 return -EBUSY;
 
-        rtc1_base = ioremap(res->start, res->end - res->start + 1);
+        rtc1_base = ioremap(res->start, resource_size(res));
         if (!rtc1_base)
                 return -EBUSY;
 
@@ -337,7 +337,7 @@ static int __devinit rtc_probe(struct platform_device *pdev)
                 goto err_rtc1_iounmap;
         }
 
-        rtc2_base = ioremap(res->start, res->end - res->start + 1);
+        rtc2_base = ioremap(res->start, resource_size(res));
         if (!rtc2_base) {
                 retval = -EBUSY;
                 goto err_rtc1_iounmap;
diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c
index 79795cdf6ed8..000c7e481e59 100644
--- a/drivers/rtc/rtc-wm831x.c
+++ b/drivers/rtc/rtc-wm831x.c
@@ -485,7 +485,7 @@ static int __devexit wm831x_rtc_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct dev_pm_ops wm831x_rtc_pm_ops = {
+static const struct dev_pm_ops wm831x_rtc_pm_ops = {
         .suspend = wm831x_rtc_suspend,
         .resume = wm831x_rtc_resume,
 
diff --git a/drivers/rtc/rtc-wm8350.c b/drivers/rtc/rtc-wm8350.c
index f16486635a8e..f1e440521c54 100644
--- a/drivers/rtc/rtc-wm8350.c
+++ b/drivers/rtc/rtc-wm8350.c
@@ -354,8 +354,9 @@ static const struct rtc_class_ops wm8350_rtc_ops = {
 };
 
 #ifdef CONFIG_PM
-static int wm8350_rtc_suspend(struct platform_device *pdev, pm_message_t state)
+static int wm8350_rtc_suspend(struct device *dev)
 {
+        struct platform_device *pdev = to_platform_device(dev);
         struct wm8350 *wm8350 = dev_get_drvdata(&pdev->dev);
         int ret = 0;
         u16 reg;
@@ -373,8 +374,9 @@ static int wm8350_rtc_suspend(struct platform_device *pdev, pm_message_t state)
         return ret;
 }
 
-static int wm8350_rtc_resume(struct platform_device *pdev)
+static int wm8350_rtc_resume(struct device *dev)
 {
+        struct platform_device *pdev = to_platform_device(dev);
         struct wm8350 *wm8350 = dev_get_drvdata(&pdev->dev);
         int ret;
 
@@ -484,13 +486,17 @@ static int __devexit wm8350_rtc_remove(struct platform_device *pdev)
         return 0;
 }
 
+static struct dev_pm_ops wm8350_rtc_pm_ops = {
+        .suspend = wm8350_rtc_suspend,
+        .resume = wm8350_rtc_resume,
+};
+
 static struct platform_driver wm8350_rtc_driver = {
         .probe = wm8350_rtc_probe,
         .remove = __devexit_p(wm8350_rtc_remove),
-        .suspend = wm8350_rtc_suspend,
-        .resume = wm8350_rtc_resume,
         .driver = {
                 .name = "wm8350-rtc",
+                .pm = &wm8350_rtc_pm_ops,
         },
 };
 
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index 6583c1a8b070..9aae49139a0a 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -155,11 +155,11 @@ static int x1205_get_status(struct i2c_client *client, unsigned char *sr)
 }
 
 static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
-                        int datetoo, u8 reg_base, unsigned char alm_enable)
+                        u8 reg_base, unsigned char alm_enable)
 {
-        int i, xfer, nbytes;
-        unsigned char buf[8];
+        int i, xfer;
         unsigned char rdata[10] = { 0, reg_base };
+        unsigned char *buf = rdata + 2;
 
         static const unsigned char wel[3] = { 0, X1205_REG_SR,
                                                 X1205_SR_WEL };
@@ -170,9 +170,9 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
         static const unsigned char diswe[3] = { 0, X1205_REG_SR, 0 };
 
         dev_dbg(&client->dev,
-                "%s: secs=%d, mins=%d, hours=%d\n",
-                __func__,
-                tm->tm_sec, tm->tm_min, tm->tm_hour);
+                "%s: sec=%d min=%d hour=%d mday=%d mon=%d year=%d wday=%d\n",
+                __func__, tm->tm_sec, tm->tm_min, tm->tm_hour, tm->tm_mday,
+                tm->tm_mon, tm->tm_year, tm->tm_wday);
 
         buf[CCR_SEC] = bin2bcd(tm->tm_sec);
         buf[CCR_MIN] = bin2bcd(tm->tm_min);
@@ -180,23 +180,15 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
         /* set hour and 24hr bit */
         buf[CCR_HOUR] = bin2bcd(tm->tm_hour) | X1205_HR_MIL;
 
-        /* should we also set the date? */
-        if (datetoo) {
-                dev_dbg(&client->dev,
-                        "%s: mday=%d, mon=%d, year=%d, wday=%d\n",
-                        __func__,
-                        tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
+        buf[CCR_MDAY] = bin2bcd(tm->tm_mday);
 
-                buf[CCR_MDAY] = bin2bcd(tm->tm_mday);
+        /* month, 1 - 12 */
+        buf[CCR_MONTH] = bin2bcd(tm->tm_mon + 1);
 
-                /* month, 1 - 12 */
-                buf[CCR_MONTH] = bin2bcd(tm->tm_mon + 1);
-
-                /* year, since the rtc epoch*/
-                buf[CCR_YEAR] = bin2bcd(tm->tm_year % 100);
-                buf[CCR_WDAY] = tm->tm_wday & 0x07;
-                buf[CCR_Y2K] = bin2bcd((tm->tm_year + 1900) / 100);
-        }
+        /* year, since the rtc epoch*/
+        buf[CCR_YEAR] = bin2bcd(tm->tm_year % 100);
+        buf[CCR_WDAY] = tm->tm_wday & 0x07;
+        buf[CCR_Y2K] = bin2bcd((tm->tm_year + 1900) / 100);
 
         /* If writing alarm registers, set compare bits on registers 0-4 */
         if (reg_base < X1205_CCR_BASE)
@@ -214,17 +206,8 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
                 return -EIO;
         }
 
-
-        /* write register's data */
-        if (datetoo)
-                nbytes = 8;
-        else
-                nbytes = 3;
-        for (i = 0; i < nbytes; i++)
-                rdata[2+i] = buf[i];
-
-        xfer = i2c_master_send(client, rdata, nbytes+2);
-        if (xfer != nbytes+2) {
+        xfer = i2c_master_send(client, rdata, sizeof(rdata));
+        if (xfer != sizeof(rdata)) {
                 dev_err(&client->dev,
                         "%s: result=%d addr=%02x, data=%02x\n",
                         __func__,
@@ -282,7 +265,7 @@ static int x1205_fix_osc(struct i2c_client *client)
 
         memset(&tm, 0, sizeof(tm));
 
-        err = x1205_set_datetime(client, &tm, 1, X1205_CCR_BASE, 0);
+        err = x1205_set_datetime(client, &tm, X1205_CCR_BASE, 0);
         if (err < 0)
                 dev_err(&client->dev, "unable to restart the oscillator\n");
 
@@ -481,7 +464,7 @@ static int x1205_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 static int x1205_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
         return x1205_set_datetime(to_i2c_client(dev),
-                &alrm->time, 1, X1205_ALM0_BASE, alrm->enabled);
+                &alrm->time, X1205_ALM0_BASE, alrm->enabled);
 }
 
 static int x1205_rtc_read_time(struct device *dev, struct rtc_time *tm)
@@ -493,7 +476,7 @@ static int x1205_rtc_read_time(struct device *dev, struct rtc_time *tm)
 static int x1205_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
         return x1205_set_datetime(to_i2c_client(dev),
-                tm, 1, X1205_CCR_BASE, 0);
+                tm, X1205_CCR_BASE, 0);
 }
 
 static int x1205_rtc_proc(struct device *dev, struct seq_file *seq)
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 5f23eca82804..6315fbd8e68b 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -14,6 +14,7 @@
 #define KMSG_COMPONENT "dasd"
 
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/seq_file.h>
 #include <linux/vmalloc.h>
 #include <linux/proc_fs.h>
@@ -272,10 +273,10 @@ dasd_statistics_write(struct file *file, const char __user *user_buf,
         DBF_EVENT(DBF_DEBUG, "/proc/dasd/statictics: '%s'\n", buffer);
 
         /* check for valid verbs */
-        for (str = buffer; isspace(*str); str++);
+        str = skip_spaces(buffer);
         if (strncmp(str, "set", 3) == 0 && isspace(str[3])) {
                 /* 'set xxx' was given */
-                for (str = str + 4; isspace(*str); str++);
+                str = skip_spaces(str + 4);
                 if (strcmp(str, "on") == 0) {
                         /* switch on statistics profiling */
                         dasd_profile_level = DASD_PROFILE_ON;
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index f76f4bd82b9f..9b43ae94beba 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -1005,7 +1005,7 @@ static int dcssblk_thaw(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops dcssblk_pm_ops = {
+static const struct dev_pm_ops dcssblk_pm_ops = {
         .freeze         = dcssblk_freeze,
         .thaw           = dcssblk_thaw,
         .restore        = dcssblk_restore,
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index 116d1b3eeb15..118de392af63 100644
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -407,7 +407,7 @@ static int xpram_restore(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops xpram_pm_ops = {
+static const struct dev_pm_ops xpram_pm_ops = {
         .restore        = xpram_restore,
 };
 
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index 60473f86e1f9..33e96484d54f 100644
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -529,7 +529,7 @@ static int monreader_restore(struct device *dev)
         return monreader_thaw(dev);
 }
 
-static struct dev_pm_ops monreader_pm_ops = {
+static const struct dev_pm_ops monreader_pm_ops = {
         .freeze  = monreader_freeze,
         .thaw    = monreader_thaw,
         .restore = monreader_restore,
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index 6532ed8b4afa..668a0579b26b 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -323,7 +323,7 @@ static int monwriter_thaw(struct device *dev)
         return monwriter_restore(dev);
 }
 
-static struct dev_pm_ops monwriter_pm_ops = {
+static const struct dev_pm_ops monwriter_pm_ops = {
         .freeze         = monwriter_freeze,
         .thaw           = monwriter_thaw,
         .restore        = monwriter_restore,
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index a983f5086788..ec88c59842e3 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -1019,7 +1019,7 @@ static int sclp_restore(struct device *dev)
         return sclp_undo_suspend(SCLP_PM_EVENT_RESTORE);
 }
 
-static struct dev_pm_ops sclp_pm_ops = {
+static const struct dev_pm_ops sclp_pm_ops = {
         .freeze         = sclp_freeze,
         .thaw           = sclp_thaw,
         .restore        = sclp_restore,
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index 28b5afc129c3..b3beab610da4 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -547,7 +547,7 @@ struct read_storage_sccb {
         u32 entries[0];
 } __packed;
 
-static struct dev_pm_ops sclp_mem_pm_ops = {
+static const struct dev_pm_ops sclp_mem_pm_ops = {
         .freeze         = sclp_mem_freeze,
 };
 
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index 899aa795bf38..7dfa5412d5a8 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -675,7 +675,7 @@ static int vmlogrdr_pm_prepare(struct device *dev)
 }
 
 
-static struct dev_pm_ops vmlogrdr_pm_ops = {
+static const struct dev_pm_ops vmlogrdr_pm_ops = {
         .prepare = vmlogrdr_pm_prepare,
 };
 
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index a5a62f1f7747..5f97ea2ee6b1 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -560,7 +560,7 @@ static int ccwgroup_pm_restore(struct device *dev)
         return gdrv->restore ? gdrv->restore(gdev) : 0;
 }
 
-static struct dev_pm_ops ccwgroup_pm_ops = {
+static const struct dev_pm_ops ccwgroup_pm_ops = {
         .prepare = ccwgroup_pm_prepare,
         .complete = ccwgroup_pm_complete,
         .freeze = ccwgroup_pm_freeze,
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 92ff88ac1107..7679aee6fa14 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -1148,7 +1148,7 @@ static int css_pm_restore(struct device *dev)
         return drv->restore ? drv->restore(sch) : 0;
 }
 
-static struct dev_pm_ops css_pm_ops = {
+static const struct dev_pm_ops css_pm_ops = {
         .prepare = css_pm_prepare,
         .complete = css_pm_complete,
         .freeze = css_pm_freeze,
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 9fecfb4223a8..73901c9e260f 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1904,7 +1904,7 @@ out_unlock:
         return ret;
 }
 
-static struct dev_pm_ops ccw_pm_ops = {
+static const struct dev_pm_ops ccw_pm_ops = {
         .prepare = ccw_device_pm_prepare,
         .complete = ccw_device_pm_complete,
         .freeze = ccw_device_pm_freeze,
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 98c04cac43c1..65ebee0a3266 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -159,7 +159,7 @@ static void netiucv_pm_complete(struct device *);
 static int netiucv_pm_freeze(struct device *);
 static int netiucv_pm_restore_thaw(struct device *);
 
-static struct dev_pm_ops netiucv_pm_ops = {
+static const struct dev_pm_ops netiucv_pm_ops = {
         .prepare = netiucv_pm_prepare,
         .complete = netiucv_pm_complete,
         .freeze = netiucv_pm_freeze,
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index 3012355f8304..67f2485d2372 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -168,7 +168,7 @@ static int smsg_pm_restore_thaw(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops smsg_pm_ops = {
+static const struct dev_pm_ops smsg_pm_ops = {
         .freeze = smsg_pm_freeze,
         .thaw = smsg_pm_restore_thaw,
         .restore = smsg_pm_restore_thaw,
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 206c2fa8c1ba..8643f5089361 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -1333,7 +1333,7 @@ static void ipr_log_enhanced_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg,
 
         error = &hostrcb->hcam.u.error.u.type_17_error;
         error->failure_reason[sizeof(error->failure_reason) - 1] = '\0';
-        strstrip(error->failure_reason);
+        strim(error->failure_reason);
 
         ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason,
                      be32_to_cpu(hostrcb->hcam.u.error.prc));
@@ -1359,7 +1359,7 @@ static void ipr_log_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg,
 
         error = &hostrcb->hcam.u.error.u.type_07_error;
         error->failure_reason[sizeof(error->failure_reason) - 1] = '\0';
-        strstrip(error->failure_reason);
+        strim(error->failure_reason);
 
         ipr_hcam_err(hostrcb, "%s [PRC: %08X]\n", error->failure_reason,
                      be32_to_cpu(hostrcb->hcam.u.error.prc));
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index 2b38f6ad6e11..8b955b534a36 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -984,7 +984,7 @@ static void sym_exec_user_command (struct sym_hcb *np, struct sym_usrcmd *uc)
         }
 }
 
-static int skip_spaces(char *ptr, int len)
+static int sym_skip_spaces(char *ptr, int len)
 {
         int cnt, c;
 
@@ -1012,7 +1012,7 @@ static int is_keyword(char *ptr, int len, char *verb)
 }
 
 #define SKIP_SPACES(ptr, len)                                           \
-        if ((arg_len = skip_spaces(ptr, len)) < 1)                      \
+        if ((arg_len = sym_skip_spaces(ptr, len)) < 1)                  \
                 return -EINVAL;                                         \
         ptr += arg_len; len -= arg_len;
 
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c
index d8983dd5c4b2..85dc0410ac1a 100644
--- a/drivers/serial/ioc3_serial.c
+++ b/drivers/serial/ioc3_serial.c
@@ -2162,7 +2162,7 @@ static struct ioc3_submodule ioc3uart_ops = {
 /**
  * ioc3_detect - module init called,
  */
-static int __devinit ioc3uart_init(void)
+static int __init ioc3uart_init(void)
 {
         int ret;
 
@@ -2179,7 +2179,7 @@ static int __devinit ioc3uart_init(void)
         return ret;
 }
 
-static void __devexit ioc3uart_exit(void)
+static void __exit ioc3uart_exit(void)
 {
         ioc3_unregister_submodule(&ioc3uart_ops);
         uart_unregister_driver(&ioc3_uart);
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index 2e02c3026d24..836d9ab4f729 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -2904,7 +2904,7 @@ static struct ioc4_submodule ioc4_serial_submodule = {
 /**
  * ioc4_serial_init - module init
  */
-int ioc4_serial_init(void)
+static int __init ioc4_serial_init(void)
 {
         int ret;
 
@@ -2913,20 +2913,30 @@ int ioc4_serial_init(void)
                 printk(KERN_WARNING
                         "%s: Couldn't register rs232 IOC4 serial driver\n",
                         __func__);
-                return ret;
+                goto out;
         }
         if ((ret = uart_register_driver(&ioc4_uart_rs422)) < 0) {
                 printk(KERN_WARNING
                         "%s: Couldn't register rs422 IOC4 serial driver\n",
                         __func__);
-                return ret;
+                goto out_uart_rs232;
         }
 
         /* register with IOC4 main module */
-        return ioc4_register_submodule(&ioc4_serial_submodule);
+        ret = ioc4_register_submodule(&ioc4_serial_submodule);
+        if (ret)
+                goto out_uart_rs422;
+        return 0;
+
+out_uart_rs422:
+        uart_unregister_driver(&ioc4_uart_rs422);
+out_uart_rs232:
+        uart_unregister_driver(&ioc4_uart_rs232);
+out:
+        return ret;
 }
 
-static void __devexit ioc4_serial_exit(void)
+static void __exit ioc4_serial_exit(void)
 {
         ioc4_unregister_submodule(&ioc4_serial_submodule);
         uart_unregister_driver(&ioc4_uart_rs232);
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index 4a821046baae..56ee082157aa 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -756,7 +756,7 @@ static int serial_pxa_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops serial_pxa_pm_ops = {
+static const struct dev_pm_ops serial_pxa_pm_ops = {
         .suspend        = serial_pxa_suspend,
         .resume         = serial_pxa_resume,
 };
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index ff38dbdb5c6e..68c7f6cfd728 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -1043,10 +1043,14 @@ static void __devinit sci_init_single(struct platform_device *dev,
         sci_port->port.iotype   = UPIO_MEM;
         sci_port->port.line     = index;
         sci_port->port.fifosize = 1;
-        sci_port->iclk          = p->clk ? clk_get(&dev->dev, p->clk) : NULL;
-        sci_port->dclk          = clk_get(&dev->dev, "peripheral_clk");
-        sci_port->enable        = sci_clk_enable;
-        sci_port->disable       = sci_clk_disable;
+
+        if (dev) {
+                sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL;
+                sci_port->dclk = clk_get(&dev->dev, "peripheral_clk");
+                sci_port->enable = sci_clk_enable;
+                sci_port->disable = sci_clk_disable;
+                sci_port->port.dev = &dev->dev;
+        }
 
         sci_port->break_timer.data = (unsigned long)sci_port;
         sci_port->break_timer.function = sci_break_timer;
@@ -1057,7 +1061,6 @@ static void __devinit sci_init_single(struct platform_device *dev,
 
         sci_port->port.irq      = p->irqs[SCIx_TXI_IRQ];
         sci_port->port.flags    = p->flags;
-        sci_port->port.dev      = &dev->dev;
         sci_port->type          = sci_port->port.type = p->type;
 
         memcpy(&sci_port->irqs, &p->irqs, sizeof(p->irqs));
@@ -1101,7 +1104,7 @@ static void serial_console_write(struct console *co, const char *s,
                 sci_port->disable(port);
 }
 
-static int __init serial_console_setup(struct console *co, char *options)
+static int __devinit serial_console_setup(struct console *co, char *options)
 {
         struct sci_port *sci_port;
         struct uart_port *port;
@@ -1119,9 +1122,14 @@ static int __init serial_console_setup(struct console *co, char *options)
         if (co->index >= SCI_NPORTS)
                 co->index = 0;
 
-        sci_port = &sci_ports[co->index];
-        port = &sci_port->port;
-        co->data = port;
+        if (co->data) {
+                port = co->data;
+                sci_port = to_sci_port(port);
+        } else {
+                sci_port = &sci_ports[co->index];
+                port = &sci_port->port;
+                co->data = port;
+        }
 
         /*
          * Also need to check port->type, we don't actually have any
@@ -1165,6 +1173,15 @@ static int __init sci_console_init(void)
         return 0;
 }
 console_initcall(sci_console_init);
+
+static struct sci_port early_serial_port;
+static struct console early_serial_console = {
+        .name           = "early_ttySC",
+        .write          = serial_console_write,
+        .flags          = CON_PRINTBUFFER,
+};
+static char early_serial_buf[32];
+
 #endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
 
 #if defined(CONFIG_SERIAL_SH_SCI_CONSOLE)
@@ -1250,6 +1267,21 @@ static int __devinit sci_probe(struct platform_device *dev)
         struct sh_sci_priv *priv;
         int i, ret = -EINVAL;
 
+#ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
+        if (is_early_platform_device(dev)) {
+                if (dev->id == -1)
+                        return -ENOTSUPP;
+                early_serial_console.index = dev->id;
+                early_serial_console.data = &early_serial_port.port;
+                sci_init_single(NULL, &early_serial_port, dev->id, p);
+                serial_console_setup(&early_serial_console, early_serial_buf);
+                if (!strstr(early_serial_buf, "keep"))
+                        early_serial_console.flags |= CON_BOOT;
+                register_console(&early_serial_console);
+                return 0;
+        }
+#endif
+
         priv = kzalloc(sizeof(*priv), GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
@@ -1312,7 +1344,7 @@ static int sci_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops sci_dev_pm_ops = {
+static const struct dev_pm_ops sci_dev_pm_ops = {
         .suspend        = sci_suspend,
         .resume         = sci_resume,
 };
@@ -1349,6 +1381,10 @@ static void __exit sci_exit(void)
         uart_unregister_driver(&sci_uart_driver);
 }
 
+#ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
+early_platform_init_buffer("earlyprintk", &sci_driver,
+                           early_serial_buf, ARRAY_SIZE(early_serial_buf));
+#endif
 module_init(sci_init);
 module_exit(sci_exit);
 
diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c
index a7e5c2e9986c..d5d7f23c19a5 100644
--- a/drivers/sh/intc.c
+++ b/drivers/sh/intc.c
@@ -806,6 +806,8 @@ static int intc_suspend(struct sys_device *dev, pm_message_t state)
                 if (d->state.event != PM_EVENT_FREEZE)
                         break;
                 for_each_irq_desc(irq, desc) {
+                        if (desc->handle_irq == intc_redirect_irq)
+                                continue;
                         if (desc->chip != &d->chip)
                                 continue;
                         if (desc->status & IRQ_DISABLED)
diff --git a/drivers/sh/pfc.c b/drivers/sh/pfc.c
index 841ed5030c8f..082604edc4c2 100644
--- a/drivers/sh/pfc.c
+++ b/drivers/sh/pfc.c
@@ -71,7 +71,7 @@ static void gpio_write_bit(struct pinmux_data_reg *dr,
 
         pos = dr->reg_width - (in_pos + 1);
 
-        pr_debug("write_bit addr = %lx, value = %ld, pos = %ld, "
+        pr_debug("write_bit addr = %lx, value = %d, pos = %ld, "
                  "r_width = %ld\n",
                  dr->reg, !!value, pos, dr->reg_width);
 
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c
index 816d4c592a3c..66802a4390cc 100644
--- a/drivers/sn/ioc3.c
+++ b/drivers/sn/ioc3.c
@@ -574,11 +574,11 @@ void ioc3_unregister_submodule(struct ioc3_submodule *is)
  * Device management *
  *********************/
 
-static char *
+static char * __devinitdata
 ioc3_class_names[]={"unknown", "IP27 BaseIO", "IP30 system", "MENET 1/2/3",
                         "MENET 4", "CADduo", "Altix Serial"};
 
-static int ioc3_class(struct ioc3_driver_data *idd)
+static int __devinit ioc3_class(struct ioc3_driver_data *idd)
 {
         int res = IOC3_CLASS_NONE;
         /* NIC-based logic */
@@ -601,7 +601,8 @@ static int ioc3_class(struct ioc3_driver_data *idd)
         return res;
 }
 /* Adds a new instance of an IOC3 card */
-static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
+static int __devinit
+ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
 {
         struct ioc3_driver_data *idd;
         uint32_t pcmd;
@@ -753,7 +754,7 @@ out:
 }
 
 /* Removes a particular instance of an IOC3 card. */
-static void ioc3_remove(struct pci_dev *pdev)
+static void __devexit ioc3_remove(struct pci_dev *pdev)
 {
         int id;
         struct ioc3_driver_data *idd;
@@ -805,7 +806,7 @@ static struct pci_driver ioc3_driver = {
         .name = "IOC3",
         .id_table = ioc3_id_table,
         .probe = ioc3_probe,
-        .remove = ioc3_remove,
+        .remove = __devexit_p(ioc3_remove),
 };
 
 MODULE_DEVICE_TABLE(pci, ioc3_id_table);
@@ -815,15 +816,15 @@ MODULE_DEVICE_TABLE(pci, ioc3_id_table);
  *********************/
 
 /* Module load */
-static int __devinit ioc3_init(void)
+static int __init ioc3_init(void)
 {
         if (ia64_platform_is("sn2"))
                 return pci_register_driver(&ioc3_driver);
-        return 0;
+        return -ENODEV;
 }
 
 /* Module unload */
-static void __devexit ioc3_exit(void)
+static void __exit ioc3_exit(void)
 {
         pci_unregister_driver(&ioc3_driver);
 }
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index c8c2b693ffac..c2f707e5ce74 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -1709,7 +1709,7 @@ static int pxa2xx_spi_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops pxa2xx_spi_pm_ops = {
+static const struct dev_pm_ops pxa2xx_spi_pm_ops = {
         .suspend        = pxa2xx_spi_suspend,
         .resume         = pxa2xx_spi_resume,
 };
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 33d94f76b9ef..276591569c8b 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -489,7 +489,7 @@ static int s3c24xx_spi_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops s3c24xx_spi_pmops = {
+static const struct dev_pm_ops s3c24xx_spi_pmops = {
         .suspend        = s3c24xx_spi_suspend,
         .resume         = s3c24xx_spi_resume,
 };
diff --git a/drivers/staging/cx25821/cx25821-audups11.c b/drivers/staging/cx25821/cx25821-audups11.c
index f78b8912d905..89c8fe2997fa 100644
--- a/drivers/staging/cx25821/cx25821-audups11.c
+++ b/drivers/staging/cx25821/cx25821-audups11.c
@@ -94,36 +94,20 @@ static struct videobuf_queue_ops cx25821_video_qops = {
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx25821_dev *h, *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx25821_dev *dev = video_drvdata(file);
         struct cx25821_fh *fh;
-        struct list_head *list;
-        enum v4l2_buf_type type = 0;
+        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-        lock_kernel();
-        list_for_each(list, &cx25821_devlist) {
-                h = list_entry(list, struct cx25821_dev, devlist);
-
-                if (h->video_dev[SRAM_CH11]
-                    && h->video_dev[SRAM_CH11]->minor == minor) {
-                        dev = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
-        }
-
-        if (NULL == dev) {
-                unlock_kernel();
-                return -ENODEV;
-        }
-
-        printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+        printk("open dev=%s type=%s\n", video_device_node_name(vdev),
+                v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh) {
-                unlock_kernel();
+        if (NULL == fh)
                 return -ENOMEM;
-        }
+
+        lock_kernel();
 
         file->private_data = fh;
         fh->dev = dev;
@@ -427,7 +411,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 struct video_device cx25821_video_template11 = {
         .name = "cx25821-audioupstream",
         .fops = &video_fops,
-        .minor = -1,
         .ioctl_ops = &video_ioctl_ops,
         .tvnorms = CX25821_NORMS,
         .current_norm = V4L2_STD_NTSC_M,
diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/staging/cx25821/cx25821-video.c
index 8834bc80a5ab..c7c14c7698a7 100644
--- a/drivers/staging/cx25821/cx25821-video.c
+++ b/drivers/staging/cx25821/cx25821-video.c
@@ -184,11 +184,11 @@ struct video_device *cx25821_vdev_init(struct cx25821_dev *dev,
         if (NULL == vfd)
                 return NULL;
         *vfd = *template;
-        vfd->minor = -1;
         vfd->v4l2_dev = &dev->v4l2_dev;
         vfd->release = video_device_release;
         snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", dev->name, type,
                  cx25821_boards[dev->board].name);
+        video_set_drvdata(vfd, dev);
         return vfd;
 }
 
@@ -424,7 +424,7 @@ int cx25821_video_irq(struct cx25821_dev *dev, int chan_num, u32 status)
 void cx25821_videoioctl_unregister(struct cx25821_dev *dev)
 {
         if (dev->ioctl_dev) {
-                if (dev->ioctl_dev->minor != -1)
+                if (video_is_registered(dev->ioctl_dev))
                         video_unregister_device(dev->ioctl_dev);
                 else
                         video_device_release(dev->ioctl_dev);
@@ -438,7 +438,7 @@ void cx25821_video_unregister(struct cx25821_dev *dev, int chan_num)
         cx_clear(PCI_INT_MSK, 1);
 
         if (dev->video_dev[chan_num]) {
-                if (-1 != dev->video_dev[chan_num]->minor)
+                if (video_is_registered(dev->video_dev[chan_num]))
                         video_unregister_device(dev->video_dev[chan_num]);
                 else
                         video_device_release(dev->video_dev[chan_num]);
diff --git a/drivers/staging/cx25821/cx25821-video0.c b/drivers/staging/cx25821/cx25821-video0.c
index 950fac1d7003..ad7a69129118 100644
--- a/drivers/staging/cx25821/cx25821-video0.c
+++ b/drivers/staging/cx25821/cx25821-video0.c
@@ -94,37 +94,21 @@ static struct videobuf_queue_ops cx25821_video_qops = {
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx25821_dev *h, *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx25821_dev *dev = video_drvdata(file);
         struct cx25821_fh *fh;
-        struct list_head *list;
-        enum v4l2_buf_type type = 0;
+        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         u32 pix_format;
 
-        lock_kernel();
-        list_for_each(list, &cx25821_devlist) {
-                h = list_entry(list, struct cx25821_dev, devlist);
-
-                if (h->video_dev[SRAM_CH00]
-                    && h->video_dev[SRAM_CH00]->minor == minor) {
-                        dev = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
-        }
-
-        if (NULL == dev) {
-                unlock_kernel();
-                return -ENODEV;
-        }
-
-        printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+        printk("open dev=%s type=%s\n", video_device_node_name(vdev),
+                v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh) {
-                unlock_kernel();
+        if (NULL == fh)
                 return -ENOMEM;
-        }
+
+        lock_kernel();
 
         file->private_data = fh;
         fh->dev = dev;
@@ -444,7 +428,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 struct video_device cx25821_video_template0 = {
         .name = "cx25821-video",
         .fops = &video_fops,
-        .minor = -1,
         .ioctl_ops = &video_ioctl_ops,
         .tvnorms = CX25821_NORMS,
         .current_norm = V4L2_STD_NTSC_M,
diff --git a/drivers/staging/cx25821/cx25821-video1.c b/drivers/staging/cx25821/cx25821-video1.c
index a4dddc684adf..e3f3c4ac7908 100644
--- a/drivers/staging/cx25821/cx25821-video1.c
+++ b/drivers/staging/cx25821/cx25821-video1.c
@@ -94,37 +94,21 @@ static struct videobuf_queue_ops cx25821_video_qops = {
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx25821_dev *h, *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx25821_dev *dev = video_drvdata(file);
         struct cx25821_fh *fh;
-        struct list_head *list;
-        enum v4l2_buf_type type = 0;
+        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         u32 pix_format;
 
-        lock_kernel();
-        list_for_each(list, &cx25821_devlist) {
-                h = list_entry(list, struct cx25821_dev, devlist);
-
-                if (h->video_dev[SRAM_CH01]
-                    && h->video_dev[SRAM_CH01]->minor == minor) {
-                        dev = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
-        }
-
-        if (NULL == dev) {
-                unlock_kernel();
-                return -ENODEV;
-        }
-
-        printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+        printk("open dev=%s type=%s\n", video_device_node_name(vdev),
+                v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh) {
-                unlock_kernel();
+        if (NULL == fh)
                 return -ENOMEM;
-        }
+
+        lock_kernel();
 
         file->private_data = fh;
         fh->dev = dev;
@@ -444,7 +428,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 struct video_device cx25821_video_template1 = {
         .name = "cx25821-video",
         .fops = &video_fops,
-        .minor = -1,
         .ioctl_ops = &video_ioctl_ops,
         .tvnorms = CX25821_NORMS,
         .current_norm = V4L2_STD_NTSC_M,
diff --git a/drivers/staging/cx25821/cx25821-video2.c b/drivers/staging/cx25821/cx25821-video2.c
index 8e04e253f5d9..36fb855a497e 100644
--- a/drivers/staging/cx25821/cx25821-video2.c
+++ b/drivers/staging/cx25821/cx25821-video2.c
@@ -94,37 +94,22 @@ static struct videobuf_queue_ops cx25821_video_qops = {
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx25821_dev *h, *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx25821_dev *dev = video_drvdata(file);
         struct cx25821_fh *fh;
-        struct list_head *list;
-        enum v4l2_buf_type type = 0;
+        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         u32 pix_format;
 
-        lock_kernel();
-        list_for_each(list, &cx25821_devlist) {
-                h = list_entry(list, struct cx25821_dev, devlist);
-
-                if (h->video_dev[SRAM_CH02]
-                    && h->video_dev[SRAM_CH02]->minor == minor) {
-                        dev = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
-        }
-
-        if (NULL == dev) {
-                unlock_kernel();
-                return -ENODEV;
-        }
-
-        printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+        printk("open dev=%s type=%s\n", video_device_node_name(vdev),
+                v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh) {
-                unlock_kernel();
+        if (NULL == fh)
                 return -ENOMEM;
-        }
+
+        lock_kernel();
+
         file->private_data = fh;
         fh->dev = dev;
         fh->type = type;
@@ -445,7 +430,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 struct video_device cx25821_video_template2 = {
         .name = "cx25821-video",
         .fops = &video_fops,
-        .minor = -1,
         .ioctl_ops = &video_ioctl_ops,
         .tvnorms = CX25821_NORMS,
         .current_norm = V4L2_STD_NTSC_M,
diff --git a/drivers/staging/cx25821/cx25821-video3.c b/drivers/staging/cx25821/cx25821-video3.c
index 8801a8ead904..1e0f10abdbcd 100644
--- a/drivers/staging/cx25821/cx25821-video3.c
+++ b/drivers/staging/cx25821/cx25821-video3.c
@@ -94,37 +94,22 @@ static struct videobuf_queue_ops cx25821_video_qops = {
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx25821_dev *h, *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx25821_dev *dev = video_drvdata(file);
         struct cx25821_fh *fh;
-        struct list_head *list;
-        enum v4l2_buf_type type = 0;
+        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         u32 pix_format;
 
-        lock_kernel();
-        list_for_each(list, &cx25821_devlist) {
-                h = list_entry(list, struct cx25821_dev, devlist);
-
-                if (h->video_dev[SRAM_CH03]
-                    && h->video_dev[SRAM_CH03]->minor == minor) {
-                        dev = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
-        }
-
-        if (NULL == dev) {
-                unlock_kernel();
-                return -ENODEV;
-        }
-
-        printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+        printk("open dev=%s type=%s\n", video_device_node_name(vdev),
+                v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh) {
-                unlock_kernel();
+        if (NULL == fh)
                 return -ENOMEM;
-        }
+
+        lock_kernel();
+
         file->private_data = fh;
         fh->dev = dev;
         fh->type = type;
@@ -444,7 +429,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 struct video_device cx25821_video_template3 = {
         .name = "cx25821-video",
         .fops = &video_fops,
-        .minor = -1,
         .ioctl_ops = &video_ioctl_ops,
         .tvnorms = CX25821_NORMS,
         .current_norm = V4L2_STD_NTSC_M,
diff --git a/drivers/staging/cx25821/cx25821-video4.c b/drivers/staging/cx25821/cx25821-video4.c
index ab0d747138ad..0cbe7a79d8c0 100644
--- a/drivers/staging/cx25821/cx25821-video4.c
+++ b/drivers/staging/cx25821/cx25821-video4.c
@@ -94,37 +94,22 @@ static struct videobuf_queue_ops cx25821_video_qops = {
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx25821_dev *h, *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx25821_dev *dev = video_drvdata(file);
         struct cx25821_fh *fh;
-        struct list_head *list;
-        enum v4l2_buf_type type = 0;
+        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         u32 pix_format;
 
-        lock_kernel();
-        list_for_each(list, &cx25821_devlist) {
-                h = list_entry(list, struct cx25821_dev, devlist);
-
-                if (h->video_dev[SRAM_CH04]
-                    && h->video_dev[SRAM_CH04]->minor == minor) {
-                        dev = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
-        }
-
-        if (NULL == dev) {
-                unlock_kernel();
-                return -ENODEV;
-        }
-
-        printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+        printk("open dev=%s type=%s\n", video_device_node_name(vdev),
+                v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh) {
-                unlock_kernel();
+        if (NULL == fh)
                 return -ENOMEM;
-        }
+
+        lock_kernel();
+
         file->private_data = fh;
         fh->dev = dev;
         fh->type = type;
@@ -443,7 +428,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 struct video_device cx25821_video_template4 = {
         .name = "cx25821-video",
         .fops = &video_fops,
-        .minor = -1,
         .ioctl_ops = &video_ioctl_ops,
         .tvnorms = CX25821_NORMS,
         .current_norm = V4L2_STD_NTSC_M,
diff --git a/drivers/staging/cx25821/cx25821-video5.c b/drivers/staging/cx25821/cx25821-video5.c
index 7ef0b971f5cf..5dc08adc12e8 100644
--- a/drivers/staging/cx25821/cx25821-video5.c
+++ b/drivers/staging/cx25821/cx25821-video5.c
@@ -94,37 +94,22 @@ static struct videobuf_queue_ops cx25821_video_qops = {
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx25821_dev *h, *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx25821_dev *dev = video_drvdata(file);
         struct cx25821_fh *fh;
-        struct list_head *list;
-        enum v4l2_buf_type type = 0;
+        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         u32 pix_format;
 
-        lock_kernel();
-        list_for_each(list, &cx25821_devlist) {
-                h = list_entry(list, struct cx25821_dev, devlist);
-
-                if (h->video_dev[SRAM_CH05]
-                    && h->video_dev[SRAM_CH05]->minor == minor) {
-                        dev = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
-        }
-
-        if (NULL == dev) {
-                unlock_kernel();
-                return -ENODEV;
-        }
-
-        printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+        printk("open dev=%s type=%s\n", video_device_node_name(vdev),
+                v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh) {
-                unlock_kernel();
+        if (NULL == fh)
                 return -ENOMEM;
-        }
+
+        lock_kernel();
+
         file->private_data = fh;
         fh->dev = dev;
         fh->type = type;
@@ -443,7 +428,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 struct video_device cx25821_video_template5 = {
         .name = "cx25821-video",
         .fops = &video_fops,
-        .minor = -1,
         .ioctl_ops = &video_ioctl_ops,
         .tvnorms = CX25821_NORMS,
         .current_norm = V4L2_STD_NTSC_M,
diff --git a/drivers/staging/cx25821/cx25821-video6.c b/drivers/staging/cx25821/cx25821-video6.c
index 3c41b49e2ea9..2938ad3ad3c5 100644
--- a/drivers/staging/cx25821/cx25821-video6.c
+++ b/drivers/staging/cx25821/cx25821-video6.c
@@ -94,37 +94,22 @@ static struct videobuf_queue_ops cx25821_video_qops = {
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx25821_dev *h, *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx25821_dev *dev = video_drvdata(file);
         struct cx25821_fh *fh;
-        struct list_head *list;
-        enum v4l2_buf_type type = 0;
+        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         u32 pix_format;
 
-        lock_kernel();
-        list_for_each(list, &cx25821_devlist) {
-                h = list_entry(list, struct cx25821_dev, devlist);
-
-                if (h->video_dev[SRAM_CH06]
-                    && h->video_dev[SRAM_CH06]->minor == minor) {
-                        dev = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
-        }
-
-        if (NULL == dev) {
-                unlock_kernel();
-                return -ENODEV;
-        }
-
-        printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+        printk("open dev=%s type=%s\n", video_device_node_name(vdev),
+                v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh) {
-                unlock_kernel();
+        if (NULL == fh)
                 return -ENOMEM;
-        }
+
+        lock_kernel();
+
         file->private_data = fh;
         fh->dev = dev;
         fh->type = type;
@@ -443,7 +428,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 struct video_device cx25821_video_template6 = {
         .name = "cx25821-video",
         .fops = &video_fops,
-        .minor = -1,
         .ioctl_ops = &video_ioctl_ops,
         .tvnorms = CX25821_NORMS,
         .current_norm = V4L2_STD_NTSC_M,
diff --git a/drivers/staging/cx25821/cx25821-video7.c b/drivers/staging/cx25821/cx25821-video7.c
index 625c9b78a9cf..458e525d72af 100644
--- a/drivers/staging/cx25821/cx25821-video7.c
+++ b/drivers/staging/cx25821/cx25821-video7.c
@@ -93,37 +93,22 @@ static struct videobuf_queue_ops cx25821_video_qops = {
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx25821_dev *h, *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx25821_dev *dev = video_drvdata(file);
         struct cx25821_fh *fh;
-        struct list_head *list;
-        enum v4l2_buf_type type = 0;
+        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         u32 pix_format;
 
-        lock_kernel();
-        list_for_each(list, &cx25821_devlist) {
-                h = list_entry(list, struct cx25821_dev, devlist);
-
-                if (h->video_dev[SRAM_CH07]
-                    && h->video_dev[SRAM_CH07]->minor == minor) {
-                        dev = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
-        }
-
-        if (NULL == dev) {
-                unlock_kernel();
-                return -ENODEV;
-        }
-
-        printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+        printk("open dev=%s type=%s\n", video_device_node_name(vdev),
+                v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh) {
-                unlock_kernel();
+        if (NULL == fh)
                 return -ENOMEM;
-        }
+
+        lock_kernel();
+
         file->private_data = fh;
         fh->dev = dev;
         fh->type = type;
@@ -442,7 +427,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 struct video_device cx25821_video_template7 = {
         .name = "cx25821-video",
         .fops = &video_fops,
-        .minor = -1,
         .ioctl_ops = &video_ioctl_ops,
         .tvnorms = CX25821_NORMS,
         .current_norm = V4L2_STD_NTSC_M,
diff --git a/drivers/staging/cx25821/cx25821-videoioctl.c b/drivers/staging/cx25821/cx25821-videoioctl.c
index 2a312ce78c63..1da52b54a454 100644
--- a/drivers/staging/cx25821/cx25821-videoioctl.c
+++ b/drivers/staging/cx25821/cx25821-videoioctl.c
@@ -94,36 +94,21 @@ static struct videobuf_queue_ops cx25821_video_qops = {
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx25821_dev *h, *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx25821_dev *dev = video_drvdata(file);
         struct cx25821_fh *fh;
-        struct list_head *list;
-        enum v4l2_buf_type type = 0;
+        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         u32 pix_format;
 
-        lock_kernel();
-        list_for_each(list, &cx25821_devlist) {
-                h = list_entry(list, struct cx25821_dev, devlist);
-
-                if (h->ioctl_dev && h->ioctl_dev->minor == minor) {
-                        dev = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
-        }
-
-        if (NULL == dev) {
-                unlock_kernel();
-                return -ENODEV;
-        }
-
-        printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+        printk("open dev=%s type=%s\n", video_device_node_name(vdev),
+                v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh) {
-                unlock_kernel();
+        if (NULL == fh)
                 return -ENOMEM;
-        }
+
+        lock_kernel();
 
         file->private_data = fh;
         fh->dev = dev;
@@ -489,7 +474,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 struct video_device cx25821_videoioctl_template = {
         .name = "cx25821-videoioctl",
         .fops = &video_fops,
-        .minor = -1,
         .ioctl_ops = &video_ioctl_ops,
         .tvnorms = CX25821_NORMS,
         .current_norm = V4L2_STD_NTSC_M,
diff --git a/drivers/staging/cx25821/cx25821-vidups10.c b/drivers/staging/cx25821/cx25821-vidups10.c
index 77b63b060405..b76d9f62c3d1 100644
--- a/drivers/staging/cx25821/cx25821-vidups10.c
+++ b/drivers/staging/cx25821/cx25821-vidups10.c
@@ -94,36 +94,20 @@ static struct videobuf_queue_ops cx25821_video_qops = {
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx25821_dev *h, *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx25821_dev *dev = video_drvdata(file);
         struct cx25821_fh *fh;
-        struct list_head *list;
-        enum v4l2_buf_type type = 0;
+        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-        lock_kernel();
-        list_for_each(list, &cx25821_devlist) {
-                h = list_entry(list, struct cx25821_dev, devlist);
-
-                if (h->video_dev[SRAM_CH10]
-                    && h->video_dev[SRAM_CH10]->minor == minor) {
-                        dev = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
-        }
-
-        if (NULL == dev) {
-                unlock_kernel();
-                return -ENODEV;
-        }
-
-        printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+        printk("open dev=%s type=%s\n", video_device_node_name(vdev),
+                v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh) {
-                unlock_kernel();
+        if (NULL == fh)
                 return -ENOMEM;
-        }
+
+        lock_kernel();
 
         file->private_data = fh;
         fh->dev = dev;
@@ -428,7 +412,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 struct video_device cx25821_video_template10 = {
         .name = "cx25821-upstream10",
         .fops = &video_fops,
-        .minor = -1,
         .ioctl_ops = &video_ioctl_ops,
         .tvnorms = CX25821_NORMS,
         .current_norm = V4L2_STD_NTSC_M,
diff --git a/drivers/staging/cx25821/cx25821-vidups9.c b/drivers/staging/cx25821/cx25821-vidups9.c
index 75c8c1eed2da..1580da3b29aa 100644
--- a/drivers/staging/cx25821/cx25821-vidups9.c
+++ b/drivers/staging/cx25821/cx25821-vidups9.c
@@ -94,36 +94,20 @@ static struct videobuf_queue_ops cx25821_video_qops = {
 
 static int video_open(struct file *file)
 {
-        int minor = video_devdata(file)->minor;
-        struct cx25821_dev *h, *dev = NULL;
+        struct video_device *vdev = video_devdata(file);
+        struct cx25821_dev *dev = video_drvdata(file);
         struct cx25821_fh *fh;
-        struct list_head *list;
-        enum v4l2_buf_type type = 0;
+        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-        lock_kernel();
-        list_for_each(list, &cx25821_devlist) {
-                h = list_entry(list, struct cx25821_dev, devlist);
-
-                if (h->video_dev[SRAM_CH09]
-                    && h->video_dev[SRAM_CH09]->minor == minor) {
-                        dev = h;
-                        type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                }
-        }
-
-        if (NULL == dev) {
-                unlock_kernel();
-                return -ENODEV;
-        }
-
-        printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
+        printk("open dev=%s type=%s\n", video_device_node_name(vdev),
+                v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh) {
-                unlock_kernel();
+        if (NULL == fh)
                 return -ENOMEM;
-        }
+
+        lock_kernel();
 
         file->private_data = fh;
         fh->dev = dev;
@@ -426,7 +410,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 struct video_device cx25821_video_template9 = {
         .name = "cx25821-upstream9",
         .fops = &video_fops,
-        .minor = -1,
         .ioctl_ops = &video_ioctl_ops,
         .tvnorms = CX25821_NORMS,
         .current_norm = V4L2_STD_NTSC_M,
diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c
index b18d8e2d4c5e..3af79242313e 100644
--- a/drivers/staging/go7007/go7007-v4l2.c
+++ b/drivers/staging/go7007/go7007-v4l2.c
@@ -1787,7 +1787,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 static struct video_device go7007_template = {
         .name           = "go7007",
         .fops           = &go7007_fops,
-        .minor          = -1,
         .release        = go7007_vfl_release,
         .ioctl_ops      = &video_ioctl_ops,
         .tvnorms        = V4L2_STD_ALL,
@@ -1817,8 +1816,8 @@ int go7007_v4l2_init(struct go7007 *go)
         }
         video_set_drvdata(go->video_dev, go);
         ++go->ref_count;
-        printk(KERN_INFO "%s: registered device video%d [v4l2]\n",
-               go->video_dev->name, go->video_dev->num);
+        printk(KERN_INFO "%s: registered device %s [v4l2]\n",
+               go->video_dev->name, video_device_node_name(go->video_dev));
 
         return 0;
 }
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index aa53db9f2e88..1ef3b8fc50b3 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -210,7 +210,7 @@ static int uio_pdrv_genirq_runtime_nop(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops uio_pdrv_genirq_dev_pm_ops = {
+static const struct dev_pm_ops uio_pdrv_genirq_dev_pm_ops = {
         .runtime_suspend = uio_pdrv_genirq_runtime_nop,
         .runtime_resume = uio_pdrv_genirq_runtime_nop,
 };
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index 91f2885b6ee1..2dcf906df569 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -363,7 +363,7 @@ static int hcd_pci_restore(struct device *dev)
         return resume_common(dev, true);
 }
 
-struct dev_pm_ops usb_hcd_pci_pm_ops = {
+const struct dev_pm_ops usb_hcd_pci_pm_ops = {
         .suspend        = hcd_pci_suspend,
         .suspend_noirq  = hcd_pci_suspend_noirq,
         .resume_noirq   = hcd_pci_resume_noirq,
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
index d8b43aee581e..bbe2b924aae8 100644
--- a/drivers/usb/core/hcd.h
+++ b/drivers/usb/core/hcd.h
@@ -330,7 +330,7 @@ extern void usb_hcd_pci_remove(struct pci_dev *dev);
 extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
 
 #ifdef CONFIG_PM_SLEEP
-extern struct dev_pm_ops        usb_hcd_pci_pm_ops;
+extern const struct dev_pm_ops usb_hcd_pci_pm_ops;
 #endif
 #endif /* CONFIG_PCI */
 
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 4e2c6df8d3cc..2fb42043b305 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -167,18 +167,23 @@ struct usb_host_interface *usb_altnum_to_altsetting(
 }
 EXPORT_SYMBOL_GPL(usb_altnum_to_altsetting);
 
+struct find_interface_arg {
+        int minor;
+        struct device_driver *drv;
+};
+
 static int __find_interface(struct device *dev, void *data)
 {
-        int *minor = data;
+        struct find_interface_arg *arg = data;
         struct usb_interface *intf;
 
         if (!is_usb_interface(dev))
                 return 0;
 
+        if (dev->driver != arg->drv)
+                return 0;
         intf = to_usb_interface(dev);
-        if (intf->minor != -1 && intf->minor == *minor)
-                return 1;
-        return 0;
+        return intf->minor == arg->minor;
 }
 
 /**
@@ -187,14 +192,18 @@ static int __find_interface(struct device *dev, void *data)
  * @minor: the minor number of the desired device
  *
  * This walks the bus device list and returns a pointer to the interface
- * with the matching minor.  Note, this only works for devices that share the
- * USB major number.
+ * with the matching minor and driver.  Note, this only works for devices
+ * that share the USB major number.
  */
 struct usb_interface *usb_find_interface(struct usb_driver *drv, int minor)
 {
+        struct find_interface_arg argb;
         struct device *dev;
 
-        dev = bus_find_device(&usb_bus_type, NULL, &minor, __find_interface);
+        argb.minor = minor;
+        argb.drv = &drv->drvwrap.driver;
+
+        dev = bus_find_device(&usb_bus_type, NULL, &argb, __find_interface);
 
         /* Drop reference count from bus_find_device */
         put_device(dev);
@@ -320,7 +329,7 @@ static int usb_dev_restore(struct device *dev)
         return usb_resume(dev, PMSG_RESTORE);
 }
 
-static struct dev_pm_ops usb_device_pm_ops = {
+static const struct dev_pm_ops usb_device_pm_ops = {
         .prepare =      usb_dev_prepare,
         .complete =     usb_dev_complete,
         .suspend =      usb_dev_suspend,
diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c
index ed77be76d6bb..dbfb482a94e3 100644
--- a/drivers/usb/host/ehci-au1xxx.c
+++ b/drivers/usb/host/ehci-au1xxx.c
@@ -297,7 +297,7 @@ static int ehci_hcd_au1xxx_drv_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops au1xxx_ehci_pmops = {
+static const struct dev_pm_ops au1xxx_ehci_pmops = {
         .suspend        = ehci_hcd_au1xxx_drv_suspend,
         .resume         = ehci_hcd_au1xxx_drv_resume,
 };
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 5c774ab98252..73352f3739b5 100644
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -80,7 +80,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 #include <linux/io.h>
-#include <linux/bitops.h>
+#include <linux/bitmap.h>
 
 #include <asm/irq.h>
 #include <asm/system.h>
@@ -190,10 +190,8 @@ static int claim_ptd_buffers(struct isp1362_ep_queue *epq,
                              struct isp1362_ep *ep, u16 len)
 {
         int ptd_offset = -EINVAL;
-        int index;
         int num_ptds = ((len + PTD_HEADER_SIZE - 1) / epq->blk_size) + 1;
-        int found = -1;
-        int last = -1;
+        int found;
 
         BUG_ON(len > epq->buf_size);
 
@@ -205,20 +203,9 @@ static int claim_ptd_buffers(struct isp1362_ep_queue *epq,
                     epq->name, len, epq->blk_size, num_ptds, epq->buf_map, epq->skip_map);
         BUG_ON(ep->num_ptds != 0);
 
-        for (index = 0; index <= epq->buf_count - num_ptds; index++) {
-                if (test_bit(index, &epq->buf_map))
-                        continue;
-                found = index;
-                for (last = index + 1; last < index + num_ptds; last++) {
-                        if (test_bit(last, &epq->buf_map)) {
-                                found = -1;
-                                break;
-                        }
-                }
-                if (found >= 0)
-                        break;
-        }
-        if (found < 0)
+        found = bitmap_find_next_zero_area(&epq->buf_map, epq->buf_count, 0,
+                                                num_ptds, 0);
+        if (found >= epq->buf_count)
                 return -EOVERFLOW;
 
         DBG(1, "%s: Found %d PTDs[%d] for %d/%d byte\n", __func__,
@@ -230,8 +217,7 @@ static int claim_ptd_buffers(struct isp1362_ep_queue *epq,
         epq->buf_avail -= num_ptds;
         BUG_ON(epq->buf_avail > epq->buf_count);
         ep->ptd_index = found;
-        for (index = found; index < last; index++)
-                __set_bit(index, &epq->buf_map);
+        bitmap_set(&epq->buf_map, found, num_ptds);
         DBG(1, "%s: Done %s PTD[%d] $%04x, avail %d count %d claimed %d %08lx:%08lx\n",
             __func__, epq->name, ep->ptd_index, ep->ptd_offset,
             epq->buf_avail, epq->buf_count, num_ptds, epq->buf_map, epq->skip_map);
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c
index e4380082ebb1..17a6043c1fa0 100644
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
@@ -294,7 +294,7 @@ static int ohci_hcd_au1xxx_drv_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops au1xxx_ohci_pmops = {
+static const struct dev_pm_ops au1xxx_ohci_pmops = {
         .suspend        = ohci_hcd_au1xxx_drv_suspend,
         .resume         = ohci_hcd_au1xxx_drv_resume,
 };
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index f1c06202fdf2..a18debdd79b8 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -518,7 +518,7 @@ static int ohci_hcd_pxa27x_drv_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops ohci_hcd_pxa27x_pm_ops = {
+static const struct dev_pm_ops ohci_hcd_pxa27x_pm_ops = {
         .suspend        = ohci_hcd_pxa27x_drv_suspend,
         .resume         = ohci_hcd_pxa27x_drv_resume,
 };
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 41dbc70ae752..b7a661c02bcd 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -2353,7 +2353,7 @@ static int r8a66597_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops r8a66597_dev_pm_ops = {
+static const struct dev_pm_ops r8a66597_dev_pm_ops = {
         .suspend = r8a66597_suspend,
         .resume = r8a66597_resume,
         .poweroff = r8a66597_suspend,
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 49f2346afad3..bfe08f4975a3 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2214,7 +2214,7 @@ static int musb_resume_noirq(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops musb_dev_pm_ops = {
+static const struct dev_pm_ops musb_dev_pm_ops = {
         .suspend        = musb_suspend,
         .resume_noirq   = musb_resume_noirq,
 };
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 99c0df1c7ebf..5a5c303a6373 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -614,6 +614,21 @@ config FB_BFIN_T350MCQB
          This display is a QVGA 320x240 24-bit RGB display interfaced by an 8-bit wide PPI
          It uses PPI[0..7] PPI_FS1, PPI_FS2 and PPI_CLK.
 
+config FB_BFIN_LQ035Q1
+        tristate "SHARP LQ035Q1DH02 TFT LCD"
+        depends on FB && BLACKFIN && SPI
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        select BFIN_GPTIMERS
+        help
+          This is the framebuffer device driver for a SHARP LQ035Q1DH02 TFT display found on
+          the Blackfin Landscape LCD EZ-Extender Card.
+          This display is a QVGA 320x240 18-bit RGB display interfaced by an 16-bit wide PPI
+          It uses PPI[0..15] PPI_FS1, PPI_FS2 and PPI_CLK.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bfin-lq035q1-fb.
 
 config FB_STI
         tristate "HP STI frame buffer device support"
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 0f8da331ba0f..4ecb30c4f3f2 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -137,6 +137,7 @@ obj-$(CONFIG_FB_EFI)              += efifb.o
 obj-$(CONFIG_FB_VGA16)            += vga16fb.o
 obj-$(CONFIG_FB_OF)               += offb.o
 obj-$(CONFIG_FB_BF54X_LQ043)      += bf54x-lq043fb.o
+obj-$(CONFIG_FB_BFIN_LQ035Q1)     += bfin-lq035q1-fb.o
 obj-$(CONFIG_FB_BFIN_T350MCQB)    += bfin-t350mcqb-fb.o
 obj-$(CONFIG_FB_MX3)              += mx3fb.o
 obj-$(CONFIG_FB_DA8XX)            += da8xx-fb.o
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index b7687c55fe16..2051c9dc813b 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -2245,6 +2245,9 @@ static int ext_setcolreg(unsigned int regno, unsigned int red,
         if (regno > 255)
                 return 1;
 
+        if (regno > 255)
+                return 1;
+
         switch (external_card_type) {
         case IS_VGA:
                 OUTB(0x3c8, regno);
diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
index 7fcb0eb54c60..f2d76dae1eb3 100644
--- a/drivers/video/backlight/da903x_bl.c
+++ b/drivers/video/backlight/da903x_bl.c
@@ -177,7 +177,7 @@ static int da903x_backlight_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops da903x_backlight_pm_ops = {
+static const struct dev_pm_ops da903x_backlight_pm_ops = {
         .suspend        = da903x_backlight_suspend,
         .resume         = da903x_backlight_resume,
 };
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index a482dd7b0311..9b3be74cee5a 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -101,7 +101,7 @@ static ssize_t lcd_store_power(struct device *dev,
         int power = simple_strtoul(buf, &endp, 0);
         size_t size = endp - buf;
 
-        if (*endp && isspace(*endp))
+        if (isspace(*endp))
                 size++;
         if (size != count)
                 return -EINVAL;
@@ -140,7 +140,7 @@ static ssize_t lcd_store_contrast(struct device *dev,
         int contrast = simple_strtoul(buf, &endp, 0);
         size_t size = endp - buf;
 
-        if (*endp && isspace(*endp))
+        if (isspace(*endp))
                 size++;
         if (size != count)
                 return -EINVAL;
diff --git a/drivers/video/bfin-lq035q1-fb.c b/drivers/video/bfin-lq035q1-fb.c
new file mode 100644
index 000000000000..b690c269784a
--- /dev/null
+++ b/drivers/video/bfin-lq035q1-fb.c
@@ -0,0 +1,826 @@
+/*
+ * Blackfin LCD Framebuffer driver SHARP LQ035Q1DH02
+ *
+ * Copyright 2008-2009 Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+
+#define DRIVER_NAME "bfin-lq035q1"
+#define pr_fmt(fmt) DRIVER_NAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/device.h>
+#include <linux/backlight.h>
+#include <linux/lcd.h>
+#include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <linux/dma-mapping.h>
+
+#include <asm/blackfin.h>
+#include <asm/irq.h>
+#include <asm/dma.h>
+#include <asm/portmux.h>
+#include <asm/gptimers.h>
+
+#include <asm/bfin-lq035q1.h>
+
+#if defined(BF533_FAMILY) || defined(BF538_FAMILY)
+#define TIMER_HSYNC_id                  TIMER1_id
+#define TIMER_HSYNCbit                  TIMER1bit
+#define TIMER_HSYNC_STATUS_TRUN         TIMER_STATUS_TRUN1
+#define TIMER_HSYNC_STATUS_TIMIL        TIMER_STATUS_TIMIL1
+#define TIMER_HSYNC_STATUS_TOVF         TIMER_STATUS_TOVF1
+
+#define TIMER_VSYNC_id                  TIMER2_id
+#define TIMER_VSYNCbit                  TIMER2bit
+#define TIMER_VSYNC_STATUS_TRUN         TIMER_STATUS_TRUN2
+#define TIMER_VSYNC_STATUS_TIMIL        TIMER_STATUS_TIMIL2
+#define TIMER_VSYNC_STATUS_TOVF         TIMER_STATUS_TOVF2
+#else
+#define TIMER_HSYNC_id                  TIMER0_id
+#define TIMER_HSYNCbit                  TIMER0bit
+#define TIMER_HSYNC_STATUS_TRUN         TIMER_STATUS_TRUN0
+#define TIMER_HSYNC_STATUS_TIMIL        TIMER_STATUS_TIMIL0
+#define TIMER_HSYNC_STATUS_TOVF         TIMER_STATUS_TOVF0
+
+#define TIMER_VSYNC_id                  TIMER1_id
+#define TIMER_VSYNCbit                  TIMER1bit
+#define TIMER_VSYNC_STATUS_TRUN         TIMER_STATUS_TRUN1
+#define TIMER_VSYNC_STATUS_TIMIL        TIMER_STATUS_TIMIL1
+#define TIMER_VSYNC_STATUS_TOVF         TIMER_STATUS_TOVF1
+#endif
+
+#define LCD_X_RES               320     /* Horizontal Resolution */
+#define LCD_Y_RES               240     /* Vertical Resolution */
+#define DMA_BUS_SIZE            16
+
+#define USE_RGB565_16_BIT_PPI
+
+#ifdef USE_RGB565_16_BIT_PPI
+#define LCD_BPP         16      /* Bit Per Pixel */
+#define CLOCKS_PER_PIX  1
+#define CPLD_PIPELINE_DELAY_COR 0       /* NO CPLB */
+#endif
+
+/* Interface 16/18-bit TFT over an 8-bit wide PPI using a small Programmable Logic Device (CPLD)
+ * http://blackfin.uclinux.org/gf/project/stamp/frs/?action=FrsReleaseBrowse&frs_package_id=165
+ */
+
+#ifdef USE_RGB565_8_BIT_PPI
+#define LCD_BPP         16      /* Bit Per Pixel */
+#define CLOCKS_PER_PIX  2
+#define CPLD_PIPELINE_DELAY_COR 3       /* RGB565 */
+#endif
+
+#ifdef USE_RGB888_8_BIT_PPI
+#define LCD_BPP         24      /* Bit Per Pixel */
+#define CLOCKS_PER_PIX  3
+#define CPLD_PIPELINE_DELAY_COR 5       /* RGB888 */
+#endif
+
+        /*
+         * HS and VS timing parameters (all in number of PPI clk ticks)
+         */
+
+#define U_LINE          4                               /* Blanking Lines */
+
+#define H_ACTPIX        (LCD_X_RES * CLOCKS_PER_PIX)    /* active horizontal pixel */
+#define H_PERIOD        (336 * CLOCKS_PER_PIX)          /* HS period */
+#define H_PULSE         (2 * CLOCKS_PER_PIX)                            /* HS pulse width */
+#define H_START         (7 * CLOCKS_PER_PIX + CPLD_PIPELINE_DELAY_COR)  /* first valid pixel */
+
+#define V_LINES         (LCD_Y_RES + U_LINE)            /* total vertical lines */
+#define V_PULSE         (2 * CLOCKS_PER_PIX)            /* VS pulse width (1-5 H_PERIODs) */
+#define V_PERIOD        (H_PERIOD * V_LINES)            /* VS period */
+
+#define ACTIVE_VIDEO_MEM_OFFSET         ((U_LINE / 2) * LCD_X_RES * (LCD_BPP / 8))
+
+#define BFIN_LCD_NBR_PALETTE_ENTRIES    256
+
+#define PPI_TX_MODE                     0x2
+#define PPI_XFER_TYPE_11                0xC
+#define PPI_PORT_CFG_01                 0x10
+#define PPI_POLS_1                      0x8000
+
+#if (CLOCKS_PER_PIX > 1)
+#define PPI_PMODE (DLEN_8 | PACK_EN)
+#else
+#define PPI_PMODE (DLEN_16)
+#endif
+
+#define LQ035_INDEX                     0x74
+#define LQ035_DATA                      0x76
+
+#define LQ035_DRIVER_OUTPUT_CTL         0x1
+#define LQ035_SHUT_CTL                  0x11
+
+#define LQ035_DRIVER_OUTPUT_MASK        (LQ035_LR | LQ035_TB | LQ035_BGR | LQ035_REV)
+#define LQ035_DRIVER_OUTPUT_DEFAULT     (0x2AEF & ~LQ035_DRIVER_OUTPUT_MASK)
+
+#define LQ035_SHUT                      (1 << 0)        /* Shutdown */
+#define LQ035_ON                        (0 << 0)        /* Shutdown */
+
+struct bfin_lq035q1fb_info {
+        struct fb_info *fb;
+        struct device *dev;
+        struct spi_driver spidrv;
+        struct bfin_lq035q1fb_disp_info *disp_info;
+        unsigned char *fb_buffer;       /* RGB Buffer */
+        dma_addr_t dma_handle;
+        int lq035_open_cnt;
+        int irq;
+        spinlock_t lock;        /* lock */
+        u32 pseudo_pal[16];
+};
+
+static int nocursor;
+module_param(nocursor, int, 0644);
+MODULE_PARM_DESC(nocursor, "cursor enable/disable");
+
+struct spi_control {
+        unsigned short mode;
+};
+
+static int lq035q1_control(struct spi_device *spi, unsigned char reg, unsigned short value)
+{
+        int ret;
+        u8 regs[3] = { LQ035_INDEX, 0, 0 };
+        u8 dat[3] = { LQ035_DATA, 0, 0 };
+
+        if (!spi)
+                return -ENODEV;
+
+        regs[2] = reg;
+        dat[1] = value >> 8;
+        dat[2] = value & 0xFF;
+
+        ret = spi_write(spi, regs, ARRAY_SIZE(regs));
+        ret |= spi_write(spi, dat, ARRAY_SIZE(dat));
+        return ret;
+}
+
+static int __devinit lq035q1_spidev_probe(struct spi_device *spi)
+{
+        int ret;
+        struct spi_control *ctl;
+        struct bfin_lq035q1fb_info *info = container_of(spi->dev.driver,
+                                                struct bfin_lq035q1fb_info,
+                                                spidrv.driver);
+
+        ctl = kzalloc(sizeof(*ctl), GFP_KERNEL);
+
+        if (!ctl)
+                return -ENOMEM;
+
+        ctl->mode = (info->disp_info->mode &
+                LQ035_DRIVER_OUTPUT_MASK) | LQ035_DRIVER_OUTPUT_DEFAULT;
+
+        ret = lq035q1_control(spi, LQ035_SHUT_CTL, LQ035_ON);
+        ret |= lq035q1_control(spi, LQ035_DRIVER_OUTPUT_CTL, ctl->mode);
+        if (ret)
+                return ret;
+
+        spi_set_drvdata(spi, ctl);
+
+        return 0;
+}
+
+static int lq035q1_spidev_remove(struct spi_device *spi)
+{
+        return lq035q1_control(spi, LQ035_SHUT_CTL, LQ035_SHUT);
+}
+
+#ifdef CONFIG_PM
+static int lq035q1_spidev_suspend(struct spi_device *spi, pm_message_t state)
+{
+        return lq035q1_control(spi, LQ035_SHUT_CTL, LQ035_SHUT);
+}
+
+static int lq035q1_spidev_resume(struct spi_device *spi)
+{
+        int ret;
+        struct spi_control *ctl = spi_get_drvdata(spi);
+
+        ret = lq035q1_control(spi, LQ035_DRIVER_OUTPUT_CTL, ctl->mode);
+        if (ret)
+                return ret;
+
+        return lq035q1_control(spi, LQ035_SHUT_CTL, LQ035_ON);
+}
+#else
+# define lq035q1_spidev_suspend NULL
+# define lq035q1_spidev_resume  NULL
+#endif
+
+/* Power down all displays on reboot, poweroff or halt */
+static void lq035q1_spidev_shutdown(struct spi_device *spi)
+{
+        lq035q1_control(spi, LQ035_SHUT_CTL, LQ035_SHUT);
+}
+
+static int lq035q1_backlight(struct bfin_lq035q1fb_info *info, unsigned arg)
+{
+        if (info->disp_info->use_bl)
+                gpio_set_value(info->disp_info->gpio_bl, arg);
+
+        return 0;
+}
+
+static void bfin_lq035q1_config_ppi(struct bfin_lq035q1fb_info *fbi)
+{
+        bfin_write_PPI_DELAY(H_START);
+        bfin_write_PPI_COUNT(H_ACTPIX - 1);
+        bfin_write_PPI_FRAME(V_LINES);
+
+        bfin_write_PPI_CONTROL(PPI_TX_MODE |       /* output mode , PORT_DIR */
+                                PPI_XFER_TYPE_11 | /* sync mode XFR_TYPE */
+                                PPI_PORT_CFG_01 |  /* two frame sync PORT_CFG */
+                                PPI_PMODE |        /* 8/16 bit data length / PACK_EN? */
+                                PPI_POLS_1);       /* faling edge syncs POLS */
+}
+
+static inline void bfin_lq035q1_disable_ppi(void)
+{
+        bfin_write_PPI_CONTROL(bfin_read_PPI_CONTROL() & ~PORT_EN);
+}
+
+static inline void bfin_lq035q1_enable_ppi(void)
+{
+        bfin_write_PPI_CONTROL(bfin_read_PPI_CONTROL() | PORT_EN);
+}
+
+static void bfin_lq035q1_start_timers(void)
+{
+        enable_gptimers(TIMER_VSYNCbit | TIMER_HSYNCbit);
+}
+
+static void bfin_lq035q1_stop_timers(void)
+{
+        disable_gptimers(TIMER_HSYNCbit | TIMER_VSYNCbit);
+
+        set_gptimer_status(0, TIMER_HSYNC_STATUS_TRUN | TIMER_VSYNC_STATUS_TRUN |
+                                TIMER_HSYNC_STATUS_TIMIL | TIMER_VSYNC_STATUS_TIMIL |
+                                 TIMER_HSYNC_STATUS_TOVF | TIMER_VSYNC_STATUS_TOVF);
+
+}
+
+static void bfin_lq035q1_init_timers(void)
+{
+
+        bfin_lq035q1_stop_timers();
+
+        set_gptimer_period(TIMER_HSYNC_id, H_PERIOD);
+        set_gptimer_pwidth(TIMER_HSYNC_id, H_PULSE);
+        set_gptimer_config(TIMER_HSYNC_id, TIMER_MODE_PWM | TIMER_PERIOD_CNT |
+                                      TIMER_TIN_SEL | TIMER_CLK_SEL|
+                                      TIMER_EMU_RUN);
+
+        set_gptimer_period(TIMER_VSYNC_id, V_PERIOD);
+        set_gptimer_pwidth(TIMER_VSYNC_id, V_PULSE);
+        set_gptimer_config(TIMER_VSYNC_id, TIMER_MODE_PWM | TIMER_PERIOD_CNT |
+                                      TIMER_TIN_SEL | TIMER_CLK_SEL |
+                                      TIMER_EMU_RUN);
+
+}
+
+static void bfin_lq035q1_config_dma(struct bfin_lq035q1fb_info *fbi)
+{
+
+        set_dma_config(CH_PPI,
+                       set_bfin_dma_config(DIR_READ, DMA_FLOW_AUTO,
+                                           INTR_DISABLE, DIMENSION_2D,
+                                           DATA_SIZE_16,
+                                           DMA_NOSYNC_KEEP_DMA_BUF));
+        set_dma_x_count(CH_PPI, (LCD_X_RES * LCD_BPP) / DMA_BUS_SIZE);
+        set_dma_x_modify(CH_PPI, DMA_BUS_SIZE / 8);
+        set_dma_y_count(CH_PPI, V_LINES);
+
+        set_dma_y_modify(CH_PPI, DMA_BUS_SIZE / 8);
+        set_dma_start_addr(CH_PPI, (unsigned long)fbi->fb_buffer);
+
+}
+
+#if (CLOCKS_PER_PIX == 1)
+static const u16 ppi0_req_16[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,
+                            P_PPI0_D0, P_PPI0_D1, P_PPI0_D2,
+                            P_PPI0_D3, P_PPI0_D4, P_PPI0_D5,
+                            P_PPI0_D6, P_PPI0_D7, P_PPI0_D8,
+                            P_PPI0_D9, P_PPI0_D10, P_PPI0_D11,
+                            P_PPI0_D12, P_PPI0_D13, P_PPI0_D14,
+                            P_PPI0_D15, 0};
+#else
+static const u16 ppi0_req_16[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,
+                            P_PPI0_D0, P_PPI0_D1, P_PPI0_D2,
+                            P_PPI0_D3, P_PPI0_D4, P_PPI0_D5,
+                            P_PPI0_D6, P_PPI0_D7, 0};
+#endif
+
+static inline void bfin_lq035q1_free_ports(void)
+{
+        peripheral_free_list(ppi0_req_16);
+        if (ANOMALY_05000400)
+                gpio_free(P_IDENT(P_PPI0_FS3));
+}
+
+static int __devinit bfin_lq035q1_request_ports(struct platform_device *pdev)
+{
+        /* ANOMALY_05000400 - PPI Does Not Start Properly In Specific Mode:
+         * Drive PPI_FS3 Low
+         */
+        if (ANOMALY_05000400) {
+                int ret = gpio_request(P_IDENT(P_PPI0_FS3), "PPI_FS3");
+                if (ret)
+                        return ret;
+                gpio_direction_output(P_IDENT(P_PPI0_FS3), 0);
+        }
+
+        if (peripheral_request_list(ppi0_req_16, DRIVER_NAME)) {
+                dev_err(&pdev->dev, "requesting peripherals failed\n");
+                return -EFAULT;
+        }
+
+        return 0;
+}
+
+static int bfin_lq035q1_fb_open(struct fb_info *info, int user)
+{
+        struct bfin_lq035q1fb_info *fbi = info->par;
+
+        spin_lock(&fbi->lock);
+        fbi->lq035_open_cnt++;
+
+        if (fbi->lq035_open_cnt <= 1) {
+
+                bfin_lq035q1_disable_ppi();
+                SSYNC();
+
+                bfin_lq035q1_config_dma(fbi);
+                bfin_lq035q1_config_ppi(fbi);
+                bfin_lq035q1_init_timers();
+
+                /* start dma */
+                enable_dma(CH_PPI);
+                bfin_lq035q1_enable_ppi();
+                bfin_lq035q1_start_timers();
+                lq035q1_backlight(fbi, 1);
+        }
+
+        spin_unlock(&fbi->lock);
+
+        return 0;
+}
+
+static int bfin_lq035q1_fb_release(struct fb_info *info, int user)
+{
+        struct bfin_lq035q1fb_info *fbi = info->par;
+
+        spin_lock(&fbi->lock);
+
+        fbi->lq035_open_cnt--;
+
+        if (fbi->lq035_open_cnt <= 0) {
+                lq035q1_backlight(fbi, 0);
+                bfin_lq035q1_disable_ppi();
+                SSYNC();
+                disable_dma(CH_PPI);
+                bfin_lq035q1_stop_timers();
+        }
+
+        spin_unlock(&fbi->lock);
+
+        return 0;
+}
+
+static int bfin_lq035q1_fb_check_var(struct fb_var_screeninfo *var,
+                                     struct fb_info *info)
+{
+        switch (var->bits_per_pixel) {
+#if (LCD_BPP == 24)
+        case 24:/* TRUECOLOUR, 16m */
+#else
+        case 16:/* DIRECTCOLOUR, 64k */
+#endif
+                var->red.offset = info->var.red.offset;
+                var->green.offset = info->var.green.offset;
+                var->blue.offset = info->var.blue.offset;
+                var->red.length = info->var.red.length;
+                var->green.length = info->var.green.length;
+                var->blue.length = info->var.blue.length;
+                var->transp.offset = 0;
+                var->transp.length = 0;
+                var->transp.msb_right = 0;
+                var->red.msb_right = 0;
+                var->green.msb_right = 0;
+                var->blue.msb_right = 0;
+                break;
+        default:
+                pr_debug("%s: depth not supported: %u BPP\n", __func__,
+                         var->bits_per_pixel);
+                return -EINVAL;
+        }
+
+        if (info->var.xres != var->xres || info->var.yres != var->yres ||
+            info->var.xres_virtual != var->xres_virtual ||
+            info->var.yres_virtual != var->yres_virtual) {
+                pr_debug("%s: Resolution not supported: X%u x Y%u \n",
+                         __func__, var->xres, var->yres);
+                return -EINVAL;
+        }
+
+        /*
+         *  Memory limit
+         */
+
+        if ((info->fix.line_length * var->yres_virtual) > info->fix.smem_len) {
+                pr_debug("%s: Memory Limit requested yres_virtual = %u\n",
+                         __func__, var->yres_virtual);
+                return -ENOMEM;
+        }
+
+
+        return 0;
+}
+
+int bfin_lq035q1_fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
+{
+        if (nocursor)
+                return 0;
+        else
+                return -EINVAL; /* just to force soft_cursor() call */
+}
+
+static int bfin_lq035q1_fb_setcolreg(u_int regno, u_int red, u_int green,
+                                   u_int blue, u_int transp,
+                                   struct fb_info *info)
+{
+        if (regno >= BFIN_LCD_NBR_PALETTE_ENTRIES)
+                return -EINVAL;
+
+        if (info->var.grayscale) {
+                /* grayscale = 0.30*R + 0.59*G + 0.11*B */
+                red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;
+        }
+
+        if (info->fix.visual == FB_VISUAL_TRUECOLOR) {
+
+                u32 value;
+                /* Place color in the pseudopalette */
+                if (regno > 16)
+                        return -EINVAL;
+
+                red >>= (16 - info->var.red.length);
+                green >>= (16 - info->var.green.length);
+                blue >>= (16 - info->var.blue.length);
+
+                value = (red << info->var.red.offset) |
+                    (green << info->var.green.offset) |
+                    (blue << info->var.blue.offset);
+                value &= 0xFFFFFF;
+
+                ((u32 *) (info->pseudo_palette))[regno] = value;
+
+        }
+
+        return 0;
+}
+
+static struct fb_ops bfin_lq035q1_fb_ops = {
+        .owner = THIS_MODULE,
+        .fb_open = bfin_lq035q1_fb_open,
+        .fb_release = bfin_lq035q1_fb_release,
+        .fb_check_var = bfin_lq035q1_fb_check_var,
+        .fb_fillrect = cfb_fillrect,
+        .fb_copyarea = cfb_copyarea,
+        .fb_imageblit = cfb_imageblit,
+        .fb_cursor = bfin_lq035q1_fb_cursor,
+        .fb_setcolreg = bfin_lq035q1_fb_setcolreg,
+};
+
+static irqreturn_t bfin_lq035q1_irq_error(int irq, void *dev_id)
+{
+        /*struct bfin_lq035q1fb_info *info = (struct bfin_lq035q1fb_info *)dev_id;*/
+
+        u16 status = bfin_read_PPI_STATUS();
+        bfin_write_PPI_STATUS(-1);
+
+        if (status) {
+                bfin_lq035q1_disable_ppi();
+                disable_dma(CH_PPI);
+
+                /* start dma */
+                enable_dma(CH_PPI);
+                bfin_lq035q1_enable_ppi();
+                bfin_write_PPI_STATUS(-1);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static int __devinit bfin_lq035q1_probe(struct platform_device *pdev)
+{
+        struct bfin_lq035q1fb_info *info;
+        struct fb_info *fbinfo;
+        int ret;
+
+        ret = request_dma(CH_PPI, DRIVER_NAME"_CH_PPI");
+        if (ret < 0) {
+                dev_err(&pdev->dev, "PPI DMA unavailable\n");
+                goto out1;
+        }
+
+        fbinfo = framebuffer_alloc(sizeof(*info), &pdev->dev);
+        if (!fbinfo) {
+                ret = -ENOMEM;
+                goto out2;
+        }
+
+        info = fbinfo->par;
+        info->fb = fbinfo;
+        info->dev = &pdev->dev;
+
+        info->disp_info = pdev->dev.platform_data;
+
+        platform_set_drvdata(pdev, fbinfo);
+
+        strcpy(fbinfo->fix.id, DRIVER_NAME);
+
+        fbinfo->fix.type = FB_TYPE_PACKED_PIXELS;
+        fbinfo->fix.type_aux = 0;
+        fbinfo->fix.xpanstep = 0;
+        fbinfo->fix.ypanstep = 0;
+        fbinfo->fix.ywrapstep = 0;
+        fbinfo->fix.accel = FB_ACCEL_NONE;
+        fbinfo->fix.visual = FB_VISUAL_TRUECOLOR;
+
+        fbinfo->var.nonstd = 0;
+        fbinfo->var.activate = FB_ACTIVATE_NOW;
+        fbinfo->var.height = -1;
+        fbinfo->var.width = -1;
+        fbinfo->var.accel_flags = 0;
+        fbinfo->var.vmode = FB_VMODE_NONINTERLACED;
+
+        fbinfo->var.xres = LCD_X_RES;
+        fbinfo->var.xres_virtual = LCD_X_RES;
+        fbinfo->var.yres = LCD_Y_RES;
+        fbinfo->var.yres_virtual = LCD_Y_RES;
+        fbinfo->var.bits_per_pixel = LCD_BPP;
+
+        if (info->disp_info->mode & LQ035_BGR) {
+#if (LCD_BPP == 24)
+                fbinfo->var.red.offset = 0;
+                fbinfo->var.green.offset = 8;
+                fbinfo->var.blue.offset = 16;
+#else
+                fbinfo->var.red.offset = 0;
+                fbinfo->var.green.offset = 5;
+                fbinfo->var.blue.offset = 11;
+#endif
+        } else {
+#if (LCD_BPP == 24)
+                fbinfo->var.red.offset = 16;
+                fbinfo->var.green.offset = 8;
+                fbinfo->var.blue.offset = 0;
+#else
+                fbinfo->var.red.offset = 11;
+                fbinfo->var.green.offset = 5;
+                fbinfo->var.blue.offset = 0;
+#endif
+        }
+
+        fbinfo->var.transp.offset = 0;
+
+#if (LCD_BPP == 24)
+        fbinfo->var.red.length = 8;
+        fbinfo->var.green.length = 8;
+        fbinfo->var.blue.length = 8;
+#else
+        fbinfo->var.red.length = 5;
+        fbinfo->var.green.length = 6;
+        fbinfo->var.blue.length = 5;
+#endif
+
+        fbinfo->var.transp.length = 0;
+
+        fbinfo->fix.smem_len = LCD_X_RES * LCD_Y_RES * LCD_BPP / 8
+                                + ACTIVE_VIDEO_MEM_OFFSET;
+
+        fbinfo->fix.line_length = fbinfo->var.xres_virtual *
+            fbinfo->var.bits_per_pixel / 8;
+
+
+        fbinfo->fbops = &bfin_lq035q1_fb_ops;
+        fbinfo->flags = FBINFO_FLAG_DEFAULT;
+
+        info->fb_buffer =
+            dma_alloc_coherent(NULL, fbinfo->fix.smem_len, &info->dma_handle,
+                               GFP_KERNEL);
+
+        if (NULL == info->fb_buffer) {
+                dev_err(&pdev->dev, "couldn't allocate dma buffer\n");
+                ret = -ENOMEM;
+                goto out3;
+        }
+
+        fbinfo->screen_base = (void *)info->fb_buffer + ACTIVE_VIDEO_MEM_OFFSET;
+        fbinfo->fix.smem_start = (int)info->fb_buffer + ACTIVE_VIDEO_MEM_OFFSET;
+
+        fbinfo->fbops = &bfin_lq035q1_fb_ops;
+
+        fbinfo->pseudo_palette = &info->pseudo_pal;
+
+        ret = fb_alloc_cmap(&fbinfo->cmap, BFIN_LCD_NBR_PALETTE_ENTRIES, 0);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "failed to allocate colormap (%d entries)\n",
+                       BFIN_LCD_NBR_PALETTE_ENTRIES);
+                goto out4;
+        }
+
+        ret = bfin_lq035q1_request_ports(pdev);
+        if (ret) {
+                dev_err(&pdev->dev, "couldn't request gpio port\n");
+                goto out6;
+        }
+
+        info->irq = platform_get_irq(pdev, 0);
+        if (info->irq < 0) {
+                ret = -EINVAL;
+                goto out7;
+        }
+
+        ret = request_irq(info->irq, bfin_lq035q1_irq_error, IRQF_DISABLED,
+                        DRIVER_NAME" PPI ERROR", info);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "unable to request PPI ERROR IRQ\n");
+                goto out7;
+        }
+
+        info->spidrv.driver.name = DRIVER_NAME"-spi";
+        info->spidrv.probe    = lq035q1_spidev_probe;
+        info->spidrv.remove   = __devexit_p(lq035q1_spidev_remove);
+        info->spidrv.shutdown = lq035q1_spidev_shutdown;
+        info->spidrv.suspend  = lq035q1_spidev_suspend;
+        info->spidrv.resume   = lq035q1_spidev_resume;
+
+        ret = spi_register_driver(&info->spidrv);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "couldn't register SPI Interface\n");
+                goto out8;
+        }
+
+        if (info->disp_info->use_bl) {
+                ret = gpio_request(info->disp_info->gpio_bl, "LQ035 Backlight");
+
+                if (ret) {
+                        dev_err(&pdev->dev, "failed to request GPIO %d\n",
+                                info->disp_info->gpio_bl);
+                        goto out9;
+                }
+                gpio_direction_output(info->disp_info->gpio_bl, 0);
+        }
+
+        ret = register_framebuffer(fbinfo);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "unable to register framebuffer\n");
+                goto out10;
+        }
+
+        dev_info(&pdev->dev, "%dx%d %d-bit RGB FrameBuffer initialized\n",
+                LCD_X_RES, LCD_Y_RES, LCD_BPP);
+
+        return 0;
+
+ out10:
+        if (info->disp_info->use_bl)
+                gpio_free(info->disp_info->gpio_bl);
+ out9:
+        spi_unregister_driver(&info->spidrv);
+ out8:
+        free_irq(info->irq, info);
+ out7:
+        bfin_lq035q1_free_ports();
+ out6:
+        fb_dealloc_cmap(&fbinfo->cmap);
+ out4:
+        dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
+                          info->dma_handle);
+ out3:
+        framebuffer_release(fbinfo);
+ out2:
+        free_dma(CH_PPI);
+ out1:
+        platform_set_drvdata(pdev, NULL);
+
+        return ret;
+}
+
+static int __devexit bfin_lq035q1_remove(struct platform_device *pdev)
+{
+        struct fb_info *fbinfo = platform_get_drvdata(pdev);
+        struct bfin_lq035q1fb_info *info = fbinfo->par;
+
+        if (info->disp_info->use_bl)
+                gpio_free(info->disp_info->gpio_bl);
+
+        spi_unregister_driver(&info->spidrv);
+
+        unregister_framebuffer(fbinfo);
+
+        free_dma(CH_PPI);
+        free_irq(info->irq, info);
+
+        if (info->fb_buffer != NULL)
+                dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
+                                  info->dma_handle);
+
+        fb_dealloc_cmap(&fbinfo->cmap);
+
+        bfin_lq035q1_free_ports();
+
+        platform_set_drvdata(pdev, NULL);
+        framebuffer_release(fbinfo);
+
+        dev_info(&pdev->dev, "unregistered LCD driver\n");
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int bfin_lq035q1_suspend(struct device *dev)
+{
+        struct fb_info *fbinfo = dev_get_drvdata(dev);
+        struct bfin_lq035q1fb_info *info = fbinfo->par;
+
+        if (info->lq035_open_cnt) {
+                lq035q1_backlight(info, 0);
+                bfin_lq035q1_disable_ppi();
+                SSYNC();
+                disable_dma(CH_PPI);
+                bfin_lq035q1_stop_timers();
+                bfin_write_PPI_STATUS(-1);
+        }
+
+        return 0;
+}
+
+static int bfin_lq035q1_resume(struct device *dev)
+{
+        struct fb_info *fbinfo = dev_get_drvdata(dev);
+        struct bfin_lq035q1fb_info *info = fbinfo->par;
+
+        if (info->lq035_open_cnt) {
+                bfin_lq035q1_disable_ppi();
+                SSYNC();
+
+                bfin_lq035q1_config_dma(info);
+                bfin_lq035q1_config_ppi(info);
+                bfin_lq035q1_init_timers();
+
+                /* start dma */
+                enable_dma(CH_PPI);
+                bfin_lq035q1_enable_ppi();
+                bfin_lq035q1_start_timers();
+                lq035q1_backlight(info, 1);
+        }
+
+        return 0;
+}
+
+static struct dev_pm_ops bfin_lq035q1_dev_pm_ops = {
+        .suspend = bfin_lq035q1_suspend,
+        .resume  = bfin_lq035q1_resume,
+};
+#endif
+
+static struct platform_driver bfin_lq035q1_driver = {
+        .probe   = bfin_lq035q1_probe,
+        .remove  = __devexit_p(bfin_lq035q1_remove),
+        .driver = {
+                .name = DRIVER_NAME,
+#ifdef CONFIG_PM
+                .pm   = &bfin_lq035q1_dev_pm_ops,
+#endif
+        },
+};
+
+static int __init bfin_lq035q1_driver_init(void)
+{
+        return platform_driver_register(&bfin_lq035q1_driver);
+}
+module_init(bfin_lq035q1_driver_init);
+
+static void __exit bfin_lq035q1_driver_cleanup(void)
+{
+        platform_driver_unregister(&bfin_lq035q1_driver);
+}
+module_exit(bfin_lq035q1_driver_cleanup);
+
+MODULE_DESCRIPTION("Blackfin TFT LCD Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c
index 5cc36cfbf07b..2549c53b26a0 100644
--- a/drivers/video/bfin-t350mcqb-fb.c
+++ b/drivers/video/bfin-t350mcqb-fb.c
@@ -487,8 +487,8 @@ static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev)
 
         fbinfo->var.nonstd = 0;
         fbinfo->var.activate = FB_ACTIVATE_NOW;
-        fbinfo->var.height = -1;
-        fbinfo->var.width = -1;
+        fbinfo->var.height = 53;
+        fbinfo->var.width = 70;
         fbinfo->var.accel_flags = 0;
         fbinfo->var.vmode = FB_VMODE_NONINTERLACED;
 
@@ -634,17 +634,35 @@ static int __devexit bfin_t350mcqb_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int bfin_t350mcqb_suspend(struct platform_device *pdev, pm_message_t state)
 {
-        bfin_t350mcqb_disable_ppi();
-        disable_dma(CH_PPI);
-        bfin_write_PPI_STATUS(0xFFFF);
+        struct fb_info *fbinfo = platform_get_drvdata(pdev);
+        struct bfin_t350mcqbfb_info *fbi = fbinfo->par;
+
+        if (fbi->lq043_open_cnt) {
+                bfin_t350mcqb_disable_ppi();
+                disable_dma(CH_PPI);
+                bfin_t350mcqb_stop_timers();
+                bfin_write_PPI_STATUS(-1);
+        }
+
 
         return 0;
 }
 
 static int bfin_t350mcqb_resume(struct platform_device *pdev)
 {
-        enable_dma(CH_PPI);
-        bfin_t350mcqb_enable_ppi();
+        struct fb_info *fbinfo = platform_get_drvdata(pdev);
+        struct bfin_t350mcqbfb_info *fbi = fbinfo->par;
+
+        if (fbi->lq043_open_cnt) {
+                bfin_t350mcqb_config_dma(fbi);
+                bfin_t350mcqb_config_ppi(fbi);
+                bfin_t350mcqb_init_timers();
+
+                /* start dma */
+                enable_dma(CH_PPI);
+                bfin_t350mcqb_enable_ppi();
+                bfin_t350mcqb_start_timers();
+        }
 
         return 0;
 }
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c
index 16f5db471ab5..99b354b8e257 100644
--- a/drivers/video/clps711xfb.c
+++ b/drivers/video/clps711xfb.c
@@ -19,8 +19,10 @@
  *
  *  Framebuffer driver for the CLPS7111 and EP7212 processors.
  */
+#include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/fb.h>
 #include <linux/init.h>
@@ -38,14 +40,6 @@ struct fb_info	*cfb;
 
 #define CMAP_MAX_SIZE   16
 
-/* The /proc entry for the backlight. */
-static struct proc_dir_entry *clps7111fb_backlight_proc_entry = NULL;
-
-static int clps7111fb_proc_backlight_read(char *page, char **start, off_t off,
-                int count, int *eof, void *data);
-static int clps7111fb_proc_backlight_write(struct file *file, 
-                const char *buffer, unsigned long count, void *data);
-
 /*
  * LCD AC Prescale.  This comes from the LCD panel manufacturers specifications.
  * This determines how many clocks + 1 of CL1 before the M signal toggles.
@@ -221,26 +215,23 @@ static struct fb_ops clps7111fb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
-static int 
-clps7111fb_proc_backlight_read(char *page, char **start, off_t off,
-                int count, int *eof, void *data)
+static int backlight_proc_show(struct seq_file *m, void *v)
 {
-        /* We need at least two characters, one for the digit, and one for
-         * the terminating NULL. */
-        if (count < 2) 
-                return -EINVAL;
-
         if (machine_is_edb7211()) {
-                return sprintf(page, "%d\n", 
+                seq_printf(m, "%d\n",
                                 (clps_readb(PDDR) & EDB_PD3_LCDBL) ? 1 : 0);
         }
 
         return 0;
 }
 
-static int 
-clps7111fb_proc_backlight_write(struct file *file, const char *buffer, 
-                unsigned long count, void *data)
+static int backlight_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, backlight_proc_show, NULL);
+}
+
+static ssize_t backlight_proc_write(struct file *file, const char *buffer,
+                                    size_t count, loff_t *pos)
 {
         unsigned char char_value;
         int value;
@@ -271,6 +262,15 @@ clps7111fb_proc_backlight_write(struct file *file, const char *buffer,
         return count;
 }
 
+static const struct file_operations backlight_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = backlight_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = backlight_proc_write,
+};
+
 static void __init clps711x_guess_lcd_params(struct fb_info *info)
 {
         unsigned int lcdcon, syscon, size;
@@ -379,19 +379,11 @@ int __init clps711xfb_init(void)
 
         fb_alloc_cmap(&cfb->cmap, CMAP_MAX_SIZE, 0);
 
-        /* Register the /proc entries. */
-        clps7111fb_backlight_proc_entry = create_proc_entry("backlight", 0444,
-                NULL);
-        if (clps7111fb_backlight_proc_entry == NULL) {
+        if (!proc_create("backlight", 0444, NULL, &backlight_proc_fops)) {
                 printk("Couldn't create the /proc entry for the backlight.\n");
                 return -EINVAL;
         }
 
-        clps7111fb_backlight_proc_entry->read_proc = 
-                &clps7111fb_proc_backlight_read;
-        clps7111fb_backlight_proc_entry->write_proc = 
-                &clps7111fb_proc_backlight_write;
-
         /*
          * Power up the LCD
          */
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index ea1fd3f47511..369a5b3ac649 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -28,6 +28,8 @@
 #include <linux/uaccess.h>
 #include <linux/interrupt.h>
 #include <linux/clk.h>
+#include <linux/cpufreq.h>
+#include <linux/console.h>
 #include <video/da8xx-fb.h>
 
 #define DRIVER_NAME "da8xx_lcdc"
@@ -113,6 +115,12 @@ struct da8xx_fb_par {
         unsigned short pseudo_palette[16];
         unsigned int databuf_sz;
         unsigned int palette_sz;
+        unsigned int pxl_clk;
+        int blank;
+#ifdef CONFIG_CPU_FREQ
+        struct notifier_block   freq_transition;
+#endif
+        void (*panel_power_ctrl)(int);
 };
 
 /* Variable Screen Information */
@@ -155,7 +163,7 @@ struct da8xx_panel {
         int             vfp;            /* Vertical front porch */
         int             vbp;            /* Vertical back porch */
         int             vsw;            /* Vertical Sync Pulse Width */
-        int             pxl_clk;        /* Pixel clock */
+        unsigned int    pxl_clk;        /* Pixel clock */
         unsigned char   invert_pxl_clk; /* Invert Pixel clock */
 };
 
@@ -171,7 +179,7 @@ static struct da8xx_panel known_lcd_panels[] = {
                 .vfp = 2,
                 .vbp = 2,
                 .vsw = 0,
-                .pxl_clk = 0x10,
+                .pxl_clk = 4608000,
                 .invert_pxl_clk = 1,
         },
         /* Sharp LK043T1DG01 */
@@ -185,13 +193,23 @@ static struct da8xx_panel known_lcd_panels[] = {
                 .vfp = 2,
                 .vbp = 2,
                 .vsw = 10,
-                .pxl_clk = 0x12,
+                .pxl_clk = 7833600,
                 .invert_pxl_clk = 0,
         },
 };
 
+/* Enable the Raster Engine of the LCD Controller */
+static inline void lcd_enable_raster(void)
+{
+        u32 reg;
+
+        reg = lcdc_read(LCD_RASTER_CTRL_REG);
+        if (!(reg & LCD_RASTER_ENABLE))
+                lcdc_write(reg | LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
+}
+
 /* Disable the Raster Engine of the LCD Controller */
-static void lcd_disable_raster(struct da8xx_fb_par *par)
+static inline void lcd_disable_raster(void)
 {
         u32 reg;
 
@@ -443,14 +461,25 @@ static int fb_setcolreg(unsigned regno, unsigned red, unsigned green,
 static void lcd_reset(struct da8xx_fb_par *par)
 {
         /* Disable the Raster if previously Enabled */
-        if (lcdc_read(LCD_RASTER_CTRL_REG) & LCD_RASTER_ENABLE)
-                lcd_disable_raster(par);
+        lcd_disable_raster();
 
         /* DMA has to be disabled */
         lcdc_write(0, LCD_DMA_CTRL_REG);
         lcdc_write(0, LCD_RASTER_CTRL_REG);
 }
 
+static void lcd_calc_clk_divider(struct da8xx_fb_par *par)
+{
+        unsigned int lcd_clk, div;
+
+        lcd_clk = clk_get_rate(par->lcdc_clk);
+        div = lcd_clk / par->pxl_clk;
+
+        /* Configure the LCD clock divisor. */
+        lcdc_write(LCD_CLK_DIVISOR(div) |
+                        (LCD_RASTER_MODE & 0x1), LCD_CTRL_REG);
+}
+
 static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
                 struct da8xx_panel *panel)
 {
@@ -459,9 +488,8 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
 
         lcd_reset(par);
 
-        /* Configure the LCD clock divisor. */
-        lcdc_write(LCD_CLK_DIVISOR(panel->pxl_clk) |
-                        (LCD_RASTER_MODE & 0x1), LCD_CTRL_REG);
+        /* Calculate the divider */
+        lcd_calc_clk_divider(par);
 
         if (panel->invert_pxl_clk)
                 lcdc_write((lcdc_read(LCD_RASTER_TIMING_2_REG) |
@@ -513,13 +541,11 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
 static irqreturn_t lcdc_irq_handler(int irq, void *arg)
 {
         u32 stat = lcdc_read(LCD_STAT_REG);
-        u32 reg;
 
         if ((stat & LCD_SYNC_LOST) && (stat & LCD_FIFO_UNDERFLOW)) {
-                reg = lcdc_read(LCD_RASTER_CTRL_REG);
-                lcdc_write(reg & ~LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
+                lcd_disable_raster();
                 lcdc_write(stat, LCD_STAT_REG);
-                lcdc_write(reg | LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
+                lcd_enable_raster();
         } else
                 lcdc_write(stat, LCD_STAT_REG);
 
@@ -574,6 +600,38 @@ static int fb_check_var(struct fb_var_screeninfo *var,
         return err;
 }
 
+#ifdef CONFIG_CPU_FREQ
+static int lcd_da8xx_cpufreq_transition(struct notifier_block *nb,
+                                     unsigned long val, void *data)
+{
+        struct da8xx_fb_par *par;
+
+        par = container_of(nb, struct da8xx_fb_par, freq_transition);
+        if (val == CPUFREQ_PRECHANGE) {
+                lcd_disable_raster();
+        } else if (val == CPUFREQ_POSTCHANGE) {
+                lcd_calc_clk_divider(par);
+                lcd_enable_raster();
+        }
+
+        return 0;
+}
+
+static inline int lcd_da8xx_cpufreq_register(struct da8xx_fb_par *par)
+{
+        par->freq_transition.notifier_call = lcd_da8xx_cpufreq_transition;
+
+        return cpufreq_register_notifier(&par->freq_transition,
+                                         CPUFREQ_TRANSITION_NOTIFIER);
+}
+
+static inline void lcd_da8xx_cpufreq_deregister(struct da8xx_fb_par *par)
+{
+        cpufreq_unregister_notifier(&par->freq_transition,
+                                    CPUFREQ_TRANSITION_NOTIFIER);
+}
+#endif
+
 static int __devexit fb_remove(struct platform_device *dev)
 {
         struct fb_info *info = dev_get_drvdata(&dev->dev);
@@ -581,8 +639,13 @@ static int __devexit fb_remove(struct platform_device *dev)
         if (info) {
                 struct da8xx_fb_par *par = info->par;
 
-                if (lcdc_read(LCD_RASTER_CTRL_REG) & LCD_RASTER_ENABLE)
-                        lcd_disable_raster(par);
+#ifdef CONFIG_CPU_FREQ
+                lcd_da8xx_cpufreq_deregister(par);
+#endif
+                if (par->panel_power_ctrl)
+                        par->panel_power_ctrl(0);
+
+                lcd_disable_raster();
                 lcdc_write(0, LCD_RASTER_CTRL_REG);
 
                 /* disable DMA  */
@@ -639,6 +702,35 @@ static int fb_ioctl(struct fb_info *info, unsigned int cmd,
         return 0;
 }
 
+static int cfb_blank(int blank, struct fb_info *info)
+{
+        struct da8xx_fb_par *par = info->par;
+        int ret = 0;
+
+        if (par->blank == blank)
+                return 0;
+
+        par->blank = blank;
+        switch (blank) {
+        case FB_BLANK_UNBLANK:
+                if (par->panel_power_ctrl)
+                        par->panel_power_ctrl(1);
+
+                lcd_enable_raster();
+                break;
+        case FB_BLANK_POWERDOWN:
+                if (par->panel_power_ctrl)
+                        par->panel_power_ctrl(0);
+
+                lcd_disable_raster();
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
 static struct fb_ops da8xx_fb_ops = {
         .owner = THIS_MODULE,
         .fb_check_var = fb_check_var,
@@ -647,6 +739,7 @@ static struct fb_ops da8xx_fb_ops = {
         .fb_fillrect = cfb_fillrect,
         .fb_copyarea = cfb_copyarea,
         .fb_imageblit = cfb_imageblit,
+        .fb_blank = cfb_blank,
 };
 
 static int __init fb_probe(struct platform_device *device)
@@ -721,6 +814,12 @@ static int __init fb_probe(struct platform_device *device)
         }
 
         par = da8xx_fb_info->par;
+        par->lcdc_clk = fb_clk;
+        par->pxl_clk = lcdc_info->pxl_clk;
+        if (fb_pdata->panel_power_ctrl) {
+                par->panel_power_ctrl = fb_pdata->panel_power_ctrl;
+                par->panel_power_ctrl(1);
+        }
 
         if (lcd_init(par, lcd_cfg, lcdc_info) < 0) {
                 dev_err(&device->dev, "lcd_init failed\n");
@@ -754,8 +853,6 @@ static int __init fb_probe(struct platform_device *device)
         da8xx_fb_fix.smem_len = par->databuf_sz - par->palette_sz;
         da8xx_fb_fix.line_length = (lcdc_info->width * lcd_cfg->bpp) / 8;
 
-        par->lcdc_clk = fb_clk;
-
         par->irq = platform_get_irq(device, 0);
         if (par->irq < 0) {
                 ret = -ENOENT;
@@ -814,12 +911,24 @@ static int __init fb_probe(struct platform_device *device)
                 goto err_dealloc_cmap;
         }
 
+#ifdef CONFIG_CPU_FREQ
+        ret = lcd_da8xx_cpufreq_register(par);
+        if (ret) {
+                dev_err(&device->dev, "failed to register cpufreq\n");
+                goto err_cpu_freq;
+        }
+#endif
+
         /* enable raster engine */
-        lcdc_write(lcdc_read(LCD_RASTER_CTRL_REG) |
-                        LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
+        lcd_enable_raster();
 
         return 0;
 
+#ifdef CONFIG_CPU_FREQ
+err_cpu_freq:
+        unregister_framebuffer(da8xx_fb_info);
+#endif
+
 err_dealloc_cmap:
         fb_dealloc_cmap(&da8xx_fb_info->cmap);
 
@@ -852,11 +961,35 @@ err_request_mem:
 #ifdef CONFIG_PM
 static int fb_suspend(struct platform_device *dev, pm_message_t state)
 {
-         return -EBUSY;
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct da8xx_fb_par *par = info->par;
+
+        acquire_console_sem();
+        if (par->panel_power_ctrl)
+                par->panel_power_ctrl(0);
+
+        fb_set_suspend(info, 1);
+        lcd_disable_raster();
+        clk_disable(par->lcdc_clk);
+        release_console_sem();
+
+        return 0;
 }
 static int fb_resume(struct platform_device *dev)
 {
-         return -EBUSY;
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct da8xx_fb_par *par = info->par;
+
+        acquire_console_sem();
+        if (par->panel_power_ctrl)
+                par->panel_power_ctrl(1);
+
+        clk_enable(par->lcdc_clk);
+        lcd_enable_raster();
+        fb_set_suspend(info, 0);
+        release_console_sem();
+
+        return 0;
 }
 #else
 #define fb_suspend NULL
diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c
index 4830b1bf51e5..80abbf323b99 100644
--- a/drivers/video/display/display-sysfs.c
+++ b/drivers/video/display/display-sysfs.c
@@ -67,7 +67,7 @@ static ssize_t display_store_contrast(struct device *dev,
         contrast = simple_strtoul(buf, &endp, 0);
         size = endp - buf;
 
-        if (*endp && isspace(*endp))
+        if (isspace(*endp))
                 size++;
 
         if (size != count)
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index bd9d46f95291..27aab4a06198 100644
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -358,6 +358,8 @@ static int ep93xxfb_setcolreg(unsigned int regno, unsigned int red,
 
         switch (info->fix.visual) {
         case FB_VISUAL_PSEUDOCOLOR:
+                if (regno > 255)
+                        return 1;
                 rgb = ((red & 0xff00) << 8) | (green & 0xff00) |
                         ((blue & 0xff00) >> 8);
 
diff --git a/drivers/video/geode/display_gx.c b/drivers/video/geode/display_gx.c
index e759895bf3d3..f0af911a096d 100644
--- a/drivers/video/geode/display_gx.c
+++ b/drivers/video/geode/display_gx.c
@@ -17,7 +17,7 @@
 #include <asm/io.h>
 #include <asm/div64.h>
 #include <asm/delay.h>
-#include <asm/geode.h>
+#include <linux/cs5535.h>
 
 #include "gxfb.h"
 
@@ -25,7 +25,7 @@ unsigned int gx_frame_buffer_size(void)
 {
         unsigned int val;
 
-        if (!geode_has_vsa2()) {
+        if (!cs5535_has_vsa2()) {
                 uint32_t hi, lo;
 
                 /* The number of pages is (PMAX - PMIN)+1 */
diff --git a/drivers/video/geode/gxfb.h b/drivers/video/geode/gxfb.h
index 16a96f8fd8c5..d19e9378b0c0 100644
--- a/drivers/video/geode/gxfb.h
+++ b/drivers/video/geode/gxfb.h
@@ -340,7 +340,7 @@ static inline void write_fp(struct gxfb_par *par, int reg, uint32_t val)
 }
 
 
-/* MSRs are defined in asm/geode.h; their bitfields are here */
+/* MSRs are defined in linux/cs5535.h; their bitfields are here */
 
 #define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3 (1 << 3)
 #define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2 (1 << 2)
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index 2552cac39e1c..b3e639d1e12c 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -32,7 +32,7 @@
 #include <linux/suspend.h>
 #include <linux/init.h>
 #include <linux/pci.h>
-#include <asm/geode.h>
+#include <linux/cs5535.h>
 
 #include "gxfb.h"
 
diff --git a/drivers/video/geode/lxfb.h b/drivers/video/geode/lxfb.h
index 6a51448fd3f7..cc781c00f75d 100644
--- a/drivers/video/geode/lxfb.h
+++ b/drivers/video/geode/lxfb.h
@@ -1,3 +1,13 @@
+/* Geode LX framebuffer driver
+ *
+ * Copyright (C) 2006-2007, Advanced Micro Devices,Inc.
+ * Copyright (c) 2008  Andres Salomon <dilinger@debian.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
 #ifndef _LXFB_H_
 #define _LXFB_H_
 
@@ -409,7 +419,7 @@ static inline void write_fp(struct lxfb_par *par, int reg, uint32_t val)
 }
 
 
-/* MSRs are defined in asm/geode.h; their bitfields are here */
+/* MSRs are defined in linux/cs5535.h; their bitfields are here */
 
 #define MSR_GLCP_DOTPLL_LOCK            (1 << 25)       /* r/o */
 #define MSR_GLCP_DOTPLL_HALFPIX         (1 << 24)
diff --git a/drivers/video/geode/lxfb_ops.c b/drivers/video/geode/lxfb_ops.c
index b1cd49c99356..0e5d8c7c3eba 100644
--- a/drivers/video/geode/lxfb_ops.c
+++ b/drivers/video/geode/lxfb_ops.c
@@ -13,7 +13,7 @@
 #include <linux/fb.h>
 #include <linux/uaccess.h>
 #include <linux/delay.h>
-#include <asm/geode.h>
+#include <linux/cs5535.h>
 
 #include "lxfb.h"
 
@@ -307,7 +307,7 @@ unsigned int lx_framebuffer_size(void)
 {
         unsigned int val;
 
-        if (!geode_has_vsa2()) {
+        if (!cs5535_has_vsa2()) {
                 uint32_t hi, lo;
 
                 /* The number of pages is (PMAX - PMIN)+1 */
diff --git a/drivers/video/geode/suspend_gx.c b/drivers/video/geode/suspend_gx.c
index 9aff32ef8bb6..1bb043d70c64 100644
--- a/drivers/video/geode/suspend_gx.c
+++ b/drivers/video/geode/suspend_gx.c
@@ -10,7 +10,7 @@
 #include <linux/fb.h>
 #include <asm/io.h>
 #include <asm/msr.h>
-#include <asm/geode.h>
+#include <linux/cs5535.h>
 #include <asm/delay.h>
 
 #include "gxfb.h"
diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c
index b8d52a8360db..6082f653c68a 100644
--- a/drivers/video/geode/video_gx.c
+++ b/drivers/video/geode/video_gx.c
@@ -16,7 +16,7 @@
 #include <asm/io.h>
 #include <asm/delay.h>
 #include <asm/msr.h>
-#include <asm/geode.h>
+#include <linux/cs5535.h>
 
 #include "gxfb.h"
 
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index e7116a6d82d3..73c83a8de2d3 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -456,7 +456,7 @@ static int hitfb_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops hitfb_dev_pm_ops = {
+static const struct dev_pm_ops hitfb_dev_pm_ops = {
         .suspend        = hitfb_suspend,
         .resume         = hitfb_resume,
 };
diff --git a/drivers/video/i810/i810_dvt.c b/drivers/video/i810/i810_dvt.c
index 27fa703a2e0a..b4b3670667ab 100644
--- a/drivers/video/i810/i810_dvt.c
+++ b/drivers/video/i810/i810_dvt.c
@@ -212,24 +212,29 @@ inline void round_off_yres(u32 *xres, u32 *yres)
         *yres = (*xres * 3) >> 2;
 }
 
-void i810fb_encode_registers(const struct fb_var_screeninfo *var,
-                             struct i810fb_par *par, u32 xres, u32 yres)
+static int i810fb_find_best_mode(u32 xres, u32 yres, u32 pixclock)
 { 
         u32 diff = 0, diff_best = 0xFFFFFFFF, i = 0, i_best = 0; 
-        u8 hfl;
+        u8 hfl = (u8) ((xres >> 3) - 1);
 
-        hfl = (u8) ((xres >> 3) - 1);
         for (i = 0; i < ARRAY_SIZE(std_modes); i++) { 
                 if (std_modes[i].cr01 == hfl) { 
-                        if (std_modes[i].pixclock <= par->regs.pixclock)
-                                diff = par->regs.pixclock - 
-                                        std_modes[i].pixclock;
+                        if (std_modes[i].pixclock <= pixclock)
+                                diff = pixclock - std_modes[i].pixclock;
                         if (diff < diff_best) {  
                                 i_best = i;
                                 diff_best = diff;
                         }
                 }
         }
+        return i_best;
+}
+
+void i810fb_encode_registers(const struct fb_var_screeninfo *var,
+                             struct i810fb_par *par, u32 xres, u32 yres)
+{
+        u32 i_best = i810fb_find_best_mode(xres, yres, par->regs.pixclock);
+
         par->regs = std_modes[i_best];
 
         /* overlay */
@@ -239,36 +244,36 @@ void i810fb_encode_registers(const struct fb_var_screeninfo *var,
 
 void i810fb_fill_var_timings(struct fb_var_screeninfo *var)
 {
-        struct i810fb_par par;
         u32 total, xres, yres;
+        u32 mode, pixclock;
 
         xres = var->xres;
         yres = var->yres;
         
-        par.regs.pixclock = 1000000000/var->pixclock;
-        i810fb_encode_registers(var, &par, xres, yres);
+        pixclock = 1000000000 / var->pixclock;
+        mode = i810fb_find_best_mode(xres, yres, pixclock);
         
-        total = ((par.regs.cr00 | (par.regs.cr35 & 1) << 8) + 3) << 3;
+        total = (std_modes[mode].cr00 | (std_modes[mode].cr35 & 1) << 8) + 3;
+        total <<= 3;
         
-        var->pixclock = 1000000000/par.regs.pixclock;
-        var->right_margin = (par.regs.cr04 << 3) - xres;
-        var->hsync_len = ((par.regs.cr05 & 0x1F) - 
-                               (par.regs.cr04 & 0x1F)) << 3;
+        var->pixclock = 1000000000 / std_modes[mode].pixclock;
+        var->right_margin = (std_modes[mode].cr04 << 3) - xres;
+        var->hsync_len = ((std_modes[mode].cr05 & 0x1F) -
+                         (std_modes[mode].cr04 & 0x1F)) << 3;
         var->left_margin = (total - (xres + var->right_margin + 
                                      var->hsync_len));
         var->sync = FB_SYNC_ON_GREEN;
-        if (~(par.regs.msr & (1 << 6)))
+        if (~(std_modes[mode].msr & (1 << 6)))
                 var->sync |= FB_SYNC_HOR_HIGH_ACT;
-        if (~(par.regs.msr & (1 << 7)))
+        if (~(std_modes[mode].msr & (1 << 7)))
                 var->sync |= FB_SYNC_VERT_HIGH_ACT;
 
-
-        total = ((par.regs.cr06 | (par.regs.cr30 & 0x0F)  << 8)) + 2;
-        var->lower_margin = (par.regs.cr10 | 
-                             (par.regs.cr32 & 0x0F) << 8) - yres;
-        var->vsync_len = (par.regs.cr11 & 0x0F) - (var->lower_margin & 0x0F);
-        var->upper_margin = total - (yres + var->lower_margin + 
-                                     var->vsync_len);
+        total = (std_modes[mode].cr06 | (std_modes[mode].cr30 & 0xF)  << 8) + 2;
+        var->lower_margin = (std_modes[mode].cr10 |
+                            (std_modes[mode].cr32 & 0x0F) << 8) - yres;
+        var->vsync_len = (std_modes[mode].cr11 & 0x0F) -
+                         (var->lower_margin & 0x0F);
+        var->upper_margin = total - (yres + var->lower_margin + var->vsync_len);
 }
 
 u32 i810_get_watermark(struct fb_var_screeninfo *var,
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 0cafd642fbc0..5ba399991050 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -874,6 +874,9 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev,
         if (bailearly == 18)
                 bailout(dinfo);
 
+        /* read active pipe */
+        dinfo->pipe = intelfbhw_active_pipe(&dinfo->save_state);
+
         /* Cursor initialisation */
         if (dinfo->hwcursor) {
                 intelfbhw_cursor_init(dinfo);
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index 0689f97c5238..81627466804e 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -469,6 +469,32 @@ void intelfbhw_do_blank(int blank, struct fb_info *info)
 }
 
 
+/* Check which pipe is connected to an active display plane. */
+int intelfbhw_active_pipe(const struct intelfb_hwstate *hw)
+{
+        int pipe = -1;
+
+        /* keep old default behaviour - prefer PIPE_A */
+        if (hw->disp_b_ctrl & DISPPLANE_PLANE_ENABLE) {
+                pipe = (hw->disp_b_ctrl >> DISPPLANE_SEL_PIPE_SHIFT);
+                pipe &= PIPE_MASK;
+                if (unlikely(pipe == PIPE_A))
+                        return PIPE_A;
+        }
+        if (hw->disp_a_ctrl & DISPPLANE_PLANE_ENABLE) {
+                pipe = (hw->disp_a_ctrl >> DISPPLANE_SEL_PIPE_SHIFT);
+                pipe &= PIPE_MASK;
+                if (likely(pipe == PIPE_A))
+                        return PIPE_A;
+        }
+        /* Impossible that no pipe is selected - return PIPE_A */
+        WARN_ON(pipe == -1);
+        if (unlikely(pipe == -1))
+                pipe = PIPE_A;
+
+        return pipe;
+}
+
 void intelfbhw_setcolreg(struct intelfb_info *dinfo, unsigned regno,
                          unsigned red, unsigned green, unsigned blue,
                          unsigned transp)
@@ -1019,7 +1045,7 @@ int intelfbhw_mode_to_hw(struct intelfb_info *dinfo,
                          struct intelfb_hwstate *hw,
                          struct fb_var_screeninfo *var)
 {
-        int pipe = PIPE_A;
+        int pipe = intelfbhw_active_pipe(hw);
         u32 *dpll, *fp0, *fp1;
         u32 m1, m2, n, p1, p2, clock_target, clock;
         u32 hsync_start, hsync_end, hblank_start, hblank_end, htotal, hactive;
@@ -1033,12 +1059,6 @@ int intelfbhw_mode_to_hw(struct intelfb_info *dinfo,
         /* Disable VGA */
         hw->vgacntrl |= VGA_DISABLE;
 
-        /* Check whether pipe A or pipe B is enabled. */
-        if (hw->pipe_a_conf & PIPECONF_ENABLE)
-                pipe = PIPE_A;
-        else if (hw->pipe_b_conf & PIPECONF_ENABLE)
-                pipe = PIPE_B;
-
         /* Set which pipe's registers will be set. */
         if (pipe == PIPE_B) {
                 dpll = &hw->dpll_b;
@@ -1262,7 +1282,6 @@ int intelfbhw_mode_to_hw(struct intelfb_info *dinfo,
 int intelfbhw_program_mode(struct intelfb_info *dinfo,
                            const struct intelfb_hwstate *hw, int blank)
 {
-        int pipe = PIPE_A;
         u32 tmp;
         const u32 *dpll, *fp0, *fp1, *pipe_conf;
         const u32 *hs, *ht, *hb, *vs, *vt, *vb, *ss;
@@ -1272,7 +1291,7 @@ int intelfbhw_program_mode(struct intelfb_info *dinfo,
         u32 src_size_reg;
         u32 count, tmp_val[3];
 
-        /* Assume single pipe, display plane A, analog CRT. */
+        /* Assume single pipe */
 
 #if VERBOSE > 0
         DBG_MSG("intelfbhw_program_mode\n");
@@ -1283,15 +1302,9 @@ int intelfbhw_program_mode(struct intelfb_info *dinfo,
         tmp |= VGA_DISABLE;
         OUTREG(VGACNTRL, tmp);
 
-        /* Check whether pipe A or pipe B is enabled. */
-        if (hw->pipe_a_conf & PIPECONF_ENABLE)
-                pipe = PIPE_A;
-        else if (hw->pipe_b_conf & PIPECONF_ENABLE)
-                pipe = PIPE_B;
-
-        dinfo->pipe = pipe;
+        dinfo->pipe = intelfbhw_active_pipe(hw);
 
-        if (pipe == PIPE_B) {
+        if (dinfo->pipe == PIPE_B) {
                 dpll = &hw->dpll_b;
                 fp0 = &hw->fpb0;
                 fp1 = &hw->fpb1;
diff --git a/drivers/video/intelfb/intelfbhw.h b/drivers/video/intelfb/intelfbhw.h
index 0b076bac321b..216ca20f259f 100644
--- a/drivers/video/intelfb/intelfbhw.h
+++ b/drivers/video/intelfb/intelfbhw.h
@@ -604,5 +604,6 @@ extern void intelfbhw_cursor_reset(struct intelfb_info *dinfo);
 extern int intelfbhw_enable_irq(struct intelfb_info *dinfo);
 extern void intelfbhw_disable_irq(struct intelfb_info *dinfo);
 extern int intelfbhw_wait_for_vsync(struct intelfb_info *dinfo, u32 pipe);
+extern int intelfbhw_active_pipe(const struct intelfb_hwstate *hw);
 
 #endif /* _INTELFBHW_H */
diff --git a/drivers/video/matrox/g450_pll.c b/drivers/video/matrox/g450_pll.c
index 09f6e045d5be..c15f8a57498e 100644
--- a/drivers/video/matrox/g450_pll.c
+++ b/drivers/video/matrox/g450_pll.c
@@ -368,7 +368,8 @@ static int __g450_setclk(struct matrox_fb_info *minfo, unsigned int fout,
                                         M1064_XDVICLKCTRL_C1DVICLKEN |
                                         M1064_XDVICLKCTRL_DVILOOPCTL |
                                         M1064_XDVICLKCTRL_P1LOOPBWDTCTL;
-                                matroxfb_DAC_out(minfo, M1064_XDVICLKCTRL, tmp);
+                                /* Setting this breaks PC systems so don't do it */
+                                /* matroxfb_DAC_out(minfo, M1064_XDVICLKCTRL, tmp); */
                                 matroxfb_DAC_out(minfo, M1064_XPWRCTRL,
                                                  xpwrctrl);
 
diff --git a/drivers/video/maxinefb.c b/drivers/video/maxinefb.c
index 5e91c2b30af9..7854c7a37dc5 100644
--- a/drivers/video/maxinefb.c
+++ b/drivers/video/maxinefb.c
@@ -92,6 +92,9 @@ static int maxinefb_setcolreg(unsigned regno, unsigned red, unsigned green,
         /* value to be written into the palette reg. */
         unsigned long hw_colorvalue = 0;
 
+        if (regno > 255)
+                return 1;
+
         red   >>= 8;    /* The cmap fields are 16 bits    */
         green >>= 8;    /* wide, but the harware colormap */
         blue  >>= 8;    /* registers are only 8 bits wide */
diff --git a/drivers/video/mb862xx/Makefile b/drivers/video/mb862xx/Makefile
index 07664814bb1d..d7777714166b 100644
--- a/drivers/video/mb862xx/Makefile
+++ b/drivers/video/mb862xx/Makefile
@@ -2,4 +2,4 @@
 # Makefile for the MB862xx framebuffer driver
 #
 
-obj-$(CONFIG_FB_MB862XX)        := mb862xxfb.o
+obj-$(CONFIG_FB_MB862XX)        := mb862xxfb.o mb862xxfb_accel.o
diff --git a/drivers/video/mb862xx/mb862xxfb.c b/drivers/video/mb862xx/mb862xxfb.c
index a28e3cfbbf70..fabb0c59a211 100644
--- a/drivers/video/mb862xx/mb862xxfb.c
+++ b/drivers/video/mb862xx/mb862xxfb.c
@@ -214,6 +214,8 @@ static int mb862xxfb_set_par(struct fb_info *fbi)
         unsigned long reg, sc;
 
         dev_dbg(par->dev, "%s\n", __func__);
+        if (par->type == BT_CORALP)
+                mb862xxfb_init_accel(fbi, fbi->var.xres);
 
         if (par->pre_init)
                 return 0;
@@ -453,6 +455,18 @@ static ssize_t mb862xxfb_show_dispregs(struct device *dev,
                 ptr += sprintf(ptr, "%08x = %08x\n",
                                reg, inreg(disp, reg));
 
+        for (reg = 0x400; reg <= 0x410; reg += 4)
+                ptr += sprintf(ptr, "geo %08x = %08x\n",
+                               reg, inreg(geo, reg));
+
+        for (reg = 0x400; reg <= 0x410; reg += 4)
+                ptr += sprintf(ptr, "draw %08x = %08x\n",
+                               reg, inreg(draw, reg));
+
+        for (reg = 0x440; reg <= 0x450; reg += 4)
+                ptr += sprintf(ptr, "draw %08x = %08x\n",
+                               reg, inreg(draw, reg));
+
         return ptr - buf;
 }
 
diff --git a/drivers/video/mb862xx/mb862xxfb.h b/drivers/video/mb862xx/mb862xxfb.h
index c4c8f4dd2217..d7e7cb76bbf2 100644
--- a/drivers/video/mb862xx/mb862xxfb.h
+++ b/drivers/video/mb862xx/mb862xxfb.h
@@ -61,6 +61,8 @@ struct mb862xxfb_par {
         u32                     pseudo_palette[16];
 };
 
+extern void mb862xxfb_init_accel(struct fb_info *info, int xres);
+
 #if defined(CONFIG_FB_MB862XX_LIME) && defined(CONFIG_FB_MB862XX_PCI_GDC)
 #error  "Select Lime GDC or CoralP/Carmine support, but not both together"
 #endif
diff --git a/drivers/video/mb862xx/mb862xxfb_accel.c b/drivers/video/mb862xx/mb862xxfb_accel.c
new file mode 100644
index 000000000000..049256052b1a
--- /dev/null
+++ b/drivers/video/mb862xx/mb862xxfb_accel.c
@@ -0,0 +1,331 @@
+/*
+ * drivers/mb862xx/mb862xxfb_accel.c
+ *
+ * Fujitsu Carmine/Coral-P(A)/Lime framebuffer driver acceleration support
+ *
+ * (C) 2007 Alexander Shishkin <virtuoso@slind.org>
+ * (C) 2009 Valentin Sitdikov <valentin.sitdikov@siemens.com>
+ * (C) 2009 Siemens AG
+ *
+ * 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/fb.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/pci.h>
+#if defined(CONFIG_OF)
+#include <linux/of_platform.h>
+#endif
+#include "mb862xxfb.h"
+#include "mb862xx_reg.h"
+#include "mb862xxfb_accel.h"
+
+static void mb862xxfb_write_fifo(u32 count, u32 *data, struct fb_info *info)
+{
+        struct mb862xxfb_par *par = info->par;
+        static u32 free;
+
+        u32 total = 0;
+        while (total < count) {
+                if (free) {
+                        outreg(geo, GDC_GEO_REG_INPUT_FIFO, data[total]);
+                        total++;
+                        free--;
+                } else {
+                        free = (u32) inreg(draw, GDC_REG_FIFO_COUNT);
+                }
+        }
+}
+
+static void mb86290fb_copyarea(struct fb_info *info,
+                               const struct fb_copyarea *area)
+{
+        __u32 cmd[6];
+
+        cmd[0] = (GDC_TYPE_SETREGISTER << 24) | (1 << 16) | GDC_REG_MODE_BITMAP;
+        /* Set raster operation */
+        cmd[1] = (2 << 7) | (GDC_ROP_COPY << 9);
+        cmd[2] = GDC_TYPE_BLTCOPYP << 24;
+
+        if (area->sx >= area->dx && area->sy >= area->dy)
+                cmd[2] |= GDC_CMD_BLTCOPY_TOP_LEFT << 16;
+        else if (area->sx >= area->dx && area->sy <= area->dy)
+                cmd[2] |= GDC_CMD_BLTCOPY_BOTTOM_LEFT << 16;
+        else if (area->sx <= area->dx && area->sy >= area->dy)
+                cmd[2] |= GDC_CMD_BLTCOPY_TOP_RIGHT << 16;
+        else
+                cmd[2] |= GDC_CMD_BLTCOPY_BOTTOM_RIGHT << 16;
+
+        cmd[3] = (area->sy << 16) | area->sx;
+        cmd[4] = (area->dy << 16) | area->dx;
+        cmd[5] = (area->height << 16) | area->width;
+        mb862xxfb_write_fifo(6, cmd, info);
+}
+
+/*
+ * Fill in the cmd array /GDC FIFO commands/ to draw a 1bit image.
+ * Make sure cmd has enough room!
+ */
+static void mb86290fb_imageblit1(u32 *cmd, u16 step, u16 dx, u16 dy,
+                                 u16 width, u16 height, u32 fgcolor,
+                                 u32 bgcolor, const struct fb_image *image,
+                                 struct fb_info *info)
+{
+        int i;
+        unsigned const char *line;
+        u16 bytes;
+
+        /* set colors and raster operation regs */
+        cmd[0] = (GDC_TYPE_SETREGISTER << 24) | (1 << 16) | GDC_REG_MODE_BITMAP;
+        /* Set raster operation */
+        cmd[1] = (2 << 7) | (GDC_ROP_COPY << 9);
+        cmd[2] =
+            (GDC_TYPE_SETCOLORREGISTER << 24) | (GDC_CMD_BODY_FORE_COLOR << 16);
+        cmd[3] = fgcolor;
+        cmd[4] =
+            (GDC_TYPE_SETCOLORREGISTER << 24) | (GDC_CMD_BODY_BACK_COLOR << 16);
+        cmd[5] = bgcolor;
+
+        i = 0;
+        line = image->data;
+        bytes = (image->width + 7) >> 3;
+
+        /* and the image */
+        cmd[6] = (GDC_TYPE_DRAWBITMAPP << 24) |
+            (GDC_CMD_BITMAP << 16) | (2 + (step * height));
+        cmd[7] = (dy << 16) | dx;
+        cmd[8] = (height << 16) | width;
+
+        while (i < height) {
+                memcpy(&cmd[9 + i * step], line, step << 2);
+#ifdef __LITTLE_ENDIAN
+                {
+                        int k = 0;
+                        for (k = 0; k < step; k++)
+                                cmd[9 + i * step + k] =
+                                    cpu_to_be32(cmd[9 + i * step + k]);
+                }
+#endif
+                line += bytes;
+                i++;
+        }
+}
+
+/*
+ * Fill in the cmd array /GDC FIFO commands/ to draw a 8bit image.
+ * Make sure cmd has enough room!
+ */
+static void mb86290fb_imageblit8(u32 *cmd, u16 step, u16 dx, u16 dy,
+                                 u16 width, u16 height, u32 fgcolor,
+                                 u32 bgcolor, const struct fb_image *image,
+                                 struct fb_info *info)
+{
+        int i, j;
+        unsigned const char *line, *ptr;
+        u16 bytes;
+
+        cmd[0] = (GDC_TYPE_DRAWBITMAPP << 24) |
+            (GDC_CMD_BLT_DRAW << 16) | (2 + (height * step));
+        cmd[1] = (dy << 16) | dx;
+        cmd[2] = (height << 16) | width;
+
+        i = 0;
+        line = ptr = image->data;
+        bytes = image->width;
+
+        while (i < height) {
+                ptr = line;
+                for (j = 0; j < step; j++) {
+                        cmd[3 + i * step + j] =
+                            (((u32 *) (info->pseudo_palette))[*ptr]) & 0xffff;
+                        ptr++;
+                        cmd[3 + i * step + j] |=
+                            ((((u32 *) (info->
+                                        pseudo_palette))[*ptr]) & 0xffff) << 16;
+                        ptr++;
+                }
+
+                line += bytes;
+                i++;
+        }
+}
+
+/*
+ * Fill in the cmd array /GDC FIFO commands/ to draw a 16bit image.
+ * Make sure cmd has enough room!
+ */
+static void mb86290fb_imageblit16(u32 *cmd, u16 step, u16 dx, u16 dy,
+                                  u16 width, u16 height, u32 fgcolor,
+                                  u32 bgcolor, const struct fb_image *image,
+                                  struct fb_info *info)
+{
+        int i;
+        unsigned const char *line;
+        u16 bytes;
+
+        i = 0;
+        line = image->data;
+        bytes = image->width << 1;
+
+        cmd[0] = (GDC_TYPE_DRAWBITMAPP << 24) |
+            (GDC_CMD_BLT_DRAW << 16) | (2 + step * height);
+        cmd[1] = (dy << 16) | dx;
+        cmd[2] = (height << 16) | width;
+
+        while (i < height) {
+                memcpy(&cmd[3 + i * step], line, step);
+                line += bytes;
+                i++;
+        }
+}
+
+static void mb86290fb_imageblit(struct fb_info *info,
+                                const struct fb_image *image)
+{
+        int mdr;
+        u32 *cmd = NULL;
+        void (*cmdfn) (u32 *, u16, u16, u16, u16, u16, u32, u32,
+                       const struct fb_image *, struct fb_info *) = NULL;
+        u32 cmdlen;
+        u32 fgcolor = 0, bgcolor = 0;
+        u16 step;
+
+        u16 width = image->width, height = image->height;
+        u16 dx = image->dx, dy = image->dy;
+        int x2, y2, vxres, vyres;
+
+        mdr = (GDC_ROP_COPY << 9);
+        x2 = image->dx + image->width;
+        y2 = image->dy + image->height;
+        vxres = info->var.xres_virtual;
+        vyres = info->var.yres_virtual;
+        x2 = min(x2, vxres);
+        y2 = min(y2, vyres);
+        width = x2 - dx;
+        height = y2 - dy;
+
+        switch (image->depth) {
+        case 1:
+                step = (width + 31) >> 5;
+                cmdlen = 9 + height * step;
+                cmdfn = mb86290fb_imageblit1;
+                if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
+                    info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
+                        fgcolor =
+                            ((u32 *) (info->pseudo_palette))[image->fg_color];
+                        bgcolor =
+                            ((u32 *) (info->pseudo_palette))[image->bg_color];
+                } else {
+                        fgcolor = image->fg_color;
+                        bgcolor = image->bg_color;
+                }
+
+                break;
+
+        case 8:
+                step = (width + 1) >> 1;
+                cmdlen = 3 + height * step;
+                cmdfn = mb86290fb_imageblit8;
+                break;
+
+        case 16:
+                step = (width + 1) >> 1;
+                cmdlen = 3 + height * step;
+                cmdfn = mb86290fb_imageblit16;
+                break;
+
+        default:
+                cfb_imageblit(info, image);
+                return;
+        }
+
+        cmd = kmalloc(cmdlen * 4, GFP_DMA);
+        if (!cmd)
+                return cfb_imageblit(info, image);
+        cmdfn(cmd, step, dx, dy, width, height, fgcolor, bgcolor, image, info);
+        mb862xxfb_write_fifo(cmdlen, cmd, info);
+        kfree(cmd);
+}
+
+static void mb86290fb_fillrect(struct fb_info *info,
+                               const struct fb_fillrect *rect)
+{
+
+        u32 x2, y2, vxres, vyres, height, width, fg;
+        u32 cmd[7];
+
+        vxres = info->var.xres_virtual;
+        vyres = info->var.yres_virtual;
+
+        if (!rect->width || !rect->height || rect->dx > vxres
+            || rect->dy > vyres)
+                return;
+
+        /* We could use hardware clipping but on many cards you get around
+         * hardware clipping by writing to framebuffer directly. */
+        x2 = rect->dx + rect->width;
+        y2 = rect->dy + rect->height;
+        x2 = min(x2, vxres);
+        y2 = min(y2, vyres);
+        width = x2 - rect->dx;
+        height = y2 - rect->dy;
+        if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
+            info->fix.visual == FB_VISUAL_DIRECTCOLOR)
+                fg = ((u32 *) (info->pseudo_palette))[rect->color];
+        else
+                fg = rect->color;
+
+        switch (rect->rop) {
+
+        case ROP_XOR:
+                /* Set raster operation */
+                cmd[1] = (2 << 7) | (GDC_ROP_XOR << 9);
+                break;
+
+        case ROP_COPY:
+                /* Set raster operation */
+                cmd[1] = (2 << 7) | (GDC_ROP_COPY << 9);
+                break;
+
+        }
+
+        cmd[0] = (GDC_TYPE_SETREGISTER << 24) | (1 << 16) | GDC_REG_MODE_BITMAP;
+        /* cmd[1] set earlier */
+        cmd[2] =
+            (GDC_TYPE_SETCOLORREGISTER << 24) | (GDC_CMD_BODY_FORE_COLOR << 16);
+        cmd[3] = fg;
+        cmd[4] = (GDC_TYPE_DRAWRECTP << 24) | (GDC_CMD_BLT_FILL << 16);
+        cmd[5] = (rect->dy << 16) | (rect->dx);
+        cmd[6] = (height << 16) | width;
+
+        mb862xxfb_write_fifo(7, cmd, info);
+}
+
+void mb862xxfb_init_accel(struct fb_info *info, int xres)
+{
+        struct mb862xxfb_par *par = info->par;
+
+        if (info->var.bits_per_pixel == 32) {
+                info->fbops->fb_fillrect = cfb_fillrect;
+                info->fbops->fb_copyarea = cfb_copyarea;
+                info->fbops->fb_imageblit = cfb_imageblit;
+        } else {
+                outreg(disp, GC_L0EM, 3);
+                info->fbops->fb_fillrect = mb86290fb_fillrect;
+                info->fbops->fb_copyarea = mb86290fb_copyarea;
+                info->fbops->fb_imageblit = mb86290fb_imageblit;
+        }
+        outreg(draw, GDC_REG_DRAW_BASE, 0);
+        outreg(draw, GDC_REG_MODE_MISC, 0x8000);
+        outreg(draw, GDC_REG_X_RESOLUTION, xres);
+
+        info->flags |=
+            FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT |
+            FBINFO_HWACCEL_IMAGEBLIT;
+        info->fix.accel = 0xff; /*FIXME: add right define */
+}
+EXPORT_SYMBOL(mb862xxfb_init_accel);
diff --git a/drivers/video/mb862xx/mb862xxfb_accel.h b/drivers/video/mb862xx/mb862xxfb_accel.h
new file mode 100644
index 000000000000..96a2dfef0f60
--- /dev/null
+++ b/drivers/video/mb862xx/mb862xxfb_accel.h
@@ -0,0 +1,203 @@
+#ifndef __MB826XXFB_ACCEL_H__
+#define __MB826XXFB_ACCEL_H__
+
+/* registers */
+#define GDC_GEO_REG_INPUT_FIFO 0x00000400L
+
+/* Special Registers */
+#define GDC_REG_CTRL                0x00000400L
+#define GDC_REG_FIFO_STATUS         0x00000404L
+#define GDC_REG_FIFO_COUNT          0x00000408L
+#define GDC_REG_SETUP_STATUS        0x0000040CL
+#define GDC_REG_DDA_STATUS          0x00000410L
+#define GDC_REG_ENGINE_STATUS       0x00000414L
+#define GDC_REG_ERROR_STATUS        0x00000418L
+#define GDC_REG_MODE_MISC           0x00000420L /* MDR0 */
+#define GDC_REG_MODE_LINE           0x00000424L /* MDR1 */
+#define GDC_REG_MODE_POLYGON        0x00000428L /* MDR2 */
+#define GDC_REG_MODE_TEXTURE        0x0000042CL /* MDR3 */
+#define GDC_REG_MODE_BITMAP         0x00000430L /* MDR4 */
+#define GDC_REG_MODE_EXTENSION      0x0000043CL /* MDR7 */
+
+/* Configuration Registers */
+#define GDC_REG_DRAW_BASE           0x00000440L
+#define GDC_REG_X_RESOLUTION        0x00000444L
+#define GDC_REG_Z_BASE              0x00000448L
+#define GDC_REG_TEXTURE_BASE        0x0000044CL
+#define GDC_REG_POLYGON_FLAG_BASE   0x00000450L
+#define GDC_REG_CLIP_XMIN           0x00000454L
+#define GDC_REG_CLIP_XMAX           0x00000458L
+#define GDC_REG_CLIP_YMIN           0x0000045CL
+#define GDC_REG_CLIP_YMAX           0x00000460L
+#define GDC_REG_TEXURE_SIZE         0x00000464L
+#define GDC_REG_TILE_SIZE           0x00000468L
+#define GDC_REG_TEX_BUF_OFFSET      0x0000046CL
+
+/* for MB86293 or later */
+#define GDC_REG_ALPHA_MAP_BASE      0x00000474L /* ABR */
+
+/* Constant Registers */
+#define GDC_REG_FOREGROUND_COLOR    0x00000480L
+#define GDC_REG_BACKGROUND_COLOR    0x00000484L
+#define GDC_REG_ALPHA               0x00000488L
+#define GDC_REG_LINE_PATTERN        0x0000048CL
+#define GDC_REG_TEX_BORDER_COLOR    0x00000494L
+#define GDC_REG_LINE_PATTERN_OFFSET 0x000003E0L
+
+/* Coomand Code */
+#define GDC_CMD_PIXEL                   0x00000000L
+#define GDC_CMD_PIXEL_Z                 0x00000001L
+
+#define GDC_CMD_X_VECTOR                0x00000020L
+#define GDC_CMD_Y_VECTOR                0x00000021L
+#define GDC_CMD_X_VECTOR_NOEND          0x00000022L
+#define GDC_CMD_Y_VECTOR_NOEND          0x00000023L
+#define GDC_CMD_X_VECTOR_BLPO           0x00000024L
+#define GDC_CMD_Y_VECTOR_BLPO           0x00000025L
+#define GDC_CMD_X_VECTOR_NOEND_BLPO     0x00000026L
+#define GDC_CMD_Y_VECTOR_NOEND_BLPO     0x00000027L
+#define GDC_CMD_AA_X_VECTOR             0x00000028L
+#define GDC_CMD_AA_Y_VECTOR             0x00000029L
+#define GDC_CMD_AA_X_VECTOR_NOEND       0x0000002AL
+#define GDC_CMD_AA_Y_VECTOR_NOEND       0x0000002BL
+#define GDC_CMD_AA_X_VECTOR_BLPO        0x0000002CL
+#define GDC_CMD_AA_Y_VECTOR_BLPO        0x0000002DL
+#define GDC_CMD_AA_X_VECTOR_NOEND_BLPO  0x0000002EL
+#define GDC_CMD_AA_Y_VECTOR_NOEND_BLPO  0x0000002FL
+
+#define GDC_CMD_0_VECTOR                0x00000030L
+#define GDC_CMD_1_VECTOR                0x00000031L
+#define GDC_CMD_0_VECTOR_NOEND          0x00000032L
+#define GDC_CMD_1_VECTOR_NOEND          0x00000033L
+#define GDC_CMD_0_VECTOR_BLPO           0x00000034L
+#define GDC_CMD_1_VECTOR_BLPO           0x00000035L
+#define GDC_CMD_0_VECTOR_NOEND_BLPO     0x00000036L
+#define GDC_CMD_1_VECTOR_NOEND_BLPO     0x00000037L
+#define GDC_CMD_AA_0_VECTOR             0x00000038L
+#define GDC_CMD_AA_1_VECTOR             0x00000039L
+#define GDC_CMD_AA_0_VECTOR_NOEND       0x0000003AL
+#define GDC_CMD_AA_1_VECTOR_NOEND       0x0000003BL
+#define GDC_CMD_AA_0_VECTOR_BLPO        0x0000003CL
+#define GDC_CMD_AA_1_VECTOR_BLPO        0x0000003DL
+#define GDC_CMD_AA_0_VECTOR_NOEND_BLPO  0x0000003EL
+#define GDC_CMD_AA_1_VECTOR_NOEND_BLPO  0x0000003FL
+
+#define GDC_CMD_BLT_FILL                0x00000041L
+#define GDC_CMD_BLT_DRAW                0x00000042L
+#define GDC_CMD_BITMAP                  0x00000043L
+#define GDC_CMD_BLTCOPY_TOP_LEFT        0x00000044L
+#define GDC_CMD_BLTCOPY_TOP_RIGHT       0x00000045L
+#define GDC_CMD_BLTCOPY_BOTTOM_LEFT     0x00000046L
+#define GDC_CMD_BLTCOPY_BOTTOM_RIGHT    0x00000047L
+#define GDC_CMD_LOAD_TEXTURE            0x00000048L
+#define GDC_CMD_LOAD_TILE               0x00000049L
+
+#define GDC_CMD_TRAP_RIGHT              0x00000060L
+#define GDC_CMD_TRAP_LEFT               0x00000061L
+#define GDC_CMD_TRIANGLE_FAN            0x00000062L
+#define GDC_CMD_FLAG_TRIANGLE_FAN       0x00000063L
+
+#define GDC_CMD_FLUSH_FB                0x000000C1L
+#define GDC_CMD_FLUSH_Z                 0x000000C2L
+
+#define GDC_CMD_POLYGON_BEGIN           0x000000E0L
+#define GDC_CMD_POLYGON_END             0x000000E1L
+#define GDC_CMD_CLEAR_POLY_FLAG         0x000000E2L
+#define GDC_CMD_NORMAL                  0x000000FFL
+
+#define GDC_CMD_VECTOR_BLPO_FLAG        0x00040000L
+#define GDC_CMD_FAST_VECTOR_BLPO_FLAG   0x00000004L
+
+/* for MB86293 or later */
+#define GDC_CMD_MDR1                            0x00000000L
+#define GDC_CMD_MDR1S                           0x00000002L
+#define GDC_CMD_MDR1B                           0x00000004L
+#define GDC_CMD_MDR2                            0x00000001L
+#define GDC_CMD_MDR2S                           0x00000003L
+#define GDC_CMD_MDR2TL                          0x00000007L
+#define GDC_CMD_GMDR1E                          0x00000010L
+#define GDC_CMD_GMDR2E                          0x00000020L
+#define GDC_CMD_OVERLAP_SHADOW_XY               0x00000000L
+#define GDC_CMD_OVERLAP_SHADOW_XY_COMPOSITION   0x00000001L
+#define GDC_CMD_OVERLAP_Z_PACKED_ONBS           0x00000007L
+#define GDC_CMD_OVERLAP_Z_ORIGIN                0x00000000L
+#define GDC_CMD_OVERLAP_Z_NON_TOPLEFT           0x00000001L
+#define GDC_CMD_OVERLAP_Z_BORDER                0x00000002L
+#define GDC_CMD_OVERLAP_Z_SHADOW                0x00000003L
+#define GDC_CMD_BLTCOPY_ALT_ALPHA               0x00000000L     /* Reserverd */
+#define GDC_CMD_DC_LOGOUT                       0x00000000L     /* Reserverd */
+#define GDC_CMD_BODY_FORE_COLOR                 0x00000000L
+#define GDC_CMD_BODY_BACK_COLOR                 0x00000001L
+#define GDC_CMD_SHADOW_FORE_COLOR               0x00000002L
+#define GDC_CMD_SHADOW_BACK_COLOR               0x00000003L
+#define GDC_CMD_BORDER_FORE_COLOR               0x00000004L
+#define GDC_CMD_BORDER_BACK_COLOR               0x00000005L
+
+/* Type Code Table */
+#define GDC_TYPE_G_NOP                                  0x00000020L
+#define GDC_TYPE_G_BEGIN                                0x00000021L
+#define GDC_TYPE_G_BEGINCONT                            0x00000022L
+#define GDC_TYPE_G_END                                  0x00000023L
+#define GDC_TYPE_G_VERTEX                               0x00000030L
+#define GDC_TYPE_G_VERTEXLOG                            0x00000032L
+#define GDC_TYPE_G_VERTEXNOPLOG                         0x00000033L
+#define GDC_TYPE_G_INIT                                 0x00000040L
+#define GDC_TYPE_G_VIEWPORT                             0x00000041L
+#define GDC_TYPE_G_DEPTHRANGE                           0x00000042L
+#define GDC_TYPE_G_LOADMATRIX                           0x00000043L
+#define GDC_TYPE_G_VIEWVOLUMEXYCLIP                     0x00000044L
+#define GDC_TYPE_G_VIEWVOLUMEZCLIP                      0x00000045L
+#define GDC_TYPE_G_VIEWVOLUMEWCLIP                      0x00000046L
+#define GDC_TYPE_SETLVERTEX2I                           0x00000072L
+#define GDC_TYPE_SETLVERTEX2IP                          0x00000073L
+#define GDC_TYPE_SETMODEREGISTER                        0x000000C0L
+#define GDC_TYPE_SETGMODEREGISTER                       0x000000C1L
+#define GDC_TYPE_OVERLAPXYOFFT                          0x000000C8L
+#define GDC_TYPE_OVERLAPZOFFT                           0x000000C9L
+#define GDC_TYPE_DC_LOGOUTADDR                          0x000000CCL
+#define GDC_TYPE_SETCOLORREGISTER                       0x000000CEL
+#define GDC_TYPE_G_BEGINE                               0x000000E1L
+#define GDC_TYPE_G_BEGINCONTE                           0x000000E2L
+#define GDC_TYPE_G_ENDE                                 0x000000E3L
+#define GDC_TYPE_DRAWPIXEL                              0x00000000L
+#define GDC_TYPE_DRAWPIXELZ                             0x00000001L
+#define GDC_TYPE_DRAWLINE                               0x00000002L
+#define GDC_TYPE_DRAWLINE2I                             0x00000003L
+#define GDC_TYPE_DRAWLINE2IP                            0x00000004L
+#define GDC_TYPE_DRAWTRAP                               0x00000005L
+#define GDC_TYPE_DRAWVERTEX2I                           0x00000006L
+#define GDC_TYPE_DRAWVERTEX2IP                          0x00000007L
+#define GDC_TYPE_DRAWRECTP                              0x00000009L
+#define GDC_TYPE_DRAWBITMAPP                            0x0000000BL
+#define GDC_TYPE_BLTCOPYP                               0x0000000DL
+#define GDC_TYPE_BLTCOPYALTERNATEP                      0x0000000FL
+#define GDC_TYPE_LOADTEXTUREP                           0x00000011L
+#define GDC_TYPE_BLTTEXTUREP                            0x00000013L
+#define GDC_TYPE_BLTCOPYALTALPHABLENDP                  0x0000001FL
+#define GDC_TYPE_SETVERTEX2I                            0x00000070L
+#define GDC_TYPE_SETVERTEX2IP                           0x00000071L
+#define GDC_TYPE_DRAW                                   0x000000F0L
+#define GDC_TYPE_SETREGISTER                            0x000000F1L
+#define GDC_TYPE_SYNC                                   0x000000FCL
+#define GDC_TYPE_INTERRUPT                              0x000000FDL
+#define GDC_TYPE_NOP                                    0x0
+
+/* Raster operation */
+#define GDC_ROP_CLEAR                   0x0000
+#define GDC_ROP_AND                     0x0001
+#define GDC_ROP_AND_REVERSE             0x0002
+#define GDC_ROP_COPY                    0x0003
+#define GDC_ROP_AND_INVERTED            0x0004
+#define GDC_ROP_NOP                     0x0005
+#define GDC_ROP_XOR                     0x0006
+#define GDC_ROP_OR                      0x0007
+#define GDC_ROP_NOR                     0x0008
+#define GDC_ROP_EQUIV                   0x0009
+#define GDC_ROP_INVERT                  0x000A
+#define GDC_ROP_OR_REVERSE              0x000B
+#define GDC_ROP_COPY_INVERTED           0x000C
+#define GDC_ROP_OR_INVERTED             0x000D
+#define GDC_ROP_NAND                    0x000E
+#define GDC_ROP_SET                     0x000F
+
+#endif
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 34e4e7995169..0129f1bc3522 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -13,6 +13,7 @@
 
 #include <linux/module.h>
 #include <linux/fb.h>
+#include <linux/kernel.h>
 
 #undef DEBUG
 
@@ -402,21 +403,6 @@ const struct fb_videomode vesa_modes[] = {
 EXPORT_SYMBOL(vesa_modes);
 #endif /* CONFIG_FB_MODE_HELPERS */
 
-static int my_atoi(const char *name)
-{
-    int val = 0;
-
-    for (;; name++) {
-        switch (*name) {
-            case '0' ... '9':
-                val = 10*val+(*name-'0');
-                break;
-            default:
-                return val;
-        }
-    }
-}
-
 /**
  *      fb_try_mode - test a video mode
  *      @var: frame buffer user defined part of display
@@ -539,7 +525,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
                     namelen = i;
                     if (!refresh_specified && !bpp_specified &&
                         !yres_specified) {
-                        refresh = my_atoi(&name[i+1]);
+                        refresh = simple_strtol(&name[i+1], NULL, 10);
                         refresh_specified = 1;
                         if (cvt || rb)
                             cvt = 0;
@@ -549,7 +535,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
                 case '-':
                     namelen = i;
                     if (!bpp_specified && !yres_specified) {
-                        bpp = my_atoi(&name[i+1]);
+                        bpp = simple_strtol(&name[i+1], NULL, 10);
                         bpp_specified = 1;
                         if (cvt || rb)
                             cvt = 0;
@@ -558,7 +544,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
                     break;
                 case 'x':
                     if (!yres_specified) {
-                        yres = my_atoi(&name[i+1]);
+                        yres = simple_strtol(&name[i+1], NULL, 10);
                         yres_specified = 1;
                     } else
                         goto done;
@@ -586,7 +572,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
             }
         }
         if (i < 0 && yres_specified) {
-            xres = my_atoi(name);
+            xres = simple_strtol(name, NULL, 10);
             res_specified = 1;
         }
 done:
diff --git a/drivers/video/output.c b/drivers/video/output.c
index 5e6439ae7394..5137aa016b83 100644
--- a/drivers/video/output.c
+++ b/drivers/video/output.c
@@ -50,7 +50,7 @@ static ssize_t video_output_store_state(struct device *dev,
         int request_state = simple_strtoul(buf,&endp,0);
         size_t size = endp - buf;
 
-        if (*endp && isspace(*endp))
+        if (isspace(*endp))
                 size++;
         if (size != count)
                 return -EINVAL;
diff --git a/drivers/video/pmag-ba-fb.c b/drivers/video/pmag-ba-fb.c
index 0573ec685a57..0f361b6100d2 100644
--- a/drivers/video/pmag-ba-fb.c
+++ b/drivers/video/pmag-ba-fb.c
@@ -98,7 +98,8 @@ static int pmagbafb_setcolreg(unsigned int regno, unsigned int red,
 {
         struct pmagbafb_par *par = info->par;
 
-        BUG_ON(regno >= info->cmap.len);
+        if (regno >= info->cmap.len)
+                return 1;
 
         red   >>= 8;    /* The cmap fields are 16 bits    */
         green >>= 8;    /* wide, but the hardware colormap */
diff --git a/drivers/video/pmagb-b-fb.c b/drivers/video/pmagb-b-fb.c
index 98748723af9f..2de0806421b4 100644
--- a/drivers/video/pmagb-b-fb.c
+++ b/drivers/video/pmagb-b-fb.c
@@ -102,7 +102,8 @@ static int pmagbbfb_setcolreg(unsigned int regno, unsigned int red,
 {
         struct pmagbbfb_par *par = info->par;
 
-        BUG_ON(regno >= info->cmap.len);
+        if (regno >= info->cmap.len)
+                return 1;
 
         red   >>= 8;    /* The cmap fields are 16 bits    */
         green >>= 8;    /* wide, but the hardware colormap */
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index f58a3aae6ea6..415858b421b3 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1221,13 +1221,14 @@ static void setup_smart_timing(struct pxafb_info *fbi,
 static int pxafb_smart_thread(void *arg)
 {
         struct pxafb_info *fbi = arg;
-        struct pxafb_mach_info *inf = fbi->dev->platform_data;
+        struct pxafb_mach_info *inf;
 
-        if (!fbi || !inf->smart_update) {
+        if (!fbi || !fbi->dev->platform_data->smart_update) {
                 pr_err("%s: not properly initialized, thread terminated\n",
                                 __func__);
                 return -EINVAL;
         }
+        inf = fbi->dev->platform_data;
 
         pr_debug("%s(): task starting\n", __func__);
 
@@ -1667,7 +1668,7 @@ static int pxafb_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops pxafb_pm_ops = {
+static const struct dev_pm_ops pxafb_pm_ops = {
         .suspend        = pxafb_suspend,
         .resume         = pxafb_resume,
 };
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index b4b5de930cf5..a69830d26f7f 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -281,6 +281,7 @@ static void sh_mobile_lcdc_deferred_io(struct fb_info *info,
                                        struct list_head *pagelist)
 {
         struct sh_mobile_lcdc_chan *ch = info->par;
+        struct sh_mobile_lcdc_board_cfg *bcfg = &ch->cfg.board_cfg;
 
         /* enable clocks before accessing hardware */
         sh_mobile_lcdc_clk_on(ch->lcdc);
@@ -305,10 +306,17 @@ static void sh_mobile_lcdc_deferred_io(struct fb_info *info,
 
                 /* trigger panel update */
                 dma_map_sg(info->dev, ch->sglist, nr_pages, DMA_TO_DEVICE);
+                if (bcfg->start_transfer)
+                        bcfg->start_transfer(bcfg->board_data, ch,
+                                             &sh_mobile_lcdc_sys_bus_ops);
                 lcdc_write_chan(ch, LDSM2R, 1);
                 dma_unmap_sg(info->dev, ch->sglist, nr_pages, DMA_TO_DEVICE);
-        } else
+        } else {
+                if (bcfg->start_transfer)
+                        bcfg->start_transfer(bcfg->board_data, ch,
+                                             &sh_mobile_lcdc_sys_bus_ops);
                 lcdc_write_chan(ch, LDSM2R, 1);
+        }
 }
 
 static void sh_mobile_lcdc_deferred_io_touch(struct fb_info *info)
@@ -890,7 +898,7 @@ static int sh_mobile_lcdc_runtime_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops sh_mobile_lcdc_dev_pm_ops = {
+static const struct dev_pm_ops sh_mobile_lcdc_dev_pm_ops = {
         .suspend = sh_mobile_lcdc_suspend,
         .resume = sh_mobile_lcdc_resume,
         .runtime_suspend = sh_mobile_lcdc_runtime_suspend,
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index a4e05e4d7501..9d2b6bc49036 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -2115,7 +2115,7 @@ sisfb_detect_VB_connect(struct sis_video_info *ivideo)
            if( (!(ivideo->vbflags2 & VB2_SISBRIDGE)) &&
                (!((ivideo->sisvga_engine == SIS_315_VGA) &&
                         (ivideo->vbflags2 & VB2_CHRONTEL))) ) {
-              if(ivideo->sisfb_tvstd & (TV_PALN | TV_PALN | TV_NTSCJ)) {
+              if(ivideo->sisfb_tvstd & (TV_PALM | TV_PALN | TV_NTSCJ)) {
                  ivideo->sisfb_tvstd = -1;
                  printk(KERN_ERR "sisfb: PALM/PALN/NTSCJ not supported\n");
               }
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index 924d79462780..35370d0ecf03 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -29,8 +29,8 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/console.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/div64.h>
 
@@ -66,6 +66,7 @@ struct sm501fb_info {
         struct fb_info          *fb[2];         /* fb info for both heads */
         struct resource         *fbmem_res;     /* framebuffer resource */
         struct resource         *regs_res;      /* registers resource */
+        struct resource         *regs2d_res;    /* 2d registers resource */
         struct sm501_platdata_fb *pdata;        /* our platform data */
 
         unsigned long            pm_crt_ctrl;   /* pm: crt ctrl save */
@@ -73,6 +74,7 @@ struct sm501fb_info {
         int                      irq;
         int                      swap_endian;   /* set to swap rgb=>bgr */
         void __iomem            *regs;          /* remapped registers */
+        void __iomem            *regs2d;        /* 2d remapped registers */
         void __iomem            *fbmem;         /* remapped framebuffer */
         size_t                   fbmem_len;     /* length of remapped region */
 };
@@ -123,9 +125,9 @@ static inline void sm501fb_sync_regs(struct sm501fb_info *info)
  * This is an attempt to lay out memory for the two framebuffers and
  * everything else
  *
- * |fbmem_res->start                                           fbmem_res->end|
- * |                                                                         |
- * |fb[0].fix.smem_start    |         |fb[1].fix.smem_start    |     2K      |
+ * |fbmem_res->start                                           fbmem_res->end|
+ * |                                                                         |
+ * |fb[0].fix.smem_start    |         |fb[1].fix.smem_start    |     2K      |
  * |-> fb[0].fix.smem_len <-| spare   |-> fb[1].fix.smem_len <-|-> cursors <-|
  *
  * The "spare" space is for the 2d engine data
@@ -1246,7 +1248,173 @@ static ssize_t sm501fb_debug_show_pnl(struct device *dev,
 
 static DEVICE_ATTR(fbregs_pnl, 0444, sm501fb_debug_show_pnl, NULL);
 
-/* framebuffer ops */
+/* acceleration operations */
+static int sm501fb_sync(struct fb_info *info)
+{
+        int count = 1000000;
+        struct sm501fb_par  *par = info->par;
+        struct sm501fb_info *fbi = par->info;
+
+        /* wait for the 2d engine to be ready */
+        while ((count > 0) &&
+               (readl(fbi->regs + SM501_SYSTEM_CONTROL) &
+                SM501_SYSCTRL_2D_ENGINE_STATUS) != 0)
+                count--;
+
+        if (count <= 0) {
+                dev_err(info->dev, "Timeout waiting for 2d engine sync\n");
+                return 1;
+        }
+        return 0;
+}
+
+static void sm501fb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
+{
+        struct sm501fb_par  *par = info->par;
+        struct sm501fb_info *fbi = par->info;
+        int width = area->width;
+        int height = area->height;
+        int sx = area->sx;
+        int sy = area->sy;
+        int dx = area->dx;
+        int dy = area->dy;
+        unsigned long rtl = 0;
+
+        /* source clip */
+        if ((sx >= info->var.xres_virtual) ||
+            (sy >= info->var.yres_virtual))
+                /* source Area not within virtual screen, skipping */
+                return;
+        if ((sx + width) >= info->var.xres_virtual)
+                width = info->var.xres_virtual - sx - 1;
+        if ((sy + height) >= info->var.yres_virtual)
+                height = info->var.yres_virtual - sy - 1;
+
+        /* dest clip */
+        if ((dx >= info->var.xres_virtual) ||
+            (dy >= info->var.yres_virtual))
+                /* Destination Area not within virtual screen, skipping */
+                return;
+        if ((dx + width) >= info->var.xres_virtual)
+                width = info->var.xres_virtual - dx - 1;
+        if ((dy + height) >= info->var.yres_virtual)
+                height = info->var.yres_virtual - dy - 1;
+
+        if ((sx < dx) || (sy < dy)) {
+                rtl = 1 << 27;
+                sx += width - 1;
+                dx += width - 1;
+                sy += height - 1;
+                dy += height - 1;
+        }
+
+        if (sm501fb_sync(info))
+                return;
+
+        /* set the base addresses */
+        writel(par->screen.sm_addr, fbi->regs2d + SM501_2D_SOURCE_BASE);
+        writel(par->screen.sm_addr, fbi->regs2d + SM501_2D_DESTINATION_BASE);
+
+        /* set the window width */
+        writel((info->var.xres << 16) | info->var.xres,
+               fbi->regs2d + SM501_2D_WINDOW_WIDTH);
+
+        /* set window stride */
+        writel((info->var.xres_virtual << 16) | info->var.xres_virtual,
+               fbi->regs2d + SM501_2D_PITCH);
+
+        /* set data format */
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                writel(0, fbi->regs2d + SM501_2D_STRETCH);
+                break;
+        case 16:
+                writel(0x00100000, fbi->regs2d + SM501_2D_STRETCH);
+                break;
+        case 32:
+                writel(0x00200000, fbi->regs2d + SM501_2D_STRETCH);
+                break;
+        }
+
+        /* 2d compare mask */
+        writel(0xffffffff, fbi->regs2d + SM501_2D_COLOR_COMPARE_MASK);
+
+        /* 2d mask */
+        writel(0xffffffff, fbi->regs2d + SM501_2D_MASK);
+
+        /* source and destination x y */
+        writel((sx << 16) | sy, fbi->regs2d + SM501_2D_SOURCE);
+        writel((dx << 16) | dy, fbi->regs2d + SM501_2D_DESTINATION);
+
+        /* w/h */
+        writel((width << 16) | height, fbi->regs2d + SM501_2D_DIMENSION);
+
+        /* do area move */
+        writel(0x800000cc | rtl, fbi->regs2d + SM501_2D_CONTROL);
+}
+
+static void sm501fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
+{
+        struct sm501fb_par  *par = info->par;
+        struct sm501fb_info *fbi = par->info;
+        int width = rect->width, height = rect->height;
+
+        if ((rect->dx >= info->var.xres_virtual) ||
+            (rect->dy >= info->var.yres_virtual))
+                /* Rectangle not within virtual screen, skipping */
+                return;
+        if ((rect->dx + width) >= info->var.xres_virtual)
+                width = info->var.xres_virtual - rect->dx - 1;
+        if ((rect->dy + height) >= info->var.yres_virtual)
+                height = info->var.yres_virtual - rect->dy - 1;
+
+        if (sm501fb_sync(info))
+                return;
+
+        /* set the base addresses */
+        writel(par->screen.sm_addr, fbi->regs2d + SM501_2D_SOURCE_BASE);
+        writel(par->screen.sm_addr, fbi->regs2d + SM501_2D_DESTINATION_BASE);
+
+        /* set the window width */
+        writel((info->var.xres << 16) | info->var.xres,
+               fbi->regs2d + SM501_2D_WINDOW_WIDTH);
+
+        /* set window stride */
+        writel((info->var.xres_virtual << 16) | info->var.xres_virtual,
+               fbi->regs2d + SM501_2D_PITCH);
+
+        /* set data format */
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                writel(0, fbi->regs2d + SM501_2D_STRETCH);
+                break;
+        case 16:
+                writel(0x00100000, fbi->regs2d + SM501_2D_STRETCH);
+                break;
+        case 32:
+                writel(0x00200000, fbi->regs2d + SM501_2D_STRETCH);
+                break;
+        }
+
+        /* 2d compare mask */
+        writel(0xffffffff, fbi->regs2d + SM501_2D_COLOR_COMPARE_MASK);
+
+        /* 2d mask */
+        writel(0xffffffff, fbi->regs2d + SM501_2D_MASK);
+
+        /* colour */
+        writel(rect->color, fbi->regs2d + SM501_2D_FOREGROUND);
+
+        /* x y */
+        writel((rect->dx << 16) | rect->dy, fbi->regs2d + SM501_2D_DESTINATION);
+
+        /* w/h */
+        writel((width << 16) | height, fbi->regs2d + SM501_2D_DIMENSION);
+
+        /* do rectangle fill */
+        writel(0x800100cc, fbi->regs2d + SM501_2D_CONTROL);
+}
+
 
 static struct fb_ops sm501fb_ops_crt = {
         .owner          = THIS_MODULE,
@@ -1256,9 +1424,10 @@ static struct fb_ops sm501fb_ops_crt = {
         .fb_setcolreg   = sm501fb_setcolreg,
         .fb_pan_display = sm501fb_pan_crt,
         .fb_cursor      = sm501fb_cursor,
-        .fb_fillrect    = cfb_fillrect,
-        .fb_copyarea    = cfb_copyarea,
+        .fb_fillrect    = sm501fb_fillrect,
+        .fb_copyarea    = sm501fb_copyarea,
         .fb_imageblit   = cfb_imageblit,
+        .fb_sync        = sm501fb_sync,
 };
 
 static struct fb_ops sm501fb_ops_pnl = {
@@ -1269,9 +1438,10 @@ static struct fb_ops sm501fb_ops_pnl = {
         .fb_blank       = sm501fb_blank_pnl,
         .fb_setcolreg   = sm501fb_setcolreg,
         .fb_cursor      = sm501fb_cursor,
-        .fb_fillrect    = cfb_fillrect,
-        .fb_copyarea    = cfb_copyarea,
+        .fb_fillrect    = sm501fb_fillrect,
+        .fb_copyarea    = sm501fb_copyarea,
         .fb_imageblit   = cfb_imageblit,
+        .fb_sync        = sm501fb_sync,
 };
 
 /* sm501_init_cursor
@@ -1329,7 +1499,8 @@ static int sm501fb_start(struct sm501fb_info *info,
                 dev_warn(dev, "no irq for device\n");
         }
 
-        /* allocate, reserve and remap resources for registers */
+        /* allocate, reserve and remap resources for display
+         * controller registers */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res == NULL) {
                 dev_err(dev, "no resource definition for registers\n");
@@ -1338,7 +1509,7 @@ static int sm501fb_start(struct sm501fb_info *info,
         }
 
         info->regs_res = request_mem_region(res->start,
-                                            res->end - res->start,
+                                            resource_size(res),
                                             pdev->name);
 
         if (info->regs_res == NULL) {
@@ -1347,37 +1518,63 @@ static int sm501fb_start(struct sm501fb_info *info,
                 goto err_release;
         }
 
-        info->regs = ioremap(res->start, (res->end - res->start)+1);
+        info->regs = ioremap(res->start, resource_size(res));
         if (info->regs == NULL) {
                 dev_err(dev, "cannot remap registers\n");
                 ret = -ENXIO;
                 goto err_regs_res;
         }
 
+        /* allocate, reserve and remap resources for 2d
+         * controller registers */
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        if (res == NULL) {
+                dev_err(dev, "no resource definition for 2d registers\n");
+                ret = -ENOENT;
+                goto err_regs_map;
+        }
+
+        info->regs2d_res = request_mem_region(res->start,
+                                              resource_size(res),
+                                              pdev->name);
+
+        if (info->regs2d_res == NULL) {
+                dev_err(dev, "cannot claim registers\n");
+                ret = -ENXIO;
+                goto err_regs_map;
+        }
+
+        info->regs2d = ioremap(res->start, resource_size(res));
+        if (info->regs2d == NULL) {
+                dev_err(dev, "cannot remap registers\n");
+                ret = -ENXIO;
+                goto err_regs2d_res;
+        }
+
         /* allocate, reserve resources for framebuffer */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
         if (res == NULL) {
                 dev_err(dev, "no memory resource defined\n");
                 ret = -ENXIO;
-                goto err_regs_map;
+                goto err_regs2d_map;
         }
 
         info->fbmem_res = request_mem_region(res->start,
-                                             (res->end - res->start)+1,
+                                             resource_size(res),
                                              pdev->name);
         if (info->fbmem_res == NULL) {
                 dev_err(dev, "cannot claim framebuffer\n");
                 ret = -ENXIO;
-                goto err_regs_map;
+                goto err_regs2d_map;
         }
 
-        info->fbmem = ioremap(res->start, (res->end - res->start)+1);
+        info->fbmem = ioremap(res->start, resource_size(res));
         if (info->fbmem == NULL) {
                 dev_err(dev, "cannot remap framebuffer\n");
                 goto err_mem_res;
         }
 
-        info->fbmem_len = (res->end - res->start)+1;
+        info->fbmem_len = resource_size(res);
 
         /* clear framebuffer memory - avoids garbage data on unused fb */
         memset(info->fbmem, 0, info->fbmem_len);
@@ -1389,8 +1586,10 @@ static int sm501fb_start(struct sm501fb_info *info,
         /* enable display controller */
         sm501_unit_power(dev->parent, SM501_GATE_DISPLAY, 1);
 
-        /* setup cursors */
+        /* enable 2d controller */
+        sm501_unit_power(dev->parent, SM501_GATE_2D_ENGINE, 1);
 
+        /* setup cursors */
         sm501_init_cursor(info->fb[HEAD_CRT], SM501_DC_CRT_HWC_ADDR);
         sm501_init_cursor(info->fb[HEAD_PANEL], SM501_DC_PANEL_HWC_ADDR);
 
@@ -1400,6 +1599,13 @@ static int sm501fb_start(struct sm501fb_info *info,
         release_resource(info->fbmem_res);
         kfree(info->fbmem_res);
 
+ err_regs2d_map:
+        iounmap(info->regs2d);
+
+ err_regs2d_res:
+        release_resource(info->regs2d_res);
+        kfree(info->regs2d_res);
+
  err_regs_map:
         iounmap(info->regs);
 
@@ -1420,6 +1626,10 @@ static void sm501fb_stop(struct sm501fb_info *info)
         release_resource(info->fbmem_res);
         kfree(info->fbmem_res);
 
+        iounmap(info->regs2d);
+        release_resource(info->regs2d_res);
+        kfree(info->regs2d_res);
+
         iounmap(info->regs);
         release_resource(info->regs_res);
         kfree(info->regs_res);
@@ -1486,7 +1696,8 @@ static int sm501fb_init_fb(struct fb_info *fb,
                 par->ops.fb_cursor = NULL;
 
         fb->fbops = &par->ops;
-        fb->flags = FBINFO_FLAG_DEFAULT |
+        fb->flags = FBINFO_FLAG_DEFAULT | FBINFO_READS_FAST |
+                FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT |
                 FBINFO_HWACCEL_XPAN | FBINFO_HWACCEL_YPAN;
 
         /* fixed data */
diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c
index e3e597f937a5..09353e2b92f6 100644
--- a/drivers/video/via/lcd.c
+++ b/drivers/video/via/lcd.c
@@ -1134,45 +1134,33 @@ static void integrated_lvds_enable(struct lvds_setting_information
                             *plvds_setting_info,
                             struct lvds_chip_information *plvds_chip_info)
 {
-        bool turn_on_first_powersequence = false;
-        bool turn_on_second_powersequence = false;
-
         DEBUG_MSG(KERN_INFO "integrated_lvds_enable, out_interface:%d\n",
                   plvds_chip_info->output_interface);
         if (plvds_setting_info->lcd_mode == LCD_SPWG)
                 viafb_write_reg_mask(CRD2, VIACR, 0x00, BIT0 + BIT1);
-         else
+        else
                 viafb_write_reg_mask(CRD2, VIACR, 0x03, BIT0 + BIT1);
-        if (INTERFACE_LVDS0LVDS1 == plvds_chip_info->output_interface)
-                turn_on_first_powersequence = true;
-        if (INTERFACE_LVDS0 == plvds_chip_info->output_interface)
-                turn_on_first_powersequence = true;
-        if (INTERFACE_LVDS1 == plvds_chip_info->output_interface)
-                turn_on_second_powersequence = true;
-
-        if (turn_on_second_powersequence) {
-                /* Use second power sequence control: */
-
-                /* Use hardware control power sequence. */
-                viafb_write_reg_mask(CRD3, VIACR, 0, BIT0);
-
-                /* Turn on back light. */
-                viafb_write_reg_mask(CRD3, VIACR, 0, BIT6 + BIT7);
 
-                /* Turn on hardware power sequence. */
-                viafb_write_reg_mask(CRD4, VIACR, 0x02, BIT1);
-        }
-        if (turn_on_first_powersequence) {
+        switch (plvds_chip_info->output_interface) {
+        case INTERFACE_LVDS0LVDS1:
+        case INTERFACE_LVDS0:
                 /* Use first power sequence control: */
-
                 /* Use hardware control power sequence. */
                 viafb_write_reg_mask(CR91, VIACR, 0, BIT0);
-
                 /* Turn on back light. */
                 viafb_write_reg_mask(CR91, VIACR, 0, BIT6 + BIT7);
-
                 /* Turn on hardware power sequence. */
                 viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);
+                break;
+        case INTERFACE_LVDS1:
+                /* Use second power sequence control: */
+                /* Use hardware control power sequence. */
+                viafb_write_reg_mask(CRD3, VIACR, 0, BIT0);
+                /* Turn on back light. */
+                viafb_write_reg_mask(CRD3, VIACR, 0, BIT6 + BIT7);
+                /* Turn on hardware power sequence. */
+                viafb_write_reg_mask(CRD4, VIACR, 0x02, BIT1);
+                break;
         }
 
         /* Turn DFP High/Low pad on. */
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 56ec696e8afa..10d8c4b4baeb 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -1797,7 +1797,7 @@ static const struct file_operations viafb_vt1636_proc_fops = {
 static void viafb_init_proc(struct proc_dir_entry **viafb_entry)
 {
         *viafb_entry = proc_mkdir("viafb", NULL);
-        if (viafb_entry) {
+        if (*viafb_entry) {
                 proc_create("dvp0", 0, *viafb_entry, &viafb_dvp0_proc_fops);
                 proc_create("dvp1", 0, *viafb_entry, &viafb_dvp1_proc_fops);
                 proc_create("dfph", 0, *viafb_entry, &viafb_dfph_proc_fops);
diff --git a/drivers/watchdog/adx_wdt.c b/drivers/watchdog/adx_wdt.c
index 77afb0acc500..9c6594473d3b 100644
--- a/drivers/watchdog/adx_wdt.c
+++ b/drivers/watchdog/adx_wdt.c
@@ -314,7 +314,7 @@ static int adx_wdt_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops adx_wdt_pm_ops = {
+static const struct dev_pm_ops adx_wdt_pm_ops = {
         .suspend = adx_wdt_suspend,
         .resume = adx_wdt_resume,
 };
diff --git a/fs/Kconfig b/fs/Kconfig
index 64d44efad7a5..f8fccaaad628 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -6,6 +6,10 @@ menu "File systems"
 
 if BLOCK
 
+config FS_JOURNAL_INFO
+        bool
+        default n
+
 source "fs/ext2/Kconfig"
 source "fs/ext3/Kconfig"
 source "fs/ext4/Kconfig"
diff --git a/fs/aio.c b/fs/aio.c
index c30dfc006108..1cf12b3dd83a 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -711,10 +711,8 @@ static ssize_t aio_run_iocb(struct kiocb *iocb)
          */
         ret = retry(iocb);
 
-        if (ret != -EIOCBRETRY && ret != -EIOCBQUEUED) {
-                BUG_ON(!list_empty(&iocb->ki_wait.task_list));
+        if (ret != -EIOCBRETRY && ret != -EIOCBQUEUED)
                 aio_complete(iocb, ret, 0);
-        }
 out:
         spin_lock_irq(&ctx->ctx_lock);
 
@@ -866,13 +864,6 @@ static void try_queue_kicked_iocb(struct kiocb *iocb)
         unsigned long flags;
         int run = 0;
 
-        /* We're supposed to be the only path putting the iocb back on the run
-         * list.  If we find that the iocb is *back* on a wait queue already
-         * than retry has happened before we could queue the iocb.  This also
-         * means that the retry could have completed and freed our iocb, no
-         * good. */
-        BUG_ON((!list_empty(&iocb->ki_wait.task_list)));
-
         spin_lock_irqsave(&ctx->ctx_lock, flags);
         /* set this inside the lock so that we can't race with aio_run_iocb()
          * testing it and putting the iocb on the run list under the lock */
@@ -886,7 +877,7 @@ static void try_queue_kicked_iocb(struct kiocb *iocb)
 /*
  * kick_iocb:
  *      Called typically from a wait queue callback context
- *      (aio_wake_function) to trigger a retry of the iocb.
+ *      to trigger a retry of the iocb.
  *      The retry is usually executed by aio workqueue
  *      threads (See aio_kick_handler).
  */
@@ -1520,31 +1511,6 @@ static ssize_t aio_setup_iocb(struct kiocb *kiocb)
         return 0;
 }
 
-/*
- * aio_wake_function:
- *      wait queue callback function for aio notification,
- *      Simply triggers a retry of the operation via kick_iocb.
- *
- *      This callback is specified in the wait queue entry in
- *      a kiocb.
- *
- * Note:
- * This routine is executed with the wait queue lock held.
- * Since kick_iocb acquires iocb->ctx->ctx_lock, it nests
- * the ioctx lock inside the wait queue lock. This is safe
- * because this callback isn't used for wait queues which
- * are nested inside ioctx lock (i.e. ctx->wait)
- */
-static int aio_wake_function(wait_queue_t *wait, unsigned mode,
-                             int sync, void *key)
-{
-        struct kiocb *iocb = container_of(wait, struct kiocb, ki_wait);
-
-        list_del_init(&wait->task_list);
-        kick_iocb(iocb);
-        return 1;
-}
-
 static void aio_batch_add(struct address_space *mapping,
                           struct hlist_head *batch_hash)
 {
@@ -1642,8 +1608,6 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
         req->ki_buf = (char __user *)(unsigned long)iocb->aio_buf;
         req->ki_left = req->ki_nbytes = iocb->aio_nbytes;
         req->ki_opcode = iocb->aio_lio_opcode;
-        init_waitqueue_func_entry(&req->ki_wait, aio_wake_function);
-        INIT_LIST_HEAD(&req->ki_wait.task_list);
 
         ret = aio_setup_iocb(req);
 
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
index 8f7cdde41733..0118d67221b2 100644
--- a/fs/autofs4/autofs_i.h
+++ b/fs/autofs4/autofs_i.h
@@ -60,6 +60,11 @@ do {							\
                 current->pid, __func__, ##args);        \
 } while (0)
 
+struct rehash_entry {
+        struct task_struct *task;
+        struct list_head list;
+};
+
 /* Unified info structure.  This is pointed to by both the dentry and
    inode structures.  Each file in the filesystem has an instance of this
    structure.  It holds a reference to the dentry, so dentries are never
@@ -75,6 +80,9 @@ struct autofs_info {
         struct completion expire_complete;
 
         struct list_head active;
+        int active_count;
+        struct list_head rehash_list;
+
         struct list_head expiring;
 
         struct autofs_sb_info *sbi;
@@ -95,6 +103,8 @@ struct autofs_info {
 
 #define AUTOFS_INF_EXPIRING     (1<<0) /* dentry is in the process of expiring */
 #define AUTOFS_INF_MOUNTPOINT   (1<<1) /* mountpoint status for direct expire */
+#define AUTOFS_INF_PENDING      (1<<2) /* dentry pending mount */
+#define AUTOFS_INF_REHASH       (1<<3) /* dentry in transit to ->lookup() */
 
 struct autofs_wait_queue {
         wait_queue_head_t queue;
@@ -161,7 +171,7 @@ static inline int autofs4_ispending(struct dentry *dentry)
 {
         struct autofs_info *inf = autofs4_dentry_ino(dentry);
 
-        if (dentry->d_flags & DCACHE_AUTOFS_PENDING)
+        if (inf->flags & AUTOFS_INF_PENDING)
                 return 1;
 
         if (inf->flags & AUTOFS_INF_EXPIRING)
@@ -264,5 +274,31 @@ out:
         return ret;
 }
 
+static inline void autofs4_add_expiring(struct dentry *dentry)
+{
+        struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
+        struct autofs_info *ino = autofs4_dentry_ino(dentry);
+        if (ino) {
+                spin_lock(&sbi->lookup_lock);
+                if (list_empty(&ino->expiring))
+                        list_add(&ino->expiring, &sbi->expiring_list);
+                spin_unlock(&sbi->lookup_lock);
+        }
+        return;
+}
+
+static inline void autofs4_del_expiring(struct dentry *dentry)
+{
+        struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
+        struct autofs_info *ino = autofs4_dentry_ino(dentry);
+        if (ino) {
+                spin_lock(&sbi->lookup_lock);
+                if (!list_empty(&ino->expiring))
+                        list_del_init(&ino->expiring);
+                spin_unlock(&sbi->lookup_lock);
+        }
+        return;
+}
+
 void autofs4_dentry_release(struct dentry *);
 extern void autofs4_kill_sb(struct super_block *);
diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index 3da18d453488..74bc9aa6df31 100644
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -27,7 +27,7 @@ static inline int autofs4_can_expire(struct dentry *dentry,
                 return 0;
 
         /* No point expiring a pending mount */
-        if (dentry->d_flags & DCACHE_AUTOFS_PENDING)
+        if (ino->flags & AUTOFS_INF_PENDING)
                 return 0;
 
         if (!do_now) {
@@ -279,6 +279,7 @@ struct dentry *autofs4_expire_direct(struct super_block *sb,
                         root->d_mounted--;
                 }
                 ino->flags |= AUTOFS_INF_EXPIRING;
+                autofs4_add_expiring(root);
                 init_completion(&ino->expire_complete);
                 spin_unlock(&sbi->fs_lock);
                 return root;
@@ -406,6 +407,7 @@ found:
                 expired, (int)expired->d_name.len, expired->d_name.name);
         ino = autofs4_dentry_ino(expired);
         ino->flags |= AUTOFS_INF_EXPIRING;
+        autofs4_add_expiring(expired);
         init_completion(&ino->expire_complete);
         spin_unlock(&sbi->fs_lock);
         spin_lock(&dcache_lock);
@@ -433,7 +435,7 @@ int autofs4_expire_wait(struct dentry *dentry)
 
                 DPRINTK("expire done status=%d", status);
 
-                if (d_unhashed(dentry))
+                if (d_unhashed(dentry) && IS_DEADDIR(dentry->d_inode))
                         return -EAGAIN;
 
                 return status;
@@ -473,6 +475,7 @@ int autofs4_expire_run(struct super_block *sb,
         spin_lock(&sbi->fs_lock);
         ino = autofs4_dentry_ino(dentry);
         ino->flags &= ~AUTOFS_INF_EXPIRING;
+        autofs4_del_expiring(dentry);
         complete_all(&ino->expire_complete);
         spin_unlock(&sbi->fs_lock);
 
@@ -503,6 +506,7 @@ int autofs4_do_expire_multi(struct super_block *sb, struct vfsmount *mnt,
                         ino->flags &= ~AUTOFS_INF_MOUNTPOINT;
                 }
                 ino->flags &= ~AUTOFS_INF_EXPIRING;
+                autofs4_del_expiring(dentry);
                 complete_all(&ino->expire_complete);
                 spin_unlock(&sbi->fs_lock);
                 dput(dentry);
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 69c8142da838..d0a3de247458 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -49,6 +49,8 @@ struct autofs_info *autofs4_init_ino(struct autofs_info *ino,
                 ino->dentry = NULL;
                 ino->size = 0;
                 INIT_LIST_HEAD(&ino->active);
+                INIT_LIST_HEAD(&ino->rehash_list);
+                ino->active_count = 0;
                 INIT_LIST_HEAD(&ino->expiring);
                 atomic_set(&ino->count, 0);
         }
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index b96a3c57359d..30cc9ddf4b70 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -72,6 +72,139 @@ const struct inode_operations autofs4_dir_inode_operations = {
         .rmdir          = autofs4_dir_rmdir,
 };
 
+static void autofs4_add_active(struct dentry *dentry)
+{
+        struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
+        struct autofs_info *ino = autofs4_dentry_ino(dentry);
+        if (ino) {
+                spin_lock(&sbi->lookup_lock);
+                if (!ino->active_count) {
+                        if (list_empty(&ino->active))
+                                list_add(&ino->active, &sbi->active_list);
+                }
+                ino->active_count++;
+                spin_unlock(&sbi->lookup_lock);
+        }
+        return;
+}
+
+static void autofs4_del_active(struct dentry *dentry)
+{
+        struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
+        struct autofs_info *ino = autofs4_dentry_ino(dentry);
+        if (ino) {
+                spin_lock(&sbi->lookup_lock);
+                ino->active_count--;
+                if (!ino->active_count) {
+                        if (!list_empty(&ino->active))
+                                list_del_init(&ino->active);
+                }
+                spin_unlock(&sbi->lookup_lock);
+        }
+        return;
+}
+
+static void autofs4_add_rehash_entry(struct autofs_info *ino,
+                                     struct rehash_entry *entry)
+{
+        entry->task = current;
+        INIT_LIST_HEAD(&entry->list);
+        list_add(&entry->list, &ino->rehash_list);
+        return;
+}
+
+static void autofs4_remove_rehash_entry(struct autofs_info *ino)
+{
+        struct list_head *head = &ino->rehash_list;
+        struct rehash_entry *entry;
+        list_for_each_entry(entry, head, list) {
+                if (entry->task == current) {
+                        list_del(&entry->list);
+                        kfree(entry);
+                        break;
+                }
+        }
+        return;
+}
+
+static void autofs4_remove_rehash_entrys(struct autofs_info *ino)
+{
+        struct autofs_sb_info *sbi = ino->sbi;
+        struct rehash_entry *entry, *next;
+        struct list_head *head;
+
+        spin_lock(&sbi->fs_lock);
+        spin_lock(&sbi->lookup_lock);
+        if (!(ino->flags & AUTOFS_INF_REHASH)) {
+                spin_unlock(&sbi->lookup_lock);
+                spin_unlock(&sbi->fs_lock);
+                return;
+        }
+        ino->flags &= ~AUTOFS_INF_REHASH;
+        head = &ino->rehash_list;
+        list_for_each_entry_safe(entry, next, head, list) {
+                list_del(&entry->list);
+                kfree(entry);
+        }
+        spin_unlock(&sbi->lookup_lock);
+        spin_unlock(&sbi->fs_lock);
+        dput(ino->dentry);
+
+        return;
+}
+
+static void autofs4_revalidate_drop(struct dentry *dentry,
+                                    struct rehash_entry *entry)
+{
+        struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
+        struct autofs_info *ino = autofs4_dentry_ino(dentry);
+        /*
+         * Add to the active list so we can pick this up in
+         * ->lookup(). Also add an entry to a rehash list so
+         * we know when there are no dentrys in flight so we
+         * know when we can rehash the dentry.
+         */
+        spin_lock(&sbi->lookup_lock);
+        if (list_empty(&ino->active))
+                list_add(&ino->active, &sbi->active_list);
+        autofs4_add_rehash_entry(ino, entry);
+        spin_unlock(&sbi->lookup_lock);
+        if (!(ino->flags & AUTOFS_INF_REHASH)) {
+                ino->flags |= AUTOFS_INF_REHASH;
+                dget(dentry);
+                spin_lock(&dentry->d_lock);
+                __d_drop(dentry);
+                spin_unlock(&dentry->d_lock);
+        }
+        return;
+}
+
+static void autofs4_revalidate_rehash(struct dentry *dentry)
+{
+        struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
+        struct autofs_info *ino = autofs4_dentry_ino(dentry);
+        if (ino->flags & AUTOFS_INF_REHASH) {
+                spin_lock(&sbi->lookup_lock);
+                autofs4_remove_rehash_entry(ino);
+                if (list_empty(&ino->rehash_list)) {
+                        spin_unlock(&sbi->lookup_lock);
+                        ino->flags &= ~AUTOFS_INF_REHASH;
+                        d_rehash(dentry);
+                        dput(ino->dentry);
+                } else
+                        spin_unlock(&sbi->lookup_lock);
+        }
+        return;
+}
+
+static unsigned int autofs4_need_mount(unsigned int flags)
+{
+        unsigned int res = 0;
+        if (flags & (TRIGGER_FLAGS | TRIGGER_INTENTS))
+                res = 1;
+        return res;
+}
+
 static int autofs4_dir_open(struct inode *inode, struct file *file)
 {
         struct dentry *dentry = file->f_path.dentry;
@@ -93,7 +226,7 @@ static int autofs4_dir_open(struct inode *inode, struct file *file)
          * it.
          */
         spin_lock(&dcache_lock);
-        if (!d_mountpoint(dentry) && __simple_empty(dentry)) {
+        if (!d_mountpoint(dentry) && list_empty(&dentry->d_subdirs)) {
                 spin_unlock(&dcache_lock);
                 return -ENOENT;
         }
@@ -103,7 +236,7 @@ out:
         return dcache_dir_open(inode, file);
 }
 
-static int try_to_fill_dentry(struct dentry *dentry, int flags)
+static int try_to_fill_dentry(struct dentry *dentry)
 {
         struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
         struct autofs_info *ino = autofs4_dentry_ino(dentry);
@@ -116,55 +249,17 @@ static int try_to_fill_dentry(struct dentry *dentry, int flags)
          * Wait for a pending mount, triggering one if there
          * isn't one already
          */
-        if (dentry->d_inode == NULL) {
-                DPRINTK("waiting for mount name=%.*s",
-                         dentry->d_name.len, dentry->d_name.name);
-
-                status = autofs4_wait(sbi, dentry, NFY_MOUNT);
-
-                DPRINTK("mount done status=%d", status);
-
-                /* Turn this into a real negative dentry? */
-                if (status == -ENOENT) {
-                        spin_lock(&dentry->d_lock);
-                        dentry->d_flags &= ~DCACHE_AUTOFS_PENDING;
-                        spin_unlock(&dentry->d_lock);
-                        return status;
-                } else if (status) {
-                        /* Return a negative dentry, but leave it "pending" */
-                        return status;
-                }
-        /* Trigger mount for path component or follow link */
-        } else if (dentry->d_flags & DCACHE_AUTOFS_PENDING ||
-                        flags & (TRIGGER_FLAGS | TRIGGER_INTENTS) ||
-                        current->link_count) {
-                DPRINTK("waiting for mount name=%.*s",
-                        dentry->d_name.len, dentry->d_name.name);
-
-                spin_lock(&dentry->d_lock);
-                dentry->d_flags |= DCACHE_AUTOFS_PENDING;
-                spin_unlock(&dentry->d_lock);
-                status = autofs4_wait(sbi, dentry, NFY_MOUNT);
+        DPRINTK("waiting for mount name=%.*s",
+                 dentry->d_name.len, dentry->d_name.name);
 
-                DPRINTK("mount done status=%d", status);
+        status = autofs4_wait(sbi, dentry, NFY_MOUNT);
 
-                if (status) {
-                        spin_lock(&dentry->d_lock);
-                        dentry->d_flags &= ~DCACHE_AUTOFS_PENDING;
-                        spin_unlock(&dentry->d_lock);
-                        return status;
-                }
-        }
-
-        /* Initialize expiry counter after successful mount */
-        if (ino)
-                ino->last_used = jiffies;
+        DPRINTK("mount done status=%d", status);
 
-        spin_lock(&dentry->d_lock);
-        dentry->d_flags &= ~DCACHE_AUTOFS_PENDING;
-        spin_unlock(&dentry->d_lock);
+        /* Update expiry counter */
+        ino->last_used = jiffies;
 
-        return 0;
+        return status;
 }
 
 /* For autofs direct mounts the follow link triggers the mount */
@@ -202,27 +297,39 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
         autofs4_expire_wait(dentry);
 
         /* We trigger a mount for almost all flags */
-        lookup_type = nd->flags & (TRIGGER_FLAGS | TRIGGER_INTENTS);
-        if (!(lookup_type || dentry->d_flags & DCACHE_AUTOFS_PENDING))
+        lookup_type = autofs4_need_mount(nd->flags);
+        spin_lock(&sbi->fs_lock);
+        spin_lock(&dcache_lock);
+        if (!(lookup_type || ino->flags & AUTOFS_INF_PENDING)) {
+                spin_unlock(&dcache_lock);
+                spin_unlock(&sbi->fs_lock);
                 goto follow;
+        }
 
         /*
          * If the dentry contains directories then it is an autofs
          * multi-mount with no root mount offset. So don't try to
          * mount it again.
          */
-        spin_lock(&dcache_lock);
-        if (dentry->d_flags & DCACHE_AUTOFS_PENDING ||
-            (!d_mountpoint(dentry) && __simple_empty(dentry))) {
+        if (ino->flags & AUTOFS_INF_PENDING ||
+            (!d_mountpoint(dentry) && list_empty(&dentry->d_subdirs))) {
+                ino->flags |= AUTOFS_INF_PENDING;
                 spin_unlock(&dcache_lock);
+                spin_unlock(&sbi->fs_lock);
+
+                status = try_to_fill_dentry(dentry);
+
+                spin_lock(&sbi->fs_lock);
+                ino->flags &= ~AUTOFS_INF_PENDING;
+                spin_unlock(&sbi->fs_lock);
 
-                status = try_to_fill_dentry(dentry, 0);
                 if (status)
                         goto out_error;
 
                 goto follow;
         }
         spin_unlock(&dcache_lock);
+        spin_unlock(&sbi->fs_lock);
 follow:
         /*
          * If there is no root mount it must be an autofs
@@ -254,18 +361,47 @@ static int autofs4_revalidate(struct dentry *dentry, struct nameidata *nd)
 {
         struct inode *dir = dentry->d_parent->d_inode;
         struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb);
-        int oz_mode = autofs4_oz_mode(sbi);
+        struct autofs_info *ino = autofs4_dentry_ino(dentry);
+        struct rehash_entry *entry;
         int flags = nd ? nd->flags : 0;
-        int status = 1;
+        unsigned int mutex_aquired;
+
+        DPRINTK("name = %.*s oz_mode = %d",
+                dentry->d_name.len, dentry->d_name.name, oz_mode);
+
+        /* Daemon never causes a mount to trigger */
+        if (autofs4_oz_mode(sbi))
+                return 1;
+
+        entry = kmalloc(sizeof(struct rehash_entry), GFP_KERNEL);
+        if (!entry)
+                return -ENOMEM;
+
+        mutex_aquired = mutex_trylock(&dir->i_mutex);
 
-        /* Pending dentry */
         spin_lock(&sbi->fs_lock);
+        spin_lock(&dcache_lock);
+        /* Pending dentry */
         if (autofs4_ispending(dentry)) {
-                /* The daemon never causes a mount to trigger */
-                spin_unlock(&sbi->fs_lock);
+                int status;
 
-                if (oz_mode)
-                        return 1;
+                /*
+                 * We can only unhash and send this to ->lookup() if
+                 * the directory mutex is held over d_revalidate() and
+                 * ->lookup(). This prevents the VFS from incorrectly
+                 * seeing the dentry as non-existent.
+                 */
+                ino->flags |= AUTOFS_INF_PENDING;
+                if (!mutex_aquired) {
+                        autofs4_revalidate_drop(dentry, entry);
+                        spin_unlock(&dcache_lock);
+                        spin_unlock(&sbi->fs_lock);
+                        return 0;
+                }
+                spin_unlock(&dcache_lock);
+                spin_unlock(&sbi->fs_lock);
+                mutex_unlock(&dir->i_mutex);
+                kfree(entry);
 
                 /*
                  * If the directory has gone away due to an expire
@@ -279,46 +415,82 @@ static int autofs4_revalidate(struct dentry *dentry, struct nameidata *nd)
                  * A zero status is success otherwise we have a
                  * negative error code.
                  */
-                status = try_to_fill_dentry(dentry, flags);
+                status = try_to_fill_dentry(dentry);
+
+                spin_lock(&sbi->fs_lock);
+                ino->flags &= ~AUTOFS_INF_PENDING;
+                spin_unlock(&sbi->fs_lock);
+
                 if (status == 0)
                         return 1;
 
                 return status;
         }
-        spin_unlock(&sbi->fs_lock);
-
-        /* Negative dentry.. invalidate if "old" */
-        if (dentry->d_inode == NULL)
-                return 0;
 
         /* Check for a non-mountpoint directory with no contents */
-        spin_lock(&dcache_lock);
         if (S_ISDIR(dentry->d_inode->i_mode) &&
-            !d_mountpoint(dentry) && 
-            __simple_empty(dentry)) {
+            !d_mountpoint(dentry) && list_empty(&dentry->d_subdirs)) {
                 DPRINTK("dentry=%p %.*s, emptydir",
                          dentry, dentry->d_name.len, dentry->d_name.name);
-                spin_unlock(&dcache_lock);
 
-                /* The daemon never causes a mount to trigger */
-                if (oz_mode)
-                        return 1;
+                if (autofs4_need_mount(flags) || current->link_count) {
+                        int status;
 
-                /*
-                 * A zero status is success otherwise we have a
-                 * negative error code.
-                 */
-                status = try_to_fill_dentry(dentry, flags);
-                if (status == 0)
-                        return 1;
+                        /*
+                         * We can only unhash and send this to ->lookup() if
+                         * the directory mutex is held over d_revalidate() and
+                         * ->lookup(). This prevents the VFS from incorrectly
+                         * seeing the dentry as non-existent.
+                         */
+                        ino->flags |= AUTOFS_INF_PENDING;
+                        if (!mutex_aquired) {
+                                autofs4_revalidate_drop(dentry, entry);
+                                spin_unlock(&dcache_lock);
+                                spin_unlock(&sbi->fs_lock);
+                                return 0;
+                        }
+                        spin_unlock(&dcache_lock);
+                        spin_unlock(&sbi->fs_lock);
+                        mutex_unlock(&dir->i_mutex);
+                        kfree(entry);
 
-                return status;
+                        /*
+                         * A zero status is success otherwise we have a
+                         * negative error code.
+                         */
+                        status = try_to_fill_dentry(dentry);
+
+                        spin_lock(&sbi->fs_lock);
+                        ino->flags &= ~AUTOFS_INF_PENDING;
+                        spin_unlock(&sbi->fs_lock);
+
+                        if (status == 0)
+                                return 1;
+
+                        return status;
+                }
         }
         spin_unlock(&dcache_lock);
+        spin_unlock(&sbi->fs_lock);
+
+        if (mutex_aquired)
+                mutex_unlock(&dir->i_mutex);
+
+        kfree(entry);
 
         return 1;
 }
 
+static void autofs4_free_rehash_entrys(struct autofs_info *inf)
+{
+        struct list_head *head = &inf->rehash_list;
+        struct rehash_entry *entry, *next;
+        list_for_each_entry_safe(entry, next, head, list) {
+                list_del(&entry->list);
+                kfree(entry);
+        }
+}
+
 void autofs4_dentry_release(struct dentry *de)
 {
         struct autofs_info *inf;
@@ -337,6 +509,8 @@ void autofs4_dentry_release(struct dentry *de)
                                 list_del(&inf->active);
                         if (!list_empty(&inf->expiring))
                                 list_del(&inf->expiring);
+                        if (!list_empty(&inf->rehash_list))
+                                autofs4_free_rehash_entrys(inf);
                         spin_unlock(&sbi->lookup_lock);
                 }
 
@@ -359,35 +533,52 @@ static const struct dentry_operations autofs4_dentry_operations = {
         .d_release      = autofs4_dentry_release,
 };
 
-static struct dentry *autofs4_lookup_active(struct autofs_sb_info *sbi, struct dentry *parent, struct qstr *name)
+static struct dentry *autofs4_lookup_active(struct dentry *dentry)
 {
+        struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
+        struct dentry *parent = dentry->d_parent;
+        struct qstr *name = &dentry->d_name;
         unsigned int len = name->len;
         unsigned int hash = name->hash;
         const unsigned char *str = name->name;
         struct list_head *p, *head;
 
+restart:
         spin_lock(&dcache_lock);
         spin_lock(&sbi->lookup_lock);
         head = &sbi->active_list;
         list_for_each(p, head) {
                 struct autofs_info *ino;
-                struct dentry *dentry;
+                struct dentry *active;
                 struct qstr *qstr;
 
                 ino = list_entry(p, struct autofs_info, active);
-                dentry = ino->dentry;
+                active = ino->dentry;
 
-                spin_lock(&dentry->d_lock);
+                spin_lock(&active->d_lock);
 
                 /* Already gone? */
-                if (atomic_read(&dentry->d_count) == 0)
+                if (atomic_read(&active->d_count) == 0)
                         goto next;
 
-                qstr = &dentry->d_name;
+                if (active->d_inode && IS_DEADDIR(active->d_inode)) {
+                        if (!list_empty(&ino->rehash_list)) {
+                                dget(active);
+                                spin_unlock(&active->d_lock);
+                                spin_unlock(&sbi->lookup_lock);
+                                spin_unlock(&dcache_lock);
+                                autofs4_remove_rehash_entrys(ino);
+                                dput(active);
+                                goto restart;
+                        }
+                        goto next;
+                }
+
+                qstr = &active->d_name;
 
-                if (dentry->d_name.hash != hash)
+                if (active->d_name.hash != hash)
                         goto next;
-                if (dentry->d_parent != parent)
+                if (active->d_parent != parent)
                         goto next;
 
                 if (qstr->len != len)
@@ -395,15 +586,13 @@ static struct dentry *autofs4_lookup_active(struct autofs_sb_info *sbi, struct d
                 if (memcmp(qstr->name, str, len))
                         goto next;
 
-                if (d_unhashed(dentry)) {
-                        dget(dentry);
-                        spin_unlock(&dentry->d_lock);
-                        spin_unlock(&sbi->lookup_lock);
-                        spin_unlock(&dcache_lock);
-                        return dentry;
-                }
+                dget(active);
+                spin_unlock(&active->d_lock);
+                spin_unlock(&sbi->lookup_lock);
+                spin_unlock(&dcache_lock);
+                return active;
 next:
-                spin_unlock(&dentry->d_lock);
+                spin_unlock(&active->d_lock);
         }
         spin_unlock(&sbi->lookup_lock);
         spin_unlock(&dcache_lock);
@@ -411,8 +600,11 @@ next:
         return NULL;
 }
 
-static struct dentry *autofs4_lookup_expiring(struct autofs_sb_info *sbi, struct dentry *parent, struct qstr *name)
+static struct dentry *autofs4_lookup_expiring(struct dentry *dentry)
 {
+        struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
+        struct dentry *parent = dentry->d_parent;
+        struct qstr *name = &dentry->d_name;
         unsigned int len = name->len;
         unsigned int hash = name->hash;
         const unsigned char *str = name->name;
@@ -423,23 +615,23 @@ static struct dentry *autofs4_lookup_expiring(struct autofs_sb_info *sbi, struct
         head = &sbi->expiring_list;
         list_for_each(p, head) {
                 struct autofs_info *ino;
-                struct dentry *dentry;
+                struct dentry *expiring;
                 struct qstr *qstr;
 
                 ino = list_entry(p, struct autofs_info, expiring);
-                dentry = ino->dentry;
+                expiring = ino->dentry;
 
-                spin_lock(&dentry->d_lock);
+                spin_lock(&expiring->d_lock);
 
                 /* Bad luck, we've already been dentry_iput */
-                if (!dentry->d_inode)
+                if (!expiring->d_inode)
                         goto next;
 
-                qstr = &dentry->d_name;
+                qstr = &expiring->d_name;
 
-                if (dentry->d_name.hash != hash)
+                if (expiring->d_name.hash != hash)
                         goto next;
-                if (dentry->d_parent != parent)
+                if (expiring->d_parent != parent)
                         goto next;
 
                 if (qstr->len != len)
@@ -447,15 +639,13 @@ static struct dentry *autofs4_lookup_expiring(struct autofs_sb_info *sbi, struct
                 if (memcmp(qstr->name, str, len))
                         goto next;
 
-                if (d_unhashed(dentry)) {
-                        dget(dentry);
-                        spin_unlock(&dentry->d_lock);
-                        spin_unlock(&sbi->lookup_lock);
-                        spin_unlock(&dcache_lock);
-                        return dentry;
-                }
+                dget(expiring);
+                spin_unlock(&expiring->d_lock);
+                spin_unlock(&sbi->lookup_lock);
+                spin_unlock(&dcache_lock);
+                return expiring;
 next:
-                spin_unlock(&dentry->d_lock);
+                spin_unlock(&expiring->d_lock);
         }
         spin_unlock(&sbi->lookup_lock);
         spin_unlock(&dcache_lock);
@@ -463,13 +653,56 @@ next:
         return NULL;
 }
 
+static struct autofs_info *init_new_dentry(struct autofs_sb_info *sbi,
+                                           struct dentry *dentry, int oz_mode)
+{
+        struct autofs_info *ino;
+
+        /*
+         * Mark the dentry incomplete but don't hash it. We do this
+         * to serialize our inode creation operations (symlink and
+         * mkdir) which prevents deadlock during the callback to
+         * the daemon. Subsequent user space lookups for the same
+         * dentry are placed on the wait queue while the daemon
+         * itself is allowed passage unresticted so the create
+         * operation itself can then hash the dentry. Finally,
+         * we check for the hashed dentry and return the newly
+         * hashed dentry.
+         */
+        dentry->d_op = &autofs4_root_dentry_operations;
+
+        /*
+         * And we need to ensure that the same dentry is used for
+         * all following lookup calls until it is hashed so that
+         * the dentry flags are persistent throughout the request.
+         */
+        ino = autofs4_init_ino(NULL, sbi, 0555);
+        if (!ino)
+                return ERR_PTR(-ENOMEM);
+
+        dentry->d_fsdata = ino;
+        ino->dentry = dentry;
+
+        /*
+         * Only set the mount pending flag for new dentrys not created
+         * by the daemon.
+         */
+        if (!oz_mode)
+                ino->flags |= AUTOFS_INF_PENDING;
+
+        d_instantiate(dentry, NULL);
+
+        return ino;
+}
+
 /* Lookups in the root directory */
 static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
 {
         struct autofs_sb_info *sbi;
         struct autofs_info *ino;
-        struct dentry *expiring, *unhashed;
+        struct dentry *expiring, *active;
         int oz_mode;
+        int status = 0;
 
         DPRINTK("name = %.*s",
                 dentry->d_name.len, dentry->d_name.name);
@@ -484,123 +717,100 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
         DPRINTK("pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d",
                  current->pid, task_pgrp_nr(current), sbi->catatonic, oz_mode);
 
-        unhashed = autofs4_lookup_active(sbi, dentry->d_parent, &dentry->d_name);
-        if (unhashed)
-                dentry = unhashed;
-        else {
-                /*
-                 * Mark the dentry incomplete but don't hash it. We do this
-                 * to serialize our inode creation operations (symlink and
-                 * mkdir) which prevents deadlock during the callback to
-                 * the daemon. Subsequent user space lookups for the same
-                 * dentry are placed on the wait queue while the daemon
-                 * itself is allowed passage unresticted so the create
-                 * operation itself can then hash the dentry. Finally,
-                 * we check for the hashed dentry and return the newly
-                 * hashed dentry.
-                 */
-                dentry->d_op = &autofs4_root_dentry_operations;
-
-                /*
-                 * And we need to ensure that the same dentry is used for
-                 * all following lookup calls until it is hashed so that
-                 * the dentry flags are persistent throughout the request.
-                 */
-                ino = autofs4_init_ino(NULL, sbi, 0555);
-                if (!ino)
-                        return ERR_PTR(-ENOMEM);
-
-                dentry->d_fsdata = ino;
-                ino->dentry = dentry;
-
-                spin_lock(&sbi->lookup_lock);
-                list_add(&ino->active, &sbi->active_list);
-                spin_unlock(&sbi->lookup_lock);
-
-                d_instantiate(dentry, NULL);
+        spin_lock(&sbi->fs_lock);
+        active = autofs4_lookup_active(dentry);
+        if (active) {
+                dentry = active;
+                ino = autofs4_dentry_ino(dentry);
+                /* If this came from revalidate, rehash it */
+                autofs4_revalidate_rehash(dentry);
+                spin_unlock(&sbi->fs_lock);
+        } else {
+                spin_unlock(&sbi->fs_lock);
+                ino = init_new_dentry(sbi, dentry, oz_mode);
+                if (IS_ERR(ino))
+                        return (struct dentry *) ino;
         }
 
+        autofs4_add_active(dentry);
+
         if (!oz_mode) {
+                expiring = autofs4_lookup_expiring(dentry);
                 mutex_unlock(&dir->i_mutex);
-                expiring = autofs4_lookup_expiring(sbi,
-                                                   dentry->d_parent,
-                                                   &dentry->d_name);
                 if (expiring) {
                         /*
                          * If we are racing with expire the request might not
                          * be quite complete but the directory has been removed
                          * so it must have been successful, so just wait for it.
                          */
-                        ino = autofs4_dentry_ino(expiring);
                         autofs4_expire_wait(expiring);
-                        spin_lock(&sbi->lookup_lock);
-                        if (!list_empty(&ino->expiring))
-                                list_del_init(&ino->expiring);
-                        spin_unlock(&sbi->lookup_lock);
                         dput(expiring);
                 }
-
-                spin_lock(&dentry->d_lock);
-                dentry->d_flags |= DCACHE_AUTOFS_PENDING;
-                spin_unlock(&dentry->d_lock);
-                if (dentry->d_op && dentry->d_op->d_revalidate)
-                        (dentry->d_op->d_revalidate)(dentry, nd);
+                status = try_to_fill_dentry(dentry);
                 mutex_lock(&dir->i_mutex);
+                spin_lock(&sbi->fs_lock);
+                ino->flags &= ~AUTOFS_INF_PENDING;
+                spin_unlock(&sbi->fs_lock);
         }
 
+        autofs4_del_active(dentry);
+
         /*
-         * If we are still pending, check if we had to handle
+         * If we had a mount fail, check if we had to handle
          * a signal. If so we can force a restart..
          */
-        if (dentry->d_flags & DCACHE_AUTOFS_PENDING) {
+        if (status) {
                 /* See if we were interrupted */
                 if (signal_pending(current)) {
                         sigset_t *sigset = &current->pending.signal;
                         if (sigismember (sigset, SIGKILL) ||
                             sigismember (sigset, SIGQUIT) ||
                             sigismember (sigset, SIGINT)) {
-                            if (unhashed)
-                                dput(unhashed);
+                            if (active)
+                                dput(active);
                             return ERR_PTR(-ERESTARTNOINTR);
                         }
                 }
-                if (!oz_mode) {
-                        spin_lock(&dentry->d_lock);
-                        dentry->d_flags &= ~DCACHE_AUTOFS_PENDING;
-                        spin_unlock(&dentry->d_lock);
+        }
+
+        /*
+         * User space can (and has done in the past) remove and re-create
+         * this directory during the callback. This can leave us with an
+         * unhashed dentry, but a successful mount!  So we need to
+         * perform another cached lookup in case the dentry now exists.
+         */
+        if (!oz_mode && !have_submounts(dentry)) {
+                struct dentry *new;
+                new = d_lookup(dentry->d_parent, &dentry->d_name);
+                if (new) {
+                        if (active)
+                                dput(active);
+                        return new;
+                } else {
+                        if (!status)
+                                status = -ENOENT;
                 }
         }
 
         /*
-         * If this dentry is unhashed, then we shouldn't honour this
-         * lookup.  Returning ENOENT here doesn't do the right thing
-         * for all system calls, but it should be OK for the operations
-         * we permit from an autofs.
+         * If we had a mount failure, return status to user space.
+         * If the mount succeeded and we used a dentry from the active queue
+         * return it.
          */
-        if (!oz_mode && d_unhashed(dentry)) {
+        if (status) {
+                dentry = ERR_PTR(status);
+                if (active)
+                        dput(active);
+                return dentry;
+        } else {
                 /*
-                 * A user space application can (and has done in the past)
-                 * remove and re-create this directory during the callback.
-                 * This can leave us with an unhashed dentry, but a
-                 * successful mount!  So we need to perform another
-                 * cached lookup in case the dentry now exists.
+                 * Valid successful mount, return active dentry or NULL
+                 * for a new dentry.
                  */
-                struct dentry *parent = dentry->d_parent;
-                struct dentry *new = d_lookup(parent, &dentry->d_name);
-                if (new != NULL)
-                        dentry = new;
-                else
-                        dentry = ERR_PTR(-ENOENT);
-
-                if (unhashed)
-                        dput(unhashed);
-
-                return dentry;
+                if (active)
+                        return active;
         }
 
-        if (unhashed)
-                return unhashed;
-
         return NULL;
 }
 
@@ -624,11 +834,6 @@ static int autofs4_dir_symlink(struct inode *dir,
         if (!ino)
                 return -ENOMEM;
 
-        spin_lock(&sbi->lookup_lock);
-        if (!list_empty(&ino->active))
-                list_del_init(&ino->active);
-        spin_unlock(&sbi->lookup_lock);
-
         ino->size = strlen(symname);
         cp = kmalloc(ino->size + 1, GFP_KERNEL);
         if (!cp) {
@@ -705,10 +910,6 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry)
         dir->i_mtime = CURRENT_TIME;
 
         spin_lock(&dcache_lock);
-        spin_lock(&sbi->lookup_lock);
-        if (list_empty(&ino->expiring))
-                list_add(&ino->expiring, &sbi->expiring_list);
-        spin_unlock(&sbi->lookup_lock);
         spin_lock(&dentry->d_lock);
         __d_drop(dentry);
         spin_unlock(&dentry->d_lock);
@@ -734,10 +935,6 @@ static int autofs4_dir_rmdir(struct inode *dir, struct dentry *dentry)
                 spin_unlock(&dcache_lock);
                 return -ENOTEMPTY;
         }
-        spin_lock(&sbi->lookup_lock);
-        if (list_empty(&ino->expiring))
-                list_add(&ino->expiring, &sbi->expiring_list);
-        spin_unlock(&sbi->lookup_lock);
         spin_lock(&dentry->d_lock);
         __d_drop(dentry);
         spin_unlock(&dentry->d_lock);
@@ -775,11 +972,6 @@ static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, int mode)
         if (!ino)
                 return -ENOMEM;
 
-        spin_lock(&sbi->lookup_lock);
-        if (!list_empty(&ino->active))
-                list_del_init(&ino->active);
-        spin_unlock(&sbi->lookup_lock);
-
         inode = autofs4_get_inode(dir->i_sb, ino);
         if (!inode) {
                 if (!dentry->d_fsdata)
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index d15ea1790bfb..97b6e9efeb7f 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -44,7 +44,7 @@ static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
  * If we don't support core dumping, then supply a NULL so we
  * don't even try.
  */
-#if defined(USE_ELF_CORE_DUMP) && defined(CONFIG_ELF_CORE)
+#ifdef CONFIG_ELF_CORE
 static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, unsigned long limit);
 #else
 #define elf_core_dump   NULL
@@ -1101,12 +1101,7 @@ out:
         return error;
 }
 
-/*
- * Note that some platforms still use traditional core dumps and not
- * the ELF core dump.  Each platform can select it as appropriate.
- */
-#if defined(USE_ELF_CORE_DUMP) && defined(CONFIG_ELF_CORE)
-
+#ifdef CONFIG_ELF_CORE
 /*
  * ELF core dumper
  *
@@ -2063,7 +2058,7 @@ out:
         return has_dumped;
 }
 
-#endif          /* USE_ELF_CORE_DUMP */
+#endif          /* CONFIG_ELF_CORE */
 
 static int __init init_elf_binfmt(void)
 {
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 38502c67987c..7b055385db8e 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -75,14 +75,14 @@ static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *,
 static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *,
                                              struct file *, struct mm_struct *);
 
-#if defined(USE_ELF_CORE_DUMP) && defined(CONFIG_ELF_CORE)
+#ifdef CONFIG_ELF_CORE
 static int elf_fdpic_core_dump(long, struct pt_regs *, struct file *, unsigned long limit);
 #endif
 
 static struct linux_binfmt elf_fdpic_format = {
         .module         = THIS_MODULE,
         .load_binary    = load_elf_fdpic_binary,
-#if defined(USE_ELF_CORE_DUMP) && defined(CONFIG_ELF_CORE)
+#ifdef CONFIG_ELF_CORE
         .core_dump      = elf_fdpic_core_dump,
 #endif
         .min_coredump   = ELF_EXEC_PAGESIZE,
@@ -380,7 +380,8 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm,
         down_write(&current->mm->mmap_sem);
         current->mm->start_brk = do_mmap(NULL, 0, stack_size,
                                          PROT_READ | PROT_WRITE | PROT_EXEC,
-                                         MAP_PRIVATE | MAP_ANONYMOUS | MAP_GROWSDOWN,
+                                         MAP_PRIVATE | MAP_ANONYMOUS |
+                                         MAP_UNINITIALIZED | MAP_GROWSDOWN,
                                          0);
 
         if (IS_ERR_VALUE(current->mm->start_brk)) {
@@ -1200,7 +1201,7 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
  *
  * Modelled on fs/binfmt_elf.c core dumper
  */
-#if defined(USE_ELF_CORE_DUMP) && defined(CONFIG_ELF_CORE)
+#ifdef CONFIG_ELF_CORE
 
 /*
  * These are the only things you should do on a core-file: use only these
@@ -1825,4 +1826,4 @@ cleanup:
 #undef NUM_NOTES
 }
 
-#endif          /* USE_ELF_CORE_DUMP */
+#endif          /* CONFIG_ELF_CORE */
diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig
index 7bb3c020e570..402afe0a0bfb 100644
--- a/fs/btrfs/Kconfig
+++ b/fs/btrfs/Kconfig
@@ -4,6 +4,7 @@ config BTRFS_FS
         select LIBCRC32C
         select ZLIB_INFLATE
         select ZLIB_DEFLATE
+        select FS_JOURNAL_INFO
         help
           Btrfs is a new filesystem with extents, writable snapshotting,
           support for multiple devices and many more features.
diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
index 4618516dd994..c2413561ea75 100644
--- a/fs/cachefiles/daemon.c
+++ b/fs/cachefiles/daemon.c
@@ -21,6 +21,7 @@
 #include <linux/mount.h>
 #include <linux/statfs.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/fs_struct.h>
 #include "internal.h"
 
@@ -257,8 +258,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
                 if (args == data)
                         goto error;
                 *args = '\0';
-                for (args++; isspace(*args); args++)
-                        continue;
+                args = skip_spaces(++args);
         }
 
         /* run the appropriate command handler */
diff --git a/fs/cifs/export.c b/fs/cifs/export.c
index 75949d6a5f1b..6177f7cca16a 100644
--- a/fs/cifs/export.c
+++ b/fs/cifs/export.c
@@ -24,7 +24,7 @@
  */
 
  /*
-  * See Documentation/filesystems/Exporting
+  * See Documentation/filesystems/nfs/Exporting
   * and examples in fs/exportfs
   *
   * Since cifs is a network file system, an "fsid" must be included for
diff --git a/fs/compat.c b/fs/compat.c
index 6c19040ffeef..00d90c2e66f0 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -38,8 +38,6 @@
 #include <linux/dirent.h>
 #include <linux/fsnotify.h>
 #include <linux/highuid.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/syscall.h>
 #include <linux/personality.h>
 #include <linux/rwsem.h>
diff --git a/fs/direct-io.c b/fs/direct-io.c
index b912270942fa..4012885d027f 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -53,13 +53,6 @@
  *
  * If blkfactor is zero then the user's request was aligned to the filesystem's
  * blocksize.
- *
- * lock_type is DIO_LOCKING for regular files on direct-IO-naive filesystems.
- * This determines whether we need to do the fancy locking which prevents
- * direct-IO from being able to read uninitialised disk blocks.  If its zero
- * (blockdev) this locking is not done, and if it is DIO_OWN_LOCKING i_mutex is
- * not held for the entire direct write (taken briefly, initially, during a
- * direct read though, but its never held for the duration of a direct-IO).
  */
 
 struct dio {
@@ -68,7 +61,7 @@ struct dio {
         struct inode *inode;
         int rw;
         loff_t i_size;                  /* i_size when submitted */
-        int lock_type;                  /* doesn't change */
+        int flags;                      /* doesn't change */
         unsigned blkbits;               /* doesn't change */
         unsigned blkfactor;             /* When we're using an alignment which
                                            is finer than the filesystem's soft
@@ -104,6 +97,18 @@ struct dio {
         unsigned cur_page_len;          /* Nr of bytes at cur_page_offset */
         sector_t cur_page_block;        /* Where it starts */
 
+        /* BIO completion state */
+        spinlock_t bio_lock;            /* protects BIO fields below */
+        unsigned long refcount;         /* direct_io_worker() and bios */
+        struct bio *bio_list;           /* singly linked via bi_private */
+        struct task_struct *waiter;     /* waiting task (NULL if none) */
+
+        /* AIO related stuff */
+        struct kiocb *iocb;             /* kiocb */
+        int is_async;                   /* is IO async ? */
+        int io_error;                   /* IO error in completion path */
+        ssize_t result;                 /* IO result */
+
         /*
          * Page fetching state. These variables belong to dio_refill_pages().
          */
@@ -115,22 +120,16 @@ struct dio {
          * Page queue.  These variables belong to dio_refill_pages() and
          * dio_get_page().
          */
-        struct page *pages[DIO_PAGES];  /* page buffer */
         unsigned head;                  /* next page to process */
         unsigned tail;                  /* last valid page + 1 */
         int page_errors;                /* errno from get_user_pages() */
 
-        /* BIO completion state */
-        spinlock_t bio_lock;            /* protects BIO fields below */
-        unsigned long refcount;         /* direct_io_worker() and bios */
-        struct bio *bio_list;           /* singly linked via bi_private */
-        struct task_struct *waiter;     /* waiting task (NULL if none) */
-
-        /* AIO related stuff */
-        struct kiocb *iocb;             /* kiocb */
-        int is_async;                   /* is IO async ? */
-        int io_error;                   /* IO error in completion path */
-        ssize_t result;                 /* IO result */
+        /*
+         * pages[] (and any fields placed after it) are not zeroed out at
+         * allocation time.  Don't add new fields after pages[] unless you
+         * wish that they not be zeroed.
+         */
+        struct page *pages[DIO_PAGES];  /* page buffer */
 };
 
 /*
@@ -240,7 +239,8 @@ static int dio_complete(struct dio *dio, loff_t offset, int ret)
         if (dio->end_io && dio->result)
                 dio->end_io(dio->iocb, offset, transferred,
                             dio->map_bh.b_private);
-        if (dio->lock_type == DIO_LOCKING)
+
+        if (dio->flags & DIO_LOCKING)
                 /* lockdep: non-owner release */
                 up_read_non_owner(&dio->inode->i_alloc_sem);
 
@@ -515,21 +515,24 @@ static int get_more_blocks(struct dio *dio)
                 map_bh->b_state = 0;
                 map_bh->b_size = fs_count << dio->inode->i_blkbits;
 
+                /*
+                 * For writes inside i_size on a DIO_SKIP_HOLES filesystem we
+                 * forbid block creations: only overwrites are permitted.
+                 * We will return early to the caller once we see an
+                 * unmapped buffer head returned, and the caller will fall
+                 * back to buffered I/O.
+                 *
+                 * Otherwise the decision is left to the get_blocks method,
+                 * which may decide to handle it or also return an unmapped
+                 * buffer head.
+                 */
                 create = dio->rw & WRITE;
-                if (dio->lock_type == DIO_LOCKING) {
+                if (dio->flags & DIO_SKIP_HOLES) {
                         if (dio->block_in_file < (i_size_read(dio->inode) >>
                                                         dio->blkbits))
                                 create = 0;
-                } else if (dio->lock_type == DIO_NO_LOCKING) {
-                        create = 0;
                 }
 
-                /*
-                 * For writes inside i_size we forbid block creations: only
-                 * overwrites are permitted.  We fall back to buffered writes
-                 * at a higher level for inside-i_size block-instantiating
-                 * writes.
-                 */
                 ret = (*dio->get_block)(dio->inode, fs_startblk,
                                                 map_bh, create);
         }
@@ -1039,7 +1042,7 @@ direct_io_worker(int rw, struct kiocb *iocb, struct inode *inode,
          * we can let i_mutex go now that its achieved its purpose
          * of protecting us from looking up uninitialized blocks.
          */
-        if ((rw == READ) && (dio->lock_type == DIO_LOCKING))
+        if (rw == READ && (dio->flags & DIO_LOCKING))
                 mutex_unlock(&dio->inode->i_mutex);
 
         /*
@@ -1086,30 +1089,28 @@ direct_io_worker(int rw, struct kiocb *iocb, struct inode *inode,
 
 /*
  * This is a library function for use by filesystem drivers.
- * The locking rules are governed by the dio_lock_type parameter.
  *
- * DIO_NO_LOCKING (no locking, for raw block device access)
- * For writes, i_mutex is not held on entry; it is never taken.
+ * The locking rules are governed by the flags parameter:
+ *  - if the flags value contains DIO_LOCKING we use a fancy locking
+ *    scheme for dumb filesystems.
+ *    For writes this function is called under i_mutex and returns with
+ *    i_mutex held, for reads, i_mutex is not held on entry, but it is
+ *    taken and dropped again before returning.
+ *    For reads and writes i_alloc_sem is taken in shared mode and released
+ *    on I/O completion (which may happen asynchronously after returning to
+ *    the caller).
  *
- * DIO_LOCKING (simple locking for regular files)
- * For writes we are called under i_mutex and return with i_mutex held, even
- * though it is internally dropped.
- * For reads, i_mutex is not held on entry, but it is taken and dropped before
- * returning.
- *
- * DIO_OWN_LOCKING (filesystem provides synchronisation and handling of
- *      uninitialised data, allowing parallel direct readers and writers)
- * For writes we are called without i_mutex, return without it, never touch it.
- * For reads we are called under i_mutex and return with i_mutex held, even
- * though it may be internally dropped.
- *
- * Additional i_alloc_sem locking requirements described inline below.
+ *  - if the flags value does NOT contain DIO_LOCKING we don't use any
+ *    internal locking but rather rely on the filesystem to synchronize
+ *    direct I/O reads/writes versus each other and truncate.
+ *    For reads and writes both i_mutex and i_alloc_sem are not held on
+ *    entry and are never taken.
  */
 ssize_t
 __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
         struct block_device *bdev, const struct iovec *iov, loff_t offset, 
         unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
-        int dio_lock_type)
+        int flags)
 {
         int seg;
         size_t size;
@@ -1120,8 +1121,6 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
         ssize_t retval = -EINVAL;
         loff_t end = offset;
         struct dio *dio;
-        int release_i_mutex = 0;
-        int acquire_i_mutex = 0;
 
         if (rw & WRITE)
                 rw = WRITE_ODIRECT_PLUG;
@@ -1151,48 +1150,41 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
                 }
         }
 
-        dio = kzalloc(sizeof(*dio), GFP_KERNEL);
+        dio = kmalloc(sizeof(*dio), GFP_KERNEL);
         retval = -ENOMEM;
         if (!dio)
                 goto out;
-
         /*
-         * For block device access DIO_NO_LOCKING is used,
-         *      neither readers nor writers do any locking at all
-         * For regular files using DIO_LOCKING,
-         *      readers need to grab i_mutex and i_alloc_sem
-         *      writers need to grab i_alloc_sem only (i_mutex is already held)
-         * For regular files using DIO_OWN_LOCKING,
-         *      neither readers nor writers take any locks here
+         * Believe it or not, zeroing out the page array caused a .5%
+         * performance regression in a database benchmark.  So, we take
+         * care to only zero out what's needed.
          */
-        dio->lock_type = dio_lock_type;
-        if (dio_lock_type != DIO_NO_LOCKING) {
+        memset(dio, 0, offsetof(struct dio, pages));
+
+        dio->flags = flags;
+        if (dio->flags & DIO_LOCKING) {
                 /* watch out for a 0 len io from a tricksy fs */
                 if (rw == READ && end > offset) {
-                        struct address_space *mapping;
+                        struct address_space *mapping =
+                                        iocb->ki_filp->f_mapping;
 
-                        mapping = iocb->ki_filp->f_mapping;
-                        if (dio_lock_type != DIO_OWN_LOCKING) {
-                                mutex_lock(&inode->i_mutex);
-                                release_i_mutex = 1;
-                        }
+                        /* will be released by direct_io_worker */
+                        mutex_lock(&inode->i_mutex);
 
                         retval = filemap_write_and_wait_range(mapping, offset,
                                                               end - 1);
                         if (retval) {
+                                mutex_unlock(&inode->i_mutex);
                                 kfree(dio);
                                 goto out;
                         }
-
-                        if (dio_lock_type == DIO_OWN_LOCKING) {
-                                mutex_unlock(&inode->i_mutex);
-                                acquire_i_mutex = 1;
-                        }
                 }
 
-                if (dio_lock_type == DIO_LOCKING)
-                        /* lockdep: not the owner will release it */
-                        down_read_non_owner(&inode->i_alloc_sem);
+                /*
+                 * Will be released at I/O completion, possibly in a
+                 * different thread.
+                 */
+                down_read_non_owner(&inode->i_alloc_sem);
         }
 
         /*
@@ -1210,24 +1202,19 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
         /*
          * In case of error extending write may have instantiated a few
          * blocks outside i_size. Trim these off again for DIO_LOCKING.
-         * NOTE: DIO_NO_LOCK/DIO_OWN_LOCK callers have to handle this by
-         * it's own meaner.
+         *
+         * NOTE: filesystems with their own locking have to handle this
+         * on their own.
          */
-        if (unlikely(retval < 0 && (rw & WRITE))) {
-                loff_t isize = i_size_read(inode);
-
-                if (end > isize && dio_lock_type == DIO_LOCKING)
-                        vmtruncate(inode, isize);
+        if (dio->flags & DIO_LOCKING) {
+                if (unlikely((rw & WRITE) && retval < 0)) {
+                        loff_t isize = i_size_read(inode);
+                        if (end > isize)
+                                vmtruncate(inode, isize);
+                }
         }
 
-        if (rw == READ && dio_lock_type == DIO_LOCKING)
-                release_i_mutex = 0;
-
 out:
-        if (release_i_mutex)
-                mutex_unlock(&inode->i_mutex);
-        else if (acquire_i_mutex)
-                mutex_lock(&inode->i_mutex);
         return retval;
 }
 EXPORT_SYMBOL(__blockdev_direct_IO);
diff --git a/fs/exec.c b/fs/exec.c
index c0c636e34f60..623a5cc3076a 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -923,6 +923,15 @@ char *get_task_comm(char *buf, struct task_struct *tsk)
 void set_task_comm(struct task_struct *tsk, char *buf)
 {
         task_lock(tsk);
+
+        /*
+         * Threads may access current->comm without holding
+         * the task lock, so write the string carefully.
+         * Readers without a lock may see incomplete new
+         * names but are safe from non-terminating string reads.
+         */
+        memset(tsk->comm, 0, TASK_COMM_LEN);
+        wmb();
         strlcpy(tsk->comm, buf, sizeof(tsk->comm));
         task_unlock(tsk);
         perf_event_comm(tsk);
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c
index 197c7db583c7..e9e175949a63 100644
--- a/fs/exportfs/expfs.c
+++ b/fs/exportfs/expfs.c
@@ -6,7 +6,7 @@
  * and for mapping back from file handles to dentries.
  *
  * For details on why we do all the strange and hairy things in here
- * take a look at Documentation/filesystems/Exporting.
+ * take a look at Documentation/filesystems/nfs/Exporting.
  */
 #include <linux/exportfs.h>
 #include <linux/fs.h>
diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c
index fc2bd05d3559..7516957273ed 100644
--- a/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@ -721,5 +721,5 @@ const struct file_operations ext2_dir_operations = {
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = ext2_compat_ioctl,
 #endif
-        .fsync          = simple_fsync,
+        .fsync          = ext2_fsync,
 };
diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h
index da318b0fa637..061914add3cf 100644
--- a/fs/ext2/ext2.h
+++ b/fs/ext2/ext2.h
@@ -155,6 +155,7 @@ extern void ext2_write_super (struct super_block *);
 extern const struct file_operations ext2_dir_operations;
 
 /* file.c */
+extern int ext2_fsync(struct file *file, struct dentry *dentry, int datasync);
 extern const struct inode_operations ext2_file_inode_operations;
 extern const struct file_operations ext2_file_operations;
 extern const struct file_operations ext2_xip_file_operations;
diff --git a/fs/ext2/file.c b/fs/ext2/file.c
index a2f3afd1a1c1..586e3589d4c2 100644
--- a/fs/ext2/file.c
+++ b/fs/ext2/file.c
@@ -19,6 +19,7 @@
  */
 
 #include <linux/time.h>
+#include <linux/pagemap.h>
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
@@ -38,6 +39,22 @@ static int ext2_release_file (struct inode * inode, struct file * filp)
         return 0;
 }
 
+int ext2_fsync(struct file *file, struct dentry *dentry, int datasync)
+{
+        int ret;
+        struct super_block *sb = dentry->d_inode->i_sb;
+        struct address_space *mapping = sb->s_bdev->bd_inode->i_mapping;
+
+        ret = simple_fsync(file, dentry, datasync);
+        if (ret == -EIO || test_and_clear_bit(AS_EIO, &mapping->flags)) {
+                /* We don't really know where the IO error happened... */
+                ext2_error(sb, __func__,
+                           "detected IO error when writing metadata buffers");
+                ret = -EIO;
+        }
+        return ret;
+}
+
 /*
  * We have mostly NULL's here: the current defaults are ok for
  * the ext2 filesystem.
@@ -55,7 +72,7 @@ const struct file_operations ext2_file_operations = {
         .mmap           = generic_file_mmap,
         .open           = generic_file_open,
         .release        = ext2_release_file,
-        .fsync          = simple_fsync,
+        .fsync          = ext2_fsync,
         .splice_read    = generic_file_splice_read,
         .splice_write   = generic_file_splice_write,
 };
@@ -72,7 +89,7 @@ const struct file_operations ext2_xip_file_operations = {
         .mmap           = xip_file_mmap,
         .open           = generic_file_open,
         .release        = ext2_release_file,
-        .fsync          = simple_fsync,
+        .fsync          = ext2_fsync,
 };
 #endif
 
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 1388802b7803..f9cb54a585ce 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -1105,9 +1105,30 @@ failed_sbi:
         return ret;
 }
 
+static void ext2_clear_super_error(struct super_block *sb)
+{
+        struct buffer_head *sbh = EXT2_SB(sb)->s_sbh;
+
+        if (buffer_write_io_error(sbh)) {
+                /*
+                 * Oh, dear.  A previous attempt to write the
+                 * superblock failed.  This could happen because the
+                 * USB device was yanked out.  Or it could happen to
+                 * be a transient write error and maybe the block will
+                 * be remapped.  Nothing we can do but to retry the
+                 * write and hope for the best.
+                 */
+                printk(KERN_ERR "EXT2-fs: %s previous I/O error to "
+                       "superblock detected", sb->s_id);
+                clear_buffer_write_io_error(sbh);
+                set_buffer_uptodate(sbh);
+        }
+}
+
 static void ext2_commit_super (struct super_block * sb,
                                struct ext2_super_block * es)
 {
+        ext2_clear_super_error(sb);
         es->s_wtime = cpu_to_le32(get_seconds());
         mark_buffer_dirty(EXT2_SB(sb)->s_sbh);
         sb->s_dirt = 0;
@@ -1115,6 +1136,7 @@ static void ext2_commit_super (struct super_block * sb,
 
 static void ext2_sync_super(struct super_block *sb, struct ext2_super_block *es)
 {
+        ext2_clear_super_error(sb);
         es->s_free_blocks_count = cpu_to_le32(ext2_count_free_blocks(sb));
         es->s_free_inodes_count = cpu_to_le32(ext2_count_free_inodes(sb));
         es->s_wtime = cpu_to_le32(get_seconds());
diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig
index 9acf7e808139..e5f6774846e4 100644
--- a/fs/ext4/Kconfig
+++ b/fs/ext4/Kconfig
@@ -2,6 +2,7 @@ config EXT4_FS
         tristate "The Extended 4 (ext4) filesystem"
         select JBD2
         select CRC16
+        select FS_JOURNAL_INFO
         help
           This is the next generation of the ext3 filesystem.
 
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 768c111a77ec..827bde1f2594 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2137,11 +2137,8 @@ static int parse_strtoul(const char *buf,
 {
         char *endp;
 
-        while (*buf && isspace(*buf))
-                buf++;
-        *value = simple_strtoul(buf, &endp, 0);
-        while (*endp && isspace(*endp))
-                endp++;
+        *value = simple_strtoul(skip_spaces(buf), &endp, 0);
+        endp = skip_spaces(endp);
         if (*endp || *value > max)
                 return -EINVAL;
 
diff --git a/fs/fat/fat.h b/fs/fat/fat.h
index 7db0979c6b72..e6efdfa0f6db 100644
--- a/fs/fat/fat.h
+++ b/fs/fat/fat.h
@@ -44,7 +44,8 @@ struct fat_mount_options {
                  nocase:1,        /* Does this need case conversion? 0=need case conversion*/
                  usefree:1,       /* Use free_clusters for FAT32 */
                  tz_utc:1,        /* Filesystem timestamps are in UTC */
-                 rodir:1;         /* allow ATTR_RO for directory */
+                 rodir:1,         /* allow ATTR_RO for directory */
+                 discard:1;       /* Issue discard requests on deletions */
 };
 
 #define FAT_HASH_BITS   8
diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c
index a81037721a6f..81184d3b75a3 100644
--- a/fs/fat/fatent.c
+++ b/fs/fat/fatent.c
@@ -566,16 +566,21 @@ int fat_free_clusters(struct inode *inode, int cluster)
                         goto error;
                 }
 
-                /* 
-                 * Issue discard for the sectors we no longer care about,
-                 * batching contiguous clusters into one request
-                 */
-                if (cluster != fatent.entry + 1) {
-                        int nr_clus = fatent.entry - first_cl + 1;
-
-                        sb_issue_discard(sb, fat_clus_to_blknr(sbi, first_cl),
-                                         nr_clus * sbi->sec_per_clus);
-                        first_cl = cluster;
+                if (sbi->options.discard) {
+                        /*
+                         * Issue discard for the sectors we no longer
+                         * care about, batching contiguous clusters
+                         * into one request
+                         */
+                        if (cluster != fatent.entry + 1) {
+                                int nr_clus = fatent.entry - first_cl + 1;
+
+                                sb_issue_discard(sb,
+                                        fat_clus_to_blknr(sbi, first_cl),
+                                        nr_clus * sbi->sec_per_clus);
+
+                                first_cl = cluster;
+                        }
                 }
 
                 ops->ent_put(&fatent, FAT_ENT_FREE);
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 76b7961ab663..14da530b05ca 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -858,6 +858,8 @@ static int fat_show_options(struct seq_file *m, struct vfsmount *mnt)
                 seq_puts(m, ",errors=panic");
         else
                 seq_puts(m, ",errors=remount-ro");
+        if (opts->discard)
+                seq_puts(m, ",discard");
 
         return 0;
 }
@@ -871,7 +873,7 @@ enum {
         Opt_shortname_winnt, Opt_shortname_mixed, Opt_utf8_no, Opt_utf8_yes,
         Opt_uni_xl_no, Opt_uni_xl_yes, Opt_nonumtail_no, Opt_nonumtail_yes,
         Opt_obsolate, Opt_flush, Opt_tz_utc, Opt_rodir, Opt_err_cont,
-        Opt_err_panic, Opt_err_ro, Opt_err,
+        Opt_err_panic, Opt_err_ro, Opt_discard, Opt_err,
 };
 
 static const match_table_t fat_tokens = {
@@ -899,6 +901,7 @@ static const match_table_t fat_tokens = {
         {Opt_err_cont, "errors=continue"},
         {Opt_err_panic, "errors=panic"},
         {Opt_err_ro, "errors=remount-ro"},
+        {Opt_discard, "discard"},
         {Opt_obsolate, "conv=binary"},
         {Opt_obsolate, "conv=text"},
         {Opt_obsolate, "conv=auto"},
@@ -1136,6 +1139,9 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug,
                 case Opt_rodir:
                         opts->rodir = 1;
                         break;
+                case Opt_discard:
+                        opts->discard = 1;
+                        break;
 
                 /* obsolete mount options */
                 case Opt_obsolate:
diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index 0f55f5cb732f..d3da05f26465 100644
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -9,6 +9,7 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/buffer_head.h>
+#include <linux/time.h>
 #include "fat.h"
 
 /*
@@ -157,10 +158,6 @@ extern struct timezone sys_tz;
 #define SECS_PER_MIN    60
 #define SECS_PER_HOUR   (60 * 60)
 #define SECS_PER_DAY    (SECS_PER_HOUR * 24)
-#define UNIX_SECS_1980  315532800L
-#if BITS_PER_LONG == 64
-#define UNIX_SECS_2108  4354819200L
-#endif
 /* days between 1.1.70 and 1.1.80 (2 leap days) */
 #define DAYS_DELTA      (365 * 10 + 2)
 /* 120 (2100 - 1980) isn't leap year */
@@ -213,58 +210,35 @@ void fat_time_fat2unix(struct msdos_sb_info *sbi, struct timespec *ts,
 void fat_time_unix2fat(struct msdos_sb_info *sbi, struct timespec *ts,
                        __le16 *time, __le16 *date, u8 *time_cs)
 {
-        time_t second = ts->tv_sec;
-        time_t day, leap_day, month, year;
+        struct tm tm;
+        time_to_tm(ts->tv_sec, sbi->options.tz_utc ? 0 :
+                   -sys_tz.tz_minuteswest * 60, &tm);
 
-        if (!sbi->options.tz_utc)
-                second -= sys_tz.tz_minuteswest * SECS_PER_MIN;
-
-        /* Jan 1 GMT 00:00:00 1980. But what about another time zone? */
-        if (second < UNIX_SECS_1980) {
+        /*  FAT can only support year between 1980 to 2107 */
+        if (tm.tm_year < 1980 - 1900) {
                 *time = 0;
                 *date = cpu_to_le16((0 << 9) | (1 << 5) | 1);
                 if (time_cs)
                         *time_cs = 0;
                 return;
         }
-#if BITS_PER_LONG == 64
-        if (second >= UNIX_SECS_2108) {
+        if (tm.tm_year > 2107 - 1900) {
                 *time = cpu_to_le16((23 << 11) | (59 << 5) | 29);
                 *date = cpu_to_le16((127 << 9) | (12 << 5) | 31);
                 if (time_cs)
                         *time_cs = 199;
                 return;
         }
-#endif
 
-        day = second / SECS_PER_DAY - DAYS_DELTA;
-        year = day / 365;
-        leap_day = (year + 3) / 4;
-        if (year > YEAR_2100)           /* 2100 isn't leap year */
-                leap_day--;
-        if (year * 365 + leap_day > day)
-                year--;
-        leap_day = (year + 3) / 4;
-        if (year > YEAR_2100)           /* 2100 isn't leap year */
-                leap_day--;
-        day -= year * 365 + leap_day;
-
-        if (IS_LEAP_YEAR(year) && day == days_in_year[3]) {
-                month = 2;
-        } else {
-                if (IS_LEAP_YEAR(year) && day > days_in_year[3])
-                        day--;
-                for (month = 1; month < 12; month++) {
-                        if (days_in_year[month + 1] > day)
-                                break;
-                }
-        }
-        day -= days_in_year[month];
+        /* from 1900 -> from 1980 */
+        tm.tm_year -= 80;
+        /* 0~11 -> 1~12 */
+        tm.tm_mon++;
+        /* 0~59 -> 0~29(2sec counts) */
+        tm.tm_sec >>= 1;
 
-        *time = cpu_to_le16(((second / SECS_PER_HOUR) % 24) << 11
-                            | ((second / SECS_PER_MIN) % 60) << 5
-                            | (second % SECS_PER_MIN) >> 1);
-        *date = cpu_to_le16((year << 9) | (month << 5) | (day + 1));
+        *time = cpu_to_le16(tm.tm_hour << 11 | tm.tm_min << 5 | tm.tm_sec);
+        *date = cpu_to_le16(tm.tm_year << 9 | tm.tm_mon << 5 | tm.tm_mday);
         if (time_cs)
                 *time_cs = (ts->tv_sec & 1) * 100 + ts->tv_nsec / 10000000;
 }
@@ -285,4 +259,3 @@ int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs)
         }
         return err;
 }
-
diff --git a/fs/fscache/object-list.c b/fs/fscache/object-list.c
index e590242fa41a..3221a0c7944e 100644
--- a/fs/fscache/object-list.c
+++ b/fs/fscache/object-list.c
@@ -91,7 +91,7 @@ EXPORT_SYMBOL(fscache_object_destroy);
  */
 static struct fscache_object *fscache_objlist_lookup(loff_t *_pos)
 {
-        struct fscache_object *pobj, *obj, *minobj = NULL;
+        struct fscache_object *pobj, *obj = NULL, *minobj = NULL;
         struct rb_node *p;
         unsigned long pos;
 
diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig
index 4dcddf83326f..b192c661caa6 100644
--- a/fs/gfs2/Kconfig
+++ b/fs/gfs2/Kconfig
@@ -10,6 +10,7 @@ config GFS2_FS
         select SLOW_WORK
         select QUOTA
         select QUOTACTL
+        select FS_JOURNAL_INFO
         help
           A cluster filesystem.
 
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index c5dad1eb7b91..0dc34621f6a6 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -85,11 +85,7 @@ static ssize_t uuid_show(struct gfs2_sbd *sdp, char *buf)
         buf[0] = '\0';
         if (!gfs2_uuid_valid(uuid))
                 return 0;
-        return snprintf(buf, PAGE_SIZE, "%02X%02X%02X%02X-%02X%02X-"
-                        "%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X\n",
-                        uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5],
-                        uuid[6], uuid[7], uuid[8], uuid[9], uuid[10], uuid[11],
-                        uuid[12], uuid[13], uuid[14], uuid[15]);
+        return snprintf(buf, PAGE_SIZE, "%pUB\n", uuid);
 }
 
 static ssize_t freeze_show(struct gfs2_sbd *sdp, char *buf)
@@ -575,14 +571,8 @@ static int gfs2_uevent(struct kset *kset, struct kobject *kobj,
         add_uevent_var(env, "LOCKPROTO=%s", sdp->sd_proto_name);
         if (!sdp->sd_args.ar_spectator)
                 add_uevent_var(env, "JOURNALID=%u", sdp->sd_lockstruct.ls_jid);
-        if (gfs2_uuid_valid(uuid)) {
-                add_uevent_var(env, "UUID=%02X%02X%02X%02X-%02X%02X-%02X%02X-"
-                               "%02X%02X-%02X%02X%02X%02X%02X%02X",
-                               uuid[0], uuid[1], uuid[2], uuid[3], uuid[4],
-                               uuid[5], uuid[6], uuid[7], uuid[8], uuid[9],
-                               uuid[10], uuid[11], uuid[12], uuid[13],
-                               uuid[14], uuid[15]);
-        }
+        if (gfs2_uuid_valid(uuid))
+                add_uevent_var(env, "UUID=%pUB", uuid);
         return 0;
 }
 
diff --git a/fs/hfs/catalog.c b/fs/hfs/catalog.c
index 6d98f116ca03..424b0337f524 100644
--- a/fs/hfs/catalog.c
+++ b/fs/hfs/catalog.c
@@ -289,6 +289,10 @@ int hfs_cat_move(u32 cnid, struct inode *src_dir, struct qstr *src_name,
         err = hfs_brec_find(&src_fd);
         if (err)
                 goto out;
+        if (src_fd.entrylength > sizeof(entry) || src_fd.entrylength < 0) {
+                err = -EIO;
+                goto out;
+        }
 
         hfs_bnode_read(src_fd.bnode, &entry, src_fd.entryoffset,
                             src_fd.entrylength);
diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c
index 7c69b98a2e45..2b3b8611b41b 100644
--- a/fs/hfs/dir.c
+++ b/fs/hfs/dir.c
@@ -79,6 +79,11 @@ static int hfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                 filp->f_pos++;
                 /* fall through */
         case 1:
+                if (fd.entrylength > sizeof(entry) || fd.entrylength < 0) {
+                        err = -EIO;
+                        goto out;
+                }
+
                 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, fd.entrylength);
                 if (entry.type != HFS_CDR_THD) {
                         printk(KERN_ERR "hfs: bad catalog folder thread\n");
@@ -109,6 +114,12 @@ static int hfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                         err = -EIO;
                         goto out;
                 }
+
+                if (fd.entrylength > sizeof(entry) || fd.entrylength < 0) {
+                        err = -EIO;
+                        goto out;
+                }
+
                 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, fd.entrylength);
                 type = entry.type;
                 len = hfs_mac2asc(sb, strbuf, &fd.key->cat.CName);
diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index f7fcbe49da72..5ed7252b7b23 100644
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -409,8 +409,13 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
         /* try to get the root inode */
         hfs_find_init(HFS_SB(sb)->cat_tree, &fd);
         res = hfs_cat_find_brec(sb, HFS_ROOT_CNID, &fd);
-        if (!res)
+        if (!res) {
+                if (fd.entrylength > sizeof(rec) || fd.entrylength < 0) {
+                        res =  -EIO;
+                        goto bail;
+                }
                 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, fd.entrylength);
+        }
         if (res) {
                 hfs_find_exit(&fd);
                 goto bail_no_root;
diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c
index f2feaa06bf26..cadc4ce48656 100644
--- a/fs/hpfs/super.c
+++ b/fs/hpfs/super.c
@@ -14,6 +14,7 @@
 #include <linux/magic.h>
 #include <linux/sched.h>
 #include <linux/smp_lock.h>
+#include <linux/bitmap.h>
 
 /* Mark the filesystem dirty, so that chkdsk checks it when os/2 booted */
 
@@ -115,15 +116,13 @@ static void hpfs_put_super(struct super_block *s)
 unsigned hpfs_count_one_bitmap(struct super_block *s, secno secno)
 {
         struct quad_buffer_head qbh;
-        unsigned *bits;
-        unsigned i, count;
-        if (!(bits = hpfs_map_4sectors(s, secno, &qbh, 4))) return 0;
-        count = 0;
-        for (i = 0; i < 2048 / sizeof(unsigned); i++) {
-                unsigned b; 
-                if (!bits[i]) continue;
-                for (b = bits[i]; b; b>>=1) count += b & 1;
-        }
+        unsigned long *bits;
+        unsigned count;
+
+        bits = hpfs_map_4sectors(s, secno, &qbh, 4);
+        if (!bits)
+                return 0;
+        count = bitmap_weight(bits, 2048 * BITS_PER_BYTE);
         hpfs_brelse4(&qbh);
         return count;
 }
diff --git a/fs/isofs/export.c b/fs/isofs/export.c
index e81a30593ba9..ed752cb38474 100644
--- a/fs/isofs/export.c
+++ b/fs/isofs/export.c
@@ -9,7 +9,7 @@
  *
  * The following files are helpful:
  *
- *     Documentation/filesystems/Exporting
+ *     Documentation/filesystems/nfs/Exporting
  *     fs/exportfs/expfs.c.
  */
 
diff --git a/fs/jbd/Kconfig b/fs/jbd/Kconfig
index 4e28beeed157..a8408983abd4 100644
--- a/fs/jbd/Kconfig
+++ b/fs/jbd/Kconfig
@@ -1,5 +1,6 @@
 config JBD
         tristate
+        select FS_JOURNAL_INFO
         help
           This is a generic journalling layer for block devices.  It is
           currently used by the ext3 file system, but it could also be
diff --git a/fs/jbd2/Kconfig b/fs/jbd2/Kconfig
index f32f346f4b0a..0f7d1ceafdfd 100644
--- a/fs/jbd2/Kconfig
+++ b/fs/jbd2/Kconfig
@@ -1,6 +1,7 @@
 config JBD2
         tristate
         select CRC32
+        select FS_JOURNAL_INFO
         help
           This is a generic journaling layer for block devices that support
           both 32-bit and 64-bit block numbers.  It is currently used by
diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c
index 090c556ffed2..3b6f2fa12cff 100644
--- a/fs/jffs2/gc.c
+++ b/fs/jffs2/gc.c
@@ -700,7 +700,8 @@ static int jffs2_garbage_collect_metadata(struct jffs2_sb_info *c, struct jffs2_
         struct jffs2_raw_inode ri;
         struct jffs2_node_frag *last_frag;
         union jffs2_device_node dev;
-        char *mdata = NULL, mdatalen = 0;
+        char *mdata = NULL;
+        int mdatalen = 0;
         uint32_t alloclen, ilen;
         int ret;
 
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
index 378991cfe40f..e22de8397b74 100644
--- a/fs/jffs2/readinode.c
+++ b/fs/jffs2/readinode.c
@@ -1284,7 +1284,7 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c,
                                 f->target = NULL;
                                 mutex_unlock(&f->sem);
                                 jffs2_do_clear_inode(c, f);
-                                return -ret;
+                                return ret;
                         }
 
                         f->target[je32_to_cpu(latest_node->csize)] = '\0';
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
index 6caf1e1ee26d..800171dca53b 100644
--- a/fs/jffs2/summary.c
+++ b/fs/jffs2/summary.c
@@ -23,7 +23,7 @@
 
 int jffs2_sum_init(struct jffs2_sb_info *c)
 {
-        uint32_t sum_size = max_t(uint32_t, c->sector_size, MAX_SUMMARY_SIZE);
+        uint32_t sum_size = min_t(uint32_t, c->sector_size, MAX_SUMMARY_SIZE);
 
         c->summary = kzalloc(sizeof(struct jffs2_summary), GFP_KERNEL);
 
diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index bd173a6ca3b1..a7966eed3c17 100644
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -11,10 +11,6 @@
 #include <linux/time.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
-#include <linux/in.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/share.h>
 
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index e1d28ddd2169..56c9519d900a 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -11,10 +11,6 @@
 #include <linux/time.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
-#include <linux/in.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/share.h>
 
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index 2a77bc25d5af..59e5673b4597 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -90,7 +90,7 @@ config ROOT_NFS
           If you want your system to mount its root file system via NFS,
           choose Y here.  This is common practice for managing systems
           without local permanent storage.  For details, read
-          <file:Documentation/filesystems/nfsroot.txt>.
+          <file:Documentation/filesystems/nfs/nfsroot.txt>.
 
           Most people say N here.
 
diff --git a/fs/nfsctl.c b/fs/nfsctl.c
index 8f9a20556f79..d3854d94b7cf 100644
--- a/fs/nfsctl.c
+++ b/fs/nfsctl.c
@@ -7,8 +7,6 @@
 #include <linux/types.h>
 #include <linux/file.h>
 #include <linux/fs.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/syscall.h>
 #include <linux/cred.h>
 #include <linux/sched.h>
diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c
index 36fcabbf5186..79717a40daba 100644
--- a/fs/nfsd/auth.c
+++ b/fs/nfsd/auth.c
@@ -1,15 +1,7 @@
-/*
- * linux/fs/nfsd/auth.c
- *
- * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
- */
+/* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
 
-#include <linux/types.h>
 #include <linux/sched.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/svcauth.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/export.h>
+#include "nfsd.h"
 #include "auth.h"
 
 int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp)
diff --git a/include/linux/nfsd/cache.h b/fs/nfsd/cache.h
index 3a3f58934f5e..d892be61016c 100644
--- a/include/linux/nfsd/cache.h
+++ b/fs/nfsd/cache.h
@@ -1,6 +1,4 @@
 /*
- * include/linux/nfsd/cache.h
- *
  * Request reply cache. This was heavily inspired by the
  * implementation in 4.3BSD/4.4BSD.
  *
@@ -10,8 +8,7 @@
 #ifndef NFSCACHE_H
 #define NFSCACHE_H
 
-#include <linux/in.h>
-#include <linux/uio.h>
+#include <linux/sunrpc/svc.h>
 
 /*
  * Representation of a reply cache entry.
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index c1c9e035d4a4..c487810a2366 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -1,7 +1,5 @@
 #define MSNFS   /* HACK HACK */
 /*
- * linux/fs/nfsd/export.c
- *
  * NFS exporting and validation.
  *
  * We maintain a list of clients, each of which has a list of
@@ -14,29 +12,16 @@
  * Copyright (C) 1995, 1996 Olaf Kirch, <okir@monad.swb.de>
  */
 
-#include <linux/unistd.h>
-#include <linux/slab.h>
-#include <linux/stat.h>
-#include <linux/in.h>
-#include <linux/seq_file.h>
-#include <linux/syscalls.h>
-#include <linux/rwsem.h>
-#include <linux/dcache.h>
 #include <linux/namei.h>
-#include <linux/mount.h>
-#include <linux/hash.h>
 #include <linux/module.h>
 #include <linux/exportfs.h>
 
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/nfsfh.h>
 #include <linux/nfsd/syscall.h>
-#include <linux/lockd/bind.h>
-#include <linux/sunrpc/msg_prot.h>
-#include <linux/sunrpc/gss_api.h>
 #include <net/ipv6.h>
 
+#include "nfsd.h"
+#include "nfsfh.h"
+
 #define NFSDDBG_FACILITY        NFSDDBG_EXPORT
 
 typedef struct auth_domain      svc_client;
@@ -369,16 +354,25 @@ static struct svc_export *svc_export_update(struct svc_export *new,
                                             struct svc_export *old);
 static struct svc_export *svc_export_lookup(struct svc_export *);
 
-static int check_export(struct inode *inode, int flags, unsigned char *uuid)
+static int check_export(struct inode *inode, int *flags, unsigned char *uuid)
 {
 
-        /* We currently export only dirs and regular files.
-         * This is what umountd does.
+        /*
+         * We currently export only dirs, regular files, and (for v4
+         * pseudoroot) symlinks.
          */
         if (!S_ISDIR(inode->i_mode) &&
+            !S_ISLNK(inode->i_mode) &&
             !S_ISREG(inode->i_mode))
                 return -ENOTDIR;
 
+        /*
+         * Mountd should never pass down a writeable V4ROOT export, but,
+         * just to make sure:
+         */
+        if (*flags & NFSEXP_V4ROOT)
+                *flags |= NFSEXP_READONLY;
+
         /* There are two requirements on a filesystem to be exportable.
          * 1:  We must be able to identify the filesystem from a number.
          *       either a device number (so FS_REQUIRES_DEV needed)
@@ -387,7 +381,7 @@ static int check_export(struct inode *inode, int flags, unsigned char *uuid)
          *       This means that s_export_op must be set.
          */
         if (!(inode->i_sb->s_type->fs_flags & FS_REQUIRES_DEV) &&
-            !(flags & NFSEXP_FSID) &&
+            !(*flags & NFSEXP_FSID) &&
             uuid == NULL) {
                 dprintk("exp_export: export of non-dev fs without fsid\n");
                 return -EINVAL;
@@ -602,7 +596,7 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
                                 goto out4;
                 }
 
-                err = check_export(exp.ex_path.dentry->d_inode, exp.ex_flags,
+                err = check_export(exp.ex_path.dentry->d_inode, &exp.ex_flags,
                                    exp.ex_uuid);
                 if (err)
                         goto out4;
@@ -1041,7 +1035,7 @@ exp_export(struct nfsctl_export *nxp)
                 goto finish;
         }
 
-        err = check_export(path.dentry->d_inode, nxp->ex_flags, NULL);
+        err = check_export(path.dentry->d_inode, &nxp->ex_flags, NULL);
         if (err) goto finish;
 
         err = -ENOMEM;
@@ -1320,6 +1314,23 @@ rqst_exp_parent(struct svc_rqst *rqstp, struct path *path)
         return exp;
 }
 
+static struct svc_export *find_fsidzero_export(struct svc_rqst *rqstp)
+{
+        struct svc_export *exp;
+        u32 fsidv[2];
+
+        mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NULL);
+
+        exp = rqst_exp_find(rqstp, FSID_NUM, fsidv);
+        /*
+         * We shouldn't have accepting an nfsv4 request at all if we
+         * don't have a pseudoexport!:
+         */
+        if (IS_ERR(exp) && PTR_ERR(exp) == -ENOENT)
+                exp = ERR_PTR(-ESERVERFAULT);
+        return exp;
+}
+
 /*
  * Called when we need the filehandle for the root of the pseudofs,
  * for a given NFSv4 client.   The root is defined to be the
@@ -1330,11 +1341,8 @@ exp_pseudoroot(struct svc_rqst *rqstp, struct svc_fh *fhp)
 {
         struct svc_export *exp;
         __be32 rv;
-        u32 fsidv[2];
 
-        mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NULL);
-
-        exp = rqst_exp_find(rqstp, FSID_NUM, fsidv);
+        exp = find_fsidzero_export(rqstp);
         if (IS_ERR(exp))
                 return nfserrno(PTR_ERR(exp));
         rv = fh_compose(fhp, exp, exp->ex_path.dentry, NULL);
@@ -1425,6 +1433,7 @@ static struct flags {
         { NFSEXP_CROSSMOUNT, {"crossmnt", ""}},
         { NFSEXP_NOSUBTREECHECK, {"no_subtree_check", ""}},
         { NFSEXP_NOAUTHNLM, {"insecure_locks", ""}},
+        { NFSEXP_V4ROOT, {"v4root", ""}},
 #ifdef MSNFS
         { NFSEXP_MSNFS, {"msnfs", ""}},
 #endif
diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
index b2786a5f9afe..0c6d81670137 100644
--- a/fs/nfsd/lockd.c
+++ b/fs/nfsd/lockd.c
@@ -1,6 +1,4 @@
 /*
- * linux/fs/nfsd/lockd.c
- *
  * This file contains all the stubs needed when communicating with lockd.
  * This level of indirection is necessary so we can run nfsd+lockd without
  * requiring the nfs client to be compiled in/loaded, and vice versa.
@@ -8,14 +6,10 @@
  * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
  */
 
-#include <linux/types.h>
-#include <linux/fs.h>
 #include <linux/file.h>
-#include <linux/mount.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/lockd/bind.h>
+#include "nfsd.h"
+#include "vfs.h"
 
 #define NFSDDBG_FACILITY                NFSDDBG_LOCKD
 
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
index 4e3219e84116..f20589d2ae27 100644
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@@ -1,19 +1,15 @@
 /*
- * linux/fs/nfsd/nfs2acl.c
- *
  * Process version 2 NFSACL requests.
  *
  * Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de>
  */
 
-#include <linux/sunrpc/svc.h>
-#include <linux/nfs.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr.h>
-#include <linux/nfsd/xdr3.h>
-#include <linux/posix_acl.h>
+#include "nfsd.h"
+/* FIXME: nfsacl.h is a broken header */
 #include <linux/nfsacl.h>
+#include "cache.h"
+#include "xdr3.h"
+#include "vfs.h"
 
 #define NFSDDBG_FACILITY                NFSDDBG_PROC
 #define RETURN_STATUS(st)       { resp->status = (st); return (st); }
@@ -217,6 +213,16 @@ static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p,
  * XDR encode functions
  */
 
+/*
+ * There must be an encoding function for void results so svc_process
+ * will work properly.
+ */
+int
+nfsaclsvc_encode_voidres(struct svc_rqst *rqstp, __be32 *p, void *dummy)
+{
+        return xdr_ressize_check(rqstp, p);
+}
+
 /* GETACL */
 static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p,
                 struct nfsd3_getaclres *resp)
@@ -308,7 +314,6 @@ static int nfsaclsvc_release_access(struct svc_rqst *rqstp, __be32 *p,
 }
 
 #define nfsaclsvc_decode_voidargs       NULL
-#define nfsaclsvc_encode_voidres        NULL
 #define nfsaclsvc_release_void          NULL
 #define nfsd3_fhandleargs       nfsd_fhandle
 #define nfsd3_attrstatres       nfsd_attrstat
@@ -346,5 +351,5 @@ struct svc_version	nfsd_acl_version2 = {
                 .vs_proc        = nfsd_acl_procedures2,
                 .vs_dispatch    = nfsd_dispatch,
                 .vs_xdrsize     = NFS3_SVC_XDRSIZE,
-                .vs_hidden      = 1,
+                .vs_hidden      = 0,
 };
diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c
index 9981dbb377a3..e0c4846bad92 100644
--- a/fs/nfsd/nfs3acl.c
+++ b/fs/nfsd/nfs3acl.c
@@ -1,18 +1,15 @@
 /*
- * linux/fs/nfsd/nfs3acl.c
- *
  * Process version 3 NFSACL requests.
  *
  * Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de>
  */
 
-#include <linux/sunrpc/svc.h>
-#include <linux/nfs3.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr3.h>
-#include <linux/posix_acl.h>
+#include "nfsd.h"
+/* FIXME: nfsacl.h is a broken header */
 #include <linux/nfsacl.h>
+#include "cache.h"
+#include "xdr3.h"
+#include "vfs.h"
 
 #define RETURN_STATUS(st)       { resp->status = (st); return (st); }
 
@@ -264,6 +261,6 @@ struct svc_version	nfsd_acl_version3 = {
                 .vs_proc        = nfsd_acl_procedures3,
                 .vs_dispatch    = nfsd_dispatch,
                 .vs_xdrsize     = NFS3_SVC_XDRSIZE,
-                .vs_hidden      = 1,
+                .vs_hidden      = 0,
 };
 
diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
index a713c418a922..3d68f45a37b9 100644
--- a/fs/nfsd/nfs3proc.c
+++ b/fs/nfsd/nfs3proc.c
@@ -1,30 +1,16 @@
 /*
- * linux/fs/nfsd/nfs3proc.c
- *
  * Process version 3 NFS requests.
  *
  * Copyright (C) 1996, 1997, 1998 Olaf Kirch <okir@monad.swb.de>
  */
 
-#include <linux/linkage.h>
-#include <linux/time.h>
-#include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/ext2_fs.h>
-#include <linux/stat.h>
-#include <linux/fcntl.h>
-#include <linux/net.h>
-#include <linux/in.h>
-#include <linux/unistd.h>
-#include <linux/slab.h>
-#include <linux/major.h>
 #include <linux/magic.h>
 
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr3.h>
-#include <linux/nfs3.h>
+#include "cache.h"
+#include "xdr3.h"
+#include "vfs.h"
 
 #define NFSDDBG_FACILITY                NFSDDBG_PROC
 
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index d0a2ce1b4324..2a533a0af2a9 100644
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -1,6 +1,4 @@
 /*
- * linux/fs/nfsd/nfs3xdr.c
- *
  * XDR support for nfsd/protocol version 3.
  *
  * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
@@ -8,19 +6,8 @@
  * 2003-08-09 Jamie Lokier: Use htonl() for nanoseconds, not htons()!
  */
 
-#include <linux/types.h>
-#include <linux/time.h>
-#include <linux/nfs3.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/dcache.h>
 #include <linux/namei.h>
-#include <linux/mm.h>
-#include <linux/vfs.h>
-#include <linux/sunrpc/xdr.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/xdr3.h>
+#include "xdr3.h"
 #include "auth.h"
 
 #define NFSDDBG_FACILITY                NFSDDBG_XDR
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index 725d02f210e2..88150685df34 100644
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -1,6 +1,4 @@
 /*
- *  fs/nfs4acl/acl.c
- *
  *  Common NFSv4 ACL handling code.
  *
  *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
@@ -36,15 +34,7 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <linux/types.h>
-#include <linux/fs.h>
-#include <linux/module.h>
 #include <linux/nfs_fs.h>
-#include <linux/posix_acl.h>
-#include <linux/nfs4.h>
 #include <linux/nfs4_acl.h>
 
 
@@ -389,7 +379,7 @@ sort_pacl(struct posix_acl *pacl)
         sort_pacl_range(pacl, 1, i-1);
 
         BUG_ON(pacl->a_entries[i].e_tag != ACL_GROUP_OBJ);
-        j = i++;
+        j = ++i;
         while (pacl->a_entries[j].e_tag == ACL_GROUP)
                 j++;
         sort_pacl_range(pacl, i, j-1);
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 24e8d78f8dde..c6eed2a3b093 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -1,6 +1,4 @@
 /*
- *  linux/fs/nfsd/nfs4callback.c
- *
  *  Copyright (c) 2001 The Regents of the University of Michigan.
  *  All rights reserved.
  *
@@ -33,22 +31,9 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <linux/module.h>
-#include <linux/list.h>
-#include <linux/inet.h>
-#include <linux/errno.h>
-#include <linux/delay.h>
-#include <linux/sched.h>
-#include <linux/kthread.h>
-#include <linux/sunrpc/xdr.h>
-#include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/clnt.h>
-#include <linux/sunrpc/svcsock.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/state.h>
-#include <linux/sunrpc/sched.h>
-#include <linux/nfs4.h>
-#include <linux/sunrpc/xprtsock.h>
+#include "nfsd.h"
+#include "state.h"
 
 #define NFSDDBG_FACILITY                NFSDDBG_PROC
 
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index ba2c199592fd..6e2983b27f3c 100644
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -1,6 +1,4 @@
 /*
- *  fs/nfsd/nfs4idmap.c
- *
  *  Mapping of UID/GIDs to name and vice versa.
  *
  *  Copyright (c) 2002, 2003 The Regents of the University of
@@ -35,22 +33,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
-
-#include <linux/mm.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/nfs.h>
-#include <linux/nfs4.h>
-#include <linux/nfs_fs.h>
-#include <linux/nfs_page.h>
-#include <linux/sunrpc/cache.h>
 #include <linux/nfsd_idmap.h>
-#include <linux/list.h>
-#include <linux/time.h>
 #include <linux/seq_file.h>
-#include <linux/sunrpc/svcauth.h>
+#include <linux/sched.h>
 
 /*
  * Cache entry
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index bebc0c2e1b0a..37514c469846 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1,6 +1,4 @@
 /*
- *  fs/nfsd/nfs4proc.c
- *
  *  Server-side procedures for NFSv4.
  *
  *  Copyright (c) 2002 The Regents of the University of Michigan.
@@ -34,20 +32,11 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-#include <linux/param.h>
-#include <linux/major.h>
-#include <linux/slab.h>
 #include <linux/file.h>
 
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfs4.h>
-#include <linux/nfsd/state.h>
-#include <linux/nfsd/xdr4.h>
-#include <linux/nfs4_acl.h>
-#include <linux/sunrpc/gss_api.h>
+#include "cache.h"
+#include "xdr4.h"
+#include "vfs.h"
 
 #define NFSDDBG_FACILITY                NFSDDBG_PROC
 
@@ -170,7 +159,7 @@ do_open_permission(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfs
                 accmode |= NFSD_MAY_READ;
         if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE)
                 accmode |= (NFSD_MAY_WRITE | NFSD_MAY_TRUNC);
-        if (open->op_share_deny & NFS4_SHARE_DENY_WRITE)
+        if (open->op_share_deny & NFS4_SHARE_DENY_READ)
                 accmode |= NFSD_MAY_WRITE;
 
         status = fh_verify(rqstp, current_fh, S_IFREG, accmode);
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index b5348405046b..5a754f7b71ed 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -1,6 +1,4 @@
 /*
-*  linux/fs/nfsd/nfs4recover.c
-*
 *  Copyright (c) 2004 The Regents of the University of Michigan.
 *  All rights reserved.
 *
@@ -33,20 +31,14 @@
 *
 */
 
-#include <linux/err.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfs4.h>
-#include <linux/nfsd/state.h>
-#include <linux/nfsd/xdr4.h>
-#include <linux/param.h>
 #include <linux/file.h>
 #include <linux/namei.h>
-#include <asm/uaccess.h>
-#include <linux/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/sched.h>
-#include <linux/mount.h>
+
+#include "nfsd.h"
+#include "state.h"
+#include "vfs.h"
 
 #define NFSDDBG_FACILITY                NFSDDBG_PROC
 
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 2153f9bdbebd..f19ed866c95f 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1,6 +1,4 @@
 /*
-*  linux/fs/nfsd/nfs4state.c
-*
 *  Copyright (c) 2001 The Regents of the University of Michigan.
 *  All rights reserved.
 *
@@ -34,28 +32,14 @@
 *
 */
 
-#include <linux/param.h>
-#include <linux/major.h>
-#include <linux/slab.h>
-
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
 #include <linux/file.h>
-#include <linux/mount.h>
-#include <linux/workqueue.h>
 #include <linux/smp_lock.h>
-#include <linux/kthread.h>
-#include <linux/nfs4.h>
-#include <linux/nfsd/state.h>
-#include <linux/nfsd/xdr4.h>
 #include <linux/namei.h>
 #include <linux/swap.h>
-#include <linux/mutex.h>
-#include <linux/lockd/bind.h>
-#include <linux/module.h>
 #include <linux/sunrpc/svcauth_gss.h>
 #include <linux/sunrpc/clnt.h>
+#include "xdr4.h"
+#include "vfs.h"
 
 #define NFSDDBG_FACILITY                NFSDDBG_PROC
 
@@ -477,13 +461,14 @@ static int set_forechannel_drc_size(struct nfsd4_channel_attrs *fchan)
 
 /*
  * fchan holds the client values on input, and the server values on output
+ * sv_max_mesg is the maximum payload plus one page for overhead.
  */
 static int init_forechannel_attrs(struct svc_rqst *rqstp,
                                   struct nfsd4_channel_attrs *session_fchan,
                                   struct nfsd4_channel_attrs *fchan)
 {
         int status = 0;
-        __u32   maxcount = svc_max_payload(rqstp);
+        __u32   maxcount = nfsd_serv->sv_max_mesg;
 
         /* headerpadsz set to zero in encode routine */
 
@@ -523,6 +508,15 @@ free_session_slots(struct nfsd4_session *ses)
                 kfree(ses->se_slots[i]);
 }
 
+/*
+ * We don't actually need to cache the rpc and session headers, so we
+ * can allocate a little less for each slot:
+ */
+static inline int slot_bytes(struct nfsd4_channel_attrs *ca)
+{
+        return ca->maxresp_cached - NFSD_MIN_HDR_SEQ_SZ;
+}
+
 static int
 alloc_init_session(struct svc_rqst *rqstp, struct nfs4_client *clp,
                    struct nfsd4_create_session *cses)
@@ -554,7 +548,7 @@ alloc_init_session(struct svc_rqst *rqstp, struct nfs4_client *clp,
         memcpy(new, &tmp, sizeof(*new));
 
         /* allocate each struct nfsd4_slot and data cache in one piece */
-        cachesize = new->se_fchannel.maxresp_cached - NFSD_MIN_HDR_SEQ_SZ;
+        cachesize = slot_bytes(&new->se_fchannel);
         for (i = 0; i < new->se_fchannel.maxreqs; i++) {
                 sp = kzalloc(sizeof(*sp) + cachesize, GFP_KERNEL);
                 if (!sp)
@@ -628,10 +622,12 @@ void
 free_session(struct kref *kref)
 {
         struct nfsd4_session *ses;
+        int mem;
 
         ses = container_of(kref, struct nfsd4_session, se_ref);
         spin_lock(&nfsd_drc_lock);
-        nfsd_drc_mem_used -= ses->se_fchannel.maxreqs * NFSD_SLOT_CACHE_SIZE;
+        mem = ses->se_fchannel.maxreqs * slot_bytes(&ses->se_fchannel);
+        nfsd_drc_mem_used -= mem;
         spin_unlock(&nfsd_drc_lock);
         free_session_slots(ses);
         kfree(ses);
@@ -2404,11 +2400,8 @@ nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open, struct nfs4_sta
 
         memcpy(&open->op_delegate_stateid, &dp->dl_stateid, sizeof(dp->dl_stateid));
 
-        dprintk("NFSD: delegation stateid=(%08x/%08x/%08x/%08x)\n\n",
-                     dp->dl_stateid.si_boot,
-                     dp->dl_stateid.si_stateownerid,
-                     dp->dl_stateid.si_fileid,
-                     dp->dl_stateid.si_generation);
+        dprintk("NFSD: delegation stateid=" STATEID_FMT "\n",
+                STATEID_VAL(&dp->dl_stateid));
 out:
         if (open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS
                         && flag == NFS4_OPEN_DELEGATE_NONE
@@ -2498,9 +2491,8 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
 
         status = nfs_ok;
 
-        dprintk("nfs4_process_open2: stateid=(%08x/%08x/%08x/%08x)\n",
-                    stp->st_stateid.si_boot, stp->st_stateid.si_stateownerid,
-                    stp->st_stateid.si_fileid, stp->st_stateid.si_generation);
+        dprintk("%s: stateid=" STATEID_FMT "\n", __func__,
+                STATEID_VAL(&stp->st_stateid));
 out:
         if (fp)
                 put_nfs4_file(fp);
@@ -2666,9 +2658,8 @@ STALE_STATEID(stateid_t *stateid)
 {
         if (time_after((unsigned long)boot_time,
                         (unsigned long)stateid->si_boot)) {
-                dprintk("NFSD: stale stateid (%08x/%08x/%08x/%08x)!\n",
-                        stateid->si_boot, stateid->si_stateownerid,
-                        stateid->si_fileid, stateid->si_generation);
+                dprintk("NFSD: stale stateid " STATEID_FMT "!\n",
+                        STATEID_VAL(stateid));
                 return 1;
         }
         return 0;
@@ -2680,9 +2671,8 @@ EXPIRED_STATEID(stateid_t *stateid)
         if (time_before((unsigned long)boot_time,
                         ((unsigned long)stateid->si_boot)) &&
             time_before((unsigned long)(stateid->si_boot + lease_time), get_seconds())) {
-                dprintk("NFSD: expired stateid (%08x/%08x/%08x/%08x)!\n",
-                        stateid->si_boot, stateid->si_stateownerid,
-                        stateid->si_fileid, stateid->si_generation);
+                dprintk("NFSD: expired stateid " STATEID_FMT "!\n",
+                        STATEID_VAL(stateid));
                 return 1;
         }
         return 0;
@@ -2696,9 +2686,8 @@ stateid_error_map(stateid_t *stateid)
         if (EXPIRED_STATEID(stateid))
                 return nfserr_expired;
 
-        dprintk("NFSD: bad stateid (%08x/%08x/%08x/%08x)!\n",
-                stateid->si_boot, stateid->si_stateownerid,
-                stateid->si_fileid, stateid->si_generation);
+        dprintk("NFSD: bad stateid " STATEID_FMT "!\n",
+                STATEID_VAL(stateid));
         return nfserr_bad_stateid;
 }
 
@@ -2884,10 +2873,8 @@ nfs4_preprocess_seqid_op(struct nfsd4_compound_state *cstate, u32 seqid,
         struct svc_fh *current_fh = &cstate->current_fh;
         __be32 status;
 
-        dprintk("NFSD: preprocess_seqid_op: seqid=%d " 
-                        "stateid = (%08x/%08x/%08x/%08x)\n", seqid,
-                stateid->si_boot, stateid->si_stateownerid, stateid->si_fileid,
-                stateid->si_generation);
+        dprintk("NFSD: %s: seqid=%d stateid = " STATEID_FMT "\n", __func__,
+                seqid, STATEID_VAL(stateid));
 
         *stpp = NULL;
         *sopp = NULL;
@@ -3019,12 +3006,8 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
         sop->so_confirmed = 1;
         update_stateid(&stp->st_stateid);
         memcpy(&oc->oc_resp_stateid, &stp->st_stateid, sizeof(stateid_t));
-        dprintk("NFSD: nfsd4_open_confirm: success, seqid=%d " 
-                "stateid=(%08x/%08x/%08x/%08x)\n", oc->oc_seqid,
-                         stp->st_stateid.si_boot,
-                         stp->st_stateid.si_stateownerid,
-                         stp->st_stateid.si_fileid,
-                         stp->st_stateid.si_generation);
+        dprintk("NFSD: %s: success, seqid=%d stateid=" STATEID_FMT "\n",
+                __func__, oc->oc_seqid, STATEID_VAL(&stp->st_stateid));
 
         nfsd4_create_clid_dir(sop->so_client);
 out:
@@ -3283,9 +3266,8 @@ find_delegation_stateid(struct inode *ino, stateid_t *stid)
         struct nfs4_file *fp;
         struct nfs4_delegation *dl;
 
-        dprintk("NFSD:find_delegation_stateid stateid=(%08x/%08x/%08x/%08x)\n",
-                    stid->si_boot, stid->si_stateownerid,
-                    stid->si_fileid, stid->si_generation);
+        dprintk("NFSD: %s: stateid=" STATEID_FMT "\n", __func__,
+                STATEID_VAL(stid));
 
         fp = find_file(ino);
         if (!fp)
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 0fbd50cee1f6..a8587e90fd5a 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -40,24 +40,16 @@
  * at the end of nfs4svc_decode_compoundargs.
  */
 
-#include <linux/param.h>
-#include <linux/smp.h>
-#include <linux/fs.h>
 #include <linux/namei.h>
-#include <linux/vfs.h>
+#include <linux/statfs.h>
 #include <linux/utsname.h>
-#include <linux/sunrpc/xdr.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/state.h>
-#include <linux/nfsd/xdr4.h>
 #include <linux/nfsd_idmap.h>
-#include <linux/nfs4.h>
 #include <linux/nfs4_acl.h>
-#include <linux/sunrpc/gss_api.h>
 #include <linux/sunrpc/svcauth_gss.h>
 
+#include "xdr4.h"
+#include "vfs.h"
+
 #define NFSDDBG_FACILITY                NFSDDBG_XDR
 
 /*
@@ -2204,11 +2196,14 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd,
          * we will not follow the cross mount and will fill the attribtutes
          * directly from the mountpoint dentry.
          */
-        if (d_mountpoint(dentry) && !attributes_need_mount(cd->rd_bmval))
-                ignore_crossmnt = 1;
-        else if (d_mountpoint(dentry)) {
+        if (nfsd_mountpoint(dentry, exp)) {
                 int err;
 
+                if (!(exp->ex_flags & NFSEXP_V4ROOT)
+                                && !attributes_need_mount(cd->rd_bmval)) {
+                        ignore_crossmnt = 1;
+                        goto out_encode;
+                }
                 /*
                  * Why the heck aren't we just using nfsd_lookup??
                  * Different "."/".." handling?  Something else?
@@ -2224,6 +2219,7 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd,
                         goto out_put;
 
         }
+out_encode:
         nfserr = nfsd4_encode_fattr(NULL, exp, dentry, p, buflen, cd->rd_bmval,
                                         cd->rd_rqstp, ignore_crossmnt);
 out_put:
diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
index 4638635c5d87..da08560c4818 100644
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@ -1,6 +1,4 @@
 /*
- * linux/fs/nfsd/nfscache.c
- *
  * Request reply cache. This is currently a global cache, but this may
  * change in the future and be a per-client cache.
  *
@@ -10,16 +8,8 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
-#include <linux/kernel.h>
-#include <linux/time.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/spinlock.h>
-#include <linux/list.h>
-
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
+#include "nfsd.h"
+#include "cache.h"
 
 /* Size of reply cache. Common values are:
  * 4.3BSD:      128
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 5c01fc148ce8..2604c3e70ea5 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1,46 +1,20 @@
 /*
- * linux/fs/nfsd/nfsctl.c
- *
  * Syscall interface to knfsd.
  *
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
-#include <linux/module.h>
-
-#include <linux/linkage.h>
-#include <linux/time.h>
-#include <linux/errno.h>
-#include <linux/fs.h>
 #include <linux/namei.h>
-#include <linux/fcntl.h>
-#include <linux/net.h>
-#include <linux/in.h>
-#include <linux/syscalls.h>
-#include <linux/unistd.h>
-#include <linux/slab.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/pagemap.h>
-#include <linux/init.h>
-#include <linux/inet.h>
-#include <linux/string.h>
 #include <linux/ctype.h>
 
-#include <linux/nfs.h>
 #include <linux/nfsd_idmap.h>
-#include <linux/lockd/bind.h>
-#include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/svcsock.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr.h>
 #include <linux/nfsd/syscall.h>
 #include <linux/lockd/lockd.h>
 #include <linux/sunrpc/clnt.h>
 
-#include <asm/uaccess.h>
-#include <net/ipv6.h>
+#include "nfsd.h"
+#include "cache.h"
 
 /*
  *      We have a single directory with 9 nodes in it.
@@ -55,6 +29,7 @@ enum {
         NFSD_Getfd,
         NFSD_Getfs,
         NFSD_List,
+        NFSD_Export_features,
         NFSD_Fh,
         NFSD_FO_UnlockIP,
         NFSD_FO_UnlockFS,
@@ -173,6 +148,24 @@ static const struct file_operations exports_operations = {
         .owner          = THIS_MODULE,
 };
 
+static int export_features_show(struct seq_file *m, void *v)
+{
+        seq_printf(m, "0x%x 0x%x\n", NFSEXP_ALLFLAGS, NFSEXP_SECINFO_FLAGS);
+        return 0;
+}
+
+static int export_features_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, export_features_show, NULL);
+}
+
+static struct file_operations export_features_operations = {
+        .open           = export_features_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 extern int nfsd_pool_stats_open(struct inode *inode, struct file *file);
 extern int nfsd_pool_stats_release(struct inode *inode, struct file *file);
 
@@ -1330,6 +1323,8 @@ static int nfsd_fill_super(struct super_block * sb, void * data, int silent)
                 [NFSD_Getfd] = {".getfd", &transaction_ops, S_IWUSR|S_IRUSR},
                 [NFSD_Getfs] = {".getfs", &transaction_ops, S_IWUSR|S_IRUSR},
                 [NFSD_List] = {"exports", &exports_operations, S_IRUGO},
+                [NFSD_Export_features] = {"export_features",
+                                        &export_features_operations, S_IRUGO},
                 [NFSD_FO_UnlockIP] = {"unlock_ip",
                                         &transaction_ops, S_IWUSR|S_IRUSR},
                 [NFSD_FO_UnlockFS] = {"unlock_filesystem",
diff --git a/include/linux/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 510ffdd5020e..e942a1aaac92 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/fs/nfsd/nfsd.h
@@ -1,6 +1,4 @@
 /*
- * linux/include/linux/nfsd/nfsd.h
- *
  * Hodge-podge collection of knfsd-related stuff.
  * I will sort this out later.
  *
@@ -11,13 +9,9 @@
 #define LINUX_NFSD_NFSD_H
 
 #include <linux/types.h>
-#include <linux/unistd.h>
-#include <linux/fs.h>
-#include <linux/posix_acl.h>
 #include <linux/mount.h>
 
 #include <linux/nfsd/debug.h>
-#include <linux/nfsd/nfsfh.h>
 #include <linux/nfsd/export.h>
 #include <linux/nfsd/stats.h>
 /*
@@ -25,30 +19,10 @@
  */
 #define NFSD_SUPPORTED_MINOR_VERSION    1
 
-/*
- * Flags for nfsd_permission
- */
-#define NFSD_MAY_NOP            0
-#define NFSD_MAY_EXEC           1 /* == MAY_EXEC */
-#define NFSD_MAY_WRITE          2 /* == MAY_WRITE */
-#define NFSD_MAY_READ           4 /* == MAY_READ */
-#define NFSD_MAY_SATTR          8
-#define NFSD_MAY_TRUNC          16
-#define NFSD_MAY_LOCK           32
-#define NFSD_MAY_OWNER_OVERRIDE 64
-#define NFSD_MAY_LOCAL_ACCESS   128 /* IRIX doing local access check on device special file*/
-#define NFSD_MAY_BYPASS_GSS_ON_ROOT 256
-
-#define NFSD_MAY_CREATE         (NFSD_MAY_EXEC|NFSD_MAY_WRITE)
-#define NFSD_MAY_REMOVE         (NFSD_MAY_EXEC|NFSD_MAY_WRITE|NFSD_MAY_TRUNC)
-
-/*
- * Callback function for readdir
- */
 struct readdir_cd {
         __be32                  err;    /* 0, nfserr, or nfserr_eof */
 };
-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,
@@ -73,69 +47,6 @@ int		nfsd_nrpools(void);
 int             nfsd_get_nrthreads(int n, int *);
 int             nfsd_set_nrthreads(int n, int *);
 
-/* nfsd/vfs.c */
-int             fh_lock_parent(struct svc_fh *, struct dentry *);
-int             nfsd_racache_init(int);
-void            nfsd_racache_shutdown(void);
-int             nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,
-                                struct svc_export **expp);
-__be32          nfsd_lookup(struct svc_rqst *, struct svc_fh *,
-                                const char *, unsigned int, struct svc_fh *);
-__be32           nfsd_lookup_dentry(struct svc_rqst *, struct svc_fh *,
-                                const char *, unsigned int,
-                                struct svc_export **, struct dentry **);
-__be32          nfsd_setattr(struct svc_rqst *, struct svc_fh *,
-                                struct iattr *, int, time_t);
-#ifdef CONFIG_NFSD_V4
-__be32          nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *,
-                    struct nfs4_acl *);
-int             nfsd4_get_nfs4_acl(struct svc_rqst *, struct dentry *, struct nfs4_acl **);
-#endif /* CONFIG_NFSD_V4 */
-__be32          nfsd_create(struct svc_rqst *, struct svc_fh *,
-                                char *name, int len, struct iattr *attrs,
-                                int type, dev_t rdev, struct svc_fh *res);
-#ifdef CONFIG_NFSD_V3
-__be32          nfsd_access(struct svc_rqst *, struct svc_fh *, u32 *, u32 *);
-__be32          nfsd_create_v3(struct svc_rqst *, struct svc_fh *,
-                                char *name, int len, struct iattr *attrs,
-                                struct svc_fh *res, int createmode,
-                                u32 *verifier, int *truncp, int *created);
-__be32          nfsd_commit(struct svc_rqst *, struct svc_fh *,
-                                loff_t, unsigned long);
-#endif /* CONFIG_NFSD_V3 */
-__be32          nfsd_open(struct svc_rqst *, struct svc_fh *, int,
-                                int, struct file **);
-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 *);
-__be32          nfsd_readlink(struct svc_rqst *, struct svc_fh *,
-                                char *, int *);
-__be32          nfsd_symlink(struct svc_rqst *, struct svc_fh *,
-                                char *name, int len, char *path, int plen,
-                                struct svc_fh *res, struct iattr *);
-__be32          nfsd_link(struct svc_rqst *, struct svc_fh *,
-                                char *, int, struct svc_fh *);
-__be32          nfsd_rename(struct svc_rqst *,
-                                struct svc_fh *, char *, int,
-                                struct svc_fh *, char *, int);
-__be32          nfsd_remove(struct svc_rqst *,
-                                struct svc_fh *, char *, int);
-__be32          nfsd_unlink(struct svc_rqst *, struct svc_fh *, int type,
-                                char *name, int len);
-int             nfsd_truncate(struct svc_rqst *, struct svc_fh *,
-                                unsigned long size);
-__be32          nfsd_readdir(struct svc_rqst *, struct svc_fh *,
-                             loff_t *, struct readdir_cd *, filldir_t);
-__be32          nfsd_statfs(struct svc_rqst *, struct svc_fh *,
-                                struct kstatfs *, int access);
-
-int             nfsd_notify_change(struct inode *, struct iattr *);
-__be32          nfsd_permission(struct svc_rqst *, struct svc_export *,
-                                struct dentry *, int);
-int             nfsd_sync_dir(struct dentry *dp);
-
 #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
 #ifdef CONFIG_NFSD_V2_ACL
 extern struct svc_version nfsd_acl_version2;
@@ -147,8 +58,6 @@ extern struct svc_version nfsd_acl_version3;
 #else
 #define nfsd_acl_version3 NULL
 #endif
-struct posix_acl *nfsd_get_posix_acl(struct svc_fh *, int);
-int nfsd_set_posix_acl(struct svc_fh *, int, struct posix_acl *);
 #endif
 
 enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL };
@@ -159,6 +68,11 @@ int nfsd_create_serv(void);
 
 extern int nfsd_max_blksize;
 
+static inline int nfsd_v4client(struct svc_rqst *rq)
+{
+        return rq->rq_prog == NFS_PROGRAM && rq->rq_vers == 4;
+}
+
 /* 
  * NFSv4 State
  */
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index 01965b2f3a76..1c12177b908c 100644
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -1,6 +1,4 @@
 /*
- * linux/fs/nfsd/nfsfh.c
- *
  * NFS server file handle treatment.
  *
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
@@ -9,19 +7,11 @@
  * ... and again Southern-Winter 2001 to support export_operations
  */
 
-#include <linux/slab.h>
-#include <linux/fs.h>
-#include <linux/unistd.h>
-#include <linux/string.h>
-#include <linux/stat.h>
-#include <linux/dcache.h>
 #include <linux/exportfs.h>
-#include <linux/mount.h>
 
-#include <linux/sunrpc/clnt.h>
-#include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/svcauth_gss.h>
-#include <linux/nfsd/nfsd.h>
+#include "nfsd.h"
+#include "vfs.h"
 #include "auth.h"
 
 #define NFSDDBG_FACILITY                NFSDDBG_FH
@@ -96,8 +86,10 @@ nfsd_mode_check(struct svc_rqst *rqstp, umode_t mode, int type)
 static __be32 nfsd_setuser_and_check_port(struct svc_rqst *rqstp,
                                           struct svc_export *exp)
 {
+        int flags = nfsexp_flags(rqstp, exp);
+
         /* Check if the request originated from a secure port. */
-        if (!rqstp->rq_secure && EX_SECURE(exp)) {
+        if (!rqstp->rq_secure && (flags & NFSEXP_INSECURE_PORT)) {
                 RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]);
                 dprintk(KERN_WARNING
                        "nfsd: request from insecure port %s!\n",
@@ -109,6 +101,36 @@ static __be32 nfsd_setuser_and_check_port(struct svc_rqst *rqstp,
         return nfserrno(nfsd_setuser(rqstp, exp));
 }
 
+static inline __be32 check_pseudo_root(struct svc_rqst *rqstp,
+        struct dentry *dentry, struct svc_export *exp)
+{
+        if (!(exp->ex_flags & NFSEXP_V4ROOT))
+                return nfs_ok;
+        /*
+         * v2/v3 clients have no need for the V4ROOT export--they use
+         * the mount protocl instead; also, further V4ROOT checks may be
+         * in v4-specific code, in which case v2/v3 clients could bypass
+         * them.
+         */
+        if (!nfsd_v4client(rqstp))
+                return nfserr_stale;
+        /*
+         * We're exposing only the directories and symlinks that have to be
+         * traversed on the way to real exports:
+         */
+        if (unlikely(!S_ISDIR(dentry->d_inode->i_mode) &&
+                     !S_ISLNK(dentry->d_inode->i_mode)))
+                return nfserr_stale;
+        /*
+         * A pseudoroot export gives permission to access only one
+         * single directory; the kernel has to make another upcall
+         * before granting access to anything else under it:
+         */
+        if (unlikely(dentry != exp->ex_path.dentry))
+                return nfserr_stale;
+        return nfs_ok;
+}
+
 /*
  * Use the given filehandle to look up the corresponding export and
  * dentry.  On success, the results are used to set fh_export and
@@ -232,14 +254,6 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp)
                 goto out;
         }
 
-        if (exp->ex_flags & NFSEXP_NOSUBTREECHECK) {
-                error = nfsd_setuser_and_check_port(rqstp, exp);
-                if (error) {
-                        dput(dentry);
-                        goto out;
-                }
-        }
-
         if (S_ISDIR(dentry->d_inode->i_mode) &&
                         (dentry->d_flags & DCACHE_DISCONNECTED)) {
                 printk("nfsd: find_fh_dentry returned a DISCONNECTED directory: %s/%s\n",
@@ -294,28 +308,32 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
                 error = nfsd_set_fh_dentry(rqstp, fhp);
                 if (error)
                         goto out;
-                dentry = fhp->fh_dentry;
-                exp = fhp->fh_export;
-        } else {
-                /*
-                 * just rechecking permissions
-                 * (e.g. nfsproc_create calls fh_verify, then nfsd_create
-                 * does as well)
-                 */
-                dprintk("nfsd: fh_verify - just checking\n");
-                dentry = fhp->fh_dentry;
-                exp = fhp->fh_export;
-                /*
-                 * Set user creds for this exportpoint; necessary even
-                 * in the "just checking" case because this may be a
-                 * filehandle that was created by fh_compose, and that
-                 * is about to be used in another nfsv4 compound
-                 * operation.
-                 */
-                error = nfsd_setuser_and_check_port(rqstp, exp);
-                if (error)
-                        goto out;
         }
+        dentry = fhp->fh_dentry;
+        exp = fhp->fh_export;
+        /*
+         * We still have to do all these permission checks, even when
+         * fh_dentry is already set:
+         *      - fh_verify may be called multiple times with different
+         *        "access" arguments (e.g. nfsd_proc_create calls
+         *        fh_verify(...,NFSD_MAY_EXEC) first, then later (in
+         *        nfsd_create) calls fh_verify(...,NFSD_MAY_CREATE).
+         *      - in the NFSv4 case, the filehandle may have been filled
+         *        in by fh_compose, and given a dentry, but further
+         *        compound operations performed with that filehandle
+         *        still need permissions checks.  In the worst case, a
+         *        mountpoint crossing may have changed the export
+         *        options, and we may now need to use a different uid
+         *        (for example, if different id-squashing options are in
+         *        effect on the new filesystem).
+         */
+        error = check_pseudo_root(rqstp, dentry, exp);
+        if (error)
+                goto out;
+
+        error = nfsd_setuser_and_check_port(rqstp, exp);
+        if (error)
+                goto out;
 
         error = nfsd_mode_check(rqstp, dentry->d_inode->i_mode, type);
         if (error)
diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h
new file mode 100644
index 000000000000..cdfb8c6a4206
--- /dev/null
+++ b/fs/nfsd/nfsfh.h
@@ -0,0 +1,208 @@
+/* Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de> */
+
+#ifndef _LINUX_NFSD_FH_INT_H
+#define _LINUX_NFSD_FH_INT_H
+
+#include <linux/nfsd/nfsfh.h>
+
+enum nfsd_fsid {
+        FSID_DEV = 0,
+        FSID_NUM,
+        FSID_MAJOR_MINOR,
+        FSID_ENCODE_DEV,
+        FSID_UUID4_INUM,
+        FSID_UUID8,
+        FSID_UUID16,
+        FSID_UUID16_INUM,
+};
+
+enum fsid_source {
+        FSIDSOURCE_DEV,
+        FSIDSOURCE_FSID,
+        FSIDSOURCE_UUID,
+};
+extern enum fsid_source fsid_source(struct svc_fh *fhp);
+
+
+/* This might look a little large to "inline" but in all calls except
+ * one, 'vers' is constant so moste of the function disappears.
+ */
+static inline void mk_fsid(int vers, u32 *fsidv, dev_t dev, ino_t ino,
+                           u32 fsid, unsigned char *uuid)
+{
+        u32 *up;
+        switch(vers) {
+        case FSID_DEV:
+                fsidv[0] = htonl((MAJOR(dev)<<16) |
+                                 MINOR(dev));
+                fsidv[1] = ino_t_to_u32(ino);
+                break;
+        case FSID_NUM:
+                fsidv[0] = fsid;
+                break;
+        case FSID_MAJOR_MINOR:
+                fsidv[0] = htonl(MAJOR(dev));
+                fsidv[1] = htonl(MINOR(dev));
+                fsidv[2] = ino_t_to_u32(ino);
+                break;
+
+        case FSID_ENCODE_DEV:
+                fsidv[0] = new_encode_dev(dev);
+                fsidv[1] = ino_t_to_u32(ino);
+                break;
+
+        case FSID_UUID4_INUM:
+                /* 4 byte fsid and inode number */
+                up = (u32*)uuid;
+                fsidv[0] = ino_t_to_u32(ino);
+                fsidv[1] = up[0] ^ up[1] ^ up[2] ^ up[3];
+                break;
+
+        case FSID_UUID8:
+                /* 8 byte fsid  */
+                up = (u32*)uuid;
+                fsidv[0] = up[0] ^ up[2];
+                fsidv[1] = up[1] ^ up[3];
+                break;
+
+        case FSID_UUID16:
+                /* 16 byte fsid - NFSv3+ only */
+                memcpy(fsidv, uuid, 16);
+                break;
+
+        case FSID_UUID16_INUM:
+                /* 8 byte inode and 16 byte fsid */
+                *(u64*)fsidv = (u64)ino;
+                memcpy(fsidv+2, uuid, 16);
+                break;
+        default: BUG();
+        }
+}
+
+static inline int key_len(int type)
+{
+        switch(type) {
+        case FSID_DEV:          return 8;
+        case FSID_NUM:          return 4;
+        case FSID_MAJOR_MINOR:  return 12;
+        case FSID_ENCODE_DEV:   return 8;
+        case FSID_UUID4_INUM:   return 8;
+        case FSID_UUID8:        return 8;
+        case FSID_UUID16:       return 16;
+        case FSID_UUID16_INUM:  return 24;
+        default: return 0;
+        }
+}
+
+/*
+ * Shorthand for dprintk()'s
+ */
+extern char * SVCFH_fmt(struct svc_fh *fhp);
+
+/*
+ * Function prototypes
+ */
+__be32  fh_verify(struct svc_rqst *, struct svc_fh *, int, int);
+__be32  fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *);
+__be32  fh_update(struct svc_fh *);
+void    fh_put(struct svc_fh *);
+
+static __inline__ struct svc_fh *
+fh_copy(struct svc_fh *dst, struct svc_fh *src)
+{
+        WARN_ON(src->fh_dentry || src->fh_locked);
+                        
+        *dst = *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)
+{
+        memset(fhp, 0, sizeof(*fhp));
+        fhp->fh_maxsize = maxsize;
+        return fhp;
+}
+
+#ifdef CONFIG_NFSD_V3
+/*
+ * Fill in the pre_op attr for the wcc data
+ */
+static inline void
+fill_pre_wcc(struct svc_fh *fhp)
+{
+        struct inode    *inode;
+
+        inode = fhp->fh_dentry->d_inode;
+        if (!fhp->fh_pre_saved) {
+                fhp->fh_pre_mtime = inode->i_mtime;
+                fhp->fh_pre_ctime = inode->i_ctime;
+                fhp->fh_pre_size  = inode->i_size;
+                fhp->fh_pre_change = inode->i_version;
+                fhp->fh_pre_saved = 1;
+        }
+}
+
+extern void fill_post_wcc(struct svc_fh *);
+#else
+#define fill_pre_wcc(ignored)
+#define fill_post_wcc(notused)
+#endif /* CONFIG_NFSD_V3 */
+
+
+/*
+ * Lock a file handle/inode
+ * NOTE: both fh_lock and fh_unlock are done "by hand" in
+ * vfs.c:nfsd_rename as it needs to grab 2 i_mutex's at once
+ * so, any changes here should be reflected there.
+ */
+
+static inline void
+fh_lock_nested(struct svc_fh *fhp, unsigned int subclass)
+{
+        struct dentry   *dentry = fhp->fh_dentry;
+        struct inode    *inode;
+
+        BUG_ON(!dentry);
+
+        if (fhp->fh_locked) {
+                printk(KERN_WARNING "fh_lock: %s/%s already locked!\n",
+                        dentry->d_parent->d_name.name, dentry->d_name.name);
+                return;
+        }
+
+        inode = dentry->d_inode;
+        mutex_lock_nested(&inode->i_mutex, subclass);
+        fill_pre_wcc(fhp);
+        fhp->fh_locked = 1;
+}
+
+static inline void
+fh_lock(struct svc_fh *fhp)
+{
+        fh_lock_nested(fhp, I_MUTEX_NORMAL);
+}
+
+/*
+ * Unlock a file handle/inode
+ */
+static inline void
+fh_unlock(struct svc_fh *fhp)
+{
+        BUG_ON(!fhp->fh_dentry);
+
+        if (fhp->fh_locked) {
+                fill_post_wcc(fhp);
+                mutex_unlock(&fhp->fh_dentry->d_inode->i_mutex);
+                fhp->fh_locked = 0;
+        }
+}
+
+#endif /* _LINUX_NFSD_FH_INT_H */
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index 0eb9c820b7a6..a047ad6111ef 100644
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -1,29 +1,14 @@
 /*
- * nfsproc2.c   Process version 2 NFS requests.
- * linux/fs/nfsd/nfs2proc.c
- * 
  * Process version 2 NFS requests.
  *
  * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de>
  */
 
-#include <linux/linkage.h>
-#include <linux/time.h>
-#include <linux/errno.h>
-#include <linux/fs.h>
-#include <linux/stat.h>
-#include <linux/fcntl.h>
-#include <linux/net.h>
-#include <linux/in.h>
 #include <linux/namei.h>
-#include <linux/unistd.h>
-#include <linux/slab.h>
 
-#include <linux/sunrpc/clnt.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/xdr.h>
+#include "cache.h"
+#include "xdr.h"
+#include "vfs.h"
 
 typedef struct svc_rqst svc_rqst;
 typedef struct svc_buf  svc_buf;
@@ -758,6 +743,7 @@ nfserrno (int errno)
                 { nfserr_io, -ETXTBSY },
                 { nfserr_notsupp, -EOPNOTSUPP },
                 { nfserr_toosmall, -ETOOSMALL },
+                { nfserr_serverfault, -ESERVERFAULT },
         };
         int     i;
 
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 67ea83eedd43..171699eb07c8 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -1,6 +1,4 @@
 /*
- * linux/fs/nfsd/nfssvc.c
- *
  * Central processing for nfsd.
  *
  * Authors:     Olaf Kirch (okir@monad.swb.de)
@@ -8,33 +6,19 @@
  * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
  */
 
-#include <linux/module.h>
 #include <linux/sched.h>
-#include <linux/time.h>
-#include <linux/errno.h>
-#include <linux/nfs.h>
-#include <linux/in.h>
-#include <linux/uio.h>
-#include <linux/unistd.h>
-#include <linux/slab.h>
-#include <linux/smp.h>
 #include <linux/freezer.h>
 #include <linux/fs_struct.h>
-#include <linux/kthread.h>
 #include <linux/swap.h>
 
-#include <linux/sunrpc/types.h>
 #include <linux/sunrpc/stats.h>
-#include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/svcsock.h>
-#include <linux/sunrpc/cache.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/stats.h>
-#include <linux/nfsd/cache.h>
-#include <linux/nfsd/syscall.h>
 #include <linux/lockd/bind.h>
 #include <linux/nfsacl.h>
 #include <linux/seq_file.h>
+#include "nfsd.h"
+#include "cache.h"
+#include "vfs.h"
 
 #define NFSDDBG_FACILITY        NFSDDBG_SVC
 
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index afd08e2c90a5..4ce005dbf3e6 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -1,20 +1,10 @@
 /*
- * linux/fs/nfsd/nfsxdr.c
- *
  * XDR support for nfsd
  *
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
-#include <linux/types.h>
-#include <linux/time.h>
-#include <linux/nfs.h>
-#include <linux/vfs.h>
-#include <linux/sunrpc/xdr.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/xdr.h>
-#include <linux/mm.h>
+#include "xdr.h"
 #include "auth.h"
 
 #define NFSDDBG_FACILITY                NFSDDBG_XDR
diff --git a/include/linux/nfsd/state.h b/fs/nfsd/state.h
index b38d11324189..fefeae27f25e 100644
--- a/include/linux/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -1,6 +1,4 @@
 /*
- *  linux/include/nfsd/state.h
- *
  *  Copyright (c) 2001 The Regents of the University of Michigan.
  *  All rights reserved.
  *
@@ -37,9 +35,8 @@
 #ifndef _NFSD4_STATE_H
 #define _NFSD4_STATE_H
 
-#include <linux/list.h>
-#include <linux/kref.h>
-#include <linux/sunrpc/clnt.h>
+#include <linux/nfsd/nfsfh.h>
+#include "nfsfh.h"
 
 typedef struct {
         u32             cl_boot;
@@ -60,6 +57,13 @@ typedef struct {
 #define si_stateownerid   si_opaque.so_stateownerid
 #define si_fileid         si_opaque.so_fileid
 
+#define STATEID_FMT     "(%08x/%08x/%08x/%08x)"
+#define STATEID_VAL(s) \
+        (s)->si_boot, \
+        (s)->si_stateownerid, \
+        (s)->si_fileid, \
+        (s)->si_generation
+
 struct nfsd4_cb_sequence {
         /* args/res */
         u32                     cbs_minorversion;
diff --git a/fs/nfsd/stats.c b/fs/nfsd/stats.c
index 71944cddf680..5232d3e8fb2f 100644
--- a/fs/nfsd/stats.c
+++ b/fs/nfsd/stats.c
@@ -1,6 +1,4 @@
 /*
- * linux/fs/nfsd/stats.c
- *
  * procfs-based user access to knfsd statistics
  *
  * /proc/net/rpc/nfsd
@@ -23,18 +21,13 @@
  * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
  */
 
-#include <linux/kernel.h>
-#include <linux/time.h>
-#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/stat.h>
 #include <linux/module.h>
-
-#include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/stats.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/stats.h>
 
+#include "nfsd.h"
+
 struct nfsd_stats       nfsdstats;
 struct svc_stat         nfsd_svcstats = {
         .program        = &nfsd_program,
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index a293f0273263..e3ef3ec0efd0 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1,7 +1,5 @@
 #define MSNFS   /* HACK HACK */
 /*
- * linux/fs/nfsd/vfs.c
- *
  * File operations used by nfsd. Some of these have been ripped from
  * other parts of the kernel because they weren't exported, others
  * are partial duplicates with added or changed functionality.
@@ -16,48 +14,31 @@
  * Zerocpy NFS support (C) 2002 Hirokazu Takahashi <taka@valinux.co.jp>
  */
 
-#include <linux/string.h>
-#include <linux/time.h>
-#include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/file.h>
-#include <linux/mount.h>
-#include <linux/major.h>
 #include <linux/splice.h>
-#include <linux/proc_fs.h>
-#include <linux/stat.h>
 #include <linux/fcntl.h>
-#include <linux/net.h>
-#include <linux/unistd.h>
-#include <linux/slab.h>
-#include <linux/pagemap.h>
-#include <linux/in.h>
-#include <linux/module.h>
 #include <linux/namei.h>
-#include <linux/vfs.h>
 #include <linux/delay.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#ifdef CONFIG_NFSD_V3
-#include <linux/nfs3.h>
-#include <linux/nfsd/xdr3.h>
-#endif /* CONFIG_NFSD_V3 */
-#include <linux/nfsd/nfsfh.h>
 #include <linux/quotaops.h>
 #include <linux/fsnotify.h>
-#include <linux/posix_acl.h>
 #include <linux/posix_acl_xattr.h>
 #include <linux/xattr.h>
+#include <linux/jhash.h>
+#include <linux/ima.h>
+#include <asm/uaccess.h>
+
+#ifdef CONFIG_NFSD_V3
+#include "xdr3.h"
+#endif /* CONFIG_NFSD_V3 */
+
 #ifdef CONFIG_NFSD_V4
-#include <linux/nfs4.h>
 #include <linux/nfs4_acl.h>
 #include <linux/nfsd_idmap.h>
-#include <linux/security.h>
 #endif /* CONFIG_NFSD_V4 */
-#include <linux/jhash.h>
-#include <linux/ima.h>
 
-#include <asm/uaccess.h>
+#include "nfsd.h"
+#include "vfs.h"
 
 #define NFSDDBG_FACILITY                NFSDDBG_FILEOP
 
@@ -89,12 +70,6 @@ struct raparm_hbucket {
 #define RAPARM_HASH_MASK        (RAPARM_HASH_SIZE-1)
 static struct raparm_hbucket    raparm_hash[RAPARM_HASH_SIZE];
 
-static inline int
-nfsd_v4client(struct svc_rqst *rq)
-{
-    return rq->rq_prog == NFS_PROGRAM && rq->rq_vers == 4;
-}
-
 /* 
  * Called from nfsd_lookup and encode_dirent. Check if we have crossed 
  * a mount point.
@@ -116,8 +91,16 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,
 
         exp2 = rqst_exp_get_by_name(rqstp, &path);
         if (IS_ERR(exp2)) {
-                if (PTR_ERR(exp2) != -ENOENT)
-                        err = PTR_ERR(exp2);
+                err = PTR_ERR(exp2);
+                /*
+                 * We normally allow NFS clients to continue
+                 * "underneath" a mountpoint that is not exported.
+                 * The exception is V4ROOT, where no traversal is ever
+                 * allowed without an explicit export of the new
+                 * directory.
+                 */
+                if (err == -ENOENT && !(exp->ex_flags & NFSEXP_V4ROOT))
+                        err = 0;
                 path_put(&path);
                 goto out;
         }
@@ -141,6 +124,53 @@ out:
         return err;
 }
 
+static void follow_to_parent(struct path *path)
+{
+        struct dentry *dp;
+
+        while (path->dentry == path->mnt->mnt_root && follow_up(path))
+                ;
+        dp = dget_parent(path->dentry);
+        dput(path->dentry);
+        path->dentry = dp;
+}
+
+static int nfsd_lookup_parent(struct svc_rqst *rqstp, struct dentry *dparent, struct svc_export **exp, struct dentry **dentryp)
+{
+        struct svc_export *exp2;
+        struct path path = {.mnt = mntget((*exp)->ex_path.mnt),
+                            .dentry = dget(dparent)};
+
+        follow_to_parent(&path);
+
+        exp2 = rqst_exp_parent(rqstp, &path);
+        if (PTR_ERR(exp2) == -ENOENT) {
+                *dentryp = dget(dparent);
+        } else if (IS_ERR(exp2)) {
+                path_put(&path);
+                return PTR_ERR(exp2);
+        } else {
+                *dentryp = dget(path.dentry);
+                exp_put(*exp);
+                *exp = exp2;
+        }
+        path_put(&path);
+        return 0;
+}
+
+/*
+ * For nfsd purposes, we treat V4ROOT exports as though there was an
+ * export at *every* directory.
+ */
+int nfsd_mountpoint(struct dentry *dentry, struct svc_export *exp)
+{
+        if (d_mountpoint(dentry))
+                return 1;
+        if (!(exp->ex_flags & NFSEXP_V4ROOT))
+                return 0;
+        return dentry->d_inode != NULL;
+}
+
 __be32
 nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp,
                    const char *name, unsigned int len,
@@ -169,35 +199,13 @@ nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp,
                         dentry = dget(dparent);
                 else if (dparent != exp->ex_path.dentry)
                         dentry = dget_parent(dparent);
-                else if (!EX_NOHIDE(exp))
+                else if (!EX_NOHIDE(exp) && !nfsd_v4client(rqstp))
                         dentry = dget(dparent); /* .. == . just like at / */
                 else {
                         /* checking mountpoint crossing is very different when stepping up */
-                        struct svc_export *exp2 = NULL;
-                        struct dentry *dp;
-                        struct path path = {.mnt = mntget(exp->ex_path.mnt),
-                                            .dentry = dget(dparent)};
-
-                        while (path.dentry == path.mnt->mnt_root &&
-                               follow_up(&path))
-                                ;
-                        dp = dget_parent(path.dentry);
-                        dput(path.dentry);
-                        path.dentry = dp;
-
-                        exp2 = rqst_exp_parent(rqstp, &path);
-                        if (PTR_ERR(exp2) == -ENOENT) {
-                                dentry = dget(dparent);
-                        } else if (IS_ERR(exp2)) {
-                                host_err = PTR_ERR(exp2);
-                                path_put(&path);
+                        host_err = nfsd_lookup_parent(rqstp, dparent, &exp, &dentry);
+                        if (host_err)
                                 goto out_nfserr;
-                        } else {
-                                dentry = dget(path.dentry);
-                                exp_put(exp);
-                                exp = exp2;
-                        }
-                        path_put(&path);
                 }
         } else {
                 fh_lock(fhp);
@@ -208,7 +216,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp,
                 /*
                  * check if we have crossed a mount point ...
                  */
-                if (d_mountpoint(dentry)) {
+                if (nfsd_mountpoint(dentry, exp)) {
                         if ((host_err = nfsd_cross_mnt(rqstp, &dentry, &exp))) {
                                 dput(dentry);
                                 goto out_nfserr;
diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h
new file mode 100644
index 000000000000..4b1de0a9ea75
--- /dev/null
+++ b/fs/nfsd/vfs.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de>
+ */
+
+#ifndef LINUX_NFSD_VFS_H
+#define LINUX_NFSD_VFS_H
+
+#include "nfsfh.h"
+
+/*
+ * Flags for nfsd_permission
+ */
+#define NFSD_MAY_NOP            0
+#define NFSD_MAY_EXEC           1 /* == MAY_EXEC */
+#define NFSD_MAY_WRITE          2 /* == MAY_WRITE */
+#define NFSD_MAY_READ           4 /* == MAY_READ */
+#define NFSD_MAY_SATTR          8
+#define NFSD_MAY_TRUNC          16
+#define NFSD_MAY_LOCK           32
+#define NFSD_MAY_OWNER_OVERRIDE 64
+#define NFSD_MAY_LOCAL_ACCESS   128 /* IRIX doing local access check on device special file*/
+#define NFSD_MAY_BYPASS_GSS_ON_ROOT 256
+
+#define NFSD_MAY_CREATE         (NFSD_MAY_EXEC|NFSD_MAY_WRITE)
+#define NFSD_MAY_REMOVE         (NFSD_MAY_EXEC|NFSD_MAY_WRITE|NFSD_MAY_TRUNC)
+
+/*
+ * Callback function for readdir
+ */
+typedef int (*nfsd_dirop_t)(struct inode *, struct dentry *, int, int);
+
+/* nfsd/vfs.c */
+int             fh_lock_parent(struct svc_fh *, struct dentry *);
+int             nfsd_racache_init(int);
+void            nfsd_racache_shutdown(void);
+int             nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,
+                                struct svc_export **expp);
+__be32          nfsd_lookup(struct svc_rqst *, struct svc_fh *,
+                                const char *, unsigned int, struct svc_fh *);
+__be32           nfsd_lookup_dentry(struct svc_rqst *, struct svc_fh *,
+                                const char *, unsigned int,
+                                struct svc_export **, struct dentry **);
+__be32          nfsd_setattr(struct svc_rqst *, struct svc_fh *,
+                                struct iattr *, int, time_t);
+int nfsd_mountpoint(struct dentry *, struct svc_export *);
+#ifdef CONFIG_NFSD_V4
+__be32          nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *,
+                    struct nfs4_acl *);
+int             nfsd4_get_nfs4_acl(struct svc_rqst *, struct dentry *, struct nfs4_acl **);
+#endif /* CONFIG_NFSD_V4 */
+__be32          nfsd_create(struct svc_rqst *, struct svc_fh *,
+                                char *name, int len, struct iattr *attrs,
+                                int type, dev_t rdev, struct svc_fh *res);
+#ifdef CONFIG_NFSD_V3
+__be32          nfsd_access(struct svc_rqst *, struct svc_fh *, u32 *, u32 *);
+__be32          nfsd_create_v3(struct svc_rqst *, struct svc_fh *,
+                                char *name, int len, struct iattr *attrs,
+                                struct svc_fh *res, int createmode,
+                                u32 *verifier, int *truncp, int *created);
+__be32          nfsd_commit(struct svc_rqst *, struct svc_fh *,
+                                loff_t, unsigned long);
+#endif /* CONFIG_NFSD_V3 */
+__be32          nfsd_open(struct svc_rqst *, struct svc_fh *, int,
+                                int, struct file **);
+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 *);
+__be32          nfsd_readlink(struct svc_rqst *, struct svc_fh *,
+                                char *, int *);
+__be32          nfsd_symlink(struct svc_rqst *, struct svc_fh *,
+                                char *name, int len, char *path, int plen,
+                                struct svc_fh *res, struct iattr *);
+__be32          nfsd_link(struct svc_rqst *, struct svc_fh *,
+                                char *, int, struct svc_fh *);
+__be32          nfsd_rename(struct svc_rqst *,
+                                struct svc_fh *, char *, int,
+                                struct svc_fh *, char *, int);
+__be32          nfsd_remove(struct svc_rqst *,
+                                struct svc_fh *, char *, int);
+__be32          nfsd_unlink(struct svc_rqst *, struct svc_fh *, int type,
+                                char *name, int len);
+int             nfsd_truncate(struct svc_rqst *, struct svc_fh *,
+                                unsigned long size);
+__be32          nfsd_readdir(struct svc_rqst *, struct svc_fh *,
+                             loff_t *, struct readdir_cd *, filldir_t);
+__be32          nfsd_statfs(struct svc_rqst *, struct svc_fh *,
+                                struct kstatfs *, int access);
+
+int             nfsd_notify_change(struct inode *, struct iattr *);
+__be32          nfsd_permission(struct svc_rqst *, struct svc_export *,
+                                struct dentry *, int);
+int             nfsd_sync_dir(struct dentry *dp);
+
+#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
+struct posix_acl *nfsd_get_posix_acl(struct svc_fh *, int);
+int nfsd_set_posix_acl(struct svc_fh *, int, struct posix_acl *);
+#endif
+
+#endif /* LINUX_NFSD_VFS_H */
diff --git a/include/linux/nfsd/xdr.h b/fs/nfsd/xdr.h
index a0132ef58f21..53b1863dd8f6 100644
--- a/include/linux/nfsd/xdr.h
+++ b/fs/nfsd/xdr.h
@@ -1,15 +1,11 @@
-/*
- * linux/include/linux/nfsd/xdr.h
- *
- * XDR types for nfsd. This is mainly a typing exercise.
- */
+/* XDR types for nfsd. This is mainly a typing exercise. */
 
 #ifndef LINUX_NFSD_H
 #define LINUX_NFSD_H
 
-#include <linux/fs.h>
 #include <linux/vfs.h>
-#include <linux/nfs.h>
+#include "nfsd.h"
+#include "nfsfh.h"
 
 struct nfsd_fhandle {
         struct svc_fh           fh;
diff --git a/include/linux/nfsd/xdr3.h b/fs/nfsd/xdr3.h
index 421eddd65a25..7df980eb0562 100644
--- a/include/linux/nfsd/xdr3.h
+++ b/fs/nfsd/xdr3.h
@@ -1,6 +1,4 @@
 /*
- * linux/include/linux/nfsd/xdr3.h
- *
  * XDR types for NFSv3 in nfsd.
  *
  * Copyright (C) 1996-1998, Olaf Kirch <okir@monad.swb.de>
@@ -9,7 +7,7 @@
 #ifndef _LINUX_NFSD_XDR3_H
 #define _LINUX_NFSD_XDR3_H
 
-#include <linux/nfsd/xdr.h>
+#include "xdr.h"
 
 struct nfsd3_sattrargs {
         struct svc_fh           fh;
diff --git a/include/linux/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index 73164c2b3d29..efa337739534 100644
--- a/include/linux/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -1,6 +1,4 @@
 /*
- *  include/linux/nfsd/xdr4.h
- *
  *  Server-side types for NFSv4.
  *
  *  Copyright (c) 2002 The Regents of the University of Michigan.
@@ -39,7 +37,8 @@
 #ifndef _LINUX_NFSD_XDR4_H
 #define _LINUX_NFSD_XDR4_H
 
-#include <linux/nfs4.h>
+#include "state.h"
+#include "nfsd.h"
 
 #define NFSD4_MAX_TAGLEN        128
 #define XDR_LEN(n)                     (((n) + 3) & ~3)
diff --git a/fs/nilfs2/Kconfig b/fs/nilfs2/Kconfig
index 251da07b2a1d..1225af7b2166 100644
--- a/fs/nilfs2/Kconfig
+++ b/fs/nilfs2/Kconfig
@@ -2,6 +2,7 @@ config NILFS2_FS
         tristate "NILFS2 file system support (EXPERIMENTAL)"
         depends on EXPERIMENTAL
         select CRC32
+        select FS_JOURNAL_INFO
         help
           NILFS2 is a log-structured file system (LFS) supporting continuous
           snapshotting.  In addition to versioning capability of the entire
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index deb2b132ae5e..3dae4a13f6e4 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -547,6 +547,9 @@ bail:
  *
  * called like this: dio->get_blocks(dio->inode, fs_startblk,
  *                                      fs_count, map_bh, dio->rw == WRITE);
+ *
+ * Note that we never bother to allocate blocks here, and thus ignore the
+ * create argument.
  */
 static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock,
                                      struct buffer_head *bh_result, int create)
@@ -563,14 +566,6 @@ static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock,
 
         inode_blocks = ocfs2_blocks_for_bytes(inode->i_sb, i_size_read(inode));
 
-        /*
-         * Any write past EOF is not allowed because we'd be extending.
-         */
-        if (create && (iblock + max_blocks) > inode_blocks) {
-                ret = -EIO;
-                goto bail;
-        }
-
         /* This figures out the size of the next contiguous block, and
          * our logical offset */
         ret = ocfs2_extent_map_get_blocks(inode, iblock, &p_blkno,
@@ -582,15 +577,6 @@ static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock,
                 goto bail;
         }
 
-        if (!ocfs2_sparse_alloc(OCFS2_SB(inode->i_sb)) && !p_blkno && create) {
-                ocfs2_error(inode->i_sb,
-                            "Inode %llu has a hole at block %llu\n",
-                            (unsigned long long)OCFS2_I(inode)->ip_blkno,
-                            (unsigned long long)iblock);
-                ret = -EROFS;
-                goto bail;
-        }
-
         /* We should already CoW the refcounted extent. */
         BUG_ON(ext_flags & OCFS2_EXT_REFCOUNTED);
         /*
@@ -601,20 +587,8 @@ static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock,
          */
         if (p_blkno && !(ext_flags & OCFS2_EXT_UNWRITTEN))
                 map_bh(bh_result, inode->i_sb, p_blkno);
-        else {
-                /*
-                 * ocfs2_prepare_inode_for_write() should have caught
-                 * the case where we'd be filling a hole and triggered
-                 * a buffered write instead.
-                 */
-                if (create) {
-                        ret = -EIO;
-                        mlog_errno(ret);
-                        goto bail;
-                }
-
+        else
                 clear_buffer_mapped(bh_result);
-        }
 
         /* make sure we don't map more than max_blocks blocks here as
            that's all the kernel will handle at this point. */
diff --git a/fs/proc/base.c b/fs/proc/base.c
index af643b5aefe8..18d5cc62d8ed 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1265,6 +1265,72 @@ static const struct file_operations proc_pid_sched_operations = {
 
 #endif
 
+static ssize_t comm_write(struct file *file, const char __user *buf,
+                                size_t count, loff_t *offset)
+{
+        struct inode *inode = file->f_path.dentry->d_inode;
+        struct task_struct *p;
+        char buffer[TASK_COMM_LEN];
+
+        memset(buffer, 0, sizeof(buffer));
+        if (count > sizeof(buffer) - 1)
+                count = sizeof(buffer) - 1;
+        if (copy_from_user(buffer, buf, count))
+                return -EFAULT;
+
+        p = get_proc_task(inode);
+        if (!p)
+                return -ESRCH;
+
+        if (same_thread_group(current, p))
+                set_task_comm(p, buffer);
+        else
+                count = -EINVAL;
+
+        put_task_struct(p);
+
+        return count;
+}
+
+static int comm_show(struct seq_file *m, void *v)
+{
+        struct inode *inode = m->private;
+        struct task_struct *p;
+
+        p = get_proc_task(inode);
+        if (!p)
+                return -ESRCH;
+
+        task_lock(p);
+        seq_printf(m, "%s\n", p->comm);
+        task_unlock(p);
+
+        put_task_struct(p);
+
+        return 0;
+}
+
+static int comm_open(struct inode *inode, struct file *filp)
+{
+        int ret;
+
+        ret = single_open(filp, comm_show, NULL);
+        if (!ret) {
+                struct seq_file *m = filp->private_data;
+
+                m->private = inode;
+        }
+        return ret;
+}
+
+static const struct file_operations proc_pid_set_comm_operations = {
+        .open           = comm_open,
+        .read           = seq_read,
+        .write          = comm_write,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 /*
  * We added or removed a vma mapping the executable. The vmas are only mapped
  * during exec and are not mapped with the mmap system call.
@@ -2200,7 +2266,7 @@ static const struct inode_operations proc_attr_dir_inode_operations = {
 
 #endif
 
-#if defined(USE_ELF_CORE_DUMP) && defined(CONFIG_ELF_CORE)
+#ifdef CONFIG_ELF_CORE
 static ssize_t proc_coredump_filter_read(struct file *file, char __user *buf,
                                          size_t count, loff_t *ppos)
 {
@@ -2504,6 +2570,7 @@ static const struct pid_entry tgid_base_stuff[] = {
 #ifdef CONFIG_SCHED_DEBUG
         REG("sched",      S_IRUGO|S_IWUSR, proc_pid_sched_operations),
 #endif
+        REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
 #ifdef CONFIG_HAVE_ARCH_TRACEHOOK
         INF("syscall",    S_IRUSR, proc_pid_syscall),
 #endif
@@ -2556,7 +2623,7 @@ static const struct pid_entry tgid_base_stuff[] = {
 #ifdef CONFIG_FAULT_INJECTION
         REG("make-it-fail", S_IRUGO|S_IWUSR, proc_fault_inject_operations),
 #endif
-#if defined(USE_ELF_CORE_DUMP) && defined(CONFIG_ELF_CORE)
+#ifdef CONFIG_ELF_CORE
         REG("coredump_filter", S_IRUGO|S_IWUSR, proc_coredump_filter_operations),
 #endif
 #ifdef CONFIG_TASK_IO_ACCOUNTING
@@ -2838,6 +2905,7 @@ static const struct pid_entry tid_base_stuff[] = {
 #ifdef CONFIG_SCHED_DEBUG
         REG("sched",     S_IRUGO|S_IWUSR, proc_pid_sched_operations),
 #endif
+        REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
 #ifdef CONFIG_HAVE_ARCH_TRACEHOOK
         INF("syscall",   S_IRUSR, proc_pid_syscall),
 #endif
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index fa678abc9db1..480cb1065eec 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -429,7 +429,7 @@ struct dentry *proc_lookup_de(struct proc_dir_entry *de, struct inode *dir,
                         unsigned int ino;
 
                         ino = de->low_ino;
-                        de_get(de);
+                        pde_get(de);
                         spin_unlock(&proc_subdir_lock);
                         error = -EINVAL;
                         inode = proc_get_inode(dir->i_sb, ino, de);
@@ -445,7 +445,7 @@ out_unlock:
                 return NULL;
         }
         if (de)
-                de_put(de);
+                pde_put(de);
         return ERR_PTR(error);
 }
 
@@ -509,17 +509,17 @@ int proc_readdir_de(struct proc_dir_entry *de, struct file *filp, void *dirent,
                                 struct proc_dir_entry *next;
 
                                 /* filldir passes info to user space */
-                                de_get(de);
+                                pde_get(de);
                                 spin_unlock(&proc_subdir_lock);
                                 if (filldir(dirent, de->name, de->namelen, filp->f_pos,
                                             de->low_ino, de->mode >> 12) < 0) {
-                                        de_put(de);
+                                        pde_put(de);
                                         goto out;
                                 }
                                 spin_lock(&proc_subdir_lock);
                                 filp->f_pos++;
                                 next = de->next;
-                                de_put(de);
+                                pde_put(de);
                                 de = next;
                         } while (de);
                         spin_unlock(&proc_subdir_lock);
@@ -763,7 +763,7 @@ out:
         return NULL;
 }
 
-void free_proc_entry(struct proc_dir_entry *de)
+static void free_proc_entry(struct proc_dir_entry *de)
 {
         unsigned int ino = de->low_ino;
 
@@ -777,6 +777,12 @@ void free_proc_entry(struct proc_dir_entry *de)
         kfree(de);
 }
 
+void pde_put(struct proc_dir_entry *pde)
+{
+        if (atomic_dec_and_test(&pde->count))
+                free_proc_entry(pde);
+}
+
 /*
  * Remove a /proc entry and free it if it's not currently in use.
  */
@@ -845,6 +851,5 @@ continue_removing:
         WARN(de->subdir, KERN_WARNING "%s: removing non-empty directory "
                         "'%s/%s', leaking at least '%s'\n", __func__,
                         de->parent->name, de->name, de->subdir->name);
-        if (atomic_dec_and_test(&de->count))
-                free_proc_entry(de);
+        pde_put(de);
 }
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index d78ade305541..445a02bcaab3 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -24,29 +24,6 @@
 
 #include "internal.h"
 
-struct proc_dir_entry *de_get(struct proc_dir_entry *de)
-{
-        atomic_inc(&de->count);
-        return de;
-}
-
-/*
- * Decrements the use count and checks for deferred deletion.
- */
-void de_put(struct proc_dir_entry *de)
-{
-        if (!atomic_read(&de->count)) {
-                printk("de_put: entry %s already free!\n", de->name);
-                return;
-        }
-
-        if (atomic_dec_and_test(&de->count))
-                free_proc_entry(de);
-}
-
-/*
- * Decrement the use count of the proc_dir_entry.
- */
 static void proc_delete_inode(struct inode *inode)
 {
         struct proc_dir_entry *de;
@@ -59,7 +36,7 @@ static void proc_delete_inode(struct inode *inode)
         /* Let go of any associated proc directory entry */
         de = PROC_I(inode)->pde;
         if (de)
-                de_put(de);
+                pde_put(de);
         if (PROC_I(inode)->sysctl)
                 sysctl_head_put(PROC_I(inode)->sysctl);
         clear_inode(inode);
@@ -480,7 +457,7 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino,
                 }
                 unlock_new_inode(inode);
         } else
-               de_put(de);
+               pde_put(de);
         return inode;
 }                       
 
@@ -495,7 +472,7 @@ int proc_fill_super(struct super_block *s)
         s->s_op = &proc_sops;
         s->s_time_gran = 1;
         
-        de_get(&proc_root);
+        pde_get(&proc_root);
         root_inode = proc_get_inode(s, PROC_ROOT_INO, &proc_root);
         if (!root_inode)
                 goto out_no_root;
@@ -509,6 +486,6 @@ int proc_fill_super(struct super_block *s)
 out_no_root:
         printk("proc_read_super: get root inode failed\n");
         iput(root_inode);
-        de_put(&proc_root);
+        pde_put(&proc_root);
         return -ENOMEM;
 }
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 753ca37002c8..1f24a3eddd12 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -61,8 +61,6 @@ extern const struct file_operations proc_pagemap_operations;
 extern const struct file_operations proc_net_operations;
 extern const struct inode_operations proc_net_inode_operations;
 
-void free_proc_entry(struct proc_dir_entry *de);
-
 void proc_init_inodecache(void);
 
 static inline struct pid *proc_pid(struct inode *inode)
@@ -101,8 +99,12 @@ unsigned long task_vsize(struct mm_struct *);
 int task_statm(struct mm_struct *, int *, int *, int *, int *);
 void task_mem(struct seq_file *, struct mm_struct *);
 
-struct proc_dir_entry *de_get(struct proc_dir_entry *de);
-void de_put(struct proc_dir_entry *de);
+static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
+{
+        atomic_inc(&pde->count);
+        return pde;
+}
+void pde_put(struct proc_dir_entry *pde);
 
 extern struct vfsmount *proc_mnt;
 int proc_fill_super(struct super_block *);
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 2a1bef9203c6..47c03f4336b8 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -650,6 +650,50 @@ static int pagemap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
         return err;
 }
 
+static u64 huge_pte_to_pagemap_entry(pte_t pte, int offset)
+{
+        u64 pme = 0;
+        if (pte_present(pte))
+                pme = PM_PFRAME(pte_pfn(pte) + offset)
+                        | PM_PSHIFT(PAGE_SHIFT) | PM_PRESENT;
+        return pme;
+}
+
+static int pagemap_hugetlb_range(pte_t *pte, unsigned long addr,
+                                 unsigned long end, struct mm_walk *walk)
+{
+        struct vm_area_struct *vma;
+        struct pagemapread *pm = walk->private;
+        struct hstate *hs = NULL;
+        int err = 0;
+
+        vma = find_vma(walk->mm, addr);
+        if (vma)
+                hs = hstate_vma(vma);
+        for (; addr != end; addr += PAGE_SIZE) {
+                u64 pfn = PM_NOT_PRESENT;
+
+                if (vma && (addr >= vma->vm_end)) {
+                        vma = find_vma(walk->mm, addr);
+                        if (vma)
+                                hs = hstate_vma(vma);
+                }
+
+                if (vma && (vma->vm_start <= addr) && is_vm_hugetlb_page(vma)) {
+                        /* calculate pfn of the "raw" page in the hugepage. */
+                        int offset = (addr & ~huge_page_mask(hs)) >> PAGE_SHIFT;
+                        pfn = huge_pte_to_pagemap_entry(*pte, offset);
+                }
+                err = add_to_pagemap(addr, pfn, pm);
+                if (err)
+                        return err;
+        }
+
+        cond_resched();
+
+        return err;
+}
+
 /*
  * /proc/pid/pagemap - an array mapping virtual pages to pfns
  *
@@ -742,6 +786,7 @@ static ssize_t pagemap_read(struct file *file, char __user *buf,
 
         pagemap_walk.pmd_entry = pagemap_pte_range;
         pagemap_walk.pte_hole = pagemap_pte_hole;
+        pagemap_walk.hugetlb_entry = pagemap_hugetlb_range;
         pagemap_walk.mm = mm;
         pagemap_walk.private = &pm;
 
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index 8f5c05d3dbd3..5d9fd64ef81a 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -110,9 +110,13 @@ int task_statm(struct mm_struct *mm, int *shared, int *text,
                 }
         }
 
-        size += (*text = mm->end_code - mm->start_code);
-        size += (*data = mm->start_stack - mm->start_data);
+        *text = (PAGE_ALIGN(mm->end_code) - (mm->start_code & PAGE_MASK))
+                >> PAGE_SHIFT;
+        *data = (PAGE_ALIGN(mm->start_stack) - (mm->start_data & PAGE_MASK))
+                >> PAGE_SHIFT;
         up_read(&mm->mmap_sem);
+        size >>= PAGE_SHIFT;
+        size += *text + *data;
         *resident = size;
         return size;
 }
diff --git a/fs/qnx4/bitmap.c b/fs/qnx4/bitmap.c
index 32f5d131a644..22e0d60e53ef 100644
--- a/fs/qnx4/bitmap.c
+++ b/fs/qnx4/bitmap.c
@@ -17,13 +17,6 @@
 #include <linux/bitops.h>
 #include "qnx4.h"
 
-#if 0
-int qnx4_new_block(struct super_block *sb)
-{
-        return 0;
-}
-#endif  /*  0  */
-
 static void count_bits(register const char *bmPart, register int size,
                        int *const tf)
 {
@@ -35,22 +28,7 @@ static void count_bits(register const char *bmPart, register int size,
         }
         do {
                 b = *bmPart++;
-                if ((b & 1) == 0)
-                        tot++;
-                if ((b & 2) == 0)
-                        tot++;
-                if ((b & 4) == 0)
-                        tot++;
-                if ((b & 8) == 0)
-                        tot++;
-                if ((b & 16) == 0)
-                        tot++;
-                if ((b & 32) == 0)
-                        tot++;
-                if ((b & 64) == 0)
-                        tot++;
-                if ((b & 128) == 0)
-                        tot++;
+                tot += 8 - hweight8(b);
                 size--;
         } while (size != 0);
         *tf = tot;
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index 449f5a66dd34..ebf3440d28ca 100644
--- a/fs/qnx4/inode.c
+++ b/fs/qnx4/inode.c
@@ -64,25 +64,7 @@ static struct buffer_head *qnx4_getblk(struct inode *inode, int nr,
                 result = sb_getblk(inode->i_sb, nr);
                 return result;
         }
-        if (!create) {
-                return NULL;
-        }
-#if 0
-        tmp = qnx4_new_block(inode->i_sb);
-        if (!tmp) {
-                return NULL;
-        }
-        result = sb_getblk(inode->i_sb, tmp);
-        if (tst) {
-                qnx4_free_block(inode->i_sb, tmp);
-                brelse(result);
-                goto repeat;
-        }
-        tst = tmp;
-#endif
-        inode->i_ctime = CURRENT_TIME_SEC;
-        mark_inode_dirty(inode);
-        return result;
+        return NULL;
 }
 
 struct buffer_head *qnx4_bread(struct inode *inode, int block, int create)
@@ -113,8 +95,6 @@ static int qnx4_get_block( struct inode *inode, sector_t iblock, struct buffer_h
         if ( phys ) {
                 // logical block is before EOF
                 map_bh(bh, inode->i_sb, phys);
-        } else if ( create ) {
-                // to be done.
         }
         return 0;
 }
diff --git a/fs/reiserfs/Kconfig b/fs/reiserfs/Kconfig
index 513f431038f9..ac7cd75c86f8 100644
--- a/fs/reiserfs/Kconfig
+++ b/fs/reiserfs/Kconfig
@@ -1,6 +1,7 @@
 config REISERFS_FS
         tristate "Reiserfs support"
         select CRC32
+        select FS_JOURNAL_INFO
         help
           Stores not just filenames but the files themselves in a balanced
           tree.  Uses journalling.
diff --git a/fs/reiserfs/Makefile b/fs/reiserfs/Makefile
index 6a9e30c041dd..792b3cb2cd18 100644
--- a/fs/reiserfs/Makefile
+++ b/fs/reiserfs/Makefile
@@ -7,7 +7,11 @@ obj-$(CONFIG_REISERFS_FS) += reiserfs.o
 reiserfs-objs := bitmap.o do_balan.o namei.o inode.o file.o dir.o fix_node.o \
                  super.o prints.o objectid.o lbalance.o ibalance.o stree.o \
                  hashes.o tail_conversion.o journal.o resize.o \
-                 item_ops.o ioctl.o procfs.o xattr.o lock.o
+                 item_ops.o ioctl.o xattr.o lock.o
+
+ifeq ($(CONFIG_REISERFS_PROC_INFO),y)
+reiserfs-objs += procfs.o
+endif
 
 ifeq ($(CONFIG_REISERFS_FS_XATTR),y)
 reiserfs-objs += xattr_user.o xattr_trusted.o
diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
index 9229e5514a4e..7a9981196c1c 100644
--- a/fs/reiserfs/procfs.c
+++ b/fs/reiserfs/procfs.c
@@ -17,8 +17,6 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 
-#ifdef CONFIG_REISERFS_PROC_INFO
-
 /*
  * LOCKING:
  *
@@ -48,14 +46,6 @@ static int show_version(struct seq_file *m, struct super_block *sb)
         return 0;
 }
 
-int reiserfs_global_version_in_proc(char *buffer, char **start, off_t offset,
-                                    int count, int *eof, void *data)
-{
-        *start = buffer;
-        *eof = 1;
-        return 0;
-}
-
 #define SF( x ) ( r -> x )
 #define SFP( x ) SF( s_proc_info_data.x )
 #define SFPL( x ) SFP( x[ level ] )
@@ -538,19 +528,6 @@ int reiserfs_proc_info_done(struct super_block *sb)
         return 0;
 }
 
-struct proc_dir_entry *reiserfs_proc_register_global(char *name,
-                                                     read_proc_t * func)
-{
-        return (proc_info_root) ? create_proc_read_entry(name, 0,
-                                                         proc_info_root,
-                                                         func, NULL) : NULL;
-}
-
-void reiserfs_proc_unregister_global(const char *name)
-{
-        remove_proc_entry(name, proc_info_root);
-}
-
 int reiserfs_proc_info_global_init(void)
 {
         if (proc_info_root == NULL) {
@@ -572,48 +549,6 @@ int reiserfs_proc_info_global_done(void)
         }
         return 0;
 }
-
-/* REISERFS_PROC_INFO */
-#else
-
-int reiserfs_proc_info_init(struct super_block *sb)
-{
-        return 0;
-}
-int reiserfs_proc_info_done(struct super_block *sb)
-{
-        return 0;
-}
-
-struct proc_dir_entry *reiserfs_proc_register_global(char *name,
-                                                     read_proc_t * func)
-{
-        return NULL;
-}
-
-void reiserfs_proc_unregister_global(const char *name)
-{;
-}
-
-int reiserfs_proc_info_global_init(void)
-{
-        return 0;
-}
-int reiserfs_proc_info_global_done(void)
-{
-        return 0;
-}
-
-int reiserfs_global_version_in_proc(char *buffer, char **start,
-                                    off_t offset,
-                                    int count, int *eof, void *data)
-{
-        return 0;
-}
-
-/* REISERFS_PROC_INFO */
-#endif
-
 /*
  * Revision 1.1.8.2  2001/07/15 17:08:42  god
  *  . use get_super() in procfs.c
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 339b0baf2af6..b4a7dd03bdb9 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -2222,8 +2222,6 @@ static int __init init_reiserfs_fs(void)
         }
 
         reiserfs_proc_info_global_init();
-        reiserfs_proc_register_global("version",
-                                      reiserfs_global_version_in_proc);
 
         ret = register_filesystem(&reiserfs_fs_type);
 
@@ -2231,7 +2229,6 @@ static int __init init_reiserfs_fs(void)
                 return 0;
         }
 
-        reiserfs_proc_unregister_global("version");
         reiserfs_proc_info_global_done();
         destroy_inodecache();
 
@@ -2240,7 +2237,6 @@ static int __init init_reiserfs_fs(void)
 
 static void __exit exit_reiserfs_fs(void)
 {
-        reiserfs_proc_unregister_global("version");
         reiserfs_proc_info_global_done();
         unregister_filesystem(&reiserfs_fs_type);
         destroy_inodecache();
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 8a771c59ac3e..90492327b383 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -350,13 +350,8 @@ void dbg_dump_node(const struct ubifs_info *c, const void *node)
                        le32_to_cpu(sup->fmt_version));
                 printk(KERN_DEBUG "\ttime_gran      %u\n",
                        le32_to_cpu(sup->time_gran));
-                printk(KERN_DEBUG "\tUUID           %02X%02X%02X%02X-%02X%02X"
-                       "-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X\n",
-                       sup->uuid[0], sup->uuid[1], sup->uuid[2], sup->uuid[3],
-                       sup->uuid[4], sup->uuid[5], sup->uuid[6], sup->uuid[7],
-                       sup->uuid[8], sup->uuid[9], sup->uuid[10], sup->uuid[11],
-                       sup->uuid[12], sup->uuid[13], sup->uuid[14],
-                       sup->uuid[15]);
+                printk(KERN_DEBUG "\tUUID           %pUB\n",
+                       sup->uuid);
                 break;
         }
         case UBIFS_MST_NODE:
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 943ad5624530..43f9d19a6f33 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1393,12 +1393,7 @@ static int mount_ubifs(struct ubifs_info *c)
                 c->leb_size, c->leb_size >> 10);
         dbg_msg("data journal heads:  %d",
                 c->jhead_cnt - NONDATA_JHEADS_CNT);
-        dbg_msg("UUID:                %02X%02X%02X%02X-%02X%02X"
-               "-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X",
-               c->uuid[0], c->uuid[1], c->uuid[2], c->uuid[3],
-               c->uuid[4], c->uuid[5], c->uuid[6], c->uuid[7],
-               c->uuid[8], c->uuid[9], c->uuid[10], c->uuid[11],
-               c->uuid[12], c->uuid[13], c->uuid[14], c->uuid[15]);
+        dbg_msg("UUID:                %pUB", c->uuid);
         dbg_msg("big_lpt              %d", c->big_lpt);
         dbg_msg("log LEBs:            %d (%d - %d)",
                 c->log_lebs, UBIFS_LOG_LNUM, c->log_last);
diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c
index 6f671f1ac271..22af68f8b682 100644
--- a/fs/ufs/dir.c
+++ b/fs/ufs/dir.c
@@ -70,13 +70,13 @@ static inline unsigned long ufs_dir_pages(struct inode *inode)
         return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT;
 }
 
-ino_t ufs_inode_by_name(struct inode *dir, struct dentry *dentry)
+ino_t ufs_inode_by_name(struct inode *dir, struct qstr *qstr)
 {
         ino_t res = 0;
         struct ufs_dir_entry *de;
         struct page *page;
         
-        de = ufs_find_entry(dir, dentry, &page);
+        de = ufs_find_entry(dir, qstr, &page);
         if (de) {
                 res = fs32_to_cpu(dir->i_sb, de->d_ino);
                 ufs_put_page(page);
@@ -249,12 +249,12 @@ struct ufs_dir_entry *ufs_dotdot(struct inode *dir, struct page **p)
  * (as a parameter - res_dir). Page is returned mapped and unlocked.
  * Entry is guaranteed to be valid.
  */
-struct ufs_dir_entry *ufs_find_entry(struct inode *dir, struct dentry *dentry,
+struct ufs_dir_entry *ufs_find_entry(struct inode *dir, struct qstr *qstr,
                                      struct page **res_page)
 {
         struct super_block *sb = dir->i_sb;
-        const char *name = dentry->d_name.name;
-        int namelen = dentry->d_name.len;
+        const char *name = qstr->name;
+        int namelen = qstr->len;
         unsigned reclen = UFS_DIR_REC_LEN(namelen);
         unsigned long start, n;
         unsigned long npages = ufs_dir_pages(dir);
diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index 23119fe7ad62..4c26d9e8bc94 100644
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -56,7 +56,7 @@ static struct dentry *ufs_lookup(struct inode * dir, struct dentry *dentry, stru
                 return ERR_PTR(-ENAMETOOLONG);
 
         lock_kernel();
-        ino = ufs_inode_by_name(dir, dentry);
+        ino = ufs_inode_by_name(dir, &dentry->d_name);
         if (ino) {
                 inode = ufs_iget(dir->i_sb, ino);
                 if (IS_ERR(inode)) {
@@ -237,7 +237,7 @@ static int ufs_unlink(struct inode *dir, struct dentry *dentry)
         struct page *page;
         int err = -ENOENT;
 
-        de = ufs_find_entry(dir, dentry, &page);
+        de = ufs_find_entry(dir, &dentry->d_name, &page);
         if (!de)
                 goto out;
 
@@ -281,7 +281,7 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
         struct ufs_dir_entry *old_de;
         int err = -ENOENT;
 
-        old_de = ufs_find_entry(old_dir, old_dentry, &old_page);
+        old_de = ufs_find_entry(old_dir, &old_dentry->d_name, &old_page);
         if (!old_de)
                 goto out;
 
@@ -301,7 +301,7 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
                         goto out_dir;
 
                 err = -ENOENT;
-                new_de = ufs_find_entry(new_dir, new_dentry, &new_page);
+                new_de = ufs_find_entry(new_dir, &new_dentry->d_name, &new_page);
                 if (!new_de)
                         goto out_dir;
                 inode_inc_link_count(old_inode);
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 5faed7954d0a..143c20bfb04b 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -66,6 +66,7 @@
  */
 
 
+#include <linux/exportfs.h>
 #include <linux/module.h>
 #include <linux/bitops.h>
 
@@ -96,6 +97,56 @@
 #include "swab.h"
 #include "util.h"
 
+static struct inode *ufs_nfs_get_inode(struct super_block *sb, u64 ino, u32 generation)
+{
+        struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;
+        struct inode *inode;
+
+        if (ino < UFS_ROOTINO || ino > uspi->s_ncg * uspi->s_ipg)
+                return ERR_PTR(-ESTALE);
+
+        inode = ufs_iget(sb, ino);
+        if (IS_ERR(inode))
+                return ERR_CAST(inode);
+        if (generation && inode->i_generation != generation) {
+                iput(inode);
+                return ERR_PTR(-ESTALE);
+        }
+        return inode;
+}
+
+static struct dentry *ufs_fh_to_dentry(struct super_block *sb, struct fid *fid,
+                                       int fh_len, int fh_type)
+{
+        return generic_fh_to_dentry(sb, fid, fh_len, fh_type, ufs_nfs_get_inode);
+}
+
+static struct dentry *ufs_fh_to_parent(struct super_block *sb, struct fid *fid,
+                                       int fh_len, int fh_type)
+{
+        return generic_fh_to_parent(sb, fid, fh_len, fh_type, ufs_nfs_get_inode);
+}
+
+static struct dentry *ufs_get_parent(struct dentry *child)
+{
+        struct qstr dot_dot = {
+                .name   = "..",
+                .len    = 2,
+        };
+        ino_t ino;
+
+        ino = ufs_inode_by_name(child->d_inode, &dot_dot);
+        if (!ino)
+                return ERR_PTR(-ENOENT);
+        return d_obtain_alias(ufs_iget(child->d_inode->i_sb, ino));
+}
+
+static const struct export_operations ufs_export_ops = {
+        .fh_to_dentry   = ufs_fh_to_dentry,
+        .fh_to_parent   = ufs_fh_to_parent,
+        .get_parent     = ufs_get_parent,
+};
+
 #ifdef CONFIG_UFS_DEBUG
 /*
  * Print contents of ufs_super_block, useful for debugging
@@ -990,6 +1041,7 @@ magic_found:
          * Read ufs_super_block into internal data structures
          */
         sb->s_op = &ufs_super_ops;
+        sb->s_export_op = &ufs_export_ops;
         sb->dq_op = NULL; /***/
         sb->s_magic = fs32_to_cpu(sb, usb3->fs_magic);
 
diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h
index 644e77e13599..0b4c39bc0d9e 100644
--- a/fs/ufs/ufs.h
+++ b/fs/ufs/ufs.h
@@ -86,9 +86,9 @@ extern void ufs_put_cylinder (struct super_block *, unsigned);
 /* dir.c */
 extern const struct inode_operations ufs_dir_inode_operations;
 extern int ufs_add_link (struct dentry *, struct inode *);
-extern ino_t ufs_inode_by_name(struct inode *, struct dentry *);
+extern ino_t ufs_inode_by_name(struct inode *, struct qstr *);
 extern int ufs_make_empty(struct inode *, struct inode *);
-extern struct ufs_dir_entry *ufs_find_entry(struct inode *, struct dentry *, struct page **);
+extern struct ufs_dir_entry *ufs_find_entry(struct inode *, struct qstr *, struct page **);
 extern int ufs_delete_entry(struct inode *, struct ufs_dir_entry *, struct page *);
 extern int ufs_empty_dir (struct inode *);
 extern struct ufs_dir_entry *ufs_dotdot(struct inode *, struct page **);
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
index 7a59daed1782..56641fe52a23 100644
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@ -26,6 +26,8 @@ endif
 
 obj-$(CONFIG_XFS_FS)            += xfs.o
 
+xfs-y                           += linux-2.6/xfs_trace.o
+
 xfs-$(CONFIG_XFS_QUOTA)         += $(addprefix quota/, \
                                    xfs_dquot.o \
                                    xfs_dquot_item.o \
@@ -90,8 +92,7 @@ xfs-y				+= xfs_alloc.o \
                                    xfs_rw.o \
                                    xfs_dmops.o
 
-xfs-$(CONFIG_XFS_TRACE)         += xfs_btree_trace.o \
-                                   xfs_dir2_trace.o
+xfs-$(CONFIG_XFS_TRACE)         += xfs_btree_trace.o
 
 # Objects in linux/
 xfs-y                           += $(addprefix $(XFS_LINUX)/, \
@@ -113,6 +114,3 @@ xfs-y				+= $(addprefix $(XFS_LINUX)/, \
 xfs-y                           += $(addprefix support/, \
                                    debug.o \
                                    uuid.o)
-
-xfs-$(CONFIG_XFS_TRACE)         += support/ktrace.o
-
diff --git a/fs/xfs/linux-2.6/xfs_acl.c b/fs/xfs/linux-2.6/xfs_acl.c
index b23a54506446..69e598b6986f 100644
--- a/fs/xfs/linux-2.6/xfs_acl.c
+++ b/fs/xfs/linux-2.6/xfs_acl.c
@@ -21,6 +21,7 @@
 #include "xfs_bmap_btree.h"
 #include "xfs_inode.h"
 #include "xfs_vnodeops.h"
+#include "xfs_trace.h"
 #include <linux/xattr.h>
 #include <linux/posix_acl_xattr.h>
 
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index 87813e405cef..66abe36c1213 100644
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -38,6 +38,7 @@
 #include "xfs_rw.h"
 #include "xfs_iomap.h"
 #include "xfs_vnodeops.h"
+#include "xfs_trace.h"
 #include <linux/mpage.h>
 #include <linux/pagevec.h>
 #include <linux/writeback.h>
@@ -76,7 +77,7 @@ xfs_ioend_wake(
                 wake_up(to_ioend_wq(ip));
 }
 
-STATIC void
+void
 xfs_count_page_state(
         struct page             *page,
         int                     *delalloc,
@@ -98,48 +99,6 @@ xfs_count_page_state(
         } while ((bh = bh->b_this_page) != head);
 }
 
-#if defined(XFS_RW_TRACE)
-void
-xfs_page_trace(
-        int             tag,
-        struct inode    *inode,
-        struct page     *page,
-        unsigned long   pgoff)
-{
-        xfs_inode_t     *ip;
-        loff_t          isize = i_size_read(inode);
-        loff_t          offset = page_offset(page);
-        int             delalloc = -1, unmapped = -1, unwritten = -1;
-
-        if (page_has_buffers(page))
-                xfs_count_page_state(page, &delalloc, &unmapped, &unwritten);
-
-        ip = XFS_I(inode);
-        if (!ip->i_rwtrace)
-                return;
-
-        ktrace_enter(ip->i_rwtrace,
-                (void *)((unsigned long)tag),
-                (void *)ip,
-                (void *)inode,
-                (void *)page,
-                (void *)pgoff,
-                (void *)((unsigned long)((ip->i_d.di_size >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(ip->i_d.di_size & 0xffffffff)),
-                (void *)((unsigned long)((isize >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(isize & 0xffffffff)),
-                (void *)((unsigned long)((offset >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(offset & 0xffffffff)),
-                (void *)((unsigned long)delalloc),
-                (void *)((unsigned long)unmapped),
-                (void *)((unsigned long)unwritten),
-                (void *)((unsigned long)current_pid()),
-                (void *)NULL);
-}
-#else
-#define xfs_page_trace(tag, inode, page, pgoff)
-#endif
-
 STATIC struct block_device *
 xfs_find_bdev_for_inode(
         struct xfs_inode        *ip)
@@ -1202,7 +1161,7 @@ xfs_vm_writepage(
         int                     delalloc, unmapped, unwritten;
         struct inode            *inode = page->mapping->host;
 
-        xfs_page_trace(XFS_WRITEPAGE_ENTER, inode, page, 0);
+        trace_xfs_writepage(inode, page, 0);
 
         /*
          * We need a transaction if:
@@ -1307,7 +1266,7 @@ xfs_vm_releasepage(
                 .nr_to_write = 1,
         };
 
-        xfs_page_trace(XFS_RELEASEPAGE_ENTER, inode, page, 0);
+        trace_xfs_releasepage(inode, page, 0);
 
         if (!page_has_buffers(page))
                 return 0;
@@ -1515,19 +1474,13 @@ xfs_vm_direct_IO(
 
         bdev = xfs_find_bdev_for_inode(XFS_I(inode));
 
-        if (rw == WRITE) {
-                iocb->private = xfs_alloc_ioend(inode, IOMAP_UNWRITTEN);
-                ret = blockdev_direct_IO_own_locking(rw, iocb, inode,
-                        bdev, iov, offset, nr_segs,
-                        xfs_get_blocks_direct,
-                        xfs_end_io_direct);
-        } else {
-                iocb->private = xfs_alloc_ioend(inode, IOMAP_READ);
-                ret = blockdev_direct_IO_no_locking(rw, iocb, inode,
-                        bdev, iov, offset, nr_segs,
-                        xfs_get_blocks_direct,
-                        xfs_end_io_direct);
-        }
+        iocb->private = xfs_alloc_ioend(inode, rw == WRITE ?
+                                        IOMAP_UNWRITTEN : IOMAP_READ);
+
+        ret = blockdev_direct_IO_no_locking(rw, iocb, inode, bdev, iov,
+                                            offset, nr_segs,
+                                            xfs_get_blocks_direct,
+                                            xfs_end_io_direct);
 
         if (unlikely(ret != -EIOCBQUEUED && iocb->private))
                 xfs_destroy_ioend(iocb->private);
@@ -1587,8 +1540,7 @@ xfs_vm_invalidatepage(
         struct page             *page,
         unsigned long           offset)
 {
-        xfs_page_trace(XFS_INVALIDPAGE_ENTER,
-                        page->mapping->host, page, offset);
+        trace_xfs_invalidatepage(page->mapping->host, page, offset);
         block_invalidatepage(page, offset);
 }
 
diff --git a/fs/xfs/linux-2.6/xfs_aops.h b/fs/xfs/linux-2.6/xfs_aops.h
index 221b3e66ceef..4cfc6ea87df8 100644
--- a/fs/xfs/linux-2.6/xfs_aops.h
+++ b/fs/xfs/linux-2.6/xfs_aops.h
@@ -45,4 +45,6 @@ extern int xfs_get_blocks(struct inode *, sector_t, struct buffer_head *, int);
 extern void xfs_ioend_init(void);
 extern void xfs_ioend_wait(struct xfs_inode *);
 
+extern void xfs_count_page_state(struct page *, int *, int *, int *);
+
 #endif /* __XFS_AOPS_H__ */
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index 4ddc973aea7a..b4c7d4248aac 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -39,6 +39,7 @@
 #include "xfs_ag.h"
 #include "xfs_dmapi.h"
 #include "xfs_mount.h"
+#include "xfs_trace.h"
 
 static kmem_zone_t *xfs_buf_zone;
 STATIC int xfsbufd(void *);
@@ -53,34 +54,6 @@ static struct workqueue_struct *xfslogd_workqueue;
 struct workqueue_struct *xfsdatad_workqueue;
 struct workqueue_struct *xfsconvertd_workqueue;
 
-#ifdef XFS_BUF_TRACE
-void
-xfs_buf_trace(
-        xfs_buf_t       *bp,
-        char            *id,
-        void            *data,
-        void            *ra)
-{
-        ktrace_enter(xfs_buf_trace_buf,
-                bp, id,
-                (void *)(unsigned long)bp->b_flags,
-                (void *)(unsigned long)bp->b_hold.counter,
-                (void *)(unsigned long)bp->b_sema.count,
-                (void *)current,
-                data, ra,
-                (void *)(unsigned long)((bp->b_file_offset>>32) & 0xffffffff),
-                (void *)(unsigned long)(bp->b_file_offset & 0xffffffff),
-                (void *)(unsigned long)bp->b_buffer_length,
-                NULL, NULL, NULL, NULL, NULL);
-}
-ktrace_t *xfs_buf_trace_buf;
-#define XFS_BUF_TRACE_SIZE      4096
-#define XB_TRACE(bp, id, data)  \
-        xfs_buf_trace(bp, id, (void *)data, (void *)__builtin_return_address(0))
-#else
-#define XB_TRACE(bp, id, data)  do { } while (0)
-#endif
-
 #ifdef XFS_BUF_LOCK_TRACKING
 # define XB_SET_OWNER(bp)       ((bp)->b_last_holder = current->pid)
 # define XB_CLEAR_OWNER(bp)     ((bp)->b_last_holder = -1)
@@ -279,7 +252,8 @@ _xfs_buf_initialize(
         init_waitqueue_head(&bp->b_waiters);
 
         XFS_STATS_INC(xb_create);
-        XB_TRACE(bp, "initialize", target);
+
+        trace_xfs_buf_init(bp, _RET_IP_);
 }
 
 /*
@@ -332,7 +306,7 @@ void
 xfs_buf_free(
         xfs_buf_t               *bp)
 {
-        XB_TRACE(bp, "free", 0);
+        trace_xfs_buf_free(bp, _RET_IP_);
 
         ASSERT(list_empty(&bp->b_hash_list));
 
@@ -445,7 +419,6 @@ _xfs_buf_lookup_pages(
         if (page_count == bp->b_page_count)
                 bp->b_flags |= XBF_DONE;
 
-        XB_TRACE(bp, "lookup_pages", (long)page_count);
         return error;
 }
 
@@ -548,7 +521,6 @@ found:
         if (down_trylock(&bp->b_sema)) {
                 if (!(flags & XBF_TRYLOCK)) {
                         /* wait for buffer ownership */
-                        XB_TRACE(bp, "get_lock", 0);
                         xfs_buf_lock(bp);
                         XFS_STATS_INC(xb_get_locked_waited);
                 } else {
@@ -571,7 +543,8 @@ found:
                 ASSERT((bp->b_flags & _XBF_DELWRI_Q) == 0);
                 bp->b_flags &= XBF_MAPPED;
         }
-        XB_TRACE(bp, "got_lock", 0);
+
+        trace_xfs_buf_find(bp, flags, _RET_IP_);
         XFS_STATS_INC(xb_get_locked);
         return bp;
 }
@@ -627,7 +600,7 @@ xfs_buf_get(
         bp->b_bn = ioff;
         bp->b_count_desired = bp->b_buffer_length;
 
-        XB_TRACE(bp, "get", (unsigned long)flags);
+        trace_xfs_buf_get(bp, flags, _RET_IP_);
         return bp;
 
  no_buffer:
@@ -644,8 +617,6 @@ _xfs_buf_read(
 {
         int                     status;
 
-        XB_TRACE(bp, "_xfs_buf_read", (unsigned long)flags);
-
         ASSERT(!(flags & (XBF_DELWRI|XBF_WRITE)));
         ASSERT(bp->b_bn != XFS_BUF_DADDR_NULL);
 
@@ -673,19 +644,18 @@ xfs_buf_read(
 
         bp = xfs_buf_get(target, ioff, isize, flags);
         if (bp) {
+                trace_xfs_buf_read(bp, flags, _RET_IP_);
+
                 if (!XFS_BUF_ISDONE(bp)) {
-                        XB_TRACE(bp, "read", (unsigned long)flags);
                         XFS_STATS_INC(xb_get_read);
                         _xfs_buf_read(bp, flags);
                 } else if (flags & XBF_ASYNC) {
-                        XB_TRACE(bp, "read_async", (unsigned long)flags);
                         /*
                          * Read ahead call which is already satisfied,
                          * drop the buffer
                          */
                         goto no_buffer;
                 } else {
-                        XB_TRACE(bp, "read_done", (unsigned long)flags);
                         /* We do not want read in the flags */
                         bp->b_flags &= ~XBF_READ;
                 }
@@ -823,7 +793,7 @@ xfs_buf_get_noaddr(
 
         xfs_buf_unlock(bp);
 
-        XB_TRACE(bp, "no_daddr", len);
+        trace_xfs_buf_get_noaddr(bp, _RET_IP_);
         return bp;
 
  fail_free_mem:
@@ -845,8 +815,8 @@ void
 xfs_buf_hold(
         xfs_buf_t               *bp)
 {
+        trace_xfs_buf_hold(bp, _RET_IP_);
         atomic_inc(&bp->b_hold);
-        XB_TRACE(bp, "hold", 0);
 }
 
 /*
@@ -859,7 +829,7 @@ xfs_buf_rele(
 {
         xfs_bufhash_t           *hash = bp->b_hash;
 
-        XB_TRACE(bp, "rele", bp->b_relse);
+        trace_xfs_buf_rele(bp, _RET_IP_);
 
         if (unlikely(!hash)) {
                 ASSERT(!bp->b_relse);
@@ -909,21 +879,19 @@ xfs_buf_cond_lock(
         int                     locked;
 
         locked = down_trylock(&bp->b_sema) == 0;
-        if (locked) {
+        if (locked)
                 XB_SET_OWNER(bp);
-        }
-        XB_TRACE(bp, "cond_lock", (long)locked);
+
+        trace_xfs_buf_cond_lock(bp, _RET_IP_);
         return locked ? 0 : -EBUSY;
 }
 
-#if defined(DEBUG) || defined(XFS_BLI_TRACE)
 int
 xfs_buf_lock_value(
         xfs_buf_t               *bp)
 {
         return bp->b_sema.count;
 }
-#endif
 
 /*
  *      Locks a buffer object.
@@ -935,12 +903,14 @@ void
 xfs_buf_lock(
         xfs_buf_t               *bp)
 {
-        XB_TRACE(bp, "lock", 0);
+        trace_xfs_buf_lock(bp, _RET_IP_);
+
         if (atomic_read(&bp->b_io_remaining))
                 blk_run_address_space(bp->b_target->bt_mapping);
         down(&bp->b_sema);
         XB_SET_OWNER(bp);
-        XB_TRACE(bp, "locked", 0);
+
+        trace_xfs_buf_lock_done(bp, _RET_IP_);
 }
 
 /*
@@ -962,7 +932,8 @@ xfs_buf_unlock(
 
         XB_CLEAR_OWNER(bp);
         up(&bp->b_sema);
-        XB_TRACE(bp, "unlock", 0);
+
+        trace_xfs_buf_unlock(bp, _RET_IP_);
 }
 
 
@@ -974,17 +945,18 @@ void
 xfs_buf_pin(
         xfs_buf_t               *bp)
 {
+        trace_xfs_buf_pin(bp, _RET_IP_);
         atomic_inc(&bp->b_pin_count);
-        XB_TRACE(bp, "pin", (long)bp->b_pin_count.counter);
 }
 
 void
 xfs_buf_unpin(
         xfs_buf_t               *bp)
 {
+        trace_xfs_buf_unpin(bp, _RET_IP_);
+
         if (atomic_dec_and_test(&bp->b_pin_count))
                 wake_up_all(&bp->b_waiters);
-        XB_TRACE(bp, "unpin", (long)bp->b_pin_count.counter);
 }
 
 int
@@ -1035,7 +1007,7 @@ xfs_buf_iodone_work(
          */
         if ((bp->b_error == EOPNOTSUPP) &&
             (bp->b_flags & (XBF_ORDERED|XBF_ASYNC)) == (XBF_ORDERED|XBF_ASYNC)) {
-                XB_TRACE(bp, "ordered_retry", bp->b_iodone);
+                trace_xfs_buf_ordered_retry(bp, _RET_IP_);
                 bp->b_flags &= ~XBF_ORDERED;
                 bp->b_flags |= _XFS_BARRIER_FAILED;
                 xfs_buf_iorequest(bp);
@@ -1050,12 +1022,12 @@ xfs_buf_ioend(
         xfs_buf_t               *bp,
         int                     schedule)
 {
+        trace_xfs_buf_iodone(bp, _RET_IP_);
+
         bp->b_flags &= ~(XBF_READ | XBF_WRITE | XBF_READ_AHEAD);
         if (bp->b_error == 0)
                 bp->b_flags |= XBF_DONE;
 
-        XB_TRACE(bp, "iodone", bp->b_iodone);
-
         if ((bp->b_iodone) || (bp->b_flags & XBF_ASYNC)) {
                 if (schedule) {
                         INIT_WORK(&bp->b_iodone_work, xfs_buf_iodone_work);
@@ -1075,7 +1047,7 @@ xfs_buf_ioerror(
 {
         ASSERT(error >= 0 && error <= 0xffff);
         bp->b_error = (unsigned short)error;
-        XB_TRACE(bp, "ioerror", (unsigned long)error);
+        trace_xfs_buf_ioerror(bp, error, _RET_IP_);
 }
 
 int
@@ -1083,7 +1055,7 @@ xfs_bawrite(
         void                    *mp,
         struct xfs_buf          *bp)
 {
-        XB_TRACE(bp, "bawrite", 0);
+        trace_xfs_buf_bawrite(bp, _RET_IP_);
 
         ASSERT(bp->b_bn != XFS_BUF_DADDR_NULL);
 
@@ -1102,7 +1074,7 @@ xfs_bdwrite(
         void                    *mp,
         struct xfs_buf          *bp)
 {
-        XB_TRACE(bp, "bdwrite", 0);
+        trace_xfs_buf_bdwrite(bp, _RET_IP_);
 
         bp->b_strat = xfs_bdstrat_cb;
         bp->b_mount = mp;
@@ -1253,7 +1225,7 @@ int
 xfs_buf_iorequest(
         xfs_buf_t               *bp)
 {
-        XB_TRACE(bp, "iorequest", 0);
+        trace_xfs_buf_iorequest(bp, _RET_IP_);
 
         if (bp->b_flags & XBF_DELWRI) {
                 xfs_buf_delwri_queue(bp, 1);
@@ -1287,11 +1259,13 @@ int
 xfs_buf_iowait(
         xfs_buf_t               *bp)
 {
-        XB_TRACE(bp, "iowait", 0);
+        trace_xfs_buf_iowait(bp, _RET_IP_);
+
         if (atomic_read(&bp->b_io_remaining))
                 blk_run_address_space(bp->b_target->bt_mapping);
         wait_for_completion(&bp->b_iowait);
-        XB_TRACE(bp, "iowaited", (long)bp->b_error);
+
+        trace_xfs_buf_iowait_done(bp, _RET_IP_);
         return bp->b_error;
 }
 
@@ -1604,7 +1578,8 @@ xfs_buf_delwri_queue(
         struct list_head        *dwq = &bp->b_target->bt_delwrite_queue;
         spinlock_t              *dwlk = &bp->b_target->bt_delwrite_lock;
 
-        XB_TRACE(bp, "delwri_q", (long)unlock);
+        trace_xfs_buf_delwri_queue(bp, _RET_IP_);
+
         ASSERT((bp->b_flags&(XBF_DELWRI|XBF_ASYNC)) == (XBF_DELWRI|XBF_ASYNC));
 
         spin_lock(dwlk);
@@ -1644,7 +1619,7 @@ xfs_buf_delwri_dequeue(
         if (dequeued)
                 xfs_buf_rele(bp);
 
-        XB_TRACE(bp, "delwri_dq", (long)dequeued);
+        trace_xfs_buf_delwri_dequeue(bp, _RET_IP_);
 }
 
 STATIC void
@@ -1692,7 +1667,7 @@ xfs_buf_delwri_split(
         INIT_LIST_HEAD(list);
         spin_lock(dwlk);
         list_for_each_entry_safe(bp, n, dwq, b_list) {
-                XB_TRACE(bp, "walkq1", (long)xfs_buf_ispin(bp));
+                trace_xfs_buf_delwri_split(bp, _RET_IP_);
                 ASSERT(bp->b_flags & XBF_DELWRI);
 
                 if (!xfs_buf_ispin(bp) && !xfs_buf_cond_lock(bp)) {
@@ -1816,14 +1791,10 @@ xfs_flush_buftarg(
 int __init
 xfs_buf_init(void)
 {
-#ifdef XFS_BUF_TRACE
-        xfs_buf_trace_buf = ktrace_alloc(XFS_BUF_TRACE_SIZE, KM_NOFS);
-#endif
-
         xfs_buf_zone = kmem_zone_init_flags(sizeof(xfs_buf_t), "xfs_buf",
                                                 KM_ZONE_HWALIGN, NULL);
         if (!xfs_buf_zone)
-                goto out_free_trace_buf;
+                goto out;
 
         xfslogd_workqueue = create_workqueue("xfslogd");
         if (!xfslogd_workqueue)
@@ -1846,10 +1817,7 @@ xfs_buf_init(void)
         destroy_workqueue(xfslogd_workqueue);
  out_free_buf_zone:
         kmem_zone_destroy(xfs_buf_zone);
- out_free_trace_buf:
-#ifdef XFS_BUF_TRACE
-        ktrace_free(xfs_buf_trace_buf);
-#endif
+ out:
         return -ENOMEM;
 }
 
@@ -1861,9 +1829,6 @@ xfs_buf_terminate(void)
         destroy_workqueue(xfsdatad_workqueue);
         destroy_workqueue(xfslogd_workqueue);
         kmem_zone_destroy(xfs_buf_zone);
-#ifdef XFS_BUF_TRACE
-        ktrace_free(xfs_buf_trace_buf);
-#endif
 }
 
 #ifdef CONFIG_KDB_MODULES
diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h
index 5f07dd91c5fa..a509f4addc2a 100644
--- a/fs/xfs/linux-2.6/xfs_buf.h
+++ b/fs/xfs/linux-2.6/xfs_buf.h
@@ -95,6 +95,28 @@ typedef enum {
         _XFS_BARRIER_FAILED = (1 << 23),
 } xfs_buf_flags_t;
 
+#define XFS_BUF_FLAGS \
+        { XBF_READ,             "READ" }, \
+        { XBF_WRITE,            "WRITE" }, \
+        { XBF_MAPPED,           "MAPPED" }, \
+        { XBF_ASYNC,            "ASYNC" }, \
+        { XBF_DONE,             "DONE" }, \
+        { XBF_DELWRI,           "DELWRI" }, \
+        { XBF_STALE,            "STALE" }, \
+        { XBF_FS_MANAGED,       "FS_MANAGED" }, \
+        { XBF_ORDERED,          "ORDERED" }, \
+        { XBF_READ_AHEAD,       "READ_AHEAD" }, \
+        { XBF_LOCK,             "LOCK" },       /* should never be set */\
+        { XBF_TRYLOCK,          "TRYLOCK" },    /* ditto */\
+        { XBF_DONT_BLOCK,       "DONT_BLOCK" }, /* ditto */\
+        { _XBF_PAGE_CACHE,      "PAGE_CACHE" }, \
+        { _XBF_PAGES,           "PAGES" }, \
+        { _XBF_RUN_QUEUES,      "RUN_QUEUES" }, \
+        { _XBF_DELWRI_Q,        "DELWRI_Q" }, \
+        { _XBF_PAGE_LOCKED,     "PAGE_LOCKED" }, \
+        { _XFS_BARRIER_FAILED,  "BARRIER_FAILED" }
+
+
 typedef enum {
         XBT_FORCE_SLEEP = 0,
         XBT_FORCE_FLUSH = 1,
@@ -243,13 +265,6 @@ extern void xfs_buf_delwri_dequeue(xfs_buf_t *);
 extern int xfs_buf_init(void);
 extern void xfs_buf_terminate(void);
 
-#ifdef XFS_BUF_TRACE
-extern ktrace_t *xfs_buf_trace_buf;
-extern void xfs_buf_trace(xfs_buf_t *, char *, void *, void *);
-#else
-#define xfs_buf_trace(bp,id,ptr,ra)     do { } while (0)
-#endif
-
 #define xfs_buf_target_name(target)     \
         ({ char __b[BDEVNAME_SIZE]; bdevname((target)->bt_bdev, __b); __b; })
 
@@ -365,10 +380,6 @@ static inline void xfs_buf_relse(xfs_buf_t *bp)
 
 #define xfs_bpin(bp)            xfs_buf_pin(bp)
 #define xfs_bunpin(bp)          xfs_buf_unpin(bp)
-
-#define xfs_buftrace(id, bp)    \
-            xfs_buf_trace(bp, id, NULL, (void *)__builtin_return_address(0))
-
 #define xfs_biodone(bp)         xfs_buf_ioend(bp, 0)
 
 #define xfs_biomove(bp, off, len, data, rw) \
diff --git a/fs/xfs/linux-2.6/xfs_fs_subr.c b/fs/xfs/linux-2.6/xfs_fs_subr.c
index 08be36d7326c..7501b85fd860 100644
--- a/fs/xfs/linux-2.6/xfs_fs_subr.c
+++ b/fs/xfs/linux-2.6/xfs_fs_subr.c
@@ -19,6 +19,7 @@
 #include "xfs_vnodeops.h"
 #include "xfs_bmap_btree.h"
 #include "xfs_inode.h"
+#include "xfs_trace.h"
 
 int  fs_noerr(void) { return 0; }
 int  fs_nosys(void) { return ENOSYS; }
@@ -51,6 +52,8 @@ xfs_flushinval_pages(
         struct address_space *mapping = VFS_I(ip)->i_mapping;
         int             ret = 0;
 
+        trace_xfs_pagecache_inval(ip, first, last);
+
         if (mapping->nrpages) {
                 xfs_iflags_clear(ip, XFS_ITRUNCATED);
                 ret = filemap_write_and_wait(mapping);
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
index 5bb523d7f37e..a034cf624437 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
@@ -51,6 +51,7 @@
 #include "xfs_quota.h"
 #include "xfs_inode_item.h"
 #include "xfs_export.h"
+#include "xfs_trace.h"
 
 #include <linux/capability.h>
 #include <linux/dcache.h>
diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c
index eafcc7c18706..be1527b1670c 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl32.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl32.c
@@ -46,6 +46,7 @@
 #include "xfs_attr.h"
 #include "xfs_ioctl.h"
 #include "xfs_ioctl32.h"
+#include "xfs_trace.h"
 
 #define  _NATIVE_IOC(cmd, type) \
           _IOC(_IOC_DIR(cmd), _IOC_TYPE(cmd), _IOC_NR(cmd), sizeof(type))
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 1f3b4b8f7dd4..1d5b298ba8b2 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -47,6 +47,7 @@
 #include "xfs_buf_item.h"
 #include "xfs_utils.h"
 #include "xfs_vnodeops.h"
+#include "xfs_trace.h"
 
 #include <linux/capability.h>
 #include <linux/xattr.h>
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h
index 6127e24062d0..5af0c81ca1ae 100644
--- a/fs/xfs/linux-2.6/xfs_linux.h
+++ b/fs/xfs/linux-2.6/xfs_linux.h
@@ -40,7 +40,6 @@
 #include <sv.h>
 #include <time.h>
 
-#include <support/ktrace.h>
 #include <support/debug.h>
 #include <support/uuid.h>
 
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c
index 1bf47f219c97..0d32457abef1 100644
--- a/fs/xfs/linux-2.6/xfs_lrw.c
+++ b/fs/xfs/linux-2.6/xfs_lrw.c
@@ -48,73 +48,12 @@
 #include "xfs_utils.h"
 #include "xfs_iomap.h"
 #include "xfs_vnodeops.h"
+#include "xfs_trace.h"
 
 #include <linux/capability.h>
 #include <linux/writeback.h>
 
 
-#if defined(XFS_RW_TRACE)
-void
-xfs_rw_enter_trace(
-        int                     tag,
-        xfs_inode_t             *ip,
-        void                    *data,
-        size_t                  segs,
-        loff_t                  offset,
-        int                     ioflags)
-{
-        if (ip->i_rwtrace == NULL)
-                return;
-        ktrace_enter(ip->i_rwtrace,
-                (void *)(unsigned long)tag,
-                (void *)ip,
-                (void *)((unsigned long)((ip->i_d.di_size >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(ip->i_d.di_size & 0xffffffff)),
-                (void *)data,
-                (void *)((unsigned long)segs),
-                (void *)((unsigned long)((offset >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(offset & 0xffffffff)),
-                (void *)((unsigned long)ioflags),
-                (void *)((unsigned long)((ip->i_new_size >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(ip->i_new_size & 0xffffffff)),
-                (void *)((unsigned long)current_pid()),
-                (void *)NULL,
-                (void *)NULL,
-                (void *)NULL,
-                (void *)NULL);
-}
-
-void
-xfs_inval_cached_trace(
-        xfs_inode_t     *ip,
-        xfs_off_t       offset,
-        xfs_off_t       len,
-        xfs_off_t       first,
-        xfs_off_t       last)
-{
-
-        if (ip->i_rwtrace == NULL)
-                return;
-        ktrace_enter(ip->i_rwtrace,
-                (void *)(__psint_t)XFS_INVAL_CACHED,
-                (void *)ip,
-                (void *)((unsigned long)((offset >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(offset & 0xffffffff)),
-                (void *)((unsigned long)((len >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(len & 0xffffffff)),
-                (void *)((unsigned long)((first >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(first & 0xffffffff)),
-                (void *)((unsigned long)((last >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(last & 0xffffffff)),
-                (void *)((unsigned long)current_pid()),
-                (void *)NULL,
-                (void *)NULL,
-                (void *)NULL,
-                (void *)NULL,
-                (void *)NULL);
-}
-#endif
-
 /*
  *      xfs_iozero
  *
@@ -250,8 +189,7 @@ xfs_read(
                 }
         }
 
-        xfs_rw_enter_trace(XFS_READ_ENTER, ip,
-                                (void *)iovp, segs, *offset, ioflags);
+        trace_xfs_file_read(ip, size, *offset, ioflags);
 
         iocb->ki_pos = *offset;
         ret = generic_file_aio_read(iocb, iovp, segs, *offset);
@@ -292,8 +230,9 @@ xfs_splice_read(
                         return -error;
                 }
         }
-        xfs_rw_enter_trace(XFS_SPLICE_READ_ENTER, ip,
-                           pipe, count, *ppos, ioflags);
+
+        trace_xfs_file_splice_read(ip, count, *ppos, ioflags);
+
         ret = generic_file_splice_read(infilp, ppos, pipe, count, flags);
         if (ret > 0)
                 XFS_STATS_ADD(xs_read_bytes, ret);
@@ -342,8 +281,8 @@ xfs_splice_write(
                 ip->i_new_size = new_size;
         xfs_iunlock(ip, XFS_ILOCK_EXCL);
 
-        xfs_rw_enter_trace(XFS_SPLICE_WRITE_ENTER, ip,
-                           pipe, count, *ppos, ioflags);
+        trace_xfs_file_splice_write(ip, count, *ppos, ioflags);
+
         ret = generic_file_splice_write(pipe, outfilp, ppos, count, flags);
         if (ret > 0)
                 XFS_STATS_ADD(xs_write_bytes, ret);
@@ -710,8 +649,6 @@ start:
         if ((ioflags & IO_ISDIRECT)) {
                 if (mapping->nrpages) {
                         WARN_ON(need_i_mutex == 0);
-                        xfs_inval_cached_trace(xip, pos, -1,
-                                        (pos & PAGE_CACHE_MASK), -1);
                         error = xfs_flushinval_pages(xip,
                                         (pos & PAGE_CACHE_MASK),
                                         -1, FI_REMAPF_LOCKED);
@@ -728,8 +665,7 @@ start:
                         need_i_mutex = 0;
                 }
 
-                xfs_rw_enter_trace(XFS_DIOWR_ENTER, xip, (void *)iovp, segs,
-                                *offset, ioflags);
+                trace_xfs_file_direct_write(xip, count, *offset, ioflags);
                 ret = generic_file_direct_write(iocb, iovp,
                                 &segs, pos, offset, count, ocount);
 
@@ -752,8 +688,7 @@ start:
                 ssize_t ret2 = 0;
 
 write_retry:
-                xfs_rw_enter_trace(XFS_WRITE_ENTER, xip, (void *)iovp, segs,
-                                *offset, ioflags);
+                trace_xfs_file_buffered_write(xip, count, *offset, ioflags);
                 ret2 = generic_file_buffered_write(iocb, iovp, segs,
                                 pos, offset, count, ret);
                 /*
@@ -858,7 +793,7 @@ int
 xfs_bdstrat_cb(struct xfs_buf *bp)
 {
         if (XFS_FORCED_SHUTDOWN(bp->b_mount)) {
-                xfs_buftrace("XFS__BDSTRAT IOERROR", bp);
+                trace_xfs_bdstrat_shut(bp, _RET_IP_);
                 /*
                  * Metadata write that didn't get logged but
                  * written delayed anyway. These aren't associated
@@ -891,7 +826,7 @@ xfsbdstrat(
                 return;
         }
 
-        xfs_buftrace("XFSBDSTRAT IOERROR", bp);
+        trace_xfs_bdstrat_shut(bp, _RET_IP_);
         xfs_bioerror_relse(bp);
 }
 
diff --git a/fs/xfs/linux-2.6/xfs_lrw.h b/fs/xfs/linux-2.6/xfs_lrw.h
index e6be37dbd0e9..d1f7789c7ffb 100644
--- a/fs/xfs/linux-2.6/xfs_lrw.h
+++ b/fs/xfs/linux-2.6/xfs_lrw.h
@@ -20,52 +20,7 @@
 
 struct xfs_mount;
 struct xfs_inode;
-struct xfs_bmbt_irec;
 struct xfs_buf;
-struct xfs_iomap;
-
-#if defined(XFS_RW_TRACE)
-/*
- * Defines for the trace mechanisms in xfs_lrw.c.
- */
-#define XFS_RW_KTRACE_SIZE      128
-
-#define XFS_READ_ENTER          1
-#define XFS_WRITE_ENTER         2
-#define XFS_IOMAP_READ_ENTER    3
-#define XFS_IOMAP_WRITE_ENTER   4
-#define XFS_IOMAP_READ_MAP      5
-#define XFS_IOMAP_WRITE_MAP     6
-#define XFS_IOMAP_WRITE_NOSPACE 7
-#define XFS_ITRUNC_START        8
-#define XFS_ITRUNC_FINISH1      9
-#define XFS_ITRUNC_FINISH2      10
-#define XFS_CTRUNC1             11
-#define XFS_CTRUNC2             12
-#define XFS_CTRUNC3             13
-#define XFS_CTRUNC4             14
-#define XFS_CTRUNC5             15
-#define XFS_CTRUNC6             16
-#define XFS_BUNMAP              17
-#define XFS_INVAL_CACHED        18
-#define XFS_DIORD_ENTER         19
-#define XFS_DIOWR_ENTER         20
-#define XFS_WRITEPAGE_ENTER     22
-#define XFS_RELEASEPAGE_ENTER   23
-#define XFS_INVALIDPAGE_ENTER   24
-#define XFS_IOMAP_ALLOC_ENTER   25
-#define XFS_IOMAP_ALLOC_MAP     26
-#define XFS_IOMAP_UNWRITTEN     27
-#define XFS_SPLICE_READ_ENTER   28
-#define XFS_SPLICE_WRITE_ENTER  29
-extern void xfs_rw_enter_trace(int, struct xfs_inode *,
-                void *, size_t, loff_t, int);
-extern void xfs_inval_cached_trace(struct xfs_inode *,
-                xfs_off_t, xfs_off_t, xfs_off_t, xfs_off_t);
-#else
-#define xfs_rw_enter_trace(tag, ip, data, size, offset, ioflags)
-#define xfs_inval_cached_trace(ip, offset, len, first, last)
-#endif
 
 /* errors from xfsbdstrat() must be extracted from the buffer */
 extern void xfsbdstrat(struct xfs_mount *, struct xfs_buf *);
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 1bfb0e980193..09783cc444ac 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -15,6 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+
 #include "xfs.h"
 #include "xfs_bit.h"
 #include "xfs_log.h"
@@ -52,11 +53,11 @@
 #include "xfs_trans_priv.h"
 #include "xfs_filestream.h"
 #include "xfs_da_btree.h"
-#include "xfs_dir2_trace.h"
 #include "xfs_extfree_item.h"
 #include "xfs_mru_cache.h"
 #include "xfs_inode_item.h"
 #include "xfs_sync.h"
+#include "xfs_trace.h"
 
 #include <linux/namei.h>
 #include <linux/init.h>
@@ -1525,8 +1526,6 @@ xfs_fs_fill_super(
                 goto fail_vnrele;
 
         kfree(mtpt);
-
-        xfs_itrace_exit(XFS_I(sb->s_root->d_inode));
         return 0;
 
  out_filestream_unmount:
@@ -1602,94 +1601,6 @@ static struct file_system_type xfs_fs_type = {
 };
 
 STATIC int __init
-xfs_alloc_trace_bufs(void)
-{
-#ifdef XFS_ALLOC_TRACE
-        xfs_alloc_trace_buf = ktrace_alloc(XFS_ALLOC_TRACE_SIZE, KM_MAYFAIL);
-        if (!xfs_alloc_trace_buf)
-                goto out;
-#endif
-#ifdef XFS_BMAP_TRACE
-        xfs_bmap_trace_buf = ktrace_alloc(XFS_BMAP_TRACE_SIZE, KM_MAYFAIL);
-        if (!xfs_bmap_trace_buf)
-                goto out_free_alloc_trace;
-#endif
-#ifdef XFS_BTREE_TRACE
-        xfs_allocbt_trace_buf = ktrace_alloc(XFS_ALLOCBT_TRACE_SIZE,
-                                             KM_MAYFAIL);
-        if (!xfs_allocbt_trace_buf)
-                goto out_free_bmap_trace;
-
-        xfs_inobt_trace_buf = ktrace_alloc(XFS_INOBT_TRACE_SIZE, KM_MAYFAIL);
-        if (!xfs_inobt_trace_buf)
-                goto out_free_allocbt_trace;
-
-        xfs_bmbt_trace_buf = ktrace_alloc(XFS_BMBT_TRACE_SIZE, KM_MAYFAIL);
-        if (!xfs_bmbt_trace_buf)
-                goto out_free_inobt_trace;
-#endif
-#ifdef XFS_ATTR_TRACE
-        xfs_attr_trace_buf = ktrace_alloc(XFS_ATTR_TRACE_SIZE, KM_MAYFAIL);
-        if (!xfs_attr_trace_buf)
-                goto out_free_bmbt_trace;
-#endif
-#ifdef XFS_DIR2_TRACE
-        xfs_dir2_trace_buf = ktrace_alloc(XFS_DIR2_GTRACE_SIZE, KM_MAYFAIL);
-        if (!xfs_dir2_trace_buf)
-                goto out_free_attr_trace;
-#endif
-
-        return 0;
-
-#ifdef XFS_DIR2_TRACE
- out_free_attr_trace:
-#endif
-#ifdef XFS_ATTR_TRACE
-        ktrace_free(xfs_attr_trace_buf);
- out_free_bmbt_trace:
-#endif
-#ifdef XFS_BTREE_TRACE
-        ktrace_free(xfs_bmbt_trace_buf);
- out_free_inobt_trace:
-        ktrace_free(xfs_inobt_trace_buf);
- out_free_allocbt_trace:
-        ktrace_free(xfs_allocbt_trace_buf);
- out_free_bmap_trace:
-#endif
-#ifdef XFS_BMAP_TRACE
-        ktrace_free(xfs_bmap_trace_buf);
- out_free_alloc_trace:
-#endif
-#ifdef XFS_ALLOC_TRACE
-        ktrace_free(xfs_alloc_trace_buf);
- out:
-#endif
-        return -ENOMEM;
-}
-
-STATIC void
-xfs_free_trace_bufs(void)
-{
-#ifdef XFS_DIR2_TRACE
-        ktrace_free(xfs_dir2_trace_buf);
-#endif
-#ifdef XFS_ATTR_TRACE
-        ktrace_free(xfs_attr_trace_buf);
-#endif
-#ifdef XFS_BTREE_TRACE
-        ktrace_free(xfs_bmbt_trace_buf);
-        ktrace_free(xfs_inobt_trace_buf);
-        ktrace_free(xfs_allocbt_trace_buf);
-#endif
-#ifdef XFS_BMAP_TRACE
-        ktrace_free(xfs_bmap_trace_buf);
-#endif
-#ifdef XFS_ALLOC_TRACE
-        ktrace_free(xfs_alloc_trace_buf);
-#endif
-}
-
-STATIC int __init
 xfs_init_zones(void)
 {
 
@@ -1830,7 +1741,6 @@ init_xfs_fs(void)
         printk(KERN_INFO XFS_VERSION_STRING " with "
                          XFS_BUILD_OPTIONS " enabled\n");
 
-        ktrace_init(64);
         xfs_ioend_init();
         xfs_dir_startup();
 
@@ -1838,13 +1748,9 @@ init_xfs_fs(void)
         if (error)
                 goto out;
 
-        error = xfs_alloc_trace_bufs();
-        if (error)
-                goto out_destroy_zones;
-
         error = xfs_mru_cache_init();
         if (error)
-                goto out_free_trace_buffers;
+                goto out_destroy_zones;
 
         error = xfs_filestream_init();
         if (error)
@@ -1879,8 +1785,6 @@ init_xfs_fs(void)
         xfs_filestream_uninit();
  out_mru_cache_uninit:
         xfs_mru_cache_uninit();
- out_free_trace_buffers:
-        xfs_free_trace_bufs();
  out_destroy_zones:
         xfs_destroy_zones();
  out:
@@ -1897,9 +1801,7 @@ exit_xfs_fs(void)
         xfs_buf_terminate();
         xfs_filestream_uninit();
         xfs_mru_cache_uninit();
-        xfs_free_trace_bufs();
         xfs_destroy_zones();
-        ktrace_uninit();
 }
 
 module_init(init_xfs_fs);
diff --git a/fs/xfs/linux-2.6/xfs_super.h b/fs/xfs/linux-2.6/xfs_super.h
index 18175ebd58ed..233d4b9881b1 100644
--- a/fs/xfs/linux-2.6/xfs_super.h
+++ b/fs/xfs/linux-2.6/xfs_super.h
@@ -56,12 +56,6 @@ extern void xfs_qm_exit(void);
 # define XFS_BIGFS_STRING
 #endif
 
-#ifdef CONFIG_XFS_TRACE
-# define XFS_TRACE_STRING       "tracing, "
-#else
-# define XFS_TRACE_STRING
-#endif
-
 #ifdef CONFIG_XFS_DMAPI
 # define XFS_DMAPI_STRING       "dmapi support, "
 #else
@@ -78,7 +72,6 @@ extern void xfs_qm_exit(void);
                                 XFS_SECURITY_STRING \
                                 XFS_REALTIME_STRING \
                                 XFS_BIGFS_STRING \
-                                XFS_TRACE_STRING \
                                 XFS_DMAPI_STRING \
                                 XFS_DBG_STRING /* DBG must be last */
 
diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c
index d895a3a960f5..6fed97a8cd3e 100644
--- a/fs/xfs/linux-2.6/xfs_sync.c
+++ b/fs/xfs/linux-2.6/xfs_sync.c
@@ -44,6 +44,7 @@
 #include "xfs_inode_item.h"
 #include "xfs_rw.h"
 #include "xfs_quota.h"
+#include "xfs_trace.h"
 
 #include <linux/kthread.h>
 #include <linux/freezer.h>
diff --git a/fs/xfs/linux-2.6/xfs_trace.c b/fs/xfs/linux-2.6/xfs_trace.c
new file mode 100644
index 000000000000..856eb3c8d605
--- /dev/null
+++ b/fs/xfs/linux-2.6/xfs_trace.c
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2009, Christoph Hellwig
+ * 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.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 the Free Software Foundation,
+ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include "xfs.h"
+#include "xfs_fs.h"
+#include "xfs_types.h"
+#include "xfs_bit.h"
+#include "xfs_log.h"
+#include "xfs_inum.h"
+#include "xfs_trans.h"
+#include "xfs_sb.h"
+#include "xfs_ag.h"
+#include "xfs_dir2.h"
+#include "xfs_da_btree.h"
+#include "xfs_bmap_btree.h"
+#include "xfs_alloc_btree.h"
+#include "xfs_ialloc_btree.h"
+#include "xfs_dir2_sf.h"
+#include "xfs_attr_sf.h"
+#include "xfs_dinode.h"
+#include "xfs_inode.h"
+#include "xfs_btree.h"
+#include "xfs_dmapi.h"
+#include "xfs_mount.h"
+#include "xfs_ialloc.h"
+#include "xfs_itable.h"
+#include "xfs_alloc.h"
+#include "xfs_bmap.h"
+#include "xfs_attr.h"
+#include "xfs_attr_sf.h"
+#include "xfs_attr_leaf.h"
+#include "xfs_log_priv.h"
+#include "xfs_buf_item.h"
+#include "xfs_quota.h"
+#include "xfs_iomap.h"
+#include "xfs_aops.h"
+#include "quota/xfs_dquot_item.h"
+#include "quota/xfs_dquot.h"
+
+/*
+ * Format fsblock number into a static buffer & return it.
+ */
+STATIC char *xfs_fmtfsblock(xfs_fsblock_t bno)
+{
+        static char rval[50];
+
+        if (bno == NULLFSBLOCK)
+                sprintf(rval, "NULLFSBLOCK");
+        else if (isnullstartblock(bno))
+                sprintf(rval, "NULLSTARTBLOCK(%lld)", startblockval(bno));
+        else
+                sprintf(rval, "%lld", (xfs_dfsbno_t)bno);
+        return rval;
+}
+
+/*
+ * We include this last to have the helpers above available for the trace
+ * event implementations.
+ */
+#define CREATE_TRACE_POINTS
+#include "xfs_trace.h"
diff --git a/fs/xfs/linux-2.6/xfs_trace.h b/fs/xfs/linux-2.6/xfs_trace.h
new file mode 100644
index 000000000000..c40834bdee58
--- /dev/null
+++ b/fs/xfs/linux-2.6/xfs_trace.h
@@ -0,0 +1,1369 @@
+/*
+ * Copyright (c) 2009, Christoph Hellwig
+ * 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.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 the Free Software Foundation,
+ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM xfs
+
+#if !defined(_TRACE_XFS_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_XFS_H
+
+#include <linux/tracepoint.h>
+
+struct xfs_agf;
+struct xfs_alloc_arg;
+struct xfs_attr_list_context;
+struct xfs_buf_log_item;
+struct xfs_da_args;
+struct xfs_da_node_entry;
+struct xfs_dquot;
+struct xlog_ticket;
+struct log;
+
+#define DEFINE_ATTR_LIST_EVENT(name) \
+TRACE_EVENT(name, \
+        TP_PROTO(struct xfs_attr_list_context *ctx), \
+        TP_ARGS(ctx), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_ino_t, ino) \
+                __field(u32, hashval) \
+                __field(u32, blkno) \
+                __field(u32, offset) \
+                __field(void *, alist) \
+                __field(int, bufsize) \
+                __field(int, count) \
+                __field(int, firstu) \
+                __field(int, dupcnt) \
+                __field(int, flags) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = VFS_I(ctx->dp)->i_sb->s_dev; \
+                __entry->ino = ctx->dp->i_ino; \
+                __entry->hashval = ctx->cursor->hashval; \
+                __entry->blkno = ctx->cursor->blkno; \
+                __entry->offset = ctx->cursor->offset; \
+                __entry->alist = ctx->alist; \
+                __entry->bufsize = ctx->bufsize; \
+                __entry->count = ctx->count; \
+                __entry->firstu = ctx->firstu; \
+                __entry->flags = ctx->flags; \
+        ), \
+        TP_printk("dev %d:%d ino 0x%llx cursor h/b/o 0x%x/0x%x/%u dupcnt %u " \
+                  "alist 0x%p size %u count %u firstu %u flags %d %s", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                   __entry->ino, \
+                   __entry->hashval, \
+                   __entry->blkno, \
+                   __entry->offset, \
+                   __entry->dupcnt, \
+                   __entry->alist, \
+                   __entry->bufsize, \
+                   __entry->count, \
+                   __entry->firstu, \
+                   __entry->flags, \
+                   __print_flags(__entry->flags, "|", XFS_ATTR_FLAGS) \
+        ) \
+)
+DEFINE_ATTR_LIST_EVENT(xfs_attr_list_sf);
+DEFINE_ATTR_LIST_EVENT(xfs_attr_list_sf_all);
+DEFINE_ATTR_LIST_EVENT(xfs_attr_list_leaf);
+DEFINE_ATTR_LIST_EVENT(xfs_attr_list_leaf_end);
+DEFINE_ATTR_LIST_EVENT(xfs_attr_list_full);
+DEFINE_ATTR_LIST_EVENT(xfs_attr_list_add);
+DEFINE_ATTR_LIST_EVENT(xfs_attr_list_wrong_blk);
+DEFINE_ATTR_LIST_EVENT(xfs_attr_list_notfound);
+
+TRACE_EVENT(xfs_attr_list_node_descend,
+        TP_PROTO(struct xfs_attr_list_context *ctx,
+                 struct xfs_da_node_entry *btree),
+        TP_ARGS(ctx, btree),
+        TP_STRUCT__entry(
+                __field(dev_t, dev)
+                __field(xfs_ino_t, ino)
+                __field(u32, hashval)
+                __field(u32, blkno)
+                __field(u32, offset)
+                __field(void *, alist)
+                __field(int, bufsize)
+                __field(int, count)
+                __field(int, firstu)
+                __field(int, dupcnt)
+                __field(int, flags)
+                __field(u32, bt_hashval)
+                __field(u32, bt_before)
+        ),
+        TP_fast_assign(
+                __entry->dev = VFS_I(ctx->dp)->i_sb->s_dev;
+                __entry->ino = ctx->dp->i_ino;
+                __entry->hashval = ctx->cursor->hashval;
+                __entry->blkno = ctx->cursor->blkno;
+                __entry->offset = ctx->cursor->offset;
+                __entry->alist = ctx->alist;
+                __entry->bufsize = ctx->bufsize;
+                __entry->count = ctx->count;
+                __entry->firstu = ctx->firstu;
+                __entry->flags = ctx->flags;
+                __entry->bt_hashval = be32_to_cpu(btree->hashval);
+                __entry->bt_before = be32_to_cpu(btree->before);
+        ),
+        TP_printk("dev %d:%d ino 0x%llx cursor h/b/o 0x%x/0x%x/%u dupcnt %u "
+                  "alist 0x%p size %u count %u firstu %u flags %d %s "
+                  "node hashval %u, node before %u",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                   __entry->ino,
+                   __entry->hashval,
+                   __entry->blkno,
+                   __entry->offset,
+                   __entry->dupcnt,
+                   __entry->alist,
+                   __entry->bufsize,
+                   __entry->count,
+                   __entry->firstu,
+                   __entry->flags,
+                   __print_flags(__entry->flags, "|", XFS_ATTR_FLAGS),
+                   __entry->bt_hashval,
+                   __entry->bt_before)
+);
+
+TRACE_EVENT(xfs_iext_insert,
+        TP_PROTO(struct xfs_inode *ip, xfs_extnum_t idx,
+                 struct xfs_bmbt_irec *r, int state, unsigned long caller_ip),
+        TP_ARGS(ip, idx, r, state, caller_ip),
+        TP_STRUCT__entry(
+                __field(dev_t, dev)
+                __field(xfs_ino_t, ino)
+                __field(xfs_extnum_t, idx)
+                __field(xfs_fileoff_t, startoff)
+                __field(xfs_fsblock_t, startblock)
+                __field(xfs_filblks_t, blockcount)
+                __field(xfs_exntst_t, state)
+                __field(int, bmap_state)
+                __field(unsigned long, caller_ip)
+        ),
+        TP_fast_assign(
+                __entry->dev = VFS_I(ip)->i_sb->s_dev;
+                __entry->ino = ip->i_ino;
+                __entry->idx = idx;
+                __entry->startoff = r->br_startoff;
+                __entry->startblock = r->br_startblock;
+                __entry->blockcount = r->br_blockcount;
+                __entry->state = r->br_state;
+                __entry->bmap_state = state;
+                __entry->caller_ip = caller_ip;
+        ),
+        TP_printk("dev %d:%d ino 0x%llx state %s idx %ld "
+                  "offset %lld block %s count %lld flag %d caller %pf",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->ino,
+                  __print_flags(__entry->bmap_state, "|", XFS_BMAP_EXT_FLAGS),
+                  (long)__entry->idx,
+                  __entry->startoff,
+                  xfs_fmtfsblock(__entry->startblock),
+                  __entry->blockcount,
+                  __entry->state,
+                  (char *)__entry->caller_ip)
+);
+
+#define DEFINE_BMAP_EVENT(name) \
+TRACE_EVENT(name, \
+        TP_PROTO(struct xfs_inode *ip, xfs_extnum_t idx, int state, \
+                 unsigned long caller_ip), \
+        TP_ARGS(ip, idx, state, caller_ip), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_ino_t, ino) \
+                __field(xfs_extnum_t, idx) \
+                __field(xfs_fileoff_t, startoff) \
+                __field(xfs_fsblock_t, startblock) \
+                __field(xfs_filblks_t, blockcount) \
+                __field(xfs_exntst_t, state) \
+                __field(int, bmap_state) \
+                __field(unsigned long, caller_ip) \
+        ), \
+        TP_fast_assign( \
+                struct xfs_ifork        *ifp = (state & BMAP_ATTRFORK) ? \
+                                                ip->i_afp : &ip->i_df; \
+                struct xfs_bmbt_irec    r; \
+        \
+                xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx), &r); \
+                __entry->dev = VFS_I(ip)->i_sb->s_dev; \
+                __entry->ino = ip->i_ino; \
+                __entry->idx = idx; \
+                __entry->startoff = r.br_startoff; \
+                __entry->startblock = r.br_startblock; \
+                __entry->blockcount = r.br_blockcount; \
+                __entry->state = r.br_state; \
+                __entry->bmap_state = state; \
+                __entry->caller_ip = caller_ip; \
+        ), \
+        TP_printk("dev %d:%d ino 0x%llx state %s idx %ld " \
+                  "offset %lld block %s count %lld flag %d caller %pf", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  __entry->ino, \
+                  __print_flags(__entry->bmap_state, "|", XFS_BMAP_EXT_FLAGS), \
+                  (long)__entry->idx, \
+                  __entry->startoff, \
+                  xfs_fmtfsblock(__entry->startblock), \
+                  __entry->blockcount, \
+                  __entry->state, \
+                  (char *)__entry->caller_ip) \
+)
+
+DEFINE_BMAP_EVENT(xfs_iext_remove);
+DEFINE_BMAP_EVENT(xfs_bmap_pre_update);
+DEFINE_BMAP_EVENT(xfs_bmap_post_update);
+DEFINE_BMAP_EVENT(xfs_extlist);
+
+#define DEFINE_BUF_EVENT(tname) \
+TRACE_EVENT(tname, \
+        TP_PROTO(struct xfs_buf *bp, unsigned long caller_ip), \
+        TP_ARGS(bp, caller_ip), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_daddr_t, bno) \
+                __field(size_t, buffer_length) \
+                __field(int, hold) \
+                __field(int, pincount) \
+                __field(unsigned, lockval) \
+                __field(unsigned, flags) \
+                __field(unsigned long, caller_ip) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = bp->b_target->bt_dev; \
+                __entry->bno = bp->b_bn; \
+                __entry->buffer_length = bp->b_buffer_length; \
+                __entry->hold = atomic_read(&bp->b_hold); \
+                __entry->pincount = atomic_read(&bp->b_pin_count); \
+                __entry->lockval = xfs_buf_lock_value(bp); \
+                __entry->flags = bp->b_flags; \
+                __entry->caller_ip = caller_ip; \
+        ), \
+        TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d " \
+                  "lock %d flags %s caller %pf", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  (unsigned long long)__entry->bno, \
+                  __entry->buffer_length, \
+                  __entry->hold, \
+                  __entry->pincount, \
+                  __entry->lockval, \
+                  __print_flags(__entry->flags, "|", XFS_BUF_FLAGS), \
+                  (void *)__entry->caller_ip) \
+)
+DEFINE_BUF_EVENT(xfs_buf_init);
+DEFINE_BUF_EVENT(xfs_buf_free);
+DEFINE_BUF_EVENT(xfs_buf_hold);
+DEFINE_BUF_EVENT(xfs_buf_rele);
+DEFINE_BUF_EVENT(xfs_buf_pin);
+DEFINE_BUF_EVENT(xfs_buf_unpin);
+DEFINE_BUF_EVENT(xfs_buf_iodone);
+DEFINE_BUF_EVENT(xfs_buf_iorequest);
+DEFINE_BUF_EVENT(xfs_buf_bawrite);
+DEFINE_BUF_EVENT(xfs_buf_bdwrite);
+DEFINE_BUF_EVENT(xfs_buf_lock);
+DEFINE_BUF_EVENT(xfs_buf_lock_done);
+DEFINE_BUF_EVENT(xfs_buf_cond_lock);
+DEFINE_BUF_EVENT(xfs_buf_unlock);
+DEFINE_BUF_EVENT(xfs_buf_ordered_retry);
+DEFINE_BUF_EVENT(xfs_buf_iowait);
+DEFINE_BUF_EVENT(xfs_buf_iowait_done);
+DEFINE_BUF_EVENT(xfs_buf_delwri_queue);
+DEFINE_BUF_EVENT(xfs_buf_delwri_dequeue);
+DEFINE_BUF_EVENT(xfs_buf_delwri_split);
+DEFINE_BUF_EVENT(xfs_buf_get_noaddr);
+DEFINE_BUF_EVENT(xfs_bdstrat_shut);
+DEFINE_BUF_EVENT(xfs_buf_item_relse);
+DEFINE_BUF_EVENT(xfs_buf_item_iodone);
+DEFINE_BUF_EVENT(xfs_buf_item_iodone_async);
+DEFINE_BUF_EVENT(xfs_buf_error_relse);
+DEFINE_BUF_EVENT(xfs_trans_read_buf_io);
+DEFINE_BUF_EVENT(xfs_trans_read_buf_shut);
+
+/* not really buffer traces, but the buf provides useful information */
+DEFINE_BUF_EVENT(xfs_btree_corrupt);
+DEFINE_BUF_EVENT(xfs_da_btree_corrupt);
+DEFINE_BUF_EVENT(xfs_reset_dqcounts);
+DEFINE_BUF_EVENT(xfs_inode_item_push);
+
+/* pass flags explicitly */
+#define DEFINE_BUF_FLAGS_EVENT(tname) \
+TRACE_EVENT(tname, \
+        TP_PROTO(struct xfs_buf *bp, unsigned flags, unsigned long caller_ip), \
+        TP_ARGS(bp, flags, caller_ip), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_daddr_t, bno) \
+                __field(size_t, buffer_length) \
+                __field(int, hold) \
+                __field(int, pincount) \
+                __field(unsigned, lockval) \
+                __field(unsigned, flags) \
+                __field(unsigned long, caller_ip) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = bp->b_target->bt_dev; \
+                __entry->bno = bp->b_bn; \
+                __entry->buffer_length = bp->b_buffer_length; \
+                __entry->flags = flags; \
+                __entry->hold = atomic_read(&bp->b_hold); \
+                __entry->pincount = atomic_read(&bp->b_pin_count); \
+                __entry->lockval = xfs_buf_lock_value(bp); \
+                __entry->caller_ip = caller_ip; \
+        ), \
+        TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d " \
+                  "lock %d flags %s caller %pf", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  (unsigned long long)__entry->bno, \
+                  __entry->buffer_length, \
+                  __entry->hold, \
+                  __entry->pincount, \
+                  __entry->lockval, \
+                  __print_flags(__entry->flags, "|", XFS_BUF_FLAGS), \
+                  (void *)__entry->caller_ip) \
+)
+DEFINE_BUF_FLAGS_EVENT(xfs_buf_find);
+DEFINE_BUF_FLAGS_EVENT(xfs_buf_get);
+DEFINE_BUF_FLAGS_EVENT(xfs_buf_read);
+
+TRACE_EVENT(xfs_buf_ioerror,
+        TP_PROTO(struct xfs_buf *bp, int error, unsigned long caller_ip),
+        TP_ARGS(bp, error, caller_ip),
+        TP_STRUCT__entry(
+                __field(dev_t, dev)
+                __field(xfs_daddr_t, bno)
+                __field(size_t, buffer_length)
+                __field(unsigned, flags)
+                __field(int, hold)
+                __field(int, pincount)
+                __field(unsigned, lockval)
+                __field(int, error)
+                __field(unsigned long, caller_ip)
+        ),
+        TP_fast_assign(
+                __entry->dev = bp->b_target->bt_dev;
+                __entry->bno = bp->b_bn;
+                __entry->buffer_length = bp->b_buffer_length;
+                __entry->hold = atomic_read(&bp->b_hold);
+                __entry->pincount = atomic_read(&bp->b_pin_count);
+                __entry->lockval = xfs_buf_lock_value(bp);
+                __entry->error = error;
+                __entry->flags = bp->b_flags;
+                __entry->caller_ip = caller_ip;
+        ),
+        TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d "
+                  "lock %d error %d flags %s caller %pf",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long long)__entry->bno,
+                  __entry->buffer_length,
+                  __entry->hold,
+                  __entry->pincount,
+                  __entry->lockval,
+                  __entry->error,
+                  __print_flags(__entry->flags, "|", XFS_BUF_FLAGS),
+                  (void *)__entry->caller_ip)
+);
+
+#define DEFINE_BUF_ITEM_EVENT(tname) \
+TRACE_EVENT(tname, \
+        TP_PROTO(struct xfs_buf_log_item *bip), \
+        TP_ARGS(bip), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_daddr_t, buf_bno) \
+                __field(size_t, buf_len) \
+                __field(int, buf_hold) \
+                __field(int, buf_pincount) \
+                __field(int, buf_lockval) \
+                __field(unsigned, buf_flags) \
+                __field(unsigned, bli_recur) \
+                __field(int, bli_refcount) \
+                __field(unsigned, bli_flags) \
+                __field(void *, li_desc) \
+                __field(unsigned, li_flags) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = bip->bli_buf->b_target->bt_dev; \
+                __entry->bli_flags = bip->bli_flags; \
+                __entry->bli_recur = bip->bli_recur; \
+                __entry->bli_refcount = atomic_read(&bip->bli_refcount); \
+                __entry->buf_bno = bip->bli_buf->b_bn; \
+                __entry->buf_len = bip->bli_buf->b_buffer_length; \
+                __entry->buf_flags = bip->bli_buf->b_flags; \
+                __entry->buf_hold = atomic_read(&bip->bli_buf->b_hold); \
+                __entry->buf_pincount = \
+                        atomic_read(&bip->bli_buf->b_pin_count); \
+                __entry->buf_lockval = xfs_buf_lock_value(bip->bli_buf); \
+                __entry->li_desc = bip->bli_item.li_desc; \
+                __entry->li_flags = bip->bli_item.li_flags; \
+        ), \
+        TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d " \
+                  "lock %d flags %s recur %d refcount %d bliflags %s " \
+                  "lidesc 0x%p liflags %s", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  (unsigned long long)__entry->buf_bno, \
+                  __entry->buf_len, \
+                  __entry->buf_hold, \
+                  __entry->buf_pincount, \
+                  __entry->buf_lockval, \
+                  __print_flags(__entry->buf_flags, "|", XFS_BUF_FLAGS), \
+                  __entry->bli_recur, \
+                  __entry->bli_refcount, \
+                  __print_flags(__entry->bli_flags, "|", XFS_BLI_FLAGS), \
+                  __entry->li_desc, \
+                  __print_flags(__entry->li_flags, "|", XFS_LI_FLAGS)) \
+)
+DEFINE_BUF_ITEM_EVENT(xfs_buf_item_size);
+DEFINE_BUF_ITEM_EVENT(xfs_buf_item_size_stale);
+DEFINE_BUF_ITEM_EVENT(xfs_buf_item_format);
+DEFINE_BUF_ITEM_EVENT(xfs_buf_item_format_stale);
+DEFINE_BUF_ITEM_EVENT(xfs_buf_item_pin);
+DEFINE_BUF_ITEM_EVENT(xfs_buf_item_unpin);
+DEFINE_BUF_ITEM_EVENT(xfs_buf_item_unpin_stale);
+DEFINE_BUF_ITEM_EVENT(xfs_buf_item_trylock);
+DEFINE_BUF_ITEM_EVENT(xfs_buf_item_unlock);
+DEFINE_BUF_ITEM_EVENT(xfs_buf_item_unlock_stale);
+DEFINE_BUF_ITEM_EVENT(xfs_buf_item_committed);
+DEFINE_BUF_ITEM_EVENT(xfs_buf_item_push);
+DEFINE_BUF_ITEM_EVENT(xfs_trans_get_buf);
+DEFINE_BUF_ITEM_EVENT(xfs_trans_get_buf_recur);
+DEFINE_BUF_ITEM_EVENT(xfs_trans_getsb);
+DEFINE_BUF_ITEM_EVENT(xfs_trans_getsb_recur);
+DEFINE_BUF_ITEM_EVENT(xfs_trans_read_buf);
+DEFINE_BUF_ITEM_EVENT(xfs_trans_read_buf_recur);
+DEFINE_BUF_ITEM_EVENT(xfs_trans_log_buf);
+DEFINE_BUF_ITEM_EVENT(xfs_trans_brelse);
+DEFINE_BUF_ITEM_EVENT(xfs_trans_bjoin);
+DEFINE_BUF_ITEM_EVENT(xfs_trans_bhold);
+DEFINE_BUF_ITEM_EVENT(xfs_trans_bhold_release);
+DEFINE_BUF_ITEM_EVENT(xfs_trans_binval);
+
+#define DEFINE_LOCK_EVENT(name) \
+TRACE_EVENT(name, \
+        TP_PROTO(struct xfs_inode *ip, unsigned lock_flags, \
+                 unsigned long caller_ip), \
+        TP_ARGS(ip,  lock_flags, caller_ip), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_ino_t, ino) \
+                __field(int, lock_flags) \
+                __field(unsigned long, caller_ip) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = VFS_I(ip)->i_sb->s_dev; \
+                __entry->ino = ip->i_ino; \
+                __entry->lock_flags = lock_flags; \
+                __entry->caller_ip = caller_ip; \
+        ), \
+        TP_printk("dev %d:%d ino 0x%llx flags %s caller %pf", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  __entry->ino, \
+                  __print_flags(__entry->lock_flags, "|", XFS_LOCK_FLAGS), \
+                  (void *)__entry->caller_ip) \
+)
+
+DEFINE_LOCK_EVENT(xfs_ilock);
+DEFINE_LOCK_EVENT(xfs_ilock_nowait);
+DEFINE_LOCK_EVENT(xfs_ilock_demote);
+DEFINE_LOCK_EVENT(xfs_iunlock);
+
+#define DEFINE_IGET_EVENT(name) \
+TRACE_EVENT(name, \
+        TP_PROTO(struct xfs_inode *ip), \
+        TP_ARGS(ip), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_ino_t, ino) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = VFS_I(ip)->i_sb->s_dev; \
+                __entry->ino = ip->i_ino; \
+        ), \
+        TP_printk("dev %d:%d ino 0x%llx", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  __entry->ino) \
+)
+DEFINE_IGET_EVENT(xfs_iget_skip);
+DEFINE_IGET_EVENT(xfs_iget_reclaim);
+DEFINE_IGET_EVENT(xfs_iget_found);
+DEFINE_IGET_EVENT(xfs_iget_alloc);
+
+#define DEFINE_INODE_EVENT(name) \
+TRACE_EVENT(name, \
+        TP_PROTO(struct xfs_inode *ip, unsigned long caller_ip), \
+        TP_ARGS(ip, caller_ip), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_ino_t, ino) \
+                __field(int, count) \
+                __field(unsigned long, caller_ip) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = VFS_I(ip)->i_sb->s_dev; \
+                __entry->ino = ip->i_ino; \
+                __entry->count = atomic_read(&VFS_I(ip)->i_count); \
+                __entry->caller_ip = caller_ip; \
+        ), \
+        TP_printk("dev %d:%d ino 0x%llx count %d caller %pf", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  __entry->ino, \
+                  __entry->count, \
+                  (char *)__entry->caller_ip) \
+)
+DEFINE_INODE_EVENT(xfs_ihold);
+DEFINE_INODE_EVENT(xfs_irele);
+/* the old xfs_itrace_entry tracer - to be replaced by s.th. in the VFS */
+DEFINE_INODE_EVENT(xfs_inode);
+#define xfs_itrace_entry(ip)    \
+        trace_xfs_inode(ip, _THIS_IP_)
+
+#define DEFINE_DQUOT_EVENT(tname) \
+TRACE_EVENT(tname, \
+        TP_PROTO(struct xfs_dquot *dqp), \
+        TP_ARGS(dqp), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(__be32, id) \
+                __field(unsigned, flags) \
+                __field(unsigned, nrefs) \
+                __field(unsigned long long, res_bcount) \
+                __field(unsigned long long, bcount) \
+                __field(unsigned long long, icount) \
+                __field(unsigned long long, blk_hardlimit) \
+                __field(unsigned long long, blk_softlimit) \
+                __field(unsigned long long, ino_hardlimit) \
+                __field(unsigned long long, ino_softlimit) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = dqp->q_mount->m_super->s_dev; \
+                __entry->id = dqp->q_core.d_id; \
+                __entry->flags = dqp->dq_flags; \
+                __entry->nrefs = dqp->q_nrefs; \
+                __entry->res_bcount = dqp->q_res_bcount; \
+                __entry->bcount = be64_to_cpu(dqp->q_core.d_bcount); \
+                __entry->icount = be64_to_cpu(dqp->q_core.d_icount); \
+                __entry->blk_hardlimit = \
+                        be64_to_cpu(dqp->q_core.d_blk_hardlimit); \
+                __entry->blk_softlimit = \
+                        be64_to_cpu(dqp->q_core.d_blk_softlimit); \
+                __entry->ino_hardlimit = \
+                        be64_to_cpu(dqp->q_core.d_ino_hardlimit); \
+                __entry->ino_softlimit = \
+                        be64_to_cpu(dqp->q_core.d_ino_softlimit); \
+        ), \
+        TP_printk("dev %d:%d id 0x%x flags %s nrefs %u res_bc 0x%llx " \
+                  "bcnt 0x%llx [hard 0x%llx | soft 0x%llx] " \
+                  "icnt 0x%llx [hard 0x%llx | soft 0x%llx]", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  be32_to_cpu(__entry->id), \
+                  __print_flags(__entry->flags, "|", XFS_DQ_FLAGS), \
+                  __entry->nrefs, \
+                  __entry->res_bcount, \
+                  __entry->bcount, \
+                  __entry->blk_hardlimit, \
+                  __entry->blk_softlimit, \
+                  __entry->icount, \
+                  __entry->ino_hardlimit, \
+                  __entry->ino_softlimit) \
+)
+DEFINE_DQUOT_EVENT(xfs_dqadjust);
+DEFINE_DQUOT_EVENT(xfs_dqshake_dirty);
+DEFINE_DQUOT_EVENT(xfs_dqshake_unlink);
+DEFINE_DQUOT_EVENT(xfs_dqreclaim_want);
+DEFINE_DQUOT_EVENT(xfs_dqreclaim_dirty);
+DEFINE_DQUOT_EVENT(xfs_dqreclaim_unlink);
+DEFINE_DQUOT_EVENT(xfs_dqattach_found);
+DEFINE_DQUOT_EVENT(xfs_dqattach_get);
+DEFINE_DQUOT_EVENT(xfs_dqinit);
+DEFINE_DQUOT_EVENT(xfs_dqreuse);
+DEFINE_DQUOT_EVENT(xfs_dqalloc);
+DEFINE_DQUOT_EVENT(xfs_dqtobp_read);
+DEFINE_DQUOT_EVENT(xfs_dqread);
+DEFINE_DQUOT_EVENT(xfs_dqread_fail);
+DEFINE_DQUOT_EVENT(xfs_dqlookup_found);
+DEFINE_DQUOT_EVENT(xfs_dqlookup_want);
+DEFINE_DQUOT_EVENT(xfs_dqlookup_freelist);
+DEFINE_DQUOT_EVENT(xfs_dqlookup_move);
+DEFINE_DQUOT_EVENT(xfs_dqlookup_done);
+DEFINE_DQUOT_EVENT(xfs_dqget_hit);
+DEFINE_DQUOT_EVENT(xfs_dqget_miss);
+DEFINE_DQUOT_EVENT(xfs_dqput);
+DEFINE_DQUOT_EVENT(xfs_dqput_wait);
+DEFINE_DQUOT_EVENT(xfs_dqput_free);
+DEFINE_DQUOT_EVENT(xfs_dqrele);
+DEFINE_DQUOT_EVENT(xfs_dqflush);
+DEFINE_DQUOT_EVENT(xfs_dqflush_force);
+DEFINE_DQUOT_EVENT(xfs_dqflush_done);
+/* not really iget events, but we re-use the format */
+DEFINE_IGET_EVENT(xfs_dquot_dqalloc);
+DEFINE_IGET_EVENT(xfs_dquot_dqdetach);
+
+
+#define DEFINE_LOGGRANT_EVENT(tname) \
+TRACE_EVENT(tname, \
+        TP_PROTO(struct log *log, struct xlog_ticket *tic), \
+        TP_ARGS(log, tic), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(unsigned, trans_type) \
+                __field(char, ocnt) \
+                __field(char, cnt) \
+                __field(int, curr_res) \
+                __field(int, unit_res) \
+                __field(unsigned int, flags) \
+                __field(void *, reserve_headq) \
+                __field(void *, write_headq) \
+                __field(int, grant_reserve_cycle) \
+                __field(int, grant_reserve_bytes) \
+                __field(int, grant_write_cycle) \
+                __field(int, grant_write_bytes) \
+                __field(int, curr_cycle) \
+                __field(int, curr_block) \
+                __field(xfs_lsn_t, tail_lsn) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = log->l_mp->m_super->s_dev; \
+                __entry->trans_type = tic->t_trans_type; \
+                __entry->ocnt = tic->t_ocnt; \
+                __entry->cnt = tic->t_cnt; \
+                __entry->curr_res = tic->t_curr_res; \
+                __entry->unit_res = tic->t_unit_res; \
+                __entry->flags = tic->t_flags; \
+                __entry->reserve_headq = log->l_reserve_headq; \
+                __entry->write_headq = log->l_write_headq; \
+                __entry->grant_reserve_cycle = log->l_grant_reserve_cycle; \
+                __entry->grant_reserve_bytes = log->l_grant_reserve_bytes; \
+                __entry->grant_write_cycle = log->l_grant_write_cycle; \
+                __entry->grant_write_bytes = log->l_grant_write_bytes; \
+                __entry->curr_cycle = log->l_curr_cycle; \
+                __entry->curr_block = log->l_curr_block; \
+                __entry->tail_lsn = log->l_tail_lsn; \
+        ), \
+        TP_printk("dev %d:%d type %s t_ocnt %u t_cnt %u t_curr_res %u " \
+                  "t_unit_res %u t_flags %s reserve_headq 0x%p " \
+                  "write_headq 0x%p grant_reserve_cycle %d " \
+                  "grant_reserve_bytes %d grant_write_cycle %d " \
+                  "grant_write_bytes %d curr_cycle %d curr_block %d " \
+                  "tail_cycle %d tail_block %d", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  __print_symbolic(__entry->trans_type, XFS_TRANS_TYPES), \
+                  __entry->ocnt, \
+                  __entry->cnt, \
+                  __entry->curr_res, \
+                  __entry->unit_res, \
+                  __print_flags(__entry->flags, "|", XLOG_TIC_FLAGS), \
+                  __entry->reserve_headq, \
+                  __entry->write_headq, \
+                  __entry->grant_reserve_cycle, \
+                  __entry->grant_reserve_bytes, \
+                  __entry->grant_write_cycle, \
+                  __entry->grant_write_bytes, \
+                  __entry->curr_cycle, \
+                  __entry->curr_block, \
+                  CYCLE_LSN(__entry->tail_lsn), \
+                  BLOCK_LSN(__entry->tail_lsn) \
+        ) \
+)
+DEFINE_LOGGRANT_EVENT(xfs_log_done_nonperm);
+DEFINE_LOGGRANT_EVENT(xfs_log_done_perm);
+DEFINE_LOGGRANT_EVENT(xfs_log_reserve);
+DEFINE_LOGGRANT_EVENT(xfs_log_umount_write);
+DEFINE_LOGGRANT_EVENT(xfs_log_grant_enter);
+DEFINE_LOGGRANT_EVENT(xfs_log_grant_exit);
+DEFINE_LOGGRANT_EVENT(xfs_log_grant_error);
+DEFINE_LOGGRANT_EVENT(xfs_log_grant_sleep1);
+DEFINE_LOGGRANT_EVENT(xfs_log_grant_wake1);
+DEFINE_LOGGRANT_EVENT(xfs_log_grant_sleep2);
+DEFINE_LOGGRANT_EVENT(xfs_log_grant_wake2);
+DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_enter);
+DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_exit);
+DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_error);
+DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_sleep1);
+DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_wake1);
+DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_sleep2);
+DEFINE_LOGGRANT_EVENT(xfs_log_regrant_write_wake2);
+DEFINE_LOGGRANT_EVENT(xfs_log_regrant_reserve_enter);
+DEFINE_LOGGRANT_EVENT(xfs_log_regrant_reserve_exit);
+DEFINE_LOGGRANT_EVENT(xfs_log_regrant_reserve_sub);
+DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_enter);
+DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_exit);
+DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_sub);
+
+#define DEFINE_RW_EVENT(name) \
+TRACE_EVENT(name, \
+        TP_PROTO(struct xfs_inode *ip, size_t count, loff_t offset, int flags), \
+        TP_ARGS(ip, count, offset, flags), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_ino_t, ino) \
+                __field(xfs_fsize_t, size) \
+                __field(xfs_fsize_t, new_size) \
+                __field(loff_t, offset) \
+                __field(size_t, count) \
+                __field(int, flags) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = VFS_I(ip)->i_sb->s_dev; \
+                __entry->ino = ip->i_ino; \
+                __entry->size = ip->i_d.di_size; \
+                __entry->new_size = ip->i_new_size; \
+                __entry->offset = offset; \
+                __entry->count = count; \
+                __entry->flags = flags; \
+        ), \
+        TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx " \
+                  "offset 0x%llx count 0x%zx ioflags %s", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  __entry->ino, \
+                  __entry->size, \
+                  __entry->new_size, \
+                  __entry->offset, \
+                  __entry->count, \
+                  __print_flags(__entry->flags, "|", XFS_IO_FLAGS)) \
+)
+DEFINE_RW_EVENT(xfs_file_read);
+DEFINE_RW_EVENT(xfs_file_buffered_write);
+DEFINE_RW_EVENT(xfs_file_direct_write);
+DEFINE_RW_EVENT(xfs_file_splice_read);
+DEFINE_RW_EVENT(xfs_file_splice_write);
+
+
+#define DEFINE_PAGE_EVENT(name) \
+TRACE_EVENT(name, \
+        TP_PROTO(struct inode *inode, struct page *page, unsigned long off), \
+        TP_ARGS(inode, page, off), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_ino_t, ino) \
+                __field(pgoff_t, pgoff) \
+                __field(loff_t, size) \
+                __field(unsigned long, offset) \
+                __field(int, delalloc) \
+                __field(int, unmapped) \
+                __field(int, unwritten) \
+        ), \
+        TP_fast_assign( \
+                int delalloc = -1, unmapped = -1, unwritten = -1; \
+        \
+                if (page_has_buffers(page)) \
+                        xfs_count_page_state(page, &delalloc, \
+                                             &unmapped, &unwritten); \
+                __entry->dev = inode->i_sb->s_dev; \
+                __entry->ino = XFS_I(inode)->i_ino; \
+                __entry->pgoff = page_offset(page); \
+                __entry->size = i_size_read(inode); \
+                __entry->offset = off; \
+                __entry->delalloc = delalloc; \
+                __entry->unmapped = unmapped; \
+                __entry->unwritten = unwritten; \
+        ), \
+        TP_printk("dev %d:%d ino 0x%llx pgoff 0x%lx size 0x%llx offset %lx " \
+                  "delalloc %d unmapped %d unwritten %d", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  __entry->ino, \
+                  __entry->pgoff, \
+                  __entry->size, \
+                  __entry->offset, \
+                  __entry->delalloc, \
+                  __entry->unmapped, \
+                  __entry->unwritten) \
+)
+DEFINE_PAGE_EVENT(xfs_writepage);
+DEFINE_PAGE_EVENT(xfs_releasepage);
+DEFINE_PAGE_EVENT(xfs_invalidatepage);
+
+#define DEFINE_IOMAP_EVENT(name) \
+TRACE_EVENT(name, \
+        TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count, \
+                 int flags, struct xfs_bmbt_irec *irec), \
+        TP_ARGS(ip, offset, count, flags, irec), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_ino_t, ino) \
+                __field(loff_t, size) \
+                __field(loff_t, new_size) \
+                __field(loff_t, offset) \
+                __field(size_t, count) \
+                __field(int, flags) \
+                __field(xfs_fileoff_t, startoff) \
+                __field(xfs_fsblock_t, startblock) \
+                __field(xfs_filblks_t, blockcount) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = VFS_I(ip)->i_sb->s_dev; \
+                __entry->ino = ip->i_ino; \
+                __entry->size = ip->i_d.di_size; \
+                __entry->new_size = ip->i_new_size; \
+                __entry->offset = offset; \
+                __entry->count = count; \
+                __entry->flags = flags; \
+                __entry->startoff = irec ? irec->br_startoff : 0; \
+                __entry->startblock = irec ? irec->br_startblock : 0; \
+                __entry->blockcount = irec ? irec->br_blockcount : 0; \
+        ), \
+        TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx " \
+                  "offset 0x%llx count %zd flags %s " \
+                  "startoff 0x%llx startblock 0x%llx blockcount 0x%llx", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  __entry->ino, \
+                  __entry->size, \
+                  __entry->new_size, \
+                  __entry->offset, \
+                  __entry->count, \
+                  __print_flags(__entry->flags, "|", BMAPI_FLAGS), \
+                  __entry->startoff, \
+                  __entry->startblock, \
+                  __entry->blockcount) \
+)
+DEFINE_IOMAP_EVENT(xfs_iomap_enter);
+DEFINE_IOMAP_EVENT(xfs_iomap_found);
+DEFINE_IOMAP_EVENT(xfs_iomap_alloc);
+
+#define DEFINE_SIMPLE_IO_EVENT(name) \
+TRACE_EVENT(name, \
+        TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count), \
+        TP_ARGS(ip, offset, count), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_ino_t, ino) \
+                __field(loff_t, size) \
+                __field(loff_t, new_size) \
+                __field(loff_t, offset) \
+                __field(size_t, count) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = VFS_I(ip)->i_sb->s_dev; \
+                __entry->ino = ip->i_ino; \
+                __entry->size = ip->i_d.di_size; \
+                __entry->new_size = ip->i_new_size; \
+                __entry->offset = offset; \
+                __entry->count = count; \
+        ), \
+        TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx " \
+                  "offset 0x%llx count %zd", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  __entry->ino, \
+                  __entry->size, \
+                  __entry->new_size, \
+                  __entry->offset, \
+                  __entry->count) \
+);
+DEFINE_SIMPLE_IO_EVENT(xfs_delalloc_enospc);
+DEFINE_SIMPLE_IO_EVENT(xfs_unwritten_convert);
+
+
+TRACE_EVENT(xfs_itruncate_start,
+        TP_PROTO(struct xfs_inode *ip, xfs_fsize_t new_size, int flag,
+                 xfs_off_t toss_start, xfs_off_t toss_finish),
+        TP_ARGS(ip, new_size, flag, toss_start, toss_finish),
+        TP_STRUCT__entry(
+                __field(dev_t, dev)
+                __field(xfs_ino_t, ino)
+                __field(xfs_fsize_t, size)
+                __field(xfs_fsize_t, new_size)
+                __field(xfs_off_t, toss_start)
+                __field(xfs_off_t, toss_finish)
+                __field(int, flag)
+        ),
+        TP_fast_assign(
+                __entry->dev = VFS_I(ip)->i_sb->s_dev;
+                __entry->ino = ip->i_ino;
+                __entry->size = ip->i_d.di_size;
+                __entry->new_size = new_size;
+                __entry->toss_start = toss_start;
+                __entry->toss_finish = toss_finish;
+                __entry->flag = flag;
+        ),
+        TP_printk("dev %d:%d ino 0x%llx %s size 0x%llx new_size 0x%llx "
+                  "toss start 0x%llx toss finish 0x%llx",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->ino,
+                  __print_flags(__entry->flag, "|", XFS_ITRUNC_FLAGS),
+                  __entry->size,
+                  __entry->new_size,
+                  __entry->toss_start,
+                  __entry->toss_finish)
+);
+
+#define DEFINE_ITRUNC_EVENT(name) \
+TRACE_EVENT(name, \
+        TP_PROTO(struct xfs_inode *ip, xfs_fsize_t new_size), \
+        TP_ARGS(ip, new_size), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_ino_t, ino) \
+                __field(xfs_fsize_t, size) \
+                __field(xfs_fsize_t, new_size) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = VFS_I(ip)->i_sb->s_dev; \
+                __entry->ino = ip->i_ino; \
+                __entry->size = ip->i_d.di_size; \
+                __entry->new_size = new_size; \
+        ), \
+        TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  __entry->ino, \
+                  __entry->size, \
+                  __entry->new_size) \
+)
+DEFINE_ITRUNC_EVENT(xfs_itruncate_finish_start);
+DEFINE_ITRUNC_EVENT(xfs_itruncate_finish_end);
+
+TRACE_EVENT(xfs_pagecache_inval,
+        TP_PROTO(struct xfs_inode *ip, xfs_off_t start, xfs_off_t finish),
+        TP_ARGS(ip, start, finish),
+        TP_STRUCT__entry(
+                __field(dev_t, dev)
+                __field(xfs_ino_t, ino)
+                __field(xfs_fsize_t, size)
+                __field(xfs_off_t, start)
+                __field(xfs_off_t, finish)
+        ),
+        TP_fast_assign(
+                __entry->dev = VFS_I(ip)->i_sb->s_dev;
+                __entry->ino = ip->i_ino;
+                __entry->size = ip->i_d.di_size;
+                __entry->start = start;
+                __entry->finish = finish;
+        ),
+        TP_printk("dev %d:%d ino 0x%llx size 0x%llx start 0x%llx finish 0x%llx",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->ino,
+                  __entry->size,
+                  __entry->start,
+                  __entry->finish)
+);
+
+TRACE_EVENT(xfs_bunmap,
+        TP_PROTO(struct xfs_inode *ip, xfs_fileoff_t bno, xfs_filblks_t len,
+                 int flags, unsigned long caller_ip),
+        TP_ARGS(ip, bno, len, flags, caller_ip),
+        TP_STRUCT__entry(
+                __field(dev_t, dev)
+                __field(xfs_ino_t, ino)
+                __field(xfs_fsize_t, size)
+                __field(xfs_fileoff_t, bno)
+                __field(xfs_filblks_t, len)
+                __field(unsigned long, caller_ip)
+                __field(int, flags)
+        ),
+        TP_fast_assign(
+                __entry->dev = VFS_I(ip)->i_sb->s_dev;
+                __entry->ino = ip->i_ino;
+                __entry->size = ip->i_d.di_size;
+                __entry->bno = bno;
+                __entry->len = len;
+                __entry->caller_ip = caller_ip;
+                __entry->flags = flags;
+        ),
+        TP_printk("dev %d:%d ino 0x%llx size 0x%llx bno 0x%llx len 0x%llx"
+                  "flags %s caller %pf",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->ino,
+                  __entry->size,
+                  __entry->bno,
+                  __entry->len,
+                  __print_flags(__entry->flags, "|", XFS_BMAPI_FLAGS),
+                  (void *)__entry->caller_ip)
+
+);
+
+TRACE_EVENT(xfs_alloc_busy,
+        TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_agblock_t agbno,
+                 xfs_extlen_t len, int slot),
+        TP_ARGS(mp, agno, agbno, len, slot),
+        TP_STRUCT__entry(
+                __field(dev_t, dev)
+                __field(xfs_agnumber_t, agno)
+                __field(xfs_agblock_t, agbno)
+                __field(xfs_extlen_t, len)
+                __field(int, slot)
+        ),
+        TP_fast_assign(
+                __entry->dev = mp->m_super->s_dev;
+                __entry->agno = agno;
+                __entry->agbno = agbno;
+                __entry->len = len;
+                __entry->slot = slot;
+        ),
+        TP_printk("dev %d:%d agno %u agbno %u len %u slot %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->agno,
+                  __entry->agbno,
+                  __entry->len,
+                  __entry->slot)
+
+);
+
+#define XFS_BUSY_STATES \
+        { 0,    "found" }, \
+        { 1,    "missing" }
+
+TRACE_EVENT(xfs_alloc_unbusy,
+        TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno,
+                 int slot, int found),
+        TP_ARGS(mp, agno, slot, found),
+        TP_STRUCT__entry(
+                __field(dev_t, dev)
+                __field(xfs_agnumber_t, agno)
+                __field(int, slot)
+                __field(int, found)
+        ),
+        TP_fast_assign(
+                __entry->dev = mp->m_super->s_dev;
+                __entry->agno = agno;
+                __entry->slot = slot;
+                __entry->found = found;
+        ),
+        TP_printk("dev %d:%d agno %u slot %d %s",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->agno,
+                  __entry->slot,
+                  __print_symbolic(__entry->found, XFS_BUSY_STATES))
+);
+
+TRACE_EVENT(xfs_alloc_busysearch,
+        TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_agblock_t agbno,
+                 xfs_extlen_t len, int found),
+        TP_ARGS(mp, agno, agbno, len, found),
+        TP_STRUCT__entry(
+                __field(dev_t, dev)
+                __field(xfs_agnumber_t, agno)
+                __field(xfs_agblock_t, agbno)
+                __field(xfs_extlen_t, len)
+                __field(int, found)
+        ),
+        TP_fast_assign(
+                __entry->dev = mp->m_super->s_dev;
+                __entry->agno = agno;
+                __entry->agbno = agbno;
+                __entry->len = len;
+                __entry->found = found;
+        ),
+        TP_printk("dev %d:%d agno %u agbno %u len %u %s",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->agno,
+                  __entry->agbno,
+                  __entry->len,
+                  __print_symbolic(__entry->found, XFS_BUSY_STATES))
+);
+
+TRACE_EVENT(xfs_agf,
+        TP_PROTO(struct xfs_mount *mp, struct xfs_agf *agf, int flags,
+                 unsigned long caller_ip),
+        TP_ARGS(mp, agf, flags, caller_ip),
+        TP_STRUCT__entry(
+                __field(dev_t, dev)
+                __field(xfs_agnumber_t, agno)
+                __field(int, flags)
+                __field(__u32, length)
+                __field(__u32, bno_root)
+                __field(__u32, cnt_root)
+                __field(__u32, bno_level)
+                __field(__u32, cnt_level)
+                __field(__u32, flfirst)
+                __field(__u32, fllast)
+                __field(__u32, flcount)
+                __field(__u32, freeblks)
+                __field(__u32, longest)
+                __field(unsigned long, caller_ip)
+        ),
+        TP_fast_assign(
+                __entry->dev = mp->m_super->s_dev;
+                __entry->agno = be32_to_cpu(agf->agf_seqno),
+                __entry->flags = flags;
+                __entry->length = be32_to_cpu(agf->agf_length),
+                __entry->bno_root = be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]),
+                __entry->cnt_root = be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]),
+                __entry->bno_level =
+                                be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]),
+                __entry->cnt_level =
+                                be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]),
+                __entry->flfirst = be32_to_cpu(agf->agf_flfirst),
+                __entry->fllast = be32_to_cpu(agf->agf_fllast),
+                __entry->flcount = be32_to_cpu(agf->agf_flcount),
+                __entry->freeblks = be32_to_cpu(agf->agf_freeblks),
+                __entry->longest = be32_to_cpu(agf->agf_longest);
+                __entry->caller_ip = caller_ip;
+        ),
+        TP_printk("dev %d:%d agno %u flags %s length %u roots b %u c %u "
+                  "levels b %u c %u flfirst %u fllast %u flcount %u "
+                  "freeblks %u longest %u caller %pf",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->agno,
+                  __print_flags(__entry->flags, "|", XFS_AGF_FLAGS),
+                  __entry->length,
+                  __entry->bno_root,
+                  __entry->cnt_root,
+                  __entry->bno_level,
+                  __entry->cnt_level,
+                  __entry->flfirst,
+                  __entry->fllast,
+                  __entry->flcount,
+                  __entry->freeblks,
+                  __entry->longest,
+                  (void *)__entry->caller_ip)
+);
+
+TRACE_EVENT(xfs_free_extent,
+        TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_agblock_t agbno,
+                 xfs_extlen_t len, bool isfl, int haveleft, int haveright),
+        TP_ARGS(mp, agno, agbno, len, isfl, haveleft, haveright),
+        TP_STRUCT__entry(
+                __field(dev_t, dev)
+                __field(xfs_agnumber_t, agno)
+                __field(xfs_agblock_t, agbno)
+                __field(xfs_extlen_t, len)
+                __field(int, isfl)
+                __field(int, haveleft)
+                __field(int, haveright)
+        ),
+        TP_fast_assign(
+                __entry->dev = mp->m_super->s_dev;
+                __entry->agno = agno;
+                __entry->agbno = agbno;
+                __entry->len = len;
+                __entry->isfl = isfl;
+                __entry->haveleft = haveleft;
+                __entry->haveright = haveright;
+        ),
+        TP_printk("dev %d:%d agno %u agbno %u len %u isfl %d %s",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->agno,
+                  __entry->agbno,
+                  __entry->len,
+                  __entry->isfl,
+                  __entry->haveleft ?
+                        (__entry->haveright ? "both" : "left") :
+                        (__entry->haveright ? "right" : "none"))
+
+);
+
+#define DEFINE_ALLOC_EVENT(name) \
+TRACE_EVENT(name, \
+        TP_PROTO(struct xfs_alloc_arg *args), \
+        TP_ARGS(args), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_agnumber_t, agno) \
+                __field(xfs_agblock_t, agbno) \
+                __field(xfs_extlen_t, minlen) \
+                __field(xfs_extlen_t, maxlen) \
+                __field(xfs_extlen_t, mod) \
+                __field(xfs_extlen_t, prod) \
+                __field(xfs_extlen_t, minleft) \
+                __field(xfs_extlen_t, total) \
+                __field(xfs_extlen_t, alignment) \
+                __field(xfs_extlen_t, minalignslop) \
+                __field(xfs_extlen_t, len) \
+                __field(short, type) \
+                __field(short, otype) \
+                __field(char, wasdel) \
+                __field(char, wasfromfl) \
+                __field(char, isfl) \
+                __field(char, userdata) \
+                __field(xfs_fsblock_t, firstblock) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = args->mp->m_super->s_dev; \
+                __entry->agno = args->agno; \
+                __entry->agbno = args->agbno; \
+                __entry->minlen = args->minlen; \
+                __entry->maxlen = args->maxlen; \
+                __entry->mod = args->mod; \
+                __entry->prod = args->prod; \
+                __entry->minleft = args->minleft; \
+                __entry->total = args->total; \
+                __entry->alignment = args->alignment; \
+                __entry->minalignslop = args->minalignslop; \
+                __entry->len = args->len; \
+                __entry->type = args->type; \
+                __entry->otype = args->otype; \
+                __entry->wasdel = args->wasdel; \
+                __entry->wasfromfl = args->wasfromfl; \
+                __entry->isfl = args->isfl; \
+                __entry->userdata = args->userdata; \
+                __entry->firstblock = args->firstblock; \
+        ), \
+        TP_printk("dev %d:%d agno %u agbno %u minlen %u maxlen %u mod %u " \
+                  "prod %u minleft %u total %u alignment %u minalignslop %u " \
+                  "len %u type %s otype %s wasdel %d wasfromfl %d isfl %d " \
+                  "userdata %d firstblock 0x%llx", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  __entry->agno, \
+                  __entry->agbno, \
+                  __entry->minlen, \
+                  __entry->maxlen, \
+                  __entry->mod, \
+                  __entry->prod, \
+                  __entry->minleft, \
+                  __entry->total, \
+                  __entry->alignment, \
+                  __entry->minalignslop, \
+                  __entry->len, \
+                  __print_symbolic(__entry->type, XFS_ALLOC_TYPES), \
+                  __print_symbolic(__entry->otype, XFS_ALLOC_TYPES), \
+                  __entry->wasdel, \
+                  __entry->wasfromfl, \
+                  __entry->isfl, \
+                  __entry->userdata, \
+                  __entry->firstblock) \
+)
+
+DEFINE_ALLOC_EVENT(xfs_alloc_exact_done);
+DEFINE_ALLOC_EVENT(xfs_alloc_exact_error);
+DEFINE_ALLOC_EVENT(xfs_alloc_near_nominleft);
+DEFINE_ALLOC_EVENT(xfs_alloc_near_first);
+DEFINE_ALLOC_EVENT(xfs_alloc_near_greater);
+DEFINE_ALLOC_EVENT(xfs_alloc_near_lesser);
+DEFINE_ALLOC_EVENT(xfs_alloc_near_error);
+DEFINE_ALLOC_EVENT(xfs_alloc_size_neither);
+DEFINE_ALLOC_EVENT(xfs_alloc_size_noentry);
+DEFINE_ALLOC_EVENT(xfs_alloc_size_nominleft);
+DEFINE_ALLOC_EVENT(xfs_alloc_size_done);
+DEFINE_ALLOC_EVENT(xfs_alloc_size_error);
+DEFINE_ALLOC_EVENT(xfs_alloc_small_freelist);
+DEFINE_ALLOC_EVENT(xfs_alloc_small_notenough);
+DEFINE_ALLOC_EVENT(xfs_alloc_small_done);
+DEFINE_ALLOC_EVENT(xfs_alloc_small_error);
+DEFINE_ALLOC_EVENT(xfs_alloc_vextent_badargs);
+DEFINE_ALLOC_EVENT(xfs_alloc_vextent_nofix);
+DEFINE_ALLOC_EVENT(xfs_alloc_vextent_noagbp);
+DEFINE_ALLOC_EVENT(xfs_alloc_vextent_loopfailed);
+DEFINE_ALLOC_EVENT(xfs_alloc_vextent_allfailed);
+
+#define DEFINE_DIR2_TRACE(tname) \
+TRACE_EVENT(tname, \
+        TP_PROTO(struct xfs_da_args *args), \
+        TP_ARGS(args), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_ino_t, ino) \
+                __dynamic_array(char, name, args->namelen) \
+                __field(int, namelen) \
+                __field(xfs_dahash_t, hashval) \
+                __field(xfs_ino_t, inumber) \
+                __field(int, op_flags) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = VFS_I(args->dp)->i_sb->s_dev; \
+                __entry->ino = args->dp->i_ino; \
+                if (args->namelen) \
+                        memcpy(__get_str(name), args->name, args->namelen); \
+                __entry->namelen = args->namelen; \
+                __entry->hashval = args->hashval; \
+                __entry->inumber = args->inumber; \
+                __entry->op_flags = args->op_flags; \
+        ), \
+        TP_printk("dev %d:%d ino 0x%llx name %.*s namelen %d hashval 0x%x " \
+                  "inumber 0x%llx op_flags %s", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  __entry->ino, \
+                  __entry->namelen, \
+                  __entry->namelen ? __get_str(name) : NULL, \
+                  __entry->namelen, \
+                  __entry->hashval, \
+                  __entry->inumber, \
+                  __print_flags(__entry->op_flags, "|", XFS_DA_OP_FLAGS)) \
+)
+DEFINE_DIR2_TRACE(xfs_dir2_sf_addname);
+DEFINE_DIR2_TRACE(xfs_dir2_sf_create);
+DEFINE_DIR2_TRACE(xfs_dir2_sf_lookup);
+DEFINE_DIR2_TRACE(xfs_dir2_sf_replace);
+DEFINE_DIR2_TRACE(xfs_dir2_sf_removename);
+DEFINE_DIR2_TRACE(xfs_dir2_sf_toino4);
+DEFINE_DIR2_TRACE(xfs_dir2_sf_toino8);
+DEFINE_DIR2_TRACE(xfs_dir2_sf_to_block);
+DEFINE_DIR2_TRACE(xfs_dir2_block_addname);
+DEFINE_DIR2_TRACE(xfs_dir2_block_lookup);
+DEFINE_DIR2_TRACE(xfs_dir2_block_replace);
+DEFINE_DIR2_TRACE(xfs_dir2_block_removename);
+DEFINE_DIR2_TRACE(xfs_dir2_block_to_sf);
+DEFINE_DIR2_TRACE(xfs_dir2_block_to_leaf);
+DEFINE_DIR2_TRACE(xfs_dir2_leaf_addname);
+DEFINE_DIR2_TRACE(xfs_dir2_leaf_lookup);
+DEFINE_DIR2_TRACE(xfs_dir2_leaf_replace);
+DEFINE_DIR2_TRACE(xfs_dir2_leaf_removename);
+DEFINE_DIR2_TRACE(xfs_dir2_leaf_to_block);
+DEFINE_DIR2_TRACE(xfs_dir2_leaf_to_node);
+DEFINE_DIR2_TRACE(xfs_dir2_node_addname);
+DEFINE_DIR2_TRACE(xfs_dir2_node_lookup);
+DEFINE_DIR2_TRACE(xfs_dir2_node_replace);
+DEFINE_DIR2_TRACE(xfs_dir2_node_removename);
+DEFINE_DIR2_TRACE(xfs_dir2_node_to_leaf);
+
+#define DEFINE_DIR2_SPACE_TRACE(tname) \
+TRACE_EVENT(tname, \
+        TP_PROTO(struct xfs_da_args *args, int idx), \
+        TP_ARGS(args, idx), \
+        TP_STRUCT__entry( \
+                __field(dev_t, dev) \
+                __field(xfs_ino_t, ino) \
+                __field(int, op_flags) \
+                __field(int, idx) \
+        ), \
+        TP_fast_assign( \
+                __entry->dev = VFS_I(args->dp)->i_sb->s_dev; \
+                __entry->ino = args->dp->i_ino; \
+                __entry->op_flags = args->op_flags; \
+                __entry->idx = idx; \
+        ), \
+        TP_printk("dev %d:%d ino 0x%llx op_flags %s index %d", \
+                  MAJOR(__entry->dev), MINOR(__entry->dev), \
+                  __entry->ino, \
+                  __print_flags(__entry->op_flags, "|", XFS_DA_OP_FLAGS), \
+                  __entry->idx) \
+)
+DEFINE_DIR2_SPACE_TRACE(xfs_dir2_leafn_add);
+DEFINE_DIR2_SPACE_TRACE(xfs_dir2_leafn_remove);
+DEFINE_DIR2_SPACE_TRACE(xfs_dir2_grow_inode);
+DEFINE_DIR2_SPACE_TRACE(xfs_dir2_shrink_inode);
+
+TRACE_EVENT(xfs_dir2_leafn_moveents,
+        TP_PROTO(struct xfs_da_args *args, int src_idx, int dst_idx, int count),
+        TP_ARGS(args, src_idx, dst_idx, count),
+        TP_STRUCT__entry(
+                __field(dev_t, dev)
+                __field(xfs_ino_t, ino)
+                __field(int, op_flags)
+                __field(int, src_idx)
+                __field(int, dst_idx)
+                __field(int, count)
+        ),
+        TP_fast_assign(
+                __entry->dev = VFS_I(args->dp)->i_sb->s_dev;
+                __entry->ino = args->dp->i_ino;
+                __entry->op_flags = args->op_flags;
+                __entry->src_idx = src_idx;
+                __entry->dst_idx = dst_idx;
+                __entry->count = count;
+        ),
+        TP_printk("dev %d:%d ino 0x%llx op_flags %s "
+                  "src_idx %d dst_idx %d count %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->ino,
+                  __print_flags(__entry->op_flags, "|", XFS_DA_OP_FLAGS),
+                  __entry->src_idx,
+                  __entry->dst_idx,
+                  __entry->count)
+);
+
+#endif /* _TRACE_XFS_H */
+
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_FILE xfs_trace
+#include <trace/define_trace.h>
diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h
index 00cabf5354d2..7c220b4227bc 100644
--- a/fs/xfs/linux-2.6/xfs_vnode.h
+++ b/fs/xfs/linux-2.6/xfs_vnode.h
@@ -39,6 +39,10 @@ struct attrlist_cursor_kern;
 #define IO_ISDIRECT     0x00004         /* bypass page cache */
 #define IO_INVIS        0x00020         /* don't update inode timestamps */
 
+#define XFS_IO_FLAGS \
+        { IO_ISDIRECT,  "DIRECT" }, \
+        { IO_INVIS,     "INVIS"}
+
 /*
  * Flush/Invalidate options for vop_toss/flush/flushinval_pages.
  */
diff --git a/fs/xfs/quota/xfs_dquot.c b/fs/xfs/quota/xfs_dquot.c
index 2f3f2229eaaf..d7c7eea09fc2 100644
--- a/fs/xfs/quota/xfs_dquot.c
+++ b/fs/xfs/quota/xfs_dquot.c
@@ -47,6 +47,7 @@
 #include "xfs_trans_space.h"
 #include "xfs_trans_priv.h"
 #include "xfs_qm.h"
+#include "xfs_trace.h"
 
 
 /*
@@ -112,10 +113,7 @@ xfs_qm_dqinit(
                 init_completion(&dqp->q_flush);
                 complete(&dqp->q_flush);
 
-#ifdef XFS_DQUOT_TRACE
-                dqp->q_trace = ktrace_alloc(DQUOT_TRACE_SIZE, KM_NOFS);
-                xfs_dqtrace_entry(dqp, "DQINIT");
-#endif
+                trace_xfs_dqinit(dqp);
         } else {
                 /*
                  * Only the q_core portion was zeroed in dqreclaim_one().
@@ -136,10 +134,7 @@ xfs_qm_dqinit(
                  dqp->q_hash = NULL;
                  ASSERT(dqp->dq_flnext == dqp->dq_flprev);
 
-#ifdef XFS_DQUOT_TRACE
-                 ASSERT(dqp->q_trace);
-                 xfs_dqtrace_entry(dqp, "DQRECLAIMED_INIT");
-#endif
+                trace_xfs_dqreuse(dqp);
         }
 
         /*
@@ -167,13 +162,8 @@ xfs_qm_dqdestroy(
 
         mutex_destroy(&dqp->q_qlock);
         sv_destroy(&dqp->q_pinwait);
-
-#ifdef XFS_DQUOT_TRACE
-        if (dqp->q_trace)
-             ktrace_free(dqp->q_trace);
-        dqp->q_trace = NULL;
-#endif
         kmem_zone_free(xfs_Gqm->qm_dqzone, dqp);
+
         atomic_dec(&xfs_Gqm->qm_totaldquots);
 }
 
@@ -195,49 +185,6 @@ xfs_qm_dqinit_core(
         d->dd_diskdq.d_flags = type;
 }
 
-
-#ifdef XFS_DQUOT_TRACE
-/*
- * Dquot tracing for debugging.
- */
-/* ARGSUSED */
-void
-__xfs_dqtrace_entry(
-        xfs_dquot_t     *dqp,
-        char            *func,
-        void            *retaddr,
-        xfs_inode_t     *ip)
-{
-        xfs_dquot_t     *udqp = NULL;
-        xfs_ino_t       ino = 0;
-
-        ASSERT(dqp->q_trace);
-        if (ip) {
-                ino = ip->i_ino;
-                udqp = ip->i_udquot;
-        }
-        ktrace_enter(dqp->q_trace,
-                     (void *)(__psint_t)DQUOT_KTRACE_ENTRY,
-                     (void *)func,
-                     (void *)(__psint_t)dqp->q_nrefs,
-                     (void *)(__psint_t)dqp->dq_flags,
-                     (void *)(__psint_t)dqp->q_res_bcount,
-                     (void *)(__psint_t)be64_to_cpu(dqp->q_core.d_bcount),
-                     (void *)(__psint_t)be64_to_cpu(dqp->q_core.d_icount),
-                     (void *)(__psint_t)be64_to_cpu(dqp->q_core.d_blk_hardlimit),
-                     (void *)(__psint_t)be64_to_cpu(dqp->q_core.d_blk_softlimit),
-                     (void *)(__psint_t)be64_to_cpu(dqp->q_core.d_ino_hardlimit),
-                     (void *)(__psint_t)be64_to_cpu(dqp->q_core.d_ino_softlimit),
-                     (void *)(__psint_t)be32_to_cpu(dqp->q_core.d_id),
-                     (void *)(__psint_t)current_pid(),
-                     (void *)(__psint_t)ino,
-                     (void *)(__psint_t)retaddr,
-                     (void *)(__psint_t)udqp);
-        return;
-}
-#endif
-
-
 /*
  * If default limits are in force, push them into the dquot now.
  * We overwrite the dquot limits only if they are zero and this
@@ -425,7 +372,8 @@ xfs_qm_dqalloc(
         xfs_trans_t     *tp = *tpp;
 
         ASSERT(tp != NULL);
-        xfs_dqtrace_entry(dqp, "DQALLOC");
+
+        trace_xfs_dqalloc(dqp);
 
         /*
          * Initialize the bmap freelist prior to calling bmapi code.
@@ -612,7 +560,8 @@ xfs_qm_dqtobp(
          * (in which case we already have the buf).
          */
         if (! newdquot) {
-                xfs_dqtrace_entry(dqp, "DQTOBP READBUF");
+                trace_xfs_dqtobp_read(dqp);
+
                 if ((error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp,
                                                dqp->q_blkno,
                                                XFS_QI_DQCHUNKLEN(mp),
@@ -670,11 +619,12 @@ xfs_qm_dqread(
 
         ASSERT(tpp);
 
+        trace_xfs_dqread(dqp);
+
         /*
          * get a pointer to the on-disk dquot and the buffer containing it
          * dqp already knows its own type (GROUP/USER).
          */
-        xfs_dqtrace_entry(dqp, "DQREAD");
         if ((error = xfs_qm_dqtobp(tpp, dqp, &ddqp, &bp, flags))) {
                 return (error);
         }
@@ -763,7 +713,7 @@ xfs_qm_idtodq(
                  * or if the dquot didn't exist on disk and we ask to
                  * allocate (ENOENT).
                  */
-                xfs_dqtrace_entry(dqp, "DQREAD FAIL");
+                trace_xfs_dqread_fail(dqp);
                 cancelflags |= XFS_TRANS_ABORT;
                 goto error0;
         }
@@ -817,7 +767,8 @@ xfs_qm_dqlookup(
                  * id can't be modified without the hashlock anyway.
                  */
                 if (be32_to_cpu(dqp->q_core.d_id) == id && dqp->q_mount == mp) {
-                        xfs_dqtrace_entry(dqp, "DQFOUND BY LOOKUP");
+                        trace_xfs_dqlookup_found(dqp);
+
                         /*
                          * All in core dquots must be on the dqlist of mp
                          */
@@ -827,7 +778,7 @@ xfs_qm_dqlookup(
                         if (dqp->q_nrefs == 0) {
                                 ASSERT (XFS_DQ_IS_ON_FREELIST(dqp));
                                 if (! xfs_qm_freelist_lock_nowait(xfs_Gqm)) {
-                                        xfs_dqtrace_entry(dqp, "DQLOOKUP: WANT");
+                                        trace_xfs_dqlookup_want(dqp);
 
                                         /*
                                          * We may have raced with dqreclaim_one()
@@ -857,8 +808,7 @@ xfs_qm_dqlookup(
                                         /*
                                          * take it off the freelist
                                          */
-                                        xfs_dqtrace_entry(dqp,
-                                                        "DQLOOKUP: TAKEOFF FL");
+                                        trace_xfs_dqlookup_freelist(dqp);
                                         XQM_FREELIST_REMOVE(dqp);
                                         /* xfs_qm_freelist_print(&(xfs_Gqm->
                                                         qm_dqfreelist),
@@ -878,8 +828,7 @@ xfs_qm_dqlookup(
                          */
                         ASSERT(mutex_is_locked(&qh->qh_lock));
                         if (dqp->HL_PREVP != &qh->qh_next) {
-                                xfs_dqtrace_entry(dqp,
-                                                  "DQLOOKUP: HASH MOVETOFRONT");
+                                trace_xfs_dqlookup_move(dqp);
                                 if ((d = dqp->HL_NEXT))
                                         d->HL_PREVP = dqp->HL_PREVP;
                                 *(dqp->HL_PREVP) = d;
@@ -889,7 +838,7 @@ xfs_qm_dqlookup(
                                 dqp->HL_PREVP = &qh->qh_next;
                                 qh->qh_next = dqp;
                         }
-                        xfs_dqtrace_entry(dqp, "LOOKUP END");
+                        trace_xfs_dqlookup_done(dqp);
                         *O_dqpp = dqp;
                         ASSERT(mutex_is_locked(&qh->qh_lock));
                         return (0);
@@ -971,7 +920,7 @@ xfs_qm_dqget(
                 ASSERT(*O_dqpp);
                 ASSERT(XFS_DQ_IS_LOCKED(*O_dqpp));
                 mutex_unlock(&h->qh_lock);
-                xfs_dqtrace_entry(*O_dqpp, "DQGET DONE (FROM CACHE)");
+                trace_xfs_dqget_hit(*O_dqpp);
                 return (0);     /* success */
         }
         XQM_STATS_INC(xqmstats.xs_qm_dqcachemisses);
@@ -1104,7 +1053,7 @@ xfs_qm_dqget(
         mutex_unlock(&h->qh_lock);
  dqret:
         ASSERT((ip == NULL) || xfs_isilocked(ip, XFS_ILOCK_EXCL));
-        xfs_dqtrace_entry(dqp, "DQGET DONE");
+        trace_xfs_dqget_miss(dqp);
         *O_dqpp = dqp;
         return (0);
 }
@@ -1124,7 +1073,8 @@ xfs_qm_dqput(
 
         ASSERT(dqp->q_nrefs > 0);
         ASSERT(XFS_DQ_IS_LOCKED(dqp));
-        xfs_dqtrace_entry(dqp, "DQPUT");
+
+        trace_xfs_dqput(dqp);
 
         if (dqp->q_nrefs != 1) {
                 dqp->q_nrefs--;
@@ -1137,7 +1087,7 @@ xfs_qm_dqput(
          * in the right order; but try to get it out-of-order first
          */
         if (! xfs_qm_freelist_lock_nowait(xfs_Gqm)) {
-                xfs_dqtrace_entry(dqp, "DQPUT: FLLOCK-WAIT");
+                trace_xfs_dqput_wait(dqp);
                 xfs_dqunlock(dqp);
                 xfs_qm_freelist_lock(xfs_Gqm);
                 xfs_dqlock(dqp);
@@ -1148,7 +1098,8 @@ xfs_qm_dqput(
 
                 /* We can't depend on nrefs being == 1 here */
                 if (--dqp->q_nrefs == 0) {
-                        xfs_dqtrace_entry(dqp, "DQPUT: ON FREELIST");
+                        trace_xfs_dqput_free(dqp);
+
                         /*
                          * insert at end of the freelist.
                          */
@@ -1196,7 +1147,7 @@ xfs_qm_dqrele(
         if (!dqp)
                 return;
 
-        xfs_dqtrace_entry(dqp, "DQRELE");
+        trace_xfs_dqrele(dqp);
 
         xfs_dqlock(dqp);
         /*
@@ -1229,7 +1180,7 @@ xfs_qm_dqflush(
 
         ASSERT(XFS_DQ_IS_LOCKED(dqp));
         ASSERT(!completion_done(&dqp->q_flush));
-        xfs_dqtrace_entry(dqp, "DQFLUSH");
+        trace_xfs_dqflush(dqp);
 
         /*
          * If not dirty, or it's pinned and we are not supposed to
@@ -1259,7 +1210,6 @@ xfs_qm_dqflush(
          * the ondisk-dquot has already been allocated for.
          */
         if ((error = xfs_qm_dqtobp(NULL, dqp, &ddqp, &bp, XFS_QMOPT_DOWARN))) {
-                xfs_dqtrace_entry(dqp, "DQTOBP FAIL");
                 ASSERT(error != ENOENT);
                 /*
                  * Quotas could have gotten turned off (ESRCH)
@@ -1297,7 +1247,7 @@ xfs_qm_dqflush(
          * get stuck waiting in the write for too long.
          */
         if (XFS_BUF_ISPINNED(bp)) {
-                xfs_dqtrace_entry(dqp, "DQFLUSH LOG FORCE");
+                trace_xfs_dqflush_force(dqp);
                 xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE);
         }
 
@@ -1308,7 +1258,9 @@ xfs_qm_dqflush(
         } else {
                 error = xfs_bwrite(mp, bp);
         }
-        xfs_dqtrace_entry(dqp, "DQFLUSH END");
+
+        trace_xfs_dqflush_done(dqp);
+
         /*
          * dqp is still locked, but caller is free to unlock it now.
          */
@@ -1483,7 +1435,7 @@ xfs_qm_dqpurge(
          */
         if (XFS_DQ_IS_DIRTY(dqp)) {
                 int     error;
-                xfs_dqtrace_entry(dqp, "DQPURGE ->DQFLUSH: DQDIRTY");
+
                 /* dqflush unlocks dqflock */
                 /*
                  * Given that dqpurge is a very rare occurrence, it is OK
diff --git a/fs/xfs/quota/xfs_dquot.h b/fs/xfs/quota/xfs_dquot.h
index a2c16bcee90b..a0f7da586d1b 100644
--- a/fs/xfs/quota/xfs_dquot.h
+++ b/fs/xfs/quota/xfs_dquot.h
@@ -85,9 +85,6 @@ typedef struct xfs_dquot {
         struct completion q_flush;      /* flush completion queue */
         atomic_t          q_pincount;   /* dquot pin count */
         wait_queue_head_t q_pinwait;    /* dquot pinning wait queue */
-#ifdef XFS_DQUOT_TRACE
-        struct ktrace   *q_trace;       /* trace header structure */
-#endif
 } xfs_dquot_t;
 
 
@@ -144,24 +141,6 @@ static inline void xfs_dqfunlock(xfs_dquot_t *dqp)
                                      (XFS_IS_UQUOTA_ON((d)->q_mount)) : \
                                      (XFS_IS_OQUOTA_ON((d)->q_mount))))
 
-#ifdef XFS_DQUOT_TRACE
-/*
- * Dquot Tracing stuff.
- */
-#define DQUOT_TRACE_SIZE        64
-#define DQUOT_KTRACE_ENTRY      1
-
-extern void             __xfs_dqtrace_entry(xfs_dquot_t *dqp, char *func,
-                                            void *, xfs_inode_t *);
-#define xfs_dqtrace_entry_ino(a,b,ip) \
-                __xfs_dqtrace_entry((a), (b), (void*)__return_address, (ip))
-#define xfs_dqtrace_entry(a,b) \
-                __xfs_dqtrace_entry((a), (b), (void*)__return_address, NULL)
-#else
-#define xfs_dqtrace_entry(a,b)
-#define xfs_dqtrace_entry_ino(a,b,ip)
-#endif
-
 #ifdef QUOTADEBUG
 extern void             xfs_qm_dqprint(xfs_dquot_t *);
 #else
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c
index 45b1bfef7388..9e627a8b5b0e 100644
--- a/fs/xfs/quota/xfs_qm.c
+++ b/fs/xfs/quota/xfs_qm.c
@@ -47,6 +47,7 @@
 #include "xfs_trans_space.h"
 #include "xfs_utils.h"
 #include "xfs_qm.h"
+#include "xfs_trace.h"
 
 /*
  * The global quota manager. There is only one of these for the entire
@@ -453,7 +454,7 @@ again:
                         xfs_dqunlock(dqp);
                         continue;
                 }
-                xfs_dqtrace_entry(dqp, "FLUSHALL: DQDIRTY");
+
                 /* XXX a sentinel would be better */
                 recl = XFS_QI_MPLRECLAIMS(mp);
                 if (!xfs_dqflock_nowait(dqp)) {
@@ -651,7 +652,7 @@ xfs_qm_dqattach_one(
          */
         dqp = *IO_idqpp;
         if (dqp) {
-                xfs_dqtrace_entry(dqp, "DQATTACH: found in ip");
+                trace_xfs_dqattach_found(dqp);
                 return 0;
         }
 
@@ -704,7 +705,7 @@ xfs_qm_dqattach_one(
         if (error)
                 return error;
 
-        xfs_dqtrace_entry(dqp, "DQATTACH: found by dqget");
+        trace_xfs_dqattach_get(dqp);
 
         /*
          * dqget may have dropped and re-acquired the ilock, but it guarantees
@@ -890,15 +891,15 @@ xfs_qm_dqdetach(
         if (!(ip->i_udquot || ip->i_gdquot))
                 return;
 
+        trace_xfs_dquot_dqdetach(ip);
+
         ASSERT(ip->i_ino != ip->i_mount->m_sb.sb_uquotino);
         ASSERT(ip->i_ino != ip->i_mount->m_sb.sb_gquotino);
         if (ip->i_udquot) {
-                xfs_dqtrace_entry_ino(ip->i_udquot, "DQDETTACH", ip);
                 xfs_qm_dqrele(ip->i_udquot);
                 ip->i_udquot = NULL;
         }
         if (ip->i_gdquot) {
-                xfs_dqtrace_entry_ino(ip->i_gdquot, "DQDETTACH", ip);
                 xfs_qm_dqrele(ip->i_gdquot);
                 ip->i_gdquot = NULL;
         }
@@ -977,7 +978,6 @@ xfs_qm_sync(
                  * across a disk write
                  */
                 xfs_qm_mplist_unlock(mp);
-                xfs_dqtrace_entry(dqp, "XQM_SYNC: DQFLUSH");
                 error = xfs_qm_dqflush(dqp, flush_flags);
                 xfs_dqunlock(dqp);
                 if (error && XFS_FORCED_SHUTDOWN(mp))
@@ -1350,7 +1350,8 @@ xfs_qm_reset_dqcounts(
         xfs_disk_dquot_t        *ddq;
         int                     j;
 
-        xfs_buftrace("RESET DQUOTS", bp);
+        trace_xfs_reset_dqcounts(bp, _RET_IP_);
+
         /*
          * Reset all counters and timers. They'll be
          * started afresh by xfs_qm_quotacheck.
@@ -1543,7 +1544,9 @@ xfs_qm_quotacheck_dqadjust(
         xfs_qcnt_t              rtblks)
 {
         ASSERT(XFS_DQ_IS_LOCKED(dqp));
-        xfs_dqtrace_entry(dqp, "QCHECK DQADJUST");
+
+        trace_xfs_dqadjust(dqp);
+
         /*
          * Adjust the inode count and the block count to reflect this inode's
          * resource usage.
@@ -1994,7 +1997,9 @@ xfs_qm_shake_freelist(
                  */
                 if (XFS_DQ_IS_DIRTY(dqp)) {
                         int     error;
-                        xfs_dqtrace_entry(dqp, "DQSHAKE: DQDIRTY");
+
+                        trace_xfs_dqshake_dirty(dqp);
+
                         /*
                          * We flush it delayed write, so don't bother
                          * releasing the mplock.
@@ -2038,7 +2043,9 @@ xfs_qm_shake_freelist(
                                 return nreclaimed;
                         goto tryagain;
                 }
-                xfs_dqtrace_entry(dqp, "DQSHAKE: UNLINKING");
+
+                trace_xfs_dqshake_unlink(dqp);
+
 #ifdef QUOTADEBUG
                 cmn_err(CE_DEBUG, "Shake 0x%p, ID 0x%x\n",
                         dqp, be32_to_cpu(dqp->q_core.d_id));
@@ -2125,7 +2132,9 @@ xfs_qm_dqreclaim_one(void)
                  */
                 if (dqp->dq_flags & XFS_DQ_WANT) {
                         ASSERT(! (dqp->dq_flags & XFS_DQ_INACTIVE));
-                        xfs_dqtrace_entry(dqp, "DQRECLAIM: DQWANT");
+
+                        trace_xfs_dqreclaim_want(dqp);
+
                         xfs_dqunlock(dqp);
                         xfs_qm_freelist_unlock(xfs_Gqm);
                         if (++restarts >= XFS_QM_RECLAIM_MAX_RESTARTS)
@@ -2171,7 +2180,9 @@ xfs_qm_dqreclaim_one(void)
                  */
                 if (XFS_DQ_IS_DIRTY(dqp)) {
                         int     error;
-                        xfs_dqtrace_entry(dqp, "DQRECLAIM: DQDIRTY");
+
+                        trace_xfs_dqreclaim_dirty(dqp);
+
                         /*
                          * We flush it delayed write, so don't bother
                          * releasing the freelist lock.
@@ -2194,8 +2205,9 @@ xfs_qm_dqreclaim_one(void)
                 if (!mutex_trylock(&dqp->q_hash->qh_lock))
                         goto mplistunlock;
 
+                trace_xfs_dqreclaim_unlink(dqp);
+
                 ASSERT(dqp->q_nrefs == 0);
-                xfs_dqtrace_entry(dqp, "DQRECLAIM: UNLINKING");
                 XQM_MPLIST_REMOVE(&(XFS_QI_MPL_LIST(dqp->q_mount)), dqp);
                 XQM_HASHLIST_REMOVE(dqp->q_hash, dqp);
                 XQM_FREELIST_REMOVE(dqp);
@@ -2430,7 +2442,7 @@ xfs_qm_vop_dqalloc(
                 }
         }
         if (uq)
-                xfs_dqtrace_entry_ino(uq, "DQALLOC", ip);
+                trace_xfs_dquot_dqalloc(ip);
 
         xfs_iunlock(ip, lockflags);
         if (O_udqpp)
diff --git a/fs/xfs/quota/xfs_qm_syscalls.c b/fs/xfs/quota/xfs_qm_syscalls.c
index 5d1a3b98a6e6..71af76fe8a23 100644
--- a/fs/xfs/quota/xfs_qm_syscalls.c
+++ b/fs/xfs/quota/xfs_qm_syscalls.c
@@ -49,6 +49,7 @@
 #include "xfs_buf_item.h"
 #include "xfs_utils.h"
 #include "xfs_qm.h"
+#include "xfs_trace.h"
 
 #ifdef DEBUG
 # define qdprintk(s, args...)   cmn_err(CE_DEBUG, s, ## args)
@@ -496,7 +497,6 @@ xfs_qm_scall_setqlim(
                 ASSERT(error != ENOENT);
                 return (error);
         }
-        xfs_dqtrace_entry(dqp, "Q_SETQLIM: AFT DQGET");
         xfs_trans_dqjoin(tp, dqp);
         ddq = &dqp->q_core;
 
@@ -602,7 +602,6 @@ xfs_qm_scall_setqlim(
         dqp->dq_flags |= XFS_DQ_DIRTY;
         xfs_trans_log_dquot(tp, dqp);
 
-        xfs_dqtrace_entry(dqp, "Q_SETQLIM: COMMIT");
         error = xfs_trans_commit(tp, 0);
         xfs_qm_dqprint(dqp);
         xfs_qm_dqrele(dqp);
@@ -630,7 +629,6 @@ xfs_qm_scall_getquota(
                 return (error);
         }
 
-        xfs_dqtrace_entry(dqp, "Q_GETQUOTA SUCCESS");
         /*
          * If everything's NULL, this dquot doesn't quite exist as far as
          * our utility programs are concerned.
diff --git a/fs/xfs/support/ktrace.c b/fs/xfs/support/ktrace.c
deleted file mode 100644
index 2d494c26717f..000000000000
--- a/fs/xfs/support/ktrace.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * Copyright (c) 2000-2003,2005 Silicon Graphics, 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 License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#include <xfs.h>
-
-static kmem_zone_t *ktrace_hdr_zone;
-static kmem_zone_t *ktrace_ent_zone;
-static int          ktrace_zentries;
-
-void __init
-ktrace_init(int zentries)
-{
-        ktrace_zentries = roundup_pow_of_two(zentries);
-
-        ktrace_hdr_zone = kmem_zone_init(sizeof(ktrace_t),
-                                        "ktrace_hdr");
-        ASSERT(ktrace_hdr_zone);
-
-        ktrace_ent_zone = kmem_zone_init(ktrace_zentries
-                                        * sizeof(ktrace_entry_t),
-                                        "ktrace_ent");
-        ASSERT(ktrace_ent_zone);
-}
-
-void __exit
-ktrace_uninit(void)
-{
-        kmem_zone_destroy(ktrace_hdr_zone);
-        kmem_zone_destroy(ktrace_ent_zone);
-}
-
-/*
- * ktrace_alloc()
- *
- * Allocate a ktrace header and enough buffering for the given
- * number of entries. Round the number of entries up to a
- * power of 2 so we can do fast masking to get the index from
- * the atomic index counter.
- */
-ktrace_t *
-ktrace_alloc(int nentries, unsigned int __nocast sleep)
-{
-        ktrace_t        *ktp;
-        ktrace_entry_t  *ktep;
-        int             entries;
-
-        ktp = (ktrace_t*)kmem_zone_alloc(ktrace_hdr_zone, sleep);
-
-        if (ktp == (ktrace_t*)NULL) {
-                /*
-                 * KM_SLEEP callers don't expect failure.
-                 */
-                if (sleep & KM_SLEEP)
-                        panic("ktrace_alloc: NULL memory on KM_SLEEP request!");
-
-                return NULL;
-        }
-
-        /*
-         * Special treatment for buffers with the ktrace_zentries entries
-         */
-        entries = roundup_pow_of_two(nentries);
-        if (entries == ktrace_zentries) {
-                ktep = (ktrace_entry_t*)kmem_zone_zalloc(ktrace_ent_zone,
-                                                            sleep);
-        } else {
-                ktep = (ktrace_entry_t*)kmem_zalloc((entries * sizeof(*ktep)),
-                                                            sleep | KM_LARGE);
-        }
-
-        if (ktep == NULL) {
-                /*
-                 * KM_SLEEP callers don't expect failure.
-                 */
-                if (sleep & KM_SLEEP)
-                        panic("ktrace_alloc: NULL memory on KM_SLEEP request!");
-
-                kmem_free(ktp);
-
-                return NULL;
-        }
-
-        ktp->kt_entries  = ktep;
-        ktp->kt_nentries = entries;
-        ASSERT(is_power_of_2(entries));
-        ktp->kt_index_mask = entries - 1;
-        atomic_set(&ktp->kt_index, 0);
-        ktp->kt_rollover = 0;
-        return ktp;
-}
-
-
-/*
- * ktrace_free()
- *
- * Free up the ktrace header and buffer.  It is up to the caller
- * to ensure that no-one is referencing it.
- */
-void
-ktrace_free(ktrace_t *ktp)
-{
-        if (ktp == (ktrace_t *)NULL)
-                return;
-
-        /*
-         * Special treatment for the Vnode trace buffer.
-         */
-        if (ktp->kt_nentries == ktrace_zentries)
-                kmem_zone_free(ktrace_ent_zone, ktp->kt_entries);
-        else
-                kmem_free(ktp->kt_entries);
-
-        kmem_zone_free(ktrace_hdr_zone, ktp);
-}
-
-
-/*
- * Enter the given values into the "next" entry in the trace buffer.
- * kt_index is always the index of the next entry to be filled.
- */
-void
-ktrace_enter(
-        ktrace_t        *ktp,
-        void            *val0,
-        void            *val1,
-        void            *val2,
-        void            *val3,
-        void            *val4,
-        void            *val5,
-        void            *val6,
-        void            *val7,
-        void            *val8,
-        void            *val9,
-        void            *val10,
-        void            *val11,
-        void            *val12,
-        void            *val13,
-        void            *val14,
-        void            *val15)
-{
-        int             index;
-        ktrace_entry_t  *ktep;
-
-        ASSERT(ktp != NULL);
-
-        /*
-         * Grab an entry by pushing the index up to the next one.
-         */
-        index = atomic_add_return(1, &ktp->kt_index);
-        index = (index - 1) & ktp->kt_index_mask;
-        if (!ktp->kt_rollover && index == ktp->kt_nentries - 1)
-                ktp->kt_rollover = 1;
-
-        ASSERT((index >= 0) && (index < ktp->kt_nentries));
-
-        ktep = &(ktp->kt_entries[index]);
-
-        ktep->val[0]  = val0;
-        ktep->val[1]  = val1;
-        ktep->val[2]  = val2;
-        ktep->val[3]  = val3;
-        ktep->val[4]  = val4;
-        ktep->val[5]  = val5;
-        ktep->val[6]  = val6;
-        ktep->val[7]  = val7;
-        ktep->val[8]  = val8;
-        ktep->val[9]  = val9;
-        ktep->val[10] = val10;
-        ktep->val[11] = val11;
-        ktep->val[12] = val12;
-        ktep->val[13] = val13;
-        ktep->val[14] = val14;
-        ktep->val[15] = val15;
-}
-
-/*
- * Return the number of entries in the trace buffer.
- */
-int
-ktrace_nentries(
-        ktrace_t        *ktp)
-{
-        int     index;
-        if (ktp == NULL)
-                return 0;
-
-        index = atomic_read(&ktp->kt_index) & ktp->kt_index_mask;
-        return (ktp->kt_rollover ? ktp->kt_nentries : index);
-}
-
-/*
- * ktrace_first()
- *
- * This is used to find the start of the trace buffer.
- * In conjunction with ktrace_next() it can be used to
- * iterate through the entire trace buffer.  This code does
- * not do any locking because it is assumed that it is called
- * from the debugger.
- *
- * The caller must pass in a pointer to a ktrace_snap
- * structure in which we will keep some state used to
- * iterate through the buffer.  This state must not touched
- * by any code outside of this module.
- */
-ktrace_entry_t *
-ktrace_first(ktrace_t   *ktp, ktrace_snap_t     *ktsp)
-{
-        ktrace_entry_t  *ktep;
-        int             index;
-        int             nentries;
-
-        if (ktp->kt_rollover)
-                index = atomic_read(&ktp->kt_index) & ktp->kt_index_mask;
-        else
-                index = 0;
-
-        ktsp->ks_start = index;
-        ktep = &(ktp->kt_entries[index]);
-
-        nentries = ktrace_nentries(ktp);
-        index++;
-        if (index < nentries) {
-                ktsp->ks_index = index;
-        } else {
-                ktsp->ks_index = 0;
-                if (index > nentries)
-                        ktep = NULL;
-        }
-        return ktep;
-}
-
-/*
- * ktrace_next()
- *
- * This is used to iterate through the entries of the given
- * trace buffer.  The caller must pass in the ktrace_snap_t
- * structure initialized by ktrace_first().  The return value
- * will be either a pointer to the next ktrace_entry or NULL
- * if all of the entries have been traversed.
- */
-ktrace_entry_t *
-ktrace_next(
-        ktrace_t        *ktp,
-        ktrace_snap_t   *ktsp)
-{
-        int             index;
-        ktrace_entry_t  *ktep;
-
-        index = ktsp->ks_index;
-        if (index == ktsp->ks_start) {
-                ktep = NULL;
-        } else {
-                ktep = &ktp->kt_entries[index];
-        }
-
-        index++;
-        if (index == ktrace_nentries(ktp)) {
-                ktsp->ks_index = 0;
-        } else {
-                ktsp->ks_index = index;
-        }
-
-        return ktep;
-}
-
-/*
- * ktrace_skip()
- *
- * Skip the next "count" entries and return the entry after that.
- * Return NULL if this causes us to iterate past the beginning again.
- */
-ktrace_entry_t *
-ktrace_skip(
-        ktrace_t        *ktp,
-        int             count,
-        ktrace_snap_t   *ktsp)
-{
-        int             index;
-        int             new_index;
-        ktrace_entry_t  *ktep;
-        int             nentries = ktrace_nentries(ktp);
-
-        index = ktsp->ks_index;
-        new_index = index + count;
-        while (new_index >= nentries) {
-                new_index -= nentries;
-        }
-        if (index == ktsp->ks_start) {
-                /*
-                 * We've iterated around to the start, so we're done.
-                 */
-                ktep = NULL;
-        } else if ((new_index < index) && (index < ktsp->ks_index)) {
-                /*
-                 * We've skipped past the start again, so we're done.
-                 */
-                ktep = NULL;
-                ktsp->ks_index = ktsp->ks_start;
-        } else {
-                ktep = &(ktp->kt_entries[new_index]);
-                new_index++;
-                if (new_index == nentries) {
-                        ktsp->ks_index = 0;
-                } else {
-                        ktsp->ks_index = new_index;
-                }
-        }
-        return ktep;
-}
diff --git a/fs/xfs/support/ktrace.h b/fs/xfs/support/ktrace.h
deleted file mode 100644
index 741d6947ca60..000000000000
--- a/fs/xfs/support/ktrace.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2000-2003,2005 Silicon Graphics, 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 License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#ifndef __XFS_SUPPORT_KTRACE_H__
-#define __XFS_SUPPORT_KTRACE_H__
-
-/*
- * Trace buffer entry structure.
- */
-typedef struct ktrace_entry {
-        void    *val[16];
-} ktrace_entry_t;
-
-/*
- * Trace buffer header structure.
- */
-typedef struct ktrace {
-        int             kt_nentries;    /* number of entries in trace buf */
-        atomic_t        kt_index;       /* current index in entries */
-        unsigned int    kt_index_mask;
-        int             kt_rollover;
-        ktrace_entry_t  *kt_entries;    /* buffer of entries */
-} ktrace_t;
-
-/*
- * Trace buffer snapshot structure.
- */
-typedef struct ktrace_snap {
-        int             ks_start;       /* kt_index at time of snap */
-        int             ks_index;       /* current index */
-} ktrace_snap_t;
-
-
-#ifdef CONFIG_XFS_TRACE
-
-extern void ktrace_init(int zentries);
-extern void ktrace_uninit(void);
-
-extern ktrace_t *ktrace_alloc(int, unsigned int __nocast);
-extern void ktrace_free(ktrace_t *);
-
-extern void ktrace_enter(
-        ktrace_t        *,
-        void            *,
-        void            *,
-        void            *,
-        void            *,
-        void            *,
-        void            *,
-        void            *,
-        void            *,
-        void            *,
-        void            *,
-        void            *,
-        void            *,
-        void            *,
-        void            *,
-        void            *,
-        void            *);
-
-extern ktrace_entry_t   *ktrace_first(ktrace_t *, ktrace_snap_t *);
-extern int              ktrace_nentries(ktrace_t *);
-extern ktrace_entry_t   *ktrace_next(ktrace_t *, ktrace_snap_t *);
-extern ktrace_entry_t   *ktrace_skip(ktrace_t *, int, ktrace_snap_t *);
-
-#else
-#define ktrace_init(x)  do { } while (0)
-#define ktrace_uninit() do { } while (0)
-#endif  /* CONFIG_XFS_TRACE */
-
-#endif  /* __XFS_SUPPORT_KTRACE_H__ */
diff --git a/fs/xfs/xfs.h b/fs/xfs/xfs.h
index 17254b529c54..5ad8ad3a1dcd 100644
--- a/fs/xfs/xfs.h
+++ b/fs/xfs/xfs.h
@@ -25,21 +25,5 @@
 /* #define QUOTADEBUG 1 */
 #endif
 
-#ifdef CONFIG_XFS_TRACE
-#define XFS_ALLOC_TRACE 1
-#define XFS_ATTR_TRACE 1
-#define XFS_BLI_TRACE 1
-#define XFS_BMAP_TRACE 1
-#define XFS_BTREE_TRACE 1
-#define XFS_DIR2_TRACE 1
-#define XFS_DQUOT_TRACE 1
-#define XFS_ILOCK_TRACE 1
-#define XFS_LOG_TRACE 1
-#define XFS_RW_TRACE 1
-#define XFS_BUF_TRACE 1
-#define XFS_INODE_TRACE 1
-#define XFS_FILESTREAMS_TRACE 1
-#endif
-
 #include <linux-2.6/xfs_linux.h>
 #endif  /* __XFS_H__ */
diff --git a/fs/xfs/xfs_ag.h b/fs/xfs/xfs_ag.h
index a5d54bf4931b..6702bd865811 100644
--- a/fs/xfs/xfs_ag.h
+++ b/fs/xfs/xfs_ag.h
@@ -86,6 +86,20 @@ typedef struct xfs_agf {
 #define XFS_AGF_NUM_BITS        12
 #define XFS_AGF_ALL_BITS        ((1 << XFS_AGF_NUM_BITS) - 1)
 
+#define XFS_AGF_FLAGS \
+        { XFS_AGF_MAGICNUM,     "MAGICNUM" }, \
+        { XFS_AGF_VERSIONNUM,   "VERSIONNUM" }, \
+        { XFS_AGF_SEQNO,        "SEQNO" }, \
+        { XFS_AGF_LENGTH,       "LENGTH" }, \
+        { XFS_AGF_ROOTS,        "ROOTS" }, \
+        { XFS_AGF_LEVELS,       "LEVELS" }, \
+        { XFS_AGF_FLFIRST,      "FLFIRST" }, \
+        { XFS_AGF_FLLAST,       "FLLAST" }, \
+        { XFS_AGF_FLCOUNT,      "FLCOUNT" }, \
+        { XFS_AGF_FREEBLKS,     "FREEBLKS" }, \
+        { XFS_AGF_LONGEST,      "LONGEST" }, \
+        { XFS_AGF_BTREEBLKS,    "BTREEBLKS" }
+
 /* disk block (xfs_daddr_t) in the AG */
 #define XFS_AGF_DADDR(mp)       ((xfs_daddr_t)(1 << (mp)->m_sectbb_log))
 #define XFS_AGF_BLOCK(mp)       XFS_HDR_BLOCK(mp, XFS_AGF_DADDR(mp))
diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c
index 2cf944eb796d..a1c65fc6d9c4 100644
--- a/fs/xfs/xfs_alloc.c
+++ b/fs/xfs/xfs_alloc.c
@@ -38,6 +38,7 @@
 #include "xfs_ialloc.h"
 #include "xfs_alloc.h"
 #include "xfs_error.h"
+#include "xfs_trace.h"
 
 
 #define XFS_ABSDIFF(a,b)        (((a) <= (b)) ? ((b) - (a)) : ((a) - (b)))
@@ -51,30 +52,6 @@ xfs_alloc_search_busy(xfs_trans_t *tp,
                     xfs_agblock_t bno,
                     xfs_extlen_t len);
 
-#if defined(XFS_ALLOC_TRACE)
-ktrace_t *xfs_alloc_trace_buf;
-
-#define TRACE_ALLOC(s,a)        \
-        xfs_alloc_trace_alloc(__func__, s, a, __LINE__)
-#define TRACE_FREE(s,a,b,x,f)   \
-        xfs_alloc_trace_free(__func__, s, mp, a, b, x, f, __LINE__)
-#define TRACE_MODAGF(s,a,f)     \
-        xfs_alloc_trace_modagf(__func__, s, mp, a, f, __LINE__)
-#define TRACE_BUSY(__func__,s,ag,agb,l,sl,tp)   \
-        xfs_alloc_trace_busy(__func__, s, mp, ag, agb, l, sl, tp, XFS_ALLOC_KTRACE_BUSY, __LINE__)
-#define TRACE_UNBUSY(__func__,s,ag,sl,tp)       \
-        xfs_alloc_trace_busy(__func__, s, mp, ag, -1, -1, sl, tp, XFS_ALLOC_KTRACE_UNBUSY, __LINE__)
-#define TRACE_BUSYSEARCH(__func__,s,ag,agb,l,tp)        \
-        xfs_alloc_trace_busy(__func__, s, mp, ag, agb, l, 0, tp, XFS_ALLOC_KTRACE_BUSYSEARCH, __LINE__)
-#else
-#define TRACE_ALLOC(s,a)
-#define TRACE_FREE(s,a,b,x,f)
-#define TRACE_MODAGF(s,a,f)
-#define TRACE_BUSY(s,a,ag,agb,l,sl,tp)
-#define TRACE_UNBUSY(fname,s,ag,sl,tp)
-#define TRACE_BUSYSEARCH(fname,s,ag,agb,l,tp)
-#endif  /* XFS_ALLOC_TRACE */
-
 /*
  * Prototypes for per-ag allocation routines
  */
@@ -498,124 +475,6 @@ xfs_alloc_read_agfl(
         return 0;
 }
 
-#if defined(XFS_ALLOC_TRACE)
-/*
- * Add an allocation trace entry for an alloc call.
- */
-STATIC void
-xfs_alloc_trace_alloc(
-        const char      *name,          /* function tag string */
-        char            *str,           /* additional string */
-        xfs_alloc_arg_t *args,          /* allocation argument structure */
-        int             line)           /* source line number */
-{
-        ktrace_enter(xfs_alloc_trace_buf,
-                (void *)(__psint_t)(XFS_ALLOC_KTRACE_ALLOC | (line << 16)),
-                (void *)name,
-                (void *)str,
-                (void *)args->mp,
-                (void *)(__psunsigned_t)args->agno,
-                (void *)(__psunsigned_t)args->agbno,
-                (void *)(__psunsigned_t)args->minlen,
-                (void *)(__psunsigned_t)args->maxlen,
-                (void *)(__psunsigned_t)args->mod,
-                (void *)(__psunsigned_t)args->prod,
-                (void *)(__psunsigned_t)args->minleft,
-                (void *)(__psunsigned_t)args->total,
-                (void *)(__psunsigned_t)args->alignment,
-                (void *)(__psunsigned_t)args->len,
-                (void *)((((__psint_t)args->type) << 16) |
-                         (__psint_t)args->otype),
-                (void *)(__psint_t)((args->wasdel << 3) |
-                                    (args->wasfromfl << 2) |
-                                    (args->isfl << 1) |
-                                    (args->userdata << 0)));
-}
-
-/*
- * Add an allocation trace entry for a free call.
- */
-STATIC void
-xfs_alloc_trace_free(
-        const char      *name,          /* function tag string */
-        char            *str,           /* additional string */
-        xfs_mount_t     *mp,            /* file system mount point */
-        xfs_agnumber_t  agno,           /* allocation group number */
-        xfs_agblock_t   agbno,          /* a.g. relative block number */
-        xfs_extlen_t    len,            /* length of extent */
-        int             isfl,           /* set if is freelist allocation/free */
-        int             line)           /* source line number */
-{
-        ktrace_enter(xfs_alloc_trace_buf,
-                (void *)(__psint_t)(XFS_ALLOC_KTRACE_FREE | (line << 16)),
-                (void *)name,
-                (void *)str,
-                (void *)mp,
-                (void *)(__psunsigned_t)agno,
-                (void *)(__psunsigned_t)agbno,
-                (void *)(__psunsigned_t)len,
-                (void *)(__psint_t)isfl,
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-}
-
-/*
- * Add an allocation trace entry for modifying an agf.
- */
-STATIC void
-xfs_alloc_trace_modagf(
-        const char      *name,          /* function tag string */
-        char            *str,           /* additional string */
-        xfs_mount_t     *mp,            /* file system mount point */
-        xfs_agf_t       *agf,           /* new agf value */
-        int             flags,          /* logging flags for agf */
-        int             line)           /* source line number */
-{
-        ktrace_enter(xfs_alloc_trace_buf,
-                (void *)(__psint_t)(XFS_ALLOC_KTRACE_MODAGF | (line << 16)),
-                (void *)name,
-                (void *)str,
-                (void *)mp,
-                (void *)(__psint_t)flags,
-                (void *)(__psunsigned_t)be32_to_cpu(agf->agf_seqno),
-                (void *)(__psunsigned_t)be32_to_cpu(agf->agf_length),
-                (void *)(__psunsigned_t)be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]),
-                (void *)(__psunsigned_t)be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]),
-                (void *)(__psunsigned_t)be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]),
-                (void *)(__psunsigned_t)be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]),
-                (void *)(__psunsigned_t)be32_to_cpu(agf->agf_flfirst),
-                (void *)(__psunsigned_t)be32_to_cpu(agf->agf_fllast),
-                (void *)(__psunsigned_t)be32_to_cpu(agf->agf_flcount),
-                (void *)(__psunsigned_t)be32_to_cpu(agf->agf_freeblks),
-                (void *)(__psunsigned_t)be32_to_cpu(agf->agf_longest));
-}
-
-STATIC void
-xfs_alloc_trace_busy(
-        const char      *name,          /* function tag string */
-        char            *str,           /* additional string */
-        xfs_mount_t     *mp,            /* file system mount point */
-        xfs_agnumber_t  agno,           /* allocation group number */
-        xfs_agblock_t   agbno,          /* a.g. relative block number */
-        xfs_extlen_t    len,            /* length of extent */
-        int             slot,           /* perag Busy slot */
-        xfs_trans_t     *tp,
-        int             trtype,         /* type: add, delete, search */
-        int             line)           /* source line number */
-{
-        ktrace_enter(xfs_alloc_trace_buf,
-                (void *)(__psint_t)(trtype | (line << 16)),
-                (void *)name,
-                (void *)str,
-                (void *)mp,
-                (void *)(__psunsigned_t)agno,
-                (void *)(__psunsigned_t)agbno,
-                (void *)(__psunsigned_t)len,
-                (void *)(__psint_t)slot,
-                (void *)tp,
-                NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-}
-#endif  /* XFS_ALLOC_TRACE */
-
 /*
  * Allocation group level functions.
  */
@@ -665,9 +524,6 @@ xfs_alloc_ag_vextent(
          */
         if (args->agbno != NULLAGBLOCK) {
                 xfs_agf_t       *agf;   /* allocation group freelist header */
-#ifdef XFS_ALLOC_TRACE
-                xfs_mount_t     *mp = args->mp;
-#endif
                 long            slen = (long)args->len;
 
                 ASSERT(args->len >= args->minlen && args->len <= args->maxlen);
@@ -682,7 +538,6 @@ xfs_alloc_ag_vextent(
                         args->pag->pagf_freeblks -= args->len;
                         ASSERT(be32_to_cpu(agf->agf_freeblks) <=
                                 be32_to_cpu(agf->agf_length));
-                        TRACE_MODAGF(NULL, agf, XFS_AGF_FREEBLKS);
                         xfs_alloc_log_agf(args->tp, args->agbp,
                                                 XFS_AGF_FREEBLKS);
                         /* search the busylist for these blocks */
@@ -792,13 +647,14 @@ xfs_alloc_ag_vextent_exact(
         }
         xfs_btree_del_cursor(bno_cur, XFS_BTREE_NOERROR);
         xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
-        TRACE_ALLOC("normal", args);
+
+        trace_xfs_alloc_exact_done(args);
         args->wasfromfl = 0;
         return 0;
 
 error0:
         xfs_btree_del_cursor(bno_cur, XFS_BTREE_ERROR);
-        TRACE_ALLOC("error", args);
+        trace_xfs_alloc_exact_error(args);
         return error;
 }
 
@@ -958,7 +814,7 @@ xfs_alloc_ag_vextent_near(
                 args->len = blen;
                 if (!xfs_alloc_fix_minleft(args)) {
                         xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
-                        TRACE_ALLOC("nominleft", args);
+                        trace_xfs_alloc_near_nominleft(args);
                         return 0;
                 }
                 blen = args->len;
@@ -981,7 +837,8 @@ xfs_alloc_ag_vextent_near(
                         goto error0;
                 xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
                 xfs_btree_del_cursor(bno_cur_lt, XFS_BTREE_NOERROR);
-                TRACE_ALLOC("first", args);
+
+                trace_xfs_alloc_near_first(args);
                 return 0;
         }
         /*
@@ -1272,7 +1129,7 @@ xfs_alloc_ag_vextent_near(
          * If we couldn't get anything, give up.
          */
         if (bno_cur_lt == NULL && bno_cur_gt == NULL) {
-                TRACE_ALLOC("neither", args);
+                trace_xfs_alloc_size_neither(args);
                 args->agbno = NULLAGBLOCK;
                 return 0;
         }
@@ -1299,7 +1156,7 @@ xfs_alloc_ag_vextent_near(
         args->len = XFS_EXTLEN_MIN(ltlena, args->maxlen);
         xfs_alloc_fix_len(args);
         if (!xfs_alloc_fix_minleft(args)) {
-                TRACE_ALLOC("nominleft", args);
+                trace_xfs_alloc_near_nominleft(args);
                 xfs_btree_del_cursor(bno_cur_lt, XFS_BTREE_NOERROR);
                 xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
                 return 0;
@@ -1314,13 +1171,18 @@ xfs_alloc_ag_vextent_near(
         if ((error = xfs_alloc_fixup_trees(cnt_cur, bno_cur_lt, ltbno, ltlen,
                         ltnew, rlen, XFSA_FIXUP_BNO_OK)))
                 goto error0;
-        TRACE_ALLOC(j ? "gt" : "lt", args);
+
+        if (j)
+                trace_xfs_alloc_near_greater(args);
+        else
+                trace_xfs_alloc_near_lesser(args);
+
         xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
         xfs_btree_del_cursor(bno_cur_lt, XFS_BTREE_NOERROR);
         return 0;
 
  error0:
-        TRACE_ALLOC("error", args);
+        trace_xfs_alloc_near_error(args);
         if (cnt_cur != NULL)
                 xfs_btree_del_cursor(cnt_cur, XFS_BTREE_ERROR);
         if (bno_cur_lt != NULL)
@@ -1371,7 +1233,7 @@ xfs_alloc_ag_vextent_size(
                         goto error0;
                 if (i == 0 || flen == 0) {
                         xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
-                        TRACE_ALLOC("noentry", args);
+                        trace_xfs_alloc_size_noentry(args);
                         return 0;
                 }
                 ASSERT(i == 1);
@@ -1448,7 +1310,7 @@ xfs_alloc_ag_vextent_size(
         xfs_alloc_fix_len(args);
         if (rlen < args->minlen || !xfs_alloc_fix_minleft(args)) {
                 xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
-                TRACE_ALLOC("nominleft", args);
+                trace_xfs_alloc_size_nominleft(args);
                 args->agbno = NULLAGBLOCK;
                 return 0;
         }
@@ -1471,11 +1333,11 @@ xfs_alloc_ag_vextent_size(
                 args->agbno + args->len <=
                         be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length),
                 error0);
-        TRACE_ALLOC("normal", args);
+        trace_xfs_alloc_size_done(args);
         return 0;
 
 error0:
-        TRACE_ALLOC("error", args);
+        trace_xfs_alloc_size_error(args);
         if (cnt_cur)
                 xfs_btree_del_cursor(cnt_cur, XFS_BTREE_ERROR);
         if (bno_cur)
@@ -1534,7 +1396,7 @@ xfs_alloc_ag_vextent_small(
                                 be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length),
                                 error0);
                         args->wasfromfl = 1;
-                        TRACE_ALLOC("freelist", args);
+                        trace_xfs_alloc_small_freelist(args);
                         *stat = 0;
                         return 0;
                 }
@@ -1556,17 +1418,17 @@ xfs_alloc_ag_vextent_small(
          */
         if (flen < args->minlen) {
                 args->agbno = NULLAGBLOCK;
-                TRACE_ALLOC("notenough", args);
+                trace_xfs_alloc_small_notenough(args);
                 flen = 0;
         }
         *fbnop = fbno;
         *flenp = flen;
         *stat = 1;
-        TRACE_ALLOC("normal", args);
+        trace_xfs_alloc_small_done(args);
         return 0;
 
 error0:
-        TRACE_ALLOC("error", args);
+        trace_xfs_alloc_small_error(args);
         return error;
 }
 
@@ -1809,17 +1671,14 @@ xfs_free_ag_extent(
                         be32_to_cpu(agf->agf_freeblks) <=
                         be32_to_cpu(agf->agf_length),
                         error0);
-                TRACE_MODAGF(NULL, agf, XFS_AGF_FREEBLKS);
                 xfs_alloc_log_agf(tp, agbp, XFS_AGF_FREEBLKS);
                 if (!isfl)
                         xfs_trans_mod_sb(tp, XFS_TRANS_SB_FDBLOCKS, (long)len);
                 XFS_STATS_INC(xs_freex);
                 XFS_STATS_ADD(xs_freeb, len);
         }
-        TRACE_FREE(haveleft ?
-                        (haveright ? "both" : "left") :
-                        (haveright ? "right" : "none"),
-                agno, bno, len, isfl);
+
+        trace_xfs_free_extent(mp, agno, bno, len, isfl, haveleft, haveright);
 
         /*
          * Since blocks move to the free list without the coordination
@@ -1836,7 +1695,7 @@ xfs_free_ag_extent(
         return 0;
 
  error0:
-        TRACE_FREE("error", agno, bno, len, isfl);
+        trace_xfs_free_extent(mp, agno, bno, len, isfl, -1, -1);
         if (bno_cur)
                 xfs_btree_del_cursor(bno_cur, XFS_BTREE_ERROR);
         if (cnt_cur)
@@ -2122,7 +1981,6 @@ xfs_alloc_get_freelist(
                 logflags |= XFS_AGF_BTREEBLKS;
         }
 
-        TRACE_MODAGF(NULL, agf, logflags);
         xfs_alloc_log_agf(tp, agbp, logflags);
         *bnop = bno;
 
@@ -2165,6 +2023,8 @@ xfs_alloc_log_agf(
                 sizeof(xfs_agf_t)
         };
 
+        trace_xfs_agf(tp->t_mountp, XFS_BUF_TO_AGF(bp), fields, _RET_IP_);
+
         xfs_btree_offsets(fields, offsets, XFS_AGF_NUM_BITS, &first, &last);
         xfs_trans_log_buf(tp, bp, (uint)first, (uint)last);
 }
@@ -2230,13 +2090,11 @@ xfs_alloc_put_freelist(
                 logflags |= XFS_AGF_BTREEBLKS;
         }
 
-        TRACE_MODAGF(NULL, agf, logflags);
         xfs_alloc_log_agf(tp, agbp, logflags);
 
         ASSERT(be32_to_cpu(agf->agf_flcount) <= XFS_AGFL_SIZE(mp));
         blockp = &agfl->agfl_bno[be32_to_cpu(agf->agf_fllast)];
         *blockp = cpu_to_be32(bno);
-        TRACE_MODAGF(NULL, agf, logflags);
         xfs_alloc_log_agf(tp, agbp, logflags);
         xfs_trans_log_buf(tp, agflbp,
                 (int)((xfs_caddr_t)blockp - (xfs_caddr_t)agfl),
@@ -2399,7 +2257,7 @@ xfs_alloc_vextent(
             args->minlen > args->maxlen || args->minlen > agsize ||
             args->mod >= args->prod) {
                 args->fsbno = NULLFSBLOCK;
-                TRACE_ALLOC("badargs", args);
+                trace_xfs_alloc_vextent_badargs(args);
                 return 0;
         }
         minleft = args->minleft;
@@ -2418,12 +2276,12 @@ xfs_alloc_vextent(
                 error = xfs_alloc_fix_freelist(args, 0);
                 args->minleft = minleft;
                 if (error) {
-                        TRACE_ALLOC("nofix", args);
+                        trace_xfs_alloc_vextent_nofix(args);
                         goto error0;
                 }
                 if (!args->agbp) {
                         up_read(&mp->m_peraglock);
-                        TRACE_ALLOC("noagbp", args);
+                        trace_xfs_alloc_vextent_noagbp(args);
                         break;
                 }
                 args->agbno = XFS_FSB_TO_AGBNO(mp, args->fsbno);
@@ -2488,7 +2346,7 @@ xfs_alloc_vextent(
                         error = xfs_alloc_fix_freelist(args, flags);
                         args->minleft = minleft;
                         if (error) {
-                                TRACE_ALLOC("nofix", args);
+                                trace_xfs_alloc_vextent_nofix(args);
                                 goto error0;
                         }
                         /*
@@ -2499,7 +2357,9 @@ xfs_alloc_vextent(
                                         goto error0;
                                 break;
                         }
-                        TRACE_ALLOC("loopfailed", args);
+
+                        trace_xfs_alloc_vextent_loopfailed(args);
+
                         /*
                          * Didn't work, figure out the next iteration.
                          */
@@ -2526,7 +2386,7 @@ xfs_alloc_vextent(
                         if (args->agno == sagno) {
                                 if (no_min == 1) {
                                         args->agbno = NULLAGBLOCK;
-                                        TRACE_ALLOC("allfailed", args);
+                                        trace_xfs_alloc_vextent_allfailed(args);
                                         break;
                                 }
                                 if (flags == 0) {
@@ -2642,16 +2502,16 @@ xfs_alloc_mark_busy(xfs_trans_t *tp,
                 }
         }
 
+        trace_xfs_alloc_busy(mp, agno, bno, len, n);
+
         if (n < XFS_PAGB_NUM_SLOTS) {
                 bsy = &mp->m_perag[agno].pagb_list[n];
                 mp->m_perag[agno].pagb_count++;
-                TRACE_BUSY("xfs_alloc_mark_busy", "got", agno, bno, len, n, tp);
                 bsy->busy_start = bno;
                 bsy->busy_length = len;
                 bsy->busy_tp = tp;
                 xfs_trans_add_busy(tp, agno, n);
         } else {
-                TRACE_BUSY("xfs_alloc_mark_busy", "FULL", agno, bno, len, -1, tp);
                 /*
                  * The busy list is full!  Since it is now not possible to
                  * track the free block, make this a synchronous transaction
@@ -2678,12 +2538,12 @@ xfs_alloc_clear_busy(xfs_trans_t *tp,
         list = mp->m_perag[agno].pagb_list;
 
         ASSERT(idx < XFS_PAGB_NUM_SLOTS);
+
+        trace_xfs_alloc_unbusy(mp, agno, idx, list[idx].busy_tp == tp);
+
         if (list[idx].busy_tp == tp) {
-                TRACE_UNBUSY("xfs_alloc_clear_busy", "found", agno, idx, tp);
                 list[idx].busy_tp = NULL;
                 mp->m_perag[agno].pagb_count--;
-        } else {
-                TRACE_UNBUSY("xfs_alloc_clear_busy", "missing", agno, idx, tp);
         }
 
         spin_unlock(&mp->m_perag[agno].pagb_lock);
@@ -2724,24 +2584,22 @@ xfs_alloc_search_busy(xfs_trans_t *tp,
                         if ((bno > bend) || (uend < bsy->busy_start)) {
                                 cnt--;
                         } else {
-                                TRACE_BUSYSEARCH("xfs_alloc_search_busy",
-                                         "found1", agno, bno, len, tp);
                                 break;
                         }
                 }
         }
 
+        trace_xfs_alloc_busysearch(mp, agno, bno, len, !!cnt);
+
         /*
          * If a block was found, force the log through the LSN of the
          * transaction that freed the block
          */
         if (cnt) {
-                TRACE_BUSYSEARCH("xfs_alloc_search_busy", "found", agno, bno, len, tp);
                 lsn = bsy->busy_tp->t_commit_lsn;
                 spin_unlock(&mp->m_perag[agno].pagb_lock);
                 xfs_log_force(mp, lsn, XFS_LOG_FORCE|XFS_LOG_SYNC);
         } else {
-                TRACE_BUSYSEARCH("xfs_alloc_search_busy", "not-found", agno, bno, len, tp);
                 spin_unlock(&mp->m_perag[agno].pagb_lock);
         }
 }
diff --git a/fs/xfs/xfs_alloc.h b/fs/xfs/xfs_alloc.h
index e704caee10df..599bffa39784 100644
--- a/fs/xfs/xfs_alloc.h
+++ b/fs/xfs/xfs_alloc.h
@@ -37,6 +37,15 @@ typedef enum xfs_alloctype
         XFS_ALLOCTYPE_THIS_BNO          /* at exactly this block */
 } xfs_alloctype_t;
 
+#define XFS_ALLOC_TYPES \
+        { XFS_ALLOCTYPE_ANY_AG,         "ANY_AG" }, \
+        { XFS_ALLOCTYPE_FIRST_AG,       "FIRST_AG" }, \
+        { XFS_ALLOCTYPE_START_AG,       "START_AG" }, \
+        { XFS_ALLOCTYPE_THIS_AG,        "THIS_AG" }, \
+        { XFS_ALLOCTYPE_START_BNO,      "START_BNO" }, \
+        { XFS_ALLOCTYPE_NEAR_BNO,       "NEAR_BNO" }, \
+        { XFS_ALLOCTYPE_THIS_BNO,       "THIS_BNO" }
+
 /*
  * Flags for xfs_alloc_fix_freelist.
  */
@@ -109,24 +118,6 @@ xfs_alloc_longest_free_extent(struct xfs_mount *mp,
 
 #ifdef __KERNEL__
 
-#if defined(XFS_ALLOC_TRACE)
-/*
- * Allocation tracing buffer size.
- */
-#define XFS_ALLOC_TRACE_SIZE    4096
-extern ktrace_t *xfs_alloc_trace_buf;
-
-/*
- * Types for alloc tracing.
- */
-#define XFS_ALLOC_KTRACE_ALLOC  1
-#define XFS_ALLOC_KTRACE_FREE   2
-#define XFS_ALLOC_KTRACE_MODAGF 3
-#define XFS_ALLOC_KTRACE_BUSY   4
-#define XFS_ALLOC_KTRACE_UNBUSY 5
-#define XFS_ALLOC_KTRACE_BUSYSEARCH     6
-#endif
-
 void
 xfs_alloc_mark_busy(xfs_trans_t *tp,
                 xfs_agnumber_t agno,
diff --git a/fs/xfs/xfs_alloc_btree.c b/fs/xfs/xfs_alloc_btree.c
index c10c3a292d30..adbd9141aea1 100644
--- a/fs/xfs/xfs_alloc_btree.c
+++ b/fs/xfs/xfs_alloc_btree.c
@@ -39,6 +39,7 @@
 #include "xfs_ialloc.h"
 #include "xfs_alloc.h"
 #include "xfs_error.h"
+#include "xfs_trace.h"
 
 
 STATIC struct xfs_btree_cur *
diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index 8fe6f6b78a4a..e953b6cfb2a8 100644
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -47,6 +47,7 @@
 #include "xfs_trans_space.h"
 #include "xfs_rw.h"
 #include "xfs_vnodeops.h"
+#include "xfs_trace.h"
 
 /*
  * xfs_attr.c
@@ -89,10 +90,6 @@ STATIC int xfs_attr_rmtval_remove(xfs_da_args_t *args);
 
 #define ATTR_RMTVALUE_MAPSIZE   1       /* # of map entries at once */
 
-#if defined(XFS_ATTR_TRACE)
-ktrace_t *xfs_attr_trace_buf;
-#endif
-
 STATIC int
 xfs_attr_name_to_xname(
         struct xfs_name *xname,
@@ -640,7 +637,6 @@ xfs_attr_list_int(xfs_attr_list_context_t *context)
                 return EIO;
 
         xfs_ilock(dp, XFS_ILOCK_SHARED);
-        xfs_attr_trace_l_c("syscall start", context);
 
         /*
          * Decide on what work routines to call based on the inode size.
@@ -656,7 +652,6 @@ xfs_attr_list_int(xfs_attr_list_context_t *context)
         }
 
         xfs_iunlock(dp, XFS_ILOCK_SHARED);
-        xfs_attr_trace_l_c("syscall end", context);
 
         return error;
 }
@@ -702,7 +697,7 @@ xfs_attr_put_listent(xfs_attr_list_context_t *context, int flags,
                         context->count * sizeof(alist->al_offset[0]);
         context->firstu -= ATTR_ENTSIZE(namelen);
         if (context->firstu < arraytop) {
-                xfs_attr_trace_l_c("buffer full", context);
+                trace_xfs_attr_list_full(context);
                 alist->al_more = 1;
                 context->seen_enough = 1;
                 return 1;
@@ -714,7 +709,7 @@ xfs_attr_put_listent(xfs_attr_list_context_t *context, int flags,
         aep->a_name[namelen] = 0;
         alist->al_offset[context->count++] = context->firstu;
         alist->al_count = context->count;
-        xfs_attr_trace_l_c("add", context);
+        trace_xfs_attr_list_add(context);
         return 0;
 }
 
@@ -1853,7 +1848,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)
                         node = bp->data;
                         switch (be16_to_cpu(node->hdr.info.magic)) {
                         case XFS_DA_NODE_MAGIC:
-                                xfs_attr_trace_l_cn("wrong blk", context, node);
+                                trace_xfs_attr_list_wrong_blk(context);
                                 xfs_da_brelse(NULL, bp);
                                 bp = NULL;
                                 break;
@@ -1861,20 +1856,18 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)
                                 leaf = bp->data;
                                 if (cursor->hashval > be32_to_cpu(leaf->entries[
                                     be16_to_cpu(leaf->hdr.count)-1].hashval)) {
-                                        xfs_attr_trace_l_cl("wrong blk",
-                                                           context, leaf);
+                                        trace_xfs_attr_list_wrong_blk(context);
                                         xfs_da_brelse(NULL, bp);
                                         bp = NULL;
                                 } else if (cursor->hashval <=
                                              be32_to_cpu(leaf->entries[0].hashval)) {
-                                        xfs_attr_trace_l_cl("maybe wrong blk",
-                                                           context, leaf);
+                                        trace_xfs_attr_list_wrong_blk(context);
                                         xfs_da_brelse(NULL, bp);
                                         bp = NULL;
                                 }
                                 break;
                         default:
-                                xfs_attr_trace_l_c("wrong blk - ??", context);
+                                trace_xfs_attr_list_wrong_blk(context);
                                 xfs_da_brelse(NULL, bp);
                                 bp = NULL;
                         }
@@ -1919,8 +1912,8 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)
                                 if (cursor->hashval
                                                 <= be32_to_cpu(btree->hashval)) {
                                         cursor->blkno = be32_to_cpu(btree->before);
-                                        xfs_attr_trace_l_cb("descending",
-                                                            context, btree);
+                                        trace_xfs_attr_list_node_descend(context,
+                                                                         btree);
                                         break;
                                 }
                         }
@@ -2270,85 +2263,3 @@ xfs_attr_rmtval_remove(xfs_da_args_t *args)
         }
         return(0);
 }
-
-#if defined(XFS_ATTR_TRACE)
-/*
- * Add a trace buffer entry for an attr_list context structure.
- */
-void
-xfs_attr_trace_l_c(char *where, struct xfs_attr_list_context *context)
-{
-        xfs_attr_trace_enter(XFS_ATTR_KTRACE_L_C, where, context,
-                (__psunsigned_t)NULL,
-                (__psunsigned_t)NULL,
-                (__psunsigned_t)NULL);
-}
-
-/*
- * Add a trace buffer entry for a context structure and a Btree node.
- */
-void
-xfs_attr_trace_l_cn(char *where, struct xfs_attr_list_context *context,
-                         struct xfs_da_intnode *node)
-{
-        xfs_attr_trace_enter(XFS_ATTR_KTRACE_L_CN, where, context,
-                (__psunsigned_t)be16_to_cpu(node->hdr.count),
-                (__psunsigned_t)be32_to_cpu(node->btree[0].hashval),
-                (__psunsigned_t)be32_to_cpu(node->btree[
-                                    be16_to_cpu(node->hdr.count)-1].hashval));
-}
-
-/*
- * Add a trace buffer entry for a context structure and a Btree element.
- */
-void
-xfs_attr_trace_l_cb(char *where, struct xfs_attr_list_context *context,
-                          struct xfs_da_node_entry *btree)
-{
-        xfs_attr_trace_enter(XFS_ATTR_KTRACE_L_CB, where, context,
-                (__psunsigned_t)be32_to_cpu(btree->hashval),
-                (__psunsigned_t)be32_to_cpu(btree->before),
-                (__psunsigned_t)NULL);
-}
-
-/*
- * Add a trace buffer entry for a context structure and a leaf block.
- */
-void
-xfs_attr_trace_l_cl(char *where, struct xfs_attr_list_context *context,
-                              struct xfs_attr_leafblock *leaf)
-{
-        xfs_attr_trace_enter(XFS_ATTR_KTRACE_L_CL, where, context,
-                (__psunsigned_t)be16_to_cpu(leaf->hdr.count),
-                (__psunsigned_t)be32_to_cpu(leaf->entries[0].hashval),
-                (__psunsigned_t)be32_to_cpu(leaf->entries[
-                                be16_to_cpu(leaf->hdr.count)-1].hashval));
-}
-
-/*
- * Add a trace buffer entry for the arguments given to the routine,
- * generic form.
- */
-void
-xfs_attr_trace_enter(int type, char *where,
-                         struct xfs_attr_list_context *context,
-                         __psunsigned_t a13, __psunsigned_t a14,
-                         __psunsigned_t a15)
-{
-        ASSERT(xfs_attr_trace_buf);
-        ktrace_enter(xfs_attr_trace_buf, (void *)((__psunsigned_t)type),
-                (void *)((__psunsigned_t)where),
-                (void *)((__psunsigned_t)context->dp),
-                (void *)((__psunsigned_t)context->cursor->hashval),
-                (void *)((__psunsigned_t)context->cursor->blkno),
-                (void *)((__psunsigned_t)context->cursor->offset),
-                (void *)((__psunsigned_t)context->alist),
-                (void *)((__psunsigned_t)context->bufsize),
-                (void *)((__psunsigned_t)context->count),
-                (void *)((__psunsigned_t)context->firstu),
-                NULL,
-                (void *)((__psunsigned_t)context->dupcnt),
-                (void *)((__psunsigned_t)context->flags),
-                (void *)a13, (void *)a14, (void *)a15);
-}
-#endif  /* XFS_ATTR_TRACE */
diff --git a/fs/xfs/xfs_attr.h b/fs/xfs/xfs_attr.h
index 12f0be3a73d4..59b410ce69a1 100644
--- a/fs/xfs/xfs_attr.h
+++ b/fs/xfs/xfs_attr.h
@@ -48,6 +48,16 @@ struct xfs_attr_list_context;
 #define ATTR_KERNOTIME  0x1000  /* [kernel] don't update inode timestamps */
 #define ATTR_KERNOVAL   0x2000  /* [kernel] get attr size only, not value */
 
+#define XFS_ATTR_FLAGS \
+        { ATTR_DONTFOLLOW,      "DONTFOLLOW" }, \
+        { ATTR_ROOT,            "ROOT" }, \
+        { ATTR_TRUST,           "TRUST" }, \
+        { ATTR_SECURE,          "SECURE" }, \
+        { ATTR_CREATE,          "CREATE" }, \
+        { ATTR_REPLACE,         "REPLACE" }, \
+        { ATTR_KERNOTIME,       "KERNOTIME" }, \
+        { ATTR_KERNOVAL,        "KERNOVAL" }
+
 /*
  * The maximum size (into the kernel or returned from the kernel) of an
  * attribute value or the buffer used for an attr_list() call.  Larger
diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c
index 0b687351293f..baf41b5af756 100644
--- a/fs/xfs/xfs_attr_leaf.c
+++ b/fs/xfs/xfs_attr_leaf.c
@@ -42,6 +42,7 @@
 #include "xfs_attr.h"
 #include "xfs_attr_leaf.h"
 #include "xfs_error.h"
+#include "xfs_trace.h"
 
 /*
  * xfs_attr_leaf.c
@@ -594,7 +595,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
         cursor = context->cursor;
         ASSERT(cursor != NULL);
 
-        xfs_attr_trace_l_c("sf start", context);
+        trace_xfs_attr_list_sf(context);
 
         /*
          * If the buffer is large enough and the cursor is at the start,
@@ -627,7 +628,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
                                 return error;
                         sfe = XFS_ATTR_SF_NEXTENTRY(sfe);
                 }
-                xfs_attr_trace_l_c("sf big-gulp", context);
+                trace_xfs_attr_list_sf_all(context);
                 return(0);
         }
 
@@ -653,7 +654,6 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
                         XFS_CORRUPTION_ERROR("xfs_attr_shortform_list",
                                              XFS_ERRLEVEL_LOW,
                                              context->dp->i_mount, sfe);
-                        xfs_attr_trace_l_c("sf corrupted", context);
                         kmem_free(sbuf);
                         return XFS_ERROR(EFSCORRUPTED);
                 }
@@ -693,7 +693,6 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
         }
         if (i == nsbuf) {
                 kmem_free(sbuf);
-                xfs_attr_trace_l_c("blk end", context);
                 return(0);
         }
 
@@ -719,7 +718,6 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
         }
 
         kmem_free(sbuf);
-        xfs_attr_trace_l_c("sf E-O-F", context);
         return(0);
 }
 
@@ -2323,7 +2321,7 @@ xfs_attr_leaf_list_int(xfs_dabuf_t *bp, xfs_attr_list_context_t *context)
         cursor = context->cursor;
         cursor->initted = 1;
 
-        xfs_attr_trace_l_cl("blk start", context, leaf);
+        trace_xfs_attr_list_leaf(context);
 
         /*
          * Re-find our place in the leaf block if this is a new syscall.
@@ -2344,7 +2342,7 @@ xfs_attr_leaf_list_int(xfs_dabuf_t *bp, xfs_attr_list_context_t *context)
                         }
                 }
                 if (i == be16_to_cpu(leaf->hdr.count)) {
-                        xfs_attr_trace_l_c("not found", context);
+                        trace_xfs_attr_list_notfound(context);
                         return(0);
                 }
         } else {
@@ -2419,7 +2417,7 @@ xfs_attr_leaf_list_int(xfs_dabuf_t *bp, xfs_attr_list_context_t *context)
                         break;
                 cursor->offset++;
         }
-        xfs_attr_trace_l_cl("blk end", context, leaf);
+        trace_xfs_attr_list_leaf_end(context);
         return(retval);
 }
 
diff --git a/fs/xfs/xfs_attr_sf.h b/fs/xfs/xfs_attr_sf.h
index ea22839caed2..76ab7b0cbb3a 100644
--- a/fs/xfs/xfs_attr_sf.h
+++ b/fs/xfs/xfs_attr_sf.h
@@ -25,8 +25,6 @@
  * to fit into the literal area of the inode.
  */
 
-struct xfs_inode;
-
 /*
  * Entries are packed toward the top as tight as possible.
  */
@@ -69,42 +67,4 @@ typedef struct xfs_attr_sf_sort {
         (be16_to_cpu(((xfs_attr_shortform_t *)  \
                 ((dp)->i_afp->if_u1.if_data))->hdr.totsize))
 
-#if defined(XFS_ATTR_TRACE)
-/*
- * Kernel tracing support for attribute lists
- */
-struct xfs_attr_list_context;
-struct xfs_da_intnode;
-struct xfs_da_node_entry;
-struct xfs_attr_leafblock;
-
-#define XFS_ATTR_TRACE_SIZE     4096    /* size of global trace buffer */
-extern ktrace_t *xfs_attr_trace_buf;
-
-/*
- * Trace record types.
- */
-#define XFS_ATTR_KTRACE_L_C     1       /* context */
-#define XFS_ATTR_KTRACE_L_CN    2       /* context, node */
-#define XFS_ATTR_KTRACE_L_CB    3       /* context, btree */
-#define XFS_ATTR_KTRACE_L_CL    4       /* context, leaf */
-
-void xfs_attr_trace_l_c(char *where, struct xfs_attr_list_context *context);
-void xfs_attr_trace_l_cn(char *where, struct xfs_attr_list_context *context,
-                              struct xfs_da_intnode *node);
-void xfs_attr_trace_l_cb(char *where, struct xfs_attr_list_context *context,
-                              struct xfs_da_node_entry *btree);
-void xfs_attr_trace_l_cl(char *where, struct xfs_attr_list_context *context,
-                              struct xfs_attr_leafblock *leaf);
-void xfs_attr_trace_enter(int type, char *where,
-                             struct xfs_attr_list_context *context,
-                             __psunsigned_t a13, __psunsigned_t a14,
-                             __psunsigned_t a15);
-#else
-#define xfs_attr_trace_l_c(w,c)
-#define xfs_attr_trace_l_cn(w,c,n)
-#define xfs_attr_trace_l_cb(w,c,b)
-#define xfs_attr_trace_l_cl(w,c,l)
-#endif /* XFS_ATTR_TRACE */
-
 #endif  /* __XFS_ATTR_SF_H__ */
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
index 8971fb09d387..98251cdc52aa 100644
--- a/fs/xfs/xfs_bmap.c
+++ b/fs/xfs/xfs_bmap.c
@@ -54,6 +54,7 @@
 #include "xfs_buf_item.h"
 #include "xfs_filestream.h"
 #include "xfs_vnodeops.h"
+#include "xfs_trace.h"
 
 
 #ifdef DEBUG
@@ -272,71 +273,6 @@ xfs_bmap_isaeof(
         int             whichfork,      /* data or attribute fork */
         char            *aeof);         /* return value */
 
-#ifdef XFS_BMAP_TRACE
-/*
- * Add bmap trace entry prior to a call to xfs_iext_remove.
- */
-STATIC void
-xfs_bmap_trace_delete(
-        const char      *fname,         /* function name */
-        char            *desc,          /* operation description */
-        xfs_inode_t     *ip,            /* incore inode pointer */
-        xfs_extnum_t    idx,            /* index of entry(entries) deleted */
-        xfs_extnum_t    cnt,            /* count of entries deleted, 1 or 2 */
-        int             whichfork);     /* data or attr fork */
-
-/*
- * Add bmap trace entry prior to a call to xfs_iext_insert, or
- * reading in the extents list from the disk (in the btree).
- */
-STATIC void
-xfs_bmap_trace_insert(
-        const char      *fname,         /* function name */
-        char            *desc,          /* operation description */
-        xfs_inode_t     *ip,            /* incore inode pointer */
-        xfs_extnum_t    idx,            /* index of entry(entries) inserted */
-        xfs_extnum_t    cnt,            /* count of entries inserted, 1 or 2 */
-        xfs_bmbt_irec_t *r1,            /* inserted record 1 */
-        xfs_bmbt_irec_t *r2,            /* inserted record 2 or null */
-        int             whichfork);     /* data or attr fork */
-
-/*
- * Add bmap trace entry after updating an extent record in place.
- */
-STATIC void
-xfs_bmap_trace_post_update(
-        const char      *fname,         /* function name */
-        char            *desc,          /* operation description */
-        xfs_inode_t     *ip,            /* incore inode pointer */
-        xfs_extnum_t    idx,            /* index of entry updated */
-        int             whichfork);     /* data or attr fork */
-
-/*
- * Add bmap trace entry prior to updating an extent record in place.
- */
-STATIC void
-xfs_bmap_trace_pre_update(
-        const char      *fname,         /* function name */
-        char            *desc,          /* operation description */
-        xfs_inode_t     *ip,            /* incore inode pointer */
-        xfs_extnum_t    idx,            /* index of entry to be updated */
-        int             whichfork);     /* data or attr fork */
-
-#define XFS_BMAP_TRACE_DELETE(d,ip,i,c,w)       \
-        xfs_bmap_trace_delete(__func__,d,ip,i,c,w)
-#define XFS_BMAP_TRACE_INSERT(d,ip,i,c,r1,r2,w) \
-        xfs_bmap_trace_insert(__func__,d,ip,i,c,r1,r2,w)
-#define XFS_BMAP_TRACE_POST_UPDATE(d,ip,i,w)    \
-        xfs_bmap_trace_post_update(__func__,d,ip,i,w)
-#define XFS_BMAP_TRACE_PRE_UPDATE(d,ip,i,w)     \
-        xfs_bmap_trace_pre_update(__func__,d,ip,i,w)
-#else
-#define XFS_BMAP_TRACE_DELETE(d,ip,i,c,w)
-#define XFS_BMAP_TRACE_INSERT(d,ip,i,c,r1,r2,w)
-#define XFS_BMAP_TRACE_POST_UPDATE(d,ip,i,w)
-#define XFS_BMAP_TRACE_PRE_UPDATE(d,ip,i,w)
-#endif  /* XFS_BMAP_TRACE */
-
 /*
  * Compute the worst-case number of indirect blocks that will be used
  * for ip's delayed extent of length "len".
@@ -363,18 +299,6 @@ xfs_bmap_validate_ret(
 #define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
 #endif /* DEBUG */
 
-#if defined(XFS_RW_TRACE)
-STATIC void
-xfs_bunmap_trace(
-        xfs_inode_t             *ip,
-        xfs_fileoff_t           bno,
-        xfs_filblks_t           len,
-        int                     flags,
-        inst_t                  *ra);
-#else
-#define xfs_bunmap_trace(ip, bno, len, flags, ra)
-#endif  /* XFS_RW_TRACE */
-
 STATIC int
 xfs_bmap_count_tree(
         xfs_mount_t     *mp,
@@ -590,9 +514,9 @@ xfs_bmap_add_extent(
          * already extents in the list.
          */
         if (nextents == 0) {
-                XFS_BMAP_TRACE_INSERT("insert empty", ip, 0, 1, new, NULL,
-                        whichfork);
-                xfs_iext_insert(ifp, 0, 1, new);
+                xfs_iext_insert(ip, 0, 1, new,
+                                whichfork == XFS_ATTR_FORK ? BMAP_ATTRFORK : 0);
+
                 ASSERT(cur == NULL);
                 ifp->if_lastex = 0;
                 if (!isnullstartblock(new->br_startblock)) {
@@ -759,26 +683,10 @@ xfs_bmap_add_extent_delay_real(
         xfs_filblks_t           temp=0; /* value for dnew calculations */
         xfs_filblks_t           temp2=0;/* value for dnew calculations */
         int                     tmp_rval;       /* partial logging flags */
-        enum {                          /* bit number definitions for state */
-                LEFT_CONTIG,    RIGHT_CONTIG,
-                LEFT_FILLING,   RIGHT_FILLING,
-                LEFT_DELAY,     RIGHT_DELAY,
-                LEFT_VALID,     RIGHT_VALID
-        };
 
 #define LEFT            r[0]
 #define RIGHT           r[1]
 #define PREV            r[2]
-#define MASK(b)         (1 << (b))
-#define MASK2(a,b)      (MASK(a) | MASK(b))
-#define MASK3(a,b,c)    (MASK2(a,b) | MASK(c))
-#define MASK4(a,b,c,d)  (MASK3(a,b,c) | MASK(d))
-#define STATE_SET(b,v)  ((v) ? (state |= MASK(b)) : (state &= ~MASK(b)))
-#define STATE_TEST(b)   (state & MASK(b))
-#define STATE_SET_TEST(b,v)     ((v) ? ((state |= MASK(b)), 1) : \
-                                       ((state &= ~MASK(b)), 0))
-#define SWITCH_STATE            \
-        (state & MASK4(LEFT_FILLING, RIGHT_FILLING, LEFT_CONTIG, RIGHT_CONTIG))
 
         /*
          * Set up a bunch of variables to make the tests simpler.
@@ -790,69 +698,80 @@ xfs_bmap_add_extent_delay_real(
         new_endoff = new->br_startoff + new->br_blockcount;
         ASSERT(PREV.br_startoff <= new->br_startoff);
         ASSERT(PREV.br_startoff + PREV.br_blockcount >= new_endoff);
+
         /*
          * Set flags determining what part of the previous delayed allocation
          * extent is being replaced by a real allocation.
          */
-        STATE_SET(LEFT_FILLING, PREV.br_startoff == new->br_startoff);
-        STATE_SET(RIGHT_FILLING,
-                PREV.br_startoff + PREV.br_blockcount == new_endoff);
+        if (PREV.br_startoff == new->br_startoff)
+                state |= BMAP_LEFT_FILLING;
+        if (PREV.br_startoff + PREV.br_blockcount == new_endoff)
+                state |= BMAP_RIGHT_FILLING;
+
         /*
          * Check and set flags if this segment has a left neighbor.
          * Don't set contiguous if the combined extent would be too large.
          */
-        if (STATE_SET_TEST(LEFT_VALID, idx > 0)) {
+        if (idx > 0) {
+                state |= BMAP_LEFT_VALID;
                 xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx - 1), &LEFT);
-                STATE_SET(LEFT_DELAY, isnullstartblock(LEFT.br_startblock));
+
+                if (isnullstartblock(LEFT.br_startblock))
+                        state |= BMAP_LEFT_DELAY;
         }
-        STATE_SET(LEFT_CONTIG,
-                STATE_TEST(LEFT_VALID) && !STATE_TEST(LEFT_DELAY) &&
-                LEFT.br_startoff + LEFT.br_blockcount == new->br_startoff &&
-                LEFT.br_startblock + LEFT.br_blockcount == new->br_startblock &&
-                LEFT.br_state == new->br_state &&
-                LEFT.br_blockcount + new->br_blockcount <= MAXEXTLEN);
+
+        if ((state & BMAP_LEFT_VALID) && !(state & BMAP_LEFT_DELAY) &&
+            LEFT.br_startoff + LEFT.br_blockcount == new->br_startoff &&
+            LEFT.br_startblock + LEFT.br_blockcount == new->br_startblock &&
+            LEFT.br_state == new->br_state &&
+            LEFT.br_blockcount + new->br_blockcount <= MAXEXTLEN)
+                state |= BMAP_LEFT_CONTIG;
+
         /*
          * Check and set flags if this segment has a right neighbor.
          * Don't set contiguous if the combined extent would be too large.
          * Also check for all-three-contiguous being too large.
          */
-        if (STATE_SET_TEST(RIGHT_VALID,
-                        idx <
-                        ip->i_df.if_bytes / (uint)sizeof(xfs_bmbt_rec_t) - 1)) {
+        if (idx < ip->i_df.if_bytes / (uint)sizeof(xfs_bmbt_rec_t) - 1) {
+                state |= BMAP_RIGHT_VALID;
                 xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx + 1), &RIGHT);
-                STATE_SET(RIGHT_DELAY, isnullstartblock(RIGHT.br_startblock));
+
+                if (isnullstartblock(RIGHT.br_startblock))
+                        state |= BMAP_RIGHT_DELAY;
         }
-        STATE_SET(RIGHT_CONTIG,
-                STATE_TEST(RIGHT_VALID) && !STATE_TEST(RIGHT_DELAY) &&
-                new_endoff == RIGHT.br_startoff &&
-                new->br_startblock + new->br_blockcount ==
-                    RIGHT.br_startblock &&
-                new->br_state == RIGHT.br_state &&
-                new->br_blockcount + RIGHT.br_blockcount <= MAXEXTLEN &&
-                ((state & MASK3(LEFT_CONTIG, LEFT_FILLING, RIGHT_FILLING)) !=
-                  MASK3(LEFT_CONTIG, LEFT_FILLING, RIGHT_FILLING) ||
-                 LEFT.br_blockcount + new->br_blockcount + RIGHT.br_blockcount
-                     <= MAXEXTLEN));
+
+        if ((state & BMAP_RIGHT_VALID) && !(state & BMAP_RIGHT_DELAY) &&
+            new_endoff == RIGHT.br_startoff &&
+            new->br_startblock + new->br_blockcount == RIGHT.br_startblock &&
+            new->br_state == RIGHT.br_state &&
+            new->br_blockcount + RIGHT.br_blockcount <= MAXEXTLEN &&
+            ((state & (BMAP_LEFT_CONTIG | BMAP_LEFT_FILLING |
+                       BMAP_RIGHT_FILLING)) !=
+                      (BMAP_LEFT_CONTIG | BMAP_LEFT_FILLING |
+                       BMAP_RIGHT_FILLING) ||
+             LEFT.br_blockcount + new->br_blockcount + RIGHT.br_blockcount
+                        <= MAXEXTLEN))
+                state |= BMAP_RIGHT_CONTIG;
+
         error = 0;
         /*
          * Switch out based on the FILLING and CONTIG state bits.
          */
-        switch (SWITCH_STATE) {
-
-        case MASK4(LEFT_FILLING, RIGHT_FILLING, LEFT_CONTIG, RIGHT_CONTIG):
+        switch (state & (BMAP_LEFT_FILLING | BMAP_LEFT_CONTIG |
+                         BMAP_RIGHT_FILLING | BMAP_RIGHT_CONTIG)) {
+        case BMAP_LEFT_FILLING | BMAP_LEFT_CONTIG |
+             BMAP_RIGHT_FILLING | BMAP_RIGHT_CONTIG:
                 /*
                  * Filling in all of a previously delayed allocation extent.
                  * The left and right neighbors are both contiguous with new.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("LF|RF|LC|RC", ip, idx - 1,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx - 1, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
                         LEFT.br_blockcount + PREV.br_blockcount +
                         RIGHT.br_blockcount);
-                XFS_BMAP_TRACE_POST_UPDATE("LF|RF|LC|RC", ip, idx - 1,
-                        XFS_DATA_FORK);
-                XFS_BMAP_TRACE_DELETE("LF|RF|LC|RC", ip, idx, 2, XFS_DATA_FORK);
-                xfs_iext_remove(ifp, idx, 2);
+                trace_xfs_bmap_post_update(ip, idx - 1, state, _THIS_IP_);
+
+                xfs_iext_remove(ip, idx, 2, state);
                 ip->i_df.if_lastex = idx - 1;
                 ip->i_d.di_nextents--;
                 if (cur == NULL)
@@ -885,20 +804,18 @@ xfs_bmap_add_extent_delay_real(
                         RIGHT.br_blockcount;
                 break;
 
-        case MASK3(LEFT_FILLING, RIGHT_FILLING, LEFT_CONTIG):
+        case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING | BMAP_LEFT_CONTIG:
                 /*
                  * Filling in all of a previously delayed allocation extent.
                  * The left neighbor is contiguous, the right is not.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("LF|RF|LC", ip, idx - 1,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx - 1, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
                         LEFT.br_blockcount + PREV.br_blockcount);
-                XFS_BMAP_TRACE_POST_UPDATE("LF|RF|LC", ip, idx - 1,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx - 1, state, _THIS_IP_);
+
                 ip->i_df.if_lastex = idx - 1;
-                XFS_BMAP_TRACE_DELETE("LF|RF|LC", ip, idx, 1, XFS_DATA_FORK);
-                xfs_iext_remove(ifp, idx, 1);
+                xfs_iext_remove(ip, idx, 1, state);
                 if (cur == NULL)
                         rval = XFS_ILOG_DEXT;
                 else {
@@ -921,19 +838,19 @@ xfs_bmap_add_extent_delay_real(
                         PREV.br_blockcount;
                 break;
 
-        case MASK3(LEFT_FILLING, RIGHT_FILLING, RIGHT_CONTIG):
+        case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING | BMAP_RIGHT_CONTIG:
                 /*
                  * Filling in all of a previously delayed allocation extent.
                  * The right neighbor is contiguous, the left is not.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("LF|RF|RC", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_startblock(ep, new->br_startblock);
                 xfs_bmbt_set_blockcount(ep,
                         PREV.br_blockcount + RIGHT.br_blockcount);
-                XFS_BMAP_TRACE_POST_UPDATE("LF|RF|RC", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
+
                 ip->i_df.if_lastex = idx;
-                XFS_BMAP_TRACE_DELETE("LF|RF|RC", ip, idx + 1, 1, XFS_DATA_FORK);
-                xfs_iext_remove(ifp, idx + 1, 1);
+                xfs_iext_remove(ip, idx + 1, 1, state);
                 if (cur == NULL)
                         rval = XFS_ILOG_DEXT;
                 else {
@@ -956,15 +873,16 @@ xfs_bmap_add_extent_delay_real(
                         RIGHT.br_blockcount;
                 break;
 
-        case MASK2(LEFT_FILLING, RIGHT_FILLING):
+        case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING:
                 /*
                  * Filling in all of a previously delayed allocation extent.
                  * Neither the left nor right neighbors are contiguous with
                  * the new one.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("LF|RF", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_startblock(ep, new->br_startblock);
-                XFS_BMAP_TRACE_POST_UPDATE("LF|RF", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
+
                 ip->i_df.if_lastex = idx;
                 ip->i_d.di_nextents++;
                 if (cur == NULL)
@@ -987,19 +905,20 @@ xfs_bmap_add_extent_delay_real(
                 temp2 = new->br_blockcount;
                 break;
 
-        case MASK2(LEFT_FILLING, LEFT_CONTIG):
+        case BMAP_LEFT_FILLING | BMAP_LEFT_CONTIG:
                 /*
                  * Filling in the first part of a previous delayed allocation.
                  * The left neighbor is contiguous.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("LF|LC", ip, idx - 1, XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx - 1, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
                         LEFT.br_blockcount + new->br_blockcount);
                 xfs_bmbt_set_startoff(ep,
                         PREV.br_startoff + new->br_blockcount);
-                XFS_BMAP_TRACE_POST_UPDATE("LF|LC", ip, idx - 1, XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx - 1, state, _THIS_IP_);
+
                 temp = PREV.br_blockcount - new->br_blockcount;
-                XFS_BMAP_TRACE_PRE_UPDATE("LF|LC", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(ep, temp);
                 ip->i_df.if_lastex = idx - 1;
                 if (cur == NULL)
@@ -1021,7 +940,7 @@ xfs_bmap_add_extent_delay_real(
                 temp = XFS_FILBLKS_MIN(xfs_bmap_worst_indlen(ip, temp),
                         startblockval(PREV.br_startblock));
                 xfs_bmbt_set_startblock(ep, nullstartblock((int)temp));
-                XFS_BMAP_TRACE_POST_UPDATE("LF|LC", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
                 *dnew = temp;
                 /* DELTA: The boundary between two in-core extents moved. */
                 temp = LEFT.br_startoff;
@@ -1029,18 +948,16 @@ xfs_bmap_add_extent_delay_real(
                         PREV.br_blockcount;
                 break;
 
-        case MASK(LEFT_FILLING):
+        case BMAP_LEFT_FILLING:
                 /*
                  * Filling in the first part of a previous delayed allocation.
                  * The left neighbor is not contiguous.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("LF", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_startoff(ep, new_endoff);
                 temp = PREV.br_blockcount - new->br_blockcount;
                 xfs_bmbt_set_blockcount(ep, temp);
-                XFS_BMAP_TRACE_INSERT("LF", ip, idx, 1, new, NULL,
-                        XFS_DATA_FORK);
-                xfs_iext_insert(ifp, idx, 1, new);
+                xfs_iext_insert(ip, idx, 1, new, state);
                 ip->i_df.if_lastex = idx;
                 ip->i_d.di_nextents++;
                 if (cur == NULL)
@@ -1071,27 +988,27 @@ xfs_bmap_add_extent_delay_real(
                         (cur ? cur->bc_private.b.allocated : 0));
                 ep = xfs_iext_get_ext(ifp, idx + 1);
                 xfs_bmbt_set_startblock(ep, nullstartblock((int)temp));
-                XFS_BMAP_TRACE_POST_UPDATE("LF", ip, idx + 1, XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx + 1, state, _THIS_IP_);
                 *dnew = temp;
                 /* DELTA: One in-core extent is split in two. */
                 temp = PREV.br_startoff;
                 temp2 = PREV.br_blockcount;
                 break;
 
-        case MASK2(RIGHT_FILLING, RIGHT_CONTIG):
+        case BMAP_RIGHT_FILLING | BMAP_RIGHT_CONTIG:
                 /*
                  * Filling in the last part of a previous delayed allocation.
                  * The right neighbor is contiguous with the new allocation.
                  */
                 temp = PREV.br_blockcount - new->br_blockcount;
-                XFS_BMAP_TRACE_PRE_UPDATE("RF|RC", ip, idx, XFS_DATA_FORK);
-                XFS_BMAP_TRACE_PRE_UPDATE("RF|RC", ip, idx + 1, XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
+                trace_xfs_bmap_pre_update(ip, idx + 1, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(ep, temp);
                 xfs_bmbt_set_allf(xfs_iext_get_ext(ifp, idx + 1),
                         new->br_startoff, new->br_startblock,
                         new->br_blockcount + RIGHT.br_blockcount,
                         RIGHT.br_state);
-                XFS_BMAP_TRACE_POST_UPDATE("RF|RC", ip, idx + 1, XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx + 1, state, _THIS_IP_);
                 ip->i_df.if_lastex = idx + 1;
                 if (cur == NULL)
                         rval = XFS_ILOG_DEXT;
@@ -1112,7 +1029,7 @@ xfs_bmap_add_extent_delay_real(
                 temp = XFS_FILBLKS_MIN(xfs_bmap_worst_indlen(ip, temp),
                         startblockval(PREV.br_startblock));
                 xfs_bmbt_set_startblock(ep, nullstartblock((int)temp));
-                XFS_BMAP_TRACE_POST_UPDATE("RF|RC", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
                 *dnew = temp;
                 /* DELTA: The boundary between two in-core extents moved. */
                 temp = PREV.br_startoff;
@@ -1120,17 +1037,15 @@ xfs_bmap_add_extent_delay_real(
                         RIGHT.br_blockcount;
                 break;
 
-        case MASK(RIGHT_FILLING):
+        case BMAP_RIGHT_FILLING:
                 /*
                  * Filling in the last part of a previous delayed allocation.
                  * The right neighbor is not contiguous.
                  */
                 temp = PREV.br_blockcount - new->br_blockcount;
-                XFS_BMAP_TRACE_PRE_UPDATE("RF", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(ep, temp);
-                XFS_BMAP_TRACE_INSERT("RF", ip, idx + 1, 1, new, NULL,
-                        XFS_DATA_FORK);
-                xfs_iext_insert(ifp, idx + 1, 1, new);
+                xfs_iext_insert(ip, idx + 1, 1, new, state);
                 ip->i_df.if_lastex = idx + 1;
                 ip->i_d.di_nextents++;
                 if (cur == NULL)
@@ -1161,7 +1076,7 @@ xfs_bmap_add_extent_delay_real(
                         (cur ? cur->bc_private.b.allocated : 0));
                 ep = xfs_iext_get_ext(ifp, idx);
                 xfs_bmbt_set_startblock(ep, nullstartblock((int)temp));
-                XFS_BMAP_TRACE_POST_UPDATE("RF", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
                 *dnew = temp;
                 /* DELTA: One in-core extent is split in two. */
                 temp = PREV.br_startoff;
@@ -1175,7 +1090,7 @@ xfs_bmap_add_extent_delay_real(
                  * This case is avoided almost all the time.
                  */
                 temp = new->br_startoff - PREV.br_startoff;
-                XFS_BMAP_TRACE_PRE_UPDATE("0", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx, 0, _THIS_IP_);
                 xfs_bmbt_set_blockcount(ep, temp);
                 r[0] = *new;
                 r[1].br_state = PREV.br_state;
@@ -1183,9 +1098,7 @@ xfs_bmap_add_extent_delay_real(
                 r[1].br_startoff = new_endoff;
                 temp2 = PREV.br_startoff + PREV.br_blockcount - new_endoff;
                 r[1].br_blockcount = temp2;
-                XFS_BMAP_TRACE_INSERT("0", ip, idx + 1, 2, &r[0], &r[1],
-                        XFS_DATA_FORK);
-                xfs_iext_insert(ifp, idx + 1, 2, &r[0]);
+                xfs_iext_insert(ip, idx + 1, 2, &r[0], state);
                 ip->i_df.if_lastex = idx + 1;
                 ip->i_d.di_nextents++;
                 if (cur == NULL)
@@ -1242,24 +1155,24 @@ xfs_bmap_add_extent_delay_real(
                 }
                 ep = xfs_iext_get_ext(ifp, idx);
                 xfs_bmbt_set_startblock(ep, nullstartblock((int)temp));
-                XFS_BMAP_TRACE_POST_UPDATE("0", ip, idx, XFS_DATA_FORK);
-                XFS_BMAP_TRACE_PRE_UPDATE("0", ip, idx + 2, XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
+                trace_xfs_bmap_pre_update(ip, idx + 2, state, _THIS_IP_);
                 xfs_bmbt_set_startblock(xfs_iext_get_ext(ifp, idx + 2),
                         nullstartblock((int)temp2));
-                XFS_BMAP_TRACE_POST_UPDATE("0", ip, idx + 2, XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx + 2, state, _THIS_IP_);
                 *dnew = temp + temp2;
                 /* DELTA: One in-core extent is split in three. */
                 temp = PREV.br_startoff;
                 temp2 = PREV.br_blockcount;
                 break;
 
-        case MASK3(LEFT_FILLING, LEFT_CONTIG, RIGHT_CONTIG):
-        case MASK3(RIGHT_FILLING, LEFT_CONTIG, RIGHT_CONTIG):
-        case MASK2(LEFT_FILLING, RIGHT_CONTIG):
-        case MASK2(RIGHT_FILLING, LEFT_CONTIG):
-        case MASK2(LEFT_CONTIG, RIGHT_CONTIG):
-        case MASK(LEFT_CONTIG):
-        case MASK(RIGHT_CONTIG):
+        case BMAP_LEFT_FILLING | BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG:
+        case BMAP_RIGHT_FILLING | BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG:
+        case BMAP_LEFT_FILLING | BMAP_RIGHT_CONTIG:
+        case BMAP_RIGHT_FILLING | BMAP_LEFT_CONTIG:
+        case BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG:
+        case BMAP_LEFT_CONTIG:
+        case BMAP_RIGHT_CONTIG:
                 /*
                  * These cases are all impossible.
                  */
@@ -1279,14 +1192,6 @@ done:
 #undef  LEFT
 #undef  RIGHT
 #undef  PREV
-#undef  MASK
-#undef  MASK2
-#undef  MASK3
-#undef  MASK4
-#undef  STATE_SET
-#undef  STATE_TEST
-#undef  STATE_SET_TEST
-#undef  SWITCH_STATE
 }
 
 /*
@@ -1316,27 +1221,10 @@ xfs_bmap_add_extent_unwritten_real(
         int                     state = 0;/* state bits, accessed thru macros */
         xfs_filblks_t           temp=0;
         xfs_filblks_t           temp2=0;
-        enum {                          /* bit number definitions for state */
-                LEFT_CONTIG,    RIGHT_CONTIG,
-                LEFT_FILLING,   RIGHT_FILLING,
-                LEFT_DELAY,     RIGHT_DELAY,
-                LEFT_VALID,     RIGHT_VALID
-        };
 
 #define LEFT            r[0]
 #define RIGHT           r[1]
 #define PREV            r[2]
-#define MASK(b)         (1 << (b))
-#define MASK2(a,b)      (MASK(a) | MASK(b))
-#define MASK3(a,b,c)    (MASK2(a,b) | MASK(c))
-#define MASK4(a,b,c,d)  (MASK3(a,b,c) | MASK(d))
-#define STATE_SET(b,v)  ((v) ? (state |= MASK(b)) : (state &= ~MASK(b)))
-#define STATE_TEST(b)   (state & MASK(b))
-#define STATE_SET_TEST(b,v)     ((v) ? ((state |= MASK(b)), 1) : \
-                                       ((state &= ~MASK(b)), 0))
-#define SWITCH_STATE            \
-        (state & MASK4(LEFT_FILLING, RIGHT_FILLING, LEFT_CONTIG, RIGHT_CONTIG))
-
         /*
          * Set up a bunch of variables to make the tests simpler.
          */
@@ -1352,68 +1240,78 @@ xfs_bmap_add_extent_unwritten_real(
         new_endoff = new->br_startoff + new->br_blockcount;
         ASSERT(PREV.br_startoff <= new->br_startoff);
         ASSERT(PREV.br_startoff + PREV.br_blockcount >= new_endoff);
+
         /*
          * Set flags determining what part of the previous oldext allocation
          * extent is being replaced by a newext allocation.
          */
-        STATE_SET(LEFT_FILLING, PREV.br_startoff == new->br_startoff);
-        STATE_SET(RIGHT_FILLING,
-                PREV.br_startoff + PREV.br_blockcount == new_endoff);
+        if (PREV.br_startoff == new->br_startoff)
+                state |= BMAP_LEFT_FILLING;
+        if (PREV.br_startoff + PREV.br_blockcount == new_endoff)
+                state |= BMAP_RIGHT_FILLING;
+
         /*
          * Check and set flags if this segment has a left neighbor.
          * Don't set contiguous if the combined extent would be too large.
          */
-        if (STATE_SET_TEST(LEFT_VALID, idx > 0)) {
+        if (idx > 0) {
+                state |= BMAP_LEFT_VALID;
                 xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx - 1), &LEFT);
-                STATE_SET(LEFT_DELAY, isnullstartblock(LEFT.br_startblock));
+
+                if (isnullstartblock(LEFT.br_startblock))
+                        state |= BMAP_LEFT_DELAY;
         }
-        STATE_SET(LEFT_CONTIG,
-                STATE_TEST(LEFT_VALID) && !STATE_TEST(LEFT_DELAY) &&
-                LEFT.br_startoff + LEFT.br_blockcount == new->br_startoff &&
-                LEFT.br_startblock + LEFT.br_blockcount == new->br_startblock &&
-                LEFT.br_state == newext &&
-                LEFT.br_blockcount + new->br_blockcount <= MAXEXTLEN);
+
+        if ((state & BMAP_LEFT_VALID) && !(state & BMAP_LEFT_DELAY) &&
+            LEFT.br_startoff + LEFT.br_blockcount == new->br_startoff &&
+            LEFT.br_startblock + LEFT.br_blockcount == new->br_startblock &&
+            LEFT.br_state == newext &&
+            LEFT.br_blockcount + new->br_blockcount <= MAXEXTLEN)
+                state |= BMAP_LEFT_CONTIG;
+
         /*
          * Check and set flags if this segment has a right neighbor.
          * Don't set contiguous if the combined extent would be too large.
          * Also check for all-three-contiguous being too large.
          */
-        if (STATE_SET_TEST(RIGHT_VALID,
-                        idx <
-                        ip->i_df.if_bytes / (uint)sizeof(xfs_bmbt_rec_t) - 1)) {
+        if (idx < ip->i_df.if_bytes / (uint)sizeof(xfs_bmbt_rec_t) - 1) {
+                state |= BMAP_RIGHT_VALID;
                 xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx + 1), &RIGHT);
-                STATE_SET(RIGHT_DELAY, isnullstartblock(RIGHT.br_startblock));
+                if (isnullstartblock(RIGHT.br_startblock))
+                        state |= BMAP_RIGHT_DELAY;
         }
-        STATE_SET(RIGHT_CONTIG,
-                STATE_TEST(RIGHT_VALID) && !STATE_TEST(RIGHT_DELAY) &&
-                new_endoff == RIGHT.br_startoff &&
-                new->br_startblock + new->br_blockcount ==
-                    RIGHT.br_startblock &&
-                newext == RIGHT.br_state &&
-                new->br_blockcount + RIGHT.br_blockcount <= MAXEXTLEN &&
-                ((state & MASK3(LEFT_CONTIG, LEFT_FILLING, RIGHT_FILLING)) !=
-                  MASK3(LEFT_CONTIG, LEFT_FILLING, RIGHT_FILLING) ||
-                 LEFT.br_blockcount + new->br_blockcount + RIGHT.br_blockcount
-                     <= MAXEXTLEN));
+
+        if ((state & BMAP_RIGHT_VALID) && !(state & BMAP_RIGHT_DELAY) &&
+            new_endoff == RIGHT.br_startoff &&
+            new->br_startblock + new->br_blockcount == RIGHT.br_startblock &&
+            newext == RIGHT.br_state &&
+            new->br_blockcount + RIGHT.br_blockcount <= MAXEXTLEN &&
+            ((state & (BMAP_LEFT_CONTIG | BMAP_LEFT_FILLING |
+                       BMAP_RIGHT_FILLING)) !=
+                      (BMAP_LEFT_CONTIG | BMAP_LEFT_FILLING |
+                       BMAP_RIGHT_FILLING) ||
+             LEFT.br_blockcount + new->br_blockcount + RIGHT.br_blockcount
+                        <= MAXEXTLEN))
+                state |= BMAP_RIGHT_CONTIG;
+
         /*
          * Switch out based on the FILLING and CONTIG state bits.
          */
-        switch (SWITCH_STATE) {
-
-        case MASK4(LEFT_FILLING, RIGHT_FILLING, LEFT_CONTIG, RIGHT_CONTIG):
+        switch (state & (BMAP_LEFT_FILLING | BMAP_LEFT_CONTIG |
+                         BMAP_RIGHT_FILLING | BMAP_RIGHT_CONTIG)) {
+        case BMAP_LEFT_FILLING | BMAP_LEFT_CONTIG |
+             BMAP_RIGHT_FILLING | BMAP_RIGHT_CONTIG:
                 /*
                  * Setting all of a previous oldext extent to newext.
                  * The left and right neighbors are both contiguous with new.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("LF|RF|LC|RC", ip, idx - 1,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx - 1, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
                         LEFT.br_blockcount + PREV.br_blockcount +
                         RIGHT.br_blockcount);
-                XFS_BMAP_TRACE_POST_UPDATE("LF|RF|LC|RC", ip, idx - 1,
-                        XFS_DATA_FORK);
-                XFS_BMAP_TRACE_DELETE("LF|RF|LC|RC", ip, idx, 2, XFS_DATA_FORK);
-                xfs_iext_remove(ifp, idx, 2);
+                trace_xfs_bmap_post_update(ip, idx - 1, state, _THIS_IP_);
+
+                xfs_iext_remove(ip, idx, 2, state);
                 ip->i_df.if_lastex = idx - 1;
                 ip->i_d.di_nextents -= 2;
                 if (cur == NULL)
@@ -1450,20 +1348,18 @@ xfs_bmap_add_extent_unwritten_real(
                         RIGHT.br_blockcount;
                 break;
 
-        case MASK3(LEFT_FILLING, RIGHT_FILLING, LEFT_CONTIG):
+        case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING | BMAP_LEFT_CONTIG:
                 /*
                  * Setting all of a previous oldext extent to newext.
                  * The left neighbor is contiguous, the right is not.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("LF|RF|LC", ip, idx - 1,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx - 1, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
                         LEFT.br_blockcount + PREV.br_blockcount);
-                XFS_BMAP_TRACE_POST_UPDATE("LF|RF|LC", ip, idx - 1,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx - 1, state, _THIS_IP_);
+
                 ip->i_df.if_lastex = idx - 1;
-                XFS_BMAP_TRACE_DELETE("LF|RF|LC", ip, idx, 1, XFS_DATA_FORK);
-                xfs_iext_remove(ifp, idx, 1);
+                xfs_iext_remove(ip, idx, 1, state);
                 ip->i_d.di_nextents--;
                 if (cur == NULL)
                         rval = XFS_ILOG_CORE | XFS_ILOG_DEXT;
@@ -1492,21 +1388,18 @@ xfs_bmap_add_extent_unwritten_real(
                         PREV.br_blockcount;
                 break;
 
-        case MASK3(LEFT_FILLING, RIGHT_FILLING, RIGHT_CONTIG):
+        case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING | BMAP_RIGHT_CONTIG:
                 /*
                  * Setting all of a previous oldext extent to newext.
                  * The right neighbor is contiguous, the left is not.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("LF|RF|RC", ip, idx,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(ep,
                         PREV.br_blockcount + RIGHT.br_blockcount);
                 xfs_bmbt_set_state(ep, newext);
-                XFS_BMAP_TRACE_POST_UPDATE("LF|RF|RC", ip, idx,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
                 ip->i_df.if_lastex = idx;
-                XFS_BMAP_TRACE_DELETE("LF|RF|RC", ip, idx + 1, 1, XFS_DATA_FORK);
-                xfs_iext_remove(ifp, idx + 1, 1);
+                xfs_iext_remove(ip, idx + 1, 1, state);
                 ip->i_d.di_nextents--;
                 if (cur == NULL)
                         rval = XFS_ILOG_CORE | XFS_ILOG_DEXT;
@@ -1535,17 +1428,16 @@ xfs_bmap_add_extent_unwritten_real(
                         RIGHT.br_blockcount;
                 break;
 
-        case MASK2(LEFT_FILLING, RIGHT_FILLING):
+        case BMAP_LEFT_FILLING | BMAP_RIGHT_FILLING:
                 /*
                  * Setting all of a previous oldext extent to newext.
                  * Neither the left nor right neighbors are contiguous with
                  * the new one.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("LF|RF", ip, idx,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_state(ep, newext);
-                XFS_BMAP_TRACE_POST_UPDATE("LF|RF", ip, idx,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
+
                 ip->i_df.if_lastex = idx;
                 if (cur == NULL)
                         rval = XFS_ILOG_DEXT;
@@ -1566,27 +1458,25 @@ xfs_bmap_add_extent_unwritten_real(
                 temp2 = new->br_blockcount;
                 break;
 
-        case MASK2(LEFT_FILLING, LEFT_CONTIG):
+        case BMAP_LEFT_FILLING | BMAP_LEFT_CONTIG:
                 /*
                  * Setting the first part of a previous oldext extent to newext.
                  * The left neighbor is contiguous.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("LF|LC", ip, idx - 1,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx - 1, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
                         LEFT.br_blockcount + new->br_blockcount);
                 xfs_bmbt_set_startoff(ep,
                         PREV.br_startoff + new->br_blockcount);
-                XFS_BMAP_TRACE_POST_UPDATE("LF|LC", ip, idx - 1,
-                        XFS_DATA_FORK);
-                XFS_BMAP_TRACE_PRE_UPDATE("LF|LC", ip, idx,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx - 1, state, _THIS_IP_);
+
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_startblock(ep,
                         new->br_startblock + new->br_blockcount);
                 xfs_bmbt_set_blockcount(ep,
                         PREV.br_blockcount - new->br_blockcount);
-                XFS_BMAP_TRACE_POST_UPDATE("LF|LC", ip, idx,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
+
                 ip->i_df.if_lastex = idx - 1;
                 if (cur == NULL)
                         rval = XFS_ILOG_DEXT;
@@ -1617,22 +1507,21 @@ xfs_bmap_add_extent_unwritten_real(
                         PREV.br_blockcount;
                 break;
 
-        case MASK(LEFT_FILLING):
+        case BMAP_LEFT_FILLING:
                 /*
                  * Setting the first part of a previous oldext extent to newext.
                  * The left neighbor is not contiguous.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("LF", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 ASSERT(ep && xfs_bmbt_get_state(ep) == oldext);
                 xfs_bmbt_set_startoff(ep, new_endoff);
                 xfs_bmbt_set_blockcount(ep,
                         PREV.br_blockcount - new->br_blockcount);
                 xfs_bmbt_set_startblock(ep,
                         new->br_startblock + new->br_blockcount);
-                XFS_BMAP_TRACE_POST_UPDATE("LF", ip, idx, XFS_DATA_FORK);
-                XFS_BMAP_TRACE_INSERT("LF", ip, idx, 1, new, NULL,
-                        XFS_DATA_FORK);
-                xfs_iext_insert(ifp, idx, 1, new);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
+
+                xfs_iext_insert(ip, idx, 1, new, state);
                 ip->i_df.if_lastex = idx;
                 ip->i_d.di_nextents++;
                 if (cur == NULL)
@@ -1660,24 +1549,21 @@ xfs_bmap_add_extent_unwritten_real(
                 temp2 = PREV.br_blockcount;
                 break;
 
-        case MASK2(RIGHT_FILLING, RIGHT_CONTIG):
+        case BMAP_RIGHT_FILLING | BMAP_RIGHT_CONTIG:
                 /*
                  * Setting the last part of a previous oldext extent to newext.
                  * The right neighbor is contiguous with the new allocation.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("RF|RC", ip, idx,
-                        XFS_DATA_FORK);
-                XFS_BMAP_TRACE_PRE_UPDATE("RF|RC", ip, idx + 1,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
+                trace_xfs_bmap_pre_update(ip, idx + 1, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(ep,
                         PREV.br_blockcount - new->br_blockcount);
-                XFS_BMAP_TRACE_POST_UPDATE("RF|RC", ip, idx,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_allf(xfs_iext_get_ext(ifp, idx + 1),
                         new->br_startoff, new->br_startblock,
                         new->br_blockcount + RIGHT.br_blockcount, newext);
-                XFS_BMAP_TRACE_POST_UPDATE("RF|RC", ip, idx + 1,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx + 1, state, _THIS_IP_);
+
                 ip->i_df.if_lastex = idx + 1;
                 if (cur == NULL)
                         rval = XFS_ILOG_DEXT;
@@ -1707,18 +1593,17 @@ xfs_bmap_add_extent_unwritten_real(
                         RIGHT.br_blockcount;
                 break;
 
-        case MASK(RIGHT_FILLING):
+        case BMAP_RIGHT_FILLING:
                 /*
                  * Setting the last part of a previous oldext extent to newext.
                  * The right neighbor is not contiguous.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("RF", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(ep,
                         PREV.br_blockcount - new->br_blockcount);
-                XFS_BMAP_TRACE_POST_UPDATE("RF", ip, idx, XFS_DATA_FORK);
-                XFS_BMAP_TRACE_INSERT("RF", ip, idx + 1, 1, new, NULL,
-                        XFS_DATA_FORK);
-                xfs_iext_insert(ifp, idx + 1, 1, new);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
+
+                xfs_iext_insert(ip, idx + 1, 1, new, state);
                 ip->i_df.if_lastex = idx + 1;
                 ip->i_d.di_nextents++;
                 if (cur == NULL)
@@ -1756,19 +1641,18 @@ xfs_bmap_add_extent_unwritten_real(
                  * newext.  Contiguity is impossible here.
                  * One extent becomes three extents.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("0", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(ep,
                         new->br_startoff - PREV.br_startoff);
-                XFS_BMAP_TRACE_POST_UPDATE("0", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
+
                 r[0] = *new;
                 r[1].br_startoff = new_endoff;
                 r[1].br_blockcount =
                         PREV.br_startoff + PREV.br_blockcount - new_endoff;
                 r[1].br_startblock = new->br_startblock + new->br_blockcount;
                 r[1].br_state = oldext;
-                XFS_BMAP_TRACE_INSERT("0", ip, idx + 1, 2, &r[0], &r[1],
-                        XFS_DATA_FORK);
-                xfs_iext_insert(ifp, idx + 1, 2, &r[0]);
+                xfs_iext_insert(ip, idx + 1, 2, &r[0], state);
                 ip->i_df.if_lastex = idx + 1;
                 ip->i_d.di_nextents += 2;
                 if (cur == NULL)
@@ -1813,13 +1697,13 @@ xfs_bmap_add_extent_unwritten_real(
                 temp2 = PREV.br_blockcount;
                 break;
 
-        case MASK3(LEFT_FILLING, LEFT_CONTIG, RIGHT_CONTIG):
-        case MASK3(RIGHT_FILLING, LEFT_CONTIG, RIGHT_CONTIG):
-        case MASK2(LEFT_FILLING, RIGHT_CONTIG):
-        case MASK2(RIGHT_FILLING, LEFT_CONTIG):
-        case MASK2(LEFT_CONTIG, RIGHT_CONTIG):
-        case MASK(LEFT_CONTIG):
-        case MASK(RIGHT_CONTIG):
+        case BMAP_LEFT_FILLING | BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG:
+        case BMAP_RIGHT_FILLING | BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG:
+        case BMAP_LEFT_FILLING | BMAP_RIGHT_CONTIG:
+        case BMAP_RIGHT_FILLING | BMAP_LEFT_CONTIG:
+        case BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG:
+        case BMAP_LEFT_CONTIG:
+        case BMAP_RIGHT_CONTIG:
                 /*
                  * These cases are all impossible.
                  */
@@ -1839,14 +1723,6 @@ done:
 #undef  LEFT
 #undef  RIGHT
 #undef  PREV
-#undef  MASK
-#undef  MASK2
-#undef  MASK3
-#undef  MASK4
-#undef  STATE_SET
-#undef  STATE_TEST
-#undef  STATE_SET_TEST
-#undef  SWITCH_STATE
 }
 
 /*
@@ -1872,62 +1748,57 @@ xfs_bmap_add_extent_hole_delay(
         int                     state;  /* state bits, accessed thru macros */
         xfs_filblks_t           temp=0; /* temp for indirect calculations */
         xfs_filblks_t           temp2=0;
-        enum {                          /* bit number definitions for state */
-                LEFT_CONTIG,    RIGHT_CONTIG,
-                LEFT_DELAY,     RIGHT_DELAY,
-                LEFT_VALID,     RIGHT_VALID
-        };
-
-#define MASK(b)                 (1 << (b))
-#define MASK2(a,b)              (MASK(a) | MASK(b))
-#define STATE_SET(b,v)          ((v) ? (state |= MASK(b)) : (state &= ~MASK(b)))
-#define STATE_TEST(b)           (state & MASK(b))
-#define STATE_SET_TEST(b,v)     ((v) ? ((state |= MASK(b)), 1) : \
-                                       ((state &= ~MASK(b)), 0))
-#define SWITCH_STATE            (state & MASK2(LEFT_CONTIG, RIGHT_CONTIG))
 
         ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK);
         ep = xfs_iext_get_ext(ifp, idx);
         state = 0;
         ASSERT(isnullstartblock(new->br_startblock));
+
         /*
          * Check and set flags if this segment has a left neighbor
          */
-        if (STATE_SET_TEST(LEFT_VALID, idx > 0)) {
+        if (idx > 0) {
+                state |= BMAP_LEFT_VALID;
                 xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx - 1), &left);
-                STATE_SET(LEFT_DELAY, isnullstartblock(left.br_startblock));
+
+                if (isnullstartblock(left.br_startblock))
+                        state |= BMAP_LEFT_DELAY;
         }
+
         /*
          * Check and set flags if the current (right) segment exists.
          * If it doesn't exist, we're converting the hole at end-of-file.
          */
-        if (STATE_SET_TEST(RIGHT_VALID,
-                           idx <
-                           ip->i_df.if_bytes / (uint)sizeof(xfs_bmbt_rec_t))) {
+        if (idx < ip->i_df.if_bytes / (uint)sizeof(xfs_bmbt_rec_t)) {
+                state |= BMAP_RIGHT_VALID;
                 xfs_bmbt_get_all(ep, &right);
-                STATE_SET(RIGHT_DELAY, isnullstartblock(right.br_startblock));
+
+                if (isnullstartblock(right.br_startblock))
+                        state |= BMAP_RIGHT_DELAY;
         }
+
         /*
          * Set contiguity flags on the left and right neighbors.
          * Don't let extents get too large, even if the pieces are contiguous.
          */
-        STATE_SET(LEFT_CONTIG,
-                STATE_TEST(LEFT_VALID) && STATE_TEST(LEFT_DELAY) &&
-                left.br_startoff + left.br_blockcount == new->br_startoff &&
-                left.br_blockcount + new->br_blockcount <= MAXEXTLEN);
-        STATE_SET(RIGHT_CONTIG,
-                STATE_TEST(RIGHT_VALID) && STATE_TEST(RIGHT_DELAY) &&
-                new->br_startoff + new->br_blockcount == right.br_startoff &&
-                new->br_blockcount + right.br_blockcount <= MAXEXTLEN &&
-                (!STATE_TEST(LEFT_CONTIG) ||
-                 (left.br_blockcount + new->br_blockcount +
-                     right.br_blockcount <= MAXEXTLEN)));
+        if ((state & BMAP_LEFT_VALID) && (state & BMAP_LEFT_DELAY) &&
+            left.br_startoff + left.br_blockcount == new->br_startoff &&
+            left.br_blockcount + new->br_blockcount <= MAXEXTLEN)
+                state |= BMAP_LEFT_CONTIG;
+
+        if ((state & BMAP_RIGHT_VALID) && (state & BMAP_RIGHT_DELAY) &&
+            new->br_startoff + new->br_blockcount == right.br_startoff &&
+            new->br_blockcount + right.br_blockcount <= MAXEXTLEN &&
+            (!(state & BMAP_LEFT_CONTIG) ||
+             (left.br_blockcount + new->br_blockcount +
+              right.br_blockcount <= MAXEXTLEN)))
+                state |= BMAP_RIGHT_CONTIG;
+
         /*
          * Switch out based on the contiguity flags.
          */
-        switch (SWITCH_STATE) {
-
-        case MASK2(LEFT_CONTIG, RIGHT_CONTIG):
+        switch (state & (BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG)) {
+        case BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG:
                 /*
                  * New allocation is contiguous with delayed allocations
                  * on the left and on the right.
@@ -1935,8 +1806,8 @@ xfs_bmap_add_extent_hole_delay(
                  */
                 temp = left.br_blockcount + new->br_blockcount +
                         right.br_blockcount;
-                XFS_BMAP_TRACE_PRE_UPDATE("LC|RC", ip, idx - 1,
-                        XFS_DATA_FORK);
+
+                trace_xfs_bmap_pre_update(ip, idx - 1, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1), temp);
                 oldlen = startblockval(left.br_startblock) +
                         startblockval(new->br_startblock) +
@@ -1944,53 +1815,52 @@ xfs_bmap_add_extent_hole_delay(
                 newlen = xfs_bmap_worst_indlen(ip, temp);
                 xfs_bmbt_set_startblock(xfs_iext_get_ext(ifp, idx - 1),
                         nullstartblock((int)newlen));
-                XFS_BMAP_TRACE_POST_UPDATE("LC|RC", ip, idx - 1,
-                        XFS_DATA_FORK);
-                XFS_BMAP_TRACE_DELETE("LC|RC", ip, idx, 1, XFS_DATA_FORK);
-                xfs_iext_remove(ifp, idx, 1);
+                trace_xfs_bmap_post_update(ip, idx - 1, state, _THIS_IP_);
+
+                xfs_iext_remove(ip, idx, 1, state);
                 ip->i_df.if_lastex = idx - 1;
                 /* DELTA: Two in-core extents were replaced by one. */
                 temp2 = temp;
                 temp = left.br_startoff;
                 break;
 
-        case MASK(LEFT_CONTIG):
+        case BMAP_LEFT_CONTIG:
                 /*
                  * New allocation is contiguous with a delayed allocation
                  * on the left.
                  * Merge the new allocation with the left neighbor.
                  */
                 temp = left.br_blockcount + new->br_blockcount;
-                XFS_BMAP_TRACE_PRE_UPDATE("LC", ip, idx - 1,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx - 1, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1), temp);
                 oldlen = startblockval(left.br_startblock) +
                         startblockval(new->br_startblock);
                 newlen = xfs_bmap_worst_indlen(ip, temp);
                 xfs_bmbt_set_startblock(xfs_iext_get_ext(ifp, idx - 1),
                         nullstartblock((int)newlen));
-                XFS_BMAP_TRACE_POST_UPDATE("LC", ip, idx - 1,
-                        XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx - 1, state, _THIS_IP_);
+
                 ip->i_df.if_lastex = idx - 1;
                 /* DELTA: One in-core extent grew into a hole. */
                 temp2 = temp;
                 temp = left.br_startoff;
                 break;
 
-        case MASK(RIGHT_CONTIG):
+        case BMAP_RIGHT_CONTIG:
                 /*
                  * New allocation is contiguous with a delayed allocation
                  * on the right.
                  * Merge the new allocation with the right neighbor.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("RC", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 temp = new->br_blockcount + right.br_blockcount;
                 oldlen = startblockval(new->br_startblock) +
                         startblockval(right.br_startblock);
                 newlen = xfs_bmap_worst_indlen(ip, temp);
                 xfs_bmbt_set_allf(ep, new->br_startoff,
                         nullstartblock((int)newlen), temp, right.br_state);
-                XFS_BMAP_TRACE_POST_UPDATE("RC", ip, idx, XFS_DATA_FORK);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
+
                 ip->i_df.if_lastex = idx;
                 /* DELTA: One in-core extent grew into a hole. */
                 temp2 = temp;
@@ -2004,9 +1874,7 @@ xfs_bmap_add_extent_hole_delay(
                  * Insert a new entry.
                  */
                 oldlen = newlen = 0;
-                XFS_BMAP_TRACE_INSERT("0", ip, idx, 1, new, NULL,
-                        XFS_DATA_FORK);
-                xfs_iext_insert(ifp, idx, 1, new);
+                xfs_iext_insert(ip, idx, 1, new, state);
                 ip->i_df.if_lastex = idx;
                 /* DELTA: A new in-core extent was added in a hole. */
                 temp2 = new->br_blockcount;
@@ -2030,12 +1898,6 @@ xfs_bmap_add_extent_hole_delay(
         }
         *logflagsp = 0;
         return 0;
-#undef  MASK
-#undef  MASK2
-#undef  STATE_SET
-#undef  STATE_TEST
-#undef  STATE_SET_TEST
-#undef  SWITCH_STATE
 }
 
 /*
@@ -2062,83 +1924,75 @@ xfs_bmap_add_extent_hole_real(
         int                     state;  /* state bits, accessed thru macros */
         xfs_filblks_t           temp=0;
         xfs_filblks_t           temp2=0;
-        enum {                          /* bit number definitions for state */
-                LEFT_CONTIG,    RIGHT_CONTIG,
-                LEFT_DELAY,     RIGHT_DELAY,
-                LEFT_VALID,     RIGHT_VALID
-        };
-
-#define MASK(b)                 (1 << (b))
-#define MASK2(a,b)              (MASK(a) | MASK(b))
-#define STATE_SET(b,v)          ((v) ? (state |= MASK(b)) : (state &= ~MASK(b)))
-#define STATE_TEST(b)           (state & MASK(b))
-#define STATE_SET_TEST(b,v)     ((v) ? ((state |= MASK(b)), 1) : \
-                                       ((state &= ~MASK(b)), 0))
-#define SWITCH_STATE            (state & MASK2(LEFT_CONTIG, RIGHT_CONTIG))
 
         ifp = XFS_IFORK_PTR(ip, whichfork);
         ASSERT(idx <= ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t));
         ep = xfs_iext_get_ext(ifp, idx);
         state = 0;
+
+        if (whichfork == XFS_ATTR_FORK)
+                state |= BMAP_ATTRFORK;
+
         /*
          * Check and set flags if this segment has a left neighbor.
          */
-        if (STATE_SET_TEST(LEFT_VALID, idx > 0)) {
+        if (idx > 0) {
+                state |= BMAP_LEFT_VALID;
                 xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx - 1), &left);
-                STATE_SET(LEFT_DELAY, isnullstartblock(left.br_startblock));
+                if (isnullstartblock(left.br_startblock))
+                        state |= BMAP_LEFT_DELAY;
         }
+
         /*
          * Check and set flags if this segment has a current value.
          * Not true if we're inserting into the "hole" at eof.
          */
-        if (STATE_SET_TEST(RIGHT_VALID,
-                           idx <
-                           ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t))) {
+        if (idx < ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t)) {
+                state |= BMAP_RIGHT_VALID;
                 xfs_bmbt_get_all(ep, &right);
-                STATE_SET(RIGHT_DELAY, isnullstartblock(right.br_startblock));
+                if (isnullstartblock(right.br_startblock))
+                        state |= BMAP_RIGHT_DELAY;
         }
+
         /*
          * We're inserting a real allocation between "left" and "right".
          * Set the contiguity flags.  Don't let extents get too large.
          */
-        STATE_SET(LEFT_CONTIG,
-                STATE_TEST(LEFT_VALID) && !STATE_TEST(LEFT_DELAY) &&
-                left.br_startoff + left.br_blockcount == new->br_startoff &&
-                left.br_startblock + left.br_blockcount == new->br_startblock &&
-                left.br_state == new->br_state &&
-                left.br_blockcount + new->br_blockcount <= MAXEXTLEN);
-        STATE_SET(RIGHT_CONTIG,
-                STATE_TEST(RIGHT_VALID) && !STATE_TEST(RIGHT_DELAY) &&
-                new->br_startoff + new->br_blockcount == right.br_startoff &&
-                new->br_startblock + new->br_blockcount ==
-                    right.br_startblock &&
-                new->br_state == right.br_state &&
-                new->br_blockcount + right.br_blockcount <= MAXEXTLEN &&
-                (!STATE_TEST(LEFT_CONTIG) ||
-                 left.br_blockcount + new->br_blockcount +
-                     right.br_blockcount <= MAXEXTLEN));
+        if ((state & BMAP_LEFT_VALID) && !(state & BMAP_LEFT_DELAY) &&
+            left.br_startoff + left.br_blockcount == new->br_startoff &&
+            left.br_startblock + left.br_blockcount == new->br_startblock &&
+            left.br_state == new->br_state &&
+            left.br_blockcount + new->br_blockcount <= MAXEXTLEN)
+                state |= BMAP_LEFT_CONTIG;
+
+        if ((state & BMAP_RIGHT_VALID) && !(state & BMAP_RIGHT_DELAY) &&
+            new->br_startoff + new->br_blockcount == right.br_startoff &&
+            new->br_startblock + new->br_blockcount == right.br_startblock &&
+            new->br_state == right.br_state &&
+            new->br_blockcount + right.br_blockcount <= MAXEXTLEN &&
+            (!(state & BMAP_LEFT_CONTIG) ||
+             left.br_blockcount + new->br_blockcount +
+             right.br_blockcount <= MAXEXTLEN))
+                state |= BMAP_RIGHT_CONTIG;
 
         error = 0;
         /*
          * Select which case we're in here, and implement it.
          */
-        switch (SWITCH_STATE) {
-
-        case MASK2(LEFT_CONTIG, RIGHT_CONTIG):
+        switch (state & (BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG)) {
+        case BMAP_LEFT_CONTIG | BMAP_RIGHT_CONTIG:
                 /*
                  * New allocation is contiguous with real allocations on the
                  * left and on the right.
                  * Merge all three into a single extent record.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("LC|RC", ip, idx - 1,
-                        whichfork);
+                trace_xfs_bmap_pre_update(ip, idx - 1, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
                         left.br_blockcount + new->br_blockcount +
                         right.br_blockcount);
-                XFS_BMAP_TRACE_POST_UPDATE("LC|RC", ip, idx - 1,
-                        whichfork);
-                XFS_BMAP_TRACE_DELETE("LC|RC", ip, idx, 1, whichfork);
-                xfs_iext_remove(ifp, idx, 1);
+                trace_xfs_bmap_post_update(ip, idx - 1, state, _THIS_IP_);
+
+                xfs_iext_remove(ip, idx, 1, state);
                 ifp->if_lastex = idx - 1;
                 XFS_IFORK_NEXT_SET(ip, whichfork,
                         XFS_IFORK_NEXTENTS(ip, whichfork) - 1);
@@ -2173,16 +2027,17 @@ xfs_bmap_add_extent_hole_real(
                         right.br_blockcount;
                 break;
 
-        case MASK(LEFT_CONTIG):
+        case BMAP_LEFT_CONTIG:
                 /*
                  * New allocation is contiguous with a real allocation
                  * on the left.
                  * Merge the new allocation with the left neighbor.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("LC", ip, idx - 1, whichfork);
+                trace_xfs_bmap_pre_update(ip, idx - 1, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
                         left.br_blockcount + new->br_blockcount);
-                XFS_BMAP_TRACE_POST_UPDATE("LC", ip, idx - 1, whichfork);
+                trace_xfs_bmap_post_update(ip, idx - 1, state, _THIS_IP_);
+
                 ifp->if_lastex = idx - 1;
                 if (cur == NULL) {
                         rval = xfs_ilog_fext(whichfork);
@@ -2207,17 +2062,18 @@ xfs_bmap_add_extent_hole_real(
                         new->br_blockcount;
                 break;
 
-        case MASK(RIGHT_CONTIG):
+        case BMAP_RIGHT_CONTIG:
                 /*
                  * New allocation is contiguous with a real allocation
                  * on the right.
                  * Merge the new allocation with the right neighbor.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("RC", ip, idx, whichfork);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_allf(ep, new->br_startoff, new->br_startblock,
                         new->br_blockcount + right.br_blockcount,
                         right.br_state);
-                XFS_BMAP_TRACE_POST_UPDATE("RC", ip, idx, whichfork);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
+
                 ifp->if_lastex = idx;
                 if (cur == NULL) {
                         rval = xfs_ilog_fext(whichfork);
@@ -2248,8 +2104,7 @@ xfs_bmap_add_extent_hole_real(
                  * real allocation.
                  * Insert a new entry.
                  */
-                XFS_BMAP_TRACE_INSERT("0", ip, idx, 1, new, NULL, whichfork);
-                xfs_iext_insert(ifp, idx, 1, new);
+                xfs_iext_insert(ip, idx, 1, new, state);
                 ifp->if_lastex = idx;
                 XFS_IFORK_NEXT_SET(ip, whichfork,
                         XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
@@ -2283,12 +2138,6 @@ xfs_bmap_add_extent_hole_real(
 done:
         *logflagsp = rval;
         return error;
-#undef  MASK
-#undef  MASK2
-#undef  STATE_SET
-#undef  STATE_TEST
-#undef  STATE_SET_TEST
-#undef  SWITCH_STATE
 }
 
 /*
@@ -3115,8 +2964,13 @@ xfs_bmap_del_extent(
         uint                    qfield; /* quota field to update */
         xfs_filblks_t           temp;   /* for indirect length calculations */
         xfs_filblks_t           temp2;  /* for indirect length calculations */
+        int                     state = 0;
 
         XFS_STATS_INC(xs_del_exlist);
+
+        if (whichfork == XFS_ATTR_FORK)
+                state |= BMAP_ATTRFORK;
+
         mp = ip->i_mount;
         ifp = XFS_IFORK_PTR(ip, whichfork);
         ASSERT((idx >= 0) && (idx < ifp->if_bytes /
@@ -3196,8 +3050,8 @@ xfs_bmap_del_extent(
                 /*
                  * Matches the whole extent.  Delete the entry.
                  */
-                XFS_BMAP_TRACE_DELETE("3", ip, idx, 1, whichfork);
-                xfs_iext_remove(ifp, idx, 1);
+                xfs_iext_remove(ip, idx, 1,
+                                whichfork == XFS_ATTR_FORK ? BMAP_ATTRFORK : 0);
                 ifp->if_lastex = idx;
                 if (delay)
                         break;
@@ -3217,7 +3071,7 @@ xfs_bmap_del_extent(
                 /*
                  * Deleting the first part of the extent.
                  */
-                XFS_BMAP_TRACE_PRE_UPDATE("2", ip, idx, whichfork);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_startoff(ep, del_endoff);
                 temp = got.br_blockcount - del->br_blockcount;
                 xfs_bmbt_set_blockcount(ep, temp);
@@ -3226,13 +3080,12 @@ xfs_bmap_del_extent(
                         temp = XFS_FILBLKS_MIN(xfs_bmap_worst_indlen(ip, temp),
                                 da_old);
                         xfs_bmbt_set_startblock(ep, nullstartblock((int)temp));
-                        XFS_BMAP_TRACE_POST_UPDATE("2", ip, idx,
-                                whichfork);
+                        trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
                         da_new = temp;
                         break;
                 }
                 xfs_bmbt_set_startblock(ep, del_endblock);
-                XFS_BMAP_TRACE_POST_UPDATE("2", ip, idx, whichfork);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
                 if (!cur) {
                         flags |= xfs_ilog_fext(whichfork);
                         break;
@@ -3248,19 +3101,18 @@ xfs_bmap_del_extent(
                  * Deleting the last part of the extent.
                  */
                 temp = got.br_blockcount - del->br_blockcount;
-                XFS_BMAP_TRACE_PRE_UPDATE("1", ip, idx, whichfork);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(ep, temp);
                 ifp->if_lastex = idx;
                 if (delay) {
                         temp = XFS_FILBLKS_MIN(xfs_bmap_worst_indlen(ip, temp),
                                 da_old);
                         xfs_bmbt_set_startblock(ep, nullstartblock((int)temp));
-                        XFS_BMAP_TRACE_POST_UPDATE("1", ip, idx,
-                                whichfork);
+                        trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
                         da_new = temp;
                         break;
                 }
-                XFS_BMAP_TRACE_POST_UPDATE("1", ip, idx, whichfork);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
                 if (!cur) {
                         flags |= xfs_ilog_fext(whichfork);
                         break;
@@ -3277,7 +3129,7 @@ xfs_bmap_del_extent(
                  * Deleting the middle of the extent.
                  */
                 temp = del->br_startoff - got.br_startoff;
-                XFS_BMAP_TRACE_PRE_UPDATE("0", ip, idx, whichfork);
+                trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
                 xfs_bmbt_set_blockcount(ep, temp);
                 new.br_startoff = del_endoff;
                 temp2 = got_endoff - del_endoff;
@@ -3364,10 +3216,8 @@ xfs_bmap_del_extent(
                                 }
                         }
                 }
-                XFS_BMAP_TRACE_POST_UPDATE("0", ip, idx, whichfork);
-                XFS_BMAP_TRACE_INSERT("0", ip, idx + 1, 1, &new, NULL,
-                        whichfork);
-                xfs_iext_insert(ifp, idx + 1, 1, &new);
+                trace_xfs_bmap_post_update(ip, idx, state, _THIS_IP_);
+                xfs_iext_insert(ip, idx + 1, 1, &new, state);
                 ifp->if_lastex = idx + 1;
                 break;
         }
@@ -3687,7 +3537,9 @@ xfs_bmap_local_to_extents(
                 xfs_iext_add(ifp, 0, 1);
                 ep = xfs_iext_get_ext(ifp, 0);
                 xfs_bmbt_set_allf(ep, 0, args.fsbno, 1, XFS_EXT_NORM);
-                XFS_BMAP_TRACE_POST_UPDATE("new", ip, 0, whichfork);
+                trace_xfs_bmap_post_update(ip, 0,
+                                whichfork == XFS_ATTR_FORK ? BMAP_ATTRFORK : 0,
+                                _THIS_IP_);
                 XFS_IFORK_NEXT_SET(ip, whichfork, 1);
                 ip->i_d.di_nblocks = 1;
                 xfs_trans_mod_dquot_byino(tp, ip,
@@ -3800,158 +3652,6 @@ xfs_bmap_search_extents(
         return ep;
 }
 
-
-#ifdef XFS_BMAP_TRACE
-ktrace_t        *xfs_bmap_trace_buf;
-
-/*
- * Add a bmap trace buffer entry.  Base routine for the others.
- */
-STATIC void
-xfs_bmap_trace_addentry(
-        int             opcode,         /* operation */
-        const char      *fname,         /* function name */
-        char            *desc,          /* operation description */
-        xfs_inode_t     *ip,            /* incore inode pointer */
-        xfs_extnum_t    idx,            /* index of entry(ies) */
-        xfs_extnum_t    cnt,            /* count of entries, 1 or 2 */
-        xfs_bmbt_rec_host_t *r1,        /* first record */
-        xfs_bmbt_rec_host_t *r2,        /* second record or null */
-        int             whichfork)      /* data or attr fork */
-{
-        xfs_bmbt_rec_host_t tr2;
-
-        ASSERT(cnt == 1 || cnt == 2);
-        ASSERT(r1 != NULL);
-        if (cnt == 1) {
-                ASSERT(r2 == NULL);
-                r2 = &tr2;
-                memset(&tr2, 0, sizeof(tr2));
-        } else
-                ASSERT(r2 != NULL);
-        ktrace_enter(xfs_bmap_trace_buf,
-                (void *)(__psint_t)(opcode | (whichfork << 16)),
-                (void *)fname, (void *)desc, (void *)ip,
-                (void *)(__psint_t)idx,
-                (void *)(__psint_t)cnt,
-                (void *)(__psunsigned_t)(ip->i_ino >> 32),
-                (void *)(__psunsigned_t)(unsigned)ip->i_ino,
-                (void *)(__psunsigned_t)(r1->l0 >> 32),
-                (void *)(__psunsigned_t)(unsigned)(r1->l0),
-                (void *)(__psunsigned_t)(r1->l1 >> 32),
-                (void *)(__psunsigned_t)(unsigned)(r1->l1),
-                (void *)(__psunsigned_t)(r2->l0 >> 32),
-                (void *)(__psunsigned_t)(unsigned)(r2->l0),
-                (void *)(__psunsigned_t)(r2->l1 >> 32),
-                (void *)(__psunsigned_t)(unsigned)(r2->l1)
-                );
-        ASSERT(ip->i_xtrace);
-        ktrace_enter(ip->i_xtrace,
-                (void *)(__psint_t)(opcode | (whichfork << 16)),
-                (void *)fname, (void *)desc, (void *)ip,
-                (void *)(__psint_t)idx,
-                (void *)(__psint_t)cnt,
-                (void *)(__psunsigned_t)(ip->i_ino >> 32),
-                (void *)(__psunsigned_t)(unsigned)ip->i_ino,
-                (void *)(__psunsigned_t)(r1->l0 >> 32),
-                (void *)(__psunsigned_t)(unsigned)(r1->l0),
-                (void *)(__psunsigned_t)(r1->l1 >> 32),
-                (void *)(__psunsigned_t)(unsigned)(r1->l1),
-                (void *)(__psunsigned_t)(r2->l0 >> 32),
-                (void *)(__psunsigned_t)(unsigned)(r2->l0),
-                (void *)(__psunsigned_t)(r2->l1 >> 32),
-                (void *)(__psunsigned_t)(unsigned)(r2->l1)
-                );
-}
-
-/*
- * Add bmap trace entry prior to a call to xfs_iext_remove.
- */
-STATIC void
-xfs_bmap_trace_delete(
-        const char      *fname,         /* function name */
-        char            *desc,          /* operation description */
-        xfs_inode_t     *ip,            /* incore inode pointer */
-        xfs_extnum_t    idx,            /* index of entry(entries) deleted */
-        xfs_extnum_t    cnt,            /* count of entries deleted, 1 or 2 */
-        int             whichfork)      /* data or attr fork */
-{
-        xfs_ifork_t     *ifp;           /* inode fork pointer */
-
-        ifp = XFS_IFORK_PTR(ip, whichfork);
-        xfs_bmap_trace_addentry(XFS_BMAP_KTRACE_DELETE, fname, desc, ip, idx,
-                cnt, xfs_iext_get_ext(ifp, idx),
-                cnt == 2 ? xfs_iext_get_ext(ifp, idx + 1) : NULL,
-                whichfork);
-}
-
-/*
- * Add bmap trace entry prior to a call to xfs_iext_insert, or
- * reading in the extents list from the disk (in the btree).
- */
-STATIC void
-xfs_bmap_trace_insert(
-        const char      *fname,         /* function name */
-        char            *desc,          /* operation description */
-        xfs_inode_t     *ip,            /* incore inode pointer */
-        xfs_extnum_t    idx,            /* index of entry(entries) inserted */
-        xfs_extnum_t    cnt,            /* count of entries inserted, 1 or 2 */
-        xfs_bmbt_irec_t *r1,            /* inserted record 1 */
-        xfs_bmbt_irec_t *r2,            /* inserted record 2 or null */
-        int             whichfork)      /* data or attr fork */
-{
-        xfs_bmbt_rec_host_t tr1;        /* compressed record 1 */
-        xfs_bmbt_rec_host_t tr2;        /* compressed record 2 if needed */
-
-        xfs_bmbt_set_all(&tr1, r1);
-        if (cnt == 2) {
-                ASSERT(r2 != NULL);
-                xfs_bmbt_set_all(&tr2, r2);
-        } else {
-                ASSERT(cnt == 1);
-                ASSERT(r2 == NULL);
-        }
-        xfs_bmap_trace_addentry(XFS_BMAP_KTRACE_INSERT, fname, desc, ip, idx,
-                cnt, &tr1, cnt == 2 ? &tr2 : NULL, whichfork);
-}
-
-/*
- * Add bmap trace entry after updating an extent record in place.
- */
-STATIC void
-xfs_bmap_trace_post_update(
-        const char      *fname,         /* function name */
-        char            *desc,          /* operation description */
-        xfs_inode_t     *ip,            /* incore inode pointer */
-        xfs_extnum_t    idx,            /* index of entry updated */
-        int             whichfork)      /* data or attr fork */
-{
-        xfs_ifork_t     *ifp;           /* inode fork pointer */
-
-        ifp = XFS_IFORK_PTR(ip, whichfork);
-        xfs_bmap_trace_addentry(XFS_BMAP_KTRACE_POST_UP, fname, desc, ip, idx,
-                1, xfs_iext_get_ext(ifp, idx), NULL, whichfork);
-}
-
-/*
- * Add bmap trace entry prior to updating an extent record in place.
- */
-STATIC void
-xfs_bmap_trace_pre_update(
-        const char      *fname,         /* function name */
-        char            *desc,          /* operation description */
-        xfs_inode_t     *ip,            /* incore inode pointer */
-        xfs_extnum_t    idx,            /* index of entry to be updated */
-        int             whichfork)      /* data or attr fork */
-{
-        xfs_ifork_t     *ifp;           /* inode fork pointer */
-
-        ifp = XFS_IFORK_PTR(ip, whichfork);
-        xfs_bmap_trace_addentry(XFS_BMAP_KTRACE_PRE_UP, fname, desc, ip, idx, 1,
-                xfs_iext_get_ext(ifp, idx), NULL, whichfork);
-}
-#endif  /* XFS_BMAP_TRACE */
-
 /*
  * Compute the worst-case number of indirect blocks that will be used
  * for ip's delayed extent of length "len".
@@ -3983,37 +3683,6 @@ xfs_bmap_worst_indlen(
         return rval;
 }
 
-#if defined(XFS_RW_TRACE)
-STATIC void
-xfs_bunmap_trace(
-        xfs_inode_t             *ip,
-        xfs_fileoff_t           bno,
-        xfs_filblks_t           len,
-        int                     flags,
-        inst_t                  *ra)
-{
-        if (ip->i_rwtrace == NULL)
-                return;
-        ktrace_enter(ip->i_rwtrace,
-                (void *)(__psint_t)XFS_BUNMAP,
-                (void *)ip,
-                (void *)(__psint_t)((ip->i_d.di_size >> 32) & 0xffffffff),
-                (void *)(__psint_t)(ip->i_d.di_size & 0xffffffff),
-                (void *)(__psint_t)(((xfs_dfiloff_t)bno >> 32) & 0xffffffff),
-                (void *)(__psint_t)((xfs_dfiloff_t)bno & 0xffffffff),
-                (void *)(__psint_t)len,
-                (void *)(__psint_t)flags,
-                (void *)(unsigned long)current_cpu(),
-                (void *)ra,
-                (void *)0,
-                (void *)0,
-                (void *)0,
-                (void *)0,
-                (void *)0,
-                (void *)0);
-}
-#endif
-
 /*
  * Convert inode from non-attributed to attributed.
  * Must not be in a transaction, ip must not be locked.
@@ -4702,34 +4371,30 @@ error0:
         return XFS_ERROR(EFSCORRUPTED);
 }
 
-#ifdef XFS_BMAP_TRACE
+#ifdef DEBUG
 /*
  * Add bmap trace insert entries for all the contents of the extent records.
  */
 void
 xfs_bmap_trace_exlist(
-        const char      *fname,         /* function name */
         xfs_inode_t     *ip,            /* incore inode pointer */
         xfs_extnum_t    cnt,            /* count of entries in the list */
-        int             whichfork)      /* data or attr fork */
+        int             whichfork,      /* data or attr fork */
+        unsigned long   caller_ip)
 {
-        xfs_bmbt_rec_host_t *ep;        /* current extent record */
         xfs_extnum_t    idx;            /* extent record index */
         xfs_ifork_t     *ifp;           /* inode fork pointer */
-        xfs_bmbt_irec_t s;              /* file extent record */
+        int             state = 0;
+
+        if (whichfork == XFS_ATTR_FORK)
+                state |= BMAP_ATTRFORK;
 
         ifp = XFS_IFORK_PTR(ip, whichfork);
         ASSERT(cnt == (ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t)));
-        for (idx = 0; idx < cnt; idx++) {
-                ep = xfs_iext_get_ext(ifp, idx);
-                xfs_bmbt_get_all(ep, &s);
-                XFS_BMAP_TRACE_INSERT("exlist", ip, idx, 1, &s, NULL,
-                        whichfork);
-        }
+        for (idx = 0; idx < cnt; idx++)
+                trace_xfs_extlist(ip, idx, whichfork, caller_ip);
 }
-#endif
 
-#ifdef DEBUG
 /*
  * Validate that the bmbt_irecs being returned from bmapi are valid
  * given the callers original parameters.  Specifically check the
@@ -5478,7 +5143,8 @@ xfs_bunmapi(
         int                     rsvd;           /* OK to allocate reserved blocks */
         xfs_fsblock_t           sum;
 
-        xfs_bunmap_trace(ip, bno, len, flags, (inst_t *)__return_address);
+        trace_xfs_bunmap(ip, bno, len, flags, _RET_IP_);
+
         whichfork = (flags & XFS_BMAPI_ATTRFORK) ?
                 XFS_ATTR_FORK : XFS_DATA_FORK;
         ifp = XFS_IFORK_PTR(ip, whichfork);
diff --git a/fs/xfs/xfs_bmap.h b/fs/xfs/xfs_bmap.h
index 56f62d2edc35..419dafb9d87d 100644
--- a/fs/xfs/xfs_bmap.h
+++ b/fs/xfs/xfs_bmap.h
@@ -95,6 +95,21 @@ typedef	struct xfs_bmap_free
                                         /* need write cache flushing and no */
                                         /* additional allocation alignments */
 
+#define XFS_BMAPI_FLAGS \
+        { XFS_BMAPI_WRITE,      "WRITE" }, \
+        { XFS_BMAPI_DELAY,      "DELAY" }, \
+        { XFS_BMAPI_ENTIRE,     "ENTIRE" }, \
+        { XFS_BMAPI_METADATA,   "METADATA" }, \
+        { XFS_BMAPI_EXACT,      "EXACT" }, \
+        { XFS_BMAPI_ATTRFORK,   "ATTRFORK" }, \
+        { XFS_BMAPI_ASYNC,      "ASYNC" }, \
+        { XFS_BMAPI_RSVBLOCKS,  "RSVBLOCKS" }, \
+        { XFS_BMAPI_PREALLOC,   "PREALLOC" }, \
+        { XFS_BMAPI_IGSTATE,    "IGSTATE" }, \
+        { XFS_BMAPI_CONTIG,     "CONTIG" }, \
+        { XFS_BMAPI_CONVERT,    "CONVERT" }
+
+
 static inline int xfs_bmapi_aflag(int w)
 {
         return (w == XFS_ATTR_FORK ? XFS_BMAPI_ATTRFORK : 0);
@@ -135,36 +150,43 @@ typedef struct xfs_bmalloca {
         char                    conv;   /* overwriting unwritten extents */
 } xfs_bmalloca_t;
 
-#if defined(__KERNEL__) && defined(XFS_BMAP_TRACE)
 /*
- * Trace operations for bmap extent tracing
+ * Flags for xfs_bmap_add_extent*.
  */
-#define XFS_BMAP_KTRACE_DELETE  1
-#define XFS_BMAP_KTRACE_INSERT  2
-#define XFS_BMAP_KTRACE_PRE_UP  3
-#define XFS_BMAP_KTRACE_POST_UP 4
-
-#define XFS_BMAP_TRACE_SIZE     4096    /* size of global trace buffer */
-#define XFS_BMAP_KTRACE_SIZE    32      /* size of per-inode trace buffer */
-extern ktrace_t *xfs_bmap_trace_buf;
+#define BMAP_LEFT_CONTIG        (1 << 0)
+#define BMAP_RIGHT_CONTIG       (1 << 1)
+#define BMAP_LEFT_FILLING       (1 << 2)
+#define BMAP_RIGHT_FILLING      (1 << 3)
+#define BMAP_LEFT_DELAY         (1 << 4)
+#define BMAP_RIGHT_DELAY        (1 << 5)
+#define BMAP_LEFT_VALID         (1 << 6)
+#define BMAP_RIGHT_VALID        (1 << 7)
+#define BMAP_ATTRFORK           (1 << 8)
+
+#define XFS_BMAP_EXT_FLAGS \
+        { BMAP_LEFT_CONTIG,     "LC" }, \
+        { BMAP_RIGHT_CONTIG,    "RC" }, \
+        { BMAP_LEFT_FILLING,    "LF" }, \
+        { BMAP_RIGHT_FILLING,   "RF" }, \
+        { BMAP_ATTRFORK,        "ATTR" }
 
 /*
  * Add bmap trace insert entries for all the contents of the extent list.
+ *
+ * Quite excessive tracing.  Only do this for debug builds.
  */
+#if defined(__KERNEL) && defined(DEBUG)
 void
 xfs_bmap_trace_exlist(
-        const char              *fname,         /* function name */
         struct xfs_inode        *ip,            /* incore inode pointer */
         xfs_extnum_t            cnt,            /* count of entries in list */
-        int                     whichfork);     /* data or attr fork */
+        int                     whichfork,
+        unsigned long           caller_ip);     /* data or attr fork */
 #define XFS_BMAP_TRACE_EXLIST(ip,c,w)   \
-        xfs_bmap_trace_exlist(__func__,ip,c,w)
-
-#else   /* __KERNEL__ && XFS_BMAP_TRACE */
-
+        xfs_bmap_trace_exlist(ip,c,w, _THIS_IP_)
+#else
 #define XFS_BMAP_TRACE_EXLIST(ip,c,w)
-
-#endif  /* __KERNEL__ && XFS_BMAP_TRACE */
+#endif
 
 /*
  * Convert inode from non-attributed to attributed.
diff --git a/fs/xfs/xfs_bmap_btree.c b/fs/xfs/xfs_bmap_btree.c
index 6f5ccede63f9..38751d5fac6f 100644
--- a/fs/xfs/xfs_bmap_btree.c
+++ b/fs/xfs/xfs_bmap_btree.c
@@ -768,12 +768,6 @@ xfs_bmbt_trace_enter(
                 (void *)a0, (void *)a1, (void *)a2, (void *)a3,
                 (void *)a4, (void *)a5, (void *)a6, (void *)a7,
                 (void *)a8, (void *)a9, (void *)a10);
-        ktrace_enter(ip->i_btrace,
-                (void *)((__psint_t)type | (whichfork << 8) | (line << 16)),
-                (void *)func, (void *)s, (void *)ip, (void *)cur,
-                (void *)a0, (void *)a1, (void *)a2, (void *)a3,
-                (void *)a4, (void *)a5, (void *)a6, (void *)a7,
-                (void *)a8, (void *)a9, (void *)a10);
 }
 
 STATIC void
diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c
index 52b5f14d0c32..36a0992dd669 100644
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
@@ -39,6 +39,7 @@
 #include "xfs_btree_trace.h"
 #include "xfs_ialloc.h"
 #include "xfs_error.h"
+#include "xfs_trace.h"
 
 /*
  * Cursor allocation zone.
@@ -81,7 +82,7 @@ xfs_btree_check_lblock(
                         XFS_ERRTAG_BTREE_CHECK_LBLOCK,
                         XFS_RANDOM_BTREE_CHECK_LBLOCK))) {
                 if (bp)
-                        xfs_buftrace("LBTREE ERROR", bp);
+                        trace_xfs_btree_corrupt(bp, _RET_IP_);
                 XFS_ERROR_REPORT("xfs_btree_check_lblock", XFS_ERRLEVEL_LOW,
                                  mp);
                 return XFS_ERROR(EFSCORRUPTED);
@@ -119,7 +120,7 @@ xfs_btree_check_sblock(
                         XFS_ERRTAG_BTREE_CHECK_SBLOCK,
                         XFS_RANDOM_BTREE_CHECK_SBLOCK))) {
                 if (bp)
-                        xfs_buftrace("SBTREE ERROR", bp);
+                        trace_xfs_btree_corrupt(bp, _RET_IP_);
                 XFS_CORRUPTION_ERROR("xfs_btree_check_sblock",
                         XFS_ERRLEVEL_LOW, cur->bc_mp, block);
                 return XFS_ERROR(EFSCORRUPTED);
diff --git a/fs/xfs/xfs_btree_trace.h b/fs/xfs/xfs_btree_trace.h
index b3f5eb3c3c6c..2d8a309873ea 100644
--- a/fs/xfs/xfs_btree_trace.h
+++ b/fs/xfs/xfs_btree_trace.h
@@ -58,8 +58,6 @@ void xfs_btree_trace_argbi(const char *, struct xfs_btree_cur *,
                 struct xfs_buf *, int, int);
 void xfs_btree_trace_argbii(const char *, struct xfs_btree_cur *,
                 struct xfs_buf *, int, int, int);
-void xfs_btree_trace_argfffi(const char *, struct xfs_btree_cur *,
-                xfs_dfiloff_t, xfs_dfsbno_t, xfs_dfilblks_t, int, int);
 void xfs_btree_trace_argi(const char *, struct xfs_btree_cur *, int, int);
 void xfs_btree_trace_argipk(const char *, struct xfs_btree_cur *, int,
                 union xfs_btree_ptr, union xfs_btree_key *, int);
@@ -71,24 +69,10 @@ void xfs_btree_trace_argr(const char *, struct xfs_btree_cur *,
                 union xfs_btree_rec *, int);
 void xfs_btree_trace_cursor(const char *, struct xfs_btree_cur *, int, int);
 
-
-#define XFS_ALLOCBT_TRACE_SIZE  4096    /* size of global trace buffer */
-extern ktrace_t *xfs_allocbt_trace_buf;
-
-#define XFS_INOBT_TRACE_SIZE    4096    /* size of global trace buffer */
-extern ktrace_t *xfs_inobt_trace_buf;
-
-#define XFS_BMBT_TRACE_SIZE     4096    /* size of global trace buffer */
-#define XFS_BMBT_KTRACE_SIZE    32      /* size of per-inode trace buffer */
-extern ktrace_t *xfs_bmbt_trace_buf;
-
-
 #define XFS_BTREE_TRACE_ARGBI(c, b, i)  \
         xfs_btree_trace_argbi(__func__, c, b, i, __LINE__)
 #define XFS_BTREE_TRACE_ARGBII(c, b, i, j)      \
         xfs_btree_trace_argbii(__func__, c, b, i, j, __LINE__)
-#define XFS_BTREE_TRACE_ARGFFFI(c, o, b, i, j)  \
-        xfs_btree_trace_argfffi(__func__, c, o, b, i, j, __LINE__)
 #define XFS_BTREE_TRACE_ARGI(c, i)      \
         xfs_btree_trace_argi(__func__, c, i, __LINE__)
 #define XFS_BTREE_TRACE_ARGIPK(c, i, p, k)      \
@@ -104,7 +88,6 @@ extern ktrace_t	*xfs_bmbt_trace_buf;
 #else
 #define XFS_BTREE_TRACE_ARGBI(c, b, i)
 #define XFS_BTREE_TRACE_ARGBII(c, b, i, j)
-#define XFS_BTREE_TRACE_ARGFFFI(c, o, b, i, j)
 #define XFS_BTREE_TRACE_ARGI(c, i)
 #define XFS_BTREE_TRACE_ARGIPK(c, i, p, s)
 #define XFS_BTREE_TRACE_ARGIPR(c, i, p, r)
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index 92af4098c7e8..a30f7e9eb2b9 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -29,6 +29,7 @@
 #include "xfs_buf_item.h"
 #include "xfs_trans_priv.h"
 #include "xfs_error.h"
+#include "xfs_trace.h"
 
 
 kmem_zone_t     *xfs_buf_item_zone;
@@ -164,7 +165,7 @@ xfs_buf_item_size(
                  * is the buf log format structure with the
                  * cancel flag in it.
                  */
-                xfs_buf_item_trace("SIZE STALE", bip);
+                trace_xfs_buf_item_size_stale(bip);
                 ASSERT(bip->bli_format.blf_flags & XFS_BLI_CANCEL);
                 return 1;
         }
@@ -206,7 +207,7 @@ xfs_buf_item_size(
                 }
         }
 
-        xfs_buf_item_trace("SIZE NORM", bip);
+        trace_xfs_buf_item_size(bip);
         return nvecs;
 }
 
@@ -259,7 +260,7 @@ xfs_buf_item_format(
                  * is the buf log format structure with the
                  * cancel flag in it.
                  */
-                xfs_buf_item_trace("FORMAT STALE", bip);
+                trace_xfs_buf_item_format_stale(bip);
                 ASSERT(bip->bli_format.blf_flags & XFS_BLI_CANCEL);
                 bip->bli_format.blf_size = nvecs;
                 return;
@@ -335,7 +336,7 @@ xfs_buf_item_format(
         /*
          * Check to make sure everything is consistent.
          */
-        xfs_buf_item_trace("FORMAT NORM", bip);
+        trace_xfs_buf_item_format(bip);
         xfs_buf_item_log_check(bip);
 }
 
@@ -355,8 +356,7 @@ xfs_buf_item_pin(
         ASSERT(atomic_read(&bip->bli_refcount) > 0);
         ASSERT((bip->bli_flags & XFS_BLI_LOGGED) ||
                (bip->bli_flags & XFS_BLI_STALE));
-        xfs_buf_item_trace("PIN", bip);
-        xfs_buftrace("XFS_PIN", bp);
+        trace_xfs_buf_item_pin(bip);
         xfs_bpin(bp);
 }
 
@@ -383,8 +383,7 @@ xfs_buf_item_unpin(
         ASSERT(bp != NULL);
         ASSERT(XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t *) == bip);
         ASSERT(atomic_read(&bip->bli_refcount) > 0);
-        xfs_buf_item_trace("UNPIN", bip);
-        xfs_buftrace("XFS_UNPIN", bp);
+        trace_xfs_buf_item_unpin(bip);
 
         freed = atomic_dec_and_test(&bip->bli_refcount);
         ailp = bip->bli_item.li_ailp;
@@ -395,8 +394,8 @@ xfs_buf_item_unpin(
                 ASSERT(!(XFS_BUF_ISDELAYWRITE(bp)));
                 ASSERT(XFS_BUF_ISSTALE(bp));
                 ASSERT(bip->bli_format.blf_flags & XFS_BLI_CANCEL);
-                xfs_buf_item_trace("UNPIN STALE", bip);
-                xfs_buftrace("XFS_UNPIN STALE", bp);
+                trace_xfs_buf_item_unpin_stale(bip);
+
                 /*
                  * If we get called here because of an IO error, we may
                  * or may not have the item on the AIL. xfs_trans_ail_delete()
@@ -440,8 +439,8 @@ xfs_buf_item_unpin_remove(
         if ((atomic_read(&bip->bli_refcount) == 1) &&
             (bip->bli_flags & XFS_BLI_STALE)) {
                 ASSERT(XFS_BUF_VALUSEMA(bip->bli_buf) <= 0);
-                xfs_buf_item_trace("UNPIN REMOVE", bip);
-                xfs_buftrace("XFS_UNPIN_REMOVE", bp);
+                trace_xfs_buf_item_unpin_stale(bip);
+
                 /*
                  * yes -- clear the xaction descriptor in-use flag
                  * and free the chunk if required.  We can safely
@@ -495,7 +494,7 @@ xfs_buf_item_trylock(
         XFS_BUF_HOLD(bp);
 
         ASSERT(!(bip->bli_flags & XFS_BLI_STALE));
-        xfs_buf_item_trace("TRYLOCK SUCCESS", bip);
+        trace_xfs_buf_item_trylock(bip);
         return XFS_ITEM_SUCCESS;
 }
 
@@ -524,7 +523,6 @@ xfs_buf_item_unlock(
         uint            hold;
 
         bp = bip->bli_buf;
-        xfs_buftrace("XFS_UNLOCK", bp);
 
         /*
          * Clear the buffer's association with this transaction.
@@ -547,7 +545,7 @@ xfs_buf_item_unlock(
          */
         if (bip->bli_flags & XFS_BLI_STALE) {
                 bip->bli_flags &= ~XFS_BLI_LOGGED;
-                xfs_buf_item_trace("UNLOCK STALE", bip);
+                trace_xfs_buf_item_unlock_stale(bip);
                 ASSERT(bip->bli_format.blf_flags & XFS_BLI_CANCEL);
                 if (!aborted)
                         return;
@@ -574,7 +572,7 @@ xfs_buf_item_unlock(
          * release the buffer at the end of this routine.
          */
         hold = bip->bli_flags & XFS_BLI_HOLD;
-        xfs_buf_item_trace("UNLOCK", bip);
+        trace_xfs_buf_item_unlock(bip);
 
         /*
          * If the buf item isn't tracking any data, free it.
@@ -618,7 +616,8 @@ xfs_buf_item_committed(
         xfs_buf_log_item_t      *bip,
         xfs_lsn_t               lsn)
 {
-        xfs_buf_item_trace("COMMITTED", bip);
+        trace_xfs_buf_item_committed(bip);
+
         if ((bip->bli_flags & XFS_BLI_INODE_ALLOC_BUF) &&
             (bip->bli_item.li_lsn != 0)) {
                 return bip->bli_item.li_lsn;
@@ -640,7 +639,7 @@ xfs_buf_item_push(
         xfs_buf_t       *bp;
 
         ASSERT(!(bip->bli_flags & XFS_BLI_STALE));
-        xfs_buf_item_trace("PUSH", bip);
+        trace_xfs_buf_item_push(bip);
 
         bp = bip->bli_buf;
 
@@ -738,9 +737,6 @@ xfs_buf_item_init(
         bip->bli_format.blf_blkno = (__int64_t)XFS_BUF_ADDR(bp);
         bip->bli_format.blf_len = (ushort)BTOBB(XFS_BUF_COUNT(bp));
         bip->bli_format.blf_map_size = map_size;
-#ifdef XFS_BLI_TRACE
-        bip->bli_trace = ktrace_alloc(XFS_BLI_TRACE_SIZE, KM_NOFS);
-#endif
 
 #ifdef XFS_TRANS_DEBUG
         /*
@@ -878,9 +874,6 @@ xfs_buf_item_free(
         kmem_free(bip->bli_logged);
 #endif /* XFS_TRANS_DEBUG */
 
-#ifdef XFS_BLI_TRACE
-        ktrace_free(bip->bli_trace);
-#endif
         kmem_zone_free(xfs_buf_item_zone, bip);
 }
 
@@ -897,7 +890,8 @@ xfs_buf_item_relse(
 {
         xfs_buf_log_item_t      *bip;
 
-        xfs_buftrace("XFS_RELSE", bp);
+        trace_xfs_buf_item_relse(bp, _RET_IP_);
+
         bip = XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t*);
         XFS_BUF_SET_FSPRIVATE(bp, bip->bli_item.li_bio_list);
         if ((XFS_BUF_FSPRIVATE(bp, void *) == NULL) &&
@@ -994,7 +988,7 @@ xfs_buf_iodone_callbacks(
                 if (XFS_FORCED_SHUTDOWN(mp)) {
                         ASSERT(XFS_BUF_TARGET(bp) == mp->m_ddev_targp);
                         XFS_BUF_SUPER_STALE(bp);
-                        xfs_buftrace("BUF_IODONE_CB", bp);
+                        trace_xfs_buf_item_iodone(bp, _RET_IP_);
                         xfs_buf_do_callbacks(bp, lip);
                         XFS_BUF_SET_FSPRIVATE(bp, NULL);
                         XFS_BUF_CLR_IODONE_FUNC(bp);
@@ -1030,7 +1024,7 @@ xfs_buf_iodone_callbacks(
                                 XFS_BUF_SET_START(bp);
                         }
                         ASSERT(XFS_BUF_IODONE_FUNC(bp));
-                        xfs_buftrace("BUF_IODONE ASYNC", bp);
+                        trace_xfs_buf_item_iodone_async(bp, _RET_IP_);
                         xfs_buf_relse(bp);
                 } else {
                         /*
@@ -1053,9 +1047,7 @@ xfs_buf_iodone_callbacks(
                 }
                 return;
         }
-#ifdef XFSERRORDEBUG
-        xfs_buftrace("XFS BUFCB NOERR", bp);
-#endif
+
         xfs_buf_do_callbacks(bp, lip);
         XFS_BUF_SET_FSPRIVATE(bp, NULL);
         XFS_BUF_CLR_IODONE_FUNC(bp);
@@ -1081,7 +1073,9 @@ xfs_buf_error_relse(
         XFS_BUF_DONE(bp);
         XFS_BUF_UNDELAYWRITE(bp);
         XFS_BUF_ERROR(bp,0);
-        xfs_buftrace("BUF_ERROR_RELSE", bp);
+
+        trace_xfs_buf_error_relse(bp, _RET_IP_);
+
         if (! XFS_FORCED_SHUTDOWN(mp))
                 xfs_force_shutdown(mp, SHUTDOWN_META_IO_ERROR);
         /*
@@ -1128,34 +1122,3 @@ xfs_buf_iodone(
         xfs_trans_ail_delete(ailp, (xfs_log_item_t *)bip);
         xfs_buf_item_free(bip);
 }
-
-#if defined(XFS_BLI_TRACE)
-void
-xfs_buf_item_trace(
-        char                    *id,
-        xfs_buf_log_item_t      *bip)
-{
-        xfs_buf_t               *bp;
-        ASSERT(bip->bli_trace != NULL);
-
-        bp = bip->bli_buf;
-        ktrace_enter(bip->bli_trace,
-                     (void *)id,
-                     (void *)bip->bli_buf,
-                     (void *)((unsigned long)bip->bli_flags),
-                     (void *)((unsigned long)bip->bli_recur),
-                     (void *)((unsigned long)atomic_read(&bip->bli_refcount)),
-                     (void *)((unsigned long)
-                                (0xFFFFFFFF & XFS_BUF_ADDR(bp) >> 32)),
-                     (void *)((unsigned long)(0xFFFFFFFF & XFS_BUF_ADDR(bp))),
-                     (void *)((unsigned long)XFS_BUF_COUNT(bp)),
-                     (void *)((unsigned long)XFS_BUF_BFLAGS(bp)),
-                     XFS_BUF_FSPRIVATE(bp, void *),
-                     XFS_BUF_FSPRIVATE2(bp, void *),
-                     (void *)(unsigned long)XFS_BUF_ISPINNED(bp),
-                     (void *)XFS_BUF_IODONE_FUNC(bp),
-                     (void *)((unsigned long)(XFS_BUF_VALUSEMA(bp))),
-                     (void *)bip->bli_item.li_desc,
-                     (void *)((unsigned long)bip->bli_item.li_flags));
-}
-#endif /* XFS_BLI_TRACE */
diff --git a/fs/xfs/xfs_buf_item.h b/fs/xfs/xfs_buf_item.h
index 5a41c348bb1c..217f34af00cb 100644
--- a/fs/xfs/xfs_buf_item.h
+++ b/fs/xfs/xfs_buf_item.h
@@ -70,22 +70,21 @@ typedef struct xfs_buf_log_format_t {
 #define XFS_BLI_INODE_ALLOC_BUF 0x10
 #define XFS_BLI_STALE_INODE     0x20
 
+#define XFS_BLI_FLAGS \
+        { XFS_BLI_HOLD,         "HOLD" }, \
+        { XFS_BLI_DIRTY,        "DIRTY" }, \
+        { XFS_BLI_STALE,        "STALE" }, \
+        { XFS_BLI_LOGGED,       "LOGGED" }, \
+        { XFS_BLI_INODE_ALLOC_BUF, "INODE_ALLOC" }, \
+        { XFS_BLI_STALE_INODE,  "STALE_INODE" }
+
 
 #ifdef __KERNEL__
 
 struct xfs_buf;
-struct ktrace;
 struct xfs_mount;
 struct xfs_buf_log_item;
 
-#if defined(XFS_BLI_TRACE)
-#define XFS_BLI_TRACE_SIZE      32
-
-void    xfs_buf_item_trace(char *, struct xfs_buf_log_item *);
-#else
-#define xfs_buf_item_trace(id, bip)
-#endif
-
 /*
  * This is the in core log item structure used to track information
  * needed to log buffers.  It tracks how many times the lock has been
@@ -97,9 +96,6 @@ typedef struct xfs_buf_log_item {
         unsigned int            bli_flags;      /* misc flags */
         unsigned int            bli_recur;      /* lock recursion count */
         atomic_t                bli_refcount;   /* cnt of tp refs */
-#ifdef XFS_BLI_TRACE
-        struct ktrace           *bli_trace;     /* event trace buf */
-#endif
 #ifdef XFS_TRANS_DEBUG
         char                    *bli_orig;      /* original buffer copy */
         char                    *bli_logged;    /* bytes logged (bitmap) */
diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index 2847bbc1c534..c0c8869115b1 100644
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
@@ -46,6 +46,7 @@
 #include "xfs_dir2_block.h"
 #include "xfs_dir2_node.h"
 #include "xfs_error.h"
+#include "xfs_trace.h"
 
 /*
  * xfs_da_btree.c
@@ -2107,7 +2108,7 @@ xfs_da_do_buf(
                                    (be32_to_cpu(free->hdr.magic) != XFS_DIR2_FREE_MAGIC),
                                 mp, XFS_ERRTAG_DA_READ_BUF,
                                 XFS_RANDOM_DA_READ_BUF))) {
-                        xfs_buftrace("DA READ ERROR", rbp->bps[0]);
+                        trace_xfs_da_btree_corrupt(rbp->bps[0], _RET_IP_);
                         XFS_CORRUPTION_ERROR("xfs_da_do_buf(2)",
                                              XFS_ERRLEVEL_LOW, mp, info);
                         error = XFS_ERROR(EFSCORRUPTED);
diff --git a/fs/xfs/xfs_da_btree.h b/fs/xfs/xfs_da_btree.h
index 8c536167bf75..30cd08f56a3a 100644
--- a/fs/xfs/xfs_da_btree.h
+++ b/fs/xfs/xfs_da_btree.h
@@ -125,6 +125,13 @@ typedef struct xfs_da_args {
 #define XFS_DA_OP_OKNOENT       0x0008  /* lookup/add op, ENOENT ok, else die */
 #define XFS_DA_OP_CILOOKUP      0x0010  /* lookup to return CI name if found */
 
+#define XFS_DA_OP_FLAGS \
+        { XFS_DA_OP_JUSTCHECK,  "JUSTCHECK" }, \
+        { XFS_DA_OP_RENAME,     "RENAME" }, \
+        { XFS_DA_OP_ADDNAME,    "ADDNAME" }, \
+        { XFS_DA_OP_OKNOENT,    "OKNOENT" }, \
+        { XFS_DA_OP_CILOOKUP,   "CILOOKUP" }
+
 /*
  * Structure to describe buffer(s) for a block.
  * This is needed in the directory version 2 format case, when
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c
index ab89a7e94a0f..d1483a4f71b8 100644
--- a/fs/xfs/xfs_dfrag.c
+++ b/fs/xfs/xfs_dfrag.c
@@ -43,6 +43,7 @@
 #include "xfs_error.h"
 #include "xfs_rw.h"
 #include "xfs_vnodeops.h"
+#include "xfs_trace.h"
 
 /*
  * Syssgi interface for swapext
@@ -168,7 +169,6 @@ xfs_swap_extents(
         }
 
         if (VN_CACHED(VFS_I(tip)) != 0) {
-                xfs_inval_cached_trace(tip, 0, -1, 0, -1);
                 error = xfs_flushinval_pages(tip, 0, -1,
                                 FI_REMAPF_LOCKED);
                 if (error)
diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c
index bb1d58eb3982..93634a7e90e9 100644
--- a/fs/xfs/xfs_dir2.c
+++ b/fs/xfs/xfs_dir2.c
@@ -40,9 +40,9 @@
 #include "xfs_dir2_leaf.h"
 #include "xfs_dir2_block.h"
 #include "xfs_dir2_node.h"
-#include "xfs_dir2_trace.h"
 #include "xfs_error.h"
 #include "xfs_vnodeops.h"
+#include "xfs_trace.h"
 
 struct xfs_name xfs_name_dotdot = {"..", 2};
 
@@ -525,7 +525,8 @@ xfs_dir2_grow_inode(
         xfs_trans_t     *tp;
         xfs_drfsbno_t   nblks;
 
-        xfs_dir2_trace_args_s("grow_inode", args, space);
+        trace_xfs_dir2_grow_inode(args, space);
+
         dp = args->dp;
         tp = args->trans;
         mp = dp->i_mount;
@@ -703,7 +704,8 @@ xfs_dir2_shrink_inode(
         xfs_mount_t     *mp;
         xfs_trans_t     *tp;
 
-        xfs_dir2_trace_args_db("shrink_inode", args, db, bp);
+        trace_xfs_dir2_shrink_inode(args, db);
+
         dp = args->dp;
         mp = dp->i_mount;
         tp = args->trans;
diff --git a/fs/xfs/xfs_dir2_block.c b/fs/xfs/xfs_dir2_block.c
index ab52e9e1c1ee..ddc4ecc7807f 100644
--- a/fs/xfs/xfs_dir2_block.c
+++ b/fs/xfs/xfs_dir2_block.c
@@ -36,8 +36,8 @@
 #include "xfs_dir2_data.h"
 #include "xfs_dir2_leaf.h"
 #include "xfs_dir2_block.h"
-#include "xfs_dir2_trace.h"
 #include "xfs_error.h"
+#include "xfs_trace.h"
 
 /*
  * Local function prototypes.
@@ -94,7 +94,8 @@ xfs_dir2_block_addname(
         __be16                  *tagp;          /* pointer to tag value */
         xfs_trans_t             *tp;            /* transaction structure */
 
-        xfs_dir2_trace_args("block_addname", args);
+        trace_xfs_dir2_block_addname(args);
+
         dp = args->dp;
         tp = args->trans;
         mp = dp->i_mount;
@@ -590,7 +591,8 @@ xfs_dir2_block_lookup(
         int                     error;          /* error return value */
         xfs_mount_t             *mp;            /* filesystem mount point */
 
-        xfs_dir2_trace_args("block_lookup", args);
+        trace_xfs_dir2_block_lookup(args);
+
         /*
          * Get the buffer, look up the entry.
          * If not found (ENOENT) then return, have no buffer.
@@ -747,7 +749,8 @@ xfs_dir2_block_removename(
         int                     size;           /* shortform size */
         xfs_trans_t             *tp;            /* transaction pointer */
 
-        xfs_dir2_trace_args("block_removename", args);
+        trace_xfs_dir2_block_removename(args);
+
         /*
          * Look up the entry in the block.  Gets the buffer and entry index.
          * It will always be there, the vnodeops level does a lookup first.
@@ -823,7 +826,8 @@ xfs_dir2_block_replace(
         int                     error;          /* error return value */
         xfs_mount_t             *mp;            /* filesystem mount point */
 
-        xfs_dir2_trace_args("block_replace", args);
+        trace_xfs_dir2_block_replace(args);
+
         /*
          * Lookup the entry in the directory.  Get buffer and entry index.
          * This will always succeed since the caller has already done a lookup.
@@ -897,7 +901,8 @@ xfs_dir2_leaf_to_block(
         int                     to;             /* block/leaf to index */
         xfs_trans_t             *tp;            /* transaction pointer */
 
-        xfs_dir2_trace_args_bb("leaf_to_block", args, lbp, dbp);
+        trace_xfs_dir2_leaf_to_block(args);
+
         dp = args->dp;
         tp = args->trans;
         mp = dp->i_mount;
@@ -1044,7 +1049,8 @@ xfs_dir2_sf_to_block(
         xfs_trans_t             *tp;            /* transaction pointer */
         struct xfs_name         name;
 
-        xfs_dir2_trace_args("sf_to_block", args);
+        trace_xfs_dir2_sf_to_block(args);
+
         dp = args->dp;
         tp = args->trans;
         mp = dp->i_mount;
diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/xfs_dir2_leaf.c
index 41ad537c49e9..29f484c11b3a 100644
--- a/fs/xfs/xfs_dir2_leaf.c
+++ b/fs/xfs/xfs_dir2_leaf.c
@@ -38,8 +38,8 @@
 #include "xfs_dir2_leaf.h"
 #include "xfs_dir2_block.h"
 #include "xfs_dir2_node.h"
-#include "xfs_dir2_trace.h"
 #include "xfs_error.h"
+#include "xfs_trace.h"
 
 /*
  * Local function declarations.
@@ -80,7 +80,8 @@ xfs_dir2_block_to_leaf(
         int                     needscan;       /* need to rescan bestfree */
         xfs_trans_t             *tp;            /* transaction pointer */
 
-        xfs_dir2_trace_args_b("block_to_leaf", args, dbp);
+        trace_xfs_dir2_block_to_leaf(args);
+
         dp = args->dp;
         mp = dp->i_mount;
         tp = args->trans;
@@ -188,7 +189,8 @@ xfs_dir2_leaf_addname(
         xfs_trans_t             *tp;            /* transaction pointer */
         xfs_dir2_db_t           use_block;      /* data block number */
 
-        xfs_dir2_trace_args("leaf_addname", args);
+        trace_xfs_dir2_leaf_addname(args);
+
         dp = args->dp;
         tp = args->trans;
         mp = dp->i_mount;
@@ -1266,7 +1268,8 @@ xfs_dir2_leaf_lookup(
         xfs_dir2_leaf_entry_t   *lep;           /* leaf entry */
         xfs_trans_t             *tp;            /* transaction pointer */
 
-        xfs_dir2_trace_args("leaf_lookup", args);
+        trace_xfs_dir2_leaf_lookup(args);
+
         /*
          * Look up name in the leaf block, returning both buffers and index.
          */
@@ -1454,7 +1457,8 @@ xfs_dir2_leaf_removename(
         xfs_dir2_data_off_t     oldbest;        /* old value of best free */
         xfs_trans_t             *tp;            /* transaction pointer */
 
-        xfs_dir2_trace_args("leaf_removename", args);
+        trace_xfs_dir2_leaf_removename(args);
+
         /*
          * Lookup the leaf entry, get the leaf and data blocks read in.
          */
@@ -1586,7 +1590,8 @@ xfs_dir2_leaf_replace(
         xfs_dir2_leaf_entry_t   *lep;           /* leaf entry */
         xfs_trans_t             *tp;            /* transaction pointer */
 
-        xfs_dir2_trace_args("leaf_replace", args);
+        trace_xfs_dir2_leaf_replace(args);
+
         /*
          * Look up the entry.
          */
@@ -1766,7 +1771,9 @@ xfs_dir2_node_to_leaf(
         if (state->path.active > 1)
                 return 0;
         args = state->args;
-        xfs_dir2_trace_args("node_to_leaf", args);
+
+        trace_xfs_dir2_node_to_leaf(args);
+
         mp = state->mp;
         dp = args->dp;
         tp = args->trans;
diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/xfs_dir2_node.c
index 5a81ccd1045b..ce6e355199b5 100644
--- a/fs/xfs/xfs_dir2_node.c
+++ b/fs/xfs/xfs_dir2_node.c
@@ -37,8 +37,8 @@
 #include "xfs_dir2_leaf.h"
 #include "xfs_dir2_block.h"
 #include "xfs_dir2_node.h"
-#include "xfs_dir2_trace.h"
 #include "xfs_error.h"
+#include "xfs_trace.h"
 
 /*
  * Function declarations.
@@ -123,7 +123,8 @@ xfs_dir2_leaf_to_node(
         __be16                  *to;            /* pointer to freespace entry */
         xfs_trans_t             *tp;            /* transaction pointer */
 
-        xfs_dir2_trace_args_b("leaf_to_node", args, lbp);
+        trace_xfs_dir2_leaf_to_node(args);
+
         dp = args->dp;
         mp = dp->i_mount;
         tp = args->trans;
@@ -196,7 +197,8 @@ xfs_dir2_leafn_add(
         xfs_mount_t             *mp;            /* filesystem mount point */
         xfs_trans_t             *tp;            /* transaction pointer */
 
-        xfs_dir2_trace_args_sb("leafn_add", args, index, bp);
+        trace_xfs_dir2_leafn_add(args, index);
+
         dp = args->dp;
         mp = dp->i_mount;
         tp = args->trans;
@@ -711,8 +713,8 @@ xfs_dir2_leafn_moveents(
         int             stale;                  /* count stale leaves copied */
         xfs_trans_t     *tp;                    /* transaction pointer */
 
-        xfs_dir2_trace_args_bibii("leafn_moveents", args, bp_s, start_s, bp_d,
-                start_d, count);
+        trace_xfs_dir2_leafn_moveents(args, start_s, start_d, count);
+
         /*
          * Silently return if nothing to do.
          */
@@ -933,7 +935,8 @@ xfs_dir2_leafn_remove(
         int                     needscan;       /* need to rescan data frees */
         xfs_trans_t             *tp;            /* transaction pointer */
 
-        xfs_dir2_trace_args_sb("leafn_remove", args, index, bp);
+        trace_xfs_dir2_leafn_remove(args, index);
+
         dp = args->dp;
         tp = args->trans;
         mp = dp->i_mount;
@@ -1363,7 +1366,8 @@ xfs_dir2_node_addname(
         int                     rval;           /* sub-return value */
         xfs_da_state_t          *state;         /* btree cursor */
 
-        xfs_dir2_trace_args("node_addname", args);
+        trace_xfs_dir2_node_addname(args);
+
         /*
          * Allocate and initialize the state (btree cursor).
          */
@@ -1822,7 +1826,8 @@ xfs_dir2_node_lookup(
         int             rval;                   /* operation return value */
         xfs_da_state_t  *state;                 /* btree cursor */
 
-        xfs_dir2_trace_args("node_lookup", args);
+        trace_xfs_dir2_node_lookup(args);
+
         /*
          * Allocate and initialize the btree cursor.
          */
@@ -1875,7 +1880,8 @@ xfs_dir2_node_removename(
         int                     rval;           /* operation return value */
         xfs_da_state_t          *state;         /* btree cursor */
 
-        xfs_dir2_trace_args("node_removename", args);
+        trace_xfs_dir2_node_removename(args);
+
         /*
          * Allocate and initialize the btree cursor.
          */
@@ -1944,7 +1950,8 @@ xfs_dir2_node_replace(
         int                     rval;           /* internal return value */
         xfs_da_state_t          *state;         /* btree cursor */
 
-        xfs_dir2_trace_args("node_replace", args);
+        trace_xfs_dir2_node_replace(args);
+
         /*
          * Allocate and initialize the btree cursor.
          */
diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
index e89734e84646..9d4f17a69676 100644
--- a/fs/xfs/xfs_dir2_sf.c
+++ b/fs/xfs/xfs_dir2_sf.c
@@ -37,7 +37,7 @@
 #include "xfs_dir2_data.h"
 #include "xfs_dir2_leaf.h"
 #include "xfs_dir2_block.h"
-#include "xfs_dir2_trace.h"
+#include "xfs_trace.h"
 
 /*
  * Prototypes for internal functions.
@@ -169,7 +169,8 @@ xfs_dir2_block_to_sf(
         xfs_dir2_sf_t           *sfp;           /* shortform structure */
         xfs_ino_t               temp;
 
-        xfs_dir2_trace_args_sb("block_to_sf", args, size, bp);
+        trace_xfs_dir2_block_to_sf(args);
+
         dp = args->dp;
         mp = dp->i_mount;
 
@@ -281,7 +282,8 @@ xfs_dir2_sf_addname(
         xfs_dir2_sf_t           *sfp;           /* shortform structure */
         xfs_dir2_sf_entry_t     *sfep = NULL;   /* shortform entry */
 
-        xfs_dir2_trace_args("sf_addname", args);
+        trace_xfs_dir2_sf_addname(args);
+
         ASSERT(xfs_dir2_sf_lookup(args) == ENOENT);
         dp = args->dp;
         ASSERT(dp->i_df.if_flags & XFS_IFINLINE);
@@ -654,7 +656,8 @@ xfs_dir2_sf_create(
         xfs_dir2_sf_t   *sfp;           /* shortform structure */
         int             size;           /* directory size */
 
-        xfs_dir2_trace_args_i("sf_create", args, pino);
+        trace_xfs_dir2_sf_create(args);
+
         dp = args->dp;
 
         ASSERT(dp != NULL);
@@ -808,7 +811,8 @@ xfs_dir2_sf_lookup(
         enum xfs_dacmp          cmp;            /* comparison result */
         xfs_dir2_sf_entry_t     *ci_sfep;       /* case-insens. entry */
 
-        xfs_dir2_trace_args("sf_lookup", args);
+        trace_xfs_dir2_sf_lookup(args);
+
         xfs_dir2_sf_check(args);
         dp = args->dp;
 
@@ -891,7 +895,8 @@ xfs_dir2_sf_removename(
         xfs_dir2_sf_entry_t     *sfep;          /* shortform directory entry */
         xfs_dir2_sf_t           *sfp;           /* shortform structure */
 
-        xfs_dir2_trace_args("sf_removename", args);
+        trace_xfs_dir2_sf_removename(args);
+
         dp = args->dp;
 
         ASSERT(dp->i_df.if_flags & XFS_IFINLINE);
@@ -982,7 +987,8 @@ xfs_dir2_sf_replace(
         xfs_dir2_sf_entry_t     *sfep;          /* shortform directory entry */
         xfs_dir2_sf_t           *sfp;           /* shortform structure */
 
-        xfs_dir2_trace_args("sf_replace", args);
+        trace_xfs_dir2_sf_replace(args);
+
         dp = args->dp;
 
         ASSERT(dp->i_df.if_flags & XFS_IFINLINE);
@@ -1125,7 +1131,8 @@ xfs_dir2_sf_toino4(
         xfs_dir2_sf_entry_t     *sfep;          /* new sf entry */
         xfs_dir2_sf_t           *sfp;           /* new sf directory */
 
-        xfs_dir2_trace_args("sf_toino4", args);
+        trace_xfs_dir2_sf_toino4(args);
+
         dp = args->dp;
 
         /*
@@ -1202,7 +1209,8 @@ xfs_dir2_sf_toino8(
         xfs_dir2_sf_entry_t     *sfep;          /* new sf entry */
         xfs_dir2_sf_t           *sfp;           /* new sf directory */
 
-        xfs_dir2_trace_args("sf_toino8", args);
+        trace_xfs_dir2_sf_toino8(args);
+
         dp = args->dp;
 
         /*
diff --git a/fs/xfs/xfs_dir2_trace.c b/fs/xfs/xfs_dir2_trace.c
deleted file mode 100644
index 6cc7c0c681ac..000000000000
--- a/fs/xfs/xfs_dir2_trace.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2000-2003,2005 Silicon Graphics, 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 License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#include "xfs.h"
-#include "xfs_fs.h"
-#include "xfs_types.h"
-#include "xfs_inum.h"
-#include "xfs_dir2.h"
-#include "xfs_da_btree.h"
-#include "xfs_bmap_btree.h"
-#include "xfs_dir2_sf.h"
-#include "xfs_attr_sf.h"
-#include "xfs_dinode.h"
-#include "xfs_inode.h"
-#include "xfs_dir2_trace.h"
-
-#ifdef XFS_DIR2_TRACE
-ktrace_t        *xfs_dir2_trace_buf;
-
-/*
- * Enter something in the trace buffers.
- */
-static void
-xfs_dir2_trace_enter(
-        xfs_inode_t     *dp,
-        int             type,
-        char            *where,
-        char            *name,
-        int             namelen,
-        void            *a0,
-        void            *a1,
-        void            *a2,
-        void            *a3,
-        void            *a4,
-        void            *a5,
-        void            *a6,
-        void            *a7)
-{
-        void            *n[5];
-
-        ASSERT(xfs_dir2_trace_buf);
-        ASSERT(dp->i_dir_trace);
-        if (name)
-                memcpy(n, name, min((int)sizeof(n), namelen));
-        else
-                memset((char *)n, 0, sizeof(n));
-        ktrace_enter(xfs_dir2_trace_buf,
-                (void *)(long)type, (void *)where,
-                (void *)a0, (void *)a1, (void *)a2, (void *)a3,
-                (void *)a4, (void *)a5, (void *)a6, (void *)a7,
-                (void *)(long)namelen,
-                (void *)n[0], (void *)n[1], (void *)n[2],
-                (void *)n[3], (void *)n[4]);
-        ktrace_enter(dp->i_dir_trace,
-                (void *)(long)type, (void *)where,
-                (void *)a0, (void *)a1, (void *)a2, (void *)a3,
-                (void *)a4, (void *)a5, (void *)a6, (void *)a7,
-                (void *)(long)namelen,
-                (void *)n[0], (void *)n[1], (void *)n[2],
-                (void *)n[3], (void *)n[4]);
-}
-
-void
-xfs_dir2_trace_args(
-        char            *where,
-        xfs_da_args_t   *args)
-{
-        xfs_dir2_trace_enter(args->dp, XFS_DIR2_KTRACE_ARGS, where,
-                (char *)args->name, (int)args->namelen,
-                (void *)(unsigned long)args->hashval,
-                (void *)((unsigned long)(args->inumber >> 32)),
-                (void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
-                (void *)args->dp, (void *)args->trans,
-                (void *)(unsigned long)(args->op_flags & XFS_DA_OP_JUSTCHECK),
-                NULL, NULL);
-}
-
-void
-xfs_dir2_trace_args_b(
-        char            *where,
-        xfs_da_args_t   *args,
-        xfs_dabuf_t     *bp)
-{
-        xfs_dir2_trace_enter(args->dp, XFS_DIR2_KTRACE_ARGS_B, where,
-                (char *)args->name, (int)args->namelen,
-                (void *)(unsigned long)args->hashval,
-                (void *)((unsigned long)(args->inumber >> 32)),
-                (void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
-                (void *)args->dp, (void *)args->trans,
-                (void *)(unsigned long)(args->op_flags & XFS_DA_OP_JUSTCHECK),
-                (void *)(bp ? bp->bps[0] : NULL), NULL);
-}
-
-void
-xfs_dir2_trace_args_bb(
-        char            *where,
-        xfs_da_args_t   *args,
-        xfs_dabuf_t     *lbp,
-        xfs_dabuf_t     *dbp)
-{
-        xfs_dir2_trace_enter(args->dp, XFS_DIR2_KTRACE_ARGS_BB, where,
-                (char *)args->name, (int)args->namelen,
-                (void *)(unsigned long)args->hashval,
-                (void *)((unsigned long)(args->inumber >> 32)),
-                (void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
-                (void *)args->dp, (void *)args->trans,
-                (void *)(unsigned long)(args->op_flags & XFS_DA_OP_JUSTCHECK),
-                (void *)(lbp ? lbp->bps[0] : NULL),
-                (void *)(dbp ? dbp->bps[0] : NULL));
-}
-
-void
-xfs_dir2_trace_args_bibii(
-        char            *where,
-        xfs_da_args_t   *args,
-        xfs_dabuf_t     *bs,
-        int             ss,
-        xfs_dabuf_t     *bd,
-        int             sd,
-        int             c)
-{
-        xfs_buf_t       *bpbs = bs ? bs->bps[0] : NULL;
-        xfs_buf_t       *bpbd = bd ? bd->bps[0] : NULL;
-
-        xfs_dir2_trace_enter(args->dp, XFS_DIR2_KTRACE_ARGS_BIBII, where,
-                (char *)args->name, (int)args->namelen,
-                (void *)args->dp, (void *)args->trans,
-                (void *)bpbs, (void *)(long)ss, (void *)bpbd, (void *)(long)sd,
-                (void *)(long)c, NULL);
-}
-
-void
-xfs_dir2_trace_args_db(
-        char            *where,
-        xfs_da_args_t   *args,
-        xfs_dir2_db_t   db,
-        xfs_dabuf_t     *bp)
-{
-        xfs_buf_t       *dbp = bp ? bp->bps[0] : NULL;
-
-        xfs_dir2_trace_enter(args->dp, XFS_DIR2_KTRACE_ARGS_DB, where,
-                (char *)args->name, (int)args->namelen,
-                (void *)(unsigned long)args->hashval,
-                (void *)((unsigned long)(args->inumber >> 32)),
-                (void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
-                (void *)args->dp, (void *)args->trans,
-                (void *)(unsigned long)(args->op_flags & XFS_DA_OP_JUSTCHECK),
-                (void *)(long)db, (void *)dbp);
-}
-
-void
-xfs_dir2_trace_args_i(
-        char            *where,
-        xfs_da_args_t   *args,
-        xfs_ino_t       i)
-{
-        xfs_dir2_trace_enter(args->dp, XFS_DIR2_KTRACE_ARGS_I, where,
-                (char *)args->name, (int)args->namelen,
-                (void *)(unsigned long)args->hashval,
-                (void *)((unsigned long)(args->inumber >> 32)),
-                (void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
-                (void *)args->dp, (void *)args->trans,
-                (void *)(unsigned long)(args->op_flags & XFS_DA_OP_JUSTCHECK),
-                (void *)((unsigned long)(i >> 32)),
-                (void *)((unsigned long)(i & 0xFFFFFFFF)));
-}
-
-void
-xfs_dir2_trace_args_s(
-        char            *where,
-        xfs_da_args_t   *args,
-        int             s)
-{
-        xfs_dir2_trace_enter(args->dp, XFS_DIR2_KTRACE_ARGS_S, where,
-                (char *)args->name, (int)args->namelen,
-                (void *)(unsigned long)args->hashval,
-                (void *)((unsigned long)(args->inumber >> 32)),
-                (void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
-                (void *)args->dp, (void *)args->trans,
-                (void *)(unsigned long)(args->op_flags & XFS_DA_OP_JUSTCHECK),
-                (void *)(long)s, NULL);
-}
-
-void
-xfs_dir2_trace_args_sb(
-        char            *where,
-        xfs_da_args_t   *args,
-        int             s,
-        xfs_dabuf_t     *bp)
-{
-        xfs_buf_t       *dbp = bp ? bp->bps[0] : NULL;
-
-        xfs_dir2_trace_enter(args->dp, XFS_DIR2_KTRACE_ARGS_SB, where,
-                (char *)args->name, (int)args->namelen,
-                (void *)(unsigned long)args->hashval,
-                (void *)((unsigned long)(args->inumber >> 32)),
-                (void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
-                (void *)args->dp, (void *)args->trans,
-                (void *)(unsigned long)(args->op_flags & XFS_DA_OP_JUSTCHECK),
-                (void *)(long)s, (void *)dbp);
-}
-#endif  /* XFS_DIR2_TRACE */
diff --git a/fs/xfs/xfs_dir2_trace.h b/fs/xfs/xfs_dir2_trace.h
deleted file mode 100644
index ca3c754f4822..000000000000
--- a/fs/xfs/xfs_dir2_trace.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2000,2005 Silicon Graphics, 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 License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#ifndef __XFS_DIR2_TRACE_H__
-#define __XFS_DIR2_TRACE_H__
-
-/*
- * Tracing for xfs v2 directories.
- */
-
-#if defined(XFS_DIR2_TRACE)
-
-struct ktrace;
-struct xfs_dabuf;
-struct xfs_da_args;
-
-#define XFS_DIR2_GTRACE_SIZE            4096    /* global buffer */
-#define XFS_DIR2_KTRACE_SIZE            32      /* per-inode buffer */
-extern struct ktrace *xfs_dir2_trace_buf;
-
-#define XFS_DIR2_KTRACE_ARGS            1       /* args only */
-#define XFS_DIR2_KTRACE_ARGS_B          2       /* args + buffer */
-#define XFS_DIR2_KTRACE_ARGS_BB         3       /* args + 2 buffers */
-#define XFS_DIR2_KTRACE_ARGS_DB         4       /* args, db, buffer */
-#define XFS_DIR2_KTRACE_ARGS_I          5       /* args, inum */
-#define XFS_DIR2_KTRACE_ARGS_S          6       /* args, int */
-#define XFS_DIR2_KTRACE_ARGS_SB         7       /* args, int, buffer */
-#define XFS_DIR2_KTRACE_ARGS_BIBII      8       /* args, buf/int/buf/int/int */
-
-void xfs_dir2_trace_args(char *where, struct xfs_da_args *args);
-void xfs_dir2_trace_args_b(char *where, struct xfs_da_args *args,
-                           struct xfs_dabuf *bp);
-void xfs_dir2_trace_args_bb(char *where, struct xfs_da_args *args,
-                            struct xfs_dabuf *lbp, struct xfs_dabuf *dbp);
-void xfs_dir2_trace_args_bibii(char *where, struct xfs_da_args *args,
-                               struct xfs_dabuf *bs, int ss,
-                               struct xfs_dabuf *bd, int sd, int c);
-void xfs_dir2_trace_args_db(char *where, struct xfs_da_args *args,
-                            xfs_dir2_db_t db, struct xfs_dabuf *bp);
-void xfs_dir2_trace_args_i(char *where, struct xfs_da_args *args, xfs_ino_t i);
-void xfs_dir2_trace_args_s(char *where, struct xfs_da_args *args, int s);
-void xfs_dir2_trace_args_sb(char *where, struct xfs_da_args *args, int s,
-                            struct xfs_dabuf *bp);
-
-#else   /* XFS_DIR2_TRACE */
-
-#define xfs_dir2_trace_args(where, args)
-#define xfs_dir2_trace_args_b(where, args, bp)
-#define xfs_dir2_trace_args_bb(where, args, lbp, dbp)
-#define xfs_dir2_trace_args_bibii(where, args, bs, ss, bd, sd, c)
-#define xfs_dir2_trace_args_db(where, args, db, bp)
-#define xfs_dir2_trace_args_i(where, args, i)
-#define xfs_dir2_trace_args_s(where, args, s)
-#define xfs_dir2_trace_args_sb(where, args, s, bp)
-
-#endif  /* XFS_DIR2_TRACE */
-
-#endif  /* __XFS_DIR2_TRACE_H__ */
diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c
index edf8bdf4141f..a631e1451abb 100644
--- a/fs/xfs/xfs_filestream.c
+++ b/fs/xfs/xfs_filestream.c
@@ -34,6 +34,7 @@
 #include "xfs_utils.h"
 #include "xfs_mru_cache.h"
 #include "xfs_filestream.h"
+#include "xfs_trace.h"
 
 #ifdef XFS_FILESTREAMS_TRACE
 
@@ -394,9 +395,7 @@ xfs_filestream_init(void)
         item_zone = kmem_zone_init(sizeof(fstrm_item_t), "fstrm_item");
         if (!item_zone)
                 return -ENOMEM;
-#ifdef XFS_FILESTREAMS_TRACE
-        xfs_filestreams_trace_buf = ktrace_alloc(XFS_FSTRM_KTRACE_SIZE, KM_NOFS);
-#endif
+
         return 0;
 }
 
@@ -407,9 +406,6 @@ xfs_filestream_init(void)
 void
 xfs_filestream_uninit(void)
 {
-#ifdef XFS_FILESTREAMS_TRACE
-        ktrace_free(xfs_filestreams_trace_buf);
-#endif
         kmem_zone_destroy(item_zone);
 }
 
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 36079aa91344..a13919a6a364 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -45,6 +45,7 @@
 #include "xfs_rtalloc.h"
 #include "xfs_rw.h"
 #include "xfs_filestream.h"
+#include "xfs_trace.h"
 
 /*
  * File system operations
@@ -347,6 +348,7 @@ xfs_growfs_data_private(
                 be32_add_cpu(&agf->agf_length, new);
                 ASSERT(be32_to_cpu(agf->agf_length) ==
                        be32_to_cpu(agi->agi_length));
+
                 xfs_alloc_log_agf(tp, bp, XFS_AGF_LENGTH);
                 /*
                  * Free the new space.
diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c
index 073bb4a26b19..f5c904a10c11 100644
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/xfs_iget.c
@@ -43,7 +43,7 @@
 #include "xfs_inode_item.h"
 #include "xfs_bmap.h"
 #include "xfs_btree_trace.h"
-#include "xfs_dir2_trace.h"
+#include "xfs_trace.h"
 
 
 /*
@@ -90,28 +90,6 @@ xfs_inode_alloc(
         ip->i_size = 0;
         ip->i_new_size = 0;
 
-        /*
-         * Initialize inode's trace buffers.
-         */
-#ifdef  XFS_INODE_TRACE
-        ip->i_trace = ktrace_alloc(INODE_TRACE_SIZE, KM_NOFS);
-#endif
-#ifdef XFS_BMAP_TRACE
-        ip->i_xtrace = ktrace_alloc(XFS_BMAP_KTRACE_SIZE, KM_NOFS);
-#endif
-#ifdef XFS_BTREE_TRACE
-        ip->i_btrace = ktrace_alloc(XFS_BMBT_KTRACE_SIZE, KM_NOFS);
-#endif
-#ifdef XFS_RW_TRACE
-        ip->i_rwtrace = ktrace_alloc(XFS_RW_KTRACE_SIZE, KM_NOFS);
-#endif
-#ifdef XFS_ILOCK_TRACE
-        ip->i_lock_trace = ktrace_alloc(XFS_ILOCK_KTRACE_SIZE, KM_NOFS);
-#endif
-#ifdef XFS_DIR2_TRACE
-        ip->i_dir_trace = ktrace_alloc(XFS_DIR2_KTRACE_SIZE, KM_NOFS);
-#endif
-
         /* prevent anyone from using this yet */
         VFS_I(ip)->i_state = I_NEW|I_LOCK;
 
@@ -133,25 +111,6 @@ xfs_inode_free(
         if (ip->i_afp)
                 xfs_idestroy_fork(ip, XFS_ATTR_FORK);
 
-#ifdef XFS_INODE_TRACE
-        ktrace_free(ip->i_trace);
-#endif
-#ifdef XFS_BMAP_TRACE
-        ktrace_free(ip->i_xtrace);
-#endif
-#ifdef XFS_BTREE_TRACE
-        ktrace_free(ip->i_btrace);
-#endif
-#ifdef XFS_RW_TRACE
-        ktrace_free(ip->i_rwtrace);
-#endif
-#ifdef XFS_ILOCK_TRACE
-        ktrace_free(ip->i_lock_trace);
-#endif
-#ifdef XFS_DIR2_TRACE
-        ktrace_free(ip->i_dir_trace);
-#endif
-
         if (ip->i_itemp) {
                 /*
                  * Only if we are shutting down the fs will we see an
@@ -210,6 +169,7 @@ xfs_iget_cache_hit(
          *           instead of polling for it.
          */
         if (ip->i_flags & (XFS_INEW|XFS_IRECLAIM)) {
+                trace_xfs_iget_skip(ip);
                 XFS_STATS_INC(xs_ig_frecycle);
                 error = EAGAIN;
                 goto out_error;
@@ -228,7 +188,7 @@ xfs_iget_cache_hit(
          * Need to carefully get it back into useable state.
          */
         if (ip->i_flags & XFS_IRECLAIMABLE) {
-                xfs_itrace_exit_tag(ip, "xfs_iget.alloc");
+                trace_xfs_iget_reclaim(ip);
 
                 /*
                  * We need to set XFS_INEW atomically with clearing the
@@ -254,6 +214,7 @@ xfs_iget_cache_hit(
                         ip->i_flags &= ~XFS_INEW;
                         ip->i_flags |= XFS_IRECLAIMABLE;
                         __xfs_inode_set_reclaim_tag(pag, ip);
+                        trace_xfs_iget_reclaim(ip);
                         goto out_error;
                 }
                 inode->i_state = I_LOCK|I_NEW;
@@ -273,8 +234,9 @@ xfs_iget_cache_hit(
                 xfs_ilock(ip, lock_flags);
 
         xfs_iflags_clear(ip, XFS_ISTALE);
-        xfs_itrace_exit_tag(ip, "xfs_iget.found");
         XFS_STATS_INC(xs_ig_found);
+
+        trace_xfs_iget_found(ip);
         return 0;
 
 out_error:
@@ -308,7 +270,7 @@ xfs_iget_cache_miss(
         if (error)
                 goto out_destroy;
 
-        xfs_itrace_exit_tag(ip, "xfs_iget.alloc");
+        xfs_itrace_entry(ip);
 
         if ((ip->i_d.di_mode == 0) && !(flags & XFS_IGET_CREATE)) {
                 error = ENOENT;
@@ -353,6 +315,8 @@ xfs_iget_cache_miss(
 
         write_unlock(&pag->pag_ici_lock);
         radix_tree_preload_end();
+
+        trace_xfs_iget_alloc(ip);
         *ipp = ip;
         return 0;
 
@@ -639,7 +603,7 @@ xfs_ilock(
         else if (lock_flags & XFS_ILOCK_SHARED)
                 mraccess_nested(&ip->i_lock, XFS_ILOCK_DEP(lock_flags));
 
-        xfs_ilock_trace(ip, 1, lock_flags, (inst_t *)__return_address);
+        trace_xfs_ilock(ip, lock_flags, _RET_IP_);
 }
 
 /*
@@ -684,7 +648,7 @@ xfs_ilock_nowait(
                 if (!mrtryaccess(&ip->i_lock))
                         goto out_undo_iolock;
         }
-        xfs_ilock_trace(ip, 2, lock_flags, (inst_t *)__return_address);
+        trace_xfs_ilock_nowait(ip, lock_flags, _RET_IP_);
         return 1;
 
  out_undo_iolock:
@@ -746,7 +710,7 @@ xfs_iunlock(
                 xfs_trans_unlocked_item(ip->i_itemp->ili_item.li_ailp,
                                         (xfs_log_item_t*)(ip->i_itemp));
         }
-        xfs_ilock_trace(ip, 3, lock_flags, (inst_t *)__return_address);
+        trace_xfs_iunlock(ip, lock_flags, _RET_IP_);
 }
 
 /*
@@ -765,6 +729,8 @@ xfs_ilock_demote(
                 mrdemote(&ip->i_lock);
         if (lock_flags & XFS_IOLOCK_EXCL)
                 mrdemote(&ip->i_iolock);
+
+        trace_xfs_ilock_demote(ip, lock_flags, _RET_IP_);
 }
 
 #ifdef DEBUG
@@ -795,52 +761,3 @@ xfs_isilocked(
         return 1;
 }
 #endif
-
-#ifdef  XFS_INODE_TRACE
-
-#define KTRACE_ENTER(ip, vk, s, line, ra)                       \
-        ktrace_enter((ip)->i_trace,                             \
-/*  0 */                (void *)(__psint_t)(vk),                \
-/*  1 */                (void *)(s),                            \
-/*  2 */                (void *)(__psint_t) line,               \
-/*  3 */                (void *)(__psint_t)atomic_read(&VFS_I(ip)->i_count), \
-/*  4 */                (void *)(ra),                           \
-/*  5 */                NULL,                                   \
-/*  6 */                (void *)(__psint_t)current_cpu(),       \
-/*  7 */                (void *)(__psint_t)current_pid(),       \
-/*  8 */                (void *)__return_address,               \
-/*  9 */                NULL, NULL, NULL, NULL, NULL, NULL, NULL)
-
-/*
- * Vnode tracing code.
- */
-void
-_xfs_itrace_entry(xfs_inode_t *ip, const char *func, inst_t *ra)
-{
-        KTRACE_ENTER(ip, INODE_KTRACE_ENTRY, func, 0, ra);
-}
-
-void
-_xfs_itrace_exit(xfs_inode_t *ip, const char *func, inst_t *ra)
-{
-        KTRACE_ENTER(ip, INODE_KTRACE_EXIT, func, 0, ra);
-}
-
-void
-xfs_itrace_hold(xfs_inode_t *ip, char *file, int line, inst_t *ra)
-{
-        KTRACE_ENTER(ip, INODE_KTRACE_HOLD, file, line, ra);
-}
-
-void
-_xfs_itrace_ref(xfs_inode_t *ip, char *file, int line, inst_t *ra)
-{
-        KTRACE_ENTER(ip, INODE_KTRACE_REF, file, line, ra);
-}
-
-void
-xfs_itrace_rele(xfs_inode_t *ip, char *file, int line, inst_t *ra)
-{
-        KTRACE_ENTER(ip, INODE_KTRACE_RELE, file, line, ra);
-}
-#endif  /* XFS_INODE_TRACE */
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index b92a4fa2a0a1..ce278b3ae7fc 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -47,10 +47,10 @@
 #include "xfs_rw.h"
 #include "xfs_error.h"
 #include "xfs_utils.h"
-#include "xfs_dir2_trace.h"
 #include "xfs_quota.h"
 #include "xfs_filestream.h"
 #include "xfs_vnodeops.h"
+#include "xfs_trace.h"
 
 kmem_zone_t *xfs_ifork_zone;
 kmem_zone_t *xfs_inode_zone;
@@ -1291,42 +1291,6 @@ xfs_file_last_byte(
         return last_byte;
 }
 
-#if defined(XFS_RW_TRACE)
-STATIC void
-xfs_itrunc_trace(
-        int             tag,
-        xfs_inode_t     *ip,
-        int             flag,
-        xfs_fsize_t     new_size,
-        xfs_off_t       toss_start,
-        xfs_off_t       toss_finish)
-{
-        if (ip->i_rwtrace == NULL) {
-                return;
-        }
-
-        ktrace_enter(ip->i_rwtrace,
-                     (void*)((long)tag),
-                     (void*)ip,
-                     (void*)(unsigned long)((ip->i_d.di_size >> 32) & 0xffffffff),
-                     (void*)(unsigned long)(ip->i_d.di_size & 0xffffffff),
-                     (void*)((long)flag),
-                     (void*)(unsigned long)((new_size >> 32) & 0xffffffff),
-                     (void*)(unsigned long)(new_size & 0xffffffff),
-                     (void*)(unsigned long)((toss_start >> 32) & 0xffffffff),
-                     (void*)(unsigned long)(toss_start & 0xffffffff),
-                     (void*)(unsigned long)((toss_finish >> 32) & 0xffffffff),
-                     (void*)(unsigned long)(toss_finish & 0xffffffff),
-                     (void*)(unsigned long)current_cpu(),
-                     (void*)(unsigned long)current_pid(),
-                     (void*)NULL,
-                     (void*)NULL,
-                     (void*)NULL);
-}
-#else
-#define xfs_itrunc_trace(tag, ip, flag, new_size, toss_start, toss_finish)
-#endif
-
 /*
  * Start the truncation of the file to new_size.  The new size
  * must be smaller than the current size.  This routine will
@@ -1409,8 +1373,7 @@ xfs_itruncate_start(
                 return 0;
         }
         last_byte = xfs_file_last_byte(ip);
-        xfs_itrunc_trace(XFS_ITRUNC_START, ip, flags, new_size, toss_start,
-                         last_byte);
+        trace_xfs_itruncate_start(ip, flags, new_size, toss_start, last_byte);
         if (last_byte > toss_start) {
                 if (flags & XFS_ITRUNC_DEFINITE) {
                         xfs_tosspages(ip, toss_start,
@@ -1514,7 +1477,8 @@ xfs_itruncate_finish(
                 new_size = 0LL;
         }
         first_unmap_block = XFS_B_TO_FSB(mp, (xfs_ufsize_t)new_size);
-        xfs_itrunc_trace(XFS_ITRUNC_FINISH1, ip, 0, new_size, 0, 0);
+        trace_xfs_itruncate_finish_start(ip, new_size);
+
         /*
          * The first thing we do is set the size to new_size permanently
          * on disk.  This way we don't have to worry about anyone ever
@@ -1731,7 +1695,7 @@ xfs_itruncate_finish(
         ASSERT((new_size != 0) ||
                (fork == XFS_ATTR_FORK) ||
                (ip->i_d.di_nextents == 0));
-        xfs_itrunc_trace(XFS_ITRUNC_FINISH2, ip, 0, new_size, 0, 0);
+        trace_xfs_itruncate_finish_end(ip, new_size);
         return 0;
 }
 
@@ -3252,23 +3216,6 @@ corrupt_out:
         return XFS_ERROR(EFSCORRUPTED);
 }
 
-
-
-#ifdef XFS_ILOCK_TRACE
-void
-xfs_ilock_trace(xfs_inode_t *ip, int lock, unsigned int lockflags, inst_t *ra)
-{
-        ktrace_enter(ip->i_lock_trace,
-                     (void *)ip,
-                     (void *)(unsigned long)lock, /* 1 = LOCK, 3=UNLOCK, etc */
-                     (void *)(unsigned long)lockflags, /* XFS_ILOCK_EXCL etc */
-                     (void *)ra,                /* caller of ilock */
-                     (void *)(unsigned long)current_cpu(),
-                     (void *)(unsigned long)current_pid(),
-                     NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-}
-#endif
-
 /*
  * Return a pointer to the extent record at file index idx.
  */
@@ -3300,13 +3247,17 @@ xfs_iext_get_ext(
  */
 void
 xfs_iext_insert(
-        xfs_ifork_t     *ifp,           /* inode fork pointer */
+        xfs_inode_t     *ip,            /* incore inode pointer */
         xfs_extnum_t    idx,            /* starting index of new items */
         xfs_extnum_t    count,          /* number of inserted items */
-        xfs_bmbt_irec_t *new)           /* items to insert */
+        xfs_bmbt_irec_t *new,           /* items to insert */
+        int             state)          /* type of extent conversion */
 {
+        xfs_ifork_t     *ifp = (state & BMAP_ATTRFORK) ? ip->i_afp : &ip->i_df;
         xfs_extnum_t    i;              /* extent record index */
 
+        trace_xfs_iext_insert(ip, idx, new, state, _RET_IP_);
+
         ASSERT(ifp->if_flags & XFS_IFEXTENTS);
         xfs_iext_add(ifp, idx, count);
         for (i = idx; i < idx + count; i++, new++)
@@ -3549,13 +3500,17 @@ xfs_iext_add_indirect_multi(
  */
 void
 xfs_iext_remove(
-        xfs_ifork_t     *ifp,           /* inode fork pointer */
+        xfs_inode_t     *ip,            /* incore inode pointer */
         xfs_extnum_t    idx,            /* index to begin removing exts */
-        int             ext_diff)       /* number of extents to remove */
+        int             ext_diff,       /* number of extents to remove */
+        int             state)          /* type of extent conversion */
 {
+        xfs_ifork_t     *ifp = (state & BMAP_ATTRFORK) ? ip->i_afp : &ip->i_df;
         xfs_extnum_t    nextents;       /* number of extents in file */
         int             new_size;       /* size of extents after removal */
 
+        trace_xfs_iext_remove(ip, idx, state, _RET_IP_);
+
         ASSERT(ext_diff > 0);
         nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
         new_size = (nextents - ext_diff) * sizeof(xfs_bmbt_rec_t);
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 41555de1d1db..ec1f28c4fc4f 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -213,7 +213,6 @@ typedef struct xfs_icdinode {
 
 struct bhv_desc;
 struct cred;
-struct ktrace;
 struct xfs_buf;
 struct xfs_bmap_free;
 struct xfs_bmbt_irec;
@@ -222,13 +221,6 @@ struct xfs_mount;
 struct xfs_trans;
 struct xfs_dquot;
 
-#if defined(XFS_ILOCK_TRACE)
-#define XFS_ILOCK_KTRACE_SIZE   32
-extern void xfs_ilock_trace(struct xfs_inode *, int, unsigned int, inst_t *);
-#else
-#define xfs_ilock_trace(i,n,f,ra)
-#endif
-
 typedef struct dm_attrs_s {
         __uint32_t      da_dmevmask;    /* DMIG event mask */
         __uint16_t      da_dmstate;     /* DMIG state info */
@@ -271,26 +263,6 @@ typedef struct xfs_inode {
 
         /* VFS inode */
         struct inode            i_vnode;        /* embedded VFS inode */
-
-        /* Trace buffers per inode. */
-#ifdef XFS_INODE_TRACE
-        struct ktrace           *i_trace;       /* general inode trace */
-#endif
-#ifdef XFS_BMAP_TRACE
-        struct ktrace           *i_xtrace;      /* inode extent list trace */
-#endif
-#ifdef XFS_BTREE_TRACE
-        struct ktrace           *i_btrace;      /* inode bmap btree trace */
-#endif
-#ifdef XFS_RW_TRACE
-        struct ktrace           *i_rwtrace;     /* inode read/write trace */
-#endif
-#ifdef XFS_ILOCK_TRACE
-        struct ktrace           *i_lock_trace;  /* inode lock/unlock trace */
-#endif
-#ifdef XFS_DIR2_TRACE
-        struct ktrace           *i_dir_trace;   /* inode directory trace */
-#endif
 } xfs_inode_t;
 
 #define XFS_ISIZE(ip)   (((ip)->i_d.di_mode & S_IFMT) == S_IFREG) ? \
@@ -406,6 +378,14 @@ static inline void xfs_ifunlock(xfs_inode_t *ip)
 #define XFS_LOCK_MASK           (XFS_IOLOCK_EXCL | XFS_IOLOCK_SHARED \
                                 | XFS_ILOCK_EXCL | XFS_ILOCK_SHARED)
 
+#define XFS_LOCK_FLAGS \
+        { XFS_IOLOCK_EXCL,      "IOLOCK_EXCL" }, \
+        { XFS_IOLOCK_SHARED,    "IOLOCK_SHARED" }, \
+        { XFS_ILOCK_EXCL,       "ILOCK_EXCL" }, \
+        { XFS_ILOCK_SHARED,     "ILOCK_SHARED" }, \
+        { XFS_IUNLOCK_NONOTIFY, "IUNLOCK_NONOTIFY" }
+
+
 /*
  * Flags for lockdep annotations.
  *
@@ -455,6 +435,10 @@ static inline void xfs_ifunlock(xfs_inode_t *ip)
 #define XFS_ITRUNC_DEFINITE     0x1
 #define XFS_ITRUNC_MAYBE        0x2
 
+#define XFS_ITRUNC_FLAGS \
+        { XFS_ITRUNC_DEFINITE,  "DEFINITE" }, \
+        { XFS_ITRUNC_MAYBE,     "MAYBE" }
+
 /*
  * For multiple groups support: if S_ISGID bit is set in the parent
  * directory, group of new file is set to that of the parent, and
@@ -507,48 +491,16 @@ void		xfs_lock_two_inodes(xfs_inode_t *, xfs_inode_t *, uint);
 void            xfs_synchronize_times(xfs_inode_t *);
 void            xfs_mark_inode_dirty_sync(xfs_inode_t *);
 
-#if defined(XFS_INODE_TRACE)
-
-#define INODE_TRACE_SIZE        16              /* number of trace entries */
-#define INODE_KTRACE_ENTRY      1
-#define INODE_KTRACE_EXIT       2
-#define INODE_KTRACE_HOLD       3
-#define INODE_KTRACE_REF        4
-#define INODE_KTRACE_RELE       5
-
-extern void _xfs_itrace_entry(struct xfs_inode *, const char *, inst_t *);
-extern void _xfs_itrace_exit(struct xfs_inode *, const char *, inst_t *);
-extern void xfs_itrace_hold(struct xfs_inode *, char *, int, inst_t *);
-extern void _xfs_itrace_ref(struct xfs_inode *, char *, int, inst_t *);
-extern void xfs_itrace_rele(struct xfs_inode *, char *, int, inst_t *);
-#define xfs_itrace_entry(ip)    \
-        _xfs_itrace_entry(ip, __func__, (inst_t *)__return_address)
-#define xfs_itrace_exit(ip)     \
-        _xfs_itrace_exit(ip, __func__, (inst_t *)__return_address)
-#define xfs_itrace_exit_tag(ip, tag)    \
-        _xfs_itrace_exit(ip, tag, (inst_t *)__return_address)
-#define xfs_itrace_ref(ip)      \
-        _xfs_itrace_ref(ip, __FILE__, __LINE__, (inst_t *)__return_address)
-
-#else
-#define xfs_itrace_entry(a)
-#define xfs_itrace_exit(a)
-#define xfs_itrace_exit_tag(a, b)
-#define xfs_itrace_hold(a, b, c, d)
-#define xfs_itrace_ref(a)
-#define xfs_itrace_rele(a, b, c, d)
-#endif
-
 #define IHOLD(ip) \
 do { \
         ASSERT(atomic_read(&VFS_I(ip)->i_count) > 0) ; \
         atomic_inc(&(VFS_I(ip)->i_count)); \
-        xfs_itrace_hold((ip), __FILE__, __LINE__, (inst_t *)__return_address); \
+        trace_xfs_ihold(ip, _THIS_IP_); \
 } while (0)
 
 #define IRELE(ip) \
 do { \
-        xfs_itrace_rele((ip), __FILE__, __LINE__, (inst_t *)__return_address); \
+        trace_xfs_irele(ip, _THIS_IP_); \
         iput(VFS_I(ip)); \
 } while (0)
 
@@ -577,11 +529,11 @@ int		xfs_iread_extents(struct xfs_trans *, struct xfs_inode *, int);
 int             xfs_iextents_copy(struct xfs_inode *, xfs_bmbt_rec_t *, int);
 
 xfs_bmbt_rec_host_t *xfs_iext_get_ext(xfs_ifork_t *, xfs_extnum_t);
-void            xfs_iext_insert(xfs_ifork_t *, xfs_extnum_t, xfs_extnum_t,
-                                xfs_bmbt_irec_t *);
+void            xfs_iext_insert(xfs_inode_t *, xfs_extnum_t, xfs_extnum_t,
+                                xfs_bmbt_irec_t *, int);
 void            xfs_iext_add(xfs_ifork_t *, xfs_extnum_t, int);
 void            xfs_iext_add_indirect_multi(xfs_ifork_t *, int, xfs_extnum_t, int);
-void            xfs_iext_remove(xfs_ifork_t *, xfs_extnum_t, int);
+void            xfs_iext_remove(xfs_inode_t *, xfs_extnum_t, int, int);
 void            xfs_iext_remove_inline(xfs_ifork_t *, xfs_extnum_t, int);
 void            xfs_iext_remove_direct(xfs_ifork_t *, xfs_extnum_t, int);
 void            xfs_iext_remove_indirect(xfs_ifork_t *, xfs_extnum_t, int);
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 9794b876d6ff..f38855d21ea5 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -41,6 +41,7 @@
 #include "xfs_ialloc.h"
 #include "xfs_rw.h"
 #include "xfs_error.h"
+#include "xfs_trace.h"
 
 
 kmem_zone_t     *xfs_ili_zone;          /* inode log item zone */
@@ -800,7 +801,9 @@ xfs_inode_item_pushbuf(
                                   !completion_done(&ip->i_flush));
                         iip->ili_pushbuf_flag = 0;
                         xfs_iunlock(ip, XFS_ILOCK_SHARED);
-                        xfs_buftrace("INODE ITEM PUSH", bp);
+
+                        trace_xfs_inode_item_push(bp, _RET_IP_);
+
                         if (XFS_BUF_ISPINNED(bp)) {
                                 xfs_log_force(mp, (xfs_lsn_t)0,
                                               XFS_LOG_FORCE);
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 7294abce6ef2..0b65039951a0 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -47,72 +47,8 @@
 #include "xfs_trans_space.h"
 #include "xfs_utils.h"
 #include "xfs_iomap.h"
+#include "xfs_trace.h"
 
-#if defined(XFS_RW_TRACE)
-void
-xfs_iomap_enter_trace(
-        int             tag,
-        xfs_inode_t     *ip,
-        xfs_off_t       offset,
-        ssize_t         count)
-{
-        if (!ip->i_rwtrace)
-                return;
-
-        ktrace_enter(ip->i_rwtrace,
-                (void *)((unsigned long)tag),
-                (void *)ip,
-                (void *)((unsigned long)((ip->i_d.di_size >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(ip->i_d.di_size & 0xffffffff)),
-                (void *)((unsigned long)((offset >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(offset & 0xffffffff)),
-                (void *)((unsigned long)count),
-                (void *)((unsigned long)((ip->i_new_size >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(ip->i_new_size & 0xffffffff)),
-                (void *)((unsigned long)current_pid()),
-                (void *)NULL,
-                (void *)NULL,
-                (void *)NULL,
-                (void *)NULL,
-                (void *)NULL,
-                (void *)NULL);
-}
-
-void
-xfs_iomap_map_trace(
-        int             tag,
-        xfs_inode_t     *ip,
-        xfs_off_t       offset,
-        ssize_t         count,
-        xfs_iomap_t     *iomapp,
-        xfs_bmbt_irec_t *imapp,
-        int             flags)
-{
-        if (!ip->i_rwtrace)
-                return;
-
-        ktrace_enter(ip->i_rwtrace,
-                (void *)((unsigned long)tag),
-                (void *)ip,
-                (void *)((unsigned long)((ip->i_d.di_size >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(ip->i_d.di_size & 0xffffffff)),
-                (void *)((unsigned long)((offset >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(offset & 0xffffffff)),
-                (void *)((unsigned long)count),
-                (void *)((unsigned long)flags),
-                (void *)((unsigned long)((iomapp->iomap_offset >> 32) & 0xffffffff)),
-                (void *)((unsigned long)(iomapp->iomap_offset & 0xffffffff)),
-                (void *)((unsigned long)(iomapp->iomap_delta)),
-                (void *)((unsigned long)(iomapp->iomap_bsize)),
-                (void *)((unsigned long)(iomapp->iomap_bn)),
-                (void *)(__psint_t)(imapp->br_startoff),
-                (void *)((unsigned long)(imapp->br_blockcount)),
-                (void *)(__psint_t)(imapp->br_startblock));
-}
-#else
-#define xfs_iomap_enter_trace(tag, io, offset, count)
-#define xfs_iomap_map_trace(tag, io, offset, count, iomapp, imapp, flags)
-#endif
 
 #define XFS_WRITEIO_ALIGN(mp,off)       (((off) >> mp->m_writeio_log) \
                                                 << mp->m_writeio_log)
@@ -187,21 +123,20 @@ xfs_iomap(
         if (XFS_FORCED_SHUTDOWN(mp))
                 return XFS_ERROR(EIO);
 
+        trace_xfs_iomap_enter(ip, offset, count, flags, NULL);
+
         switch (flags & (BMAPI_READ | BMAPI_WRITE | BMAPI_ALLOCATE)) {
         case BMAPI_READ:
-                xfs_iomap_enter_trace(XFS_IOMAP_READ_ENTER, ip, offset, count);
                 lockmode = xfs_ilock_map_shared(ip);
                 bmapi_flags = XFS_BMAPI_ENTIRE;
                 break;
         case BMAPI_WRITE:
-                xfs_iomap_enter_trace(XFS_IOMAP_WRITE_ENTER, ip, offset, count);
                 lockmode = XFS_ILOCK_EXCL;
                 if (flags & BMAPI_IGNSTATE)
                         bmapi_flags |= XFS_BMAPI_IGSTATE|XFS_BMAPI_ENTIRE;
                 xfs_ilock(ip, lockmode);
                 break;
         case BMAPI_ALLOCATE:
-                xfs_iomap_enter_trace(XFS_IOMAP_ALLOC_ENTER, ip, offset, count);
                 lockmode = XFS_ILOCK_SHARED;
                 bmapi_flags = XFS_BMAPI_ENTIRE;
 
@@ -237,8 +172,7 @@ xfs_iomap(
                 if (nimaps &&
                     (imap.br_startblock != HOLESTARTBLOCK) &&
                     (imap.br_startblock != DELAYSTARTBLOCK)) {
-                        xfs_iomap_map_trace(XFS_IOMAP_WRITE_MAP, ip,
-                                        offset, count, iomapp, &imap, flags);
+                        trace_xfs_iomap_found(ip, offset, count, flags, &imap);
                         break;
                 }
 
@@ -250,8 +184,7 @@ xfs_iomap(
                                                       &imap, &nimaps);
                 }
                 if (!error) {
-                        xfs_iomap_map_trace(XFS_IOMAP_ALLOC_MAP, ip,
-                                        offset, count, iomapp, &imap, flags);
+                        trace_xfs_iomap_alloc(ip, offset, count, flags, &imap);
                 }
                 iomap_flags = IOMAP_NEW;
                 break;
@@ -261,8 +194,7 @@ xfs_iomap(
                 lockmode = 0;
 
                 if (nimaps && !isnullstartblock(imap.br_startblock)) {
-                        xfs_iomap_map_trace(XFS_IOMAP_WRITE_MAP, ip,
-                                        offset, count, iomapp, &imap, flags);
+                        trace_xfs_iomap_found(ip, offset, count, flags, &imap);
                         break;
                 }
 
@@ -623,8 +555,7 @@ retry:
          * delalloc blocks and retry without EOF preallocation.
          */
         if (nimaps == 0) {
-                xfs_iomap_enter_trace(XFS_IOMAP_WRITE_NOSPACE,
-                                        ip, offset, count);
+                trace_xfs_delalloc_enospc(ip, offset, count);
                 if (flushed)
                         return XFS_ERROR(ENOSPC);
 
@@ -837,7 +768,7 @@ xfs_iomap_write_unwritten(
         int             committed;
         int             error;
 
-        xfs_iomap_enter_trace(XFS_IOMAP_UNWRITTEN, ip, offset, count);
+        trace_xfs_unwritten_convert(ip, offset, count);
 
         offset_fsb = XFS_B_TO_FSBT(mp, offset);
         count_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)offset + count);
diff --git a/fs/xfs/xfs_iomap.h b/fs/xfs/xfs_iomap.h
index fdcf7b82747f..174f29990991 100644
--- a/fs/xfs/xfs_iomap.h
+++ b/fs/xfs/xfs_iomap.h
@@ -43,6 +43,14 @@ typedef enum {
         BMAPI_TRYLOCK = (1 << 7),       /* non-blocking request */
 } bmapi_flags_t;
 
+#define BMAPI_FLAGS \
+        { BMAPI_READ,           "READ" }, \
+        { BMAPI_WRITE,          "WRITE" }, \
+        { BMAPI_ALLOCATE,       "ALLOCATE" }, \
+        { BMAPI_IGNSTATE,       "IGNSTATE" }, \
+        { BMAPI_DIRECT,         "DIRECT" }, \
+        { BMAPI_MMAP,           "MMAP" }, \
+        { BMAPI_TRYLOCK,        "TRYLOCK" }
 
 /*
  * xfs_iomap_t:  File system I/O map
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 9dbdff3ea484..4cb1792040e3 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -40,6 +40,7 @@
 #include "xfs_dinode.h"
 #include "xfs_inode.h"
 #include "xfs_rw.h"
+#include "xfs_trace.h"
 
 kmem_zone_t     *xfs_log_ticket_zone;
 
@@ -122,85 +123,6 @@ STATIC void	xlog_verify_tail_lsn(xlog_t *log, xlog_in_core_t *iclog,
 
 STATIC int      xlog_iclogs_empty(xlog_t *log);
 
-#if defined(XFS_LOG_TRACE)
-
-#define XLOG_TRACE_LOGGRANT_SIZE        2048
-#define XLOG_TRACE_ICLOG_SIZE           256
-
-void
-xlog_trace_loggrant_alloc(xlog_t *log)
-{
-        log->l_grant_trace = ktrace_alloc(XLOG_TRACE_LOGGRANT_SIZE, KM_NOFS);
-}
-
-void
-xlog_trace_loggrant_dealloc(xlog_t *log)
-{
-        ktrace_free(log->l_grant_trace);
-}
-
-void
-xlog_trace_loggrant(xlog_t *log, xlog_ticket_t *tic, xfs_caddr_t string)
-{
-        unsigned long cnts;
-
-        /* ticket counts are 1 byte each */
-        cnts = ((unsigned long)tic->t_ocnt) | ((unsigned long)tic->t_cnt) << 8;
-
-        ktrace_enter(log->l_grant_trace,
-                     (void *)tic,
-                     (void *)log->l_reserve_headq,
-                     (void *)log->l_write_headq,
-                     (void *)((unsigned long)log->l_grant_reserve_cycle),
-                     (void *)((unsigned long)log->l_grant_reserve_bytes),
-                     (void *)((unsigned long)log->l_grant_write_cycle),
-                     (void *)((unsigned long)log->l_grant_write_bytes),
-                     (void *)((unsigned long)log->l_curr_cycle),
-                     (void *)((unsigned long)log->l_curr_block),
-                     (void *)((unsigned long)CYCLE_LSN(log->l_tail_lsn)),
-                     (void *)((unsigned long)BLOCK_LSN(log->l_tail_lsn)),
-                     (void *)string,
-                     (void *)((unsigned long)tic->t_trans_type),
-                     (void *)cnts,
-                     (void *)((unsigned long)tic->t_curr_res),
-                     (void *)((unsigned long)tic->t_unit_res));
-}
-
-void
-xlog_trace_iclog_alloc(xlog_in_core_t *iclog)
-{
-        iclog->ic_trace = ktrace_alloc(XLOG_TRACE_ICLOG_SIZE, KM_NOFS);
-}
-
-void
-xlog_trace_iclog_dealloc(xlog_in_core_t *iclog)
-{
-        ktrace_free(iclog->ic_trace);
-}
-
-void
-xlog_trace_iclog(xlog_in_core_t *iclog, uint state)
-{
-        ktrace_enter(iclog->ic_trace,
-                     (void *)((unsigned long)state),
-                     (void *)((unsigned long)current_pid()),
-                     (void *)NULL, (void *)NULL, (void *)NULL, (void *)NULL,
-                     (void *)NULL, (void *)NULL, (void *)NULL, (void *)NULL,
-                     (void *)NULL, (void *)NULL, (void *)NULL, (void *)NULL,
-                     (void *)NULL, (void *)NULL);
-}
-#else
-
-#define xlog_trace_loggrant_alloc(log)
-#define xlog_trace_loggrant_dealloc(log)
-#define xlog_trace_loggrant(log,tic,string)
-
-#define xlog_trace_iclog_alloc(iclog)
-#define xlog_trace_iclog_dealloc(iclog)
-#define xlog_trace_iclog(iclog,state)
-
-#endif /* XFS_LOG_TRACE */
-
 
 static void
 xlog_ins_ticketq(struct xlog_ticket **qp, struct xlog_ticket *tic)
@@ -353,15 +275,17 @@ xfs_log_done(xfs_mount_t	*mp,
 
         if ((ticket->t_flags & XLOG_TIC_PERM_RESERV) == 0 ||
             (flags & XFS_LOG_REL_PERM_RESERV)) {
+                trace_xfs_log_done_nonperm(log, ticket);
+
                 /*
                  * Release ticket if not permanent reservation or a specific
                  * request has been made to release a permanent reservation.
                  */
-                xlog_trace_loggrant(log, ticket, "xfs_log_done: (non-permanent)");
                 xlog_ungrant_log_space(log, ticket);
                 xfs_log_ticket_put(ticket);
         } else {
-                xlog_trace_loggrant(log, ticket, "xfs_log_done: (permanent)");
+                trace_xfs_log_done_perm(log, ticket);
+
                 xlog_regrant_reserve_log_space(log, ticket);
                 /* If this ticket was a permanent reservation and we aren't
                  * trying to release it, reset the inited flags; so next time
@@ -505,10 +429,13 @@ xfs_log_reserve(xfs_mount_t	 *mp,
 
         XFS_STATS_INC(xs_try_logspace);
 
+
         if (*ticket != NULL) {
                 ASSERT(flags & XFS_LOG_PERM_RESERV);
                 internal_ticket = (xlog_ticket_t *)*ticket;
-                xlog_trace_loggrant(log, internal_ticket, "xfs_log_reserve: existing ticket (permanent trans)");
+
+                trace_xfs_log_reserve(log, internal_ticket);
+
                 xlog_grant_push_ail(mp, internal_ticket->t_unit_res);
                 retval = xlog_regrant_write_log_space(log, internal_ticket);
         } else {
@@ -519,10 +446,9 @@ xfs_log_reserve(xfs_mount_t	 *mp,
                         return XFS_ERROR(ENOMEM);
                 internal_ticket->t_trans_type = t_type;
                 *ticket = internal_ticket;
-                xlog_trace_loggrant(log, internal_ticket, 
-                        (internal_ticket->t_flags & XLOG_TIC_PERM_RESERV) ?
-                        "xfs_log_reserve: create new ticket (permanent trans)" :
-                        "xfs_log_reserve: create new ticket");
+
+                trace_xfs_log_reserve(log, internal_ticket);
+
                 xlog_grant_push_ail(mp,
                                     (internal_ticket->t_unit_res *
                                      internal_ticket->t_cnt));
@@ -734,7 +660,7 @@ xfs_log_unmount_write(xfs_mount_t *mp)
                         spin_unlock(&log->l_icloglock);
                 }
                 if (tic) {
-                        xlog_trace_loggrant(log, tic, "unmount rec");
+                        trace_xfs_log_umount_write(log, tic);
                         xlog_ungrant_log_space(log, tic);
                         xfs_log_ticket_put(tic);
                 }
@@ -1030,7 +956,6 @@ xlog_iodone(xfs_buf_t *bp)
                 xfs_fs_cmn_err(CE_WARN, l->l_mp,
                                 "xlog_iodone: Barriers are no longer supported"
                                 " by device. Disabling barriers\n");
-                xfs_buftrace("XLOG_IODONE BARRIERS OFF", bp);
         }
 
         /*
@@ -1085,13 +1010,10 @@ xlog_bdstrat_cb(struct xfs_buf *bp)
                 return 0;
         }
 
-        xfs_buftrace("XLOG__BDSTRAT IOERROR", bp);
         XFS_BUF_ERROR(bp, EIO);
         XFS_BUF_STALE(bp);
         xfs_biodone(bp);
         return XFS_ERROR(EIO);
-
-
 }
 
 /*
@@ -1246,7 +1168,6 @@ xlog_alloc_log(xfs_mount_t	*mp,
         spin_lock_init(&log->l_grant_lock);
         sv_init(&log->l_flush_wait, 0, "flush_wait");
 
-        xlog_trace_loggrant_alloc(log);
         /* log record size must be multiple of BBSIZE; see xlog_rec_header_t */
         ASSERT((XFS_BUF_SIZE(bp) & BBMASK) == 0);
 
@@ -1305,8 +1226,6 @@ xlog_alloc_log(xfs_mount_t	*mp,
                 sv_init(&iclog->ic_force_wait, SV_DEFAULT, "iclog-force");
                 sv_init(&iclog->ic_write_wait, SV_DEFAULT, "iclog-write");
 
-                xlog_trace_iclog_alloc(iclog);
-
                 iclogp = &iclog->ic_next;
         }
         *iclogp = log->l_iclog;                 /* complete ring */
@@ -1321,13 +1240,11 @@ out_free_iclog:
                         sv_destroy(&iclog->ic_force_wait);
                         sv_destroy(&iclog->ic_write_wait);
                         xfs_buf_free(iclog->ic_bp);
-                        xlog_trace_iclog_dealloc(iclog);
                 }
                 kmem_free(iclog);
         }
         spinlock_destroy(&log->l_icloglock);
         spinlock_destroy(&log->l_grant_lock);
-        xlog_trace_loggrant_dealloc(log);
         xfs_buf_free(log->l_xbuf);
 out_free_log:
         kmem_free(log);
@@ -1607,7 +1524,6 @@ xlog_dealloc_log(xlog_t *log)
                 sv_destroy(&iclog->ic_force_wait);
                 sv_destroy(&iclog->ic_write_wait);
                 xfs_buf_free(iclog->ic_bp);
-                xlog_trace_iclog_dealloc(iclog);
                 next_iclog = iclog->ic_next;
                 kmem_free(iclog);
                 iclog = next_iclog;
@@ -1616,7 +1532,6 @@ xlog_dealloc_log(xlog_t *log)
         spinlock_destroy(&log->l_grant_lock);
 
         xfs_buf_free(log->l_xbuf);
-        xlog_trace_loggrant_dealloc(log);
         log->l_mp->m_log = NULL;
         kmem_free(log);
 }       /* xlog_dealloc_log */
@@ -2414,7 +2329,6 @@ restart:
 
         iclog = log->l_iclog;
         if (iclog->ic_state != XLOG_STATE_ACTIVE) {
-                xlog_trace_iclog(iclog, XLOG_TRACE_SLEEP_FLUSH);
                 XFS_STATS_INC(xs_log_noiclogs);
 
                 /* Wait for log writes to have flushed */
@@ -2520,13 +2434,15 @@ xlog_grant_log_space(xlog_t	   *log,
 
         /* Is there space or do we need to sleep? */
         spin_lock(&log->l_grant_lock);
-        xlog_trace_loggrant(log, tic, "xlog_grant_log_space: enter");
+
+        trace_xfs_log_grant_enter(log, tic);
 
         /* something is already sleeping; insert new transaction at end */
         if (log->l_reserve_headq) {
                 xlog_ins_ticketq(&log->l_reserve_headq, tic);
-                xlog_trace_loggrant(log, tic,
-                                    "xlog_grant_log_space: sleep 1");
+
+                trace_xfs_log_grant_sleep1(log, tic);
+
                 /*
                  * Gotta check this before going to sleep, while we're
                  * holding the grant lock.
@@ -2540,8 +2456,7 @@ xlog_grant_log_space(xlog_t	   *log,
                  * If we got an error, and the filesystem is shutting down,
                  * we'll catch it down below. So just continue...
                  */
-                xlog_trace_loggrant(log, tic,
-                                    "xlog_grant_log_space: wake 1");
+                trace_xfs_log_grant_wake1(log, tic);
                 spin_lock(&log->l_grant_lock);
         }
         if (tic->t_flags & XFS_LOG_PERM_RESERV)
@@ -2558,8 +2473,9 @@ redo:
         if (free_bytes < need_bytes) {
                 if ((tic->t_flags & XLOG_TIC_IN_Q) == 0)
                         xlog_ins_ticketq(&log->l_reserve_headq, tic);
-                xlog_trace_loggrant(log, tic,
-                                    "xlog_grant_log_space: sleep 2");
+
+                trace_xfs_log_grant_sleep2(log, tic);
+
                 spin_unlock(&log->l_grant_lock);
                 xlog_grant_push_ail(log->l_mp, need_bytes);
                 spin_lock(&log->l_grant_lock);
@@ -2571,8 +2487,8 @@ redo:
                 if (XLOG_FORCED_SHUTDOWN(log))
                         goto error_return;
 
-                xlog_trace_loggrant(log, tic,
-                                    "xlog_grant_log_space: wake 2");
+                trace_xfs_log_grant_wake2(log, tic);
+
                 goto redo;
         } else if (tic->t_flags & XLOG_TIC_IN_Q)
                 xlog_del_ticketq(&log->l_reserve_headq, tic);
@@ -2592,7 +2508,7 @@ redo:
                 ASSERT(log->l_grant_write_bytes <= BBTOB(BLOCK_LSN(tail_lsn)));
         }
 #endif
-        xlog_trace_loggrant(log, tic, "xlog_grant_log_space: exit");
+        trace_xfs_log_grant_exit(log, tic);
         xlog_verify_grant_head(log, 1);
         spin_unlock(&log->l_grant_lock);
         return 0;
@@ -2600,7 +2516,9 @@ redo:
  error_return:
         if (tic->t_flags & XLOG_TIC_IN_Q)
                 xlog_del_ticketq(&log->l_reserve_headq, tic);
-        xlog_trace_loggrant(log, tic, "xlog_grant_log_space: err_ret");
+
+        trace_xfs_log_grant_error(log, tic);
+
         /*
          * If we are failing, make sure the ticket doesn't have any
          * current reservations. We don't want to add this back when
@@ -2640,7 +2558,8 @@ xlog_regrant_write_log_space(xlog_t	   *log,
 #endif
 
         spin_lock(&log->l_grant_lock);
-        xlog_trace_loggrant(log, tic, "xlog_regrant_write_log_space: enter");
+
+        trace_xfs_log_regrant_write_enter(log, tic);
 
         if (XLOG_FORCED_SHUTDOWN(log))
                 goto error_return;
@@ -2669,8 +2588,8 @@ xlog_regrant_write_log_space(xlog_t	   *log,
                         if ((tic->t_flags & XLOG_TIC_IN_Q) == 0)
                                 xlog_ins_ticketq(&log->l_write_headq, tic);
 
-                        xlog_trace_loggrant(log, tic,
-                                    "xlog_regrant_write_log_space: sleep 1");
+                        trace_xfs_log_regrant_write_sleep1(log, tic);
+
                         spin_unlock(&log->l_grant_lock);
                         xlog_grant_push_ail(log->l_mp, need_bytes);
                         spin_lock(&log->l_grant_lock);
@@ -2685,8 +2604,7 @@ xlog_regrant_write_log_space(xlog_t	   *log,
                         if (XLOG_FORCED_SHUTDOWN(log))
                                 goto error_return;
 
-                        xlog_trace_loggrant(log, tic,
-                                    "xlog_regrant_write_log_space: wake 1");
+                        trace_xfs_log_regrant_write_wake1(log, tic);
                 }
         }
 
@@ -2704,6 +2622,8 @@ redo:
                 spin_lock(&log->l_grant_lock);
 
                 XFS_STATS_INC(xs_sleep_logspace);
+                trace_xfs_log_regrant_write_sleep2(log, tic);
+
                 sv_wait(&tic->t_wait, PINOD|PLTWAIT, &log->l_grant_lock, s);
 
                 /* If we're shutting down, this tic is already off the queue */
@@ -2711,8 +2631,7 @@ redo:
                 if (XLOG_FORCED_SHUTDOWN(log))
                         goto error_return;
 
-                xlog_trace_loggrant(log, tic,
-                                    "xlog_regrant_write_log_space: wake 2");
+                trace_xfs_log_regrant_write_wake2(log, tic);
                 goto redo;
         } else if (tic->t_flags & XLOG_TIC_IN_Q)
                 xlog_del_ticketq(&log->l_write_headq, tic);
@@ -2727,7 +2646,8 @@ redo:
         }
 #endif
 
-        xlog_trace_loggrant(log, tic, "xlog_regrant_write_log_space: exit");
+        trace_xfs_log_regrant_write_exit(log, tic);
+
         xlog_verify_grant_head(log, 1);
         spin_unlock(&log->l_grant_lock);
         return 0;
@@ -2736,7 +2656,9 @@ redo:
  error_return:
         if (tic->t_flags & XLOG_TIC_IN_Q)
                 xlog_del_ticketq(&log->l_reserve_headq, tic);
-        xlog_trace_loggrant(log, tic, "xlog_regrant_write_log_space: err_ret");
+
+        trace_xfs_log_regrant_write_error(log, tic);
+
         /*
          * If we are failing, make sure the ticket doesn't have any
          * current reservations. We don't want to add this back when
@@ -2760,8 +2682,8 @@ STATIC void
 xlog_regrant_reserve_log_space(xlog_t        *log,
                                xlog_ticket_t *ticket)
 {
-        xlog_trace_loggrant(log, ticket,
-                            "xlog_regrant_reserve_log_space: enter");
+        trace_xfs_log_regrant_reserve_enter(log, ticket);
+
         if (ticket->t_cnt > 0)
                 ticket->t_cnt--;
 
@@ -2769,8 +2691,9 @@ xlog_regrant_reserve_log_space(xlog_t	     *log,
         xlog_grant_sub_space(log, ticket->t_curr_res);
         ticket->t_curr_res = ticket->t_unit_res;
         xlog_tic_reset_res(ticket);
-        xlog_trace_loggrant(log, ticket,
-                            "xlog_regrant_reserve_log_space: sub current res");
+
+        trace_xfs_log_regrant_reserve_sub(log, ticket);
+
         xlog_verify_grant_head(log, 1);
 
         /* just return if we still have some of the pre-reserved space */
@@ -2780,8 +2703,9 @@ xlog_regrant_reserve_log_space(xlog_t	     *log,
         }
 
         xlog_grant_add_space_reserve(log, ticket->t_unit_res);
-        xlog_trace_loggrant(log, ticket,
-                            "xlog_regrant_reserve_log_space: exit");
+
+        trace_xfs_log_regrant_reserve_exit(log, ticket);
+
         xlog_verify_grant_head(log, 0);
         spin_unlock(&log->l_grant_lock);
         ticket->t_curr_res = ticket->t_unit_res;
@@ -2811,11 +2735,11 @@ xlog_ungrant_log_space(xlog_t	     *log,
                 ticket->t_cnt--;
 
         spin_lock(&log->l_grant_lock);
-        xlog_trace_loggrant(log, ticket, "xlog_ungrant_log_space: enter");
+        trace_xfs_log_ungrant_enter(log, ticket);
 
         xlog_grant_sub_space(log, ticket->t_curr_res);
 
-        xlog_trace_loggrant(log, ticket, "xlog_ungrant_log_space: sub current");
+        trace_xfs_log_ungrant_sub(log, ticket);
 
         /* If this is a permanent reservation ticket, we may be able to free
          * up more space based on the remaining count.
@@ -2825,7 +2749,8 @@ xlog_ungrant_log_space(xlog_t	     *log,
                 xlog_grant_sub_space(log, ticket->t_unit_res*ticket->t_cnt);
         }
 
-        xlog_trace_loggrant(log, ticket, "xlog_ungrant_log_space: exit");
+        trace_xfs_log_ungrant_exit(log, ticket);
+
         xlog_verify_grant_head(log, 1);
         spin_unlock(&log->l_grant_lock);
         xfs_log_move_tail(log->l_mp, 1);
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index 679c7c4926a2..d55662db7077 100644
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -19,7 +19,6 @@
 #define __XFS_LOG_PRIV_H__
 
 struct xfs_buf;
-struct ktrace;
 struct log;
 struct xlog_ticket;
 struct xfs_buf_cancel;
@@ -135,6 +134,12 @@ static inline uint xlog_get_client_id(__be32 i)
 #define XLOG_TIC_INITED         0x1     /* has been initialized */
 #define XLOG_TIC_PERM_RESERV    0x2     /* permanent reservation */
 #define XLOG_TIC_IN_Q           0x4
+
+#define XLOG_TIC_FLAGS \
+        { XLOG_TIC_INITED,      "XLOG_TIC_INITED" }, \
+        { XLOG_TIC_PERM_RESERV, "XLOG_TIC_PERM_RESERV" }, \
+        { XLOG_TIC_IN_Q,        "XLOG_TIC_IN_Q" }
+
 #endif  /* __KERNEL__ */
 
 #define XLOG_UNMOUNT_TYPE       0x556e  /* Un for Unmount */
@@ -361,9 +366,6 @@ typedef struct xlog_in_core {
         int                     ic_bwritecnt;
         unsigned short          ic_state;
         char                    *ic_datap;      /* pointer to iclog data */
-#ifdef XFS_LOG_TRACE
-        struct ktrace           *ic_trace;
-#endif
 
         /* Callback structures need their own cacheline */
         spinlock_t              ic_callback_lock ____cacheline_aligned_in_smp;
@@ -429,10 +431,6 @@ typedef struct log {
         int                     l_grant_write_cycle;
         int                     l_grant_write_bytes;
 
-#ifdef XFS_LOG_TRACE
-        struct ktrace           *l_grant_trace;
-#endif
-
         /* The following field are used for debugging; need to hold icloglock */
 #ifdef DEBUG
         char                    *l_iclog_bak[XLOG_MAX_ICLOGS];
@@ -456,12 +454,6 @@ extern void	 xlog_put_bp(struct xfs_buf *);
 
 extern kmem_zone_t      *xfs_log_ticket_zone;
 
-/* iclog tracing */
-#define XLOG_TRACE_GRAB_FLUSH  1
-#define XLOG_TRACE_REL_FLUSH   2
-#define XLOG_TRACE_SLEEP_FLUSH 3
-#define XLOG_TRACE_WAKE_FLUSH  4
-
 /*
  * Unmount record type is used as a pseudo transaction type for the ticket.
  * It's value must be outside the range of XFS_TRANS_* values.
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 1ec98ed914d4..69ac2e5ef20c 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -46,6 +46,7 @@
 #include "xfs_quota.h"
 #include "xfs_rw.h"
 #include "xfs_utils.h"
+#include "xfs_trace.h"
 
 STATIC int      xlog_find_zeroed(xlog_t *, xfs_daddr_t *);
 STATIC int      xlog_clear_stale_blocks(xlog_t *, xfs_lsn_t);
@@ -225,16 +226,10 @@ xlog_header_check_dump(
         xfs_mount_t             *mp,
         xlog_rec_header_t       *head)
 {
-        int                     b;
-
-        cmn_err(CE_DEBUG, "%s:  SB : uuid = ", __func__);
-        for (b = 0; b < 16; b++)
-                cmn_err(CE_DEBUG, "%02x", ((__uint8_t *)&mp->m_sb.sb_uuid)[b]);
-        cmn_err(CE_DEBUG, ", fmt = %d\n", XLOG_FMT);
-        cmn_err(CE_DEBUG, "    log : uuid = ");
-        for (b = 0; b < 16; b++)
-                cmn_err(CE_DEBUG, "%02x", ((__uint8_t *)&head->h_fs_uuid)[b]);
-        cmn_err(CE_DEBUG, ", fmt = %d\n", be32_to_cpu(head->h_fmt));
+        cmn_err(CE_DEBUG, "%s:  SB : uuid = %pU, fmt = %d\n",
+                __func__, &mp->m_sb.sb_uuid, XLOG_FMT);
+        cmn_err(CE_DEBUG, "    log : uuid = %pU, fmt = %d\n",
+                &head->h_fs_uuid, be32_to_cpu(head->h_fmt));
 }
 #else
 #define xlog_header_check_dump(mp, head)
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index bfffd6334abb..eb403b40e120 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -44,6 +44,8 @@
 #include "xfs_quota.h"
 #include "xfs_fsops.h"
 #include "xfs_utils.h"
+#include "xfs_trace.h"
+
 
 STATIC void     xfs_unmountfs_wait(xfs_mount_t *);
 
diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h
index 3ec91ac74c2a..91bfd60f4c74 100644
--- a/fs/xfs/xfs_quota.h
+++ b/fs/xfs/xfs_quota.h
@@ -92,6 +92,14 @@ typedef struct xfs_dqblk {
 
 #define XFS_DQ_ALLTYPES         (XFS_DQ_USER|XFS_DQ_PROJ|XFS_DQ_GROUP)
 
+#define XFS_DQ_FLAGS \
+        { XFS_DQ_USER,          "USER" }, \
+        { XFS_DQ_PROJ,          "PROJ" }, \
+        { XFS_DQ_GROUP,         "GROUP" }, \
+        { XFS_DQ_DIRTY,         "DIRTY" }, \
+        { XFS_DQ_WANT,          "WANT" }, \
+        { XFS_DQ_INACTIVE,      "INACTIVE" }
+
 /*
  * In the worst case, when both user and group quotas are on,
  * we can have a max of three dquots changing in a single transaction.
diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c
index b81deea0ce19..fc1cda23b817 100644
--- a/fs/xfs/xfs_rename.c
+++ b/fs/xfs/xfs_rename.c
@@ -39,6 +39,7 @@
 #include "xfs_utils.h"
 #include "xfs_trans_space.h"
 #include "xfs_vnodeops.h"
+#include "xfs_trace.h"
 
 
 /*
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index 385f6dceba5d..9e15a1185362 100644
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -45,6 +45,7 @@
 #include "xfs_inode_item.h"
 #include "xfs_trans_space.h"
 #include "xfs_utils.h"
+#include "xfs_trace.h"
 
 
 /*
diff --git a/fs/xfs/xfs_rw.c b/fs/xfs/xfs_rw.c
index 4c199d18f850..5aa07caea5f1 100644
--- a/fs/xfs/xfs_rw.c
+++ b/fs/xfs/xfs_rw.c
@@ -44,6 +44,7 @@
 #include "xfs_error.h"
 #include "xfs_buf_item.h"
 #include "xfs_rw.h"
+#include "xfs_trace.h"
 
 /*
  * This is a subroutine for xfs_write() and other writers (xfs_ioctl)
@@ -171,7 +172,6 @@ xfs_bioerror(
          * No need to wait until the buffer is unpinned.
          * We aren't flushing it.
          */
-        xfs_buftrace("XFS IOERROR", bp);
         XFS_BUF_ERROR(bp, EIO);
         /*
          * We're calling biodone, so delete B_DONE flag. Either way
@@ -205,7 +205,6 @@ xfs_bioerror_relse(
         ASSERT(XFS_BUF_IODONE_FUNC(bp) != xfs_buf_iodone_callbacks);
         ASSERT(XFS_BUF_IODONE_FUNC(bp) != xlog_iodone);
 
-        xfs_buftrace("XFS IOERRELSE", bp);
         fl = XFS_BUF_BFLAGS(bp);
         /*
          * No need to wait until the buffer is unpinned.
diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
index a0574f593f52..ca64f33c63a3 100644
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/xfs_trans.h
@@ -100,6 +100,49 @@ typedef struct xfs_trans_header {
 #define XFS_TRANS_TYPE_MAX              41
 /* new transaction types need to be reflected in xfs_logprint(8) */
 
+#define XFS_TRANS_TYPES \
+        { XFS_TRANS_SETATTR_NOT_SIZE,   "SETATTR_NOT_SIZE" }, \
+        { XFS_TRANS_SETATTR_SIZE,       "SETATTR_SIZE" }, \
+        { XFS_TRANS_INACTIVE,           "INACTIVE" }, \
+        { XFS_TRANS_CREATE,             "CREATE" }, \
+        { XFS_TRANS_CREATE_TRUNC,       "CREATE_TRUNC" }, \
+        { XFS_TRANS_TRUNCATE_FILE,      "TRUNCATE_FILE" }, \
+        { XFS_TRANS_REMOVE,             "REMOVE" }, \
+        { XFS_TRANS_LINK,               "LINK" }, \
+        { XFS_TRANS_RENAME,             "RENAME" }, \
+        { XFS_TRANS_MKDIR,              "MKDIR" }, \
+        { XFS_TRANS_RMDIR,              "RMDIR" }, \
+        { XFS_TRANS_SYMLINK,            "SYMLINK" }, \
+        { XFS_TRANS_SET_DMATTRS,        "SET_DMATTRS" }, \
+        { XFS_TRANS_GROWFS,             "GROWFS" }, \
+        { XFS_TRANS_STRAT_WRITE,        "STRAT_WRITE" }, \
+        { XFS_TRANS_DIOSTRAT,           "DIOSTRAT" }, \
+        { XFS_TRANS_WRITEID,            "WRITEID" }, \
+        { XFS_TRANS_ADDAFORK,           "ADDAFORK" }, \
+        { XFS_TRANS_ATTRINVAL,          "ATTRINVAL" }, \
+        { XFS_TRANS_ATRUNCATE,          "ATRUNCATE" }, \
+        { XFS_TRANS_ATTR_SET,           "ATTR_SET" }, \
+        { XFS_TRANS_ATTR_RM,            "ATTR_RM" }, \
+        { XFS_TRANS_ATTR_FLAG,          "ATTR_FLAG" }, \
+        { XFS_TRANS_CLEAR_AGI_BUCKET,   "CLEAR_AGI_BUCKET" }, \
+        { XFS_TRANS_QM_SBCHANGE,        "QM_SBCHANGE" }, \
+        { XFS_TRANS_QM_QUOTAOFF,        "QM_QUOTAOFF" }, \
+        { XFS_TRANS_QM_DQALLOC,         "QM_DQALLOC" }, \
+        { XFS_TRANS_QM_SETQLIM,         "QM_SETQLIM" }, \
+        { XFS_TRANS_QM_DQCLUSTER,       "QM_DQCLUSTER" }, \
+        { XFS_TRANS_QM_QINOCREATE,      "QM_QINOCREATE" }, \
+        { XFS_TRANS_QM_QUOTAOFF_END,    "QM_QOFF_END" }, \
+        { XFS_TRANS_SB_UNIT,            "SB_UNIT" }, \
+        { XFS_TRANS_FSYNC_TS,           "FSYNC_TS" }, \
+        { XFS_TRANS_GROWFSRT_ALLOC,     "GROWFSRT_ALLOC" }, \
+        { XFS_TRANS_GROWFSRT_ZERO,      "GROWFSRT_ZERO" }, \
+        { XFS_TRANS_GROWFSRT_FREE,      "GROWFSRT_FREE" }, \
+        { XFS_TRANS_SWAPEXT,            "SWAPEXT" }, \
+        { XFS_TRANS_SB_COUNT,           "SB_COUNT" }, \
+        { XFS_TRANS_DUMMY1,             "DUMMY1" }, \
+        { XFS_TRANS_DUMMY2,             "DUMMY2" }, \
+        { XLOG_UNMOUNT_REC_TYPE,        "UNMOUNT" }
+
 /*
  * This structure is used to track log items associated with
  * a transaction.  It points to the log item and keeps some
@@ -782,6 +825,10 @@ typedef struct xfs_log_item {
 #define XFS_LI_IN_AIL   0x1
 #define XFS_LI_ABORTED  0x2
 
+#define XFS_LI_FLAGS \
+        { XFS_LI_IN_AIL,        "IN_AIL" }, \
+        { XFS_LI_ABORTED,       "ABORTED" }
+
 typedef struct xfs_item_ops {
         uint (*iop_size)(xfs_log_item_t *);
         void (*iop_format)(xfs_log_item_t *, struct xfs_log_iovec *);
diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c
index 03a1f701fea8..49130628d5ef 100644
--- a/fs/xfs/xfs_trans_buf.c
+++ b/fs/xfs/xfs_trans_buf.c
@@ -38,6 +38,7 @@
 #include "xfs_trans_priv.h"
 #include "xfs_error.h"
 #include "xfs_rw.h"
+#include "xfs_trace.h"
 
 
 STATIC xfs_buf_t *xfs_trans_buf_item_match(xfs_trans_t *, xfs_buftarg_t *,
@@ -95,26 +96,23 @@ xfs_trans_get_buf(xfs_trans_t	*tp,
         }
         if (bp != NULL) {
                 ASSERT(XFS_BUF_VALUSEMA(bp) <= 0);
-                if (XFS_FORCED_SHUTDOWN(tp->t_mountp)) {
-                        xfs_buftrace("TRANS GET RECUR SHUT", bp);
+                if (XFS_FORCED_SHUTDOWN(tp->t_mountp))
                         XFS_BUF_SUPER_STALE(bp);
-                }
+
                 /*
                  * If the buffer is stale then it was binval'ed
                  * since last read.  This doesn't matter since the
                  * caller isn't allowed to use the data anyway.
                  */
-                else if (XFS_BUF_ISSTALE(bp)) {
-                        xfs_buftrace("TRANS GET RECUR STALE", bp);
+                else if (XFS_BUF_ISSTALE(bp))
                         ASSERT(!XFS_BUF_ISDELAYWRITE(bp));
-                }
+
                 ASSERT(XFS_BUF_FSPRIVATE2(bp, xfs_trans_t *) == tp);
                 bip = XFS_BUF_FSPRIVATE(bp, xfs_buf_log_item_t *);
                 ASSERT(bip != NULL);
                 ASSERT(atomic_read(&bip->bli_refcount) > 0);
                 bip->bli_recur++;
-                xfs_buftrace("TRANS GET RECUR", bp);
-                xfs_buf_item_trace("GET RECUR", bip);
+                trace_xfs_trans_get_buf_recur(bip);
                 return (bp);
         }
 
@@ -166,8 +164,7 @@ xfs_trans_get_buf(xfs_trans_t	*tp,
          */
         XFS_BUF_SET_FSPRIVATE2(bp, tp);
 
-        xfs_buftrace("TRANS GET", bp);
-        xfs_buf_item_trace("GET", bip);
+        trace_xfs_trans_get_buf(bip);
         return (bp);
 }
 
@@ -207,7 +204,7 @@ xfs_trans_getsb(xfs_trans_t	*tp,
                 ASSERT(bip != NULL);
                 ASSERT(atomic_read(&bip->bli_refcount) > 0);
                 bip->bli_recur++;
-                xfs_buf_item_trace("GETSB RECUR", bip);
+                trace_xfs_trans_getsb_recur(bip);
                 return (bp);
         }
 
@@ -249,7 +246,7 @@ xfs_trans_getsb(xfs_trans_t	*tp,
          */
         XFS_BUF_SET_FSPRIVATE2(bp, tp);
 
-        xfs_buf_item_trace("GETSB", bip);
+        trace_xfs_trans_getsb(bip);
         return (bp);
 }
 
@@ -347,7 +344,7 @@ xfs_trans_read_buf(
                 ASSERT(XFS_BUF_FSPRIVATE(bp, void *) != NULL);
                 ASSERT((XFS_BUF_ISERROR(bp)) == 0);
                 if (!(XFS_BUF_ISDONE(bp))) {
-                        xfs_buftrace("READ_BUF_INCORE !DONE", bp);
+                        trace_xfs_trans_read_buf_io(bp, _RET_IP_);
                         ASSERT(!XFS_BUF_ISASYNC(bp));
                         XFS_BUF_READ(bp);
                         xfsbdstrat(tp->t_mountp, bp);
@@ -372,7 +369,7 @@ xfs_trans_read_buf(
                  * brelse it either. Just get out.
                  */
                 if (XFS_FORCED_SHUTDOWN(mp)) {
-                        xfs_buftrace("READ_BUF_INCORE XFSSHUTDN", bp);
+                        trace_xfs_trans_read_buf_shut(bp, _RET_IP_);
                         *bpp = NULL;
                         return XFS_ERROR(EIO);
                 }
@@ -382,7 +379,7 @@ xfs_trans_read_buf(
                 bip->bli_recur++;
 
                 ASSERT(atomic_read(&bip->bli_refcount) > 0);
-                xfs_buf_item_trace("READ RECUR", bip);
+                trace_xfs_trans_read_buf_recur(bip);
                 *bpp = bp;
                 return 0;
         }
@@ -402,7 +399,6 @@ xfs_trans_read_buf(
         }
         if (XFS_BUF_GETERROR(bp) != 0) {
             XFS_BUF_SUPER_STALE(bp);
-                xfs_buftrace("READ ERROR", bp);
                 error = XFS_BUF_GETERROR(bp);
 
                 xfs_ioerror_alert("xfs_trans_read_buf", mp,
@@ -461,8 +457,7 @@ xfs_trans_read_buf(
          */
         XFS_BUF_SET_FSPRIVATE2(bp, tp);
 
-        xfs_buftrace("TRANS READ", bp);
-        xfs_buf_item_trace("READ", bip);
+        trace_xfs_trans_read_buf(bip);
         *bpp = bp;
         return 0;
 
@@ -480,7 +475,7 @@ shutdown_abort:
         ASSERT((XFS_BUF_BFLAGS(bp) & (XFS_B_STALE|XFS_B_DELWRI)) !=
                                                 (XFS_B_STALE|XFS_B_DELWRI));
 
-        xfs_buftrace("READ_BUF XFSSHUTDN", bp);
+        trace_xfs_trans_read_buf_shut(bp, _RET_IP_);
         xfs_buf_relse(bp);
         *bpp = NULL;
         return XFS_ERROR(EIO);
@@ -546,13 +541,14 @@ xfs_trans_brelse(xfs_trans_t	*tp,
         lidp = xfs_trans_find_item(tp, (xfs_log_item_t*)bip);
         ASSERT(lidp != NULL);
 
+        trace_xfs_trans_brelse(bip);
+
         /*
          * If the release is just for a recursive lock,
          * then decrement the count and return.
          */
         if (bip->bli_recur > 0) {
                 bip->bli_recur--;
-                xfs_buf_item_trace("RELSE RECUR", bip);
                 return;
         }
 
@@ -560,10 +556,8 @@ xfs_trans_brelse(xfs_trans_t	*tp,
          * If the buffer is dirty within this transaction, we can't
          * release it until we commit.
          */
-        if (lidp->lid_flags & XFS_LID_DIRTY) {
-                xfs_buf_item_trace("RELSE DIRTY", bip);
+        if (lidp->lid_flags & XFS_LID_DIRTY)
                 return;
-        }
 
         /*
          * If the buffer has been invalidated, then we can't release
@@ -571,13 +565,10 @@ xfs_trans_brelse(xfs_trans_t	*tp,
          * as part of this transaction.  This prevents us from pulling
          * the item from the AIL before we should.
          */
-        if (bip->bli_flags & XFS_BLI_STALE) {
-                xfs_buf_item_trace("RELSE STALE", bip);
+        if (bip->bli_flags & XFS_BLI_STALE)
                 return;
-        }
 
         ASSERT(!(bip->bli_flags & XFS_BLI_LOGGED));
-        xfs_buf_item_trace("RELSE", bip);
 
         /*
          * Free up the log item descriptor tracking the released item.
@@ -674,7 +665,7 @@ xfs_trans_bjoin(xfs_trans_t	*tp,
          */
         XFS_BUF_SET_FSPRIVATE2(bp, tp);
 
-        xfs_buf_item_trace("BJOIN", bip);
+        trace_xfs_trans_bjoin(bip);
 }
 
 /*
@@ -698,7 +689,7 @@ xfs_trans_bhold(xfs_trans_t	*tp,
         ASSERT(!(bip->bli_format.blf_flags & XFS_BLI_CANCEL));
         ASSERT(atomic_read(&bip->bli_refcount) > 0);
         bip->bli_flags |= XFS_BLI_HOLD;
-        xfs_buf_item_trace("BHOLD", bip);
+        trace_xfs_trans_bhold(bip);
 }
 
 /*
@@ -721,7 +712,8 @@ xfs_trans_bhold_release(xfs_trans_t	*tp,
         ASSERT(atomic_read(&bip->bli_refcount) > 0);
         ASSERT(bip->bli_flags & XFS_BLI_HOLD);
         bip->bli_flags &= ~XFS_BLI_HOLD;
-        xfs_buf_item_trace("BHOLD RELEASE", bip);
+
+        trace_xfs_trans_bhold_release(bip);
 }
 
 /*
@@ -767,6 +759,8 @@ xfs_trans_log_buf(xfs_trans_t	*tp,
         XFS_BUF_SET_IODONE_FUNC(bp, xfs_buf_iodone_callbacks);
         bip->bli_item.li_cb = (void(*)(xfs_buf_t*,xfs_log_item_t*))xfs_buf_iodone;
 
+        trace_xfs_trans_log_buf(bip);
+
         /*
          * If we invalidated the buffer within this transaction, then
          * cancel the invalidation now that we're dirtying the buffer
@@ -774,7 +768,6 @@ xfs_trans_log_buf(xfs_trans_t	*tp,
          * because we have a reference to the buffer this entire time.
          */
         if (bip->bli_flags & XFS_BLI_STALE) {
-                xfs_buf_item_trace("BLOG UNSTALE", bip);
                 bip->bli_flags &= ~XFS_BLI_STALE;
                 ASSERT(XFS_BUF_ISSTALE(bp));
                 XFS_BUF_UNSTALE(bp);
@@ -789,7 +782,6 @@ xfs_trans_log_buf(xfs_trans_t	*tp,
         lidp->lid_flags &= ~XFS_LID_BUF_STALE;
         bip->bli_flags |= XFS_BLI_LOGGED;
         xfs_buf_item_log(bip, first, last);
-        xfs_buf_item_trace("BLOG", bip);
 }
 
 
@@ -828,6 +820,8 @@ xfs_trans_binval(
         ASSERT(lidp != NULL);
         ASSERT(atomic_read(&bip->bli_refcount) > 0);
 
+        trace_xfs_trans_binval(bip);
+
         if (bip->bli_flags & XFS_BLI_STALE) {
                 /*
                  * If the buffer is already invalidated, then
@@ -840,8 +834,6 @@ xfs_trans_binval(
                 ASSERT(bip->bli_format.blf_flags & XFS_BLI_CANCEL);
                 ASSERT(lidp->lid_flags & XFS_LID_DIRTY);
                 ASSERT(tp->t_flags & XFS_TRANS_DIRTY);
-                xfs_buftrace("XFS_BINVAL RECUR", bp);
-                xfs_buf_item_trace("BINVAL RECUR", bip);
                 return;
         }
 
@@ -875,8 +867,6 @@ xfs_trans_binval(
               (bip->bli_format.blf_map_size * sizeof(uint)));
         lidp->lid_flags |= XFS_LID_DIRTY|XFS_LID_BUF_STALE;
         tp->t_flags |= XFS_TRANS_DIRTY;
-        xfs_buftrace("XFS_BINVAL", bp);
-        xfs_buf_item_trace("BINVAL", bip);
 }
 
 /*
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 578f3f59b789..6558ffd8d140 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -53,6 +53,7 @@
 #include "xfs_log_priv.h"
 #include "xfs_filestream.h"
 #include "xfs_vnodeops.h"
+#include "xfs_trace.h"
 
 int
 xfs_setattr(
@@ -1397,7 +1398,6 @@ xfs_lookup(
         if (error)
                 goto out_free_name;
 
-        xfs_itrace_ref(*ipp);
         return 0;
 
 out_free_name:
@@ -1543,7 +1543,6 @@ xfs_create(
          * At this point, we've gotten a newly allocated inode.
          * It is locked (and joined to the transaction).
          */
-        xfs_itrace_ref(ip);
         ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
 
         /*
@@ -2003,9 +2002,6 @@ xfs_remove(
         if (!is_dir && link_zero && xfs_inode_is_filestream(ip))
                 xfs_filestream_deassociate(ip);
 
-        xfs_itrace_exit(ip);
-        xfs_itrace_exit(dp);
-
  std_return:
         if (DM_EVENT_ENABLED(dp, DM_EVENT_POSTREMOVE)) {
                 XFS_SEND_NAMESP(mp, DM_EVENT_POSTREMOVE, dp, DM_RIGHT_NULL,
@@ -2302,7 +2298,6 @@ xfs_symlink(
                         goto error_return;
                 goto error1;
         }
-        xfs_itrace_ref(ip);
 
         /*
          * An error after we've joined dp to the transaction will result in the
@@ -2845,7 +2840,6 @@ xfs_free_file_space(
         ioffset = offset & ~(rounding - 1);
 
         if (VN_CACHED(VFS_I(ip)) != 0) {
-                xfs_inval_cached_trace(ip, ioffset, -1, ioffset, -1);
                 error = xfs_flushinval_pages(ip, ioffset, -1, FI_REMAPF_LOCKED);
                 if (error)
                         goto out_unlock_iolock;
diff --git a/include/asm-generic/bitops/atomic.h b/include/asm-generic/bitops/atomic.h
index c8946465e63a..ecc44a8e2b44 100644
--- a/include/asm-generic/bitops/atomic.h
+++ b/include/asm-generic/bitops/atomic.h
@@ -15,19 +15,19 @@
 #  define ATOMIC_HASH_SIZE 4
 #  define ATOMIC_HASH(a) (&(__atomic_hash[ (((unsigned long) a)/L1_CACHE_BYTES) & (ATOMIC_HASH_SIZE-1) ]))
 
-extern raw_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned;
+extern arch_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned;
 
 /* Can't use raw_spin_lock_irq because of #include problems, so
  * this is the substitute */
 #define _atomic_spin_lock_irqsave(l,f) do {     \
-        raw_spinlock_t *s = ATOMIC_HASH(l);     \
+        arch_spinlock_t *s = ATOMIC_HASH(l);    \
         local_irq_save(f);                      \
-        __raw_spin_lock(s);                     \
+        arch_spin_lock(s);                      \
 } while(0)
 
 #define _atomic_spin_unlock_irqrestore(l,f) do {        \
-        raw_spinlock_t *s = ATOMIC_HASH(l);             \
-        __raw_spin_unlock(s);                           \
+        arch_spinlock_t *s = ATOMIC_HASH(l);            \
+        arch_spin_unlock(s);                            \
         local_irq_restore(f);                           \
 } while(0)
 
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 4b6755984d24..18c435d7c082 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -113,22 +113,22 @@ extern void warn_slowpath_null(const char *file, const int line);
 #endif
 
 #define WARN_ON_ONCE(condition) ({                              \
-        static int __warned;                                    \
+        static bool __warned;                                   \
         int __ret_warn_once = !!(condition);                    \
                                                                 \
         if (unlikely(__ret_warn_once))                          \
                 if (WARN_ON(!__warned))                         \
-                        __warned = 1;                           \
+                        __warned = true;                        \
         unlikely(__ret_warn_once);                              \
 })
 
 #define WARN_ONCE(condition, format...) ({                      \
-        static int __warned;                                    \
+        static bool __warned;                                   \
         int __ret_warn_once = !!(condition);                    \
                                                                 \
         if (unlikely(__ret_warn_once))                          \
                 if (WARN(!__warned, format))                    \
-                        __warned = 1;                           \
+                        __warned = true;                        \
         unlikely(__ret_warn_once);                              \
 })
 
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 204bed37e82d..485eeb6c4ef3 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -145,6 +145,7 @@ extern int __gpio_to_irq(unsigned gpio);
 extern int gpio_export(unsigned gpio, bool direction_may_change);
 extern int gpio_export_link(struct device *dev, const char *name,
                         unsigned gpio);
+extern int gpio_sysfs_set_active_low(unsigned gpio, int value);
 extern void gpio_unexport(unsigned gpio);
 
 #endif  /* CONFIG_GPIO_SYSFS */
@@ -197,6 +198,11 @@ static inline int gpio_export_link(struct device *dev, const char *name,
         return -ENOSYS;
 }
 
+static inline int gpio_sysfs_set_active_low(unsigned gpio, int value)
+{
+        return -ENOSYS;
+}
+
 static inline void gpio_unexport(unsigned gpio)
 {
 }
diff --git a/include/asm-generic/mman-common.h b/include/asm-generic/mman-common.h
index 5ee13b2fd223..20111265afd8 100644
--- a/include/asm-generic/mman-common.h
+++ b/include/asm-generic/mman-common.h
@@ -19,6 +19,11 @@
 #define MAP_TYPE        0x0f            /* Mask for type of mapping */
 #define MAP_FIXED       0x10            /* Interpret addr exactly */
 #define MAP_ANONYMOUS   0x20            /* don't use a file */
+#ifdef CONFIG_MMAP_ALLOW_UNINITIALIZED
+# define MAP_UNINITIALIZED 0x4000000    /* For anonymous mmap, memory could be uninitialized */
+#else
+# define MAP_UNINITIALIZED 0x0          /* Don't support this flag */
+#endif
 
 #define MS_ASYNC        1               /* sync memory asynchronously */
 #define MS_INVALIDATE   2               /* invalidate the caches */
diff --git a/include/linux/aio.h b/include/linux/aio.h
index aea219d7d8d1..811dbb369379 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -102,7 +102,6 @@ struct kiocb {
         } ki_obj;
 
         __u64                   ki_user_data;   /* user's data for completion */
-        wait_queue_t            ki_wait;
         loff_t                  ki_pos;
 
         void                    *private;
@@ -140,7 +139,6 @@ struct kiocb {
                 (x)->ki_dtor = NULL;                    \
                 (x)->ki_obj.tsk = tsk;                  \
                 (x)->ki_user_data = 0;                  \
-                init_wait((&(x)->ki_wait));             \
         } while (0)
 
 #define AIO_RING_MAGIC                  0xa10a10a1
@@ -223,8 +221,6 @@ struct mm_struct;
 static inline void exit_aio(struct mm_struct *mm) { }
 #endif /* CONFIG_AIO */
 
-#define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait)
-
 static inline struct kiocb *list_kiocb(struct list_head *h)
 {
         return list_entry(h, struct kiocb, ki_list);
diff --git a/include/linux/atmel-mci.h b/include/linux/atmel-mci.h
index 57b1846a3c87..3e09b345f4d6 100644
--- a/include/linux/atmel-mci.h
+++ b/include/linux/atmel-mci.h
@@ -3,8 +3,6 @@
 
 #define ATMEL_MCI_MAX_NR_SLOTS  2
 
-#include <linux/dw_dmac.h>
-
 /**
  * struct mci_slot_pdata - board-specific per-slot configuration
  * @bus_width: Number of data lines wired up the slot
@@ -34,7 +32,7 @@ struct mci_slot_pdata {
  * @slot: Per-slot configuration data.
  */
 struct mci_platform_data {
-        struct dw_dma_slave     dma_slave;
+        struct mci_dma_data     *dma_slave;
         struct mci_slot_pdata   slot[ATMEL_MCI_MAX_NR_SLOTS];
 };
 
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index 756d78b8c1c5..daf8c480c786 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -42,6 +42,9 @@
  * bitmap_empty(src, nbits)                     Are all bits zero in *src?
  * bitmap_full(src, nbits)                      Are all bits set in *src?
  * bitmap_weight(src, nbits)                    Hamming Weight: number set bits
+ * bitmap_set(dst, pos, nbits)                  Set specified bit area
+ * bitmap_clear(dst, pos, nbits)                Clear specified bit area
+ * bitmap_find_next_zero_area(buf, len, pos, n, mask)   Find bit free area
  * bitmap_shift_right(dst, src, n, nbits)       *dst = *src >> n
  * bitmap_shift_left(dst, src, n, nbits)        *dst = *src << n
  * bitmap_remap(dst, src, old, new, nbits)      *dst = map(old, new)(src)
@@ -108,6 +111,14 @@ extern int __bitmap_subset(const unsigned long *bitmap1,
                         const unsigned long *bitmap2, int bits);
 extern int __bitmap_weight(const unsigned long *bitmap, int bits);
 
+extern void bitmap_set(unsigned long *map, int i, int len);
+extern void bitmap_clear(unsigned long *map, int start, int nr);
+extern unsigned long bitmap_find_next_zero_area(unsigned long *map,
+                                         unsigned long size,
+                                         unsigned long start,
+                                         unsigned int nr,
+                                         unsigned long align_mask);
+
 extern int bitmap_scnprintf(char *buf, unsigned int len,
                         const unsigned long *src, int nbits);
 extern int __bitmap_parse(const char *buf, unsigned int buflen, int is_user,
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 1ed2a5cc03f5..3db7767d2a17 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -51,6 +51,15 @@ struct can_priv {
         struct sk_buff **echo_skb;
 };
 
+/*
+ * get_can_dlc(value) - helper macro to cast a given data length code (dlc)
+ * to __u8 and ensure the dlc value to be max. 8 bytes.
+ *
+ * To be used in the CAN netdriver receive path to ensure conformance with
+ * ISO 11898-1 Chapter 8.4.2.3 (DLC field)
+ */
+#define get_can_dlc(i)  (min_t(__u8, (i), 8))
+
 struct net_device *alloc_candev(int sizeof_priv, unsigned int echo_skb_max);
 void free_candev(struct net_device *dev);
 
diff --git a/include/linux/cs5535.h b/include/linux/cs5535.h
new file mode 100644
index 000000000000..d5a1d4810b80
--- /dev/null
+++ b/include/linux/cs5535.h
@@ -0,0 +1,172 @@
+/*
+ * AMD CS5535/CS5536 definitions
+ * Copyright (C) 2006  Advanced Micro Devices, Inc.
+ * Copyright (C) 2009  Andres Salomon <dilinger@collabora.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public License
+ * as published by the Free Software Foundation.
+ */
+
+#ifndef _CS5535_H
+#define _CS5535_H
+
+/* MSRs */
+#define MSR_GLIU_P2D_RO0        0x10000029
+
+#define MSR_LX_GLD_MSR_CONFIG   0x48002001
+#define MSR_LX_MSR_PADSEL       0x48002011      /* NOT 0x48000011; the data
+                                                 * sheet has the wrong value */
+#define MSR_GLCP_SYS_RSTPLL     0x4C000014
+#define MSR_GLCP_DOTPLL         0x4C000015
+
+#define MSR_LBAR_SMB            0x5140000B
+#define MSR_LBAR_GPIO           0x5140000C
+#define MSR_LBAR_MFGPT          0x5140000D
+#define MSR_LBAR_ACPI           0x5140000E
+#define MSR_LBAR_PMS            0x5140000F
+
+#define MSR_DIVIL_SOFT_RESET    0x51400017
+
+#define MSR_PIC_YSEL_LOW        0x51400020
+#define MSR_PIC_YSEL_HIGH       0x51400021
+#define MSR_PIC_ZSEL_LOW        0x51400022
+#define MSR_PIC_ZSEL_HIGH       0x51400023
+#define MSR_PIC_IRQM_LPC        0x51400025
+
+#define MSR_MFGPT_IRQ           0x51400028
+#define MSR_MFGPT_NR            0x51400029
+#define MSR_MFGPT_SETUP         0x5140002B
+
+#define MSR_LX_SPARE_MSR        0x80000011      /* DC-specific */
+
+#define MSR_GX_GLD_MSR_CONFIG   0xC0002001
+#define MSR_GX_MSR_PADSEL       0xC0002011
+
+/* resource sizes */
+#define LBAR_GPIO_SIZE          0xFF
+#define LBAR_MFGPT_SIZE         0x40
+#define LBAR_ACPI_SIZE          0x40
+#define LBAR_PMS_SIZE           0x80
+
+/* VSA2 magic values */
+#define VSA_VRC_INDEX           0xAC1C
+#define VSA_VRC_DATA            0xAC1E
+#define VSA_VR_UNLOCK           0xFC53  /* unlock virtual register */
+#define VSA_VR_SIGNATURE        0x0003
+#define VSA_VR_MEM_SIZE         0x0200
+#define AMD_VSA_SIG             0x4132  /* signature is ascii 'VSA2' */
+#define GSW_VSA_SIG             0x534d  /* General Software signature */
+
+#include <linux/io.h>
+
+static inline int cs5535_has_vsa2(void)
+{
+        static int has_vsa2 = -1;
+
+        if (has_vsa2 == -1) {
+                uint16_t val;
+
+                /*
+                 * The VSA has virtual registers that we can query for a
+                 * signature.
+                 */
+                outw(VSA_VR_UNLOCK, VSA_VRC_INDEX);
+                outw(VSA_VR_SIGNATURE, VSA_VRC_INDEX);
+
+                val = inw(VSA_VRC_DATA);
+                has_vsa2 = (val == AMD_VSA_SIG || val == GSW_VSA_SIG);
+        }
+
+        return has_vsa2;
+}
+
+/* GPIOs */
+#define GPIO_OUTPUT_VAL         0x00
+#define GPIO_OUTPUT_ENABLE      0x04
+#define GPIO_OUTPUT_OPEN_DRAIN  0x08
+#define GPIO_OUTPUT_INVERT      0x0C
+#define GPIO_OUTPUT_AUX1        0x10
+#define GPIO_OUTPUT_AUX2        0x14
+#define GPIO_PULL_UP            0x18
+#define GPIO_PULL_DOWN          0x1C
+#define GPIO_INPUT_ENABLE       0x20
+#define GPIO_INPUT_INVERT       0x24
+#define GPIO_INPUT_FILTER       0x28
+#define GPIO_INPUT_EVENT_COUNT  0x2C
+#define GPIO_READ_BACK          0x30
+#define GPIO_INPUT_AUX1         0x34
+#define GPIO_EVENTS_ENABLE      0x38
+#define GPIO_LOCK_ENABLE        0x3C
+#define GPIO_POSITIVE_EDGE_EN   0x40
+#define GPIO_NEGATIVE_EDGE_EN   0x44
+#define GPIO_POSITIVE_EDGE_STS  0x48
+#define GPIO_NEGATIVE_EDGE_STS  0x4C
+
+#define GPIO_MAP_X              0xE0
+#define GPIO_MAP_Y              0xE4
+#define GPIO_MAP_Z              0xE8
+#define GPIO_MAP_W              0xEC
+
+void cs5535_gpio_set(unsigned offset, unsigned int reg);
+void cs5535_gpio_clear(unsigned offset, unsigned int reg);
+int cs5535_gpio_isset(unsigned offset, unsigned int reg);
+
+/* MFGPTs */
+
+#define MFGPT_MAX_TIMERS        8
+#define MFGPT_TIMER_ANY         (-1)
+
+#define MFGPT_DOMAIN_WORKING    1
+#define MFGPT_DOMAIN_STANDBY    2
+#define MFGPT_DOMAIN_ANY        (MFGPT_DOMAIN_WORKING | MFGPT_DOMAIN_STANDBY)
+
+#define MFGPT_CMP1              0
+#define MFGPT_CMP2              1
+
+#define MFGPT_EVENT_IRQ         0
+#define MFGPT_EVENT_NMI         1
+#define MFGPT_EVENT_RESET       3
+
+#define MFGPT_REG_CMP1          0
+#define MFGPT_REG_CMP2          2
+#define MFGPT_REG_COUNTER       4
+#define MFGPT_REG_SETUP         6
+
+#define MFGPT_SETUP_CNTEN       (1 << 15)
+#define MFGPT_SETUP_CMP2        (1 << 14)
+#define MFGPT_SETUP_CMP1        (1 << 13)
+#define MFGPT_SETUP_SETUP       (1 << 12)
+#define MFGPT_SETUP_STOPEN      (1 << 11)
+#define MFGPT_SETUP_EXTEN       (1 << 10)
+#define MFGPT_SETUP_REVEN       (1 << 5)
+#define MFGPT_SETUP_CLKSEL      (1 << 4)
+
+struct cs5535_mfgpt_timer;
+
+extern uint16_t cs5535_mfgpt_read(struct cs5535_mfgpt_timer *timer,
+                uint16_t reg);
+extern void cs5535_mfgpt_write(struct cs5535_mfgpt_timer *timer, uint16_t reg,
+                uint16_t value);
+
+extern int cs5535_mfgpt_toggle_event(struct cs5535_mfgpt_timer *timer, int cmp,
+                int event, int enable);
+extern int cs5535_mfgpt_set_irq(struct cs5535_mfgpt_timer *timer, int cmp,
+                int *irq, int enable);
+extern struct cs5535_mfgpt_timer *cs5535_mfgpt_alloc_timer(int timer,
+                int domain);
+extern void cs5535_mfgpt_free_timer(struct cs5535_mfgpt_timer *timer);
+
+static inline int cs5535_mfgpt_setup_irq(struct cs5535_mfgpt_timer *timer,
+                int cmp, int *irq)
+{
+        return cs5535_mfgpt_set_irq(timer, cmp, irq, 1);
+}
+
+static inline int cs5535_mfgpt_release_irq(struct cs5535_mfgpt_timer *timer,
+                int cmp, int *irq)
+{
+        return cs5535_mfgpt_set_irq(timer, cmp, irq, 0);
+}
+
+#endif
diff --git a/include/linux/ctype.h b/include/linux/ctype.h
index afa36392297a..a3d6ee0044f9 100644
--- a/include/linux/ctype.h
+++ b/include/linux/ctype.h
@@ -15,7 +15,7 @@
 #define _X      0x40    /* hex digit */
 #define _SP     0x80    /* hard space (0x20) */
 
-extern unsigned char _ctype[];
+extern const unsigned char _ctype[];
 
 #define __ismask(x) (_ctype[(int)(unsigned char)(x)])
 
@@ -27,6 +27,7 @@ extern unsigned char _ctype[];
 #define islower(c)      ((__ismask(c)&(_L)) != 0)
 #define isprint(c)      ((__ismask(c)&(_P|_U|_L|_D|_SP)) != 0)
 #define ispunct(c)      ((__ismask(c)&(_P)) != 0)
+/* Note: isspace() must return false for %NUL-terminator */
 #define isspace(c)      ((__ismask(c)&(_S)) != 0)
 #define isupper(c)      ((__ismask(c)&(_U)) != 0)
 #define isxdigit(c)     ((__ismask(c)&(_D|_X)) != 0)
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index df7607e6dce8..d4c9c0b88adc 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -235,7 +235,7 @@ void dm_uevent_add(struct mapped_device *md, struct list_head *elist);
 const char *dm_device_name(struct mapped_device *md);
 int dm_copy_name_and_uuid(struct mapped_device *md, char *name, char *uuid);
 struct gendisk *dm_disk(struct mapped_device *md);
-int dm_suspended(struct mapped_device *md);
+int dm_suspended(struct dm_target *ti);
 int dm_noflush_suspending(struct dm_target *ti);
 union map_info *dm_get_mapinfo(struct bio *bio);
 union map_info *dm_get_rq_mapinfo(struct request *rq);
@@ -276,7 +276,7 @@ void dm_table_unplug_all(struct dm_table *t);
 /*
  * Table reference counting.
  */
-struct dm_table *dm_get_table(struct mapped_device *md);
+struct dm_table *dm_get_live_table(struct mapped_device *md);
 void dm_table_get(struct dm_table *t);
 void dm_table_put(struct dm_table *t);
 
@@ -295,8 +295,10 @@ void dm_table_event(struct dm_table *t);
 
 /*
  * The device must be suspended before calling this method.
+ * Returns the previous table, which the caller must destroy.
  */
-int dm_swap_table(struct mapped_device *md, struct dm_table *t);
+struct dm_table *dm_swap_table(struct mapped_device *md,
+                               struct dm_table *t);
 
 /*
  * A wrapper around vmalloc.
diff --git a/include/linux/dm-dirty-log.h b/include/linux/dm-dirty-log.h
index 5e8b11d88f6f..7084503c3405 100644
--- a/include/linux/dm-dirty-log.h
+++ b/include/linux/dm-dirty-log.h
@@ -21,6 +21,7 @@ struct dm_dirty_log_type;
 
 struct dm_dirty_log {
         struct dm_dirty_log_type *type;
+        int (*flush_callback_fn)(struct dm_target *ti);
         void *context;
 };
 
@@ -136,8 +137,9 @@ int dm_dirty_log_type_unregister(struct dm_dirty_log_type *type);
  * type->constructor/destructor() directly.
  */
 struct dm_dirty_log *dm_dirty_log_create(const char *type_name,
-                                         struct dm_target *ti,
-                                         unsigned argc, char **argv);
+                        struct dm_target *ti,
+                        int (*flush_callback_fn)(struct dm_target *ti),
+                        unsigned argc, char **argv);
 void dm_dirty_log_destroy(struct dm_dirty_log *log);
 
 #endif  /* __KERNEL__ */
diff --git a/include/linux/dm-ioctl.h b/include/linux/dm-ioctl.h
index 2ab84c83c31a..aa95508d2f95 100644
--- a/include/linux/dm-ioctl.h
+++ b/include/linux/dm-ioctl.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001 - 2003 Sistina Software (UK) Limited.
- * Copyright (C) 2004 - 2005 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004 - 2009 Red Hat, Inc. All rights reserved.
  *
  * This file is released under the LGPL.
  */
@@ -266,9 +266,9 @@ enum {
 #define DM_DEV_SET_GEOMETRY     _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
 
 #define DM_VERSION_MAJOR        4
-#define DM_VERSION_MINOR        15
+#define DM_VERSION_MINOR        16
 #define DM_VERSION_PATCHLEVEL   0
-#define DM_VERSION_EXTRA        "-ioctl (2009-04-01)"
+#define DM_VERSION_EXTRA        "-ioctl (2009-11-05)"
 
 /* Status bits */
 #define DM_READONLY_FLAG        (1 << 0) /* In/Out */
@@ -309,4 +309,11 @@ enum {
  */
 #define DM_NOFLUSH_FLAG         (1 << 11) /* In */
 
+/*
+ * If set, any table information returned will relate to the inactive
+ * table instead of the live one.  Always check DM_INACTIVE_PRESENT_FLAG
+ * is set before using the data returned.
+ */
+#define DM_QUERY_INACTIVE_TABLE_FLAG    (1 << 12) /* In */
+
 #endif                          /* _LINUX_DM_IOCTL_H */
diff --git a/include/linux/dm-region-hash.h b/include/linux/dm-region-hash.h
index a9e652a41373..9e2a7a401df5 100644
--- a/include/linux/dm-region-hash.h
+++ b/include/linux/dm-region-hash.h
@@ -78,8 +78,7 @@ void dm_rh_dec(struct dm_region_hash *rh, region_t region);
 /* Delay bios on regions. */
 void dm_rh_delay(struct dm_region_hash *rh, struct bio *bio);
 
-void dm_rh_mark_nosync(struct dm_region_hash *rh,
-                       struct bio *bio, unsigned done, int error);
+void dm_rh_mark_nosync(struct dm_region_hash *rh, struct bio *bio);
 
 /*
  * Region recovery control.
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 2b9f2ac7ed60..78784982b33e 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -74,7 +74,7 @@ enum dma_transaction_type {
  *  control completion, and communicate status.
  * @DMA_PREP_INTERRUPT - trigger an interrupt (callback) upon completion of
  *  this transaction
- * @DMA_CTRL_ACK - the descriptor cannot be reused until the client
+ * @DMA_CTRL_ACK - if clear, the descriptor cannot be reused until the client
  *  acknowledges receipt, i.e. has has a chance to establish any dependency
  *  chains
  * @DMA_COMPL_SKIP_SRC_UNMAP - set to disable dma-unmapping the source buffer(s)
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index a0d9422a1569..f8c2e1767500 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -57,8 +57,7 @@ extern int ddebug_remove_module(char *mod_name);
         { 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__);                         \
+                printk(KERN_DEBUG pr_fmt(fmt),  ##__VA_ARGS__);         \
         } while (0)
 
 
@@ -69,9 +68,7 @@ extern int ddebug_remove_module(char *mod_name);
         { 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__);                 \
+                dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__);        \
         } while (0)
 
 #else
@@ -81,8 +78,10 @@ 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)
+#define dynamic_pr_debug(fmt, ...)                                      \
+        do { if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); } while (0)
+#define dynamic_dev_dbg(dev, format, ...)                               \
+        do { if (0) dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__); } while (0)
 #endif
 
 #endif
diff --git a/include/linux/efi.h b/include/linux/efi.h
index ce4581fbc08b..fb737bc19a8c 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -280,11 +280,7 @@ efi_guidcmp (efi_guid_t left, efi_guid_t right)
 static inline char *
 efi_guid_unparse(efi_guid_t *guid, char *out)
 {
-        sprintf(out, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-                guid->b[3], guid->b[2], guid->b[1], guid->b[0],
-                guid->b[5], guid->b[4], guid->b[7], guid->b[6],
-                guid->b[8], guid->b[9], guid->b[10], guid->b[11],
-                guid->b[12], guid->b[13], guid->b[14], guid->b[15]);
+        sprintf(out, "%pUl", guid->b);
         return out;
 }
 
diff --git a/include/linux/err.h b/include/linux/err.h
index ec87f3142bf3..1b12642636c7 100644
--- a/include/linux/err.h
+++ b/include/linux/err.h
@@ -34,6 +34,11 @@ static inline long IS_ERR(const void *ptr)
         return IS_ERR_VALUE((unsigned long)ptr);
 }
 
+static inline long IS_ERR_OR_NULL(const void *ptr)
+{
+        return !ptr || IS_ERR_VALUE((unsigned long)ptr);
+}
+
 /**
  * ERR_CAST - Explicitly cast an error-valued pointer to another pointer type
  * @ptr: The pointer to cast.
diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
index 27e772cefb6a..dc12f416a49f 100644
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@ -97,7 +97,7 @@ struct fid {
  * @get_name:       find the name for a given inode in a given directory
  * @get_parent:     find the parent of a given directory
  *
- * See Documentation/filesystems/Exporting for details on how to use
+ * See Documentation/filesystems/nfs/Exporting for details on how to use
  * this interface correctly.
  *
  * encode_fh:
diff --git a/include/linux/fs.h b/include/linux/fs.h
index a057f48eb156..b23a7018eb90 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2264,9 +2264,11 @@ ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
         int lock_type);
 
 enum {
-        DIO_LOCKING = 1, /* need locking between buffered and direct access */
-        DIO_NO_LOCKING,  /* bdev; no locking at all between buffered/direct */
-        DIO_OWN_LOCKING, /* filesystem locks buffered and direct internally */
+        /* need locking between buffered and direct access */
+        DIO_LOCKING     = 0x01,
+
+        /* filesystem does not support filling holes */
+        DIO_SKIP_HOLES  = 0x02,
 };
 
 static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
@@ -2275,7 +2277,8 @@ static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
         dio_iodone_t end_io)
 {
         return __blockdev_direct_IO(rw, iocb, inode, bdev, iov, offset,
-                                nr_segs, get_block, end_io, DIO_LOCKING);
+                                    nr_segs, get_block, end_io,
+                                    DIO_LOCKING | DIO_SKIP_HOLES);
 }
 
 static inline ssize_t blockdev_direct_IO_no_locking(int rw, struct kiocb *iocb,
@@ -2284,16 +2287,7 @@ static inline ssize_t blockdev_direct_IO_no_locking(int rw, struct kiocb *iocb,
         dio_iodone_t end_io)
 {
         return __blockdev_direct_IO(rw, iocb, inode, bdev, iov, offset,
-                                nr_segs, get_block, end_io, DIO_NO_LOCKING);
-}
-
-static inline ssize_t blockdev_direct_IO_own_locking(int rw, struct kiocb *iocb,
-        struct inode *inode, struct block_device *bdev, const struct iovec *iov,
-        loff_t offset, unsigned long nr_segs, get_block_t get_block,
-        dio_iodone_t end_io)
-{
-        return __blockdev_direct_IO(rw, iocb, inode, bdev, iov, offset,
-                                nr_segs, get_block, end_io, DIO_OWN_LOCKING);
+                                nr_segs, get_block, end_io, 0);
 }
 #endif
 
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index 059bd189d35d..4e949a5b5b85 100644
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -99,6 +99,12 @@ static inline int gpio_export_link(struct device *dev, const char *name,
         return -EINVAL;
 }
 
+static inline int gpio_sysfs_set_active_low(unsigned gpio, int value)
+{
+        /* GPIO can never have been requested */
+        WARN_ON(1);
+        return -EINVAL;
+}
 
 static inline void gpio_unexport(unsigned gpio)
 {
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index af634e95871d..5d86fb2309d2 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -169,7 +169,7 @@ struct hrtimer_clock_base {
  * @max_hang_time:      Maximum time spent in hrtimer_interrupt
  */
 struct hrtimer_cpu_base {
-        spinlock_t                      lock;
+        raw_spinlock_t                  lock;
         struct hrtimer_clock_base       clock_base[HRTIMER_MAX_CLOCK_BASES];
 #ifdef CONFIG_HIGH_RES_TIMERS
         ktime_t                         expires_next;
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 41a59afc70fa..78b4bc64c006 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -23,6 +23,12 @@ void reset_vma_resv_huge_pages(struct vm_area_struct *vma);
 int hugetlb_sysctl_handler(struct ctl_table *, int, void __user *, size_t *, loff_t *);
 int hugetlb_overcommit_handler(struct ctl_table *, int, void __user *, size_t *, loff_t *);
 int hugetlb_treat_movable_handler(struct ctl_table *, int, void __user *, size_t *, loff_t *);
+
+#ifdef CONFIG_NUMA
+int hugetlb_mempolicy_sysctl_handler(struct ctl_table *, int,
+                                        void __user *, size_t *, loff_t *);
+#endif
+
 int copy_hugetlb_page_range(struct mm_struct *, struct mm_struct *, struct vm_area_struct *);
 int follow_hugetlb_page(struct mm_struct *, struct vm_area_struct *,
                         struct page **, struct vm_area_struct **,
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 419ab546b266..02fc617782ef 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -110,7 +110,7 @@ extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client,
  * @driver: Device driver model driver
  * @id_table: List of I2C devices supported by this driver
  * @detect: Callback for device detection
- * @address_data: The I2C addresses to probe (for detect)
+ * @address_list: The I2C addresses to probe (for detect)
  * @clients: List of detected clients we created (for i2c-core use only)
  *
  * The driver.owner field should be set to the module owner of this driver.
@@ -161,8 +161,8 @@ struct i2c_driver {
         const struct i2c_device_id *id_table;
 
         /* Device detection callback for automatic device creation */
-        int (*detect)(struct i2c_client *, int kind, struct i2c_board_info *);
-        const struct i2c_client_address_data *address_data;
+        int (*detect)(struct i2c_client *, struct i2c_board_info *);
+        const unsigned short *address_list;
         struct list_head clients;
 };
 #define to_i2c_driver(d) container_of(d, struct i2c_driver, driver)
@@ -391,14 +391,6 @@ static inline void i2c_unlock_adapter(struct i2c_adapter *adapter)
 #define I2C_CLASS_DDC           (1<<3)  /* DDC bus on graphics adapters */
 #define I2C_CLASS_SPD           (1<<7)  /* SPD EEPROMs and similar */
 
-/* i2c_client_address_data is the struct for holding default client
- * addresses for a driver and for the parameters supplied on the
- * command line
- */
-struct i2c_client_address_data {
-        const unsigned short *normal_i2c;
-};
-
 /* Internal numbers to terminate lists */
 #define I2C_CLIENT_END          0xfffeU
 
@@ -576,82 +568,4 @@ union i2c_smbus_data {
 #define I2C_SMBUS_BLOCK_PROC_CALL   7           /* SMBus 2.0 */
 #define I2C_SMBUS_I2C_BLOCK_DATA    8
 
-
-#ifdef __KERNEL__
-
-/* These defines are used for probing i2c client addresses */
-/* The length of the option lists */
-#define I2C_CLIENT_MAX_OPTS 48
-
-/* Default fill of many variables */
-#define I2C_CLIENT_DEFAULTS {I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-                             I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END}
-
-/* I2C_CLIENT_MODULE_PARM creates a module parameter, and puts it in the
-   module header */
-
-#define I2C_CLIENT_MODULE_PARM(var,desc) \
-  static unsigned short var[I2C_CLIENT_MAX_OPTS] = I2C_CLIENT_DEFAULTS; \
-  static unsigned int var##_num; \
-  module_param_array(var, short, &var##_num, 0); \
-  MODULE_PARM_DESC(var, desc)
-
-#define I2C_CLIENT_INSMOD_COMMON                                        \
-static const struct i2c_client_address_data addr_data = {               \
-        .normal_i2c     = normal_i2c,                                   \
-}
-
-/* These are the ones you want to use in your own drivers. Pick the one
-   which matches the number of devices the driver differenciates between. */
-#define I2C_CLIENT_INSMOD                                               \
-I2C_CLIENT_INSMOD_COMMON
-
-#define I2C_CLIENT_INSMOD_1(chip1)                                      \
-enum chips { any_chip, chip1 };                                         \
-I2C_CLIENT_INSMOD_COMMON
-
-#define I2C_CLIENT_INSMOD_2(chip1, chip2)                               \
-enum chips { any_chip, chip1, chip2 };                                  \
-I2C_CLIENT_INSMOD_COMMON
-
-#define I2C_CLIENT_INSMOD_3(chip1, chip2, chip3)                        \
-enum chips { any_chip, chip1, chip2, chip3 };                           \
-I2C_CLIENT_INSMOD_COMMON
-
-#define I2C_CLIENT_INSMOD_4(chip1, chip2, chip3, chip4)                 \
-enum chips { any_chip, chip1, chip2, chip3, chip4 };                    \
-I2C_CLIENT_INSMOD_COMMON
-
-#define I2C_CLIENT_INSMOD_5(chip1, chip2, chip3, chip4, chip5)          \
-enum chips { any_chip, chip1, chip2, chip3, chip4, chip5 };             \
-I2C_CLIENT_INSMOD_COMMON
-
-#define I2C_CLIENT_INSMOD_6(chip1, chip2, chip3, chip4, chip5, chip6)   \
-enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6 };      \
-I2C_CLIENT_INSMOD_COMMON
-
-#define I2C_CLIENT_INSMOD_7(chip1, chip2, chip3, chip4, chip5, chip6, chip7) \
-enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6,        \
-             chip7 };                                                   \
-I2C_CLIENT_INSMOD_COMMON
-
-#define I2C_CLIENT_INSMOD_8(chip1, chip2, chip3, chip4, chip5, chip6, chip7, chip8) \
-enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6,        \
-             chip7, chip8 };                                            \
-I2C_CLIENT_INSMOD_COMMON
-#endif /* __KERNEL__ */
 #endif /* _LINUX_I2C_H */
diff --git a/include/linux/i8042.h b/include/linux/i8042.h
index 60c3360ef6ad..9bf6870ee5f4 100644
--- a/include/linux/i8042.h
+++ b/include/linux/i8042.h
@@ -39,6 +39,10 @@ void i8042_lock_chip(void);
 void i8042_unlock_chip(void);
 int i8042_command(unsigned char *param, int command);
 bool i8042_check_port_owner(const struct serio *);
+int i8042_install_filter(bool (*filter)(unsigned char data, unsigned char str,
+                                        struct serio *serio));
+int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str,
+                                       struct serio *serio));
 
 #else
 
@@ -52,7 +56,7 @@ void i8042_unlock_chip(void)
 
 int i8042_command(unsigned char *param, int command)
 {
-        return -ENOSYS;
+        return -ENODEV;
 }
 
 bool i8042_check_port_owner(const struct serio *serio)
@@ -60,6 +64,18 @@ bool i8042_check_port_owner(const struct serio *serio)
         return false;
 }
 
+int i8042_install_filter(bool (*filter)(unsigned char data, unsigned char str,
+                                        struct serio *serio))
+{
+        return -ENODEV;
+}
+
+int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str,
+                                       struct serio *serio))
+{
+        return -ENODEV;
+}
+
 #endif
 
 #endif
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 8d10aa7fd4c9..5ed8b9c50355 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -111,6 +111,12 @@ extern struct cred init_cred;
 # define INIT_PERF_EVENTS(tsk)
 #endif
 
+#ifdef CONFIG_FS_JOURNAL_INFO
+#define INIT_JOURNAL_INFO       .journal_info = NULL,
+#else
+#define INIT_JOURNAL_INFO
+#endif
+
 /*
  *  INIT_TASK is used to set up the first task table, touch at
  * your own risk!. Base=0, limit=0x1fffff (=2MB)
@@ -162,10 +168,9 @@ extern struct cred init_cred;
                 .signal = {{0}}},                                       \
         .blocked        = {{0}},                                        \
         .alloc_lock     = __SPIN_LOCK_UNLOCKED(tsk.alloc_lock),         \
-        .journal_info   = NULL,                                         \
         .cpu_timers     = INIT_CPU_TIMERS(tsk.cpu_timers),              \
         .fs_excl        = ATOMIC_INIT(0),                               \
-        .pi_lock        = __SPIN_LOCK_UNLOCKED(tsk.pi_lock),            \
+        .pi_lock        = __RAW_SPIN_LOCK_UNLOCKED(tsk.pi_lock),        \
         .timer_slack_ns = 50000, /* 50 usec default slack */            \
         .pids = {                                                       \
                 [PIDTYPE_PID]  = INIT_PID_LINK(PIDTYPE_PID),            \
@@ -173,6 +178,7 @@ extern struct cred init_cred;
                 [PIDTYPE_SID]  = INIT_PID_LINK(PIDTYPE_SID),            \
         },                                                              \
         .dirties = INIT_PROP_LOCAL_SINGLE(dirties),                     \
+        INIT_JOURNAL_INFO                                               \
         INIT_IDS                                                        \
         INIT_PERF_EVENTS(tsk)                                           \
         INIT_TRACE_IRQFLAGS                                             \
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 4f0a72a9740c..9310c699a37d 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -332,6 +332,7 @@ struct intel_iommu {
 #ifdef CONFIG_INTR_REMAP
         struct ir_table *ir_table;      /* Interrupt remapping info */
 #endif
+        int             node;
 };
 
 static inline void __iommu_flush_cache(
diff --git a/include/linux/iommu-helper.h b/include/linux/iommu-helper.h
index 3b068e5b5671..64d1b638745d 100644
--- a/include/linux/iommu-helper.h
+++ b/include/linux/iommu-helper.h
@@ -14,14 +14,11 @@ static inline unsigned long iommu_device_max_index(unsigned long size,
 extern int iommu_is_span_boundary(unsigned int index, unsigned int nr,
                                   unsigned long shift,
                                   unsigned long boundary_size);
-extern void iommu_area_reserve(unsigned long *map, unsigned long i, int len);
 extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size,
                                       unsigned long start, unsigned int nr,
                                       unsigned long shift,
                                       unsigned long boundary_size,
                                       unsigned long align_mask);
-extern void iommu_area_free(unsigned long *map, unsigned long start,
-                            unsigned int nr);
 
 extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len,
                                      unsigned long io_page_size);
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 83aa81297ea3..7129504e053d 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -126,11 +126,11 @@ extern int allocate_resource(struct resource *root, struct resource *new,
 int adjust_resource(struct resource *res, resource_size_t start,
                     resource_size_t size);
 resource_size_t resource_alignment(struct resource *res);
-static inline resource_size_t resource_size(struct resource *res)
+static inline resource_size_t resource_size(const struct resource *res)
 {
         return res->end - res->start + 1;
 }
-static inline unsigned long resource_type(struct resource *res)
+static inline unsigned long resource_type(const struct resource *res)
 {
         return res->flags & IORESOURCE_TYPE_BITS;
 }
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index e408722a84c7..07baa38bce37 100644
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -87,7 +87,7 @@ 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 HARD_MSGMAX    (32768*sizeof(void *)/4)
 #define DFLT_MSGSIZEMAX 8192   /* max message size */
 #else
 static inline int mq_init_ns(struct ipc_namespace *ns) { return 0; }
diff --git a/include/linux/irq.h b/include/linux/irq.h
index a287cfc0b1a6..451481c082b5 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -192,7 +192,7 @@ struct irq_desc {
         unsigned int            irq_count;      /* For detecting broken IRQs */
         unsigned long           last_unhandled; /* Aging timer for unhandled count */
         unsigned int            irqs_unhandled;
-        spinlock_t              lock;
+        raw_spinlock_t          lock;
 #ifdef CONFIG_SMP
         cpumask_var_t           affinity;
         unsigned int            node;
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
index 792274269f2b..d8e9b3d1c23c 100644
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@ -107,18 +107,6 @@ static inline void print_symbol(const char *fmt, unsigned long addr)
                        __builtin_extract_return_addr((void *)addr));
 }
 
-/*
- * Pretty-print a function pointer.  This function is deprecated.
- * Please use the "%pF" vsprintf format instead.
- */
-static inline void __deprecated print_fn_descriptor_symbol(const char *fmt, void *addr)
-{
-#if defined(CONFIG_IA64) || defined(CONFIG_PPC64)
-        addr = *(void **)addr;
-#endif
-        print_symbol(fmt, (unsigned long)addr);
-}
-
 static inline void print_ip_sym(unsigned long ip)
 {
         printk("[<%p>] %pS\n", (void *) ip, (void *) ip);
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 3fa4c590cf12..4d9c916d06d9 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -251,10 +251,10 @@ extern int printk_delay_msec;
  * Print a one-time message (analogous to WARN_ONCE() et al):
  */
 #define printk_once(x...) ({                    \
-        static bool __print_once = true;        \
+        static bool __print_once;               \
                                                 \
-        if (__print_once) {                     \
-                __print_once = false;           \
+        if (!__print_once) {                    \
+                __print_once = true;            \
                 printk(x);                      \
         }                                       \
 })
@@ -397,15 +397,58 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
         printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
 #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(fmt, ##__VA_ARGS__); \
-        } while (0)
+#define pr_debug(fmt, ...) \
+        dynamic_pr_debug(fmt, ##__VA_ARGS__)
 #else
 #define pr_debug(fmt, ...) \
         ({ if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); 0; })
 #endif
 
 /*
+ * ratelimited messages with local ratelimit_state,
+ * no local ratelimit_state used in the !PRINTK case
+ */
+#ifdef CONFIG_PRINTK
+#define printk_ratelimited(fmt, ...)  ({                \
+        static struct ratelimit_state _rs = {           \
+                .interval = DEFAULT_RATELIMIT_INTERVAL, \
+                .burst = DEFAULT_RATELIMIT_BURST,       \
+        };                                              \
+                                                        \
+        if (!__ratelimit(&_rs))                         \
+                printk(fmt, ##__VA_ARGS__);             \
+})
+#else
+/* No effect, but we still get type checking even in the !PRINTK case: */
+#define printk_ratelimited printk
+#endif
+
+#define pr_emerg_ratelimited(fmt, ...) \
+        printk_ratelimited(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_alert_ratelimited(fmt, ...) \
+        printk_ratelimited(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_crit_ratelimited(fmt, ...) \
+        printk_ratelimited(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_err_ratelimited(fmt, ...) \
+        printk_ratelimited(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_warning_ratelimited(fmt, ...) \
+        printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_notice_ratelimited(fmt, ...) \
+        printk_ratelimited(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_info_ratelimited(fmt, ...) \
+        printk_ratelimited(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
+/* no pr_cont_ratelimited, don't do that... */
+/* If you are writing a driver, please use dev_dbg instead */
+#if defined(DEBUG)
+#define pr_debug_ratelimited(fmt, ...) \
+        printk_ratelimited(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#else
+#define pr_debug_ratelimited(fmt, ...) \
+        ({ if (0) printk_ratelimited(KERN_DEBUG pr_fmt(fmt), \
+                                     ##__VA_ARGS__); 0; })
+#endif
+
+/*
  * General tracing related utility functions - trace_printk(),
  * tracing_on/tracing_off and tracing_start()/tracing_stop
  *
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index adc34f2c6eff..c356b6914ffd 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -206,6 +206,8 @@ extern size_t vmcoreinfo_max_size;
 
 int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,
                 unsigned long long *crash_size, unsigned long long *crash_base);
+int crash_shrink_memory(unsigned long new_size);
+size_t crash_get_memory_size(void);
 
 #else /* !CONFIG_KEXEC */
 struct pt_regs;
diff --git a/include/linux/kmsg_dump.h b/include/linux/kmsg_dump.h
new file mode 100644
index 000000000000..e32aa268efac
--- /dev/null
+++ b/include/linux/kmsg_dump.h
@@ -0,0 +1,60 @@
+/*
+ * linux/include/kmsg_dump.h
+ *
+ * Copyright (C) 2009 Net Insight AB
+ *
+ * Author: Simon Kagstrom <simon.kagstrom@netinsight.net>
+ *
+ * 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_KMSG_DUMP_H
+#define _LINUX_KMSG_DUMP_H
+
+#include <linux/list.h>
+
+enum kmsg_dump_reason {
+        KMSG_DUMP_OOPS,
+        KMSG_DUMP_PANIC,
+};
+
+/**
+ * struct kmsg_dumper - kernel crash message dumper structure
+ * @dump:       The callback which gets called on crashes. The buffer is passed
+ *              as two sections, where s1 (length l1) contains the older
+ *              messages and s2 (length l2) contains the newer.
+ * @list:       Entry in the dumper list (private)
+ * @registered: Flag that specifies if this is already registered
+ */
+struct kmsg_dumper {
+        void (*dump)(struct kmsg_dumper *dumper, enum kmsg_dump_reason reason,
+                        const char *s1, unsigned long l1,
+                        const char *s2, unsigned long l2);
+        struct list_head list;
+        int registered;
+};
+
+#ifdef CONFIG_PRINTK
+void kmsg_dump(enum kmsg_dump_reason reason);
+
+int kmsg_dump_register(struct kmsg_dumper *dumper);
+
+int kmsg_dump_unregister(struct kmsg_dumper *dumper);
+#else
+static inline void kmsg_dump(enum kmsg_dump_reason reason)
+{
+}
+
+static inline int kmsg_dump_register(struct kmsg_dumper *dumper)
+{
+        return -EINVAL;
+}
+
+static inline int kmsg_dump_unregister(struct kmsg_dumper *dumper)
+{
+        return -EINVAL;
+}
+#endif
+
+#endif /* _LINUX_KMSG_DUMP_H */
diff --git a/include/linux/ksm.h b/include/linux/ksm.h
index a485c14ecd5d..43bdab769fc3 100644
--- a/include/linux/ksm.h
+++ b/include/linux/ksm.h
@@ -9,8 +9,12 @@
 
 #include <linux/bitops.h>
 #include <linux/mm.h>
+#include <linux/pagemap.h>
+#include <linux/rmap.h>
 #include <linux/sched.h>
-#include <linux/vmstat.h>
+
+struct stable_node;
+struct mem_cgroup;
 
 #ifdef CONFIG_KSM
 int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
@@ -34,46 +38,110 @@ static inline void ksm_exit(struct mm_struct *mm)
 /*
  * A KSM page is one of those write-protected "shared pages" or "merged pages"
  * which KSM maps into multiple mms, wherever identical anonymous page content
- * is found in VM_MERGEABLE vmas.  It's a PageAnon page, with NULL anon_vma.
+ * is found in VM_MERGEABLE vmas.  It's a PageAnon page, pointing not to any
+ * anon_vma, but to that page's node of the stable tree.
  */
 static inline int PageKsm(struct page *page)
 {
-        return ((unsigned long)page->mapping == PAGE_MAPPING_ANON);
+        return ((unsigned long)page->mapping & PAGE_MAPPING_FLAGS) ==
+                                (PAGE_MAPPING_ANON | PAGE_MAPPING_KSM);
+}
+
+static inline struct stable_node *page_stable_node(struct page *page)
+{
+        return PageKsm(page) ? page_rmapping(page) : NULL;
+}
+
+static inline void set_page_stable_node(struct page *page,
+                                        struct stable_node *stable_node)
+{
+        page->mapping = (void *)stable_node +
+                                (PAGE_MAPPING_ANON | PAGE_MAPPING_KSM);
 }
 
 /*
- * But we have to avoid the checking which page_add_anon_rmap() performs.
+ * When do_swap_page() first faults in from swap what used to be a KSM page,
+ * no problem, it will be assigned to this vma's anon_vma; but thereafter,
+ * it might be faulted into a different anon_vma (or perhaps to a different
+ * offset in the same anon_vma).  do_swap_page() cannot do all the locking
+ * needed to reconstitute a cross-anon_vma KSM page: for now it has to make
+ * a copy, and leave remerging the pages to a later pass of ksmd.
+ *
+ * We'd like to make this conditional on vma->vm_flags & VM_MERGEABLE,
+ * but what if the vma was unmerged while the page was swapped out?
  */
-static inline void page_add_ksm_rmap(struct page *page)
+struct page *ksm_does_need_to_copy(struct page *page,
+                        struct vm_area_struct *vma, unsigned long address);
+static inline struct page *ksm_might_need_to_copy(struct page *page,
+                        struct vm_area_struct *vma, unsigned long address)
 {
-        if (atomic_inc_and_test(&page->_mapcount)) {
-                page->mapping = (void *) PAGE_MAPPING_ANON;
-                __inc_zone_page_state(page, NR_ANON_PAGES);
-        }
+        struct anon_vma *anon_vma = page_anon_vma(page);
+
+        if (!anon_vma ||
+            (anon_vma == vma->anon_vma &&
+             page->index == linear_page_index(vma, address)))
+                return page;
+
+        return ksm_does_need_to_copy(page, vma, address);
 }
+
+int page_referenced_ksm(struct page *page,
+                        struct mem_cgroup *memcg, unsigned long *vm_flags);
+int try_to_unmap_ksm(struct page *page, enum ttu_flags flags);
+int rmap_walk_ksm(struct page *page, int (*rmap_one)(struct page *,
+                  struct vm_area_struct *, unsigned long, void *), void *arg);
+void ksm_migrate_page(struct page *newpage, struct page *oldpage);
+
 #else  /* !CONFIG_KSM */
 
+static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)
+{
+        return 0;
+}
+
+static inline void ksm_exit(struct mm_struct *mm)
+{
+}
+
+static inline int PageKsm(struct page *page)
+{
+        return 0;
+}
+
+#ifdef CONFIG_MMU
 static inline int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
                 unsigned long end, int advice, unsigned long *vm_flags)
 {
         return 0;
 }
 
-static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)
+static inline struct page *ksm_might_need_to_copy(struct page *page,
+                        struct vm_area_struct *vma, unsigned long address)
+{
+        return page;
+}
+
+static inline int page_referenced_ksm(struct page *page,
+                        struct mem_cgroup *memcg, unsigned long *vm_flags)
 {
         return 0;
 }
 
-static inline void ksm_exit(struct mm_struct *mm)
+static inline int try_to_unmap_ksm(struct page *page, enum ttu_flags flags)
 {
+        return 0;
 }
 
-static inline int PageKsm(struct page *page)
+static inline int rmap_walk_ksm(struct page *page, int (*rmap_one)(struct page*,
+                struct vm_area_struct *, unsigned long, void *), void *arg)
 {
         return 0;
 }
 
-/* No stub required for page_add_ksm_rmap(page) */
+static inline void ksm_migrate_page(struct page *newpage, struct page *oldpage)
+{
+}
+#endif /* CONFIG_MMU */
 #endif /* !CONFIG_KSM */
 
-#endif
+#endif /* __LINUX_KSM_H */
diff --git a/include/linux/lis3lv02d.h b/include/linux/lis3lv02d.h
index 3cc2f2c53e4c..f1ca0dcc1628 100644
--- a/include/linux/lis3lv02d.h
+++ b/include/linux/lis3lv02d.h
@@ -43,6 +43,21 @@ struct lis3lv02d_platform_data {
 #define LIS3_WAKEUP_Z_HI        (1 << 5)
         unsigned char wakeup_flags;
         unsigned char wakeup_thresh;
+#define LIS3_NO_MAP             0
+#define LIS3_DEV_X              1
+#define LIS3_DEV_Y              2
+#define LIS3_DEV_Z              3
+#define LIS3_INV_DEV_X         -1
+#define LIS3_INV_DEV_Y         -2
+#define LIS3_INV_DEV_Z         -3
+        s8 axis_x;
+        s8 axis_y;
+        s8 axis_z;
+        int (*setup_resources)(void);
+        int (*release_resources)(void);
+        /* Limits for selftest are specified in chip data sheet */
+        s16 st_min_limits[3]; /* min pass limit x, y, z */
+        s16 st_max_limits[3]; /* max pass limit x, y, z */
 };
 
 #endif /* __LIS3LV02D_H_ */
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index bf9213b2db8f..0b46c2068b96 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -54,6 +54,11 @@ extern void mem_cgroup_rotate_lru_list(struct page *page, enum lru_list lru);
 extern void mem_cgroup_del_lru(struct page *page);
 extern void mem_cgroup_move_lists(struct page *page,
                                   enum lru_list from, enum lru_list to);
+
+/* For coalescing uncharge for reducing memcg' overhead*/
+extern void mem_cgroup_uncharge_start(void);
+extern void mem_cgroup_uncharge_end(void);
+
 extern void mem_cgroup_uncharge_page(struct page *page);
 extern void mem_cgroup_uncharge_cache_page(struct page *page);
 extern int mem_cgroup_shmem_charge_fallback(struct page *page,
@@ -117,7 +122,7 @@ static inline bool mem_cgroup_disabled(void)
 }
 
 extern bool mem_cgroup_oom_called(struct task_struct *task);
-void mem_cgroup_update_mapped_file_stat(struct page *page, int val);
+void mem_cgroup_update_file_mapped(struct page *page, int val);
 unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
                                                 gfp_t gfp_mask, int nid,
                                                 int zid);
@@ -151,6 +156,14 @@ static inline void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *ptr)
 {
 }
 
+static inline void mem_cgroup_uncharge_start(void)
+{
+}
+
+static inline void mem_cgroup_uncharge_end(void)
+{
+}
+
 static inline void mem_cgroup_uncharge_page(struct page *page)
 {
 }
@@ -274,7 +287,7 @@ mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
 {
 }
 
-static inline void mem_cgroup_update_mapped_file_stat(struct page *page,
+static inline void mem_cgroup_update_file_mapped(struct page *page,
                                                         int val)
 {
 }
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index fed969281a41..35b07b773e6c 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -69,7 +69,6 @@ extern void online_page(struct page *page);
 /* VM interface that may be used by firmware interface */
 extern int online_pages(unsigned long, unsigned long);
 extern void __offline_isolated_pages(unsigned long, unsigned long);
-extern int offline_pages(unsigned long, unsigned long, unsigned long);
 
 /* reasonably generic interface to expand the physical pages in a zone  */
 extern int __add_pages(int nid, struct zone *zone, unsigned long start_pfn,
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index 085c903fe0f1..1cc966cd3e5f 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -201,6 +201,7 @@ extern void mpol_fix_fork_child_flag(struct task_struct *p);
 extern struct zonelist *huge_zonelist(struct vm_area_struct *vma,
                                 unsigned long addr, gfp_t gfp_flags,
                                 struct mempolicy **mpol, nodemask_t **nodemask);
+extern bool init_nodemask_of_mempolicy(nodemask_t *mask);
 extern unsigned slab_node(struct mempolicy *policy);
 
 extern enum zone_type policy_zone;
@@ -328,6 +329,8 @@ static inline struct zonelist *huge_zonelist(struct vm_area_struct *vma,
         return node_zonelist(0, gfp_flags);
 }
 
+static inline bool init_nodemask_of_mempolicy(nodemask_t *m) { return false; }
+
 static inline int do_migrate_pages(struct mm_struct *mm,
                         const nodemask_t *from_nodes,
                         const nodemask_t *to_nodes, int flags)
diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h
index d9034cc87f18..3398bd9aab11 100644
--- a/include/linux/mfd/pcf50633/core.h
+++ b/include/linux/mfd/pcf50633/core.h
@@ -29,7 +29,12 @@ struct pcf50633_platform_data {
         char **batteries;
         int num_batteries;
 
-        int charging_restart_interval;
+        /*
+         * Should be set accordingly to the reference resistor used, see
+         * I_{ch(ref)} charger reference current in the pcf50633 User
+         * Manual.
+         */
+        int charger_reference_current_ma;
 
         /* Callbacks */
         void (*probe_done)(struct pcf50633 *);
diff --git a/include/linux/mfd/pcf50633/mbc.h b/include/linux/mfd/pcf50633/mbc.h
index 4119579acf2c..df4f5fa88de3 100644
--- a/include/linux/mfd/pcf50633/mbc.h
+++ b/include/linux/mfd/pcf50633/mbc.h
@@ -128,6 +128,7 @@ enum pcf50633_reg_mbcs3 {
 int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma);
 
 int pcf50633_mbc_get_status(struct pcf50633 *);
+int pcf50633_mbc_get_usb_online_status(struct pcf50633 *);
 
 #endif
 
diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index 527602cdea1c..7f085c97c799 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -12,7 +12,8 @@ typedef struct page *new_page_t(struct page *, unsigned long private, int **);
 extern int putback_lru_pages(struct list_head *l);
 extern int migrate_page(struct address_space *,
                         struct page *, struct page *);
-extern int migrate_pages(struct list_head *l, new_page_t x, unsigned long);
+extern int migrate_pages(struct list_head *l, new_page_t x,
+                        unsigned long private, int offlining);
 
 extern int fail_migrate_page(struct address_space *,
                         struct page *, struct page *);
@@ -26,10 +27,7 @@ extern int migrate_vmas(struct mm_struct *mm,
 
 static inline int putback_lru_pages(struct list_head *l) { return 0; }
 static inline int migrate_pages(struct list_head *l, new_page_t x,
-                unsigned long private) { return -ENOSYS; }
-
-static inline int migrate_pages_to(struct list_head *pagelist,
-                        struct vm_area_struct *vma, int dest) { return 0; }
+                unsigned long private, int offlining) { return -ENOSYS; }
 
 static inline int migrate_prep(void) { return -ENOSYS; }
 
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index ce7cc6c7bcbb..e92d1bfdb330 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -61,6 +61,7 @@ enum {
         MLX4_DEV_CAP_FLAG_BAD_PKEY_CNTR = 1 <<  8,
         MLX4_DEV_CAP_FLAG_BAD_QKEY_CNTR = 1 <<  9,
         MLX4_DEV_CAP_FLAG_DPDP          = 1 << 12,
+        MLX4_DEV_CAP_FLAG_BLH           = 1 << 15,
         MLX4_DEV_CAP_FLAG_MEM_WINDOW    = 1 << 16,
         MLX4_DEV_CAP_FLAG_APM           = 1 << 17,
         MLX4_DEV_CAP_FLAG_ATOMIC        = 1 << 18,
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 24c395694f4d..9d65ae4ba0e0 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -620,13 +620,22 @@ void page_address_init(void);
 /*
  * On an anonymous page mapped into a user virtual memory area,
  * page->mapping points to its anon_vma, not to a struct address_space;
- * with the PAGE_MAPPING_ANON bit set to distinguish it.
+ * with the PAGE_MAPPING_ANON bit set to distinguish it.  See rmap.h.
+ *
+ * On an anonymous page in a VM_MERGEABLE area, if CONFIG_KSM is enabled,
+ * the PAGE_MAPPING_KSM bit may be set along with the PAGE_MAPPING_ANON bit;
+ * and then page->mapping points, not to an anon_vma, but to a private
+ * structure which KSM associates with that merged page.  See ksm.h.
+ *
+ * PAGE_MAPPING_KSM without PAGE_MAPPING_ANON is currently never used.
  *
  * Please note that, confusingly, "page_mapping" refers to the inode
  * address_space which maps the page from disk; whereas "page_mapped"
  * refers to user virtual address space into which the page is mapped.
  */
 #define PAGE_MAPPING_ANON       1
+#define PAGE_MAPPING_KSM        2
+#define PAGE_MAPPING_FLAGS      (PAGE_MAPPING_ANON | PAGE_MAPPING_KSM)
 
 extern struct address_space swapper_space;
 static inline struct address_space *page_mapping(struct page *page)
@@ -634,16 +643,19 @@ static inline struct address_space *page_mapping(struct page *page)
         struct address_space *mapping = page->mapping;
 
         VM_BUG_ON(PageSlab(page));
-#ifdef CONFIG_SWAP
         if (unlikely(PageSwapCache(page)))
                 mapping = &swapper_space;
-        else
-#endif
-        if (unlikely((unsigned long)mapping & PAGE_MAPPING_ANON))
+        else if (unlikely((unsigned long)mapping & PAGE_MAPPING_ANON))
                 mapping = NULL;
         return mapping;
 }
 
+/* Neutral page->mapping pointer to address_space or anon_vma or other */
+static inline void *page_rmapping(struct page *page)
+{
+        return (void *)((unsigned long)page->mapping & ~PAGE_MAPPING_FLAGS);
+}
+
 static inline int PageAnon(struct page *page)
 {
         return ((unsigned long)page->mapping & PAGE_MAPPING_ANON) != 0;
@@ -758,6 +770,7 @@ unsigned long unmap_vmas(struct mmu_gather **tlb,
  * @pmd_entry: if set, called for each non-empty PMD (3rd-level) entry
  * @pte_entry: if set, called for each non-empty PTE (4th-level) entry
  * @pte_hole: if set, called for each hole at all levels
+ * @hugetlb_entry: if set, called for each hugetlb entry
  *
  * (see walk_page_range for more details)
  */
@@ -767,6 +780,8 @@ struct mm_walk {
         int (*pmd_entry)(pmd_t *, unsigned long, unsigned long, struct mm_walk *);
         int (*pte_entry)(pte_t *, unsigned long, unsigned long, struct mm_walk *);
         int (*pte_hole)(unsigned long, unsigned long, struct mm_walk *);
+        int (*hugetlb_entry)(pte_t *, unsigned long, unsigned long,
+                             struct mm_walk *);
         struct mm_struct *mm;
         void *private;
 };
diff --git a/include/linux/mtd/bbm.h b/include/linux/mtd/bbm.h
index fff8c53e5434..9c3757c5759d 100644
--- a/include/linux/mtd/bbm.h
+++ b/include/linux/mtd/bbm.h
@@ -19,22 +19,21 @@
 
 /**
  * struct nand_bbt_descr - bad block table descriptor
- * @options:            options for this descriptor
- * @pages:              the page(s) where we find the bbt, used with
- *                      option BBT_ABSPAGE when bbt is searched,
- *                      then we store the found bbts pages here.
- *                      Its an array and supports up to 8 chips now
- * @offs:               offset of the pattern in the oob area of the page
- * @veroffs:            offset of the bbt version counter in the oob area of the page
- * @version:            version read from the bbt page during scan
- * @len:                length of the pattern, if 0 no pattern check is performed
- * @maxblocks:          maximum number of blocks to search for a bbt. This
- *                      number of blocks is reserved at the end of the device
- *                      where the tables are written.
- * @reserved_block_code: if non-0, this pattern denotes a reserved
- *                      (rather than bad) block in the stored bbt
- * @pattern:            pattern to identify bad block table or factory marked
- *                      good / bad blocks, can be NULL, if len = 0
+ * @options:    options for this descriptor
+ * @pages:      the page(s) where we find the bbt, used with option BBT_ABSPAGE
+ *              when bbt is searched, then we store the found bbts pages here.
+ *              Its an array and supports up to 8 chips now
+ * @offs:       offset of the pattern in the oob area of the page
+ * @veroffs:    offset of the bbt version counter in the oob are of the page
+ * @version:    version read from the bbt page during scan
+ * @len:        length of the pattern, if 0 no pattern check is performed
+ * @maxblocks:  maximum number of blocks to search for a bbt. This number of
+ *              blocks is reserved at the end of the device where the tables are
+ *              written.
+ * @reserved_block_code: if non-0, this pattern denotes a reserved (rather than
+ *              bad) block in the stored bbt
+ * @pattern:    pattern to identify bad block table or factory marked good /
+ *              bad blocks, can be NULL, if len = 0
  *
  * Descriptor for the bad block table marker and the descriptor for the
  * pattern which identifies good and bad blocks. The assumption is made
@@ -90,7 +89,9 @@ struct nand_bbt_descr {
 /*
  * Constants for oob configuration
  */
-#define ONENAND_BADBLOCK_POS    0
+#define NAND_SMALL_BADBLOCK_POS         5
+#define NAND_LARGE_BADBLOCK_POS         0
+#define ONENAND_BADBLOCK_POS            0
 
 /*
  * Bad block scanning errors
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index 88d3d8fbf9f2..df89f4275232 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -518,10 +518,11 @@ struct cfi_fixup {
 #define CFI_MFR_ANY 0xffff
 #define CFI_ID_ANY  0xffff
 
-#define CFI_MFR_AMD 0x0001
-#define CFI_MFR_ATMEL 0x001F
-#define CFI_MFR_SAMSUNG 0x00EC
-#define CFI_MFR_ST  0x0020      /* STMicroelectronics */
+#define CFI_MFR_AMD     0x0001
+#define CFI_MFR_INTEL   0x0089
+#define CFI_MFR_ATMEL   0x001F
+#define CFI_MFR_SAMSUNG 0x00EC
+#define CFI_MFR_ST      0x0020 /* STMicroelectronics */
 
 void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups);
 
diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h
index d4f38c5fd44e..d0bf422ae374 100644
--- a/include/linux/mtd/flashchip.h
+++ b/include/linux/mtd/flashchip.h
@@ -38,6 +38,15 @@ typedef enum {
         FL_XIP_WHILE_ERASING,
         FL_XIP_WHILE_WRITING,
         FL_SHUTDOWN,
+        /* These 2 come from nand_state_t, which has been unified here */
+        FL_READING,
+        FL_CACHEDPRG,
+        /* These 4 come from onenand_state_t, which has been unified here */
+        FL_RESETING,
+        FL_OTPING,
+        FL_PREPARING_ERASE,
+        FL_VERIFYING_ERASE,
+
         FL_UNKNOWN
 } flstate_t;
 
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 7a232a9bdd62..ccab9dfc5217 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -21,6 +21,8 @@
 #include <linux/wait.h>
 #include <linux/spinlock.h>
 #include <linux/mtd/mtd.h>
+#include <linux/mtd/flashchip.h>
+#include <linux/mtd/bbm.h>
 
 struct mtd_info;
 /* Scan and identify a NAND device */
@@ -168,7 +170,6 @@ typedef enum {
 /* Chip does not allow subpage writes */
 #define NAND_NO_SUBPAGE_WRITE   0x00000200
 
-
 /* Options valid for Samsung large page devices */
 #define NAND_SAMSUNG_LP_OPTIONS \
         (NAND_NO_PADDING | NAND_CACHEPRG | NAND_COPYBACK)
@@ -194,6 +195,9 @@ typedef enum {
 /* This option is defined if the board driver allocates its own buffers
    (e.g. because it needs them DMA-coherent */
 #define NAND_OWN_BUFFERS        0x00040000
+/* Chip may not exist, so silence any errors in scan */
+#define NAND_SCAN_SILENT_NODEV  0x00080000
+
 /* Options set by nand scan */
 /* Nand scan has allocated controller struct */
 #define NAND_CONTROLLER_ALLOC   0x80000000
@@ -202,20 +206,6 @@ typedef enum {
 #define NAND_CI_CHIPNR_MSK      0x03
 #define NAND_CI_CELLTYPE_MSK    0x0C
 
-/*
- * nand_state_t - chip states
- * Enumeration for NAND flash chip state
- */
-typedef enum {
-        FL_READY,
-        FL_READING,
-        FL_WRITING,
-        FL_ERASING,
-        FL_SYNCING,
-        FL_CACHEDPRG,
-        FL_PM_SUSPENDED,
-} nand_state_t;
-
 /* Keep gcc happy */
 struct nand_chip;
 
@@ -402,7 +392,7 @@ struct nand_chip {
         uint8_t         cellinfo;
         int             badblockpos;
 
-        nand_state_t    state;
+        flstate_t       state;
 
         uint8_t         *oob_poi;
         struct nand_hw_control  *controller;
@@ -470,75 +460,6 @@ struct nand_manufacturers {
 extern struct nand_flash_dev nand_flash_ids[];
 extern struct nand_manufacturers nand_manuf_ids[];
 
-/**
- * struct nand_bbt_descr - bad block table descriptor
- * @options:    options for this descriptor
- * @pages:      the page(s) where we find the bbt, used with option BBT_ABSPAGE
- *              when bbt is searched, then we store the found bbts pages here.
- *              Its an array and supports up to 8 chips now
- * @offs:       offset of the pattern in the oob area of the page
- * @veroffs:    offset of the bbt version counter in the oob are of the page
- * @version:    version read from the bbt page during scan
- * @len:        length of the pattern, if 0 no pattern check is performed
- * @maxblocks:  maximum number of blocks to search for a bbt. This number of
- *              blocks is reserved at the end of the device where the tables are
- *              written.
- * @reserved_block_code: if non-0, this pattern denotes a reserved (rather than
- *              bad) block in the stored bbt
- * @pattern:    pattern to identify bad block table or factory marked good /
- *              bad blocks, can be NULL, if len = 0
- *
- * Descriptor for the bad block table marker and the descriptor for the
- * pattern which identifies good and bad blocks. The assumption is made
- * that the pattern and the version count are always located in the oob area
- * of the first block.
- */
-struct nand_bbt_descr {
-        int     options;
-        int     pages[NAND_MAX_CHIPS];
-        int     offs;
-        int     veroffs;
-        uint8_t version[NAND_MAX_CHIPS];
-        int     len;
-        int     maxblocks;
-        int     reserved_block_code;
-        uint8_t *pattern;
-};
-
-/* Options for the bad block table descriptors */
-
-/* The number of bits used per block in the bbt on the device */
-#define NAND_BBT_NRBITS_MSK     0x0000000F
-#define NAND_BBT_1BIT           0x00000001
-#define NAND_BBT_2BIT           0x00000002
-#define NAND_BBT_4BIT           0x00000004
-#define NAND_BBT_8BIT           0x00000008
-/* The bad block table is in the last good block of the device */
-#define NAND_BBT_LASTBLOCK      0x00000010
-/* The bbt is at the given page, else we must scan for the bbt */
-#define NAND_BBT_ABSPAGE        0x00000020
-/* The bbt is at the given page, else we must scan for the bbt */
-#define NAND_BBT_SEARCH         0x00000040
-/* bbt is stored per chip on multichip devices */
-#define NAND_BBT_PERCHIP        0x00000080
-/* bbt has a version counter at offset veroffs */
-#define NAND_BBT_VERSION        0x00000100
-/* Create a bbt if none axists */
-#define NAND_BBT_CREATE         0x00000200
-/* Search good / bad pattern through all pages of a block */
-#define NAND_BBT_SCANALLPAGES   0x00000400
-/* Scan block empty during good / bad block scan */
-#define NAND_BBT_SCANEMPTY      0x00000800
-/* Write bbt if neccecary */
-#define NAND_BBT_WRITE          0x00001000
-/* Read and write back block contents when writing bbt */
-#define NAND_BBT_SAVECONTENT    0x00002000
-/* Search good / bad pattern on the first and the second page */
-#define NAND_BBT_SCAN2NDPAGE    0x00004000
-
-/* The maximum number of blocks to scan for a bbt */
-#define NAND_BBT_SCAN_MAXBLOCKS 4
-
 extern int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd);
 extern int nand_update_bbt(struct mtd_info *mtd, loff_t offs);
 extern int nand_default_bbt(struct mtd_info *mtd);
@@ -548,12 +469,6 @@ extern int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
 extern int nand_do_read(struct mtd_info *mtd, loff_t from, size_t len,
                         size_t * retlen, uint8_t * buf);
 
-/*
-* Constants for oob configuration
-*/
-#define NAND_SMALL_BADBLOCK_POS         5
-#define NAND_LARGE_BADBLOCK_POS         0
-
 /**
  * struct platform_nand_chip - chip level device structure
  * @nr_chips:           max. number of chips to scan for
diff --git a/include/linux/mtd/nand_ecc.h b/include/linux/mtd/nand_ecc.h
index 052ea8ca2434..41bc013571d0 100644
--- a/include/linux/mtd/nand_ecc.h
+++ b/include/linux/mtd/nand_ecc.h
@@ -16,7 +16,13 @@
 struct mtd_info;
 
 /*
- * Calculate 3 byte ECC code for 256 byte block
+ * Calculate 3 byte ECC code for eccsize byte block
+ */
+void __nand_calculate_ecc(const u_char *dat, unsigned int eccsize,
+                                u_char *ecc_code);
+
+/*
+ * Calculate 3 byte ECC code for 256/512 byte block
  */
 int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code);
 
@@ -27,7 +33,7 @@ int __nand_correct_data(u_char *dat, u_char *read_ecc, u_char *calc_ecc,
                         unsigned int eccsize);
 
 /*
- * Detect and correct a 1 bit error for 256 byte block
+ * Detect and correct a 1 bit error for 256/512 byte block
  */
 int nand_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc);
 
diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h
index 4e49f3350678..5509eb06b326 100644
--- a/include/linux/mtd/onenand.h
+++ b/include/linux/mtd/onenand.h
@@ -1,7 +1,7 @@
 /*
  *  linux/include/linux/mtd/onenand.h
  *
- *  Copyright (C) 2005-2007 Samsung Electronics
+ *  Copyright © 2005-2009 Samsung Electronics
  *  Kyungmin Park <kyungmin.park@samsung.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -14,6 +14,7 @@
 
 #include <linux/spinlock.h>
 #include <linux/completion.h>
+#include <linux/mtd/flashchip.h>
 #include <linux/mtd/onenand_regs.h>
 #include <linux/mtd/bbm.h>
 
@@ -25,22 +26,6 @@ extern int onenand_scan(struct mtd_info *mtd, int max_chips);
 /* Free resources held by the OneNAND device */
 extern void onenand_release(struct mtd_info *mtd);
 
-/*
- * onenand_state_t - chip states
- * Enumeration for OneNAND flash chip state
- */
-typedef enum {
-        FL_READY,
-        FL_READING,
-        FL_WRITING,
-        FL_ERASING,
-        FL_SYNCING,
-        FL_LOCKING,
-        FL_RESETING,
-        FL_OTPING,
-        FL_PM_SUSPENDED,
-} onenand_state_t;
-
 /**
  * struct onenand_bufferram - OneNAND BufferRAM Data
  * @blockpage:          block & page address in BufferRAM
@@ -137,7 +122,7 @@ struct onenand_chip {
 
         spinlock_t              chip_lock;
         wait_queue_head_t       wq;
-        onenand_state_t         state;
+        flstate_t               state;
         unsigned char           *page_buf;
         unsigned char           *oob_buf;
 
@@ -152,6 +137,8 @@ struct onenand_chip {
 /*
  * Helper macros
  */
+#define ONENAND_PAGES_PER_BLOCK        (1<<6)
+
 #define ONENAND_CURRENT_BUFFERRAM(this)         (this->bufferram_index)
 #define ONENAND_NEXT_BUFFERRAM(this)            (this->bufferram_index ^ 1)
 #define ONENAND_SET_NEXT_BUFFERRAM(this)        (this->bufferram_index ^= 1)
diff --git a/include/linux/mtd/onenand_regs.h b/include/linux/mtd/onenand_regs.h
index acadbf53a69f..cd6f3b431195 100644
--- a/include/linux/mtd/onenand_regs.h
+++ b/include/linux/mtd/onenand_regs.h
@@ -131,6 +131,8 @@
 #define ONENAND_CMD_LOCK_TIGHT          (0x2C)
 #define ONENAND_CMD_UNLOCK_ALL          (0x27)
 #define ONENAND_CMD_ERASE               (0x94)
+#define ONENAND_CMD_MULTIBLOCK_ERASE    (0x95)
+#define ONENAND_CMD_ERASE_VERIFY        (0x71)
 #define ONENAND_CMD_RESET               (0xF0)
 #define ONENAND_CMD_OTP_ACCESS          (0x65)
 #define ONENAND_CMD_READID              (0x90)
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 51071b335751..89b28812ec24 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -2,6 +2,7 @@
 #define _LINUX_NFS_XDR_H
 
 #include <linux/nfsacl.h>
+#include <linux/nfs3.h>
 
 /*
  * To change the maximum rsize and wsize supported by the NFS client, adjust
diff --git a/include/linux/nfsacl.h b/include/linux/nfsacl.h
index 43011b69297c..f321b578edeb 100644
--- a/include/linux/nfsacl.h
+++ b/include/linux/nfsacl.h
@@ -29,6 +29,7 @@
 #ifdef __KERNEL__
 
 #include <linux/posix_acl.h>
+#include <linux/sunrpc/xdr.h>
 
 /* Maximum number of ACL entries over NFS */
 #define NFS_ACL_MAX_ENTRIES     1024
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index a6d9ef2bb34a..8ae78a61eea4 100644
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -12,7 +12,7 @@
 
 # include <linux/types.h>
 #ifdef __KERNEL__
-# include <linux/in.h>
+# include <linux/nfsd/nfsfh.h>
 #endif
 
 /*
@@ -39,11 +39,23 @@
 #define NFSEXP_FSID             0x2000
 #define NFSEXP_CROSSMOUNT       0x4000
 #define NFSEXP_NOACL            0x8000  /* reserved for possible ACL related use */
-#define NFSEXP_ALLFLAGS         0xFE3F
+/*
+ * The NFSEXP_V4ROOT flag causes the kernel to give access only to NFSv4
+ * clients, and only to the single directory that is the root of the
+ * export; further lookup and readdir operations are treated as if every
+ * subdirectory was a mountpoint, and ignored if they are not themselves
+ * exported.  This is used by nfsd and mountd to construct the NFSv4
+ * pseudofilesystem, which provides access only to paths leading to each
+ * exported filesystem.
+ */
+#define NFSEXP_V4ROOT           0x10000
+/* All flags that we claim to support.  (Note we don't support NOACL.) */
+#define NFSEXP_ALLFLAGS         0x17E3F
 
 /* The flags that may vary depending on security flavor: */
 #define NFSEXP_SECINFO_FLAGS    (NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
-                                        | NFSEXP_ALLSQUASH)
+                                        | NFSEXP_ALLSQUASH \
+                                        | NFSEXP_INSECURE_PORT)
 
 #ifdef __KERNEL__
 
@@ -108,7 +120,6 @@ struct svc_expkey {
         struct path             ek_path;
 };
 
-#define EX_SECURE(exp)          (!((exp)->ex_flags & NFSEXP_INSECURE_PORT))
 #define EX_ISSYNC(exp)          (!((exp)->ex_flags & NFSEXP_ASYNC))
 #define EX_NOHIDE(exp)          ((exp)->ex_flags & NFSEXP_NOHIDE)
 #define EX_WGATHER(exp)         ((exp)->ex_flags & NFSEXP_GATHERED_WRITES)
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index 8f641c908450..65e333afaee4 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -16,11 +16,9 @@
 
 # include <linux/types.h>
 #ifdef __KERNEL__
-# include <linux/string.h>
-# include <linux/fs.h>
+# include <linux/sunrpc/svc.h>
 #endif
 #include <linux/nfsd/const.h>
-#include <linux/nfsd/debug.h>
 
 /*
  * This is the old "dentry style" Linux NFSv2 file handle.
@@ -164,208 +162,6 @@ typedef struct svc_fh {
 
 } svc_fh;
 
-enum nfsd_fsid {
-        FSID_DEV = 0,
-        FSID_NUM,
-        FSID_MAJOR_MINOR,
-        FSID_ENCODE_DEV,
-        FSID_UUID4_INUM,
-        FSID_UUID8,
-        FSID_UUID16,
-        FSID_UUID16_INUM,
-};
-
-enum fsid_source {
-        FSIDSOURCE_DEV,
-        FSIDSOURCE_FSID,
-        FSIDSOURCE_UUID,
-};
-extern enum fsid_source fsid_source(struct svc_fh *fhp);
-
-
-/* This might look a little large to "inline" but in all calls except
- * one, 'vers' is constant so moste of the function disappears.
- */
-static inline void mk_fsid(int vers, u32 *fsidv, dev_t dev, ino_t ino,
-                           u32 fsid, unsigned char *uuid)
-{
-        u32 *up;
-        switch(vers) {
-        case FSID_DEV:
-                fsidv[0] = htonl((MAJOR(dev)<<16) |
-                                 MINOR(dev));
-                fsidv[1] = ino_t_to_u32(ino);
-                break;
-        case FSID_NUM:
-                fsidv[0] = fsid;
-                break;
-        case FSID_MAJOR_MINOR:
-                fsidv[0] = htonl(MAJOR(dev));
-                fsidv[1] = htonl(MINOR(dev));
-                fsidv[2] = ino_t_to_u32(ino);
-                break;
-
-        case FSID_ENCODE_DEV:
-                fsidv[0] = new_encode_dev(dev);
-                fsidv[1] = ino_t_to_u32(ino);
-                break;
-
-        case FSID_UUID4_INUM:
-                /* 4 byte fsid and inode number */
-                up = (u32*)uuid;
-                fsidv[0] = ino_t_to_u32(ino);
-                fsidv[1] = up[0] ^ up[1] ^ up[2] ^ up[3];
-                break;
-
-        case FSID_UUID8:
-                /* 8 byte fsid  */
-                up = (u32*)uuid;
-                fsidv[0] = up[0] ^ up[2];
-                fsidv[1] = up[1] ^ up[3];
-                break;
-
-        case FSID_UUID16:
-                /* 16 byte fsid - NFSv3+ only */
-                memcpy(fsidv, uuid, 16);
-                break;
-
-        case FSID_UUID16_INUM:
-                /* 8 byte inode and 16 byte fsid */
-                *(u64*)fsidv = (u64)ino;
-                memcpy(fsidv+2, uuid, 16);
-                break;
-        default: BUG();
-        }
-}
-
-static inline int key_len(int type)
-{
-        switch(type) {
-        case FSID_DEV:          return 8;
-        case FSID_NUM:          return 4;
-        case FSID_MAJOR_MINOR:  return 12;
-        case FSID_ENCODE_DEV:   return 8;
-        case FSID_UUID4_INUM:   return 8;
-        case FSID_UUID8:        return 8;
-        case FSID_UUID16:       return 16;
-        case FSID_UUID16_INUM:  return 24;
-        default: return 0;
-        }
-}
-
-/*
- * Shorthand for dprintk()'s
- */
-extern char * SVCFH_fmt(struct svc_fh *fhp);
-
-/*
- * Function prototypes
- */
-__be32  fh_verify(struct svc_rqst *, struct svc_fh *, int, int);
-__be32  fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *);
-__be32  fh_update(struct svc_fh *);
-void    fh_put(struct svc_fh *);
-
-static __inline__ struct svc_fh *
-fh_copy(struct svc_fh *dst, struct svc_fh *src)
-{
-        WARN_ON(src->fh_dentry || src->fh_locked);
-                        
-        *dst = *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)
-{
-        memset(fhp, 0, sizeof(*fhp));
-        fhp->fh_maxsize = maxsize;
-        return fhp;
-}
-
-#ifdef CONFIG_NFSD_V3
-/*
- * Fill in the pre_op attr for the wcc data
- */
-static inline void
-fill_pre_wcc(struct svc_fh *fhp)
-{
-        struct inode    *inode;
-
-        inode = fhp->fh_dentry->d_inode;
-        if (!fhp->fh_pre_saved) {
-                fhp->fh_pre_mtime = inode->i_mtime;
-                fhp->fh_pre_ctime = inode->i_ctime;
-                fhp->fh_pre_size  = inode->i_size;
-                fhp->fh_pre_change = inode->i_version;
-                fhp->fh_pre_saved = 1;
-        }
-}
-
-extern void fill_post_wcc(struct svc_fh *);
-#else
-#define fill_pre_wcc(ignored)
-#define fill_post_wcc(notused)
-#endif /* CONFIG_NFSD_V3 */
-
-
-/*
- * Lock a file handle/inode
- * NOTE: both fh_lock and fh_unlock are done "by hand" in
- * vfs.c:nfsd_rename as it needs to grab 2 i_mutex's at once
- * so, any changes here should be reflected there.
- */
-
-static inline void
-fh_lock_nested(struct svc_fh *fhp, unsigned int subclass)
-{
-        struct dentry   *dentry = fhp->fh_dentry;
-        struct inode    *inode;
-
-        dfprintk(FILEOP, "nfsd: fh_lock(%s) locked = %d\n",
-                        SVCFH_fmt(fhp), fhp->fh_locked);
-
-        BUG_ON(!dentry);
-
-        if (fhp->fh_locked) {
-                printk(KERN_WARNING "fh_lock: %s/%s already locked!\n",
-                        dentry->d_parent->d_name.name, dentry->d_name.name);
-                return;
-        }
-
-        inode = dentry->d_inode;
-        mutex_lock_nested(&inode->i_mutex, subclass);
-        fill_pre_wcc(fhp);
-        fhp->fh_locked = 1;
-}
-
-static inline void
-fh_lock(struct svc_fh *fhp)
-{
-        fh_lock_nested(fhp, I_MUTEX_NORMAL);
-}
-
-/*
- * Unlock a file handle/inode
- */
-static inline void
-fh_unlock(struct svc_fh *fhp)
-{
-        BUG_ON(!fhp->fh_dentry);
-
-        if (fhp->fh_locked) {
-                fill_post_wcc(fhp);
-                mutex_unlock(&fhp->fh_dentry->d_inode->i_mutex);
-                fhp->fh_locked = 0;
-        }
-}
 #endif /* __KERNEL__ */
 
 
diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h
index 7a3b565b898f..812bc1e160dc 100644
--- a/include/linux/nfsd/syscall.h
+++ b/include/linux/nfsd/syscall.h
@@ -9,14 +9,8 @@
 #ifndef NFSD_SYSCALL_H
 #define NFSD_SYSCALL_H
 
-# include <linux/types.h>
-#ifdef __KERNEL__
-# include <linux/in.h>
-#endif 
-#include <linux/posix_types.h>
-#include <linux/nfsd/const.h>
+#include <linux/types.h>
 #include <linux/nfsd/export.h>
-#include <linux/nfsd/nfsfh.h>
 
 /*
  * Version of the syscall interface
diff --git a/include/linux/node.h b/include/linux/node.h
index 681a697b9a86..06292dac3eab 100644
--- a/include/linux/node.h
+++ b/include/linux/node.h
@@ -21,13 +21,19 @@
 
 #include <linux/sysdev.h>
 #include <linux/cpumask.h>
+#include <linux/workqueue.h>
 
 struct node {
         struct sys_device       sysdev;
+
+#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HUGETLBFS)
+        struct work_struct      node_work;
+#endif
 };
 
 struct memory_block;
 extern struct node node_devices[];
+typedef  void (*node_registration_func_t)(struct node *);
 
 extern int register_node(struct node *, int, struct node *);
 extern void unregister_node(struct node *node);
@@ -39,6 +45,11 @@ extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid);
 extern int register_mem_sect_under_node(struct memory_block *mem_blk,
                                                 int nid);
 extern int unregister_mem_sect_under_nodes(struct memory_block *mem_blk);
+
+#ifdef CONFIG_HUGETLBFS
+extern void register_hugetlbfs_with_node(node_registration_func_t doregister,
+                                         node_registration_func_t unregister);
+#endif
 #else
 static inline int register_one_node(int nid)
 {
@@ -65,6 +76,11 @@ static inline int unregister_mem_sect_under_nodes(struct memory_block *mem_blk)
 {
         return 0;
 }
+
+static inline void register_hugetlbfs_with_node(node_registration_func_t reg,
+                                                node_registration_func_t unreg)
+{
+}
 #endif
 
 #define to_node(sys_device) container_of(sys_device, struct node, sysdev)
diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h
index b359c4a9ec9e..454997cccbd8 100644
--- a/include/linux/nodemask.h
+++ b/include/linux/nodemask.h
@@ -245,14 +245,19 @@ static inline int __next_node(int n, const nodemask_t *srcp)
         return min_t(int,MAX_NUMNODES,find_next_bit(srcp->bits, MAX_NUMNODES, n+1));
 }
 
+static inline void init_nodemask_of_node(nodemask_t *mask, int node)
+{
+        nodes_clear(*mask);
+        node_set(node, *mask);
+}
+
 #define nodemask_of_node(node)                                          \
 ({                                                                      \
         typeof(_unused_nodemask_arg_) m;                                \
         if (sizeof(m) == sizeof(unsigned long)) {                       \
-                m.bits[0] = 1UL<<(node);                                \
+                m.bits[0] = 1UL << (node);                              \
         } else {                                                        \
-                nodes_clear(m);                                         \
-                node_set((node), m);                                    \
+                init_nodemask_of_node(&m, (node));                      \
         }                                                               \
         m;                                                              \
 })
@@ -480,15 +485,17 @@ static inline int num_node_state(enum node_states state)
 #define for_each_online_node(node) for_each_node_state(node, N_ONLINE)
 
 /*
- * For nodemask scrach area.(See CPUMASK_ALLOC() in cpumask.h)
+ * For nodemask scrach area.
+ * NODEMASK_ALLOC(type, name) allocates an object with a specified type and
+ * name.
  */
-
-#if NODES_SHIFT > 8 /* nodemask_t > 64 bytes */
-#define NODEMASK_ALLOC(x, m) struct x *m = kmalloc(sizeof(*m), GFP_KERNEL)
-#define NODEMASK_FREE(m) kfree(m)
+#if NODES_SHIFT > 8 /* nodemask_t > 256 bytes */
+#define NODEMASK_ALLOC(type, name, gfp_flags)   \
+                        type *name = kmalloc(sizeof(*name), gfp_flags)
+#define NODEMASK_FREE(m)                        kfree(m)
 #else
-#define NODEMASK_ALLOC(x, m) struct x _m, *m = &_m
-#define NODEMASK_FREE(m)
+#define NODEMASK_ALLOC(type, name, gfp_flags)   type _name, *name = &_name
+#define NODEMASK_FREE(m)                        do {} while (0)
 #endif
 
 /* A example struture for using NODEMASK_ALLOC, used in mempolicy. */
@@ -497,8 +504,10 @@ struct nodemask_scratch {
         nodemask_t      mask2;
 };
 
-#define NODEMASK_SCRATCH(x) NODEMASK_ALLOC(nodemask_scratch, x)
-#define NODEMASK_SCRATCH_FREE(x)  NODEMASK_FREE(x)
+#define NODEMASK_SCRATCH(x)                                             \
+                        NODEMASK_ALLOC(struct nodemask_scratch, x,      \
+                                        GFP_KERNEL | __GFP_NORETRY)
+#define NODEMASK_SCRATCH_FREE(x)        NODEMASK_FREE(x)
 
 
 #endif /* __LINUX_NODEMASK_H */
diff --git a/include/linux/numa.h b/include/linux/numa.h
index a31a7301b159..3aaa31603a86 100644
--- a/include/linux/numa.h
+++ b/include/linux/numa.h
@@ -10,4 +10,6 @@
 
 #define MAX_NUMNODES    (1 << NODES_SHIFT)
 
+#define NUMA_NO_NODE    (-1)
+
 #endif /* _LINUX_NUMA_H */
diff --git a/include/linux/oom.h b/include/linux/oom.h
index 6aac5fe4f6f1..537662315627 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -10,6 +10,7 @@
 #ifdef __KERNEL__
 
 #include <linux/types.h>
+#include <linux/nodemask.h>
 
 struct zonelist;
 struct notifier_block;
@@ -26,7 +27,8 @@ enum oom_constraint {
 extern int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_flags);
 extern void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);
 
-extern void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order);
+extern void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
+                int order, nodemask_t *mask);
 extern int register_oom_notifier(struct notifier_block *nb);
 extern int unregister_oom_notifier(struct notifier_block *nb);
 
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 6b202b173955..49e907bd067f 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -99,7 +99,7 @@ enum pageflags {
         PG_buddy,               /* Page is free, on buddy lists */
         PG_swapbacked,          /* Page is backed by RAM/swap */
         PG_unevictable,         /* Page is "unevictable"  */
-#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT
+#ifdef CONFIG_MMU
         PG_mlocked,             /* Page is vma mlocked */
 #endif
 #ifdef CONFIG_ARCH_USES_PG_UNCACHED
@@ -259,12 +259,10 @@ PAGEFLAG_FALSE(SwapCache)
 PAGEFLAG(Unevictable, unevictable) __CLEARPAGEFLAG(Unevictable, unevictable)
         TESTCLEARFLAG(Unevictable, unevictable)
 
-#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT
-#define MLOCK_PAGES 1
+#ifdef CONFIG_MMU
 PAGEFLAG(Mlocked, mlocked) __CLEARPAGEFLAG(Mlocked, mlocked)
         TESTSCFLAG(Mlocked, mlocked) __TESTCLEARFLAG(Mlocked, mlocked)
 #else
-#define MLOCK_PAGES 0
 PAGEFLAG_FALSE(Mlocked) SETPAGEFLAG_NOOP(Mlocked)
         TESTCLEARFLAG_FALSE(Mlocked) __TESTCLEARFLAG_FALSE(Mlocked)
 #endif
@@ -393,7 +391,7 @@ static inline void __ClearPageTail(struct page *page)
 
 #endif /* !PAGEFLAGS_EXTENDED */
 
-#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT
+#ifdef CONFIG_MMU
 #define __PG_MLOCKED            (1 << PG_mlocked)
 #else
 #define __PG_MLOCKED            0
diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h
index 4b938d4f3ac2..b0e4eb126236 100644
--- a/include/linux/page_cgroup.h
+++ b/include/linux/page_cgroup.h
@@ -57,6 +57,8 @@ static inline void ClearPageCgroup##uname(struct page_cgroup *pc)	\
 static inline int TestClearPageCgroup##uname(struct page_cgroup *pc)    \
         { return test_and_clear_bit(PCG_##lname, &pc->flags);  }
 
+TESTPCGFLAG(Locked, LOCK)
+
 /* Cache flag is set only once (at allocation) */
 TESTPCGFLAG(Cache, CACHE)
 CLEARPCGFLAG(Cache, CACHE)
@@ -86,11 +88,6 @@ static inline void lock_page_cgroup(struct page_cgroup *pc)
         bit_spin_lock(PCG_LOCK, &pc->flags);
 }
 
-static inline int trylock_page_cgroup(struct page_cgroup *pc)
-{
-        return bit_spin_trylock(PCG_LOCK, &pc->flags);
-}
-
 static inline void unlock_page_cgroup(struct page_cgroup *pc)
 {
         bit_spin_unlock(PCG_LOCK, &pc->flags);
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 64a53f74c9a9..da7bdc23f279 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -681,7 +681,7 @@ struct perf_event_context {
          * Protect the states of the events in the list,
          * nr_active, and the list:
          */
-        spinlock_t                      lock;
+        raw_spinlock_t                  lock;
         /*
          * Protect the list of events.  Locking either mutex or lock
          * is sufficient to ensure the list doesn't change; to change
diff --git a/include/linux/plist.h b/include/linux/plist.h
index 45926d77d6ac..8227f717c70f 100644
--- a/include/linux/plist.h
+++ b/include/linux/plist.h
@@ -81,7 +81,8 @@ struct plist_head {
         struct list_head prio_list;
         struct list_head node_list;
 #ifdef CONFIG_DEBUG_PI_LIST
-        spinlock_t *lock;
+        raw_spinlock_t *rawlock;
+        spinlock_t *spinlock;
 #endif
 };
 
@@ -91,9 +92,11 @@ struct plist_node {
 };
 
 #ifdef CONFIG_DEBUG_PI_LIST
-# define PLIST_HEAD_LOCK_INIT(_lock)    .lock = _lock
+# define PLIST_HEAD_LOCK_INIT(_lock)            .spinlock = _lock
+# define PLIST_HEAD_LOCK_INIT_RAW(_lock)        .rawlock = _lock
 #else
 # define PLIST_HEAD_LOCK_INIT(_lock)
+# define PLIST_HEAD_LOCK_INIT_RAW(_lock)
 #endif
 
 #define _PLIST_HEAD_INIT(head)                          \
@@ -107,11 +110,22 @@ struct plist_node {
  */
 #define PLIST_HEAD_INIT(head, _lock)                    \
 {                                                       \
-        _PLIST_HEAD_INIT(head),                         \
+        _PLIST_HEAD_INIT(head),                         \
         PLIST_HEAD_LOCK_INIT(&(_lock))                  \
 }
 
 /**
+ * PLIST_HEAD_INIT_RAW - static struct plist_head initializer
+ * @head:       struct plist_head variable name
+ * @_lock:      lock to initialize for this list
+ */
+#define PLIST_HEAD_INIT_RAW(head, _lock)                \
+{                                                       \
+        _PLIST_HEAD_INIT(head),                         \
+        PLIST_HEAD_LOCK_INIT_RAW(&(_lock))              \
+}
+
+/**
  * PLIST_NODE_INIT - static struct plist_node initializer
  * @node:       struct plist_node variable name
  * @__prio:     initial node priority
@@ -119,13 +133,13 @@ struct plist_node {
 #define PLIST_NODE_INIT(node, __prio)                   \
 {                                                       \
         .prio  = (__prio),                              \
-        .plist = { _PLIST_HEAD_INIT((node).plist) },    \
+        .plist = { _PLIST_HEAD_INIT((node).plist) },    \
 }
 
 /**
  * plist_head_init - dynamic struct plist_head initializer
  * @head:       &struct plist_head pointer
- * @lock:       list spinlock, remembered for debugging
+ * @lock:       spinlock protecting the list (debugging)
  */
 static inline void
 plist_head_init(struct plist_head *head, spinlock_t *lock)
@@ -133,7 +147,24 @@ plist_head_init(struct plist_head *head, spinlock_t *lock)
         INIT_LIST_HEAD(&head->prio_list);
         INIT_LIST_HEAD(&head->node_list);
 #ifdef CONFIG_DEBUG_PI_LIST
-        head->lock = lock;
+        head->spinlock = lock;
+        head->rawlock = NULL;
+#endif
+}
+
+/**
+ * plist_head_init_raw - dynamic struct plist_head initializer
+ * @head:       &struct plist_head pointer
+ * @lock:       raw_spinlock protecting the list (debugging)
+ */
+static inline void
+plist_head_init_raw(struct plist_head *head, raw_spinlock_t *lock)
+{
+        INIT_LIST_HEAD(&head->prio_list);
+        INIT_LIST_HEAD(&head->node_list);
+#ifdef CONFIG_DEBUG_PI_LIST
+        head->rawlock = lock;
+        head->spinlock = NULL;
 #endif
 }
 
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 0d65934246af..198b8f9fe05e 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -219,7 +219,7 @@ struct dev_pm_ops {
  * to RAM and hibernation.
  */
 #define SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \
-struct dev_pm_ops name = { \
+const struct dev_pm_ops name = { \
         .suspend = suspend_fn, \
         .resume = resume_fn, \
         .freeze = suspend_fn, \
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 7456d7d87a19..56f2d63a5cbb 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -105,12 +105,7 @@ static inline int ptrace_reparented(struct task_struct *child)
 {
         return child->real_parent != child->parent;
 }
-static inline void ptrace_link(struct task_struct *child,
-                               struct task_struct *new_parent)
-{
-        if (unlikely(child->ptrace))
-                __ptrace_link(child, new_parent);
-}
+
 static inline void ptrace_unlink(struct task_struct *child)
 {
         if (unlikely(child->ptrace))
@@ -169,9 +164,9 @@ static inline void ptrace_init_task(struct task_struct *child, bool ptrace)
         INIT_LIST_HEAD(&child->ptraced);
         child->parent = child->real_parent;
         child->ptrace = 0;
-        if (unlikely(ptrace)) {
+        if (unlikely(ptrace) && (current->ptrace & PT_PTRACED)) {
                 child->ptrace = current->ptrace;
-                ptrace_link(child, current->parent);
+                __ptrace_link(child, current->parent);
         }
 }
 
@@ -278,6 +273,18 @@ static inline void user_enable_block_step(struct task_struct *task)
 }
 #endif  /* arch_has_block_step */
 
+#ifdef ARCH_HAS_USER_SINGLE_STEP_INFO
+extern void user_single_step_siginfo(struct task_struct *tsk,
+                                struct pt_regs *regs, siginfo_t *info);
+#else
+static inline void user_single_step_siginfo(struct task_struct *tsk,
+                                struct pt_regs *regs, siginfo_t *info)
+{
+        memset(info, 0, sizeof(*info));
+        info->si_signo = SIGTRAP;
+}
+#endif
+
 #ifndef arch_ptrace_stop_needed
 /**
  * arch_ptrace_stop_needed - Decide whether arch_ptrace_stop() should be called
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index a05b4a20768d..c96c1858fe2c 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -2051,25 +2051,12 @@ void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
 int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,
                         struct treepath *path, struct reiserfs_dir_entry *de);
 struct dentry *reiserfs_get_parent(struct dentry *);
-/* procfs.c */
-
-#if defined( CONFIG_PROC_FS ) && defined( CONFIG_REISERFS_PROC_INFO )
-#define REISERFS_PROC_INFO
-#else
-#undef REISERFS_PROC_INFO
-#endif
 
+#ifdef CONFIG_REISERFS_PROC_INFO
 int reiserfs_proc_info_init(struct super_block *sb);
 int reiserfs_proc_info_done(struct super_block *sb);
-struct proc_dir_entry *reiserfs_proc_register_global(char *name,
-                                                     read_proc_t * func);
-void reiserfs_proc_unregister_global(const char *name);
 int reiserfs_proc_info_global_init(void);
 int reiserfs_proc_info_global_done(void);
-int reiserfs_global_version_in_proc(char *buffer, char **start, off_t offset,
-                                    int count, int *eof, void *data);
-
-#if defined( REISERFS_PROC_INFO )
 
 #define PROC_EXP( e )   e
 
@@ -2084,6 +2071,26 @@ int reiserfs_global_version_in_proc(char *buffer, char **start, off_t offset,
     PROC_INFO_ADD( sb, free_at[ ( level ) ], B_FREE_SPACE( bh ) );      \
     PROC_INFO_ADD( sb, items_at[ ( level ) ], B_NR_ITEMS( bh ) )
 #else
+static inline int reiserfs_proc_info_init(struct super_block *sb)
+{
+        return 0;
+}
+
+static inline int reiserfs_proc_info_done(struct super_block *sb)
+{
+        return 0;
+}
+
+static inline int reiserfs_proc_info_global_init(void)
+{
+        return 0;
+}
+
+static inline int reiserfs_proc_info_global_done(void)
+{
+        return 0;
+}
+
 #define PROC_EXP( e )
 #define VOID_V ( ( void ) 0 )
 #define PROC_INFO_MAX( sb, field, value ) VOID_V
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index cb0ba7032609..b019ae64e2ab 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -26,6 +26,9 @@
  */
 struct anon_vma {
         spinlock_t lock;        /* Serialize access to vma list */
+#ifdef CONFIG_KSM
+        atomic_t ksm_refcount;
+#endif
         /*
          * NOTE: the LSB of the head.next is set by
          * mm_take_all_locks() _after_ taking the above lock. So the
@@ -38,6 +41,34 @@ struct anon_vma {
 };
 
 #ifdef CONFIG_MMU
+#ifdef CONFIG_KSM
+static inline void ksm_refcount_init(struct anon_vma *anon_vma)
+{
+        atomic_set(&anon_vma->ksm_refcount, 0);
+}
+
+static inline int ksm_refcount(struct anon_vma *anon_vma)
+{
+        return atomic_read(&anon_vma->ksm_refcount);
+}
+#else
+static inline void ksm_refcount_init(struct anon_vma *anon_vma)
+{
+}
+
+static inline int ksm_refcount(struct anon_vma *anon_vma)
+{
+        return 0;
+}
+#endif /* CONFIG_KSM */
+
+static inline struct anon_vma *page_anon_vma(struct page *page)
+{
+        if (((unsigned long)page->mapping & PAGE_MAPPING_FLAGS) !=
+                                            PAGE_MAPPING_ANON)
+                return NULL;
+        return page_rmapping(page);
+}
 
 static inline void anon_vma_lock(struct vm_area_struct *vma)
 {
@@ -62,6 +93,7 @@ void __anon_vma_merge(struct vm_area_struct *, struct vm_area_struct *);
 void anon_vma_unlink(struct vm_area_struct *);
 void anon_vma_link(struct vm_area_struct *);
 void __anon_vma_link(struct vm_area_struct *);
+void anon_vma_free(struct anon_vma *);
 
 /*
  * rmap interfaces called when adding or removing pte of page
@@ -81,6 +113,9 @@ static inline void page_dup_rmap(struct page *page)
  */
 int page_referenced(struct page *, int is_locked,
                         struct mem_cgroup *cnt, unsigned long *vm_flags);
+int page_referenced_one(struct page *, struct vm_area_struct *,
+        unsigned long address, unsigned int *mapcount, unsigned long *vm_flags);
+
 enum ttu_flags {
         TTU_UNMAP = 0,                  /* unmap mode */
         TTU_MIGRATION = 1,              /* migration mode */
@@ -94,6 +129,8 @@ enum ttu_flags {
 #define TTU_ACTION(x) ((x) & TTU_ACTION_MASK)
 
 int try_to_unmap(struct page *, enum ttu_flags flags);
+int try_to_unmap_one(struct page *, struct vm_area_struct *,
+                        unsigned long address, enum ttu_flags flags);
 
 /*
  * Called from mm/filemap_xip.c to unmap empty zero page
@@ -127,6 +164,12 @@ struct anon_vma *page_lock_anon_vma(struct page *page);
 void page_unlock_anon_vma(struct anon_vma *anon_vma);
 int page_mapped_in_vma(struct page *page, struct vm_area_struct *vma);
 
+/*
+ * Called by migrate.c to remove migration ptes, but might be used more later.
+ */
+int rmap_walk(struct page *page, int (*rmap_one)(struct page *,
+                struct vm_area_struct *, unsigned long, void *), void *arg);
+
 #else   /* !CONFIG_MMU */
 
 #define anon_vma_init()         do {} while (0)
diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
index f19b00b7d530..281d8fd775e8 100644
--- a/include/linux/rtmutex.h
+++ b/include/linux/rtmutex.h
@@ -24,7 +24,7 @@
  * @owner:      the mutex owner
  */
 struct rt_mutex {
-        spinlock_t              wait_lock;
+        raw_spinlock_t          wait_lock;
         struct plist_head       wait_list;
         struct task_struct      *owner;
 #ifdef CONFIG_DEBUG_RT_MUTEXES
@@ -63,8 +63,8 @@ struct hrtimer_sleeper;
 #endif
 
 #define __RT_MUTEX_INITIALIZER(mutexname) \
-        { .wait_lock = __SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \
-        , .wait_list = PLIST_HEAD_INIT(mutexname.wait_list, mutexname.wait_lock) \
+        { .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \
+        , .wait_list = PLIST_HEAD_INIT_RAW(mutexname.wait_list, mutexname.wait_lock) \
         , .owner = NULL \
         __DEBUG_RT_MUTEX_INITIALIZER(mutexname)}
 
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 14fc906ed602..05330fc5b436 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -368,11 +368,9 @@ enum {
 #define RTAX_MAX (__RTAX_MAX - 1)
 
 #define RTAX_FEATURE_ECN        0x00000001
-#define RTAX_FEATURE_NO_SACK    0x00000002
-#define RTAX_FEATURE_NO_TSTAMP  0x00000004
+#define RTAX_FEATURE_SACK       0x00000002
+#define RTAX_FEATURE_TIMESTAMP  0x00000004
 #define RTAX_FEATURE_ALLFRAG    0x00000008
-#define RTAX_FEATURE_NO_WSCALE  0x00000010
-#define RTAX_FEATURE_NO_DSACK   0x00000020
 
 struct rta_session {
         __u8    proto;
diff --git a/include/linux/rwlock.h b/include/linux/rwlock.h
new file mode 100644
index 000000000000..71e0b00b6f2c
--- /dev/null
+++ b/include/linux/rwlock.h
@@ -0,0 +1,125 @@
+#ifndef __LINUX_RWLOCK_H
+#define __LINUX_RWLOCK_H
+
+#ifndef __LINUX_SPINLOCK_H
+# error "please don't include this file directly"
+#endif
+
+/*
+ * rwlock related methods
+ *
+ * split out from spinlock.h
+ *
+ * portions Copyright 2005, Red Hat, Inc., Ingo Molnar
+ * Released under the General Public License (GPL).
+ */
+
+#ifdef CONFIG_DEBUG_SPINLOCK
+  extern void __rwlock_init(rwlock_t *lock, const char *name,
+                            struct lock_class_key *key);
+# define rwlock_init(lock)                                      \
+do {                                                            \
+        static struct lock_class_key __key;                     \
+                                                                \
+        __rwlock_init((lock), #lock, &__key);                   \
+} while (0)
+#else
+# define rwlock_init(lock)                                      \
+        do { *(lock) = __RW_LOCK_UNLOCKED(lock); } while (0)
+#endif
+
+#ifdef CONFIG_DEBUG_SPINLOCK
+ extern void do_raw_read_lock(rwlock_t *lock);
+#define do_raw_read_lock_flags(lock, flags) do_raw_read_lock(lock)
+ extern int do_raw_read_trylock(rwlock_t *lock);
+ extern void do_raw_read_unlock(rwlock_t *lock);
+ extern void do_raw_write_lock(rwlock_t *lock);
+#define do_raw_write_lock_flags(lock, flags) do_raw_write_lock(lock)
+ extern int do_raw_write_trylock(rwlock_t *lock);
+ extern void do_raw_write_unlock(rwlock_t *lock);
+#else
+# define do_raw_read_lock(rwlock)       arch_read_lock(&(rwlock)->raw_lock)
+# define do_raw_read_lock_flags(lock, flags) \
+                arch_read_lock_flags(&(lock)->raw_lock, *(flags))
+# define do_raw_read_trylock(rwlock)    arch_read_trylock(&(rwlock)->raw_lock)
+# define do_raw_read_unlock(rwlock)     arch_read_unlock(&(rwlock)->raw_lock)
+# define do_raw_write_lock(rwlock)      arch_write_lock(&(rwlock)->raw_lock)
+# define do_raw_write_lock_flags(lock, flags) \
+                arch_write_lock_flags(&(lock)->raw_lock, *(flags))
+# define do_raw_write_trylock(rwlock)   arch_write_trylock(&(rwlock)->raw_lock)
+# define do_raw_write_unlock(rwlock)    arch_write_unlock(&(rwlock)->raw_lock)
+#endif
+
+#define read_can_lock(rwlock)           arch_read_can_lock(&(rwlock)->raw_lock)
+#define write_can_lock(rwlock)          arch_write_can_lock(&(rwlock)->raw_lock)
+
+/*
+ * Define the various rw_lock methods.  Note we define these
+ * regardless of whether CONFIG_SMP or CONFIG_PREEMPT are set. The various
+ * methods are defined as nops in the case they are not required.
+ */
+#define read_trylock(lock)      __cond_lock(lock, _raw_read_trylock(lock))
+#define write_trylock(lock)     __cond_lock(lock, _raw_write_trylock(lock))
+
+#define write_lock(lock)        _raw_write_lock(lock)
+#define read_lock(lock)         _raw_read_lock(lock)
+
+#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
+
+#define read_lock_irqsave(lock, flags)                  \
+        do {                                            \
+                typecheck(unsigned long, flags);        \
+                flags = _raw_read_lock_irqsave(lock);   \
+        } while (0)
+#define write_lock_irqsave(lock, flags)                 \
+        do {                                            \
+                typecheck(unsigned long, flags);        \
+                flags = _raw_write_lock_irqsave(lock);  \
+        } while (0)
+
+#else
+
+#define read_lock_irqsave(lock, flags)                  \
+        do {                                            \
+                typecheck(unsigned long, flags);        \
+                _raw_read_lock_irqsave(lock, flags);    \
+        } while (0)
+#define write_lock_irqsave(lock, flags)                 \
+        do {                                            \
+                typecheck(unsigned long, flags);        \
+                _raw_write_lock_irqsave(lock, flags);   \
+        } while (0)
+
+#endif
+
+#define read_lock_irq(lock)             _raw_read_lock_irq(lock)
+#define read_lock_bh(lock)              _raw_read_lock_bh(lock)
+#define write_lock_irq(lock)            _raw_write_lock_irq(lock)
+#define write_lock_bh(lock)             _raw_write_lock_bh(lock)
+#define read_unlock(lock)               _raw_read_unlock(lock)
+#define write_unlock(lock)              _raw_write_unlock(lock)
+#define read_unlock_irq(lock)           _raw_read_unlock_irq(lock)
+#define write_unlock_irq(lock)          _raw_write_unlock_irq(lock)
+
+#define read_unlock_irqrestore(lock, flags)                     \
+        do {                                                    \
+                typecheck(unsigned long, flags);                \
+                _raw_read_unlock_irqrestore(lock, flags);       \
+        } while (0)
+#define read_unlock_bh(lock)            _raw_read_unlock_bh(lock)
+
+#define write_unlock_irqrestore(lock, flags)            \
+        do {                                            \
+                typecheck(unsigned long, flags);        \
+                _raw_write_unlock_irqrestore(lock, flags);      \
+        } while (0)
+#define write_unlock_bh(lock)           _raw_write_unlock_bh(lock)
+
+#define write_trylock_irqsave(lock, flags) \
+({ \
+        local_irq_save(flags); \
+        write_trylock(lock) ? \
+        1 : ({ local_irq_restore(flags); 0; }); \
+})
+
+#endif /* __LINUX_RWLOCK_H */
diff --git a/include/linux/rwlock_api_smp.h b/include/linux/rwlock_api_smp.h
new file mode 100644
index 000000000000..9c9f0495d37c
--- /dev/null
+++ b/include/linux/rwlock_api_smp.h
@@ -0,0 +1,282 @@
+#ifndef __LINUX_RWLOCK_API_SMP_H
+#define __LINUX_RWLOCK_API_SMP_H
+
+#ifndef __LINUX_SPINLOCK_API_SMP_H
+# error "please don't include this file directly"
+#endif
+
+/*
+ * include/linux/rwlock_api_smp.h
+ *
+ * spinlock API declarations on SMP (and debug)
+ * (implemented in kernel/spinlock.c)
+ *
+ * portions Copyright 2005, Red Hat, Inc., Ingo Molnar
+ * Released under the General Public License (GPL).
+ */
+
+void __lockfunc _raw_read_lock(rwlock_t *lock)          __acquires(lock);
+void __lockfunc _raw_write_lock(rwlock_t *lock)         __acquires(lock);
+void __lockfunc _raw_read_lock_bh(rwlock_t *lock)       __acquires(lock);
+void __lockfunc _raw_write_lock_bh(rwlock_t *lock)      __acquires(lock);
+void __lockfunc _raw_read_lock_irq(rwlock_t *lock)      __acquires(lock);
+void __lockfunc _raw_write_lock_irq(rwlock_t *lock)     __acquires(lock);
+unsigned long __lockfunc _raw_read_lock_irqsave(rwlock_t *lock)
+                                                        __acquires(lock);
+unsigned long __lockfunc _raw_write_lock_irqsave(rwlock_t *lock)
+                                                        __acquires(lock);
+int __lockfunc _raw_read_trylock(rwlock_t *lock);
+int __lockfunc _raw_write_trylock(rwlock_t *lock);
+void __lockfunc _raw_read_unlock(rwlock_t *lock)        __releases(lock);
+void __lockfunc _raw_write_unlock(rwlock_t *lock)       __releases(lock);
+void __lockfunc _raw_read_unlock_bh(rwlock_t *lock)     __releases(lock);
+void __lockfunc _raw_write_unlock_bh(rwlock_t *lock)    __releases(lock);
+void __lockfunc _raw_read_unlock_irq(rwlock_t *lock)    __releases(lock);
+void __lockfunc _raw_write_unlock_irq(rwlock_t *lock)   __releases(lock);
+void __lockfunc
+_raw_read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
+                                                        __releases(lock);
+void __lockfunc
+_raw_write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
+                                                        __releases(lock);
+
+#ifdef CONFIG_INLINE_READ_LOCK
+#define _raw_read_lock(lock) __raw_read_lock(lock)
+#endif
+
+#ifdef CONFIG_INLINE_WRITE_LOCK
+#define _raw_write_lock(lock) __raw_write_lock(lock)
+#endif
+
+#ifdef CONFIG_INLINE_READ_LOCK_BH
+#define _raw_read_lock_bh(lock) __raw_read_lock_bh(lock)
+#endif
+
+#ifdef CONFIG_INLINE_WRITE_LOCK_BH
+#define _raw_write_lock_bh(lock) __raw_write_lock_bh(lock)
+#endif
+
+#ifdef CONFIG_INLINE_READ_LOCK_IRQ
+#define _raw_read_lock_irq(lock) __raw_read_lock_irq(lock)
+#endif
+
+#ifdef CONFIG_INLINE_WRITE_LOCK_IRQ
+#define _raw_write_lock_irq(lock) __raw_write_lock_irq(lock)
+#endif
+
+#ifdef CONFIG_INLINE_READ_LOCK_IRQSAVE
+#define _raw_read_lock_irqsave(lock) __raw_read_lock_irqsave(lock)
+#endif
+
+#ifdef CONFIG_INLINE_WRITE_LOCK_IRQSAVE
+#define _raw_write_lock_irqsave(lock) __raw_write_lock_irqsave(lock)
+#endif
+
+#ifdef CONFIG_INLINE_READ_TRYLOCK
+#define _raw_read_trylock(lock) __raw_read_trylock(lock)
+#endif
+
+#ifdef CONFIG_INLINE_WRITE_TRYLOCK
+#define _raw_write_trylock(lock) __raw_write_trylock(lock)
+#endif
+
+#ifdef CONFIG_INLINE_READ_UNLOCK
+#define _raw_read_unlock(lock) __raw_read_unlock(lock)
+#endif
+
+#ifdef CONFIG_INLINE_WRITE_UNLOCK
+#define _raw_write_unlock(lock) __raw_write_unlock(lock)
+#endif
+
+#ifdef CONFIG_INLINE_READ_UNLOCK_BH
+#define _raw_read_unlock_bh(lock) __raw_read_unlock_bh(lock)
+#endif
+
+#ifdef CONFIG_INLINE_WRITE_UNLOCK_BH
+#define _raw_write_unlock_bh(lock) __raw_write_unlock_bh(lock)
+#endif
+
+#ifdef CONFIG_INLINE_READ_UNLOCK_IRQ
+#define _raw_read_unlock_irq(lock) __raw_read_unlock_irq(lock)
+#endif
+
+#ifdef CONFIG_INLINE_WRITE_UNLOCK_IRQ
+#define _raw_write_unlock_irq(lock) __raw_write_unlock_irq(lock)
+#endif
+
+#ifdef CONFIG_INLINE_READ_UNLOCK_IRQRESTORE
+#define _raw_read_unlock_irqrestore(lock, flags) \
+        __raw_read_unlock_irqrestore(lock, flags)
+#endif
+
+#ifdef CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE
+#define _raw_write_unlock_irqrestore(lock, flags) \
+        __raw_write_unlock_irqrestore(lock, flags)
+#endif
+
+static inline int __raw_read_trylock(rwlock_t *lock)
+{
+        preempt_disable();
+        if (do_raw_read_trylock(lock)) {
+                rwlock_acquire_read(&lock->dep_map, 0, 1, _RET_IP_);
+                return 1;
+        }
+        preempt_enable();
+        return 0;
+}
+
+static inline int __raw_write_trylock(rwlock_t *lock)
+{
+        preempt_disable();
+        if (do_raw_write_trylock(lock)) {
+                rwlock_acquire(&lock->dep_map, 0, 1, _RET_IP_);
+                return 1;
+        }
+        preempt_enable();
+        return 0;
+}
+
+/*
+ * If lockdep is enabled then we use the non-preemption spin-ops
+ * even on CONFIG_PREEMPT, because lockdep assumes that interrupts are
+ * not re-enabled during lock-acquire (which the preempt-spin-ops do):
+ */
+#if !defined(CONFIG_GENERIC_LOCKBREAK) || defined(CONFIG_DEBUG_LOCK_ALLOC)
+
+static inline void __raw_read_lock(rwlock_t *lock)
+{
+        preempt_disable();
+        rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
+        LOCK_CONTENDED(lock, do_raw_read_trylock, do_raw_read_lock);
+}
+
+static inline unsigned long __raw_read_lock_irqsave(rwlock_t *lock)
+{
+        unsigned long flags;
+
+        local_irq_save(flags);
+        preempt_disable();
+        rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
+        LOCK_CONTENDED_FLAGS(lock, do_raw_read_trylock, do_raw_read_lock,
+                             do_raw_read_lock_flags, &flags);
+        return flags;
+}
+
+static inline void __raw_read_lock_irq(rwlock_t *lock)
+{
+        local_irq_disable();
+        preempt_disable();
+        rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
+        LOCK_CONTENDED(lock, do_raw_read_trylock, do_raw_read_lock);
+}
+
+static inline void __raw_read_lock_bh(rwlock_t *lock)
+{
+        local_bh_disable();
+        preempt_disable();
+        rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
+        LOCK_CONTENDED(lock, do_raw_read_trylock, do_raw_read_lock);
+}
+
+static inline unsigned long __raw_write_lock_irqsave(rwlock_t *lock)
+{
+        unsigned long flags;
+
+        local_irq_save(flags);
+        preempt_disable();
+        rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
+        LOCK_CONTENDED_FLAGS(lock, do_raw_write_trylock, do_raw_write_lock,
+                             do_raw_write_lock_flags, &flags);
+        return flags;
+}
+
+static inline void __raw_write_lock_irq(rwlock_t *lock)
+{
+        local_irq_disable();
+        preempt_disable();
+        rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
+        LOCK_CONTENDED(lock, do_raw_write_trylock, do_raw_write_lock);
+}
+
+static inline void __raw_write_lock_bh(rwlock_t *lock)
+{
+        local_bh_disable();
+        preempt_disable();
+        rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
+        LOCK_CONTENDED(lock, do_raw_write_trylock, do_raw_write_lock);
+}
+
+static inline void __raw_write_lock(rwlock_t *lock)
+{
+        preempt_disable();
+        rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
+        LOCK_CONTENDED(lock, do_raw_write_trylock, do_raw_write_lock);
+}
+
+#endif /* CONFIG_PREEMPT */
+
+static inline void __raw_write_unlock(rwlock_t *lock)
+{
+        rwlock_release(&lock->dep_map, 1, _RET_IP_);
+        do_raw_write_unlock(lock);
+        preempt_enable();
+}
+
+static inline void __raw_read_unlock(rwlock_t *lock)
+{
+        rwlock_release(&lock->dep_map, 1, _RET_IP_);
+        do_raw_read_unlock(lock);
+        preempt_enable();
+}
+
+static inline void
+__raw_read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
+{
+        rwlock_release(&lock->dep_map, 1, _RET_IP_);
+        do_raw_read_unlock(lock);
+        local_irq_restore(flags);
+        preempt_enable();
+}
+
+static inline void __raw_read_unlock_irq(rwlock_t *lock)
+{
+        rwlock_release(&lock->dep_map, 1, _RET_IP_);
+        do_raw_read_unlock(lock);
+        local_irq_enable();
+        preempt_enable();
+}
+
+static inline void __raw_read_unlock_bh(rwlock_t *lock)
+{
+        rwlock_release(&lock->dep_map, 1, _RET_IP_);
+        do_raw_read_unlock(lock);
+        preempt_enable_no_resched();
+        local_bh_enable_ip((unsigned long)__builtin_return_address(0));
+}
+
+static inline void __raw_write_unlock_irqrestore(rwlock_t *lock,
+                                             unsigned long flags)
+{
+        rwlock_release(&lock->dep_map, 1, _RET_IP_);
+        do_raw_write_unlock(lock);
+        local_irq_restore(flags);
+        preempt_enable();
+}
+
+static inline void __raw_write_unlock_irq(rwlock_t *lock)
+{
+        rwlock_release(&lock->dep_map, 1, _RET_IP_);
+        do_raw_write_unlock(lock);
+        local_irq_enable();
+        preempt_enable();
+}
+
+static inline void __raw_write_unlock_bh(rwlock_t *lock)
+{
+        rwlock_release(&lock->dep_map, 1, _RET_IP_);
+        do_raw_write_unlock(lock);
+        preempt_enable_no_resched();
+        local_bh_enable_ip((unsigned long)__builtin_return_address(0));
+}
+
+#endif /* __LINUX_RWLOCK_API_SMP_H */
diff --git a/include/linux/rwlock_types.h b/include/linux/rwlock_types.h
new file mode 100644
index 000000000000..bd31808c7d8e
--- /dev/null
+++ b/include/linux/rwlock_types.h
@@ -0,0 +1,56 @@
+#ifndef __LINUX_RWLOCK_TYPES_H
+#define __LINUX_RWLOCK_TYPES_H
+
+/*
+ * include/linux/rwlock_types.h - generic rwlock type definitions
+ *                                and initializers
+ *
+ * portions Copyright 2005, Red Hat, Inc., Ingo Molnar
+ * Released under the General Public License (GPL).
+ */
+typedef struct {
+        arch_rwlock_t raw_lock;
+#ifdef CONFIG_GENERIC_LOCKBREAK
+        unsigned int break_lock;
+#endif
+#ifdef CONFIG_DEBUG_SPINLOCK
+        unsigned int magic, owner_cpu;
+        void *owner;
+#endif
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+        struct lockdep_map dep_map;
+#endif
+} rwlock_t;
+
+#define RWLOCK_MAGIC            0xdeaf1eed
+
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+# define RW_DEP_MAP_INIT(lockname)      .dep_map = { .name = #lockname }
+#else
+# define RW_DEP_MAP_INIT(lockname)
+#endif
+
+#ifdef CONFIG_DEBUG_SPINLOCK
+#define __RW_LOCK_UNLOCKED(lockname)                                    \
+        (rwlock_t)      {       .raw_lock = __ARCH_RW_LOCK_UNLOCKED,    \
+                                .magic = RWLOCK_MAGIC,                  \
+                                .owner = SPINLOCK_OWNER_INIT,           \
+                                .owner_cpu = -1,                        \
+                                RW_DEP_MAP_INIT(lockname) }
+#else
+#define __RW_LOCK_UNLOCKED(lockname) \
+        (rwlock_t)      {       .raw_lock = __ARCH_RW_LOCK_UNLOCKED,    \
+                                RW_DEP_MAP_INIT(lockname) }
+#endif
+
+/*
+ * RW_LOCK_UNLOCKED defeat lockdep state tracking and is hence
+ * deprecated.
+ *
+ * Please use DEFINE_RWLOCK() or __RW_LOCK_UNLOCKED() as appropriate.
+ */
+#define RW_LOCK_UNLOCKED        __RW_LOCK_UNLOCKED(old_style_rw_init)
+
+#define DEFINE_RWLOCK(x)        rwlock_t x = __RW_LOCK_UNLOCKED(x)
+
+#endif /* __LINUX_RWLOCK_TYPES_H */
diff --git a/include/linux/rwsem-spinlock.h b/include/linux/rwsem-spinlock.h
index 6c3c0f6c261f..bdfcc2527970 100644
--- a/include/linux/rwsem-spinlock.h
+++ b/include/linux/rwsem-spinlock.h
@@ -68,11 +68,7 @@ extern int __down_write_trylock(struct rw_semaphore *sem);
 extern void __up_read(struct rw_semaphore *sem);
 extern void __up_write(struct rw_semaphore *sem);
 extern void __downgrade_write(struct rw_semaphore *sem);
-
-static inline int rwsem_is_locked(struct rw_semaphore *sem)
-{
-        return (sem->activity != 0);
-}
+extern int rwsem_is_locked(struct rw_semaphore *sem);
 
 #endif /* __KERNEL__ */
 #endif /* _LINUX_RWSEM_SPINLOCK_H */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 294eb2f80144..244c287a5ac1 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1409,7 +1409,7 @@ struct task_struct {
 #endif
 
         /* Protection of the PI data structures: */
-        spinlock_t pi_lock;
+        raw_spinlock_t pi_lock;
 
 #ifdef CONFIG_RT_MUTEXES
         /* PI waiters blocked on a rt_mutex held by this task */
@@ -1446,8 +1446,10 @@ struct task_struct {
         gfp_t lockdep_reclaim_gfp;
 #endif
 
+#ifdef CONFIG_FS_JOURNAL_INFO
 /* journalling filesystem info */
         void *journal_info;
+#endif
 
 /* stacked block device info */
         struct bio *bio_list, **bio_tail;
@@ -1542,6 +1544,14 @@ struct task_struct {
         unsigned long trace_recursion;
 #endif /* CONFIG_TRACING */
         unsigned long stack_start;
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR /* memcg uses this to do batch job */
+        struct memcg_batch_info {
+                int do_batch;   /* incremented when batch uncharge started */
+                struct mem_cgroup *memcg; /* target memcg of uncharge */
+                unsigned long bytes;            /* uncharged usage */
+                unsigned long memsw_bytes; /* uncharged mem+swap usage */
+        } memcg_batch;
+#endif
 };
 
 /* Future-safe accessor for struct task_struct's cpus_allowed. */
@@ -2073,7 +2083,6 @@ extern int kill_proc_info(int, struct siginfo *, pid_t);
 extern int do_notify_parent(struct task_struct *, int);
 extern void __wake_up_parent(struct task_struct *p, struct task_struct *parent);
 extern void force_sig(int, struct task_struct *);
-extern void force_sig_specific(int, struct task_struct *);
 extern int send_sig(int, struct task_struct *, int);
 extern void zap_other_threads(struct task_struct *p);
 extern struct sigqueue *sigqueue_alloc(void);
@@ -2092,11 +2101,6 @@ static inline int kill_cad_pid(int sig, int priv)
 #define SEND_SIG_PRIV   ((struct siginfo *) 1)
 #define SEND_SIG_FORCED ((struct siginfo *) 2)
 
-static inline int is_si_special(const struct siginfo *info)
-{
-        return info <= SEND_SIG_FORCED;
-}
-
 /*
  * True if we are on the alternate signal stack.
  */
diff --git a/include/linux/sem.h b/include/linux/sem.h
index 1b191c176bcd..8a4adbef8a0f 100644
--- a/include/linux/sem.h
+++ b/include/linux/sem.h
@@ -86,6 +86,7 @@ struct task_struct;
 struct sem {
         int     semval;         /* current value */
         int     sempid;         /* pid of last operation */
+        struct list_head sem_pending; /* pending single-sop operations */
 };
 
 /* One sem_array data structure for each set of semaphores in the system. */
@@ -96,11 +97,13 @@ struct sem_array {
         struct sem              *sem_base;      /* ptr to first semaphore in array */
         struct list_head        sem_pending;    /* pending operations to be processed */
         struct list_head        list_id;        /* undo requests on this array */
-        unsigned long           sem_nsems;      /* no. of semaphores in array */
+        int                     sem_nsems;      /* no. of semaphores in array */
+        int                     complex_count;  /* pending complex operations */
 };
 
 /* One queue for each sleeping process in the system. */
 struct sem_queue {
+        struct list_head        simple_list; /* queue of pending operations */
         struct list_head        list;    /* queue of pending operations */
         struct task_struct      *sleeper; /* this process */
         struct sem_undo         *undo;   /* undo structure */
diff --git a/include/linux/sm501-regs.h b/include/linux/sm501-regs.h
index d53642d2d899..67ed2c542831 100644
--- a/include/linux/sm501-regs.h
+++ b/include/linux/sm501-regs.h
@@ -31,6 +31,8 @@
 #define SM501_SYSCTRL_PCI_SUBSYS_LOCK   (1<<11)
 #define SM501_SYSCTRL_PCI_BURST_READ_EN (1<<15)
 
+#define SM501_SYSCTRL_2D_ENGINE_STATUS  (1<<19)
+
 /* miscellaneous control */
 
 #define SM501_MISC_CONTROL              (0x000004)
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index 71dccfeb0d88..86088213334a 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -8,13 +8,13 @@
  *
  * on SMP builds:
  *
- *  asm/spinlock_types.h: contains the raw_spinlock_t/raw_rwlock_t and the
+ *  asm/spinlock_types.h: contains the arch_spinlock_t/arch_rwlock_t and the
  *                        initializers
  *
  *  linux/spinlock_types.h:
  *                        defines the generic type and initializers
  *
- *  asm/spinlock.h:       contains the __raw_spin_*()/etc. lowlevel
+ *  asm/spinlock.h:       contains the arch_spin_*()/etc. lowlevel
  *                        implementations, mostly inline assembly code
  *
  *   (also included on UP-debug builds:)
@@ -34,7 +34,7 @@
  *                        defines the generic type and initializers
  *
  *  linux/spinlock_up.h:
- *                        contains the __raw_spin_*()/etc. version of UP
+ *                        contains the arch_spin_*()/etc. version of UP
  *                        builds. (which are NOPs on non-debug, non-preempt
  *                        builds)
  *
@@ -75,12 +75,12 @@
 #define __lockfunc __attribute__((section(".spinlock.text")))
 
 /*
- * Pull the raw_spinlock_t and raw_rwlock_t definitions:
+ * Pull the arch_spinlock_t and arch_rwlock_t definitions:
  */
 #include <linux/spinlock_types.h>
 
 /*
- * Pull the __raw*() functions/declarations (UP-nondebug doesnt need them):
+ * Pull the arch_spin*() functions/declarations (UP-nondebug doesnt need them):
  */
 #ifdef CONFIG_SMP
 # include <asm/spinlock.h>
@@ -89,45 +89,31 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPINLOCK
-  extern void __spin_lock_init(spinlock_t *lock, const char *name,
-                               struct lock_class_key *key);
-# define spin_lock_init(lock)                                   \
+  extern void __raw_spin_lock_init(raw_spinlock_t *lock, const char *name,
+                                   struct lock_class_key *key);
+# define raw_spin_lock_init(lock)                               \
 do {                                                            \
         static struct lock_class_key __key;                     \
                                                                 \
-        __spin_lock_init((lock), #lock, &__key);                \
+        __raw_spin_lock_init((lock), #lock, &__key);            \
 } while (0)
 
 #else
-# define spin_lock_init(lock)                                   \
-        do { *(lock) = __SPIN_LOCK_UNLOCKED(lock); } while (0)
+# define raw_spin_lock_init(lock)                               \
+        do { *(lock) = __RAW_SPIN_LOCK_UNLOCKED(lock); } while (0)
 #endif
 
-#ifdef CONFIG_DEBUG_SPINLOCK
-  extern void __rwlock_init(rwlock_t *lock, const char *name,
-                            struct lock_class_key *key);
-# define rwlock_init(lock)                                      \
-do {                                                            \
-        static struct lock_class_key __key;                     \
-                                                                \
-        __rwlock_init((lock), #lock, &__key);                   \
-} while (0)
-#else
-# define rwlock_init(lock)                                      \
-        do { *(lock) = __RW_LOCK_UNLOCKED(lock); } while (0)
-#endif
-
-#define spin_is_locked(lock)    __raw_spin_is_locked(&(lock)->raw_lock)
+#define raw_spin_is_locked(lock)        arch_spin_is_locked(&(lock)->raw_lock)
 
 #ifdef CONFIG_GENERIC_LOCKBREAK
-#define spin_is_contended(lock) ((lock)->break_lock)
+#define raw_spin_is_contended(lock) ((lock)->break_lock)
 #else
 
-#ifdef __raw_spin_is_contended
-#define spin_is_contended(lock) __raw_spin_is_contended(&(lock)->raw_lock)
+#ifdef arch_spin_is_contended
+#define raw_spin_is_contended(lock)     arch_spin_is_contended(&(lock)->raw_lock)
 #else
-#define spin_is_contended(lock) (((void)(lock), 0))
-#endif /*__raw_spin_is_contended*/
+#define raw_spin_is_contended(lock)     (((void)(lock), 0))
+#endif /*arch_spin_is_contended*/
 #endif
 
 /* The lock does not imply full memory barrier. */
@@ -136,182 +122,260 @@ static inline void smp_mb__after_lock(void) { smp_mb(); }
 #endif
 
 /**
- * spin_unlock_wait - wait until the spinlock gets unlocked
+ * raw_spin_unlock_wait - wait until the spinlock gets unlocked
  * @lock: the spinlock in question.
  */
-#define spin_unlock_wait(lock)  __raw_spin_unlock_wait(&(lock)->raw_lock)
+#define raw_spin_unlock_wait(lock)      arch_spin_unlock_wait(&(lock)->raw_lock)
 
 #ifdef CONFIG_DEBUG_SPINLOCK
- extern void _raw_spin_lock(spinlock_t *lock);
-#define _raw_spin_lock_flags(lock, flags) _raw_spin_lock(lock)
- 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);
+ extern void do_raw_spin_lock(raw_spinlock_t *lock);
+#define do_raw_spin_lock_flags(lock, flags) do_raw_spin_lock(lock)
+ extern int do_raw_spin_trylock(raw_spinlock_t *lock);
+ extern void do_raw_spin_unlock(raw_spinlock_t *lock);
 #else
-# define _raw_spin_lock(lock)           __raw_spin_lock(&(lock)->raw_lock)
-# define _raw_spin_lock_flags(lock, flags) \
-                __raw_spin_lock_flags(&(lock)->raw_lock, *(flags))
-# 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)
+static inline void do_raw_spin_lock(raw_spinlock_t *lock)
+{
+        arch_spin_lock(&lock->raw_lock);
+}
+
+static inline void
+do_raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long *flags)
+{
+        arch_spin_lock_flags(&lock->raw_lock, *flags);
+}
+
+static inline int do_raw_spin_trylock(raw_spinlock_t *lock)
+{
+        return arch_spin_trylock(&(lock)->raw_lock);
+}
+
+static inline void do_raw_spin_unlock(raw_spinlock_t *lock)
+{
+        arch_spin_unlock(&lock->raw_lock);
+}
 #endif
 
-#define read_can_lock(rwlock)           __raw_read_can_lock(&(rwlock)->raw_lock)
-#define write_can_lock(rwlock)          __raw_write_can_lock(&(rwlock)->raw_lock)
-
 /*
- * Define the various spin_lock and rw_lock methods.  Note we define these
- * regardless of whether CONFIG_SMP or CONFIG_PREEMPT are set. The various
- * methods are defined as nops in the case they are not required.
+ * Define the various spin_lock methods.  Note we define these
+ * regardless of whether CONFIG_SMP or CONFIG_PREEMPT are set. The
+ * various methods are defined as nops in the case they are not
+ * required.
  */
-#define spin_trylock(lock)              __cond_lock(lock, _spin_trylock(lock))
-#define read_trylock(lock)              __cond_lock(lock, _read_trylock(lock))
-#define write_trylock(lock)             __cond_lock(lock, _write_trylock(lock))
+#define raw_spin_trylock(lock)  __cond_lock(lock, _raw_spin_trylock(lock))
 
-#define spin_lock(lock)                 _spin_lock(lock)
+#define raw_spin_lock(lock)     _raw_spin_lock(lock)
 
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
-# define spin_lock_nested(lock, subclass) _spin_lock_nested(lock, subclass)
-# define spin_lock_nest_lock(lock, nest_lock)                           \
+# define raw_spin_lock_nested(lock, subclass) \
+        _raw_spin_lock_nested(lock, subclass)
+
+# define raw_spin_lock_nest_lock(lock, nest_lock)                       \
          do {                                                           \
                  typecheck(struct lockdep_map *, &(nest_lock)->dep_map);\
-                 _spin_lock_nest_lock(lock, &(nest_lock)->dep_map);     \
+                 _raw_spin_lock_nest_lock(lock, &(nest_lock)->dep_map); \
          } while (0)
 #else
-# define spin_lock_nested(lock, subclass) _spin_lock(lock)
-# define spin_lock_nest_lock(lock, nest_lock) _spin_lock(lock)
+# define raw_spin_lock_nested(lock, subclass)           _raw_spin_lock(lock)
+# define raw_spin_lock_nest_lock(lock, nest_lock)       _raw_spin_lock(lock)
 #endif
 
-#define write_lock(lock)                _write_lock(lock)
-#define read_lock(lock)                 _read_lock(lock)
-
 #if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
 
-#define spin_lock_irqsave(lock, flags)                  \
+#define raw_spin_lock_irqsave(lock, flags)                      \
         do {                                            \
                 typecheck(unsigned long, flags);        \
-                flags = _spin_lock_irqsave(lock);       \
-        } while (0)
-#define read_lock_irqsave(lock, flags)                  \
-        do {                                            \
-                typecheck(unsigned long, flags);        \
-                flags = _read_lock_irqsave(lock);       \
-        } while (0)
-#define write_lock_irqsave(lock, flags)                 \
-        do {                                            \
-                typecheck(unsigned long, flags);        \
-                flags = _write_lock_irqsave(lock);      \
+                flags = _raw_spin_lock_irqsave(lock);   \
         } while (0)
 
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
-#define spin_lock_irqsave_nested(lock, flags, subclass)                 \
+#define raw_spin_lock_irqsave_nested(lock, flags, subclass)             \
         do {                                                            \
                 typecheck(unsigned long, flags);                        \
-                flags = _spin_lock_irqsave_nested(lock, subclass);      \
+                flags = _raw_spin_lock_irqsave_nested(lock, subclass);  \
         } while (0)
 #else
-#define spin_lock_irqsave_nested(lock, flags, subclass)                 \
+#define raw_spin_lock_irqsave_nested(lock, flags, subclass)             \
         do {                                                            \
                 typecheck(unsigned long, flags);                        \
-                flags = _spin_lock_irqsave(lock);                       \
+                flags = _raw_spin_lock_irqsave(lock);                   \
         } while (0)
 #endif
 
 #else
 
-#define spin_lock_irqsave(lock, flags)                  \
-        do {                                            \
-                typecheck(unsigned long, flags);        \
-                _spin_lock_irqsave(lock, flags);        \
-        } while (0)
-#define read_lock_irqsave(lock, flags)                  \
-        do {                                            \
-                typecheck(unsigned long, flags);        \
-                _read_lock_irqsave(lock, flags);        \
-        } while (0)
-#define write_lock_irqsave(lock, flags)                 \
+#define raw_spin_lock_irqsave(lock, flags)              \
         do {                                            \
                 typecheck(unsigned long, flags);        \
-                _write_lock_irqsave(lock, flags);       \
+                _raw_spin_lock_irqsave(lock, flags);    \
         } while (0)
-#define spin_lock_irqsave_nested(lock, flags, subclass) \
-        spin_lock_irqsave(lock, flags)
 
-#endif
+#define raw_spin_lock_irqsave_nested(lock, flags, subclass)     \
+        raw_spin_lock_irqsave(lock, flags)
 
-#define spin_lock_irq(lock)             _spin_lock_irq(lock)
-#define spin_lock_bh(lock)              _spin_lock_bh(lock)
-#define read_lock_irq(lock)             _read_lock_irq(lock)
-#define read_lock_bh(lock)              _read_lock_bh(lock)
-#define write_lock_irq(lock)            _write_lock_irq(lock)
-#define write_lock_bh(lock)             _write_lock_bh(lock)
-#define spin_unlock(lock)               _spin_unlock(lock)
-#define read_unlock(lock)               _read_unlock(lock)
-#define write_unlock(lock)              _write_unlock(lock)
-#define spin_unlock_irq(lock)           _spin_unlock_irq(lock)
-#define read_unlock_irq(lock)           _read_unlock_irq(lock)
-#define write_unlock_irq(lock)          _write_unlock_irq(lock)
-
-#define spin_unlock_irqrestore(lock, flags)             \
-        do {                                            \
-                typecheck(unsigned long, flags);        \
-                _spin_unlock_irqrestore(lock, flags);   \
-        } while (0)
-#define spin_unlock_bh(lock)            _spin_unlock_bh(lock)
+#endif
 
-#define read_unlock_irqrestore(lock, flags)             \
-        do {                                            \
-                typecheck(unsigned long, flags);        \
-                _read_unlock_irqrestore(lock, flags);   \
-        } while (0)
-#define read_unlock_bh(lock)            _read_unlock_bh(lock)
+#define raw_spin_lock_irq(lock)         _raw_spin_lock_irq(lock)
+#define raw_spin_lock_bh(lock)          _raw_spin_lock_bh(lock)
+#define raw_spin_unlock(lock)           _raw_spin_unlock(lock)
+#define raw_spin_unlock_irq(lock)       _raw_spin_unlock_irq(lock)
 
-#define write_unlock_irqrestore(lock, flags)            \
-        do {                                            \
-                typecheck(unsigned long, flags);        \
-                _write_unlock_irqrestore(lock, flags);  \
+#define raw_spin_unlock_irqrestore(lock, flags)         \
+        do {                                                    \
+                typecheck(unsigned long, flags);                \
+                _raw_spin_unlock_irqrestore(lock, flags);       \
         } while (0)
-#define write_unlock_bh(lock)           _write_unlock_bh(lock)
+#define raw_spin_unlock_bh(lock)        _raw_spin_unlock_bh(lock)
 
-#define spin_trylock_bh(lock)   __cond_lock(lock, _spin_trylock_bh(lock))
+#define raw_spin_trylock_bh(lock) \
+        __cond_lock(lock, _raw_spin_trylock_bh(lock))
 
-#define spin_trylock_irq(lock) \
+#define raw_spin_trylock_irq(lock) \
 ({ \
         local_irq_disable(); \
-        spin_trylock(lock) ? \
+        raw_spin_trylock(lock) ? \
         1 : ({ local_irq_enable(); 0;  }); \
 })
 
-#define spin_trylock_irqsave(lock, flags) \
+#define raw_spin_trylock_irqsave(lock, flags) \
 ({ \
         local_irq_save(flags); \
-        spin_trylock(lock) ? \
+        raw_spin_trylock(lock) ? \
         1 : ({ local_irq_restore(flags); 0; }); \
 })
 
-#define write_trylock_irqsave(lock, flags) \
-({ \
-        local_irq_save(flags); \
-        write_trylock(lock) ? \
-        1 : ({ local_irq_restore(flags); 0; }); \
+/**
+ * raw_spin_can_lock - would raw_spin_trylock() succeed?
+ * @lock: the spinlock in question.
+ */
+#define raw_spin_can_lock(lock) (!raw_spin_is_locked(lock))
+
+/* Include rwlock functions */
+#include <linux/rwlock.h>
+
+/*
+ * Pull the _spin_*()/_read_*()/_write_*() functions/declarations:
+ */
+#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
+# include <linux/spinlock_api_smp.h>
+#else
+# include <linux/spinlock_api_up.h>
+#endif
+
+/*
+ * Map the spin_lock functions to the raw variants for PREEMPT_RT=n
+ */
+
+static inline raw_spinlock_t *spinlock_check(spinlock_t *lock)
+{
+        return &lock->rlock;
+}
+
+#define spin_lock_init(_lock)                           \
+do {                                                    \
+        spinlock_check(_lock);                          \
+        raw_spin_lock_init(&(_lock)->rlock);            \
+} while (0)
+
+static inline void spin_lock(spinlock_t *lock)
+{
+        raw_spin_lock(&lock->rlock);
+}
+
+static inline void spin_lock_bh(spinlock_t *lock)
+{
+        raw_spin_lock_bh(&lock->rlock);
+}
+
+static inline int spin_trylock(spinlock_t *lock)
+{
+        return raw_spin_trylock(&lock->rlock);
+}
+
+#define spin_lock_nested(lock, subclass)                        \
+do {                                                            \
+        raw_spin_lock_nested(spinlock_check(lock), subclass);   \
+} while (0)
+
+#define spin_lock_nest_lock(lock, nest_lock)                            \
+do {                                                                    \
+        raw_spin_lock_nest_lock(spinlock_check(lock), nest_lock);       \
+} while (0)
+
+static inline void spin_lock_irq(spinlock_t *lock)
+{
+        raw_spin_lock_irq(&lock->rlock);
+}
+
+#define spin_lock_irqsave(lock, flags)                          \
+do {                                                            \
+        raw_spin_lock_irqsave(spinlock_check(lock), flags);     \
+} while (0)
+
+#define spin_lock_irqsave_nested(lock, flags, subclass)                 \
+do {                                                                    \
+        raw_spin_lock_irqsave_nested(spinlock_check(lock), flags, subclass); \
+} while (0)
+
+static inline void spin_unlock(spinlock_t *lock)
+{
+        raw_spin_unlock(&lock->rlock);
+}
+
+static inline void spin_unlock_bh(spinlock_t *lock)
+{
+        raw_spin_unlock_bh(&lock->rlock);
+}
+
+static inline void spin_unlock_irq(spinlock_t *lock)
+{
+        raw_spin_unlock_irq(&lock->rlock);
+}
+
+static inline void spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags)
+{
+        raw_spin_unlock_irqrestore(&lock->rlock, flags);
+}
+
+static inline int spin_trylock_bh(spinlock_t *lock)
+{
+        return raw_spin_trylock_bh(&lock->rlock);
+}
+
+static inline int spin_trylock_irq(spinlock_t *lock)
+{
+        return raw_spin_trylock_irq(&lock->rlock);
+}
+
+#define spin_trylock_irqsave(lock, flags)                       \
+({                                                              \
+        raw_spin_trylock_irqsave(spinlock_check(lock), flags); \
 })
 
+static inline void spin_unlock_wait(spinlock_t *lock)
+{
+        raw_spin_unlock_wait(&lock->rlock);
+}
+
+static inline int spin_is_locked(spinlock_t *lock)
+{
+        return raw_spin_is_locked(&lock->rlock);
+}
+
+static inline int spin_is_contended(spinlock_t *lock)
+{
+        return raw_spin_is_contended(&lock->rlock);
+}
+
+static inline int spin_can_lock(spinlock_t *lock)
+{
+        return raw_spin_can_lock(&lock->rlock);
+}
+
+static inline void assert_spin_locked(spinlock_t *lock)
+{
+        assert_raw_spin_locked(&lock->rlock);
+}
+
 /*
  * Pull the atomic_t declaration:
  * (asm-mips/atomic.h needs above definitions)
@@ -329,19 +393,4 @@ extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock);
 #define atomic_dec_and_lock(atomic, lock) \
                 __cond_lock(lock, _atomic_dec_and_lock(atomic, lock))
 
-/**
- * spin_can_lock - would spin_trylock() succeed?
- * @lock: the spinlock in question.
- */
-#define spin_can_lock(lock)     (!spin_is_locked(lock))
-
-/*
- * Pull the _spin_*()/_read_*()/_write_*() functions/declarations:
- */
-#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
-# include <linux/spinlock_api_smp.h>
-#else
-# include <linux/spinlock_api_up.h>
-#endif
-
 #endif /* __LINUX_SPINLOCK_H */
diff --git a/include/linux/spinlock_api_smp.h b/include/linux/spinlock_api_smp.h
index 8264a7f459bc..e253ccd7a604 100644
--- a/include/linux/spinlock_api_smp.h
+++ b/include/linux/spinlock_api_smp.h
@@ -17,165 +17,76 @@
 
 int in_lock_functions(unsigned long addr);
 
-#define assert_spin_locked(x)   BUG_ON(!spin_is_locked(x))
-
-void __lockfunc _spin_lock(spinlock_t *lock)            __acquires(lock);
-void __lockfunc _spin_lock_nested(spinlock_t *lock, int subclass)
-                                                        __acquires(lock);
-void __lockfunc _spin_lock_nest_lock(spinlock_t *lock, struct lockdep_map *map)
-                                                        __acquires(lock);
-void __lockfunc _read_lock(rwlock_t *lock)              __acquires(lock);
-void __lockfunc _write_lock(rwlock_t *lock)             __acquires(lock);
-void __lockfunc _spin_lock_bh(spinlock_t *lock)         __acquires(lock);
-void __lockfunc _read_lock_bh(rwlock_t *lock)           __acquires(lock);
-void __lockfunc _write_lock_bh(rwlock_t *lock)          __acquires(lock);
-void __lockfunc _spin_lock_irq(spinlock_t *lock)        __acquires(lock);
-void __lockfunc _read_lock_irq(rwlock_t *lock)          __acquires(lock);
-void __lockfunc _write_lock_irq(rwlock_t *lock)         __acquires(lock);
-unsigned long __lockfunc _spin_lock_irqsave(spinlock_t *lock)
-                                                        __acquires(lock);
-unsigned long __lockfunc _spin_lock_irqsave_nested(spinlock_t *lock, int subclass)
-                                                        __acquires(lock);
-unsigned long __lockfunc _read_lock_irqsave(rwlock_t *lock)
-                                                        __acquires(lock);
-unsigned long __lockfunc _write_lock_irqsave(rwlock_t *lock)
-                                                        __acquires(lock);
-int __lockfunc _spin_trylock(spinlock_t *lock);
-int __lockfunc _read_trylock(rwlock_t *lock);
-int __lockfunc _write_trylock(rwlock_t *lock);
-int __lockfunc _spin_trylock_bh(spinlock_t *lock);
-void __lockfunc _spin_unlock(spinlock_t *lock)          __releases(lock);
-void __lockfunc _read_unlock(rwlock_t *lock)            __releases(lock);
-void __lockfunc _write_unlock(rwlock_t *lock)           __releases(lock);
-void __lockfunc _spin_unlock_bh(spinlock_t *lock)       __releases(lock);
-void __lockfunc _read_unlock_bh(rwlock_t *lock)         __releases(lock);
-void __lockfunc _write_unlock_bh(rwlock_t *lock)        __releases(lock);
-void __lockfunc _spin_unlock_irq(spinlock_t *lock)      __releases(lock);
-void __lockfunc _read_unlock_irq(rwlock_t *lock)        __releases(lock);
-void __lockfunc _write_unlock_irq(rwlock_t *lock)       __releases(lock);
-void __lockfunc _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags)
-                                                        __releases(lock);
-void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
-                                                        __releases(lock);
-void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
-                                                        __releases(lock);
+#define assert_raw_spin_locked(x)       BUG_ON(!raw_spin_is_locked(x))
+
+void __lockfunc _raw_spin_lock(raw_spinlock_t *lock)            __acquires(lock);
+void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass)
+                                                                __acquires(lock);
+void __lockfunc
+_raw_spin_lock_nest_lock(raw_spinlock_t *lock, struct lockdep_map *map)
+                                                                __acquires(lock);
+void __lockfunc _raw_spin_lock_bh(raw_spinlock_t *lock)         __acquires(lock);
+void __lockfunc _raw_spin_lock_irq(raw_spinlock_t *lock)
+                                                                __acquires(lock);
+
+unsigned long __lockfunc _raw_spin_lock_irqsave(raw_spinlock_t *lock)
+                                                                __acquires(lock);
+unsigned long __lockfunc
+_raw_spin_lock_irqsave_nested(raw_spinlock_t *lock, int subclass)
+                                                                __acquires(lock);
+int __lockfunc _raw_spin_trylock(raw_spinlock_t *lock);
+int __lockfunc _raw_spin_trylock_bh(raw_spinlock_t *lock);
+void __lockfunc _raw_spin_unlock(raw_spinlock_t *lock)          __releases(lock);
+void __lockfunc _raw_spin_unlock_bh(raw_spinlock_t *lock)       __releases(lock);
+void __lockfunc _raw_spin_unlock_irq(raw_spinlock_t *lock)      __releases(lock);
+void __lockfunc
+_raw_spin_unlock_irqrestore(raw_spinlock_t *lock, unsigned long flags)
+                                                                __releases(lock);
 
 #ifdef CONFIG_INLINE_SPIN_LOCK
-#define _spin_lock(lock) __spin_lock(lock)
-#endif
-
-#ifdef CONFIG_INLINE_READ_LOCK
-#define _read_lock(lock) __read_lock(lock)
-#endif
-
-#ifdef CONFIG_INLINE_WRITE_LOCK
-#define _write_lock(lock) __write_lock(lock)
+#define _raw_spin_lock(lock) __raw_spin_lock(lock)
 #endif
 
 #ifdef CONFIG_INLINE_SPIN_LOCK_BH
-#define _spin_lock_bh(lock) __spin_lock_bh(lock)
-#endif
-
-#ifdef CONFIG_INLINE_READ_LOCK_BH
-#define _read_lock_bh(lock) __read_lock_bh(lock)
-#endif
-
-#ifdef CONFIG_INLINE_WRITE_LOCK_BH
-#define _write_lock_bh(lock) __write_lock_bh(lock)
+#define _raw_spin_lock_bh(lock) __raw_spin_lock_bh(lock)
 #endif
 
 #ifdef CONFIG_INLINE_SPIN_LOCK_IRQ
-#define _spin_lock_irq(lock) __spin_lock_irq(lock)
-#endif
-
-#ifdef CONFIG_INLINE_READ_LOCK_IRQ
-#define _read_lock_irq(lock) __read_lock_irq(lock)
-#endif
-
-#ifdef CONFIG_INLINE_WRITE_LOCK_IRQ
-#define _write_lock_irq(lock) __write_lock_irq(lock)
+#define _raw_spin_lock_irq(lock) __raw_spin_lock_irq(lock)
 #endif
 
 #ifdef CONFIG_INLINE_SPIN_LOCK_IRQSAVE
-#define _spin_lock_irqsave(lock) __spin_lock_irqsave(lock)
-#endif
-
-#ifdef CONFIG_INLINE_READ_LOCK_IRQSAVE
-#define _read_lock_irqsave(lock) __read_lock_irqsave(lock)
-#endif
-
-#ifdef CONFIG_INLINE_WRITE_LOCK_IRQSAVE
-#define _write_lock_irqsave(lock) __write_lock_irqsave(lock)
+#define _raw_spin_lock_irqsave(lock) __raw_spin_lock_irqsave(lock)
 #endif
 
 #ifdef CONFIG_INLINE_SPIN_TRYLOCK
-#define _spin_trylock(lock) __spin_trylock(lock)
-#endif
-
-#ifdef CONFIG_INLINE_READ_TRYLOCK
-#define _read_trylock(lock) __read_trylock(lock)
-#endif
-
-#ifdef CONFIG_INLINE_WRITE_TRYLOCK
-#define _write_trylock(lock) __write_trylock(lock)
+#define _raw_spin_trylock(lock) __raw_spin_trylock(lock)
 #endif
 
 #ifdef CONFIG_INLINE_SPIN_TRYLOCK_BH
-#define _spin_trylock_bh(lock) __spin_trylock_bh(lock)
+#define _raw_spin_trylock_bh(lock) __raw_spin_trylock_bh(lock)
 #endif
 
 #ifdef CONFIG_INLINE_SPIN_UNLOCK
-#define _spin_unlock(lock) __spin_unlock(lock)
-#endif
-
-#ifdef CONFIG_INLINE_READ_UNLOCK
-#define _read_unlock(lock) __read_unlock(lock)
-#endif
-
-#ifdef CONFIG_INLINE_WRITE_UNLOCK
-#define _write_unlock(lock) __write_unlock(lock)
+#define _raw_spin_unlock(lock) __raw_spin_unlock(lock)
 #endif
 
 #ifdef CONFIG_INLINE_SPIN_UNLOCK_BH
-#define _spin_unlock_bh(lock) __spin_unlock_bh(lock)
-#endif
-
-#ifdef CONFIG_INLINE_READ_UNLOCK_BH
-#define _read_unlock_bh(lock) __read_unlock_bh(lock)
-#endif
-
-#ifdef CONFIG_INLINE_WRITE_UNLOCK_BH
-#define _write_unlock_bh(lock) __write_unlock_bh(lock)
+#define _raw_spin_unlock_bh(lock) __raw_spin_unlock_bh(lock)
 #endif
 
 #ifdef CONFIG_INLINE_SPIN_UNLOCK_IRQ
-#define _spin_unlock_irq(lock) __spin_unlock_irq(lock)
-#endif
-
-#ifdef CONFIG_INLINE_READ_UNLOCK_IRQ
-#define _read_unlock_irq(lock) __read_unlock_irq(lock)
-#endif
-
-#ifdef CONFIG_INLINE_WRITE_UNLOCK_IRQ
-#define _write_unlock_irq(lock) __write_unlock_irq(lock)
+#define _raw_spin_unlock_irq(lock) __raw_spin_unlock_irq(lock)
 #endif
 
 #ifdef CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE
-#define _spin_unlock_irqrestore(lock, flags) __spin_unlock_irqrestore(lock, flags)
-#endif
-
-#ifdef CONFIG_INLINE_READ_UNLOCK_IRQRESTORE
-#define _read_unlock_irqrestore(lock, flags) __read_unlock_irqrestore(lock, flags)
-#endif
-
-#ifdef CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE
-#define _write_unlock_irqrestore(lock, flags) __write_unlock_irqrestore(lock, flags)
+#define _raw_spin_unlock_irqrestore(lock, flags) __raw_spin_unlock_irqrestore(lock, flags)
 #endif
 
-static inline int __spin_trylock(spinlock_t *lock)
+static inline int __raw_spin_trylock(raw_spinlock_t *lock)
 {
         preempt_disable();
-        if (_raw_spin_trylock(lock)) {
+        if (do_raw_spin_trylock(lock)) {
                 spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
                 return 1;
         }
@@ -183,28 +94,6 @@ static inline int __spin_trylock(spinlock_t *lock)
         return 0;
 }
 
-static inline int __read_trylock(rwlock_t *lock)
-{
-        preempt_disable();
-        if (_raw_read_trylock(lock)) {
-                rwlock_acquire_read(&lock->dep_map, 0, 1, _RET_IP_);
-                return 1;
-        }
-        preempt_enable();
-        return 0;
-}
-
-static inline int __write_trylock(rwlock_t *lock)
-{
-        preempt_disable();
-        if (_raw_write_trylock(lock)) {
-                rwlock_acquire(&lock->dep_map, 0, 1, _RET_IP_);
-                return 1;
-        }
-        preempt_enable();
-        return 0;
-}
-
 /*
  * If lockdep is enabled then we use the non-preemption spin-ops
  * even on CONFIG_PREEMPT, because lockdep assumes that interrupts are
@@ -212,14 +101,7 @@ static inline int __write_trylock(rwlock_t *lock)
  */
 #if !defined(CONFIG_GENERIC_LOCKBREAK) || defined(CONFIG_DEBUG_LOCK_ALLOC)
 
-static inline void __read_lock(rwlock_t *lock)
-{
-        preempt_disable();
-        rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
-        LOCK_CONTENDED(lock, _raw_read_trylock, _raw_read_lock);
-}
-
-static inline unsigned long __spin_lock_irqsave(spinlock_t *lock)
+static inline unsigned long __raw_spin_lock_irqsave(raw_spinlock_t *lock)
 {
         unsigned long flags;
 
@@ -228,205 +110,79 @@ static inline unsigned long __spin_lock_irqsave(spinlock_t *lock)
         spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
         /*
          * On lockdep we dont want the hand-coded irq-enable of
-         * _raw_spin_lock_flags() code, because lockdep assumes
+         * do_raw_spin_lock_flags() code, because lockdep assumes
          * that interrupts are not re-enabled during lock-acquire:
          */
 #ifdef CONFIG_LOCKDEP
-        LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock);
+        LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
 #else
-        _raw_spin_lock_flags(lock, &flags);
+        do_raw_spin_lock_flags(lock, &flags);
 #endif
         return flags;
 }
 
-static inline void __spin_lock_irq(spinlock_t *lock)
+static inline void __raw_spin_lock_irq(raw_spinlock_t *lock)
 {
         local_irq_disable();
         preempt_disable();
         spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
-        LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock);
+        LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
 }
 
-static inline void __spin_lock_bh(spinlock_t *lock)
+static inline void __raw_spin_lock_bh(raw_spinlock_t *lock)
 {
         local_bh_disable();
         preempt_disable();
         spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
-        LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock);
-}
-
-static inline unsigned long __read_lock_irqsave(rwlock_t *lock)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        preempt_disable();
-        rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
-        LOCK_CONTENDED_FLAGS(lock, _raw_read_trylock, _raw_read_lock,
-                             _raw_read_lock_flags, &flags);
-        return flags;
-}
-
-static inline void __read_lock_irq(rwlock_t *lock)
-{
-        local_irq_disable();
-        preempt_disable();
-        rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
-        LOCK_CONTENDED(lock, _raw_read_trylock, _raw_read_lock);
-}
-
-static inline void __read_lock_bh(rwlock_t *lock)
-{
-        local_bh_disable();
-        preempt_disable();
-        rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
-        LOCK_CONTENDED(lock, _raw_read_trylock, _raw_read_lock);
-}
-
-static inline unsigned long __write_lock_irqsave(rwlock_t *lock)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        preempt_disable();
-        rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
-        LOCK_CONTENDED_FLAGS(lock, _raw_write_trylock, _raw_write_lock,
-                             _raw_write_lock_flags, &flags);
-        return flags;
-}
-
-static inline void __write_lock_irq(rwlock_t *lock)
-{
-        local_irq_disable();
-        preempt_disable();
-        rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
-        LOCK_CONTENDED(lock, _raw_write_trylock, _raw_write_lock);
+        LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
 }
 
-static inline void __write_lock_bh(rwlock_t *lock)
-{
-        local_bh_disable();
-        preempt_disable();
-        rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
-        LOCK_CONTENDED(lock, _raw_write_trylock, _raw_write_lock);
-}
-
-static inline void __spin_lock(spinlock_t *lock)
+static inline void __raw_spin_lock(raw_spinlock_t *lock)
 {
         preempt_disable();
         spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
-        LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock);
-}
-
-static inline void __write_lock(rwlock_t *lock)
-{
-        preempt_disable();
-        rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
-        LOCK_CONTENDED(lock, _raw_write_trylock, _raw_write_lock);
+        LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
 }
 
 #endif /* CONFIG_PREEMPT */
 
-static inline void __spin_unlock(spinlock_t *lock)
+static inline void __raw_spin_unlock(raw_spinlock_t *lock)
 {
         spin_release(&lock->dep_map, 1, _RET_IP_);
-        _raw_spin_unlock(lock);
-        preempt_enable();
-}
-
-static inline void __write_unlock(rwlock_t *lock)
-{
-        rwlock_release(&lock->dep_map, 1, _RET_IP_);
-        _raw_write_unlock(lock);
-        preempt_enable();
-}
-
-static inline void __read_unlock(rwlock_t *lock)
-{
-        rwlock_release(&lock->dep_map, 1, _RET_IP_);
-        _raw_read_unlock(lock);
+        do_raw_spin_unlock(lock);
         preempt_enable();
 }
 
-static inline void __spin_unlock_irqrestore(spinlock_t *lock,
+static inline void __raw_spin_unlock_irqrestore(raw_spinlock_t *lock,
                                             unsigned long flags)
 {
         spin_release(&lock->dep_map, 1, _RET_IP_);
-        _raw_spin_unlock(lock);
+        do_raw_spin_unlock(lock);
         local_irq_restore(flags);
         preempt_enable();
 }
 
-static inline void __spin_unlock_irq(spinlock_t *lock)
+static inline void __raw_spin_unlock_irq(raw_spinlock_t *lock)
 {
         spin_release(&lock->dep_map, 1, _RET_IP_);
-        _raw_spin_unlock(lock);
+        do_raw_spin_unlock(lock);
         local_irq_enable();
         preempt_enable();
 }
 
-static inline void __spin_unlock_bh(spinlock_t *lock)
+static inline void __raw_spin_unlock_bh(raw_spinlock_t *lock)
 {
         spin_release(&lock->dep_map, 1, _RET_IP_);
-        _raw_spin_unlock(lock);
-        preempt_enable_no_resched();
-        local_bh_enable_ip((unsigned long)__builtin_return_address(0));
-}
-
-static inline void __read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
-{
-        rwlock_release(&lock->dep_map, 1, _RET_IP_);
-        _raw_read_unlock(lock);
-        local_irq_restore(flags);
-        preempt_enable();
-}
-
-static inline void __read_unlock_irq(rwlock_t *lock)
-{
-        rwlock_release(&lock->dep_map, 1, _RET_IP_);
-        _raw_read_unlock(lock);
-        local_irq_enable();
-        preempt_enable();
-}
-
-static inline void __read_unlock_bh(rwlock_t *lock)
-{
-        rwlock_release(&lock->dep_map, 1, _RET_IP_);
-        _raw_read_unlock(lock);
+        do_raw_spin_unlock(lock);
         preempt_enable_no_resched();
         local_bh_enable_ip((unsigned long)__builtin_return_address(0));
 }
 
-static inline void __write_unlock_irqrestore(rwlock_t *lock,
-                                             unsigned long flags)
-{
-        rwlock_release(&lock->dep_map, 1, _RET_IP_);
-        _raw_write_unlock(lock);
-        local_irq_restore(flags);
-        preempt_enable();
-}
-
-static inline void __write_unlock_irq(rwlock_t *lock)
-{
-        rwlock_release(&lock->dep_map, 1, _RET_IP_);
-        _raw_write_unlock(lock);
-        local_irq_enable();
-        preempt_enable();
-}
-
-static inline void __write_unlock_bh(rwlock_t *lock)
-{
-        rwlock_release(&lock->dep_map, 1, _RET_IP_);
-        _raw_write_unlock(lock);
-        preempt_enable_no_resched();
-        local_bh_enable_ip((unsigned long)__builtin_return_address(0));
-}
-
-static inline int __spin_trylock_bh(spinlock_t *lock)
+static inline int __raw_spin_trylock_bh(raw_spinlock_t *lock)
 {
         local_bh_disable();
         preempt_disable();
-        if (_raw_spin_trylock(lock)) {
+        if (do_raw_spin_trylock(lock)) {
                 spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
                 return 1;
         }
@@ -435,4 +191,6 @@ static inline int __spin_trylock_bh(spinlock_t *lock)
         return 0;
 }
 
+#include <linux/rwlock_api_smp.h>
+
 #endif /* __LINUX_SPINLOCK_API_SMP_H */
diff --git a/include/linux/spinlock_api_up.h b/include/linux/spinlock_api_up.h
index 04e1d3164576..af1f47229e70 100644
--- a/include/linux/spinlock_api_up.h
+++ b/include/linux/spinlock_api_up.h
@@ -16,7 +16,7 @@
 
 #define in_lock_functions(ADDR)         0
 
-#define assert_spin_locked(lock)        do { (void)(lock); } while (0)
+#define assert_raw_spin_locked(lock)    do { (void)(lock); } while (0)
 
 /*
  * In the UP-nondebug case there's no real locking going on, so the
@@ -40,7 +40,8 @@
   do { preempt_enable(); __release(lock); (void)(lock); } while (0)
 
 #define __UNLOCK_BH(lock) \
-  do { preempt_enable_no_resched(); local_bh_enable(); __release(lock); (void)(lock); } while (0)
+  do { preempt_enable_no_resched(); local_bh_enable(); \
+          __release(lock); (void)(lock); } while (0)
 
 #define __UNLOCK_IRQ(lock) \
   do { local_irq_enable(); __UNLOCK(lock); } while (0)
@@ -48,34 +49,37 @@
 #define __UNLOCK_IRQRESTORE(lock, flags) \
   do { local_irq_restore(flags); __UNLOCK(lock); } while (0)
 
-#define _spin_lock(lock)                        __LOCK(lock)
-#define _spin_lock_nested(lock, subclass)       __LOCK(lock)
-#define _read_lock(lock)                        __LOCK(lock)
-#define _write_lock(lock)                       __LOCK(lock)
-#define _spin_lock_bh(lock)                     __LOCK_BH(lock)
-#define _read_lock_bh(lock)                     __LOCK_BH(lock)
-#define _write_lock_bh(lock)                    __LOCK_BH(lock)
-#define _spin_lock_irq(lock)                    __LOCK_IRQ(lock)
-#define _read_lock_irq(lock)                    __LOCK_IRQ(lock)
-#define _write_lock_irq(lock)                   __LOCK_IRQ(lock)
-#define _spin_lock_irqsave(lock, flags)         __LOCK_IRQSAVE(lock, flags)
-#define _read_lock_irqsave(lock, flags)         __LOCK_IRQSAVE(lock, flags)
-#define _write_lock_irqsave(lock, flags)        __LOCK_IRQSAVE(lock, flags)
-#define _spin_trylock(lock)                     ({ __LOCK(lock); 1; })
-#define _read_trylock(lock)                     ({ __LOCK(lock); 1; })
-#define _write_trylock(lock)                    ({ __LOCK(lock); 1; })
-#define _spin_trylock_bh(lock)                  ({ __LOCK_BH(lock); 1; })
-#define _spin_unlock(lock)                      __UNLOCK(lock)
-#define _read_unlock(lock)                      __UNLOCK(lock)
-#define _write_unlock(lock)                     __UNLOCK(lock)
-#define _spin_unlock_bh(lock)                   __UNLOCK_BH(lock)
-#define _write_unlock_bh(lock)                  __UNLOCK_BH(lock)
-#define _read_unlock_bh(lock)                   __UNLOCK_BH(lock)
-#define _spin_unlock_irq(lock)                  __UNLOCK_IRQ(lock)
-#define _read_unlock_irq(lock)                  __UNLOCK_IRQ(lock)
-#define _write_unlock_irq(lock)                 __UNLOCK_IRQ(lock)
-#define _spin_unlock_irqrestore(lock, flags)    __UNLOCK_IRQRESTORE(lock, flags)
-#define _read_unlock_irqrestore(lock, flags)    __UNLOCK_IRQRESTORE(lock, flags)
-#define _write_unlock_irqrestore(lock, flags)   __UNLOCK_IRQRESTORE(lock, flags)
+#define _raw_spin_lock(lock)                    __LOCK(lock)
+#define _raw_spin_lock_nested(lock, subclass)   __LOCK(lock)
+#define _raw_read_lock(lock)                    __LOCK(lock)
+#define _raw_write_lock(lock)                   __LOCK(lock)
+#define _raw_spin_lock_bh(lock)                 __LOCK_BH(lock)
+#define _raw_read_lock_bh(lock)                 __LOCK_BH(lock)
+#define _raw_write_lock_bh(lock)                __LOCK_BH(lock)
+#define _raw_spin_lock_irq(lock)                __LOCK_IRQ(lock)
+#define _raw_read_lock_irq(lock)                __LOCK_IRQ(lock)
+#define _raw_write_lock_irq(lock)               __LOCK_IRQ(lock)
+#define _raw_spin_lock_irqsave(lock, flags)     __LOCK_IRQSAVE(lock, flags)
+#define _raw_read_lock_irqsave(lock, flags)     __LOCK_IRQSAVE(lock, flags)
+#define _raw_write_lock_irqsave(lock, flags)    __LOCK_IRQSAVE(lock, flags)
+#define _raw_spin_trylock(lock)                 ({ __LOCK(lock); 1; })
+#define _raw_read_trylock(lock)                 ({ __LOCK(lock); 1; })
+#define _raw_write_trylock(lock)                        ({ __LOCK(lock); 1; })
+#define _raw_spin_trylock_bh(lock)              ({ __LOCK_BH(lock); 1; })
+#define _raw_spin_unlock(lock)                  __UNLOCK(lock)
+#define _raw_read_unlock(lock)                  __UNLOCK(lock)
+#define _raw_write_unlock(lock)                 __UNLOCK(lock)
+#define _raw_spin_unlock_bh(lock)               __UNLOCK_BH(lock)
+#define _raw_write_unlock_bh(lock)              __UNLOCK_BH(lock)
+#define _raw_read_unlock_bh(lock)               __UNLOCK_BH(lock)
+#define _raw_spin_unlock_irq(lock)              __UNLOCK_IRQ(lock)
+#define _raw_read_unlock_irq(lock)              __UNLOCK_IRQ(lock)
+#define _raw_write_unlock_irq(lock)             __UNLOCK_IRQ(lock)
+#define _raw_spin_unlock_irqrestore(lock, flags) \
+                                        __UNLOCK_IRQRESTORE(lock, flags)
+#define _raw_read_unlock_irqrestore(lock, flags) \
+                                        __UNLOCK_IRQRESTORE(lock, flags)
+#define _raw_write_unlock_irqrestore(lock, flags) \
+                                        __UNLOCK_IRQRESTORE(lock, flags)
 
 #endif /* __LINUX_SPINLOCK_API_UP_H */
diff --git a/include/linux/spinlock_types.h b/include/linux/spinlock_types.h
index 68d88f71f1a2..851b7783720d 100644
--- a/include/linux/spinlock_types.h
+++ b/include/linux/spinlock_types.h
@@ -17,8 +17,8 @@
 
 #include <linux/lockdep.h>
 
-typedef struct {
-        raw_spinlock_t raw_lock;
+typedef struct raw_spinlock {
+        arch_spinlock_t raw_lock;
 #ifdef CONFIG_GENERIC_LOCKBREAK
         unsigned int break_lock;
 #endif
@@ -29,26 +29,10 @@ typedef struct {
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
         struct lockdep_map dep_map;
 #endif
-} spinlock_t;
+} raw_spinlock_t;
 
 #define SPINLOCK_MAGIC          0xdead4ead
 
-typedef struct {
-        raw_rwlock_t raw_lock;
-#ifdef CONFIG_GENERIC_LOCKBREAK
-        unsigned int break_lock;
-#endif
-#ifdef CONFIG_DEBUG_SPINLOCK
-        unsigned int magic, owner_cpu;
-        void *owner;
-#endif
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-        struct lockdep_map dep_map;
-#endif
-} rwlock_t;
-
-#define RWLOCK_MAGIC            0xdeaf1eed
-
 #define SPINLOCK_OWNER_INIT     ((void *)-1L)
 
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
@@ -57,44 +41,56 @@ typedef struct {
 # define SPIN_DEP_MAP_INIT(lockname)
 #endif
 
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-# define RW_DEP_MAP_INIT(lockname)      .dep_map = { .name = #lockname }
+#ifdef CONFIG_DEBUG_SPINLOCK
+# define SPIN_DEBUG_INIT(lockname)              \
+        .magic = SPINLOCK_MAGIC,                \
+        .owner_cpu = -1,                        \
+        .owner = SPINLOCK_OWNER_INIT,
 #else
-# define RW_DEP_MAP_INIT(lockname)
+# define SPIN_DEBUG_INIT(lockname)
 #endif
 
-#ifdef CONFIG_DEBUG_SPINLOCK
-# define __SPIN_LOCK_UNLOCKED(lockname)                                 \
-        (spinlock_t)    {       .raw_lock = __RAW_SPIN_LOCK_UNLOCKED,   \
-                                .magic = SPINLOCK_MAGIC,                \
-                                .owner = SPINLOCK_OWNER_INIT,           \
-                                .owner_cpu = -1,                        \
-                                SPIN_DEP_MAP_INIT(lockname) }
-#define __RW_LOCK_UNLOCKED(lockname)                                    \
-        (rwlock_t)      {       .raw_lock = __RAW_RW_LOCK_UNLOCKED,     \
-                                .magic = RWLOCK_MAGIC,                  \
-                                .owner = SPINLOCK_OWNER_INIT,           \
-                                .owner_cpu = -1,                        \
-                                RW_DEP_MAP_INIT(lockname) }
-#else
-# define __SPIN_LOCK_UNLOCKED(lockname) \
-        (spinlock_t)    {       .raw_lock = __RAW_SPIN_LOCK_UNLOCKED,   \
-                                SPIN_DEP_MAP_INIT(lockname) }
-#define __RW_LOCK_UNLOCKED(lockname) \
-        (rwlock_t)      {       .raw_lock = __RAW_RW_LOCK_UNLOCKED,     \
-                                RW_DEP_MAP_INIT(lockname) }
+#define __RAW_SPIN_LOCK_INITIALIZER(lockname)   \
+        {                                       \
+        .raw_lock = __ARCH_SPIN_LOCK_UNLOCKED,  \
+        SPIN_DEBUG_INIT(lockname)               \
+        SPIN_DEP_MAP_INIT(lockname) }
+
+#define __RAW_SPIN_LOCK_UNLOCKED(lockname)      \
+        (raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname)
+
+#define DEFINE_RAW_SPINLOCK(x)  raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x)
+
+typedef struct spinlock {
+        union {
+                struct raw_spinlock rlock;
+
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+# define LOCK_PADSIZE (offsetof(struct raw_spinlock, dep_map))
+                struct {
+                        u8 __padding[LOCK_PADSIZE];
+                        struct lockdep_map dep_map;
+                };
 #endif
+        };
+} spinlock_t;
+
+#define __SPIN_LOCK_INITIALIZER(lockname) \
+        { { .rlock = __RAW_SPIN_LOCK_INITIALIZER(lockname) } }
+
+#define __SPIN_LOCK_UNLOCKED(lockname) \
+        (spinlock_t ) __SPIN_LOCK_INITIALIZER(lockname)
 
 /*
- * SPIN_LOCK_UNLOCKED and RW_LOCK_UNLOCKED defeat lockdep state tracking and
- * are hence deprecated.
- * Please use DEFINE_SPINLOCK()/DEFINE_RWLOCK() or
- * __SPIN_LOCK_UNLOCKED()/__RW_LOCK_UNLOCKED() as appropriate.
+ * SPIN_LOCK_UNLOCKED defeats lockdep state tracking and is hence
+ * deprecated.
+ * Please use DEFINE_SPINLOCK() or __SPIN_LOCK_UNLOCKED() as
+ * appropriate.
  */
 #define SPIN_LOCK_UNLOCKED      __SPIN_LOCK_UNLOCKED(old_style_spin_init)
-#define RW_LOCK_UNLOCKED        __RW_LOCK_UNLOCKED(old_style_rw_init)
 
 #define DEFINE_SPINLOCK(x)      spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
-#define DEFINE_RWLOCK(x)        rwlock_t x = __RW_LOCK_UNLOCKED(x)
+
+#include <linux/rwlock_types.h>
 
 #endif /* __LINUX_SPINLOCK_TYPES_H */
diff --git a/include/linux/spinlock_types_up.h b/include/linux/spinlock_types_up.h
index 04135b0e198e..c09b6407ae1b 100644
--- a/include/linux/spinlock_types_up.h
+++ b/include/linux/spinlock_types_up.h
@@ -16,22 +16,22 @@
 
 typedef struct {
         volatile unsigned int slock;
-} raw_spinlock_t;
+} arch_spinlock_t;
 
-#define __RAW_SPIN_LOCK_UNLOCKED { 1 }
+#define __ARCH_SPIN_LOCK_UNLOCKED { 1 }
 
 #else
 
-typedef struct { } raw_spinlock_t;
+typedef struct { } arch_spinlock_t;
 
-#define __RAW_SPIN_LOCK_UNLOCKED { }
+#define __ARCH_SPIN_LOCK_UNLOCKED { }
 
 #endif
 
 typedef struct {
         /* no debug version on UP */
-} raw_rwlock_t;
+} arch_rwlock_t;
 
-#define __RAW_RW_LOCK_UNLOCKED { }
+#define __ARCH_RW_LOCK_UNLOCKED { }
 
 #endif /* __LINUX_SPINLOCK_TYPES_UP_H */
diff --git a/include/linux/spinlock_up.h b/include/linux/spinlock_up.h
index d4841ed8215b..b14f6a91e19f 100644
--- a/include/linux/spinlock_up.h
+++ b/include/linux/spinlock_up.h
@@ -18,21 +18,21 @@
  */
 
 #ifdef CONFIG_DEBUG_SPINLOCK
-#define __raw_spin_is_locked(x)         ((x)->slock == 0)
+#define arch_spin_is_locked(x)          ((x)->slock == 0)
 
-static inline void __raw_spin_lock(raw_spinlock_t *lock)
+static inline void arch_spin_lock(arch_spinlock_t *lock)
 {
         lock->slock = 0;
 }
 
 static inline void
-__raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
+arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
 {
         local_irq_save(flags);
         lock->slock = 0;
 }
 
-static inline int __raw_spin_trylock(raw_spinlock_t *lock)
+static inline int arch_spin_trylock(arch_spinlock_t *lock)
 {
         char oldval = lock->slock;
 
@@ -41,7 +41,7 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock)
         return oldval > 0;
 }
 
-static inline void __raw_spin_unlock(raw_spinlock_t *lock)
+static inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
         lock->slock = 1;
 }
@@ -49,28 +49,28 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
 /*
  * Read-write spinlocks. No debug version.
  */
-#define __raw_read_lock(lock)           do { (void)(lock); } while (0)
-#define __raw_write_lock(lock)          do { (void)(lock); } while (0)
-#define __raw_read_trylock(lock)        ({ (void)(lock); 1; })
-#define __raw_write_trylock(lock)       ({ (void)(lock); 1; })
-#define __raw_read_unlock(lock)         do { (void)(lock); } while (0)
-#define __raw_write_unlock(lock)        do { (void)(lock); } while (0)
+#define arch_read_lock(lock)            do { (void)(lock); } while (0)
+#define arch_write_lock(lock)           do { (void)(lock); } while (0)
+#define arch_read_trylock(lock) ({ (void)(lock); 1; })
+#define arch_write_trylock(lock)        ({ (void)(lock); 1; })
+#define arch_read_unlock(lock)          do { (void)(lock); } while (0)
+#define arch_write_unlock(lock) do { (void)(lock); } while (0)
 
 #else /* DEBUG_SPINLOCK */
-#define __raw_spin_is_locked(lock)      ((void)(lock), 0)
+#define arch_spin_is_locked(lock)       ((void)(lock), 0)
 /* for sched.c and kernel_lock.c: */
-# define __raw_spin_lock(lock)          do { (void)(lock); } while (0)
-# define __raw_spin_lock_flags(lock, flags)     do { (void)(lock); } while (0)
-# define __raw_spin_unlock(lock)        do { (void)(lock); } while (0)
-# define __raw_spin_trylock(lock)       ({ (void)(lock); 1; })
+# define arch_spin_lock(lock)           do { (void)(lock); } while (0)
+# define arch_spin_lock_flags(lock, flags)      do { (void)(lock); } while (0)
+# define arch_spin_unlock(lock) do { (void)(lock); } while (0)
+# define arch_spin_trylock(lock)        ({ (void)(lock); 1; })
 #endif /* DEBUG_SPINLOCK */
 
-#define __raw_spin_is_contended(lock)   (((void)(lock), 0))
+#define arch_spin_is_contended(lock)    (((void)(lock), 0))
 
-#define __raw_read_can_lock(lock)       (((void)(lock), 1))
-#define __raw_write_can_lock(lock)      (((void)(lock), 1))
+#define arch_read_can_lock(lock)        (((void)(lock), 1))
+#define arch_write_can_lock(lock)       (((void)(lock), 1))
 
-#define __raw_spin_unlock_wait(lock) \
-                do { cpu_relax(); } while (__raw_spin_is_locked(lock))
+#define arch_spin_unlock_wait(lock) \
+                do { cpu_relax(); } while (arch_spin_is_locked(lock))
 
 #endif /* __LINUX_SPINLOCK_UP_H */
diff --git a/include/linux/string.h b/include/linux/string.h
index b8508868d5ad..651839a2a755 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -62,7 +62,15 @@ extern char * strnchr(const char *, size_t, int);
 #ifndef __HAVE_ARCH_STRRCHR
 extern char * strrchr(const char *,int);
 #endif
-extern char * __must_check strstrip(char *);
+extern char * __must_check skip_spaces(const char *);
+
+extern char *strim(char *);
+
+static inline __must_check char *strstrip(char *str)
+{
+        return strim(str);
+}
+
 #ifndef __HAVE_ARCH_STRSTR
 extern char * strstr(const char *,const char *);
 #endif
diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h
index 10709cbe96fd..c2786f20016f 100644
--- a/include/linux/sunrpc/debug.h
+++ b/include/linux/sunrpc/debug.h
@@ -28,9 +28,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/timer.h>
-#include <linux/workqueue.h>
-
 /*
  * Enable RPC debugging/profiling.
  */
diff --git a/include/linux/sunrpc/rpc_rdma.h b/include/linux/sunrpc/rpc_rdma.h
index 87b895d5c786..b78f16b1dea3 100644
--- a/include/linux/sunrpc/rpc_rdma.h
+++ b/include/linux/sunrpc/rpc_rdma.h
@@ -40,6 +40,8 @@
 #ifndef _LINUX_SUNRPC_RPC_RDMA_H
 #define _LINUX_SUNRPC_RPC_RDMA_H
 
+#include <linux/types.h>
+
 struct rpcrdma_segment {
         __be32 rs_handle;       /* Registered memory handle */
         __be32 rs_length;       /* Length of the chunk in bytes */
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 52e8cb0a7569..5a3085b9b394 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -29,7 +29,6 @@ struct svc_pool_stats {
         unsigned long   packets;
         unsigned long   sockets_queued;
         unsigned long   threads_woken;
-        unsigned long   overloads_avoided;
         unsigned long   threads_timedout;
 };
 
@@ -50,7 +49,6 @@ 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;
 
@@ -275,16 +273,11 @@ struct svc_rqst {
         struct auth_domain *    rq_client;      /* RPC peer info */
         struct auth_domain *    rq_gssclient;   /* "gss/"-style peer info */
         struct svc_cacherep *   rq_cacherep;    /* cache info */
-        struct knfsd_fh *       rq_reffh;       /* Referrence filehandle, used to
-                                                 * determine what device number
-                                                 * to report (real or virtual)
-                                                 */
         int                     rq_splice_ok;   /* turned off in gss privacy
                                                  * to prevent encrypting page
                                                  * 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 */
 };
 
 /*
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 4ec90019c1a4..a2602a8207a6 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -145,38 +145,43 @@ enum {
         SWP_DISCARDABLE = (1 << 2),     /* blkdev supports discard */
         SWP_DISCARDING  = (1 << 3),     /* now discarding a free cluster */
         SWP_SOLIDSTATE  = (1 << 4),     /* blkdev seeks are cheap */
+        SWP_CONTINUED   = (1 << 5),     /* swap_map has count continuation */
                                         /* add others here before... */
         SWP_SCANNING    = (1 << 8),     /* refcount in scan_swap_map */
 };
 
 #define SWAP_CLUSTER_MAX 32
 
-#define SWAP_MAP_MAX    0x7ffe
-#define SWAP_MAP_BAD    0x7fff
-#define SWAP_HAS_CACHE  0x8000          /* There is a swap cache of entry. */
-#define SWAP_COUNT_MASK (~SWAP_HAS_CACHE)
+#define SWAP_MAP_MAX    0x3e    /* Max duplication count, in first swap_map */
+#define SWAP_MAP_BAD    0x3f    /* Note pageblock is bad, in first swap_map */
+#define SWAP_HAS_CACHE  0x40    /* Flag page is cached, in first swap_map */
+#define SWAP_CONT_MAX   0x7f    /* Max count, in each swap_map continuation */
+#define COUNT_CONTINUED 0x80    /* See swap_map continuation for full count */
+#define SWAP_MAP_SHMEM  0xbf    /* Owned by shmem/tmpfs, in first swap_map */
+
 /*
  * The in-memory structure used to track swap areas.
  */
 struct swap_info_struct {
-        unsigned long flags;
-        int prio;                       /* swap priority */
-        int next;                       /* next entry on swap list */
-        struct file *swap_file;
-        struct block_device *bdev;
-        struct list_head extent_list;
-        struct swap_extent *curr_swap_extent;
-        unsigned short *swap_map;
-        unsigned int lowest_bit;
-        unsigned int highest_bit;
+        unsigned long   flags;          /* SWP_USED etc: see above */
+        signed short    prio;           /* swap priority of this type */
+        signed char     type;           /* strange name for an index */
+        signed char     next;           /* next type on the swap list */
+        unsigned int    max;            /* extent of the swap_map */
+        unsigned char *swap_map;        /* vmalloc'ed array of usage counts */
+        unsigned int lowest_bit;        /* index of first free in swap_map */
+        unsigned int highest_bit;       /* index of last free in swap_map */
+        unsigned int pages;             /* total of usable pages of swap */
+        unsigned int inuse_pages;       /* number of those currently in use */
+        unsigned int cluster_next;      /* likely index for next allocation */
+        unsigned int cluster_nr;        /* countdown to next cluster search */
         unsigned int lowest_alloc;      /* while preparing discard cluster */
         unsigned int highest_alloc;     /* while preparing discard cluster */
-        unsigned int cluster_next;
-        unsigned int cluster_nr;
-        unsigned int pages;
-        unsigned int max;
-        unsigned int inuse_pages;
-        unsigned int old_block_size;
+        struct swap_extent *curr_swap_extent;
+        struct swap_extent first_swap_extent;
+        struct block_device *bdev;      /* swap device or bdev of swap file */
+        struct file *swap_file;         /* seldom referenced */
+        unsigned int old_block_size;    /* seldom referenced */
 };
 
 struct swap_list_t {
@@ -273,6 +278,7 @@ extern int scan_unevictable_register_node(struct node *node);
 extern void scan_unevictable_unregister_node(struct node *node);
 
 extern int kswapd_run(int nid);
+extern void kswapd_stop(int nid);
 
 #ifdef CONFIG_MMU
 /* linux/mm/shmem.c */
@@ -309,17 +315,18 @@ extern long total_swap_pages;
 extern void si_swapinfo(struct sysinfo *);
 extern swp_entry_t get_swap_page(void);
 extern swp_entry_t get_swap_page_of_type(int);
-extern void swap_duplicate(swp_entry_t);
-extern int swapcache_prepare(swp_entry_t);
 extern int valid_swaphandles(swp_entry_t, unsigned long *);
+extern int add_swap_count_continuation(swp_entry_t, gfp_t);
+extern void swap_shmem_alloc(swp_entry_t);
+extern int swap_duplicate(swp_entry_t);
+extern int swapcache_prepare(swp_entry_t);
 extern void swap_free(swp_entry_t);
 extern void swapcache_free(swp_entry_t, struct page *page);
 extern int free_swap_and_cache(swp_entry_t);
 extern int swap_type_of(dev_t, sector_t, struct block_device **);
 extern unsigned int count_swap_pages(int, int);
-extern sector_t map_swap_page(struct swap_info_struct *, pgoff_t);
+extern sector_t map_swap_page(struct page *, struct block_device **);
 extern sector_t swapdev_block(int, pgoff_t);
-extern struct swap_info_struct *get_swap_info_struct(unsigned);
 extern int reuse_swap_page(struct page *);
 extern int try_to_free_swap(struct page *);
 struct backing_dev_info;
@@ -384,8 +391,18 @@ static inline void show_swap_cache_info(void)
 #define free_swap_and_cache(swp)        is_migration_entry(swp)
 #define swapcache_prepare(swp)          is_migration_entry(swp)
 
-static inline void swap_duplicate(swp_entry_t swp)
+static inline int add_swap_count_continuation(swp_entry_t swp, gfp_t gfp_mask)
 {
+        return 0;
+}
+
+static inline void swap_shmem_alloc(swp_entry_t swp)
+{
+}
+
+static inline int swap_duplicate(swp_entry_t swp)
+{
+        return 0;
 }
 
 static inline void swap_free(swp_entry_t swp)
diff --git a/include/linux/timb_gpio.h b/include/linux/timb_gpio.h
new file mode 100644
index 000000000000..ce456eaae861
--- /dev/null
+++ b/include/linux/timb_gpio.h
@@ -0,0 +1,37 @@
+/*
+ * timb_gpio.h timberdale FPGA GPIO driver, platform data definition
+ * Copyright (c) 2009 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.
+ *
+ * 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 _LINUX_TIMB_GPIO_H
+#define _LINUX_TIMB_GPIO_H
+
+/**
+ * struct timbgpio_platform_data - Platform data of the Timberdale GPIO driver
+ * @gpio_base           The number of the first GPIO pin, set to -1 for
+ *                      dynamic number allocation.
+ * @nr_pins             Number of pins that is supported by the hardware (1-32)
+ * @irq_base            If IRQ is supported by the hardware, this is the base
+ *                      number of IRQ:s. One IRQ per pin will be used. Set to
+ *                      -1 if IRQ:s is not supported.
+ */
+struct timbgpio_platform_data {
+        int gpio_base;
+        int nr_pins;
+        int irq_base;
+};
+
+#endif
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
index 1eb44a924e56..10db0102a890 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -134,6 +134,13 @@ static inline __must_check int tracehook_report_syscall_entry(
  */
 static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step)
 {
+        if (step) {
+                siginfo_t info;
+                user_single_step_siginfo(current, regs, &info);
+                force_sig_info(SIGTRAP, &info, current);
+                return;
+        }
+
         ptrace_report_syscall(regs);
 }
 
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 405a9035fe40..ef3a2947b102 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -350,8 +350,6 @@ extern void tty_write_flush(struct tty_struct *);
 
 extern struct ktermios tty_std_termios;
 
-extern int kmsg_redirect;
-
 extern void console_init(void);
 extern int vcs_init(void);
 
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 32b92298fd79..d4962a782b8a 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -294,6 +294,7 @@ struct v4l2_pix_format {
 
 /* Grey formats */
 #define V4L2_PIX_FMT_GREY    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
+#define V4L2_PIX_FMT_Y10     v4l2_fourcc('Y', '1', '0', ' ') /* 10  Greyscale     */
 #define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y', '1', '6', ' ') /* 16  Greyscale     */
 
 /* Palette formats */
@@ -329,7 +330,11 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
 #define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
 #define V4L2_PIX_FMT_SGRBG8  v4l2_fourcc('G', 'R', 'B', 'G') /*  8  GRGR.. BGBG.. */
-#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10bit raw bayer */
+#define V4L2_PIX_FMT_SRGGB8  v4l2_fourcc('R', 'G', 'G', 'B') /*  8  RGRG.. GBGB.. */
+#define V4L2_PIX_FMT_SBGGR10 v4l2_fourcc('B', 'G', '1', '0') /* 10  BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SGBRG10 v4l2_fourcc('G', 'B', '1', '0') /* 10  GBGB.. RGRG.. */
+#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10  GRGR.. BGBG.. */
+#define V4L2_PIX_FMT_SRGGB10 v4l2_fourcc('R', 'G', '1', '0') /* 10  RGRG.. GBGB.. */
         /* 10bit raw bayer DPCM compressed to 8 bits */
 #define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')
         /*
@@ -732,6 +737,99 @@ struct v4l2_standard {
 };
 
 /*
+ *      V I D E O       T I M I N G S   D V     P R E S E T
+ */
+struct v4l2_dv_preset {
+        __u32   preset;
+        __u32   reserved[4];
+};
+
+/*
+ *      D V     P R E S E T S   E N U M E R A T I O N
+ */
+struct v4l2_dv_enum_preset {
+        __u32   index;
+        __u32   preset;
+        __u8    name[32]; /* Name of the preset timing */
+        __u32   width;
+        __u32   height;
+        __u32   reserved[4];
+};
+
+/*
+ *      D V     P R E S E T     V A L U E S
+ */
+#define         V4L2_DV_INVALID         0
+#define         V4L2_DV_480P59_94       1 /* BT.1362 */
+#define         V4L2_DV_576P50          2 /* BT.1362 */
+#define         V4L2_DV_720P24          3 /* SMPTE 296M */
+#define         V4L2_DV_720P25          4 /* SMPTE 296M */
+#define         V4L2_DV_720P30          5 /* SMPTE 296M */
+#define         V4L2_DV_720P50          6 /* SMPTE 296M */
+#define         V4L2_DV_720P59_94       7 /* SMPTE 274M */
+#define         V4L2_DV_720P60          8 /* SMPTE 274M/296M */
+#define         V4L2_DV_1080I29_97      9 /* BT.1120/ SMPTE 274M */
+#define         V4L2_DV_1080I30         10 /* BT.1120/ SMPTE 274M */
+#define         V4L2_DV_1080I25         11 /* BT.1120 */
+#define         V4L2_DV_1080I50         12 /* SMPTE 296M */
+#define         V4L2_DV_1080I60         13 /* SMPTE 296M */
+#define         V4L2_DV_1080P24         14 /* SMPTE 296M */
+#define         V4L2_DV_1080P25         15 /* SMPTE 296M */
+#define         V4L2_DV_1080P30         16 /* SMPTE 296M */
+#define         V4L2_DV_1080P50         17 /* BT.1120 */
+#define         V4L2_DV_1080P60         18 /* BT.1120 */
+
+/*
+ *      D V     B T     T I M I N G S
+ */
+
+/* BT.656/BT.1120 timing data */
+struct v4l2_bt_timings {
+        __u32   width;          /* width in pixels */
+        __u32   height;         /* height in lines */
+        __u32   interlaced;     /* Interlaced or progressive */
+        __u32   polarities;     /* Positive or negative polarity */
+        __u64   pixelclock;     /* Pixel clock in HZ. Ex. 74.25MHz->74250000 */
+        __u32   hfrontporch;    /* Horizpontal front porch in pixels */
+        __u32   hsync;          /* Horizontal Sync length in pixels */
+        __u32   hbackporch;     /* Horizontal back porch in pixels */
+        __u32   vfrontporch;    /* Vertical front porch in pixels */
+        __u32   vsync;          /* Vertical Sync length in lines */
+        __u32   vbackporch;     /* Vertical back porch in lines */
+        __u32   il_vfrontporch; /* Vertical front porch for bottom field of
+                                 * interlaced field formats
+                                 */
+        __u32   il_vsync;       /* Vertical sync length for bottom field of
+                                 * interlaced field formats
+                                 */
+        __u32   il_vbackporch;  /* Vertical back porch for bottom field of
+                                 * interlaced field formats
+                                 */
+        __u32   reserved[16];
+} __attribute__ ((packed));
+
+/* Interlaced or progressive format */
+#define V4L2_DV_PROGRESSIVE     0
+#define V4L2_DV_INTERLACED      1
+
+/* Polarities. If bit is not set, it is assumed to be negative polarity */
+#define V4L2_DV_VSYNC_POS_POL   0x00000001
+#define V4L2_DV_HSYNC_POS_POL   0x00000002
+
+
+/* DV timings */
+struct v4l2_dv_timings {
+        __u32 type;
+        union {
+                struct v4l2_bt_timings  bt;
+                __u32   reserved[32];
+        };
+} __attribute__ ((packed));
+
+/* Values for the type field */
+#define V4L2_DV_BT_656_1120     0       /* BT.656/1120 timing type */
+
+/*
  *      V I D E O   I N P U T S
  */
 struct v4l2_input {
@@ -742,7 +840,8 @@ struct v4l2_input {
         __u32        tuner;             /*  Associated tuner */
         v4l2_std_id  std;
         __u32        status;
-        __u32        reserved[4];
+        __u32        capabilities;
+        __u32        reserved[3];
 };
 
 /*  Values for the 'type' field */
@@ -773,6 +872,11 @@ struct v4l2_input {
 #define V4L2_IN_ST_NO_ACCESS   0x02000000  /* Conditional access denied */
 #define V4L2_IN_ST_VTR         0x04000000  /* VTR time constant */
 
+/* capabilities flags */
+#define V4L2_IN_CAP_PRESETS             0x00000001 /* Supports S_DV_PRESET */
+#define V4L2_IN_CAP_CUSTOM_TIMINGS      0x00000002 /* Supports S_DV_TIMINGS */
+#define V4L2_IN_CAP_STD                 0x00000004 /* Supports S_STD */
+
 /*
  *      V I D E O   O U T P U T S
  */
@@ -783,13 +887,19 @@ struct v4l2_output {
         __u32        audioset;          /*  Associated audios (bitfield) */
         __u32        modulator;         /*  Associated modulator */
         v4l2_std_id  std;
-        __u32        reserved[4];
+        __u32        capabilities;
+        __u32        reserved[3];
 };
 /*  Values for the 'type' field */
 #define V4L2_OUTPUT_TYPE_MODULATOR              1
 #define V4L2_OUTPUT_TYPE_ANALOG                 2
 #define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY       3
 
+/* capabilities flags */
+#define V4L2_OUT_CAP_PRESETS            0x00000001 /* Supports S_DV_PRESET */
+#define V4L2_OUT_CAP_CUSTOM_TIMINGS     0x00000002 /* Supports S_DV_TIMINGS */
+#define V4L2_OUT_CAP_STD                0x00000004 /* Supports S_STD */
+
 /*
  *      C O N T R O L S
  */
@@ -1624,6 +1734,13 @@ struct v4l2_dbg_chip_ident {
 #endif
 
 #define VIDIOC_S_HW_FREQ_SEEK    _IOW('V', 82, struct v4l2_hw_freq_seek)
+#define VIDIOC_ENUM_DV_PRESETS  _IOWR('V', 83, struct v4l2_dv_enum_preset)
+#define VIDIOC_S_DV_PRESET      _IOWR('V', 84, struct v4l2_dv_preset)
+#define VIDIOC_G_DV_PRESET      _IOWR('V', 85, struct v4l2_dv_preset)
+#define VIDIOC_QUERY_DV_PRESET  _IOR('V',  86, struct v4l2_dv_preset)
+#define VIDIOC_S_DV_TIMINGS     _IOWR('V', 87, struct v4l2_dv_timings)
+#define VIDIOC_G_DV_TIMINGS     _IOWR('V', 88, struct v4l2_dv_timings)
+
 /* Reminder: when adding new ioctls please add support for them to
    drivers/media/video/v4l2-compat-ioctl32.c as well! */
 
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index d85889710f9b..ee03bba9c5df 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -40,6 +40,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
                 PGSCAN_ZONE_RECLAIM_FAILED,
 #endif
                 PGINODESTEAL, SLABS_SCANNED, KSWAPD_STEAL, KSWAPD_INODESTEAL,
+                KSWAPD_LOW_WMARK_HIT_QUICKLY, KSWAPD_HIGH_WMARK_HIT_QUICKLY,
+                KSWAPD_SKIP_CONGESTION_WAIT,
                 PAGEOUTRUN, ALLOCSTALL, PGROTATED,
 #ifdef CONFIG_HUGETLB_PAGE
                 HTLB_BUDDY_PGALLOC, HTLB_BUDDY_PGALLOC_FAIL,
diff --git a/include/linux/vt.h b/include/linux/vt.h
index 7ffa11f06232..3fb9944e50a6 100644
--- a/include/linux/vt.h
+++ b/include/linux/vt.h
@@ -84,4 +84,19 @@ struct vt_setactivate {
 
 #define VT_SETACTIVATE  0x560F  /* Activate and set the mode of a console */
 
+#ifdef CONFIG_VT_CONSOLE
+
+extern int vt_kmsg_redirect(int new);
+
+#else
+
+static inline int vt_kmsg_redirect(int new)
+{
+        return 0;
+}
+
+#endif
+
+#define vt_get_kmsg_redirect() vt_kmsg_redirect(-1)
+
 #endif /* _LINUX_VT_H */
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index e41a99ee353e..2c6af24b905e 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -26,26 +26,7 @@
 #include <linux/input.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
-#include <linux/spinlock.h>
-
-extern int media_ir_debug;    /* media_ir_debug level (0,1,2) */
-#define IR_dprintk(level, fmt, arg...)  if (media_ir_debug >= level) \
-        printk(KERN_DEBUG "%s: " fmt , __func__, ## arg)
-
-#define IR_TYPE_RC5     1
-#define IR_TYPE_PD      2 /* Pulse distance encoded IR */
-#define IR_TYPE_OTHER  99
-
-struct ir_scancode {
-        u16     scancode;
-        u32     keycode;
-};
-
-struct ir_scancode_table {
-        struct ir_scancode *scan;
-        int size;
-        spinlock_t lock;
-};
+#include <media/ir-core.h>
 
 #define RC5_START(x)    (((x)>>12)&3)
 #define RC5_TOGGLE(x)   (((x)>>11)&1)
@@ -56,8 +37,6 @@ struct ir_input_state {
         /* configuration */
         int                ir_type;
 
-        struct ir_scancode_table keytable;
-
         /* key info */
         u32                ir_key;      /* ir scancode */
         u32                keycode;     /* linux key code */
@@ -105,7 +84,7 @@ struct card_ir {
 /* Routines from ir-functions.c */
 
 int ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
-                   int ir_type, struct ir_scancode_table *ir_codes);
+                   int ir_type);
 void ir_input_nokey(struct input_dev *dev, struct ir_input_state *ir);
 void ir_input_keydown(struct input_dev *dev, struct ir_input_state *ir,
                       u32 ir_key);
@@ -118,19 +97,6 @@ u32  ir_rc5_decode(unsigned int code);
 void ir_rc5_timer_end(unsigned long data);
 void ir_rc5_timer_keyup(unsigned long data);
 
-/* Routines from ir-keytable.c */
-
-u32 ir_g_keycode_from_table(struct input_dev *input_dev,
-                            u32 scancode);
-
-int ir_set_keycode_table(struct input_dev *input_dev,
-                         struct ir_scancode_table *rc_tab);
-
-int ir_roundup_tablesize(int n_elems);
-int ir_copy_table(struct ir_scancode_table *destin,
-                 const struct ir_scancode_table *origin);
-void ir_input_free(struct input_dev *input_dev);
-
 /* scancode->keycode map tables from ir-keymaps.c */
 
 extern struct ir_scancode_table ir_codes_empty_table;
@@ -195,4 +161,5 @@ extern struct ir_scancode_table ir_codes_evga_indtube_table;
 extern struct ir_scancode_table ir_codes_terratec_cinergy_xs_table;
 extern struct ir_scancode_table ir_codes_videomate_s350_table;
 extern struct ir_scancode_table ir_codes_gadmei_rm008z_table;
+extern struct ir_scancode_table ir_codes_nec_terratec_cinergy_xs_table;
 #endif
diff --git a/include/media/ir-core.h b/include/media/ir-core.h
new file mode 100644
index 000000000000..299d201e1339
--- /dev/null
+++ b/include/media/ir-core.h
@@ -0,0 +1,62 @@
+/*
+ * Remote Controller core header
+ *
+ * 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.
+ */
+
+#ifndef _IR_CORE
+#define _IR_CORE
+
+#include <linux/input.h>
+#include <linux/spinlock.h>
+
+extern int ir_core_debug;
+#define IR_dprintk(level, fmt, arg...)  if (ir_core_debug >= level) \
+        printk(KERN_DEBUG "%s: " fmt , __func__, ## arg)
+
+enum ir_type {
+        IR_TYPE_UNKNOWN = 0,
+        IR_TYPE_RC5     = 1,
+        IR_TYPE_PD      = 2,             /* Pulse distance encoded IR */
+        IR_TYPE_NEC     = 3,
+        IR_TYPE_OTHER   = 99,
+};
+
+struct ir_scancode {
+        u16     scancode;
+        u32     keycode;
+};
+
+struct ir_scancode_table {
+        struct ir_scancode      *scan;
+        int                     size;
+        enum                    ir_type ir_type;
+        spinlock_t              lock;
+};
+
+struct ir_input_dev {
+        struct input_dev                *dev;
+        struct ir_scancode_table        rc_tab;
+};
+
+/* Routines from ir-keytable.c */
+
+u32 ir_g_keycode_from_table(struct input_dev *input_dev,
+                            u32 scancode);
+
+int ir_set_keycode_table(struct input_dev *input_dev,
+                         struct ir_scancode_table *rc_tab);
+
+int ir_roundup_tablesize(int n_elems);
+int ir_input_register(struct input_dev *dev,
+                      struct ir_scancode_table *ir_codes);
+void ir_input_unregister(struct input_dev *input_dev);
+
+#endif
diff --git a/include/media/mt9t112.h b/include/media/mt9t112.h
new file mode 100644
index 000000000000..a43c74ab05ec
--- /dev/null
+++ b/include/media/mt9t112.h
@@ -0,0 +1,30 @@
+/* mt9t112 Camera
+ *
+ * Copyright (C) 2009 Renesas Solutions Corp.
+ * Kuninori Morimoto <morimoto.kuninori@renesas.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 __MT9T112_H__
+#define __MT9T112_H__
+
+#define MT9T112_FLAG_PCLK_RISING_EDGE   (1 << 0)
+#define MT9T112_FLAG_DATAWIDTH_8        (1 << 1) /* default width is 10 */
+
+struct mt9t112_pll_divider {
+        u8 m, n;
+        u8 p1, p2, p3, p4, p5, p6, p7;
+};
+
+/*
+ * mt9t112 camera info
+ */
+struct mt9t112_camera_info {
+        u32 flags;
+        struct mt9t112_pll_divider divider;
+};
+
+#endif /* __MT9T112_H__ */
diff --git a/include/media/ov772x.h b/include/media/ov772x.h
index 30d9629198ef..14c77efd6a85 100644
--- a/include/media/ov772x.h
+++ b/include/media/ov772x.h
@@ -1,4 +1,5 @@
-/* ov772x Camera
+/*
+ * ov772x Camera
  *
  * Copyright (C) 2008 Renesas Solutions Corp.
  * Kuninori Morimoto <morimoto.kuninori@renesas.com>
@@ -54,7 +55,6 @@ struct ov772x_edge_ctrl {
 struct ov772x_camera_info {
         unsigned long          buswidth;
         unsigned long          flags;
-        struct soc_camera_link link;
         struct ov772x_edge_ctrl edgectrl;
 };
 
diff --git a/include/media/rj54n1cb0c.h b/include/media/rj54n1cb0c.h
new file mode 100644
index 000000000000..8ae3288ae925
--- /dev/null
+++ b/include/media/rj54n1cb0c.h
@@ -0,0 +1,19 @@
+/*
+ * RJ54N1CB0C Private data
+ *
+ * Copyright (C) 2009, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ *
+ * 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 __RJ54N1CB0C_H__
+#define __RJ54N1CB0C_H__
+
+struct rj54n1_pdata {
+        unsigned int    mclk_freq;
+        bool            ioctl_high;
+};
+
+#endif
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index eed5fccc83f3..4aeff96ff7d8 100644
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -108,8 +108,6 @@ struct saa7146_fh {
 
 struct saa7146_vv
 {
-        int vbi_minor;
-
         /* vbi capture */
         struct saa7146_dmaqueue         vbi_q;
         /* vbi workaround interrupt queue */
@@ -117,8 +115,6 @@ struct saa7146_vv
         int                             vbi_fieldcount;
         struct saa7146_fh               *vbi_streaming;
 
-        int video_minor;
-
         int                             video_status;
         struct saa7146_fh               *video_fh;
 
diff --git a/include/media/sh_mobile_ceu.h b/include/media/sh_mobile_ceu.h
index 0f3524cff435..b67747836878 100644
--- a/include/media/sh_mobile_ceu.h
+++ b/include/media/sh_mobile_ceu.h
@@ -3,6 +3,8 @@
 
 #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 */
+#define SH_CEU_FLAG_HSYNC_LOW           (1 << 2) /* default High if possible */
+#define SH_CEU_FLAG_VSYNC_LOW           (1 << 3) /* default High if possible */
 
 struct sh_mobile_ceu_info {
         unsigned long flags;
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 3d74e60032dd..dcc5b86bcb6c 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -24,18 +24,13 @@ struct soc_camera_device {
         struct device *pdev;            /* Platform device */
         s32 user_width;
         s32 user_height;
-        unsigned short width_min;
-        unsigned short height_min;
-        unsigned short y_skip_top;      /* Lines to skip at the top */
+        enum v4l2_colorspace colorspace;
         unsigned char iface;            /* Host number */
         unsigned char devnum;           /* Device number per host */
-        unsigned char buswidth;         /* See comment in .c */
         struct soc_camera_sense *sense; /* See comment in struct definition */
         struct soc_camera_ops *ops;
         struct video_device *vdev;
-        const struct soc_camera_data_format *current_fmt;
-        const struct soc_camera_data_format *formats;
-        int num_formats;
+        const struct soc_camera_format_xlate *current_fmt;
         struct soc_camera_format_xlate *user_formats;
         int num_user_formats;
         enum v4l2_field field;          /* Preserve field over close() */
@@ -107,6 +102,8 @@ struct soc_camera_link {
         int i2c_adapter_id;
         struct i2c_board_info *board_info;
         const char *module_name;
+        void *priv;
+
         /*
          * For non-I2C devices platform platform has to provide methods to
          * add a device to the system and to remove
@@ -162,23 +159,13 @@ static inline struct v4l2_subdev *soc_camera_to_subdev(
 int soc_camera_host_register(struct soc_camera_host *ici);
 void soc_camera_host_unregister(struct soc_camera_host *ici);
 
-const struct soc_camera_data_format *soc_camera_format_by_fourcc(
-        struct soc_camera_device *icd, unsigned int fourcc);
 const struct soc_camera_format_xlate *soc_camera_xlate_by_fourcc(
         struct soc_camera_device *icd, unsigned int fourcc);
 
-struct soc_camera_data_format {
-        const char *name;
-        unsigned int depth;
-        __u32 fourcc;
-        enum v4l2_colorspace colorspace;
-};
-
 /**
  * struct soc_camera_format_xlate - match between host and sensor formats
- * @cam_fmt: sensor format provided by the sensor
- * @host_fmt: host format after host translation from cam_fmt
- * @buswidth: bus width for this format
+ * @code: code of a sensor provided format
+ * @host_fmt: host format after host translation from code
  *
  * Host and sensor translation structure. Used in table of host and sensor
  * formats matchings in soc_camera_device. A host can override the generic list
@@ -186,9 +173,8 @@ struct soc_camera_data_format {
  * format setup.
  */
 struct soc_camera_format_xlate {
-        const struct soc_camera_data_format *cam_fmt;
-        const struct soc_camera_data_format *host_fmt;
-        unsigned char buswidth;
+        enum v4l2_mbus_pixelcode code;
+        const struct soc_mbus_pixelfmt *host_fmt;
 };
 
 struct soc_camera_ops {
diff --git a/include/media/soc_camera_platform.h b/include/media/soc_camera_platform.h
index bb70401b8141..0ecefe227b76 100644
--- a/include/media/soc_camera_platform.h
+++ b/include/media/soc_camera_platform.h
@@ -19,11 +19,10 @@ struct device;
 struct soc_camera_platform_info {
         const char *format_name;
         unsigned long format_depth;
-        struct v4l2_pix_format format;
+        struct v4l2_mbus_framefmt format;
         unsigned long bus_param;
         struct device *dev;
         int (*set_capture)(struct soc_camera_platform_info *info, int enable);
-        struct soc_camera_link link;
 };
 
 #endif /* __SOC_CAMERA_H__ */
diff --git a/include/media/soc_mediabus.h b/include/media/soc_mediabus.h
new file mode 100644
index 000000000000..037cd7be001e
--- /dev/null
+++ b/include/media/soc_mediabus.h
@@ -0,0 +1,65 @@
+/*
+ * SoC-camera Media Bus API extensions
+ *
+ * Copyright (C) 2009, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ *
+ * 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 SOC_MEDIABUS_H
+#define SOC_MEDIABUS_H
+
+#include <linux/videodev2.h>
+
+#include <media/v4l2-mediabus.h>
+
+/**
+ * enum soc_mbus_packing - data packing types on the media-bus
+ * @SOC_MBUS_PACKING_NONE:      no packing, bit-for-bit transfer to RAM
+ * @SOC_MBUS_PACKING_2X8_PADHI: 16 bits transferred in 2 8-bit samples, in the
+ *                              possibly incomplete byte high bits are padding
+ * @SOC_MBUS_PACKING_2X8_PADLO: as above, but low bits are padding
+ * @SOC_MBUS_PACKING_EXTEND16:  sample width (e.g., 10 bits) has to be extended
+ *                              to 16 bits
+ */
+enum soc_mbus_packing {
+        SOC_MBUS_PACKING_NONE,
+        SOC_MBUS_PACKING_2X8_PADHI,
+        SOC_MBUS_PACKING_2X8_PADLO,
+        SOC_MBUS_PACKING_EXTEND16,
+};
+
+/**
+ * enum soc_mbus_order - sample order on the media bus
+ * @SOC_MBUS_ORDER_LE:          least significant sample first
+ * @SOC_MBUS_ORDER_BE:          most significant sample first
+ */
+enum soc_mbus_order {
+        SOC_MBUS_ORDER_LE,
+        SOC_MBUS_ORDER_BE,
+};
+
+/**
+ * struct soc_mbus_pixelfmt - Data format on the media bus
+ * @name:               Name of the format
+ * @fourcc:             Fourcc code, that will be obtained if the data is
+ *                      stored in memory in the following way:
+ * @packing:            Type of sample-packing, that has to be used
+ * @order:              Sample order when storing in memory
+ * @bits_per_sample:    How many bits the bridge has to sample
+ */
+struct soc_mbus_pixelfmt {
+        const char              *name;
+        u32                     fourcc;
+        enum soc_mbus_packing   packing;
+        enum soc_mbus_order     order;
+        u8                      bits_per_sample;
+};
+
+const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc(
+        enum v4l2_mbus_pixelcode code);
+s32 soc_mbus_bytes_per_line(u32 width, const struct soc_mbus_pixelfmt *mf);
+
+#endif
diff --git a/include/media/tw9910.h b/include/media/tw9910.h
index 73231e7880d8..5e2895a05e6b 100644
--- a/include/media/tw9910.h
+++ b/include/media/tw9910.h
@@ -32,7 +32,6 @@ enum tw9910_mpout_pin {
 struct tw9910_video_info {
         unsigned long          buswidth;
         enum tw9910_mpout_pin  mpout;
-        struct soc_camera_link link;
 };
 
 
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 91942dbe64e3..6cc107d198a0 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -267,6 +267,8 @@ enum {
         V4L2_IDENT_MT9V022IX7ATC        = 45010, /* No way to detect "normal" I77ATx */
         V4L2_IDENT_MT9V022IX7ATM        = 45015, /* and "lead free" IA7ATx chips */
         V4L2_IDENT_MT9T031              = 45020,
+        V4L2_IDENT_MT9T111              = 45021,
+        V4L2_IDENT_MT9T112              = 45022,
         V4L2_IDENT_MT9V111              = 45031,
         V4L2_IDENT_MT9V112              = 45032,
 
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 1c25b10da34b..1c7b259f341c 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -212,5 +212,5 @@ void v4l_bound_align_image(unsigned int *w, unsigned int wmin,
                            unsigned int *h, unsigned int hmin,
                            unsigned int hmax, unsigned int halign,
                            unsigned int salign);
-
+int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info);
 #endif /* V4L2_COMMON_H_ */
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 73c9867d744c..2dee93892ea2 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -28,10 +28,10 @@ struct v4l2_ioctl_callbacks;
 struct video_device;
 struct v4l2_device;
 
-/* Flag to mark the video_device struct as unregistered.
-   Drivers can set this flag if they want to block all future
-   device access. It is set by video_unregister_device. */
-#define V4L2_FL_UNREGISTERED    (0)
+/* Flag to mark the video_device struct as registered.
+   Drivers can clear this flag if they want to block all future
+   device access. It is cleared by video_unregister_device. */
+#define V4L2_FL_REGISTERED      (0)
 
 struct v4l2_file_operations {
         struct module *owner;
@@ -96,9 +96,7 @@ struct video_device
 /* Register video devices. Note that if video_register_device fails,
    the release() callback of the video_device structure is *not* called, so
    the caller is responsible for freeing any data. Usually that means that
-   you call video_device_release() on failure.
-
-   Also note that vdev->minor is set to -1 if the registration failed. */
+   you call video_device_release() on failure. */
 int __must_check video_register_device(struct video_device *vdev, int type, int nr);
 
 /* Same as video_register_device, but no warning is issued if the desired
@@ -106,7 +104,7 @@ int __must_check video_register_device(struct video_device *vdev, int type, int
 int __must_check video_register_device_no_warn(struct video_device *vdev, int type, int nr);
 
 /* Unregister video devices. Will do nothing if vdev == NULL or
-   vdev->minor < 0. */
+   video_is_registered() returns false. */
 void video_unregister_device(struct video_device *vdev);
 
 /* helper functions to alloc/release struct video_device, the
@@ -141,9 +139,14 @@ static inline void *video_drvdata(struct file *file)
         return video_get_drvdata(video_devdata(file));
 }
 
-static inline int video_is_unregistered(struct video_device *vdev)
+static inline const char *video_device_node_name(struct video_device *vdev)
+{
+        return dev_name(&vdev->dev);
+}
+
+static inline int video_is_registered(struct video_device *vdev)
 {
-        return test_bit(V4L2_FL_UNREGISTERED, &vdev->flags);
+        return test_bit(V4L2_FL_REGISTERED, &vdev->flags);
 }
 
 #endif /* _V4L2_DEV_H */
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 7a4529defa88..e8ba0f2efbae 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -239,6 +239,21 @@ struct v4l2_ioctl_ops {
         int (*vidioc_enum_frameintervals) (struct file *file, void *fh,
                                            struct v4l2_frmivalenum *fival);
 
+        /* DV Timings IOCTLs */
+        int (*vidioc_enum_dv_presets) (struct file *file, void *fh,
+                                       struct v4l2_dv_enum_preset *preset);
+
+        int (*vidioc_s_dv_preset) (struct file *file, void *fh,
+                                   struct v4l2_dv_preset *preset);
+        int (*vidioc_g_dv_preset) (struct file *file, void *fh,
+                                   struct v4l2_dv_preset *preset);
+        int (*vidioc_query_dv_preset) (struct file *file, void *fh,
+                                        struct v4l2_dv_preset *qpreset);
+        int (*vidioc_s_dv_timings) (struct file *file, void *fh,
+                                    struct v4l2_dv_timings *timings);
+        int (*vidioc_g_dv_timings) (struct file *file, void *fh,
+                                    struct v4l2_dv_timings *timings);
+
         /* For other private ioctls */
         long (*vidioc_default)         (struct file *file, void *fh,
                                         int cmd, void *arg);
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
new file mode 100644
index 000000000000..0dbe02ada259
--- /dev/null
+++ b/include/media/v4l2-mediabus.h
@@ -0,0 +1,61 @@
+/*
+ * Media Bus API header
+ *
+ * Copyright (C) 2009, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ *
+ * 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 V4L2_MEDIABUS_H
+#define V4L2_MEDIABUS_H
+
+/*
+ * These pixel codes uniquely identify data formats on the media bus. Mostly
+ * they correspond to similarly named V4L2_PIX_FMT_* formats, format 0 is
+ * reserved, V4L2_MBUS_FMT_FIXED shall be used by host-client pairs, where the
+ * data format is fixed. Additionally, "2X8" means that one pixel is transferred
+ * in two 8-bit samples, "BE" or "LE" specify in which order those samples are
+ * transferred over the bus: "LE" means that the least significant bits are
+ * transferred first, "BE" means that the most significant bits are transferred
+ * first, and "PADHI" and "PADLO" define which bits - low or high, in the
+ * incomplete high byte, are filled with padding bits.
+ */
+enum v4l2_mbus_pixelcode {
+        V4L2_MBUS_FMT_FIXED = 1,
+        V4L2_MBUS_FMT_YUYV8_2X8_LE,
+        V4L2_MBUS_FMT_YVYU8_2X8_LE,
+        V4L2_MBUS_FMT_YUYV8_2X8_BE,
+        V4L2_MBUS_FMT_YVYU8_2X8_BE,
+        V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
+        V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE,
+        V4L2_MBUS_FMT_RGB565_2X8_LE,
+        V4L2_MBUS_FMT_RGB565_2X8_BE,
+        V4L2_MBUS_FMT_SBGGR8_1X8,
+        V4L2_MBUS_FMT_SBGGR10_1X10,
+        V4L2_MBUS_FMT_GREY8_1X8,
+        V4L2_MBUS_FMT_Y10_1X10,
+        V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE,
+        V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE,
+        V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE,
+        V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE,
+};
+
+/**
+ * struct v4l2_mbus_framefmt - frame format on the media bus
+ * @width:      frame width
+ * @height:     frame height
+ * @code:       data format code
+ * @field:      used interlacing type
+ * @colorspace: colorspace of the data
+ */
+struct v4l2_mbus_framefmt {
+        __u32                           width;
+        __u32                           height;
+        enum v4l2_mbus_pixelcode        code;
+        enum v4l2_field                 field;
+        enum v4l2_colorspace            colorspace;
+};
+
+#endif
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 00bf17608453..9ba99cd39ee7 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -22,6 +22,7 @@
 #define _V4L2_SUBDEV_H
 
 #include <media/v4l2-common.h>
+#include <media/v4l2-mediabus.h>
 
 /* generic v4l2_device notify callback notification values */
 #define V4L2_SUBDEV_IR_RX_NOTIFY                _IOW('v', 0, u32)
@@ -207,7 +208,7 @@ struct v4l2_subdev_audio_ops {
    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
+   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.
@@ -217,6 +218,26 @@ struct v4l2_subdev_audio_ops {
 
    s_routing: see s_routing in audio_ops, except this version is for video
         devices.
+
+   s_dv_preset: set dv (Digital Video) preset in the sub device. Similar to
+        s_std()
+
+   query_dv_preset: query dv preset in the sub device. This is similar to
+        querystd()
+
+   s_dv_timings(): Set custom dv timings in the sub device. This is used
+        when sub device is capable of setting detailed timing information
+        in the hardware to generate/detect the video signal.
+
+   g_dv_timings(): Get custom dv timings in the sub device.
+
+   enum_mbus_fmt: enumerate pixel formats, provided by a video data source
+
+   g_mbus_fmt: get the current pixel format, provided by a video data source
+
+   try_mbus_fmt: try to set a pixel format on a video data source
+
+   s_mbus_fmt: set a pixel format on a video data source
  */
 struct v4l2_subdev_video_ops {
         int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config);
@@ -240,6 +261,33 @@ struct v4l2_subdev_video_ops {
         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);
+        int (*s_dv_preset)(struct v4l2_subdev *sd,
+                        struct v4l2_dv_preset *preset);
+        int (*query_dv_preset)(struct v4l2_subdev *sd,
+                        struct v4l2_dv_preset *preset);
+        int (*s_dv_timings)(struct v4l2_subdev *sd,
+                        struct v4l2_dv_timings *timings);
+        int (*g_dv_timings)(struct v4l2_subdev *sd,
+                        struct v4l2_dv_timings *timings);
+        int (*enum_mbus_fmt)(struct v4l2_subdev *sd, int index,
+                             enum v4l2_mbus_pixelcode *code);
+        int (*g_mbus_fmt)(struct v4l2_subdev *sd,
+                          struct v4l2_mbus_framefmt *fmt);
+        int (*try_mbus_fmt)(struct v4l2_subdev *sd,
+                            struct v4l2_mbus_framefmt *fmt);
+        int (*s_mbus_fmt)(struct v4l2_subdev *sd,
+                          struct v4l2_mbus_framefmt *fmt);
+};
+
+/**
+ * struct v4l2_subdev_sensor_ops - v4l2-subdev sensor operations
+ * @g_skip_top_lines: number of lines at the top of the image to be skipped.
+ *                    This is needed for some sensors, which always corrupt
+ *                    several top lines of the output image, or which send their
+ *                    metadata in them.
+ */
+struct v4l2_subdev_sensor_ops {
+        int (*g_skip_top_lines)(struct v4l2_subdev *sd, u32 *lines);
 };
 
 /*
@@ -326,11 +374,12 @@ struct v4l2_subdev_ir_ops {
 };
 
 struct v4l2_subdev_ops {
-        const struct v4l2_subdev_core_ops  *core;
-        const struct v4l2_subdev_tuner_ops *tuner;
-        const struct v4l2_subdev_audio_ops *audio;
-        const struct v4l2_subdev_video_ops *video;
-        const struct v4l2_subdev_ir_ops    *ir;
+        const struct v4l2_subdev_core_ops       *core;
+        const struct v4l2_subdev_tuner_ops      *tuner;
+        const struct v4l2_subdev_audio_ops      *audio;
+        const struct v4l2_subdev_video_ops      *video;
+        const struct v4l2_subdev_ir_ops         *ir;
+        const struct v4l2_subdev_sensor_ops     *sensor;
 };
 
 #define V4L2_SUBDEV_NAME_SIZE 32
diff --git a/include/net/dst.h b/include/net/dst.h
index 387cb3cfde7e..39c4a5963e12 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -113,7 +113,7 @@ dst_metric(const struct dst_entry *dst, int metric)
 static inline u32
 dst_feature(const struct dst_entry *dst, u32 feature)
 {
-        return (dst ? dst_metric(dst, RTAX_FEATURES) & feature : 0);
+        return dst_metric(dst, RTAX_FEATURES) & feature;
 }
 
 static inline u32 dst_mtu(const struct dst_entry *dst)
diff --git a/include/net/ip.h b/include/net/ip.h
index e6b9d12d5f62..85108cfbb1ae 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -337,6 +337,7 @@ enum ip_defrag_users {
         IP_DEFRAG_CALL_RA_CHAIN,
         IP_DEFRAG_CONNTRACK_IN,
         IP_DEFRAG_CONNTRACK_OUT,
+        IP_DEFRAG_CONNTRACK_BRIDGE_IN,
         IP_DEFRAG_VS_IN,
         IP_DEFRAG_VS_OUT,
         IP_DEFRAG_VS_FWD
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 92db8617d188..ccab5946c830 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -350,8 +350,16 @@ static inline int ipv6_prefix_equal(const struct in6_addr *a1,
 
 struct inet_frag_queue;
 
+enum ip6_defrag_users {
+        IP6_DEFRAG_LOCAL_DELIVER,
+        IP6_DEFRAG_CONNTRACK_IN,
+        IP6_DEFRAG_CONNTRACK_OUT,
+        IP6_DEFRAG_CONNTRACK_BRIDGE_IN,
+};
+
 struct ip6_create_arg {
         __be32 id;
+        u32 user;
         struct in6_addr *src;
         struct in6_addr *dst;
 };
diff --git a/include/net/netfilter/ipv6/nf_conntrack_ipv6.h b/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
index abc55ad75c2b..1ee717eb5b09 100644
--- a/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
+++ b/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
@@ -9,7 +9,7 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6;
 
 extern int nf_ct_frag6_init(void);
 extern void nf_ct_frag6_cleanup(void);
-extern struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb);
+extern struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user);
 extern void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb,
                                struct net_device *in,
                                struct net_device *out,
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 1b6f7d348cee..34f5cc24d903 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -408,8 +408,7 @@ extern int			tcp_recvmsg(struct kiocb *iocb, struct sock *sk,
 extern void                     tcp_parse_options(struct sk_buff *skb,
                                                   struct tcp_options_received *opt_rx,
                                                   u8 **hvpp,
-                                                  int estab,
-                                                  struct dst_entry *dst);
+                                                  int estab);
 
 extern u8                       *tcp_parse_md5sig_option(struct tcphdr *th);
 
diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index 483057b2f4b4..fa0d52b8e622 100644
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -36,6 +36,7 @@
 
 #include <linux/in.h>
 #include <linux/in6.h>
+#include <linux/if_arp.h>
 #include <linux/netdevice.h>
 #include <linux/socket.h>
 #include <rdma/ib_verbs.h>
@@ -60,8 +61,8 @@ struct rdma_dev_addr {
         unsigned char src_dev_addr[MAX_ADDR_LEN];
         unsigned char dst_dev_addr[MAX_ADDR_LEN];
         unsigned char broadcast[MAX_ADDR_LEN];
-        enum rdma_node_type dev_type;
-        struct net_device *src_dev;
+        unsigned short dev_type;
+        int bound_dev_if;
 };
 
 /**
@@ -121,40 +122,29 @@ static inline void ib_addr_get_mgid(struct rdma_dev_addr *dev_addr,
         memcpy(gid, dev_addr->broadcast + 4, sizeof *gid);
 }
 
-static inline void ib_addr_get_sgid(struct rdma_dev_addr *dev_addr,
-                                    union ib_gid *gid)
+static inline int rdma_addr_gid_offset(struct rdma_dev_addr *dev_addr)
 {
-        memcpy(gid, dev_addr->src_dev_addr + 4, sizeof *gid);
+        return dev_addr->dev_type == ARPHRD_INFINIBAND ? 4 : 0;
 }
 
-static inline void ib_addr_set_sgid(struct rdma_dev_addr *dev_addr,
-                                    union ib_gid *gid)
+static inline void rdma_addr_get_sgid(struct rdma_dev_addr *dev_addr, union ib_gid *gid)
 {
-        memcpy(dev_addr->src_dev_addr + 4, gid, sizeof *gid);
+        memcpy(gid, dev_addr->src_dev_addr + rdma_addr_gid_offset(dev_addr), sizeof *gid);
 }
 
-static inline void ib_addr_get_dgid(struct rdma_dev_addr *dev_addr,
-                                    union ib_gid *gid)
+static inline void rdma_addr_set_sgid(struct rdma_dev_addr *dev_addr, union ib_gid *gid)
 {
-        memcpy(gid, dev_addr->dst_dev_addr + 4, sizeof *gid);
+        memcpy(dev_addr->src_dev_addr + rdma_addr_gid_offset(dev_addr), gid, sizeof *gid);
 }
 
-static inline void ib_addr_set_dgid(struct rdma_dev_addr *dev_addr,
-                                    union ib_gid *gid)
+static inline void rdma_addr_get_dgid(struct rdma_dev_addr *dev_addr, union ib_gid *gid)
 {
-        memcpy(dev_addr->dst_dev_addr + 4, gid, sizeof *gid);
+        memcpy(gid, dev_addr->dst_dev_addr + rdma_addr_gid_offset(dev_addr), sizeof *gid);
 }
 
-static inline void iw_addr_get_sgid(struct rdma_dev_addr *dev_addr,
-                                    union ib_gid *gid)
-{
-        memcpy(gid, dev_addr->src_dev_addr, sizeof *gid);
-}
-
-static inline void iw_addr_get_dgid(struct rdma_dev_addr *dev_addr,
-                                    union ib_gid *gid)
+static inline void rdma_addr_set_dgid(struct rdma_dev_addr *dev_addr, union ib_gid *gid)
 {
-        memcpy(gid, dev_addr->dst_dev_addr, sizeof *gid);
+        memcpy(dev_addr->dst_dev_addr + rdma_addr_gid_offset(dev_addr), gid, sizeof *gid);
 }
 
 #endif /* IB_ADDR_H */
diff --git a/include/rdma/ib_sa.h b/include/rdma/ib_sa.h
index 3841c1aff692..1082afaed158 100644
--- a/include/rdma/ib_sa.h
+++ b/include/rdma/ib_sa.h
@@ -379,4 +379,10 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
                          struct ib_sa_path_rec *rec,
                          struct ib_ah_attr *ah_attr);
 
+/**
+ * ib_sa_unpack_path - Convert a path record from MAD format to struct
+ * ib_sa_path_rec.
+ */
+void ib_sa_unpack_path(void *attribute, struct ib_sa_path_rec *rec);
+
 #endif /* IB_SA_H */
diff --git a/include/rdma/ib_user_sa.h b/include/rdma/ib_user_sa.h
index 659120157e14..cfc7c9ba781e 100644
--- a/include/rdma/ib_user_sa.h
+++ b/include/rdma/ib_user_sa.h
@@ -35,6 +35,22 @@
 
 #include <linux/types.h>
 
+enum {
+        IB_PATH_GMP             = 1,
+        IB_PATH_PRIMARY         = (1<<1),
+        IB_PATH_ALTERNATE       = (1<<2),
+        IB_PATH_OUTBOUND        = (1<<3),
+        IB_PATH_INBOUND         = (1<<4),
+        IB_PATH_INBOUND_REVERSE = (1<<5),
+        IB_PATH_BIDIRECTIONAL   = IB_PATH_OUTBOUND | IB_PATH_INBOUND_REVERSE
+};
+
+struct ib_path_rec_data {
+        __u32   flags;
+        __u32   reserved;
+        __u32   path_rec[16];
+};
+
 struct ib_user_path_rec {
         __u8    dgid[16];
         __u8    sgid[16];
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index c179318edd92..09509edb1c5f 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1425,6 +1425,11 @@ int ib_destroy_qp(struct ib_qp *qp);
  * @send_wr: A list of work requests to post on the send queue.
  * @bad_send_wr: On an immediate failure, this parameter will reference
  *   the work request that failed to be posted on the QP.
+ *
+ * While IBA Vol. 1 section 11.4.1.1 specifies that if an immediate
+ * error is returned, the QP state shall not be affected,
+ * ib_post_send() will return an immediate error after queueing any
+ * earlier work requests in the list.
  */
 static inline int ib_post_send(struct ib_qp *qp,
                                struct ib_send_wr *send_wr,
diff --git a/include/rdma/rdma_user_cm.h b/include/rdma/rdma_user_cm.h
index c55705460b87..1d165022c02d 100644
--- a/include/rdma/rdma_user_cm.h
+++ b/include/rdma/rdma_user_cm.h
@@ -215,12 +215,14 @@ struct rdma_ucm_event_resp {
 
 /* Option levels */
 enum {
-        RDMA_OPTION_ID          = 0
+        RDMA_OPTION_ID          = 0,
+        RDMA_OPTION_IB          = 1
 };
 
 /* Option details */
 enum {
-        RDMA_OPTION_ID_TOS      = 0
+        RDMA_OPTION_ID_TOS      = 0,
+        RDMA_OPTION_IB_PATH     = 1
 };
 
 struct rdma_ucm_set_option {
diff --git a/include/video/da8xx-fb.h b/include/video/da8xx-fb.h
index c051a50ed528..89d43b3d4cb9 100644
--- a/include/video/da8xx-fb.h
+++ b/include/video/da8xx-fb.h
@@ -38,6 +38,7 @@ struct da8xx_lcdc_platform_data {
         const char manu_name[10];
         void *controller_data;
         const char type[25];
+        void (*panel_power_ctrl)(int);
 };
 
 struct lcd_ctrl_config {
diff --git a/include/video/sh_mobile_lcdc.h b/include/video/sh_mobile_lcdc.h
index 25144ab22b95..288205457713 100644
--- a/include/video/sh_mobile_lcdc.h
+++ b/include/video/sh_mobile_lcdc.h
@@ -50,6 +50,8 @@ struct sh_mobile_lcdc_board_cfg {
         void *board_data;
         int (*setup_sys)(void *board_data, void *sys_ops_handle,
                          struct sh_mobile_lcdc_sys_bus_ops *sys_ops);
+        void (*start_transfer)(void *board_data, void *sys_ops_handle,
+                               struct sh_mobile_lcdc_sys_bus_ops *sys_ops);
         void (*display_on)(void *board_data);
         void (*display_off)(void *board_data);
 };
diff --git a/init/Kconfig b/init/Kconfig
index 54c655ce9c04..a23da9f01803 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1079,6 +1079,28 @@ config SLOB
 
 endchoice
 
+config MMAP_ALLOW_UNINITIALIZED
+        bool "Allow mmapped anonymous memory to be uninitialized"
+        depends on EMBEDDED && !MMU
+        default n
+        help
+          Normally, and according to the Linux spec, anonymous memory obtained
+          from mmap() has it's contents cleared before it is passed to
+          userspace.  Enabling this config option allows you to request that
+          mmap() skip that if it is given an MAP_UNINITIALIZED flag, thus
+          providing a huge performance boost.  If this option is not enabled,
+          then the flag will be ignored.
+
+          This is taken advantage of by uClibc's malloc(), and also by
+          ELF-FDPIC binfmt's brk and stack allocator.
+
+          Because of the obvious security issues, this option should only be
+          enabled on embedded devices where you control what is run in
+          userspace.  Since that isn't generally a problem on no-MMU systems,
+          it is normally safe to say Y here.
+
+          See Documentation/nommu-mmap.txt for more information.
+
 config PROFILING
         bool "Profiling support (EXPERIMENTAL)"
         help
diff --git a/init/main.c b/init/main.c
index 4051d75dd2d6..c3db4a98b369 100644
--- a/init/main.c
+++ b/init/main.c
@@ -691,10 +691,10 @@ asmlinkage void __init start_kernel(void)
 static void __init do_ctors(void)
 {
 #ifdef CONFIG_CONSTRUCTORS
-        ctor_fn_t *call = (ctor_fn_t *) __ctors_start;
+        ctor_fn_t *fn = (ctor_fn_t *) __ctors_start;
 
-        for (; call < (ctor_fn_t *) __ctors_end; call++)
-                (*call)();
+        for (; fn < (ctor_fn_t *) __ctors_end; fn++)
+                (*fn)();
 #endif
 }
 
@@ -755,10 +755,10 @@ extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[];
 
 static void __init do_initcalls(void)
 {
-        initcall_t *call;
+        initcall_t *fn;
 
-        for (call = __early_initcall_end; call < __initcall_end; call++)
-                do_one_initcall(*call);
+        for (fn = __early_initcall_end; fn < __initcall_end; fn++)
+                do_one_initcall(*fn);
 
         /* Make sure there is no pending stuff from the initcall sequence */
         flush_scheduled_work();
@@ -785,10 +785,10 @@ static void __init do_basic_setup(void)
 
 static void __init do_pre_smp_initcalls(void)
 {
-        initcall_t *call;
+        initcall_t *fn;
 
-        for (call = __initcall_start; call < __early_initcall_end; call++)
-                do_one_initcall(*call);
+        for (fn = __initcall_start; fn < __early_initcall_end; fn++)
+                do_one_initcall(*fn);
 }
 
 static void run_init_process(char *init_filename)
diff --git a/ipc/msg.c b/ipc/msg.c
index 085bd58f2f07..af42ef8900a6 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -125,6 +125,7 @@ void msg_init_ns(struct ipc_namespace *ns)
 void msg_exit_ns(struct ipc_namespace *ns)
 {
         free_ipcs(ns, &msg_ids(ns), freeque);
+        idr_destroy(&ns->ids[IPC_MSG_IDS].ipcs_idr);
 }
 #endif
 
diff --git a/ipc/sem.c b/ipc/sem.c
index 87c2b641fd7b..dbef95b15941 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -129,6 +129,7 @@ void sem_init_ns(struct ipc_namespace *ns)
 void sem_exit_ns(struct ipc_namespace *ns)
 {
         free_ipcs(ns, &sem_ids(ns), freeary);
+        idr_destroy(&ns->ids[IPC_SEM_IDS].ipcs_idr);
 }
 #endif
 
@@ -240,6 +241,7 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params)
         key_t key = params->key;
         int nsems = params->u.nsems;
         int semflg = params->flg;
+        int i;
 
         if (!nsems)
                 return -EINVAL;
@@ -272,6 +274,11 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params)
         ns->used_sems += nsems;
 
         sma->sem_base = (struct sem *) &sma[1];
+
+        for (i = 0; i < nsems; i++)
+                INIT_LIST_HEAD(&sma->sem_base[i].sem_pending);
+
+        sma->complex_count = 0;
         INIT_LIST_HEAD(&sma->sem_pending);
         INIT_LIST_HEAD(&sma->list_id);
         sma->sem_nsems = nsems;
@@ -397,63 +404,109 @@ undo:
         return result;
 }
 
-/* Go through the pending queue for the indicated semaphore
- * looking for tasks that can be completed.
+/*
+ * Wake up a process waiting on the sem queue with a given error.
+ * The queue is invalid (may not be accessed) after the function returns.
  */
-static void update_queue (struct sem_array * sma)
+static void wake_up_sem_queue(struct sem_queue *q, int error)
 {
-        int error;
-        struct sem_queue * q;
+        /*
+         * Hold preempt off so that we don't get preempted and have the
+         * wakee busy-wait until we're scheduled back on. We're holding
+         * locks here so it may not strictly be needed, however if the
+         * locks become preemptible then this prevents such a problem.
+         */
+        preempt_disable();
+        q->status = IN_WAKEUP;
+        wake_up_process(q->sleeper);
+        /* hands-off: q can disappear immediately after writing q->status. */
+        smp_wmb();
+        q->status = error;
+        preempt_enable();
+}
+
+static void unlink_queue(struct sem_array *sma, struct sem_queue *q)
+{
+        list_del(&q->list);
+        if (q->nsops == 1)
+                list_del(&q->simple_list);
+        else
+                sma->complex_count--;
+}
+
+
+/**
+ * update_queue(sma, semnum): Look for tasks that can be completed.
+ * @sma: semaphore array.
+ * @semnum: semaphore that was modified.
+ *
+ * update_queue must be called after a semaphore in a semaphore array
+ * was modified. If multiple semaphore were modified, then @semnum
+ * must be set to -1.
+ */
+static void update_queue(struct sem_array *sma, int semnum)
+{
+        struct sem_queue *q;
+        struct list_head *walk;
+        struct list_head *pending_list;
+        int offset;
+
+        /* if there are complex operations around, then knowing the semaphore
+         * that was modified doesn't help us. Assume that multiple semaphores
+         * were modified.
+         */
+        if (sma->complex_count)
+                semnum = -1;
+
+        if (semnum == -1) {
+                pending_list = &sma->sem_pending;
+                offset = offsetof(struct sem_queue, list);
+        } else {
+                pending_list = &sma->sem_base[semnum].sem_pending;
+                offset = offsetof(struct sem_queue, simple_list);
+        }
+
+again:
+        walk = pending_list->next;
+        while (walk != pending_list) {
+                int error, alter;
+
+                q = (struct sem_queue *)((char *)walk - offset);
+                walk = walk->next;
+
+                /* If we are scanning the single sop, per-semaphore list of
+                 * one semaphore and that semaphore is 0, then it is not
+                 * necessary to scan the "alter" entries: simple increments
+                 * that affect only one entry succeed immediately and cannot
+                 * be in the  per semaphore pending queue, and decrements
+                 * cannot be successful if the value is already 0.
+                 */
+                if (semnum != -1 && sma->sem_base[semnum].semval == 0 &&
+                                q->alter)
+                        break;
 
-        q = list_entry(sma->sem_pending.next, struct sem_queue, list);
-        while (&q->list != &sma->sem_pending) {
                 error = try_atomic_semop(sma, q->sops, q->nsops,
                                          q->undo, q->pid);
 
                 /* Does q->sleeper still need to sleep? */
-                if (error <= 0) {
-                        struct sem_queue *n;
-
-                        /*
-                         * Continue scanning. The next operation
-                         * that must be checked depends on the type of the
-                         * completed operation:
-                         * - if the operation modified the array, then
-                         *   restart from the head of the queue and
-                         *   check for threads that might be waiting
-                         *   for semaphore values to become 0.
-                         * - if the operation didn't modify the array,
-                         *   then just continue.
-                         * The order of list_del() and reading ->next
-                         * is crucial: In the former case, the list_del()
-                         * must be done first [because we might be the
-                         * first entry in ->sem_pending], in the latter
-                         * case the list_del() must be done last
-                         * [because the list is invalid after the list_del()]
-                         */
-                        if (q->alter) {
-                                list_del(&q->list);
-                                n = list_entry(sma->sem_pending.next,
-                                                struct sem_queue, list);
-                        } else {
-                                n = list_entry(q->list.next, struct sem_queue,
-                                                list);
-                                list_del(&q->list);
-                        }
-
-                        /* wake up the waiting thread */
-                        q->status = IN_WAKEUP;
+                if (error > 0)
+                        continue;
 
-                        wake_up_process(q->sleeper);
-                        /* hands-off: q will disappear immediately after
-                         * writing q->status.
-                         */
-                        smp_wmb();
-                        q->status = error;
-                        q = n;
-                } else {
-                        q = list_entry(q->list.next, struct sem_queue, list);
-                }
+                unlink_queue(sma, q);
+
+                /*
+                 * The next operation that must be checked depends on the type
+                 * of the completed operation:
+                 * - if the operation modified the array, then restart from the
+                 *   head of the queue and check for threads that might be
+                 *   waiting for the new semaphore values.
+                 * - if the operation didn't modify the array, then just
+                 *   continue.
+                 */
+                alter = q->alter;
+                wake_up_sem_queue(q, error);
+                if (alter && !error)
+                        goto again;
         }
 }
 
@@ -533,12 +586,8 @@ static void freeary(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
 
         /* Wake up all pending processes and let them fail with EIDRM. */
         list_for_each_entry_safe(q, tq, &sma->sem_pending, list) {
-                list_del(&q->list);
-
-                q->status = IN_WAKEUP;
-                wake_up_process(q->sleeper); /* doesn't sleep */
-                smp_wmb();
-                q->status = -EIDRM;     /* hands-off q */
+                unlink_queue(sma, q);
+                wake_up_sem_queue(q, -EIDRM);
         }
 
         /* Remove the semaphore set from the IDR */
@@ -575,7 +624,7 @@ static unsigned long copy_semid_to_user(void __user *buf, struct semid64_ds *in,
 static int semctl_nolock(struct ipc_namespace *ns, int semid,
                          int cmd, int version, union semun arg)
 {
-        int err = -EINVAL;
+        int err;
         struct sem_array *sma;
 
         switch(cmd) {
@@ -652,7 +701,6 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid,
         default:
                 return -EINVAL;
         }
-        return err;
 out_unlock:
         sem_unlock(sma);
         return err;
@@ -759,7 +807,7 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
                 }
                 sma->sem_ctime = get_seconds();
                 /* maybe some queued-up processes were waiting for this */
-                update_queue(sma);
+                update_queue(sma, -1);
                 err = 0;
                 goto out_unlock;
         }
@@ -801,7 +849,7 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
                 curr->sempid = task_tgid_vnr(current);
                 sma->sem_ctime = get_seconds();
                 /* maybe some queued-up processes were waiting for this */
-                update_queue(sma);
+                update_queue(sma, semnum);
                 err = 0;
                 goto out_unlock;
         }
@@ -961,17 +1009,31 @@ static inline int get_undo_list(struct sem_undo_list **undo_listp)
         return 0;
 }
 
-static struct sem_undo *lookup_undo(struct sem_undo_list *ulp, int semid)
+static struct sem_undo *__lookup_undo(struct sem_undo_list *ulp, int semid)
 {
-        struct sem_undo *walk;
+        struct sem_undo *un;
 
-        list_for_each_entry_rcu(walk, &ulp->list_proc, list_proc) {
-                if (walk->semid == semid)
-                        return walk;
+        list_for_each_entry_rcu(un, &ulp->list_proc, list_proc) {
+                if (un->semid == semid)
+                        return un;
         }
         return NULL;
 }
 
+static struct sem_undo *lookup_undo(struct sem_undo_list *ulp, int semid)
+{
+        struct sem_undo *un;
+
+        assert_spin_locked(&ulp->lock);
+
+        un = __lookup_undo(ulp, semid);
+        if (un) {
+                list_del_rcu(&un->list_proc);
+                list_add_rcu(&un->list_proc, &ulp->list_proc);
+        }
+        return un;
+}
+
 /**
  * find_alloc_undo - Lookup (and if not present create) undo array
  * @ns: namespace
@@ -1163,7 +1225,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
         error = try_atomic_semop (sma, sops, nsops, un, task_tgid_vnr(current));
         if (error <= 0) {
                 if (alter && error == 0)
-                        update_queue (sma);
+                        update_queue(sma, (nsops == 1) ? sops[0].sem_num : -1);
+
                 goto out_unlock_free;
         }
 
@@ -1181,6 +1244,19 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
         else
                 list_add(&queue.list, &sma->sem_pending);
 
+        if (nsops == 1) {
+                struct sem *curr;
+                curr = &sma->sem_base[sops->sem_num];
+
+                if (alter)
+                        list_add_tail(&queue.simple_list, &curr->sem_pending);
+                else
+                        list_add(&queue.simple_list, &curr->sem_pending);
+        } else {
+                INIT_LIST_HEAD(&queue.simple_list);
+                sma->complex_count++;
+        }
+
         queue.status = -EINTR;
         queue.sleeper = current;
         current->state = TASK_INTERRUPTIBLE;
@@ -1222,7 +1298,7 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
          */
         if (timeout && jiffies_left == 0)
                 error = -EAGAIN;
-        list_del(&queue.list);
+        unlink_queue(sma, &queue);
 
 out_unlock_free:
         sem_unlock(sma);
@@ -1307,7 +1383,7 @@ void exit_sem(struct task_struct *tsk)
                 if (IS_ERR(sma))
                         continue;
 
-                un = lookup_undo(ulp, semid);
+                un = __lookup_undo(ulp, semid);
                 if (un == NULL) {
                         /* exit_sem raced with IPC_RMID+semget() that created
                          * exactly the same semid. Nothing to do.
@@ -1351,7 +1427,7 @@ void exit_sem(struct task_struct *tsk)
                 }
                 sma->sem_otime = get_seconds();
                 /* maybe some queued-up processes were waiting for this */
-                update_queue(sma);
+                update_queue(sma, -1);
                 sem_unlock(sma);
 
                 call_rcu(&un->rcu, free_un);
@@ -1365,7 +1441,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it)
         struct sem_array *sma = it;
 
         return seq_printf(s,
-                          "%10d %10d  %4o %10lu %5u %5u %5u %5u %10lu %10lu\n",
+                          "%10d %10d  %4o %10u %5u %5u %5u %5u %10lu %10lu\n",
                           sma->sem_perm.key,
                           sma->sem_perm.id,
                           sma->sem_perm.mode,
diff --git a/ipc/shm.c b/ipc/shm.c
index 11bec626c228..e9b039f74129 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -101,6 +101,7 @@ static void do_shm_rmid(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
 void shm_exit_ns(struct ipc_namespace *ns)
 {
         free_ipcs(ns, &shm_ids(ns), do_shm_rmid);
+        idr_destroy(&ns->ids[IPC_SHM_IDS].ipcs_idr);
 }
 #endif
 
diff --git a/kernel/acct.c b/kernel/acct.c
index 9a4715a2f6bf..a6605ca921b6 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -536,7 +536,8 @@ static void do_acct_process(struct bsd_acct_struct *acct,
         do_div(elapsed, AHZ);
         ac.ac_btime = get_seconds() - elapsed;
         /* we really need to bite the bullet and change layout */
-        current_uid_gid(&ac.ac_uid, &ac.ac_gid);
+        ac.ac_uid = orig_cred->uid;
+        ac.ac_gid = orig_cred->gid;
 #if ACCT_VERSION==2
         ac.ac_ahz = AHZ;
 #endif
diff --git a/kernel/exit.c b/kernel/exit.c
index 6f50ef55a6f3..5962d7ccf243 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -933,7 +933,7 @@ NORET_TYPE void do_exit(long code)
          * an exiting task cleaning up the robust pi futexes.
          */
         smp_mb();
-        spin_unlock_wait(&tsk->pi_lock);
+        raw_spin_unlock_wait(&tsk->pi_lock);
 
         if (unlikely(in_atomic()))
                 printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n",
diff --git a/kernel/fork.c b/kernel/fork.c
index 1415dc4598ae..202a0ba63d3c 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -939,9 +939,9 @@ SYSCALL_DEFINE1(set_tid_address, int __user *, tidptr)
 
 static void rt_mutex_init_task(struct task_struct *p)
 {
-        spin_lock_init(&p->pi_lock);
+        raw_spin_lock_init(&p->pi_lock);
 #ifdef CONFIG_RT_MUTEXES
-        plist_head_init(&p->pi_waiters, &p->pi_lock);
+        plist_head_init_raw(&p->pi_waiters, &p->pi_lock);
         p->pi_blocked_on = NULL;
 #endif
 }
@@ -1127,6 +1127,10 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 #ifdef CONFIG_DEBUG_MUTEXES
         p->blocked_on = NULL; /* not blocked yet */
 #endif
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
+        p->memcg_batch.do_batch = 0;
+        p->memcg_batch.memcg = NULL;
+#endif
 
         p->bts = NULL;
 
@@ -1206,9 +1210,10 @@ static struct task_struct *copy_process(unsigned long clone_flags,
                 p->sas_ss_sp = p->sas_ss_size = 0;
 
         /*
-         * Syscall tracing should be turned off in the child regardless
-         * of CLONE_PTRACE.
+         * Syscall tracing and stepping should be turned off in the
+         * child regardless of CLONE_PTRACE.
          */
+        user_disable_single_step(p);
         clear_tsk_thread_flag(p, TIF_SYSCALL_TRACE);
 #ifdef TIF_SYSCALL_EMU
         clear_tsk_thread_flag(p, TIF_SYSCALL_EMU);
diff --git a/kernel/futex.c b/kernel/futex.c
index d73ef1f3e55d..8e3c3ffe1b9a 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -403,9 +403,9 @@ static void free_pi_state(struct futex_pi_state *pi_state)
          * and has cleaned up the pi_state already
          */
         if (pi_state->owner) {
-                spin_lock_irq(&pi_state->owner->pi_lock);
+                raw_spin_lock_irq(&pi_state->owner->pi_lock);
                 list_del_init(&pi_state->list);
-                spin_unlock_irq(&pi_state->owner->pi_lock);
+                raw_spin_unlock_irq(&pi_state->owner->pi_lock);
 
                 rt_mutex_proxy_unlock(&pi_state->pi_mutex, pi_state->owner);
         }
@@ -470,18 +470,18 @@ void exit_pi_state_list(struct task_struct *curr)
          * pi_state_list anymore, but we have to be careful
          * versus waiters unqueueing themselves:
          */
-        spin_lock_irq(&curr->pi_lock);
+        raw_spin_lock_irq(&curr->pi_lock);
         while (!list_empty(head)) {
 
                 next = head->next;
                 pi_state = list_entry(next, struct futex_pi_state, list);
                 key = pi_state->key;
                 hb = hash_futex(&key);
-                spin_unlock_irq(&curr->pi_lock);
+                raw_spin_unlock_irq(&curr->pi_lock);
 
                 spin_lock(&hb->lock);
 
-                spin_lock_irq(&curr->pi_lock);
+                raw_spin_lock_irq(&curr->pi_lock);
                 /*
                  * We dropped the pi-lock, so re-check whether this
                  * task still owns the PI-state:
@@ -495,15 +495,15 @@ void exit_pi_state_list(struct task_struct *curr)
                 WARN_ON(list_empty(&pi_state->list));
                 list_del_init(&pi_state->list);
                 pi_state->owner = NULL;
-                spin_unlock_irq(&curr->pi_lock);
+                raw_spin_unlock_irq(&curr->pi_lock);
 
                 rt_mutex_unlock(&pi_state->pi_mutex);
 
                 spin_unlock(&hb->lock);
 
-                spin_lock_irq(&curr->pi_lock);
+                raw_spin_lock_irq(&curr->pi_lock);
         }
-        spin_unlock_irq(&curr->pi_lock);
+        raw_spin_unlock_irq(&curr->pi_lock);
 }
 
 static int
@@ -558,7 +558,7 @@ lookup_pi_state(u32 uval, struct futex_hash_bucket *hb,
          * change of the task flags, we do this protected by
          * p->pi_lock:
          */
-        spin_lock_irq(&p->pi_lock);
+        raw_spin_lock_irq(&p->pi_lock);
         if (unlikely(p->flags & PF_EXITING)) {
                 /*
                  * The task is on the way out. When PF_EXITPIDONE is
@@ -567,7 +567,7 @@ lookup_pi_state(u32 uval, struct futex_hash_bucket *hb,
                  */
                 int ret = (p->flags & PF_EXITPIDONE) ? -ESRCH : -EAGAIN;
 
-                spin_unlock_irq(&p->pi_lock);
+                raw_spin_unlock_irq(&p->pi_lock);
                 put_task_struct(p);
                 return ret;
         }
@@ -586,7 +586,7 @@ lookup_pi_state(u32 uval, struct futex_hash_bucket *hb,
         WARN_ON(!list_empty(&pi_state->list));
         list_add(&pi_state->list, &p->pi_state_list);
         pi_state->owner = p;
-        spin_unlock_irq(&p->pi_lock);
+        raw_spin_unlock_irq(&p->pi_lock);
 
         put_task_struct(p);
 
@@ -760,7 +760,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this)
         if (!pi_state)
                 return -EINVAL;
 
-        spin_lock(&pi_state->pi_mutex.wait_lock);
+        raw_spin_lock(&pi_state->pi_mutex.wait_lock);
         new_owner = rt_mutex_next_owner(&pi_state->pi_mutex);
 
         /*
@@ -789,23 +789,23 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this)
                 else if (curval != uval)
                         ret = -EINVAL;
                 if (ret) {
-                        spin_unlock(&pi_state->pi_mutex.wait_lock);
+                        raw_spin_unlock(&pi_state->pi_mutex.wait_lock);
                         return ret;
                 }
         }
 
-        spin_lock_irq(&pi_state->owner->pi_lock);
+        raw_spin_lock_irq(&pi_state->owner->pi_lock);
         WARN_ON(list_empty(&pi_state->list));
         list_del_init(&pi_state->list);
-        spin_unlock_irq(&pi_state->owner->pi_lock);
+        raw_spin_unlock_irq(&pi_state->owner->pi_lock);
 
-        spin_lock_irq(&new_owner->pi_lock);
+        raw_spin_lock_irq(&new_owner->pi_lock);
         WARN_ON(!list_empty(&pi_state->list));
         list_add(&pi_state->list, &new_owner->pi_state_list);
         pi_state->owner = new_owner;
-        spin_unlock_irq(&new_owner->pi_lock);
+        raw_spin_unlock_irq(&new_owner->pi_lock);
 
-        spin_unlock(&pi_state->pi_mutex.wait_lock);
+        raw_spin_unlock(&pi_state->pi_mutex.wait_lock);
         rt_mutex_unlock(&pi_state->pi_mutex);
 
         return 0;
@@ -1010,7 +1010,7 @@ void requeue_futex(struct futex_q *q, struct futex_hash_bucket *hb1,
                 plist_add(&q->list, &hb2->chain);
                 q->lock_ptr = &hb2->lock;
 #ifdef CONFIG_DEBUG_PI_LIST
-                q->list.plist.lock = &hb2->lock;
+                q->list.plist.spinlock = &hb2->lock;
 #endif
         }
         get_futex_key_refs(key2);
@@ -1046,7 +1046,7 @@ void requeue_pi_wake_futex(struct futex_q *q, union futex_key *key,
 
         q->lock_ptr = &hb->lock;
 #ifdef CONFIG_DEBUG_PI_LIST
-        q->list.plist.lock = &hb->lock;
+        q->list.plist.spinlock = &hb->lock;
 #endif
 
         wake_up_state(q->task, TASK_NORMAL);
@@ -1394,7 +1394,7 @@ static inline void queue_me(struct futex_q *q, struct futex_hash_bucket *hb)
 
         plist_node_init(&q->list, prio);
 #ifdef CONFIG_DEBUG_PI_LIST
-        q->list.plist.lock = &hb->lock;
+        q->list.plist.spinlock = &hb->lock;
 #endif
         plist_add(&q->list, &hb->chain);
         q->task = current;
@@ -1529,18 +1529,18 @@ retry:
          * itself.
          */
         if (pi_state->owner != NULL) {
-                spin_lock_irq(&pi_state->owner->pi_lock);
+                raw_spin_lock_irq(&pi_state->owner->pi_lock);
                 WARN_ON(list_empty(&pi_state->list));
                 list_del_init(&pi_state->list);
-                spin_unlock_irq(&pi_state->owner->pi_lock);
+                raw_spin_unlock_irq(&pi_state->owner->pi_lock);
         }
 
         pi_state->owner = newowner;
 
-        spin_lock_irq(&newowner->pi_lock);
+        raw_spin_lock_irq(&newowner->pi_lock);
         WARN_ON(!list_empty(&pi_state->list));
         list_add(&pi_state->list, &newowner->pi_state_list);
-        spin_unlock_irq(&newowner->pi_lock);
+        raw_spin_unlock_irq(&newowner->pi_lock);
         return 0;
 
         /*
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index d2f9239dc6ba..0086628b6e97 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -127,11 +127,11 @@ struct hrtimer_clock_base *lock_hrtimer_base(const struct hrtimer *timer,
         for (;;) {
                 base = timer->base;
                 if (likely(base != NULL)) {
-                        spin_lock_irqsave(&base->cpu_base->lock, *flags);
+                        raw_spin_lock_irqsave(&base->cpu_base->lock, *flags);
                         if (likely(base == timer->base))
                                 return base;
                         /* The timer has migrated to another CPU: */
-                        spin_unlock_irqrestore(&base->cpu_base->lock, *flags);
+                        raw_spin_unlock_irqrestore(&base->cpu_base->lock, *flags);
                 }
                 cpu_relax();
         }
@@ -208,13 +208,13 @@ again:
 
                 /* See the comment in lock_timer_base() */
                 timer->base = NULL;
-                spin_unlock(&base->cpu_base->lock);
-                spin_lock(&new_base->cpu_base->lock);
+                raw_spin_unlock(&base->cpu_base->lock);
+                raw_spin_lock(&new_base->cpu_base->lock);
 
                 if (cpu != this_cpu && hrtimer_check_target(timer, new_base)) {
                         cpu = this_cpu;
-                        spin_unlock(&new_base->cpu_base->lock);
-                        spin_lock(&base->cpu_base->lock);
+                        raw_spin_unlock(&new_base->cpu_base->lock);
+                        raw_spin_lock(&base->cpu_base->lock);
                         timer->base = base;
                         goto again;
                 }
@@ -230,7 +230,7 @@ lock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags)
 {
         struct hrtimer_clock_base *base = timer->base;
 
-        spin_lock_irqsave(&base->cpu_base->lock, *flags);
+        raw_spin_lock_irqsave(&base->cpu_base->lock, *flags);
 
         return base;
 }
@@ -628,12 +628,12 @@ static void retrigger_next_event(void *arg)
         base = &__get_cpu_var(hrtimer_bases);
 
         /* Adjust CLOCK_REALTIME offset */
-        spin_lock(&base->lock);
+        raw_spin_lock(&base->lock);
         base->clock_base[CLOCK_REALTIME].offset =
                 timespec_to_ktime(realtime_offset);
 
         hrtimer_force_reprogram(base, 0);
-        spin_unlock(&base->lock);
+        raw_spin_unlock(&base->lock);
 }
 
 /*
@@ -694,9 +694,9 @@ static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer,
 {
         if (base->cpu_base->hres_active && hrtimer_reprogram(timer, base)) {
                 if (wakeup) {
-                        spin_unlock(&base->cpu_base->lock);
+                        raw_spin_unlock(&base->cpu_base->lock);
                         raise_softirq_irqoff(HRTIMER_SOFTIRQ);
-                        spin_lock(&base->cpu_base->lock);
+                        raw_spin_lock(&base->cpu_base->lock);
                 } else
                         __raise_softirq_irqoff(HRTIMER_SOFTIRQ);
 
@@ -790,7 +790,7 @@ static inline void timer_stats_account_hrtimer(struct hrtimer *timer)
 static inline
 void unlock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags)
 {
-        spin_unlock_irqrestore(&timer->base->cpu_base->lock, *flags);
+        raw_spin_unlock_irqrestore(&timer->base->cpu_base->lock, *flags);
 }
 
 /**
@@ -1123,7 +1123,7 @@ ktime_t hrtimer_get_next_event(void)
         unsigned long flags;
         int i;
 
-        spin_lock_irqsave(&cpu_base->lock, flags);
+        raw_spin_lock_irqsave(&cpu_base->lock, flags);
 
         if (!hrtimer_hres_active()) {
                 for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++, base++) {
@@ -1140,7 +1140,7 @@ ktime_t hrtimer_get_next_event(void)
                 }
         }
 
-        spin_unlock_irqrestore(&cpu_base->lock, flags);
+        raw_spin_unlock_irqrestore(&cpu_base->lock, flags);
 
         if (mindelta.tv64 < 0)
                 mindelta.tv64 = 0;
@@ -1222,11 +1222,11 @@ static void __run_hrtimer(struct hrtimer *timer, ktime_t *now)
          * they get migrated to another cpu, therefore its safe to unlock
          * the timer base.
          */
-        spin_unlock(&cpu_base->lock);
+        raw_spin_unlock(&cpu_base->lock);
         trace_hrtimer_expire_entry(timer, now);
         restart = fn(timer);
         trace_hrtimer_expire_exit(timer);
-        spin_lock(&cpu_base->lock);
+        raw_spin_lock(&cpu_base->lock);
 
         /*
          * Note: We clear the CALLBACK bit after enqueue_hrtimer and
@@ -1261,7 +1261,7 @@ void hrtimer_interrupt(struct clock_event_device *dev)
 retry:
         expires_next.tv64 = KTIME_MAX;
 
-        spin_lock(&cpu_base->lock);
+        raw_spin_lock(&cpu_base->lock);
         /*
          * We set expires_next to KTIME_MAX here with cpu_base->lock
          * held to prevent that a timer is enqueued in our queue via
@@ -1317,7 +1317,7 @@ retry:
          * against it.
          */
         cpu_base->expires_next = expires_next;
-        spin_unlock(&cpu_base->lock);
+        raw_spin_unlock(&cpu_base->lock);
 
         /* Reprogramming necessary ? */
         if (expires_next.tv64 == KTIME_MAX ||
@@ -1457,7 +1457,7 @@ void hrtimer_run_queues(void)
                         gettime = 0;
                 }
 
-                spin_lock(&cpu_base->lock);
+                raw_spin_lock(&cpu_base->lock);
 
                 while ((node = base->first)) {
                         struct hrtimer *timer;
@@ -1469,7 +1469,7 @@ void hrtimer_run_queues(void)
 
                         __run_hrtimer(timer, &base->softirq_time);
                 }
-                spin_unlock(&cpu_base->lock);
+                raw_spin_unlock(&cpu_base->lock);
         }
 }
 
@@ -1625,7 +1625,7 @@ static void __cpuinit init_hrtimers_cpu(int cpu)
         struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);
         int i;
 
-        spin_lock_init(&cpu_base->lock);
+        raw_spin_lock_init(&cpu_base->lock);
 
         for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++)
                 cpu_base->clock_base[i].cpu_base = cpu_base;
@@ -1683,16 +1683,16 @@ static void migrate_hrtimers(int scpu)
          * The caller is globally serialized and nobody else
          * takes two locks at once, deadlock is not possible.
          */
-        spin_lock(&new_base->lock);
-        spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING);
+        raw_spin_lock(&new_base->lock);
+        raw_spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING);
 
         for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {
                 migrate_hrtimer_list(&old_base->clock_base[i],
                                      &new_base->clock_base[i]);
         }
 
-        spin_unlock(&old_base->lock);
-        spin_unlock(&new_base->lock);
+        raw_spin_unlock(&old_base->lock);
+        raw_spin_unlock(&new_base->lock);
 
         /* Check, if we got expired work to do */
         __hrtimer_peek_ahead_timers();
diff --git a/kernel/hw_breakpoint.c b/kernel/hw_breakpoint.c
index 366eedf949c0..dbcbf6a33a08 100644
--- a/kernel/hw_breakpoint.c
+++ b/kernel/hw_breakpoint.c
@@ -96,7 +96,7 @@ static int task_bp_pinned(struct task_struct *tsk)
 
         list = &ctx->event_list;
 
-        spin_lock_irqsave(&ctx->lock, flags);
+        raw_spin_lock_irqsave(&ctx->lock, flags);
 
         /*
          * The current breakpoint counter is not included in the list
@@ -107,7 +107,7 @@ static int task_bp_pinned(struct task_struct *tsk)
                         count++;
         }
 
-        spin_unlock_irqrestore(&ctx->lock, flags);
+        raw_spin_unlock_irqrestore(&ctx->lock, flags);
 
         return count;
 }
diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c
index 1de9700f416e..2295a31ef110 100644
--- a/kernel/irq/autoprobe.c
+++ b/kernel/irq/autoprobe.c
@@ -45,7 +45,7 @@ unsigned long probe_irq_on(void)
          * flush such a longstanding irq before considering it as spurious.
          */
         for_each_irq_desc_reverse(i, desc) {
-                spin_lock_irq(&desc->lock);
+                raw_spin_lock_irq(&desc->lock);
                 if (!desc->action && !(desc->status & IRQ_NOPROBE)) {
                         /*
                          * An old-style architecture might still have
@@ -61,7 +61,7 @@ unsigned long probe_irq_on(void)
                                 desc->chip->set_type(i, IRQ_TYPE_PROBE);
                         desc->chip->startup(i);
                 }
-                spin_unlock_irq(&desc->lock);
+                raw_spin_unlock_irq(&desc->lock);
         }
 
         /* Wait for longstanding interrupts to trigger. */
@@ -73,13 +73,13 @@ unsigned long probe_irq_on(void)
          * happened in the previous stage, it may have masked itself)
          */
         for_each_irq_desc_reverse(i, desc) {
-                spin_lock_irq(&desc->lock);
+                raw_spin_lock_irq(&desc->lock);
                 if (!desc->action && !(desc->status & IRQ_NOPROBE)) {
                         desc->status |= IRQ_AUTODETECT | IRQ_WAITING;
                         if (desc->chip->startup(i))
                                 desc->status |= IRQ_PENDING;
                 }
-                spin_unlock_irq(&desc->lock);
+                raw_spin_unlock_irq(&desc->lock);
         }
 
         /*
@@ -91,7 +91,7 @@ unsigned long probe_irq_on(void)
          * Now filter out any obviously spurious interrupts
          */
         for_each_irq_desc(i, desc) {
-                spin_lock_irq(&desc->lock);
+                raw_spin_lock_irq(&desc->lock);
                 status = desc->status;
 
                 if (status & IRQ_AUTODETECT) {
@@ -103,7 +103,7 @@ unsigned long probe_irq_on(void)
                                 if (i < 32)
                                         mask |= 1 << i;
                 }
-                spin_unlock_irq(&desc->lock);
+                raw_spin_unlock_irq(&desc->lock);
         }
 
         return mask;
@@ -129,7 +129,7 @@ unsigned int probe_irq_mask(unsigned long val)
         int i;
 
         for_each_irq_desc(i, desc) {
-                spin_lock_irq(&desc->lock);
+                raw_spin_lock_irq(&desc->lock);
                 status = desc->status;
 
                 if (status & IRQ_AUTODETECT) {
@@ -139,7 +139,7 @@ unsigned int probe_irq_mask(unsigned long val)
                         desc->status = status & ~IRQ_AUTODETECT;
                         desc->chip->shutdown(i);
                 }
-                spin_unlock_irq(&desc->lock);
+                raw_spin_unlock_irq(&desc->lock);
         }
         mutex_unlock(&probing_active);
 
@@ -171,7 +171,7 @@ int probe_irq_off(unsigned long val)
         unsigned int status;
 
         for_each_irq_desc(i, desc) {
-                spin_lock_irq(&desc->lock);
+                raw_spin_lock_irq(&desc->lock);
                 status = desc->status;
 
                 if (status & IRQ_AUTODETECT) {
@@ -183,7 +183,7 @@ int probe_irq_off(unsigned long val)
                         desc->status = status & ~IRQ_AUTODETECT;
                         desc->chip->shutdown(i);
                 }
-                spin_unlock_irq(&desc->lock);
+                raw_spin_unlock_irq(&desc->lock);
         }
         mutex_unlock(&probing_active);
 
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index ba566c261adc..ecc3fa28f666 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -34,7 +34,7 @@ void dynamic_irq_init(unsigned int irq)
         }
 
         /* Ensure we don't have left over values from a previous use of this irq */
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         desc->status = IRQ_DISABLED;
         desc->chip = &no_irq_chip;
         desc->handle_irq = handle_bad_irq;
@@ -51,7 +51,7 @@ void dynamic_irq_init(unsigned int irq)
         cpumask_clear(desc->pending_mask);
 #endif
 #endif
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 }
 
 /**
@@ -68,9 +68,9 @@ void dynamic_irq_cleanup(unsigned int irq)
                 return;
         }
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         if (desc->action) {
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
                 WARN(1, KERN_ERR "Destroying IRQ%d without calling free_irq\n",
                         irq);
                 return;
@@ -82,7 +82,7 @@ void dynamic_irq_cleanup(unsigned int irq)
         desc->chip = &no_irq_chip;
         desc->name = NULL;
         clear_kstat_irqs(desc);
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 }
 
 
@@ -104,10 +104,10 @@ int set_irq_chip(unsigned int irq, struct irq_chip *chip)
         if (!chip)
                 chip = &no_irq_chip;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         irq_chip_set_defaults(chip);
         desc->chip = chip;
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 
         return 0;
 }
@@ -133,9 +133,9 @@ int set_irq_type(unsigned int irq, unsigned int type)
         if (type == IRQ_TYPE_NONE)
                 return 0;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         ret = __irq_set_trigger(desc, irq, type);
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
         return ret;
 }
 EXPORT_SYMBOL(set_irq_type);
@@ -158,9 +158,9 @@ int set_irq_data(unsigned int irq, void *data)
                 return -EINVAL;
         }
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         desc->handler_data = data;
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
         return 0;
 }
 EXPORT_SYMBOL(set_irq_data);
@@ -183,11 +183,11 @@ int set_irq_msi(unsigned int irq, struct msi_desc *entry)
                 return -EINVAL;
         }
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         desc->msi_desc = entry;
         if (entry)
                 entry->irq = irq;
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
         return 0;
 }
 
@@ -214,9 +214,9 @@ int set_irq_chip_data(unsigned int irq, void *data)
                 return -EINVAL;
         }
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         desc->chip_data = data;
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 
         return 0;
 }
@@ -241,12 +241,12 @@ void set_irq_nested_thread(unsigned int irq, int nest)
         if (!desc)
                 return;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         if (nest)
                 desc->status |= IRQ_NESTED_THREAD;
         else
                 desc->status &= ~IRQ_NESTED_THREAD;
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 }
 EXPORT_SYMBOL_GPL(set_irq_nested_thread);
 
@@ -343,7 +343,7 @@ void handle_nested_irq(unsigned int irq)
 
         might_sleep();
 
-        spin_lock_irq(&desc->lock);
+        raw_spin_lock_irq(&desc->lock);
 
         kstat_incr_irqs_this_cpu(irq, desc);
 
@@ -352,17 +352,17 @@ void handle_nested_irq(unsigned int irq)
                 goto out_unlock;
 
         desc->status |= IRQ_INPROGRESS;
-        spin_unlock_irq(&desc->lock);
+        raw_spin_unlock_irq(&desc->lock);
 
         action_ret = action->thread_fn(action->irq, action->dev_id);
         if (!noirqdebug)
                 note_interrupt(irq, desc, action_ret);
 
-        spin_lock_irq(&desc->lock);
+        raw_spin_lock_irq(&desc->lock);
         desc->status &= ~IRQ_INPROGRESS;
 
 out_unlock:
-        spin_unlock_irq(&desc->lock);
+        raw_spin_unlock_irq(&desc->lock);
 }
 EXPORT_SYMBOL_GPL(handle_nested_irq);
 
@@ -384,7 +384,7 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc)
         struct irqaction *action;
         irqreturn_t action_ret;
 
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
 
         if (unlikely(desc->status & IRQ_INPROGRESS))
                 goto out_unlock;
@@ -396,16 +396,16 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc)
                 goto out_unlock;
 
         desc->status |= IRQ_INPROGRESS;
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 
         action_ret = handle_IRQ_event(irq, action);
         if (!noirqdebug)
                 note_interrupt(irq, desc, action_ret);
 
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
         desc->status &= ~IRQ_INPROGRESS;
 out_unlock:
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 }
 
 /**
@@ -424,7 +424,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
         struct irqaction *action;
         irqreturn_t action_ret;
 
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
         mask_ack_irq(desc, irq);
 
         if (unlikely(desc->status & IRQ_INPROGRESS))
@@ -441,13 +441,13 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
                 goto out_unlock;
 
         desc->status |= IRQ_INPROGRESS;
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 
         action_ret = handle_IRQ_event(irq, action);
         if (!noirqdebug)
                 note_interrupt(irq, desc, action_ret);
 
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
         desc->status &= ~IRQ_INPROGRESS;
 
         if (unlikely(desc->status & IRQ_ONESHOT))
@@ -455,7 +455,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
         else if (!(desc->status & IRQ_DISABLED) && desc->chip->unmask)
                 desc->chip->unmask(irq);
 out_unlock:
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 }
 EXPORT_SYMBOL_GPL(handle_level_irq);
 
@@ -475,7 +475,7 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
         struct irqaction *action;
         irqreturn_t action_ret;
 
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
 
         if (unlikely(desc->status & IRQ_INPROGRESS))
                 goto out;
@@ -497,18 +497,18 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
 
         desc->status |= IRQ_INPROGRESS;
         desc->status &= ~IRQ_PENDING;
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 
         action_ret = handle_IRQ_event(irq, action);
         if (!noirqdebug)
                 note_interrupt(irq, desc, action_ret);
 
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
         desc->status &= ~IRQ_INPROGRESS;
 out:
         desc->chip->eoi(irq);
 
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 }
 
 /**
@@ -530,7 +530,7 @@ out:
 void
 handle_edge_irq(unsigned int irq, struct irq_desc *desc)
 {
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
 
         desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
 
@@ -576,17 +576,17 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
                 }
 
                 desc->status &= ~IRQ_PENDING;
-                spin_unlock(&desc->lock);
+                raw_spin_unlock(&desc->lock);
                 action_ret = handle_IRQ_event(irq, action);
                 if (!noirqdebug)
                         note_interrupt(irq, desc, action_ret);
-                spin_lock(&desc->lock);
+                raw_spin_lock(&desc->lock);
 
         } while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);
 
         desc->status &= ~IRQ_INPROGRESS;
 out_unlock:
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 }
 
 /**
@@ -643,7 +643,7 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
         }
 
         chip_bus_lock(irq, desc);
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
 
         /* Uninstall? */
         if (handle == handle_bad_irq) {
@@ -661,7 +661,7 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
                 desc->depth = 0;
                 desc->chip->startup(irq);
         }
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
         chip_bus_sync_unlock(irq, desc);
 }
 EXPORT_SYMBOL_GPL(__set_irq_handler);
@@ -692,9 +692,9 @@ void __init set_irq_noprobe(unsigned int irq)
                 return;
         }
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         desc->status |= IRQ_NOPROBE;
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 }
 
 void __init set_irq_probe(unsigned int irq)
@@ -707,7 +707,7 @@ void __init set_irq_probe(unsigned int irq)
                 return;
         }
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         desc->status &= ~IRQ_NOPROBE;
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 }
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 17c71bb565c6..814940e7f485 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -80,7 +80,7 @@ static struct irq_desc irq_desc_init = {
         .chip       = &no_irq_chip,
         .handle_irq = handle_bad_irq,
         .depth      = 1,
-        .lock       = __SPIN_LOCK_UNLOCKED(irq_desc_init.lock),
+        .lock       = __RAW_SPIN_LOCK_UNLOCKED(irq_desc_init.lock),
 };
 
 void __ref init_kstat_irqs(struct irq_desc *desc, int node, int nr)
@@ -108,7 +108,7 @@ static void init_one_irq_desc(int irq, struct irq_desc *desc, int node)
 {
         memcpy(desc, &irq_desc_init, sizeof(struct irq_desc));
 
-        spin_lock_init(&desc->lock);
+        raw_spin_lock_init(&desc->lock);
         desc->irq = irq;
 #ifdef CONFIG_SMP
         desc->node = node;
@@ -130,7 +130,7 @@ static void init_one_irq_desc(int irq, struct irq_desc *desc, int node)
 /*
  * Protect the sparse_irqs:
  */
-DEFINE_SPINLOCK(sparse_irq_lock);
+DEFINE_RAW_SPINLOCK(sparse_irq_lock);
 
 struct irq_desc **irq_desc_ptrs __read_mostly;
 
@@ -141,7 +141,7 @@ static struct irq_desc irq_desc_legacy[NR_IRQS_LEGACY] __cacheline_aligned_in_sm
                 .chip       = &no_irq_chip,
                 .handle_irq = handle_bad_irq,
                 .depth      = 1,
-                .lock       = __SPIN_LOCK_UNLOCKED(irq_desc_init.lock),
+                .lock       = __RAW_SPIN_LOCK_UNLOCKED(irq_desc_init.lock),
         }
 };
 
@@ -212,7 +212,7 @@ struct irq_desc * __ref irq_to_desc_alloc_node(unsigned int irq, int node)
         if (desc)
                 return desc;
 
-        spin_lock_irqsave(&sparse_irq_lock, flags);
+        raw_spin_lock_irqsave(&sparse_irq_lock, flags);
 
         /* We have to check it to avoid races with another CPU */
         desc = irq_desc_ptrs[irq];
@@ -234,7 +234,7 @@ struct irq_desc * __ref irq_to_desc_alloc_node(unsigned int irq, int node)
         irq_desc_ptrs[irq] = desc;
 
 out_unlock:
-        spin_unlock_irqrestore(&sparse_irq_lock, flags);
+        raw_spin_unlock_irqrestore(&sparse_irq_lock, flags);
 
         return desc;
 }
@@ -247,7 +247,7 @@ struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned_in_smp = {
                 .chip = &no_irq_chip,
                 .handle_irq = handle_bad_irq,
                 .depth = 1,
-                .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock),
+                .lock = __RAW_SPIN_LOCK_UNLOCKED(irq_desc->lock),
         }
 };
 
@@ -473,7 +473,7 @@ unsigned int __do_IRQ(unsigned int irq)
                 return 1;
         }
 
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
         if (desc->chip->ack)
                 desc->chip->ack(irq);
         /*
@@ -517,13 +517,13 @@ unsigned int __do_IRQ(unsigned int irq)
         for (;;) {
                 irqreturn_t action_ret;
 
-                spin_unlock(&desc->lock);
+                raw_spin_unlock(&desc->lock);
 
                 action_ret = handle_IRQ_event(irq, action);
                 if (!noirqdebug)
                         note_interrupt(irq, desc, action_ret);
 
-                spin_lock(&desc->lock);
+                raw_spin_lock(&desc->lock);
                 if (likely(!(desc->status & IRQ_PENDING)))
                         break;
                 desc->status &= ~IRQ_PENDING;
@@ -536,7 +536,7 @@ out:
          * disabled while the handler was running.
          */
         desc->chip->end(irq);
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 
         return 1;
 }
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index 1b5d742c6a77..b2821f070a3d 100644
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -18,7 +18,7 @@ extern void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume);
 extern struct lock_class_key irq_desc_lock_class;
 extern void init_kstat_irqs(struct irq_desc *desc, int node, int nr);
 extern void clear_kstat_irqs(struct irq_desc *desc);
-extern spinlock_t sparse_irq_lock;
+extern raw_spinlock_t sparse_irq_lock;
 
 #ifdef CONFIG_SPARSE_IRQ
 /* irq_desc_ptrs allocated at boot time */
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 7305b297d1eb..eb6078ca60c7 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -46,9 +46,9 @@ void synchronize_irq(unsigned int irq)
                         cpu_relax();
 
                 /* Ok, that indicated we're done: double-check carefully. */
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 status = desc->status;
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
 
                 /* Oops, that failed? */
         } while (status & IRQ_INPROGRESS);
@@ -114,7 +114,7 @@ int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask)
         if (!desc->chip->set_affinity)
                 return -EINVAL;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
 
 #ifdef CONFIG_GENERIC_PENDING_IRQ
         if (desc->status & IRQ_MOVE_PCNTXT) {
@@ -134,7 +134,7 @@ int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask)
         }
 #endif
         desc->status |= IRQ_AFFINITY_SET;
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
         return 0;
 }
 
@@ -181,11 +181,11 @@ int irq_select_affinity_usr(unsigned int irq)
         unsigned long flags;
         int ret;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         ret = setup_affinity(irq, desc);
         if (!ret)
                 irq_set_thread_affinity(desc);
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 
         return ret;
 }
@@ -231,9 +231,9 @@ void disable_irq_nosync(unsigned int irq)
                 return;
 
         chip_bus_lock(irq, desc);
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         __disable_irq(desc, irq, false);
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
         chip_bus_sync_unlock(irq, desc);
 }
 EXPORT_SYMBOL(disable_irq_nosync);
@@ -308,9 +308,9 @@ void enable_irq(unsigned int irq)
                 return;
 
         chip_bus_lock(irq, desc);
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         __enable_irq(desc, irq, false);
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
         chip_bus_sync_unlock(irq, desc);
 }
 EXPORT_SYMBOL(enable_irq);
@@ -347,7 +347,7 @@ int set_irq_wake(unsigned int irq, unsigned int on)
         /* wakeup-capable irqs can be shared between drivers that
          * don't need to have the same sleep mode behaviors.
          */
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         if (on) {
                 if (desc->wake_depth++ == 0) {
                         ret = set_irq_wake_real(irq, on);
@@ -368,7 +368,7 @@ int set_irq_wake(unsigned int irq, unsigned int on)
                 }
         }
 
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
         return ret;
 }
 EXPORT_SYMBOL(set_irq_wake);
@@ -484,12 +484,12 @@ static int irq_wait_for_interrupt(struct irqaction *action)
 static void irq_finalize_oneshot(unsigned int irq, struct irq_desc *desc)
 {
         chip_bus_lock(irq, desc);
-        spin_lock_irq(&desc->lock);
+        raw_spin_lock_irq(&desc->lock);
         if (!(desc->status & IRQ_DISABLED) && (desc->status & IRQ_MASKED)) {
                 desc->status &= ~IRQ_MASKED;
                 desc->chip->unmask(irq);
         }
-        spin_unlock_irq(&desc->lock);
+        raw_spin_unlock_irq(&desc->lock);
         chip_bus_sync_unlock(irq, desc);
 }
 
@@ -514,9 +514,9 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action)
                 return;
         }
 
-        spin_lock_irq(&desc->lock);
+        raw_spin_lock_irq(&desc->lock);
         cpumask_copy(mask, desc->affinity);
-        spin_unlock_irq(&desc->lock);
+        raw_spin_unlock_irq(&desc->lock);
 
         set_cpus_allowed_ptr(current, mask);
         free_cpumask_var(mask);
@@ -545,7 +545,7 @@ static int irq_thread(void *data)
 
                 atomic_inc(&desc->threads_active);
 
-                spin_lock_irq(&desc->lock);
+                raw_spin_lock_irq(&desc->lock);
                 if (unlikely(desc->status & IRQ_DISABLED)) {
                         /*
                          * CHECKME: We might need a dedicated
@@ -555,9 +555,9 @@ static int irq_thread(void *data)
                          * retriggers the interrupt itself --- tglx
                          */
                         desc->status |= IRQ_PENDING;
-                        spin_unlock_irq(&desc->lock);
+                        raw_spin_unlock_irq(&desc->lock);
                 } else {
-                        spin_unlock_irq(&desc->lock);
+                        raw_spin_unlock_irq(&desc->lock);
 
                         action->thread_fn(action->irq, action->dev_id);
 
@@ -679,7 +679,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
         /*
          * The following block of code has to be executed atomically
          */
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         old_ptr = &desc->action;
         old = *old_ptr;
         if (old) {
@@ -775,7 +775,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
                 __enable_irq(desc, irq, false);
         }
 
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 
         /*
          * Strictly no need to wake it up, but hung_task complains
@@ -802,7 +802,7 @@ mismatch:
         ret = -EBUSY;
 
 out_thread:
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
         if (new->thread) {
                 struct task_struct *t = new->thread;
 
@@ -844,7 +844,7 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
         if (!desc)
                 return NULL;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
 
         /*
          * There can be multiple actions per IRQ descriptor, find the right
@@ -856,7 +856,7 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
 
                 if (!action) {
                         WARN(1, "Trying to free already-free IRQ %d\n", irq);
-                        spin_unlock_irqrestore(&desc->lock, flags);
+                        raw_spin_unlock_irqrestore(&desc->lock, flags);
 
                         return NULL;
                 }
@@ -884,7 +884,7 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
                         desc->chip->disable(irq);
         }
 
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
 
         unregister_handler_proc(irq, action);
 
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index fcb6c96f2627..241962280836 100644
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -27,7 +27,7 @@ void move_masked_irq(int irq)
         if (!desc->chip->set_affinity)
                 return;
 
-        assert_spin_locked(&desc->lock);
+        assert_raw_spin_locked(&desc->lock);
 
         /*
          * If there was a valid mask to work with, please
diff --git a/kernel/irq/numa_migrate.c b/kernel/irq/numa_migrate.c
index 3fd30197da2e..26bac9d8f860 100644
--- a/kernel/irq/numa_migrate.c
+++ b/kernel/irq/numa_migrate.c
@@ -42,7 +42,7 @@ static bool init_copy_one_irq_desc(int irq, struct irq_desc *old_desc,
                                 "for migration.\n", irq);
                 return false;
         }
-        spin_lock_init(&desc->lock);
+        raw_spin_lock_init(&desc->lock);
         desc->node = node;
         lockdep_set_class(&desc->lock, &irq_desc_lock_class);
         init_copy_kstat_irqs(old_desc, desc, node, nr_cpu_ids);
@@ -67,7 +67,7 @@ static struct irq_desc *__real_move_irq_desc(struct irq_desc *old_desc,
 
         irq = old_desc->irq;
 
-        spin_lock_irqsave(&sparse_irq_lock, flags);
+        raw_spin_lock_irqsave(&sparse_irq_lock, flags);
 
         /* We have to check it to avoid races with another CPU */
         desc = irq_desc_ptrs[irq];
@@ -91,7 +91,7 @@ static struct irq_desc *__real_move_irq_desc(struct irq_desc *old_desc,
         }
 
         irq_desc_ptrs[irq] = desc;
-        spin_unlock_irqrestore(&sparse_irq_lock, flags);
+        raw_spin_unlock_irqrestore(&sparse_irq_lock, flags);
 
         /* free the old one */
         free_one_irq_desc(old_desc, desc);
@@ -100,7 +100,7 @@ static struct irq_desc *__real_move_irq_desc(struct irq_desc *old_desc,
         return desc;
 
 out_unlock:
-        spin_unlock_irqrestore(&sparse_irq_lock, flags);
+        raw_spin_unlock_irqrestore(&sparse_irq_lock, flags);
 
         return desc;
 }
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index a0bb09e79867..0d4005d85b03 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -28,9 +28,9 @@ void suspend_device_irqs(void)
         for_each_irq_desc(irq, desc) {
                 unsigned long flags;
 
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 __disable_irq(desc, irq, true);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 
         for_each_irq_desc(irq, desc)
@@ -56,9 +56,9 @@ void resume_device_irqs(void)
                 if (!(desc->status & IRQ_SUSPENDED))
                         continue;
 
-                spin_lock_irqsave(&desc->lock, flags);
+                raw_spin_lock_irqsave(&desc->lock, flags);
                 __enable_irq(desc, irq, true);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 }
 EXPORT_SYMBOL_GPL(resume_device_irqs);
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index 0832145fea97..6f50eccc79c0 100644
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -179,7 +179,7 @@ static int name_unique(unsigned int irq, struct irqaction *new_action)
         unsigned long flags;
         int ret = 1;
 
-        spin_lock_irqsave(&desc->lock, flags);
+        raw_spin_lock_irqsave(&desc->lock, flags);
         for (action = desc->action ; action; action = action->next) {
                 if ((action != new_action) && action->name &&
                                 !strcmp(new_action->name, action->name)) {
@@ -187,7 +187,7 @@ static int name_unique(unsigned int irq, struct irqaction *new_action)
                         break;
                 }
         }
-        spin_unlock_irqrestore(&desc->lock, flags);
+        raw_spin_unlock_irqrestore(&desc->lock, flags);
         return ret;
 }
 
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index e49ea1c5232d..89fb90ae534f 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -28,7 +28,7 @@ static int try_one_irq(int irq, struct irq_desc *desc)
         struct irqaction *action;
         int ok = 0, work = 0;
 
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
         /* Already running on another processor */
         if (desc->status & IRQ_INPROGRESS) {
                 /*
@@ -37,13 +37,13 @@ static int try_one_irq(int irq, struct irq_desc *desc)
                  */
                 if (desc->action && (desc->action->flags & IRQF_SHARED))
                         desc->status |= IRQ_PENDING;
-                spin_unlock(&desc->lock);
+                raw_spin_unlock(&desc->lock);
                 return ok;
         }
         /* Honour the normal IRQ locking */
         desc->status |= IRQ_INPROGRESS;
         action = desc->action;
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 
         while (action) {
                 /* Only shared IRQ handlers are safe to call */
@@ -56,7 +56,7 @@ static int try_one_irq(int irq, struct irq_desc *desc)
         }
         local_irq_disable();
         /* Now clean up the flags */
-        spin_lock(&desc->lock);
+        raw_spin_lock(&desc->lock);
         action = desc->action;
 
         /*
@@ -68,9 +68,9 @@ static int try_one_irq(int irq, struct irq_desc *desc)
                  * Perform real IRQ processing for the IRQ we deferred
                  */
                 work = 1;
-                spin_unlock(&desc->lock);
+                raw_spin_unlock(&desc->lock);
                 handle_IRQ_event(irq, action);
-                spin_lock(&desc->lock);
+                raw_spin_lock(&desc->lock);
                 desc->status &= ~IRQ_PENDING;
         }
         desc->status &= ~IRQ_INPROGRESS;
@@ -80,7 +80,7 @@ static int try_one_irq(int irq, struct irq_desc *desc)
          */
         if (work && desc->chip && desc->chip->end)
                 desc->chip->end(irq);
-        spin_unlock(&desc->lock);
+        raw_spin_unlock(&desc->lock);
 
         return ok;
 }
diff --git a/kernel/kexec.c b/kernel/kexec.c
index f336e2107f98..433e9fcc1fc5 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -31,6 +31,7 @@
 #include <linux/cpu.h>
 #include <linux/console.h>
 #include <linux/vmalloc.h>
+#include <linux/swap.h>
 
 #include <asm/page.h>
 #include <asm/uaccess.h>
@@ -1082,6 +1083,64 @@ void crash_kexec(struct pt_regs *regs)
         }
 }
 
+size_t crash_get_memory_size(void)
+{
+        size_t size;
+        mutex_lock(&kexec_mutex);
+        size = crashk_res.end - crashk_res.start + 1;
+        mutex_unlock(&kexec_mutex);
+        return size;
+}
+
+static void free_reserved_phys_range(unsigned long begin, unsigned long end)
+{
+        unsigned long addr;
+
+        for (addr = begin; addr < end; addr += PAGE_SIZE) {
+                ClearPageReserved(pfn_to_page(addr >> PAGE_SHIFT));
+                init_page_count(pfn_to_page(addr >> PAGE_SHIFT));
+                free_page((unsigned long)__va(addr));
+                totalram_pages++;
+        }
+}
+
+int crash_shrink_memory(unsigned long new_size)
+{
+        int ret = 0;
+        unsigned long start, end;
+
+        mutex_lock(&kexec_mutex);
+
+        if (kexec_crash_image) {
+                ret = -ENOENT;
+                goto unlock;
+        }
+        start = crashk_res.start;
+        end = crashk_res.end;
+
+        if (new_size >= end - start + 1) {
+                ret = -EINVAL;
+                if (new_size == end - start + 1)
+                        ret = 0;
+                goto unlock;
+        }
+
+        start = roundup(start, PAGE_SIZE);
+        end = roundup(start + new_size, PAGE_SIZE);
+
+        free_reserved_phys_range(end, crashk_res.end);
+
+        if (start == end) {
+                crashk_res.end = end;
+                release_resource(&crashk_res);
+        } else
+                crashk_res.end = end - 1;
+
+unlock:
+        mutex_unlock(&kexec_mutex);
+        return ret;
+}
+
 static u32 *append_elf_note(u32 *buf, char *name, unsigned type, void *data,
                             size_t data_len)
 {
diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
index 528dd78e7e7e..3feaf5a74514 100644
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
@@ -100,6 +100,26 @@ static ssize_t kexec_crash_loaded_show(struct kobject *kobj,
 }
 KERNEL_ATTR_RO(kexec_crash_loaded);
 
+static ssize_t kexec_crash_size_show(struct kobject *kobj,
+                                       struct kobj_attribute *attr, char *buf)
+{
+        return sprintf(buf, "%zu\n", crash_get_memory_size());
+}
+static ssize_t kexec_crash_size_store(struct kobject *kobj,
+                                   struct kobj_attribute *attr,
+                                   const char *buf, size_t count)
+{
+        unsigned long cnt;
+        int ret;
+
+        if (strict_strtoul(buf, 0, &cnt))
+                return -EINVAL;
+
+        ret = crash_shrink_memory(cnt);
+        return ret < 0 ? ret : count;
+}
+KERNEL_ATTR_RW(kexec_crash_size);
+
 static ssize_t vmcoreinfo_show(struct kobject *kobj,
                                struct kobj_attribute *attr, char *buf)
 {
@@ -147,6 +167,7 @@ static struct attribute * kernel_attrs[] = {
 #ifdef CONFIG_KEXEC
         &kexec_loaded_attr.attr,
         &kexec_crash_loaded_attr.attr,
+        &kexec_crash_size_attr.attr,
         &vmcoreinfo_attr.attr,
 #endif
         NULL
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 429540c70d3f..5feaddcdbe49 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -73,11 +73,11 @@ module_param(lock_stat, int, 0644);
  * to use a raw spinlock - we really dont want the spinlock
  * code to recurse back into the lockdep code...
  */
-static raw_spinlock_t lockdep_lock = (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
+static arch_spinlock_t lockdep_lock = (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED;
 
 static int graph_lock(void)
 {
-        __raw_spin_lock(&lockdep_lock);
+        arch_spin_lock(&lockdep_lock);
         /*
          * Make sure that if another CPU detected a bug while
          * walking the graph we dont change it (while the other
@@ -85,7 +85,7 @@ static int graph_lock(void)
          * dropped already)
          */
         if (!debug_locks) {
-                __raw_spin_unlock(&lockdep_lock);
+                arch_spin_unlock(&lockdep_lock);
                 return 0;
         }
         /* prevent any recursions within lockdep from causing deadlocks */
@@ -95,11 +95,11 @@ static int graph_lock(void)
 
 static inline int graph_unlock(void)
 {
-        if (debug_locks && !__raw_spin_is_locked(&lockdep_lock))
+        if (debug_locks && !arch_spin_is_locked(&lockdep_lock))
                 return DEBUG_LOCKS_WARN_ON(1);
 
         current->lockdep_recursion--;
-        __raw_spin_unlock(&lockdep_lock);
+        arch_spin_unlock(&lockdep_lock);
         return 0;
 }
 
@@ -111,7 +111,7 @@ static inline int debug_locks_off_graph_unlock(void)
 {
         int ret = debug_locks_off();
 
-        __raw_spin_unlock(&lockdep_lock);
+        arch_spin_unlock(&lockdep_lock);
 
         return ret;
 }
@@ -1170,9 +1170,9 @@ unsigned long lockdep_count_forward_deps(struct lock_class *class)
         this.class = class;
 
         local_irq_save(flags);
-        __raw_spin_lock(&lockdep_lock);
+        arch_spin_lock(&lockdep_lock);
         ret = __lockdep_count_forward_deps(&this);
-        __raw_spin_unlock(&lockdep_lock);
+        arch_spin_unlock(&lockdep_lock);
         local_irq_restore(flags);
 
         return ret;
@@ -1197,9 +1197,9 @@ unsigned long lockdep_count_backward_deps(struct lock_class *class)
         this.class = class;
 
         local_irq_save(flags);
-        __raw_spin_lock(&lockdep_lock);
+        arch_spin_lock(&lockdep_lock);
         ret = __lockdep_count_backward_deps(&this);
-        __raw_spin_unlock(&lockdep_lock);
+        arch_spin_unlock(&lockdep_lock);
         local_irq_restore(flags);
 
         return ret;
diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
index 6b2d735846a5..57d527a16f9d 100644
--- a/kernel/mutex-debug.h
+++ b/kernel/mutex-debug.h
@@ -43,13 +43,13 @@ static inline void mutex_clear_owner(struct mutex *lock)
                                                         \
                 DEBUG_LOCKS_WARN_ON(in_interrupt());    \
                 local_irq_save(flags);                  \
-                __raw_spin_lock(&(lock)->raw_lock);     \
+                arch_spin_lock(&(lock)->rlock.raw_lock);\
                 DEBUG_LOCKS_WARN_ON(l->magic != l);     \
         } while (0)
 
-#define spin_unlock_mutex(lock, flags)                  \
-        do {                                            \
-                __raw_spin_unlock(&(lock)->raw_lock);   \
-                local_irq_restore(flags);               \
-                preempt_check_resched();                \
+#define spin_unlock_mutex(lock, flags)                          \
+        do {                                                    \
+                arch_spin_unlock(&(lock)->rlock.raw_lock);      \
+                local_irq_restore(flags);                       \
+                preempt_check_resched();                        \
         } while (0)
diff --git a/kernel/panic.c b/kernel/panic.c
index 96b45d0b4ba5..5827f7b97254 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -10,6 +10,7 @@
  */
 #include <linux/debug_locks.h>
 #include <linux/interrupt.h>
+#include <linux/kmsg_dump.h>
 #include <linux/kallsyms.h>
 #include <linux/notifier.h>
 #include <linux/module.h>
@@ -74,6 +75,7 @@ NORET_TYPE void panic(const char * fmt, ...)
         dump_stack();
 #endif
 
+        kmsg_dump(KMSG_DUMP_PANIC);
         /*
          * If we have crashed and we have a crash kernel loaded let it handle
          * everything else.
@@ -339,6 +341,7 @@ void oops_exit(void)
 {
         do_oops_enter_exit();
         print_oops_end_marker();
+        kmsg_dump(KMSG_DUMP_OOPS);
 }
 
 #ifdef WANT_WARN_ON_SLOWPATH
diff --git a/kernel/params.c b/kernel/params.c
index d656c276508d..cf1b69183127 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -24,6 +24,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 
 #if 0
 #define DEBUGP printk
@@ -122,9 +123,7 @@ static char *next_arg(char *args, char **param, char **val)
                 next = args + i;
 
         /* Chew up trailing spaces. */
-        while (isspace(*next))
-                next++;
-        return next;
+        return skip_spaces(next);
 }
 
 /* Args looks like "foo=bar,bar2 baz=fuz wiz". */
@@ -139,8 +138,7 @@ int parse_args(const char *name,
         DEBUGP("Parsing ARGS: %s\n", args);
 
         /* Chew leading spaces */
-        while (isspace(*args))
-                args++;
+        args = skip_spaces(args);
 
         while (*args) {
                 int ret;
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index e73e53c7582f..9052d6c8c9fd 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -203,14 +203,14 @@ perf_lock_task_context(struct task_struct *task, unsigned long *flags)
                  * if so.  If we locked the right context, then it
                  * can't get swapped on us any more.
                  */
-                spin_lock_irqsave(&ctx->lock, *flags);
+                raw_spin_lock_irqsave(&ctx->lock, *flags);
                 if (ctx != rcu_dereference(task->perf_event_ctxp)) {
-                        spin_unlock_irqrestore(&ctx->lock, *flags);
+                        raw_spin_unlock_irqrestore(&ctx->lock, *flags);
                         goto retry;
                 }
 
                 if (!atomic_inc_not_zero(&ctx->refcount)) {
-                        spin_unlock_irqrestore(&ctx->lock, *flags);
+                        raw_spin_unlock_irqrestore(&ctx->lock, *flags);
                         ctx = NULL;
                 }
         }
@@ -231,7 +231,7 @@ static struct perf_event_context *perf_pin_task_context(struct task_struct *task
         ctx = perf_lock_task_context(task, &flags);
         if (ctx) {
                 ++ctx->pin_count;
-                spin_unlock_irqrestore(&ctx->lock, flags);
+                raw_spin_unlock_irqrestore(&ctx->lock, flags);
         }
         return ctx;
 }
@@ -240,9 +240,9 @@ static void perf_unpin_context(struct perf_event_context *ctx)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&ctx->lock, flags);
+        raw_spin_lock_irqsave(&ctx->lock, flags);
         --ctx->pin_count;
-        spin_unlock_irqrestore(&ctx->lock, flags);
+        raw_spin_unlock_irqrestore(&ctx->lock, flags);
         put_ctx(ctx);
 }
 
@@ -427,7 +427,7 @@ static void __perf_event_remove_from_context(void *info)
         if (ctx->task && cpuctx->task_ctx != ctx)
                 return;
 
-        spin_lock(&ctx->lock);
+        raw_spin_lock(&ctx->lock);
         /*
          * Protect the list operation against NMI by disabling the
          * events on a global level.
@@ -449,7 +449,7 @@ static void __perf_event_remove_from_context(void *info)
         }
 
         perf_enable();
-        spin_unlock(&ctx->lock);
+        raw_spin_unlock(&ctx->lock);
 }
 
 
@@ -488,12 +488,12 @@ retry:
         task_oncpu_function_call(task, __perf_event_remove_from_context,
                                  event);
 
-        spin_lock_irq(&ctx->lock);
+        raw_spin_lock_irq(&ctx->lock);
         /*
          * If the context is active we need to retry the smp call.
          */
         if (ctx->nr_active && !list_empty(&event->group_entry)) {
-                spin_unlock_irq(&ctx->lock);
+                raw_spin_unlock_irq(&ctx->lock);
                 goto retry;
         }
 
@@ -504,7 +504,7 @@ retry:
          */
         if (!list_empty(&event->group_entry))
                 list_del_event(event, ctx);
-        spin_unlock_irq(&ctx->lock);
+        raw_spin_unlock_irq(&ctx->lock);
 }
 
 /*
@@ -535,7 +535,7 @@ static void __perf_event_disable(void *info)
         if (ctx->task && cpuctx->task_ctx != ctx)
                 return;
 
-        spin_lock(&ctx->lock);
+        raw_spin_lock(&ctx->lock);
 
         /*
          * If the event is on, turn it off.
@@ -551,7 +551,7 @@ static void __perf_event_disable(void *info)
                 event->state = PERF_EVENT_STATE_OFF;
         }
 
-        spin_unlock(&ctx->lock);
+        raw_spin_unlock(&ctx->lock);
 }
 
 /*
@@ -584,12 +584,12 @@ void perf_event_disable(struct perf_event *event)
  retry:
         task_oncpu_function_call(task, __perf_event_disable, event);
 
-        spin_lock_irq(&ctx->lock);
+        raw_spin_lock_irq(&ctx->lock);
         /*
          * If the event is still active, we need to retry the cross-call.
          */
         if (event->state == PERF_EVENT_STATE_ACTIVE) {
-                spin_unlock_irq(&ctx->lock);
+                raw_spin_unlock_irq(&ctx->lock);
                 goto retry;
         }
 
@@ -602,7 +602,7 @@ void perf_event_disable(struct perf_event *event)
                 event->state = PERF_EVENT_STATE_OFF;
         }
 
-        spin_unlock_irq(&ctx->lock);
+        raw_spin_unlock_irq(&ctx->lock);
 }
 
 static int
@@ -770,7 +770,7 @@ static void __perf_install_in_context(void *info)
                 cpuctx->task_ctx = ctx;
         }
 
-        spin_lock(&ctx->lock);
+        raw_spin_lock(&ctx->lock);
         ctx->is_active = 1;
         update_context_time(ctx);
 
@@ -820,7 +820,7 @@ static void __perf_install_in_context(void *info)
  unlock:
         perf_enable();
 
-        spin_unlock(&ctx->lock);
+        raw_spin_unlock(&ctx->lock);
 }
 
 /*
@@ -856,12 +856,12 @@ retry:
         task_oncpu_function_call(task, __perf_install_in_context,
                                  event);
 
-        spin_lock_irq(&ctx->lock);
+        raw_spin_lock_irq(&ctx->lock);
         /*
          * we need to retry the smp call.
          */
         if (ctx->is_active && list_empty(&event->group_entry)) {
-                spin_unlock_irq(&ctx->lock);
+                raw_spin_unlock_irq(&ctx->lock);
                 goto retry;
         }
 
@@ -872,7 +872,7 @@ retry:
          */
         if (list_empty(&event->group_entry))
                 add_event_to_ctx(event, ctx);
-        spin_unlock_irq(&ctx->lock);
+        raw_spin_unlock_irq(&ctx->lock);
 }
 
 /*
@@ -917,7 +917,7 @@ static void __perf_event_enable(void *info)
                 cpuctx->task_ctx = ctx;
         }
 
-        spin_lock(&ctx->lock);
+        raw_spin_lock(&ctx->lock);
         ctx->is_active = 1;
         update_context_time(ctx);
 
@@ -959,7 +959,7 @@ static void __perf_event_enable(void *info)
         }
 
  unlock:
-        spin_unlock(&ctx->lock);
+        raw_spin_unlock(&ctx->lock);
 }
 
 /*
@@ -985,7 +985,7 @@ void perf_event_enable(struct perf_event *event)
                 return;
         }
 
-        spin_lock_irq(&ctx->lock);
+        raw_spin_lock_irq(&ctx->lock);
         if (event->state >= PERF_EVENT_STATE_INACTIVE)
                 goto out;
 
@@ -1000,10 +1000,10 @@ void perf_event_enable(struct perf_event *event)
                 event->state = PERF_EVENT_STATE_OFF;
 
  retry:
-        spin_unlock_irq(&ctx->lock);
+        raw_spin_unlock_irq(&ctx->lock);
         task_oncpu_function_call(task, __perf_event_enable, event);
 
-        spin_lock_irq(&ctx->lock);
+        raw_spin_lock_irq(&ctx->lock);
 
         /*
          * If the context is active and the event is still off,
@@ -1020,7 +1020,7 @@ void perf_event_enable(struct perf_event *event)
                 __perf_event_mark_enabled(event, ctx);
 
  out:
-        spin_unlock_irq(&ctx->lock);
+        raw_spin_unlock_irq(&ctx->lock);
 }
 
 static int perf_event_refresh(struct perf_event *event, int refresh)
@@ -1042,7 +1042,7 @@ void __perf_event_sched_out(struct perf_event_context *ctx,
 {
         struct perf_event *event;
 
-        spin_lock(&ctx->lock);
+        raw_spin_lock(&ctx->lock);
         ctx->is_active = 0;
         if (likely(!ctx->nr_events))
                 goto out;
@@ -1055,7 +1055,7 @@ void __perf_event_sched_out(struct perf_event_context *ctx,
         }
         perf_enable();
  out:
-        spin_unlock(&ctx->lock);
+        raw_spin_unlock(&ctx->lock);
 }
 
 /*
@@ -1193,8 +1193,8 @@ void perf_event_task_sched_out(struct task_struct *task,
                  * order we take the locks because no other cpu could
                  * be trying to lock both of these tasks.
                  */
-                spin_lock(&ctx->lock);
-                spin_lock_nested(&next_ctx->lock, SINGLE_DEPTH_NESTING);
+                raw_spin_lock(&ctx->lock);
+                raw_spin_lock_nested(&next_ctx->lock, SINGLE_DEPTH_NESTING);
                 if (context_equiv(ctx, next_ctx)) {
                         /*
                          * XXX do we need a memory barrier of sorts
@@ -1208,8 +1208,8 @@ void perf_event_task_sched_out(struct task_struct *task,
 
                         perf_event_sync_stat(ctx, next_ctx);
                 }
-                spin_unlock(&next_ctx->lock);
-                spin_unlock(&ctx->lock);
+                raw_spin_unlock(&next_ctx->lock);
+                raw_spin_unlock(&ctx->lock);
         }
         rcu_read_unlock();
 
@@ -1251,7 +1251,7 @@ __perf_event_sched_in(struct perf_event_context *ctx,
         struct perf_event *event;
         int can_add_hw = 1;
 
-        spin_lock(&ctx->lock);
+        raw_spin_lock(&ctx->lock);
         ctx->is_active = 1;
         if (likely(!ctx->nr_events))
                 goto out;
@@ -1306,7 +1306,7 @@ __perf_event_sched_in(struct perf_event_context *ctx,
         }
         perf_enable();
  out:
-        spin_unlock(&ctx->lock);
+        raw_spin_unlock(&ctx->lock);
 }
 
 /*
@@ -1370,7 +1370,7 @@ static void perf_ctx_adjust_freq(struct perf_event_context *ctx)
         struct hw_perf_event *hwc;
         u64 interrupts, freq;
 
-        spin_lock(&ctx->lock);
+        raw_spin_lock(&ctx->lock);
         list_for_each_entry_rcu(event, &ctx->event_list, event_entry) {
                 if (event->state != PERF_EVENT_STATE_ACTIVE)
                         continue;
@@ -1425,7 +1425,7 @@ static void perf_ctx_adjust_freq(struct perf_event_context *ctx)
                         perf_enable();
                 }
         }
-        spin_unlock(&ctx->lock);
+        raw_spin_unlock(&ctx->lock);
 }
 
 /*
@@ -1438,7 +1438,7 @@ static void rotate_ctx(struct perf_event_context *ctx)
         if (!ctx->nr_events)
                 return;
 
-        spin_lock(&ctx->lock);
+        raw_spin_lock(&ctx->lock);
         /*
          * Rotate the first entry last (works just fine for group events too):
          */
@@ -1449,7 +1449,7 @@ static void rotate_ctx(struct perf_event_context *ctx)
         }
         perf_enable();
 
-        spin_unlock(&ctx->lock);
+        raw_spin_unlock(&ctx->lock);
 }
 
 void perf_event_task_tick(struct task_struct *curr, int cpu)
@@ -1498,7 +1498,7 @@ static void perf_event_enable_on_exec(struct task_struct *task)
 
         __perf_event_task_sched_out(ctx);
 
-        spin_lock(&ctx->lock);
+        raw_spin_lock(&ctx->lock);
 
         list_for_each_entry(event, &ctx->group_list, group_entry) {
                 if (!event->attr.enable_on_exec)
@@ -1516,7 +1516,7 @@ static void perf_event_enable_on_exec(struct task_struct *task)
         if (enabled)
                 unclone_ctx(ctx);
 
-        spin_unlock(&ctx->lock);
+        raw_spin_unlock(&ctx->lock);
 
         perf_event_task_sched_in(task, smp_processor_id());
  out:
@@ -1542,10 +1542,10 @@ static void __perf_event_read(void *info)
         if (ctx->task && cpuctx->task_ctx != ctx)
                 return;
 
-        spin_lock(&ctx->lock);
+        raw_spin_lock(&ctx->lock);
         update_context_time(ctx);
         update_event_times(event);
-        spin_unlock(&ctx->lock);
+        raw_spin_unlock(&ctx->lock);
 
         event->pmu->read(event);
 }
@@ -1563,10 +1563,10 @@ static u64 perf_event_read(struct perf_event *event)
                 struct perf_event_context *ctx = event->ctx;
                 unsigned long flags;
 
-                spin_lock_irqsave(&ctx->lock, flags);
+                raw_spin_lock_irqsave(&ctx->lock, flags);
                 update_context_time(ctx);
                 update_event_times(event);
-                spin_unlock_irqrestore(&ctx->lock, flags);
+                raw_spin_unlock_irqrestore(&ctx->lock, flags);
         }
 
         return atomic64_read(&event->count);
@@ -1579,7 +1579,7 @@ static void
 __perf_event_init_context(struct perf_event_context *ctx,
                             struct task_struct *task)
 {
-        spin_lock_init(&ctx->lock);
+        raw_spin_lock_init(&ctx->lock);
         mutex_init(&ctx->mutex);
         INIT_LIST_HEAD(&ctx->group_list);
         INIT_LIST_HEAD(&ctx->event_list);
@@ -1649,7 +1649,7 @@ static struct perf_event_context *find_get_context(pid_t pid, int cpu)
         ctx = perf_lock_task_context(task, &flags);
         if (ctx) {
                 unclone_ctx(ctx);
-                spin_unlock_irqrestore(&ctx->lock, flags);
+                raw_spin_unlock_irqrestore(&ctx->lock, flags);
         }
 
         if (!ctx) {
@@ -1987,7 +1987,7 @@ static int perf_event_period(struct perf_event *event, u64 __user *arg)
         if (!value)
                 return -EINVAL;
 
-        spin_lock_irq(&ctx->lock);
+        raw_spin_lock_irq(&ctx->lock);
         if (event->attr.freq) {
                 if (value > sysctl_perf_event_sample_rate) {
                         ret = -EINVAL;
@@ -2000,7 +2000,7 @@ static int perf_event_period(struct perf_event *event, u64 __user *arg)
                 event->hw.sample_period = value;
         }
 unlock:
-        spin_unlock_irq(&ctx->lock);
+        raw_spin_unlock_irq(&ctx->lock);
 
         return ret;
 }
@@ -4992,7 +4992,7 @@ void perf_event_exit_task(struct task_struct *child)
          * reading child->perf_event_ctxp, we wait until it has
          * incremented the context's refcount before we do put_ctx below.
          */
-        spin_lock(&child_ctx->lock);
+        raw_spin_lock(&child_ctx->lock);
         child->perf_event_ctxp = NULL;
         /*
          * If this context is a clone; unclone it so it can't get
@@ -5001,7 +5001,7 @@ void perf_event_exit_task(struct task_struct *child)
          */
         unclone_ctx(child_ctx);
         update_context_time(child_ctx);
-        spin_unlock_irqrestore(&child_ctx->lock, flags);
+        raw_spin_unlock_irqrestore(&child_ctx->lock, flags);
 
         /*
          * Report the task dead after unscheduling the events so that we
@@ -5292,11 +5292,11 @@ perf_set_reserve_percpu(struct sysdev_class *class,
         perf_reserved_percpu = val;
         for_each_online_cpu(cpu) {
                 cpuctx = &per_cpu(perf_cpu_context, cpu);
-                spin_lock_irq(&cpuctx->ctx.lock);
+                raw_spin_lock_irq(&cpuctx->ctx.lock);
                 mpt = min(perf_max_events - cpuctx->ctx.nr_events,
                           perf_max_events - perf_reserved_percpu);
                 cpuctx->max_pertask = mpt;
-                spin_unlock_irq(&cpuctx->ctx.lock);
+                raw_spin_unlock_irq(&cpuctx->ctx.lock);
         }
         spin_unlock(&perf_resource_lock);
 
diff --git a/kernel/pid.c b/kernel/pid.c
index d3f722d20f9c..2e17c9c92cbe 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -141,11 +141,12 @@ static int alloc_pidmap(struct pid_namespace *pid_ns)
                          * installing it:
                          */
                         spin_lock_irq(&pidmap_lock);
-                        if (map->page)
-                                kfree(page);
-                        else
+                        if (!map->page) {
                                 map->page = page;
+                                page = NULL;
+                        }
                         spin_unlock_irq(&pidmap_lock);
+                        kfree(page);
                         if (unlikely(!map->page))
                                 break;
                 }
@@ -268,12 +269,11 @@ struct pid *alloc_pid(struct pid_namespace *ns)
         for (type = 0; type < PIDTYPE_MAX; ++type)
                 INIT_HLIST_HEAD(&pid->tasks[type]);
 
+        upid = pid->numbers + ns->level;
         spin_lock_irq(&pidmap_lock);
-        for (i = ns->level; i >= 0; i--) {
-                upid = &pid->numbers[i];
+        for ( ; upid >= pid->numbers; --upid)
                 hlist_add_head_rcu(&upid->pid_chain,
                                 &pid_hash[pid_hashfn(upid->nr, upid->ns)]);
-        }
         spin_unlock_irq(&pidmap_lock);
 
 out:
diff --git a/kernel/power/console.c b/kernel/power/console.c
index 5187136fe1de..218e5af90156 100644
--- a/kernel/power/console.c
+++ b/kernel/power/console.c
@@ -6,7 +6,7 @@
 
 #include <linux/vt_kern.h>
 #include <linux/kbd_kern.h>
-#include <linux/console.h>
+#include <linux/vt.h>
 #include <linux/module.h>
 #include "power.h"
 
@@ -21,8 +21,7 @@ int pm_prepare_console(void)
         if (orig_fgconsole < 0)
                 return 1;
 
-        orig_kmsg = kmsg_redirect;
-        kmsg_redirect = SUSPEND_CONSOLE;
+        orig_kmsg = vt_kmsg_redirect(SUSPEND_CONSOLE);
         return 0;
 }
 
@@ -30,7 +29,7 @@ void pm_restore_console(void)
 {
         if (orig_fgconsole >= 0) {
                 vt_move_to_console(orig_fgconsole, 0);
-                kmsg_redirect = orig_kmsg;
+                vt_kmsg_redirect(orig_kmsg);
         }
 }
 #endif
diff --git a/kernel/printk.c b/kernel/printk.c
index b5ac4d99c667..1ded8e7dd19b 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -34,6 +34,7 @@
 #include <linux/syscalls.h>
 #include <linux/kexec.h>
 #include <linux/ratelimit.h>
+#include <linux/kmsg_dump.h>
 
 #include <asm/uaccess.h>
 
@@ -1405,4 +1406,122 @@ bool printk_timed_ratelimit(unsigned long *caller_jiffies,
         return false;
 }
 EXPORT_SYMBOL(printk_timed_ratelimit);
+
+static DEFINE_SPINLOCK(dump_list_lock);
+static LIST_HEAD(dump_list);
+
+/**
+ * kmsg_dump_register - register a kernel log dumper.
+ * @dump: pointer to the kmsg_dumper structure
+ *
+ * Adds a kernel log dumper to the system. The dump callback in the
+ * structure will be called when the kernel oopses or panics and must be
+ * set. Returns zero on success and %-EINVAL or %-EBUSY otherwise.
+ */
+int kmsg_dump_register(struct kmsg_dumper *dumper)
+{
+        unsigned long flags;
+        int err = -EBUSY;
+
+        /* The dump callback needs to be set */
+        if (!dumper->dump)
+                return -EINVAL;
+
+        spin_lock_irqsave(&dump_list_lock, flags);
+        /* Don't allow registering multiple times */
+        if (!dumper->registered) {
+                dumper->registered = 1;
+                list_add_tail(&dumper->list, &dump_list);
+                err = 0;
+        }
+        spin_unlock_irqrestore(&dump_list_lock, flags);
+
+        return err;
+}
+EXPORT_SYMBOL_GPL(kmsg_dump_register);
+
+/**
+ * kmsg_dump_unregister - unregister a kmsg dumper.
+ * @dump: pointer to the kmsg_dumper structure
+ *
+ * Removes a dump device from the system. Returns zero on success and
+ * %-EINVAL otherwise.
+ */
+int kmsg_dump_unregister(struct kmsg_dumper *dumper)
+{
+        unsigned long flags;
+        int err = -EINVAL;
+
+        spin_lock_irqsave(&dump_list_lock, flags);
+        if (dumper->registered) {
+                dumper->registered = 0;
+                list_del(&dumper->list);
+                err = 0;
+        }
+        spin_unlock_irqrestore(&dump_list_lock, flags);
+
+        return err;
+}
+EXPORT_SYMBOL_GPL(kmsg_dump_unregister);
+
+static const char const *kmsg_reasons[] = {
+        [KMSG_DUMP_OOPS]        = "oops",
+        [KMSG_DUMP_PANIC]       = "panic",
+};
+
+static const char *kmsg_to_str(enum kmsg_dump_reason reason)
+{
+        if (reason >= ARRAY_SIZE(kmsg_reasons) || reason < 0)
+                return "unknown";
+
+        return kmsg_reasons[reason];
+}
+
+/**
+ * kmsg_dump - dump kernel log to kernel message dumpers.
+ * @reason: the reason (oops, panic etc) for dumping
+ *
+ * Iterate through each of the dump devices and call the oops/panic
+ * callbacks with the log buffer.
+ */
+void kmsg_dump(enum kmsg_dump_reason reason)
+{
+        unsigned long end;
+        unsigned chars;
+        struct kmsg_dumper *dumper;
+        const char *s1, *s2;
+        unsigned long l1, l2;
+        unsigned long flags;
+
+        /* Theoretically, the log could move on after we do this, but
+           there's not a lot we can do about that. The new messages
+           will overwrite the start of what we dump. */
+        spin_lock_irqsave(&logbuf_lock, flags);
+        end = log_end & LOG_BUF_MASK;
+        chars = logged_chars;
+        spin_unlock_irqrestore(&logbuf_lock, flags);
+
+        if (logged_chars > end) {
+                s1 = log_buf + log_buf_len - logged_chars + end;
+                l1 = logged_chars - end;
+
+                s2 = log_buf;
+                l2 = end;
+        } else {
+                s1 = "";
+                l1 = 0;
+
+                s2 = log_buf + end - logged_chars;
+                l2 = logged_chars;
+        }
+
+        if (!spin_trylock_irqsave(&dump_list_lock, flags)) {
+                printk(KERN_ERR "dump_kmsg: dump list lock is held during %s, skipping dump\n",
+                                kmsg_to_str(reason));
+                return;
+        }
+        list_for_each_entry(dumper, &dump_list, list)
+                dumper->dump(dumper, reason, s1, l1, s2, l2);
+        spin_unlock_irqrestore(&dump_list_lock, flags);
+}
 #endif
diff --git a/kernel/relay.c b/kernel/relay.c
index 760c26209a3c..c705a41b4ba3 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1198,7 +1198,7 @@ static void relay_pipe_buf_release(struct pipe_inode_info *pipe,
         relay_consume_bytes(rbuf, buf->private);
 }
 
-static struct pipe_buf_operations relay_pipe_buf_ops = {
+static const struct pipe_buf_operations relay_pipe_buf_ops = {
         .can_merge = 0,
         .map = generic_pipe_buf_map,
         .unmap = generic_pipe_buf_unmap,
diff --git a/kernel/rtmutex-debug.c b/kernel/rtmutex-debug.c
index 5fcb4fe645e2..ddabb54bb5c8 100644
--- a/kernel/rtmutex-debug.c
+++ b/kernel/rtmutex-debug.c
@@ -37,8 +37,8 @@ do {								\
         if (rt_trace_on) {                                      \
                 rt_trace_on = 0;                                \
                 console_verbose();                              \
-                if (spin_is_locked(&current->pi_lock))          \
-                        spin_unlock(&current->pi_lock);         \
+                if (raw_spin_is_locked(&current->pi_lock))      \
+                        raw_spin_unlock(&current->pi_lock);     \
         }                                                       \
 } while (0)
 
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
index 29bd4baf9e75..a9604815786a 100644
--- a/kernel/rtmutex.c
+++ b/kernel/rtmutex.c
@@ -138,9 +138,9 @@ static void rt_mutex_adjust_prio(struct task_struct *task)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&task->pi_lock, flags);
+        raw_spin_lock_irqsave(&task->pi_lock, flags);
         __rt_mutex_adjust_prio(task);
-        spin_unlock_irqrestore(&task->pi_lock, flags);
+        raw_spin_unlock_irqrestore(&task->pi_lock, flags);
 }
 
 /*
@@ -195,7 +195,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
         /*
          * Task can not go away as we did a get_task() before !
          */
-        spin_lock_irqsave(&task->pi_lock, flags);
+        raw_spin_lock_irqsave(&task->pi_lock, flags);
 
         waiter = task->pi_blocked_on;
         /*
@@ -231,8 +231,8 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
                 goto out_unlock_pi;
 
         lock = waiter->lock;
-        if (!spin_trylock(&lock->wait_lock)) {
-                spin_unlock_irqrestore(&task->pi_lock, flags);
+        if (!raw_spin_trylock(&lock->wait_lock)) {
+                raw_spin_unlock_irqrestore(&task->pi_lock, flags);
                 cpu_relax();
                 goto retry;
         }
@@ -240,7 +240,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
         /* Deadlock detection */
         if (lock == orig_lock || rt_mutex_owner(lock) == top_task) {
                 debug_rt_mutex_deadlock(deadlock_detect, orig_waiter, lock);
-                spin_unlock(&lock->wait_lock);
+                raw_spin_unlock(&lock->wait_lock);
                 ret = deadlock_detect ? -EDEADLK : 0;
                 goto out_unlock_pi;
         }
@@ -253,13 +253,13 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
         plist_add(&waiter->list_entry, &lock->wait_list);
 
         /* Release the task */
-        spin_unlock_irqrestore(&task->pi_lock, flags);
+        raw_spin_unlock_irqrestore(&task->pi_lock, flags);
         put_task_struct(task);
 
         /* Grab the next task */
         task = rt_mutex_owner(lock);
         get_task_struct(task);
-        spin_lock_irqsave(&task->pi_lock, flags);
+        raw_spin_lock_irqsave(&task->pi_lock, flags);
 
         if (waiter == rt_mutex_top_waiter(lock)) {
                 /* Boost the owner */
@@ -277,10 +277,10 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
                 __rt_mutex_adjust_prio(task);
         }
 
-        spin_unlock_irqrestore(&task->pi_lock, flags);
+        raw_spin_unlock_irqrestore(&task->pi_lock, flags);
 
         top_waiter = rt_mutex_top_waiter(lock);
-        spin_unlock(&lock->wait_lock);
+        raw_spin_unlock(&lock->wait_lock);
 
         if (!detect_deadlock && waiter != top_waiter)
                 goto out_put_task;
@@ -288,7 +288,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
         goto again;
 
  out_unlock_pi:
-        spin_unlock_irqrestore(&task->pi_lock, flags);
+        raw_spin_unlock_irqrestore(&task->pi_lock, flags);
  out_put_task:
         put_task_struct(task);
 
@@ -313,9 +313,9 @@ static inline int try_to_steal_lock(struct rt_mutex *lock,
         if (pendowner == task)
                 return 1;
 
-        spin_lock_irqsave(&pendowner->pi_lock, flags);
+        raw_spin_lock_irqsave(&pendowner->pi_lock, flags);
         if (task->prio >= pendowner->prio) {
-                spin_unlock_irqrestore(&pendowner->pi_lock, flags);
+                raw_spin_unlock_irqrestore(&pendowner->pi_lock, flags);
                 return 0;
         }
 
@@ -325,7 +325,7 @@ static inline int try_to_steal_lock(struct rt_mutex *lock,
          * priority.
          */
         if (likely(!rt_mutex_has_waiters(lock))) {
-                spin_unlock_irqrestore(&pendowner->pi_lock, flags);
+                raw_spin_unlock_irqrestore(&pendowner->pi_lock, flags);
                 return 1;
         }
 
@@ -333,7 +333,7 @@ static inline int try_to_steal_lock(struct rt_mutex *lock,
         next = rt_mutex_top_waiter(lock);
         plist_del(&next->pi_list_entry, &pendowner->pi_waiters);
         __rt_mutex_adjust_prio(pendowner);
-        spin_unlock_irqrestore(&pendowner->pi_lock, flags);
+        raw_spin_unlock_irqrestore(&pendowner->pi_lock, flags);
 
         /*
          * We are going to steal the lock and a waiter was
@@ -350,10 +350,10 @@ static inline int try_to_steal_lock(struct rt_mutex *lock,
          * might be task:
          */
         if (likely(next->task != task)) {
-                spin_lock_irqsave(&task->pi_lock, flags);
+                raw_spin_lock_irqsave(&task->pi_lock, flags);
                 plist_add(&next->pi_list_entry, &task->pi_waiters);
                 __rt_mutex_adjust_prio(task);
-                spin_unlock_irqrestore(&task->pi_lock, flags);
+                raw_spin_unlock_irqrestore(&task->pi_lock, flags);
         }
         return 1;
 }
@@ -420,7 +420,7 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
         unsigned long flags;
         int chain_walk = 0, res;
 
-        spin_lock_irqsave(&task->pi_lock, flags);
+        raw_spin_lock_irqsave(&task->pi_lock, flags);
         __rt_mutex_adjust_prio(task);
         waiter->task = task;
         waiter->lock = lock;
@@ -434,17 +434,17 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
 
         task->pi_blocked_on = waiter;
 
-        spin_unlock_irqrestore(&task->pi_lock, flags);
+        raw_spin_unlock_irqrestore(&task->pi_lock, flags);
 
         if (waiter == rt_mutex_top_waiter(lock)) {
-                spin_lock_irqsave(&owner->pi_lock, flags);
+                raw_spin_lock_irqsave(&owner->pi_lock, flags);
                 plist_del(&top_waiter->pi_list_entry, &owner->pi_waiters);
                 plist_add(&waiter->pi_list_entry, &owner->pi_waiters);
 
                 __rt_mutex_adjust_prio(owner);
                 if (owner->pi_blocked_on)
                         chain_walk = 1;
-                spin_unlock_irqrestore(&owner->pi_lock, flags);
+                raw_spin_unlock_irqrestore(&owner->pi_lock, flags);
         }
         else if (debug_rt_mutex_detect_deadlock(waiter, detect_deadlock))
                 chain_walk = 1;
@@ -459,12 +459,12 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
          */
         get_task_struct(owner);
 
-        spin_unlock(&lock->wait_lock);
+        raw_spin_unlock(&lock->wait_lock);
 
         res = rt_mutex_adjust_prio_chain(owner, detect_deadlock, lock, waiter,
                                          task);
 
-        spin_lock(&lock->wait_lock);
+        raw_spin_lock(&lock->wait_lock);
 
         return res;
 }
@@ -483,7 +483,7 @@ static void wakeup_next_waiter(struct rt_mutex *lock)
         struct task_struct *pendowner;
         unsigned long flags;
 
-        spin_lock_irqsave(&current->pi_lock, flags);
+        raw_spin_lock_irqsave(&current->pi_lock, flags);
 
         waiter = rt_mutex_top_waiter(lock);
         plist_del(&waiter->list_entry, &lock->wait_list);
@@ -500,7 +500,7 @@ static void wakeup_next_waiter(struct rt_mutex *lock)
 
         rt_mutex_set_owner(lock, pendowner, RT_MUTEX_OWNER_PENDING);
 
-        spin_unlock_irqrestore(&current->pi_lock, flags);
+        raw_spin_unlock_irqrestore(&current->pi_lock, flags);
 
         /*
          * Clear the pi_blocked_on variable and enqueue a possible
@@ -509,7 +509,7 @@ static void wakeup_next_waiter(struct rt_mutex *lock)
          * waiter with higher priority than pending-owner->normal_prio
          * is blocked on the unboosted (pending) owner.
          */
-        spin_lock_irqsave(&pendowner->pi_lock, flags);
+        raw_spin_lock_irqsave(&pendowner->pi_lock, flags);
 
         WARN_ON(!pendowner->pi_blocked_on);
         WARN_ON(pendowner->pi_blocked_on != waiter);
@@ -523,7 +523,7 @@ static void wakeup_next_waiter(struct rt_mutex *lock)
                 next = rt_mutex_top_waiter(lock);
                 plist_add(&next->pi_list_entry, &pendowner->pi_waiters);
         }
-        spin_unlock_irqrestore(&pendowner->pi_lock, flags);
+        raw_spin_unlock_irqrestore(&pendowner->pi_lock, flags);
 
         wake_up_process(pendowner);
 }
@@ -541,15 +541,15 @@ static void remove_waiter(struct rt_mutex *lock,
         unsigned long flags;
         int chain_walk = 0;
 
-        spin_lock_irqsave(&current->pi_lock, flags);
+        raw_spin_lock_irqsave(&current->pi_lock, flags);
         plist_del(&waiter->list_entry, &lock->wait_list);
         waiter->task = NULL;
         current->pi_blocked_on = NULL;
-        spin_unlock_irqrestore(&current->pi_lock, flags);
+        raw_spin_unlock_irqrestore(&current->pi_lock, flags);
 
         if (first && owner != current) {
 
-                spin_lock_irqsave(&owner->pi_lock, flags);
+                raw_spin_lock_irqsave(&owner->pi_lock, flags);
 
                 plist_del(&waiter->pi_list_entry, &owner->pi_waiters);
 
@@ -564,7 +564,7 @@ static void remove_waiter(struct rt_mutex *lock,
                 if (owner->pi_blocked_on)
                         chain_walk = 1;
 
-                spin_unlock_irqrestore(&owner->pi_lock, flags);
+                raw_spin_unlock_irqrestore(&owner->pi_lock, flags);
         }
 
         WARN_ON(!plist_node_empty(&waiter->pi_list_entry));
@@ -575,11 +575,11 @@ static void remove_waiter(struct rt_mutex *lock,
         /* gets dropped in rt_mutex_adjust_prio_chain()! */
         get_task_struct(owner);
 
-        spin_unlock(&lock->wait_lock);
+        raw_spin_unlock(&lock->wait_lock);
 
         rt_mutex_adjust_prio_chain(owner, 0, lock, NULL, current);
 
-        spin_lock(&lock->wait_lock);
+        raw_spin_lock(&lock->wait_lock);
 }
 
 /*
@@ -592,15 +592,15 @@ void rt_mutex_adjust_pi(struct task_struct *task)
         struct rt_mutex_waiter *waiter;
         unsigned long flags;
 
-        spin_lock_irqsave(&task->pi_lock, flags);
+        raw_spin_lock_irqsave(&task->pi_lock, flags);
 
         waiter = task->pi_blocked_on;
         if (!waiter || waiter->list_entry.prio == task->prio) {
-                spin_unlock_irqrestore(&task->pi_lock, flags);
+                raw_spin_unlock_irqrestore(&task->pi_lock, flags);
                 return;
         }
 
-        spin_unlock_irqrestore(&task->pi_lock, flags);
+        raw_spin_unlock_irqrestore(&task->pi_lock, flags);
 
         /* gets dropped in rt_mutex_adjust_prio_chain()! */
         get_task_struct(task);
@@ -672,14 +672,14 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state,
                                 break;
                 }
 
-                spin_unlock(&lock->wait_lock);
+                raw_spin_unlock(&lock->wait_lock);
 
                 debug_rt_mutex_print_deadlock(waiter);
 
                 if (waiter->task)
                         schedule_rt_mutex(lock);
 
-                spin_lock(&lock->wait_lock);
+                raw_spin_lock(&lock->wait_lock);
                 set_current_state(state);
         }
 
@@ -700,11 +700,11 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
         debug_rt_mutex_init_waiter(&waiter);
         waiter.task = NULL;
 
-        spin_lock(&lock->wait_lock);
+        raw_spin_lock(&lock->wait_lock);
 
         /* Try to acquire the lock again: */
         if (try_to_take_rt_mutex(lock)) {
-                spin_unlock(&lock->wait_lock);
+                raw_spin_unlock(&lock->wait_lock);
                 return 0;
         }
 
@@ -731,7 +731,7 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
          */
         fixup_rt_mutex_waiters(lock);
 
-        spin_unlock(&lock->wait_lock);
+        raw_spin_unlock(&lock->wait_lock);
 
         /* Remove pending timer: */
         if (unlikely(timeout))
@@ -758,7 +758,7 @@ rt_mutex_slowtrylock(struct rt_mutex *lock)
 {
         int ret = 0;
 
-        spin_lock(&lock->wait_lock);
+        raw_spin_lock(&lock->wait_lock);
 
         if (likely(rt_mutex_owner(lock) != current)) {
 
@@ -770,7 +770,7 @@ rt_mutex_slowtrylock(struct rt_mutex *lock)
                 fixup_rt_mutex_waiters(lock);
         }
 
-        spin_unlock(&lock->wait_lock);
+        raw_spin_unlock(&lock->wait_lock);
 
         return ret;
 }
@@ -781,7 +781,7 @@ rt_mutex_slowtrylock(struct rt_mutex *lock)
 static void __sched
 rt_mutex_slowunlock(struct rt_mutex *lock)
 {
-        spin_lock(&lock->wait_lock);
+        raw_spin_lock(&lock->wait_lock);
 
         debug_rt_mutex_unlock(lock);
 
@@ -789,13 +789,13 @@ rt_mutex_slowunlock(struct rt_mutex *lock)
 
         if (!rt_mutex_has_waiters(lock)) {
                 lock->owner = NULL;
-                spin_unlock(&lock->wait_lock);
+                raw_spin_unlock(&lock->wait_lock);
                 return;
         }
 
         wakeup_next_waiter(lock);
 
-        spin_unlock(&lock->wait_lock);
+        raw_spin_unlock(&lock->wait_lock);
 
         /* Undo pi boosting if necessary: */
         rt_mutex_adjust_prio(current);
@@ -970,8 +970,8 @@ EXPORT_SYMBOL_GPL(rt_mutex_destroy);
 void __rt_mutex_init(struct rt_mutex *lock, const char *name)
 {
         lock->owner = NULL;
-        spin_lock_init(&lock->wait_lock);
-        plist_head_init(&lock->wait_list, &lock->wait_lock);
+        raw_spin_lock_init(&lock->wait_lock);
+        plist_head_init_raw(&lock->wait_list, &lock->wait_lock);
 
         debug_rt_mutex_init(lock, name);
 }
@@ -1032,7 +1032,7 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
 {
         int ret;
 
-        spin_lock(&lock->wait_lock);
+        raw_spin_lock(&lock->wait_lock);
 
         mark_rt_mutex_waiters(lock);
 
@@ -1040,7 +1040,7 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
                 /* We got the lock for task. */
                 debug_rt_mutex_lock(lock);
                 rt_mutex_set_owner(lock, task, 0);
-                spin_unlock(&lock->wait_lock);
+                raw_spin_unlock(&lock->wait_lock);
                 rt_mutex_deadlock_account_lock(lock, task);
                 return 1;
         }
@@ -1056,7 +1056,7 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
                  */
                 ret = 0;
         }
-        spin_unlock(&lock->wait_lock);
+        raw_spin_unlock(&lock->wait_lock);
 
         debug_rt_mutex_print_deadlock(waiter);
 
@@ -1106,7 +1106,7 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
 {
         int ret;
 
-        spin_lock(&lock->wait_lock);
+        raw_spin_lock(&lock->wait_lock);
 
         set_current_state(TASK_INTERRUPTIBLE);
 
@@ -1124,7 +1124,7 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
          */
         fixup_rt_mutex_waiters(lock);
 
-        spin_unlock(&lock->wait_lock);
+        raw_spin_unlock(&lock->wait_lock);
 
         /*
          * Readjust priority, when we did not get the lock. We might have been
diff --git a/kernel/sched.c b/kernel/sched.c
index fd05861b2111..18cceeecce35 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -141,7 +141,7 @@ struct rt_prio_array {
 
 struct rt_bandwidth {
         /* nests inside the rq lock: */
-        spinlock_t              rt_runtime_lock;
+        raw_spinlock_t          rt_runtime_lock;
         ktime_t                 rt_period;
         u64                     rt_runtime;
         struct hrtimer          rt_period_timer;
@@ -178,7 +178,7 @@ void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime)
         rt_b->rt_period = ns_to_ktime(period);
         rt_b->rt_runtime = runtime;
 
-        spin_lock_init(&rt_b->rt_runtime_lock);
+        raw_spin_lock_init(&rt_b->rt_runtime_lock);
 
         hrtimer_init(&rt_b->rt_period_timer,
                         CLOCK_MONOTONIC, HRTIMER_MODE_REL);
@@ -200,7 +200,7 @@ static void start_rt_bandwidth(struct rt_bandwidth *rt_b)
         if (hrtimer_active(&rt_b->rt_period_timer))
                 return;
 
-        spin_lock(&rt_b->rt_runtime_lock);
+        raw_spin_lock(&rt_b->rt_runtime_lock);
         for (;;) {
                 unsigned long delta;
                 ktime_t soft, hard;
@@ -217,7 +217,7 @@ static void start_rt_bandwidth(struct rt_bandwidth *rt_b)
                 __hrtimer_start_range_ns(&rt_b->rt_period_timer, soft, delta,
                                 HRTIMER_MODE_ABS_PINNED, 0);
         }
-        spin_unlock(&rt_b->rt_runtime_lock);
+        raw_spin_unlock(&rt_b->rt_runtime_lock);
 }
 
 #ifdef CONFIG_RT_GROUP_SCHED
@@ -470,7 +470,7 @@ struct rt_rq {
         u64 rt_time;
         u64 rt_runtime;
         /* Nests inside the rq lock: */
-        spinlock_t rt_runtime_lock;
+        raw_spinlock_t rt_runtime_lock;
 
 #ifdef CONFIG_RT_GROUP_SCHED
         unsigned long rt_nr_boosted;
@@ -525,7 +525,7 @@ static struct root_domain def_root_domain;
  */
 struct rq {
         /* runqueue lock: */
-        spinlock_t lock;
+        raw_spinlock_t lock;
 
         /*
          * nr_running and cpu_load should be in the same cacheline because
@@ -685,7 +685,7 @@ inline void update_rq_clock(struct rq *rq)
  */
 int runqueue_is_locked(int cpu)
 {
-        return spin_is_locked(&cpu_rq(cpu)->lock);
+        return raw_spin_is_locked(&cpu_rq(cpu)->lock);
 }
 
 /*
@@ -893,7 +893,7 @@ static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
          */
         spin_acquire(&rq->lock.dep_map, 0, 0, _THIS_IP_);
 
-        spin_unlock_irq(&rq->lock);
+        raw_spin_unlock_irq(&rq->lock);
 }
 
 #else /* __ARCH_WANT_UNLOCKED_CTXSW */
@@ -917,9 +917,9 @@ static inline void prepare_lock_switch(struct rq *rq, struct task_struct *next)
         next->oncpu = 1;
 #endif
 #ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW
-        spin_unlock_irq(&rq->lock);
+        raw_spin_unlock_irq(&rq->lock);
 #else
-        spin_unlock(&rq->lock);
+        raw_spin_unlock(&rq->lock);
 #endif
 }
 
@@ -949,10 +949,10 @@ static inline struct rq *__task_rq_lock(struct task_struct *p)
 {
         for (;;) {
                 struct rq *rq = task_rq(p);
-                spin_lock(&rq->lock);
+                raw_spin_lock(&rq->lock);
                 if (likely(rq == task_rq(p)))
                         return rq;
-                spin_unlock(&rq->lock);
+                raw_spin_unlock(&rq->lock);
         }
 }
 
@@ -969,10 +969,10 @@ static struct rq *task_rq_lock(struct task_struct *p, unsigned long *flags)
         for (;;) {
                 local_irq_save(*flags);
                 rq = task_rq(p);
-                spin_lock(&rq->lock);
+                raw_spin_lock(&rq->lock);
                 if (likely(rq == task_rq(p)))
                         return rq;
-                spin_unlock_irqrestore(&rq->lock, *flags);
+                raw_spin_unlock_irqrestore(&rq->lock, *flags);
         }
 }
 
@@ -981,19 +981,19 @@ void task_rq_unlock_wait(struct task_struct *p)
         struct rq *rq = task_rq(p);
 
         smp_mb(); /* spin-unlock-wait is not a full memory barrier */
-        spin_unlock_wait(&rq->lock);
+        raw_spin_unlock_wait(&rq->lock);
 }
 
 static void __task_rq_unlock(struct rq *rq)
         __releases(rq->lock)
 {
-        spin_unlock(&rq->lock);
+        raw_spin_unlock(&rq->lock);
 }
 
 static inline void task_rq_unlock(struct rq *rq, unsigned long *flags)
         __releases(rq->lock)
 {
-        spin_unlock_irqrestore(&rq->lock, *flags);
+        raw_spin_unlock_irqrestore(&rq->lock, *flags);
 }
 
 /*
@@ -1006,7 +1006,7 @@ static struct rq *this_rq_lock(void)
 
         local_irq_disable();
         rq = this_rq();
-        spin_lock(&rq->lock);
+        raw_spin_lock(&rq->lock);
 
         return rq;
 }
@@ -1053,10 +1053,10 @@ static enum hrtimer_restart hrtick(struct hrtimer *timer)
 
         WARN_ON_ONCE(cpu_of(rq) != smp_processor_id());
 
-        spin_lock(&rq->lock);
+        raw_spin_lock(&rq->lock);
         update_rq_clock(rq);
         rq->curr->sched_class->task_tick(rq, rq->curr, 1);
-        spin_unlock(&rq->lock);
+        raw_spin_unlock(&rq->lock);
 
         return HRTIMER_NORESTART;
 }
@@ -1069,10 +1069,10 @@ static void __hrtick_start(void *arg)
 {
         struct rq *rq = arg;
 
-        spin_lock(&rq->lock);
+        raw_spin_lock(&rq->lock);
         hrtimer_restart(&rq->hrtick_timer);
         rq->hrtick_csd_pending = 0;
-        spin_unlock(&rq->lock);
+        raw_spin_unlock(&rq->lock);
 }
 
 /*
@@ -1179,7 +1179,7 @@ static void resched_task(struct task_struct *p)
 {
         int cpu;
 
-        assert_spin_locked(&task_rq(p)->lock);
+        assert_raw_spin_locked(&task_rq(p)->lock);
 
         if (test_tsk_need_resched(p))
                 return;
@@ -1201,10 +1201,10 @@ static void resched_cpu(int cpu)
         struct rq *rq = cpu_rq(cpu);
         unsigned long flags;
 
-        if (!spin_trylock_irqsave(&rq->lock, flags))
+        if (!raw_spin_trylock_irqsave(&rq->lock, flags))
                 return;
         resched_task(cpu_curr(cpu));
-        spin_unlock_irqrestore(&rq->lock, flags);
+        raw_spin_unlock_irqrestore(&rq->lock, flags);
 }
 
 #ifdef CONFIG_NO_HZ
@@ -1273,7 +1273,7 @@ static void sched_rt_avg_update(struct rq *rq, u64 rt_delta)
 #else /* !CONFIG_SMP */
 static void resched_task(struct task_struct *p)
 {
-        assert_spin_locked(&task_rq(p)->lock);
+        assert_raw_spin_locked(&task_rq(p)->lock);
         set_tsk_need_resched(p);
 }
 
@@ -1600,11 +1600,11 @@ static void update_group_shares_cpu(struct task_group *tg, int cpu,
                 struct rq *rq = cpu_rq(cpu);
                 unsigned long flags;
 
-                spin_lock_irqsave(&rq->lock, flags);
+                raw_spin_lock_irqsave(&rq->lock, flags);
                 tg->cfs_rq[cpu]->rq_weight = boost ? 0 : rq_weight;
                 tg->cfs_rq[cpu]->shares = boost ? 0 : shares;
                 __set_se_shares(tg->se[cpu], shares);
-                spin_unlock_irqrestore(&rq->lock, flags);
+                raw_spin_unlock_irqrestore(&rq->lock, flags);
         }
 }
 
@@ -1706,9 +1706,9 @@ static void update_shares_locked(struct rq *rq, struct sched_domain *sd)
         if (root_task_group_empty())
                 return;
 
-        spin_unlock(&rq->lock);
+        raw_spin_unlock(&rq->lock);
         update_shares(sd);
-        spin_lock(&rq->lock);
+        raw_spin_lock(&rq->lock);
 }
 
 static void update_h_load(long cpu)
@@ -1748,7 +1748,7 @@ static inline int _double_lock_balance(struct rq *this_rq, struct rq *busiest)
         __acquires(busiest->lock)
         __acquires(this_rq->lock)
 {
-        spin_unlock(&this_rq->lock);
+        raw_spin_unlock(&this_rq->lock);
         double_rq_lock(this_rq, busiest);
 
         return 1;
@@ -1769,14 +1769,16 @@ static int _double_lock_balance(struct rq *this_rq, struct rq *busiest)
 {
         int ret = 0;
 
-        if (unlikely(!spin_trylock(&busiest->lock))) {
+        if (unlikely(!raw_spin_trylock(&busiest->lock))) {
                 if (busiest < this_rq) {
-                        spin_unlock(&this_rq->lock);
-                        spin_lock(&busiest->lock);
-                        spin_lock_nested(&this_rq->lock, SINGLE_DEPTH_NESTING);
+                        raw_spin_unlock(&this_rq->lock);
+                        raw_spin_lock(&busiest->lock);
+                        raw_spin_lock_nested(&this_rq->lock,
+                                              SINGLE_DEPTH_NESTING);
                         ret = 1;
                 } else
-                        spin_lock_nested(&busiest->lock, SINGLE_DEPTH_NESTING);
+                        raw_spin_lock_nested(&busiest->lock,
+                                              SINGLE_DEPTH_NESTING);
         }
         return ret;
 }
@@ -1790,7 +1792,7 @@ static int double_lock_balance(struct rq *this_rq, struct rq *busiest)
 {
         if (unlikely(!irqs_disabled())) {
                 /* printk() doesn't work good under rq->lock */
-                spin_unlock(&this_rq->lock);
+                raw_spin_unlock(&this_rq->lock);
                 BUG_ON(1);
         }
 
@@ -1800,7 +1802,7 @@ static int double_lock_balance(struct rq *this_rq, struct rq *busiest)
 static inline void double_unlock_balance(struct rq *this_rq, struct rq *busiest)
         __releases(busiest->lock)
 {
-        spin_unlock(&busiest->lock);
+        raw_spin_unlock(&busiest->lock);
         lock_set_subclass(&this_rq->lock.dep_map, 0, _RET_IP_);
 }
 #endif
@@ -2023,13 +2025,13 @@ void kthread_bind(struct task_struct *p, unsigned int cpu)
                 return;
         }
 
-        spin_lock_irqsave(&rq->lock, flags);
+        raw_spin_lock_irqsave(&rq->lock, flags);
         update_rq_clock(rq);
         set_task_cpu(p, cpu);
         p->cpus_allowed = cpumask_of_cpu(cpu);
         p->rt.nr_cpus_allowed = 1;
         p->flags |= PF_THREAD_BOUND;
-        spin_unlock_irqrestore(&rq->lock, flags);
+        raw_spin_unlock_irqrestore(&rq->lock, flags);
 }
 EXPORT_SYMBOL(kthread_bind);
 
@@ -2781,10 +2783,10 @@ static inline void post_schedule(struct rq *rq)
         if (rq->post_schedule) {
                 unsigned long flags;
 
-                spin_lock_irqsave(&rq->lock, flags);
+                raw_spin_lock_irqsave(&rq->lock, flags);
                 if (rq->curr->sched_class->post_schedule)
                         rq->curr->sched_class->post_schedule(rq);
-                spin_unlock_irqrestore(&rq->lock, flags);
+                raw_spin_unlock_irqrestore(&rq->lock, flags);
 
                 rq->post_schedule = 0;
         }
@@ -3066,15 +3068,15 @@ static void double_rq_lock(struct rq *rq1, struct rq *rq2)
 {
         BUG_ON(!irqs_disabled());
         if (rq1 == rq2) {
-                spin_lock(&rq1->lock);
+                raw_spin_lock(&rq1->lock);
                 __acquire(rq2->lock);   /* Fake it out ;) */
         } else {
                 if (rq1 < rq2) {
-                        spin_lock(&rq1->lock);
-                        spin_lock_nested(&rq2->lock, SINGLE_DEPTH_NESTING);
+                        raw_spin_lock(&rq1->lock);
+                        raw_spin_lock_nested(&rq2->lock, SINGLE_DEPTH_NESTING);
                 } else {
-                        spin_lock(&rq2->lock);
-                        spin_lock_nested(&rq1->lock, SINGLE_DEPTH_NESTING);
+                        raw_spin_lock(&rq2->lock);
+                        raw_spin_lock_nested(&rq1->lock, SINGLE_DEPTH_NESTING);
                 }
         }
         update_rq_clock(rq1);
@@ -3091,9 +3093,9 @@ static void double_rq_unlock(struct rq *rq1, struct rq *rq2)
         __releases(rq1->lock)
         __releases(rq2->lock)
 {
-        spin_unlock(&rq1->lock);
+        raw_spin_unlock(&rq1->lock);
         if (rq1 != rq2)
-                spin_unlock(&rq2->lock);
+                raw_spin_unlock(&rq2->lock);
         else
                 __release(rq2->lock);
 }
@@ -4186,14 +4188,15 @@ redo:
 
                 if (unlikely(sd->nr_balance_failed > sd->cache_nice_tries+2)) {
 
-                        spin_lock_irqsave(&busiest->lock, flags);
+                        raw_spin_lock_irqsave(&busiest->lock, flags);
 
                         /* don't kick the migration_thread, if the curr
                          * task on busiest cpu can't be moved to this_cpu
                          */
                         if (!cpumask_test_cpu(this_cpu,
                                               &busiest->curr->cpus_allowed)) {
-                                spin_unlock_irqrestore(&busiest->lock, flags);
+                                raw_spin_unlock_irqrestore(&busiest->lock,
+                                                            flags);
                                 all_pinned = 1;
                                 goto out_one_pinned;
                         }
@@ -4203,7 +4206,7 @@ redo:
                                 busiest->push_cpu = this_cpu;
                                 active_balance = 1;
                         }
-                        spin_unlock_irqrestore(&busiest->lock, flags);
+                        raw_spin_unlock_irqrestore(&busiest->lock, flags);
                         if (active_balance)
                                 wake_up_process(busiest->migration_thread);
 
@@ -4385,10 +4388,10 @@ redo:
                 /*
                  * Should not call ttwu while holding a rq->lock
                  */
-                spin_unlock(&this_rq->lock);
+                raw_spin_unlock(&this_rq->lock);
                 if (active_balance)
                         wake_up_process(busiest->migration_thread);
-                spin_lock(&this_rq->lock);
+                raw_spin_lock(&this_rq->lock);
 
         } else
                 sd->nr_balance_failed = 0;
@@ -5257,11 +5260,11 @@ void scheduler_tick(void)
 
         sched_clock_tick();
 
-        spin_lock(&rq->lock);
+        raw_spin_lock(&rq->lock);
         update_rq_clock(rq);
         update_cpu_load(rq);
         curr->sched_class->task_tick(rq, curr, 0);
-        spin_unlock(&rq->lock);
+        raw_spin_unlock(&rq->lock);
 
         perf_event_task_tick(curr, cpu);
 
@@ -5455,7 +5458,7 @@ need_resched_nonpreemptible:
         if (sched_feat(HRTICK))
                 hrtick_clear(rq);
 
-        spin_lock_irq(&rq->lock);
+        raw_spin_lock_irq(&rq->lock);
         update_rq_clock(rq);
         clear_tsk_need_resched(prev);
 
@@ -5491,7 +5494,7 @@ need_resched_nonpreemptible:
                 cpu = smp_processor_id();
                 rq = cpu_rq(cpu);
         } else
-                spin_unlock_irq(&rq->lock);
+                raw_spin_unlock_irq(&rq->lock);
 
         post_schedule(rq);
 
@@ -6320,7 +6323,7 @@ recheck:
          * make sure no PI-waiters arrive (or leave) while we are
          * changing the priority of the task:
          */
-        spin_lock_irqsave(&p->pi_lock, flags);
+        raw_spin_lock_irqsave(&p->pi_lock, flags);
         /*
          * To be able to change p->policy safely, the apropriate
          * runqueue lock must be held.
@@ -6330,7 +6333,7 @@ recheck:
         if (unlikely(oldpolicy != -1 && oldpolicy != p->policy)) {
                 policy = oldpolicy = -1;
                 __task_rq_unlock(rq);
-                spin_unlock_irqrestore(&p->pi_lock, flags);
+                raw_spin_unlock_irqrestore(&p->pi_lock, flags);
                 goto recheck;
         }
         update_rq_clock(rq);
@@ -6354,7 +6357,7 @@ recheck:
                 check_class_changed(rq, p, prev_class, oldprio, running);
         }
         __task_rq_unlock(rq);
-        spin_unlock_irqrestore(&p->pi_lock, flags);
+        raw_spin_unlock_irqrestore(&p->pi_lock, flags);
 
         rt_mutex_adjust_pi(p);
 
@@ -6684,7 +6687,7 @@ SYSCALL_DEFINE0(sched_yield)
          */
         __release(rq->lock);
         spin_release(&rq->lock.dep_map, 1, _THIS_IP_);
-        _raw_spin_unlock(&rq->lock);
+        do_raw_spin_unlock(&rq->lock);
         preempt_enable_no_resched();
 
         schedule();
@@ -6980,7 +6983,7 @@ void __cpuinit init_idle(struct task_struct *idle, int cpu)
         struct rq *rq = cpu_rq(cpu);
         unsigned long flags;
 
-        spin_lock_irqsave(&rq->lock, flags);
+        raw_spin_lock_irqsave(&rq->lock, flags);
 
         __sched_fork(idle);
         idle->se.exec_start = sched_clock();
@@ -6992,7 +6995,7 @@ void __cpuinit init_idle(struct task_struct *idle, int cpu)
 #if defined(CONFIG_SMP) && defined(__ARCH_WANT_UNLOCKED_CTXSW)
         idle->oncpu = 1;
 #endif
-        spin_unlock_irqrestore(&rq->lock, flags);
+        raw_spin_unlock_irqrestore(&rq->lock, flags);
 
         /* Set the preempt count _outside_ the spinlocks! */
 #if defined(CONFIG_PREEMPT)
@@ -7209,10 +7212,10 @@ static int migration_thread(void *data)
                 struct migration_req *req;
                 struct list_head *head;
 
-                spin_lock_irq(&rq->lock);
+                raw_spin_lock_irq(&rq->lock);
 
                 if (cpu_is_offline(cpu)) {
-                        spin_unlock_irq(&rq->lock);
+                        raw_spin_unlock_irq(&rq->lock);
                         break;
                 }
 
@@ -7224,7 +7227,7 @@ static int migration_thread(void *data)
                 head = &rq->migration_queue;
 
                 if (list_empty(head)) {
-                        spin_unlock_irq(&rq->lock);
+                        raw_spin_unlock_irq(&rq->lock);
                         schedule();
                         set_current_state(TASK_INTERRUPTIBLE);
                         continue;
@@ -7233,14 +7236,14 @@ static int migration_thread(void *data)
                 list_del_init(head->next);
 
                 if (req->task != NULL) {
-                        spin_unlock(&rq->lock);
+                        raw_spin_unlock(&rq->lock);
                         __migrate_task(req->task, cpu, req->dest_cpu);
                 } else if (likely(cpu == (badcpu = smp_processor_id()))) {
                         req->dest_cpu = RCU_MIGRATION_GOT_QS;
-                        spin_unlock(&rq->lock);
+                        raw_spin_unlock(&rq->lock);
                 } else {
                         req->dest_cpu = RCU_MIGRATION_MUST_SYNC;
-                        spin_unlock(&rq->lock);
+                        raw_spin_unlock(&rq->lock);
                         WARN_ONCE(1, "migration_thread() on CPU %d, expected %d\n", badcpu, cpu);
                 }
                 local_irq_enable();
@@ -7363,14 +7366,14 @@ void sched_idle_next(void)
          * Strictly not necessary since rest of the CPUs are stopped by now
          * and interrupts disabled on the current cpu.
          */
-        spin_lock_irqsave(&rq->lock, flags);
+        raw_spin_lock_irqsave(&rq->lock, flags);
 
         __setscheduler(rq, p, SCHED_FIFO, MAX_RT_PRIO-1);
 
         update_rq_clock(rq);
         activate_task(rq, p, 0);
 
-        spin_unlock_irqrestore(&rq->lock, flags);
+        raw_spin_unlock_irqrestore(&rq->lock, flags);
 }
 
 /*
@@ -7406,9 +7409,9 @@ static void migrate_dead(unsigned int dead_cpu, struct task_struct *p)
          * that's OK. No task can be added to this CPU, so iteration is
          * fine.
          */
-        spin_unlock_irq(&rq->lock);
+        raw_spin_unlock_irq(&rq->lock);
         move_task_off_dead_cpu(dead_cpu, p);
-        spin_lock_irq(&rq->lock);
+        raw_spin_lock_irq(&rq->lock);
 
         put_task_struct(p);
 }
@@ -7674,13 +7677,13 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
 
                 /* Update our root-domain */
                 rq = cpu_rq(cpu);
-                spin_lock_irqsave(&rq->lock, flags);
+                raw_spin_lock_irqsave(&rq->lock, flags);
                 if (rq->rd) {
                         BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
 
                         set_rq_online(rq);
                 }
-                spin_unlock_irqrestore(&rq->lock, flags);
+                raw_spin_unlock_irqrestore(&rq->lock, flags);
                 break;
 
 #ifdef CONFIG_HOTPLUG_CPU
@@ -7705,13 +7708,13 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
                 put_task_struct(rq->migration_thread);
                 rq->migration_thread = NULL;
                 /* Idle task back to normal (off runqueue, low prio) */
-                spin_lock_irq(&rq->lock);
+                raw_spin_lock_irq(&rq->lock);
                 update_rq_clock(rq);
                 deactivate_task(rq, rq->idle, 0);
                 __setscheduler(rq, rq->idle, SCHED_NORMAL, 0);
                 rq->idle->sched_class = &idle_sched_class;
                 migrate_dead_tasks(cpu);
-                spin_unlock_irq(&rq->lock);
+                raw_spin_unlock_irq(&rq->lock);
                 cpuset_unlock();
                 migrate_nr_uninterruptible(rq);
                 BUG_ON(rq->nr_running != 0);
@@ -7721,30 +7724,30 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
                  * they didn't take sched_hotcpu_mutex. Just wake up
                  * the requestors.
                  */
-                spin_lock_irq(&rq->lock);
+                raw_spin_lock_irq(&rq->lock);
                 while (!list_empty(&rq->migration_queue)) {
                         struct migration_req *req;
 
                         req = list_entry(rq->migration_queue.next,
                                          struct migration_req, list);
                         list_del_init(&req->list);
-                        spin_unlock_irq(&rq->lock);
+                        raw_spin_unlock_irq(&rq->lock);
                         complete(&req->done);
-                        spin_lock_irq(&rq->lock);
+                        raw_spin_lock_irq(&rq->lock);
                 }
-                spin_unlock_irq(&rq->lock);
+                raw_spin_unlock_irq(&rq->lock);
                 break;
 
         case CPU_DYING:
         case CPU_DYING_FROZEN:
                 /* Update our root-domain */
                 rq = cpu_rq(cpu);
-                spin_lock_irqsave(&rq->lock, flags);
+                raw_spin_lock_irqsave(&rq->lock, flags);
                 if (rq->rd) {
                         BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
                         set_rq_offline(rq);
                 }
-                spin_unlock_irqrestore(&rq->lock, flags);
+                raw_spin_unlock_irqrestore(&rq->lock, flags);
                 break;
 #endif
         }
@@ -7974,7 +7977,7 @@ static void rq_attach_root(struct rq *rq, struct root_domain *rd)
         struct root_domain *old_rd = NULL;
         unsigned long flags;
 
-        spin_lock_irqsave(&rq->lock, flags);
+        raw_spin_lock_irqsave(&rq->lock, flags);
 
         if (rq->rd) {
                 old_rd = rq->rd;
@@ -8000,7 +8003,7 @@ static void rq_attach_root(struct rq *rq, struct root_domain *rd)
         if (cpumask_test_cpu(rq->cpu, cpu_active_mask))
                 set_rq_online(rq);
 
-        spin_unlock_irqrestore(&rq->lock, flags);
+        raw_spin_unlock_irqrestore(&rq->lock, flags);
 
         if (old_rd)
                 free_rootdomain(old_rd);
@@ -9357,13 +9360,13 @@ static void init_rt_rq(struct rt_rq *rt_rq, struct rq *rq)
 #ifdef CONFIG_SMP
         rt_rq->rt_nr_migratory = 0;
         rt_rq->overloaded = 0;
-        plist_head_init(&rt_rq->pushable_tasks, &rq->lock);
+        plist_head_init_raw(&rt_rq->pushable_tasks, &rq->lock);
 #endif
 
         rt_rq->rt_time = 0;
         rt_rq->rt_throttled = 0;
         rt_rq->rt_runtime = 0;
-        spin_lock_init(&rt_rq->rt_runtime_lock);
+        raw_spin_lock_init(&rt_rq->rt_runtime_lock);
 
 #ifdef CONFIG_RT_GROUP_SCHED
         rt_rq->rt_nr_boosted = 0;
@@ -9523,7 +9526,7 @@ void __init sched_init(void)
                 struct rq *rq;
 
                 rq = cpu_rq(i);
-                spin_lock_init(&rq->lock);
+                raw_spin_lock_init(&rq->lock);
                 rq->nr_running = 0;
                 rq->calc_load_active = 0;
                 rq->calc_load_update = jiffies + LOAD_FREQ;
@@ -9621,7 +9624,7 @@ void __init sched_init(void)
 #endif
 
 #ifdef CONFIG_RT_MUTEXES
-        plist_head_init(&init_task.pi_waiters, &init_task.pi_lock);
+        plist_head_init_raw(&init_task.pi_waiters, &init_task.pi_lock);
 #endif
 
         /*
@@ -9746,13 +9749,13 @@ void normalize_rt_tasks(void)
                         continue;
                 }
 
-                spin_lock(&p->pi_lock);
+                raw_spin_lock(&p->pi_lock);
                 rq = __task_rq_lock(p);
 
                 normalize_task(rq, p);
 
                 __task_rq_unlock(rq);
-                spin_unlock(&p->pi_lock);
+                raw_spin_unlock(&p->pi_lock);
         } while_each_thread(g, p);
 
         read_unlock_irqrestore(&tasklist_lock, flags);
@@ -10115,9 +10118,9 @@ static void set_se_shares(struct sched_entity *se, unsigned long shares)
         struct rq *rq = cfs_rq->rq;
         unsigned long flags;
 
-        spin_lock_irqsave(&rq->lock, flags);
+        raw_spin_lock_irqsave(&rq->lock, flags);
         __set_se_shares(se, shares);
-        spin_unlock_irqrestore(&rq->lock, flags);
+        raw_spin_unlock_irqrestore(&rq->lock, flags);
 }
 
 static DEFINE_MUTEX(shares_mutex);
@@ -10302,18 +10305,18 @@ static int tg_set_bandwidth(struct task_group *tg,
         if (err)
                 goto unlock;
 
-        spin_lock_irq(&tg->rt_bandwidth.rt_runtime_lock);
+        raw_spin_lock_irq(&tg->rt_bandwidth.rt_runtime_lock);
         tg->rt_bandwidth.rt_period = ns_to_ktime(rt_period);
         tg->rt_bandwidth.rt_runtime = rt_runtime;
 
         for_each_possible_cpu(i) {
                 struct rt_rq *rt_rq = tg->rt_rq[i];
 
-                spin_lock(&rt_rq->rt_runtime_lock);
+                raw_spin_lock(&rt_rq->rt_runtime_lock);
                 rt_rq->rt_runtime = rt_runtime;
-                spin_unlock(&rt_rq->rt_runtime_lock);
+                raw_spin_unlock(&rt_rq->rt_runtime_lock);
         }
-        spin_unlock_irq(&tg->rt_bandwidth.rt_runtime_lock);
+        raw_spin_unlock_irq(&tg->rt_bandwidth.rt_runtime_lock);
  unlock:
         read_unlock(&tasklist_lock);
         mutex_unlock(&rt_constraints_mutex);
@@ -10418,15 +10421,15 @@ static int sched_rt_global_constraints(void)
         if (sysctl_sched_rt_runtime == 0)
                 return -EBUSY;
 
-        spin_lock_irqsave(&def_rt_bandwidth.rt_runtime_lock, flags);
+        raw_spin_lock_irqsave(&def_rt_bandwidth.rt_runtime_lock, flags);
         for_each_possible_cpu(i) {
                 struct rt_rq *rt_rq = &cpu_rq(i)->rt;
 
-                spin_lock(&rt_rq->rt_runtime_lock);
+                raw_spin_lock(&rt_rq->rt_runtime_lock);
                 rt_rq->rt_runtime = global_rt_runtime();
-                spin_unlock(&rt_rq->rt_runtime_lock);
+                raw_spin_unlock(&rt_rq->rt_runtime_lock);
         }
-        spin_unlock_irqrestore(&def_rt_bandwidth.rt_runtime_lock, flags);
+        raw_spin_unlock_irqrestore(&def_rt_bandwidth.rt_runtime_lock, flags);
 
         return 0;
 }
@@ -10717,9 +10720,9 @@ static u64 cpuacct_cpuusage_read(struct cpuacct *ca, int cpu)
         /*
          * Take rq->lock to make 64-bit read safe on 32-bit platforms.
          */
-        spin_lock_irq(&cpu_rq(cpu)->lock);
+        raw_spin_lock_irq(&cpu_rq(cpu)->lock);
         data = *cpuusage;
-        spin_unlock_irq(&cpu_rq(cpu)->lock);
+        raw_spin_unlock_irq(&cpu_rq(cpu)->lock);
 #else
         data = *cpuusage;
 #endif
@@ -10735,9 +10738,9 @@ static void cpuacct_cpuusage_write(struct cpuacct *ca, int cpu, u64 val)
         /*
          * Take rq->lock to make 64-bit write safe on 32-bit platforms.
          */
-        spin_lock_irq(&cpu_rq(cpu)->lock);
+        raw_spin_lock_irq(&cpu_rq(cpu)->lock);
         *cpuusage = val;
-        spin_unlock_irq(&cpu_rq(cpu)->lock);
+        raw_spin_unlock_irq(&cpu_rq(cpu)->lock);
 #else
         *cpuusage = val;
 #endif
@@ -10971,9 +10974,9 @@ void synchronize_sched_expedited(void)
                 init_completion(&req->done);
                 req->task = NULL;
                 req->dest_cpu = RCU_MIGRATION_NEED_QS;
-                spin_lock_irqsave(&rq->lock, flags);
+                raw_spin_lock_irqsave(&rq->lock, flags);
                 list_add(&req->list, &rq->migration_queue);
-                spin_unlock_irqrestore(&rq->lock, flags);
+                raw_spin_unlock_irqrestore(&rq->lock, flags);
                 wake_up_process(rq->migration_thread);
         }
         for_each_online_cpu(cpu) {
@@ -10981,11 +10984,11 @@ void synchronize_sched_expedited(void)
                 req = &per_cpu(rcu_migration_req, cpu);
                 rq = cpu_rq(cpu);
                 wait_for_completion(&req->done);
-                spin_lock_irqsave(&rq->lock, flags);
+                raw_spin_lock_irqsave(&rq->lock, flags);
                 if (unlikely(req->dest_cpu == RCU_MIGRATION_MUST_SYNC))
                         need_full_sync = 1;
                 req->dest_cpu = RCU_MIGRATION_IDLE;
-                spin_unlock_irqrestore(&rq->lock, flags);
+                raw_spin_unlock_irqrestore(&rq->lock, flags);
         }
         rcu_expedited_state = RCU_EXPEDITED_STATE_IDLE;
         synchronize_sched_expedited_count++;
diff --git a/kernel/sched_cpupri.c b/kernel/sched_cpupri.c
index 0f052fc674d5..597b33099dfa 100644
--- a/kernel/sched_cpupri.c
+++ b/kernel/sched_cpupri.c
@@ -135,26 +135,26 @@ void cpupri_set(struct cpupri *cp, int cpu, int newpri)
         if (likely(newpri != CPUPRI_INVALID)) {
                 struct cpupri_vec *vec = &cp->pri_to_cpu[newpri];
 
-                spin_lock_irqsave(&vec->lock, flags);
+                raw_spin_lock_irqsave(&vec->lock, flags);
 
                 cpumask_set_cpu(cpu, vec->mask);
                 vec->count++;
                 if (vec->count == 1)
                         set_bit(newpri, cp->pri_active);
 
-                spin_unlock_irqrestore(&vec->lock, flags);
+                raw_spin_unlock_irqrestore(&vec->lock, flags);
         }
         if (likely(oldpri != CPUPRI_INVALID)) {
                 struct cpupri_vec *vec  = &cp->pri_to_cpu[oldpri];
 
-                spin_lock_irqsave(&vec->lock, flags);
+                raw_spin_lock_irqsave(&vec->lock, flags);
 
                 vec->count--;
                 if (!vec->count)
                         clear_bit(oldpri, cp->pri_active);
                 cpumask_clear_cpu(cpu, vec->mask);
 
-                spin_unlock_irqrestore(&vec->lock, flags);
+                raw_spin_unlock_irqrestore(&vec->lock, flags);
         }
 
         *currpri = newpri;
@@ -180,7 +180,7 @@ int cpupri_init(struct cpupri *cp, bool bootmem)
         for (i = 0; i < CPUPRI_NR_PRIORITIES; i++) {
                 struct cpupri_vec *vec = &cp->pri_to_cpu[i];
 
-                spin_lock_init(&vec->lock);
+                raw_spin_lock_init(&vec->lock);
                 vec->count = 0;
                 if (!zalloc_cpumask_var(&vec->mask, gfp))
                         goto cleanup;
diff --git a/kernel/sched_cpupri.h b/kernel/sched_cpupri.h
index 9a7e859b8fbf..7cb5bb6b95be 100644
--- a/kernel/sched_cpupri.h
+++ b/kernel/sched_cpupri.h
@@ -12,7 +12,7 @@
 /* values 2-101 are RT priorities 0-99 */
 
 struct cpupri_vec {
-        spinlock_t lock;
+        raw_spinlock_t lock;
         int        count;
         cpumask_var_t mask;
 };
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index 5ae24fc65d75..67f95aada4b9 100644
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -184,7 +184,7 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
         SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "exec_clock",
                         SPLIT_NS(cfs_rq->exec_clock));
 
-        spin_lock_irqsave(&rq->lock, flags);
+        raw_spin_lock_irqsave(&rq->lock, flags);
         if (cfs_rq->rb_leftmost)
                 MIN_vruntime = (__pick_next_entity(cfs_rq))->vruntime;
         last = __pick_last_entity(cfs_rq);
@@ -192,7 +192,7 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
                 max_vruntime = last->vruntime;
         min_vruntime = cfs_rq->min_vruntime;
         rq0_min_vruntime = cpu_rq(0)->cfs.min_vruntime;
-        spin_unlock_irqrestore(&rq->lock, flags);
+        raw_spin_unlock_irqrestore(&rq->lock, flags);
         SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "MIN_vruntime",
                         SPLIT_NS(MIN_vruntime));
         SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "min_vruntime",
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 804a411838f1..5bedf6e3ebf3 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1955,7 +1955,7 @@ static void task_fork_fair(struct task_struct *p)
         struct rq *rq = this_rq();
         unsigned long flags;
 
-        spin_lock_irqsave(&rq->lock, flags);
+        raw_spin_lock_irqsave(&rq->lock, flags);
 
         if (unlikely(task_cpu(p) != this_cpu))
                 __set_task_cpu(p, this_cpu);
@@ -1975,7 +1975,7 @@ static void task_fork_fair(struct task_struct *p)
                 resched_task(rq->curr);
         }
 
-        spin_unlock_irqrestore(&rq->lock, flags);
+        raw_spin_unlock_irqrestore(&rq->lock, flags);
 }
 
 /*
diff --git a/kernel/sched_idletask.c b/kernel/sched_idletask.c
index 33d5384a73a8..5f93b570d383 100644
--- a/kernel/sched_idletask.c
+++ b/kernel/sched_idletask.c
@@ -34,10 +34,10 @@ static struct task_struct *pick_next_task_idle(struct rq *rq)
 static void
 dequeue_task_idle(struct rq *rq, struct task_struct *p, int sleep)
 {
-        spin_unlock_irq(&rq->lock);
+        raw_spin_unlock_irq(&rq->lock);
         printk(KERN_ERR "bad: scheduling from the idle thread!\n");
         dump_stack();
-        spin_lock_irq(&rq->lock);
+        raw_spin_lock_irq(&rq->lock);
 }
 
 static void put_prev_task_idle(struct rq *rq, struct task_struct *prev)
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index aecbd9c6b20c..d2ea2828164e 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
@@ -327,7 +327,7 @@ static int do_balance_runtime(struct rt_rq *rt_rq)
 
         weight = cpumask_weight(rd->span);
 
-        spin_lock(&rt_b->rt_runtime_lock);
+        raw_spin_lock(&rt_b->rt_runtime_lock);
         rt_period = ktime_to_ns(rt_b->rt_period);
         for_each_cpu(i, rd->span) {
                 struct rt_rq *iter = sched_rt_period_rt_rq(rt_b, i);
@@ -336,7 +336,7 @@ static int do_balance_runtime(struct rt_rq *rt_rq)
                 if (iter == rt_rq)
                         continue;
 
-                spin_lock(&iter->rt_runtime_lock);
+                raw_spin_lock(&iter->rt_runtime_lock);
                 /*
                  * Either all rqs have inf runtime and there's nothing to steal
                  * or __disable_runtime() below sets a specific rq to inf to
@@ -358,14 +358,14 @@ static int do_balance_runtime(struct rt_rq *rt_rq)
                         rt_rq->rt_runtime += diff;
                         more = 1;
                         if (rt_rq->rt_runtime == rt_period) {
-                                spin_unlock(&iter->rt_runtime_lock);
+                                raw_spin_unlock(&iter->rt_runtime_lock);
                                 break;
                         }
                 }
 next:
-                spin_unlock(&iter->rt_runtime_lock);
+                raw_spin_unlock(&iter->rt_runtime_lock);
         }
-        spin_unlock(&rt_b->rt_runtime_lock);
+        raw_spin_unlock(&rt_b->rt_runtime_lock);
 
         return more;
 }
@@ -386,8 +386,8 @@ static void __disable_runtime(struct rq *rq)
                 s64 want;
                 int i;
 
-                spin_lock(&rt_b->rt_runtime_lock);
-                spin_lock(&rt_rq->rt_runtime_lock);
+                raw_spin_lock(&rt_b->rt_runtime_lock);
+                raw_spin_lock(&rt_rq->rt_runtime_lock);
                 /*
                  * Either we're all inf and nobody needs to borrow, or we're
                  * already disabled and thus have nothing to do, or we have
@@ -396,7 +396,7 @@ static void __disable_runtime(struct rq *rq)
                 if (rt_rq->rt_runtime == RUNTIME_INF ||
                                 rt_rq->rt_runtime == rt_b->rt_runtime)
                         goto balanced;
-                spin_unlock(&rt_rq->rt_runtime_lock);
+                raw_spin_unlock(&rt_rq->rt_runtime_lock);
 
                 /*
                  * Calculate the difference between what we started out with
@@ -418,7 +418,7 @@ static void __disable_runtime(struct rq *rq)
                         if (iter == rt_rq || iter->rt_runtime == RUNTIME_INF)
                                 continue;
 
-                        spin_lock(&iter->rt_runtime_lock);
+                        raw_spin_lock(&iter->rt_runtime_lock);
                         if (want > 0) {
                                 diff = min_t(s64, iter->rt_runtime, want);
                                 iter->rt_runtime -= diff;
@@ -427,13 +427,13 @@ static void __disable_runtime(struct rq *rq)
                                 iter->rt_runtime -= want;
                                 want -= want;
                         }
-                        spin_unlock(&iter->rt_runtime_lock);
+                        raw_spin_unlock(&iter->rt_runtime_lock);
 
                         if (!want)
                                 break;
                 }
 
-                spin_lock(&rt_rq->rt_runtime_lock);
+                raw_spin_lock(&rt_rq->rt_runtime_lock);
                 /*
                  * We cannot be left wanting - that would mean some runtime
                  * leaked out of the system.
@@ -445,8 +445,8 @@ balanced:
                  * runtime - in which case borrowing doesn't make sense.
                  */
                 rt_rq->rt_runtime = RUNTIME_INF;
-                spin_unlock(&rt_rq->rt_runtime_lock);
-                spin_unlock(&rt_b->rt_runtime_lock);
+                raw_spin_unlock(&rt_rq->rt_runtime_lock);
+                raw_spin_unlock(&rt_b->rt_runtime_lock);
         }
 }
 
@@ -454,9 +454,9 @@ static void disable_runtime(struct rq *rq)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&rq->lock, flags);
+        raw_spin_lock_irqsave(&rq->lock, flags);
         __disable_runtime(rq);
-        spin_unlock_irqrestore(&rq->lock, flags);
+        raw_spin_unlock_irqrestore(&rq->lock, flags);
 }
 
 static void __enable_runtime(struct rq *rq)
@@ -472,13 +472,13 @@ static void __enable_runtime(struct rq *rq)
         for_each_leaf_rt_rq(rt_rq, rq) {
                 struct rt_bandwidth *rt_b = sched_rt_bandwidth(rt_rq);
 
-                spin_lock(&rt_b->rt_runtime_lock);
-                spin_lock(&rt_rq->rt_runtime_lock);
+                raw_spin_lock(&rt_b->rt_runtime_lock);
+                raw_spin_lock(&rt_rq->rt_runtime_lock);
                 rt_rq->rt_runtime = rt_b->rt_runtime;
                 rt_rq->rt_time = 0;
                 rt_rq->rt_throttled = 0;
-                spin_unlock(&rt_rq->rt_runtime_lock);
-                spin_unlock(&rt_b->rt_runtime_lock);
+                raw_spin_unlock(&rt_rq->rt_runtime_lock);
+                raw_spin_unlock(&rt_b->rt_runtime_lock);
         }
 }
 
@@ -486,9 +486,9 @@ static void enable_runtime(struct rq *rq)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&rq->lock, flags);
+        raw_spin_lock_irqsave(&rq->lock, flags);
         __enable_runtime(rq);
-        spin_unlock_irqrestore(&rq->lock, flags);
+        raw_spin_unlock_irqrestore(&rq->lock, flags);
 }
 
 static int balance_runtime(struct rt_rq *rt_rq)
@@ -496,9 +496,9 @@ static int balance_runtime(struct rt_rq *rt_rq)
         int more = 0;
 
         if (rt_rq->rt_time > rt_rq->rt_runtime) {
-                spin_unlock(&rt_rq->rt_runtime_lock);
+                raw_spin_unlock(&rt_rq->rt_runtime_lock);
                 more = do_balance_runtime(rt_rq);
-                spin_lock(&rt_rq->rt_runtime_lock);
+                raw_spin_lock(&rt_rq->rt_runtime_lock);
         }
 
         return more;
@@ -524,11 +524,11 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun)
                 struct rt_rq *rt_rq = sched_rt_period_rt_rq(rt_b, i);
                 struct rq *rq = rq_of_rt_rq(rt_rq);
 
-                spin_lock(&rq->lock);
+                raw_spin_lock(&rq->lock);
                 if (rt_rq->rt_time) {
                         u64 runtime;
 
-                        spin_lock(&rt_rq->rt_runtime_lock);
+                        raw_spin_lock(&rt_rq->rt_runtime_lock);
                         if (rt_rq->rt_throttled)
                                 balance_runtime(rt_rq);
                         runtime = rt_rq->rt_runtime;
@@ -539,13 +539,13 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun)
                         }
                         if (rt_rq->rt_time || rt_rq->rt_nr_running)
                                 idle = 0;
-                        spin_unlock(&rt_rq->rt_runtime_lock);
+                        raw_spin_unlock(&rt_rq->rt_runtime_lock);
                 } else if (rt_rq->rt_nr_running)
                         idle = 0;
 
                 if (enqueue)
                         sched_rt_rq_enqueue(rt_rq);
-                spin_unlock(&rq->lock);
+                raw_spin_unlock(&rq->lock);
         }
 
         return idle;
@@ -624,11 +624,11 @@ static void update_curr_rt(struct rq *rq)
                 rt_rq = rt_rq_of_se(rt_se);
 
                 if (sched_rt_runtime(rt_rq) != RUNTIME_INF) {
-                        spin_lock(&rt_rq->rt_runtime_lock);
+                        raw_spin_lock(&rt_rq->rt_runtime_lock);
                         rt_rq->rt_time += delta_exec;
                         if (sched_rt_runtime_exceeded(rt_rq))
                                 resched_task(curr);
-                        spin_unlock(&rt_rq->rt_runtime_lock);
+                        raw_spin_unlock(&rt_rq->rt_runtime_lock);
                 }
         }
 }
@@ -1246,7 +1246,7 @@ static struct rq *find_lock_lowest_rq(struct task_struct *task, struct rq *rq)
                                      task_running(rq, task) ||
                                      !task->se.on_rq)) {
 
-                                spin_unlock(&lowest_rq->lock);
+                                raw_spin_unlock(&lowest_rq->lock);
                                 lowest_rq = NULL;
                                 break;
                         }
diff --git a/kernel/signal.c b/kernel/signal.c
index 6b982f2cf524..1814e68e4de3 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -423,7 +423,7 @@ still_pending:
                  */
                 info->si_signo = sig;
                 info->si_errno = 0;
-                info->si_code = 0;
+                info->si_code = SI_USER;
                 info->si_pid = 0;
                 info->si_uid = 0;
         }
@@ -607,6 +607,17 @@ static int rm_from_queue(unsigned long mask, struct sigpending *s)
         return 1;
 }
 
+static inline int is_si_special(const struct siginfo *info)
+{
+        return info <= SEND_SIG_FORCED;
+}
+
+static inline bool si_fromuser(const struct siginfo *info)
+{
+        return info == SEND_SIG_NOINFO ||
+                (!is_si_special(info) && SI_FROMUSER(info));
+}
+
 /*
  * Bad permissions for sending the signal
  * - the caller must hold at least the RCU read lock
@@ -621,7 +632,7 @@ static int check_kill_permission(int sig, struct siginfo *info,
         if (!valid_signal(sig))
                 return -EINVAL;
 
-        if (info != SEND_SIG_NOINFO && (is_si_special(info) || SI_FROMKERNEL(info)))
+        if (!si_fromuser(info))
                 return 0;
 
         error = audit_signal_info(sig, t); /* Let audit system see the signal */
@@ -949,9 +960,8 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
         int from_ancestor_ns = 0;
 
 #ifdef CONFIG_PID_NS
-        if (!is_si_special(info) && SI_FROMUSER(info) &&
-                        task_pid_nr_ns(current, task_active_pid_ns(t)) <= 0)
-                from_ancestor_ns = 1;
+        from_ancestor_ns = si_fromuser(info) &&
+                           !task_pid_nr_ns(current, task_active_pid_ns(t));
 #endif
 
         return __send_signal(sig, info, t, group, from_ancestor_ns);
@@ -1052,12 +1062,6 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
         return ret;
 }
 
-void
-force_sig_specific(int sig, struct task_struct *t)
-{
-        force_sig_info(sig, SEND_SIG_FORCED, t);
-}
-
 /*
  * Nuke all other threads in the group.
  */
@@ -1186,8 +1190,7 @@ int kill_pid_info_as_uid(int sig, struct siginfo *info, struct pid *pid,
                 goto out_unlock;
         }
         pcred = __task_cred(p);
-        if ((info == SEND_SIG_NOINFO ||
-             (!is_si_special(info) && SI_FROMUSER(info))) &&
+        if (si_fromuser(info) &&
             euid != pcred->suid && euid != pcred->uid &&
             uid  != pcred->suid && uid  != pcred->uid) {
                 ret = -EPERM;
@@ -1837,11 +1840,6 @@ relock:
 
         for (;;) {
                 struct k_sigaction *ka;
-
-                if (unlikely(signal->group_stop_count > 0) &&
-                    do_signal_stop(0))
-                        goto relock;
-
                 /*
                  * Tracing can induce an artifical signal and choose sigaction.
                  * The return value in @signr determines the default action,
@@ -1853,6 +1851,10 @@ relock:
                 if (unlikely(signr != 0))
                         ka = return_ka;
                 else {
+                        if (unlikely(signal->group_stop_count > 0) &&
+                            do_signal_stop(0))
+                                goto relock;
+
                         signr = dequeue_signal(current, &current->blocked,
                                                info);
 
diff --git a/kernel/smp.c b/kernel/smp.c
index a8c76069cf50..de735a6637d0 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -16,11 +16,11 @@ static DEFINE_PER_CPU(struct call_single_queue, call_single_queue);
 
 static struct {
         struct list_head        queue;
-        spinlock_t              lock;
+        raw_spinlock_t          lock;
 } call_function __cacheline_aligned_in_smp =
         {
                 .queue          = LIST_HEAD_INIT(call_function.queue),
-                .lock           = __SPIN_LOCK_UNLOCKED(call_function.lock),
+                .lock           = __RAW_SPIN_LOCK_UNLOCKED(call_function.lock),
         };
 
 enum {
@@ -35,7 +35,7 @@ struct call_function_data {
 
 struct call_single_queue {
         struct list_head        list;
-        spinlock_t              lock;
+        raw_spinlock_t          lock;
 };
 
 static DEFINE_PER_CPU(struct call_function_data, cfd_data);
@@ -80,7 +80,7 @@ static int __cpuinit init_call_single_data(void)
         for_each_possible_cpu(i) {
                 struct call_single_queue *q = &per_cpu(call_single_queue, i);
 
-                spin_lock_init(&q->lock);
+                raw_spin_lock_init(&q->lock);
                 INIT_LIST_HEAD(&q->list);
         }
 
@@ -141,10 +141,10 @@ void generic_exec_single(int cpu, struct call_single_data *data, int wait)
         unsigned long flags;
         int ipi;
 
-        spin_lock_irqsave(&dst->lock, flags);
+        raw_spin_lock_irqsave(&dst->lock, flags);
         ipi = list_empty(&dst->list);
         list_add_tail(&data->list, &dst->list);
-        spin_unlock_irqrestore(&dst->lock, flags);
+        raw_spin_unlock_irqrestore(&dst->lock, flags);
 
         /*
          * The list addition should be visible before sending the IPI
@@ -171,7 +171,7 @@ void generic_exec_single(int cpu, struct call_single_data *data, int wait)
 void generic_smp_call_function_interrupt(void)
 {
         struct call_function_data *data;
-        int cpu = get_cpu();
+        int cpu = smp_processor_id();
 
         /*
          * Shouldn't receive this interrupt on a cpu that is not yet online.
@@ -201,9 +201,9 @@ void generic_smp_call_function_interrupt(void)
                 refs = atomic_dec_return(&data->refs);
                 WARN_ON(refs < 0);
                 if (!refs) {
-                        spin_lock(&call_function.lock);
+                        raw_spin_lock(&call_function.lock);
                         list_del_rcu(&data->csd.list);
-                        spin_unlock(&call_function.lock);
+                        raw_spin_unlock(&call_function.lock);
                 }
 
                 if (refs)
@@ -212,7 +212,6 @@ void generic_smp_call_function_interrupt(void)
                 csd_unlock(&data->csd);
         }
 
-        put_cpu();
 }
 
 /*
@@ -230,9 +229,9 @@ void generic_smp_call_function_single_interrupt(void)
          */
         WARN_ON_ONCE(!cpu_online(smp_processor_id()));
 
-        spin_lock(&q->lock);
+        raw_spin_lock(&q->lock);
         list_replace_init(&q->list, &list);
-        spin_unlock(&q->lock);
+        raw_spin_unlock(&q->lock);
 
         while (!list_empty(&list)) {
                 struct call_single_data *data;
@@ -449,14 +448,14 @@ void smp_call_function_many(const struct cpumask *mask,
         cpumask_clear_cpu(this_cpu, data->cpumask);
         atomic_set(&data->refs, cpumask_weight(data->cpumask));
 
-        spin_lock_irqsave(&call_function.lock, flags);
+        raw_spin_lock_irqsave(&call_function.lock, flags);
         /*
          * Place entry at the _HEAD_ of the list, so that any cpu still
          * observing the entry in generic_smp_call_function_interrupt()
          * will not miss any other list entries:
          */
         list_add_rcu(&data->csd.list, &call_function.queue);
-        spin_unlock_irqrestore(&call_function.lock, flags);
+        raw_spin_unlock_irqrestore(&call_function.lock, flags);
 
         /*
          * Make the list addition visible before sending the ipi.
@@ -501,20 +500,20 @@ EXPORT_SYMBOL(smp_call_function);
 
 void ipi_call_lock(void)
 {
-        spin_lock(&call_function.lock);
+        raw_spin_lock(&call_function.lock);
 }
 
 void ipi_call_unlock(void)
 {
-        spin_unlock(&call_function.lock);
+        raw_spin_unlock(&call_function.lock);
 }
 
 void ipi_call_lock_irq(void)
 {
-        spin_lock_irq(&call_function.lock);
+        raw_spin_lock_irq(&call_function.lock);
 }
 
 void ipi_call_unlock_irq(void)
 {
-        spin_unlock_irq(&call_function.lock);
+        raw_spin_unlock_irq(&call_function.lock);
 }
diff --git a/kernel/spinlock.c b/kernel/spinlock.c
index 41e042219ff6..be6517fb9c14 100644
--- a/kernel/spinlock.c
+++ b/kernel/spinlock.c
@@ -32,6 +32,8 @@
  * include/linux/spinlock_api_smp.h
  */
 #else
+#define raw_read_can_lock(l)    read_can_lock(l)
+#define raw_write_can_lock(l)   write_can_lock(l)
 /*
  * We build the __lock_function inlines here. They are too large for
  * inlining all over the place, but here is only one user per function
@@ -42,49 +44,49 @@
  * towards that other CPU that it should break the lock ASAP.
  */
 #define BUILD_LOCK_OPS(op, locktype)                                    \
-void __lockfunc __##op##_lock(locktype##_t *lock)                       \
+void __lockfunc __raw_##op##_lock(locktype##_t *lock)                   \
 {                                                                       \
         for (;;) {                                                      \
                 preempt_disable();                                      \
-                if (likely(_raw_##op##_trylock(lock)))                  \
+                if (likely(do_raw_##op##_trylock(lock)))                \
                         break;                                          \
                 preempt_enable();                                       \
                                                                         \
                 if (!(lock)->break_lock)                                \
                         (lock)->break_lock = 1;                         \
-                while (!op##_can_lock(lock) && (lock)->break_lock)      \
-                        _raw_##op##_relax(&lock->raw_lock);             \
+                while (!raw_##op##_can_lock(lock) && (lock)->break_lock)\
+                        arch_##op##_relax(&lock->raw_lock);             \
         }                                                               \
         (lock)->break_lock = 0;                                         \
 }                                                                       \
                                                                         \
-unsigned long __lockfunc __##op##_lock_irqsave(locktype##_t *lock)      \
+unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock)  \
 {                                                                       \
         unsigned long flags;                                            \
                                                                         \
         for (;;) {                                                      \
                 preempt_disable();                                      \
                 local_irq_save(flags);                                  \
-                if (likely(_raw_##op##_trylock(lock)))                  \
+                if (likely(do_raw_##op##_trylock(lock)))                \
                         break;                                          \
                 local_irq_restore(flags);                               \
                 preempt_enable();                                       \
                                                                         \
                 if (!(lock)->break_lock)                                \
                         (lock)->break_lock = 1;                         \
-                while (!op##_can_lock(lock) && (lock)->break_lock)      \
-                        _raw_##op##_relax(&lock->raw_lock);             \
+                while (!raw_##op##_can_lock(lock) && (lock)->break_lock)\
+                        arch_##op##_relax(&lock->raw_lock);             \
         }                                                               \
         (lock)->break_lock = 0;                                         \
         return flags;                                                   \
 }                                                                       \
                                                                         \
-void __lockfunc __##op##_lock_irq(locktype##_t *lock)                   \
+void __lockfunc __raw_##op##_lock_irq(locktype##_t *lock)               \
 {                                                                       \
-        _##op##_lock_irqsave(lock);                                     \
+        _raw_##op##_lock_irqsave(lock);                                 \
 }                                                                       \
                                                                         \
-void __lockfunc __##op##_lock_bh(locktype##_t *lock)                    \
+void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock)                \
 {                                                                       \
         unsigned long flags;                                            \
                                                                         \
@@ -93,7 +95,7 @@ void __lockfunc __##op##_lock_bh(locktype##_t *lock)			\
         /* irq-disabling. We use the generic preemption-aware   */      \
         /* function:                                            */      \
         /**/                                                            \
-        flags = _##op##_lock_irqsave(lock);                             \
+        flags = _raw_##op##_lock_irqsave(lock);                         \
         local_bh_disable();                                             \
         local_irq_restore(flags);                                       \
 }                                                                       \
@@ -107,269 +109,269 @@ void __lockfunc __##op##_lock_bh(locktype##_t *lock)			\
  *         __[spin|read|write]_lock_irqsave()
  *         __[spin|read|write]_lock_bh()
  */
-BUILD_LOCK_OPS(spin, spinlock);
+BUILD_LOCK_OPS(spin, raw_spinlock);
 BUILD_LOCK_OPS(read, rwlock);
 BUILD_LOCK_OPS(write, rwlock);
 
 #endif
 
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-
-void __lockfunc _spin_lock_nested(spinlock_t *lock, int subclass)
+#ifndef CONFIG_INLINE_SPIN_TRYLOCK
+int __lockfunc _raw_spin_trylock(raw_spinlock_t *lock)
 {
-        preempt_disable();
-        spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
-        LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock);
+        return __raw_spin_trylock(lock);
 }
-EXPORT_SYMBOL(_spin_lock_nested);
+EXPORT_SYMBOL(_raw_spin_trylock);
+#endif
 
-unsigned long __lockfunc _spin_lock_irqsave_nested(spinlock_t *lock,
-                                                   int subclass)
+#ifndef CONFIG_INLINE_SPIN_TRYLOCK_BH
+int __lockfunc _raw_spin_trylock_bh(raw_spinlock_t *lock)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
-        preempt_disable();
-        spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
-        LOCK_CONTENDED_FLAGS(lock, _raw_spin_trylock, _raw_spin_lock,
-                                _raw_spin_lock_flags, &flags);
-        return flags;
+        return __raw_spin_trylock_bh(lock);
 }
-EXPORT_SYMBOL(_spin_lock_irqsave_nested);
+EXPORT_SYMBOL(_raw_spin_trylock_bh);
+#endif
 
-void __lockfunc _spin_lock_nest_lock(spinlock_t *lock,
-                                     struct lockdep_map *nest_lock)
+#ifndef CONFIG_INLINE_SPIN_LOCK
+void __lockfunc _raw_spin_lock(raw_spinlock_t *lock)
 {
-        preempt_disable();
-        spin_acquire_nest(&lock->dep_map, 0, 0, nest_lock, _RET_IP_);
-        LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock);
+        __raw_spin_lock(lock);
 }
-EXPORT_SYMBOL(_spin_lock_nest_lock);
-
+EXPORT_SYMBOL(_raw_spin_lock);
 #endif
 
-#ifndef CONFIG_INLINE_SPIN_TRYLOCK
-int __lockfunc _spin_trylock(spinlock_t *lock)
+#ifndef CONFIG_INLINE_SPIN_LOCK_IRQSAVE
+unsigned long __lockfunc _raw_spin_lock_irqsave(raw_spinlock_t *lock)
 {
-        return __spin_trylock(lock);
+        return __raw_spin_lock_irqsave(lock);
 }
-EXPORT_SYMBOL(_spin_trylock);
+EXPORT_SYMBOL(_raw_spin_lock_irqsave);
 #endif
 
-#ifndef CONFIG_INLINE_READ_TRYLOCK
-int __lockfunc _read_trylock(rwlock_t *lock)
+#ifndef CONFIG_INLINE_SPIN_LOCK_IRQ
+void __lockfunc _raw_spin_lock_irq(raw_spinlock_t *lock)
 {
-        return __read_trylock(lock);
+        __raw_spin_lock_irq(lock);
 }
-EXPORT_SYMBOL(_read_trylock);
+EXPORT_SYMBOL(_raw_spin_lock_irq);
 #endif
 
-#ifndef CONFIG_INLINE_WRITE_TRYLOCK
-int __lockfunc _write_trylock(rwlock_t *lock)
+#ifndef CONFIG_INLINE_SPIN_LOCK_BH
+void __lockfunc _raw_spin_lock_bh(raw_spinlock_t *lock)
 {
-        return __write_trylock(lock);
+        __raw_spin_lock_bh(lock);
 }
-EXPORT_SYMBOL(_write_trylock);
+EXPORT_SYMBOL(_raw_spin_lock_bh);
 #endif
 
-#ifndef CONFIG_INLINE_READ_LOCK
-void __lockfunc _read_lock(rwlock_t *lock)
+#ifndef CONFIG_INLINE_SPIN_UNLOCK
+void __lockfunc _raw_spin_unlock(raw_spinlock_t *lock)
 {
-        __read_lock(lock);
+        __raw_spin_unlock(lock);
 }
-EXPORT_SYMBOL(_read_lock);
+EXPORT_SYMBOL(_raw_spin_unlock);
 #endif
 
-#ifndef CONFIG_INLINE_SPIN_LOCK_IRQSAVE
-unsigned long __lockfunc _spin_lock_irqsave(spinlock_t *lock)
+#ifndef CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE
+void __lockfunc _raw_spin_unlock_irqrestore(raw_spinlock_t *lock, unsigned long flags)
 {
-        return __spin_lock_irqsave(lock);
+        __raw_spin_unlock_irqrestore(lock, flags);
 }
-EXPORT_SYMBOL(_spin_lock_irqsave);
+EXPORT_SYMBOL(_raw_spin_unlock_irqrestore);
 #endif
 
-#ifndef CONFIG_INLINE_SPIN_LOCK_IRQ
-void __lockfunc _spin_lock_irq(spinlock_t *lock)
+#ifndef CONFIG_INLINE_SPIN_UNLOCK_IRQ
+void __lockfunc _raw_spin_unlock_irq(raw_spinlock_t *lock)
 {
-        __spin_lock_irq(lock);
+        __raw_spin_unlock_irq(lock);
 }
-EXPORT_SYMBOL(_spin_lock_irq);
+EXPORT_SYMBOL(_raw_spin_unlock_irq);
 #endif
 
-#ifndef CONFIG_INLINE_SPIN_LOCK_BH
-void __lockfunc _spin_lock_bh(spinlock_t *lock)
+#ifndef CONFIG_INLINE_SPIN_UNLOCK_BH
+void __lockfunc _raw_spin_unlock_bh(raw_spinlock_t *lock)
 {
-        __spin_lock_bh(lock);
+        __raw_spin_unlock_bh(lock);
 }
-EXPORT_SYMBOL(_spin_lock_bh);
+EXPORT_SYMBOL(_raw_spin_unlock_bh);
 #endif
 
-#ifndef CONFIG_INLINE_READ_LOCK_IRQSAVE
-unsigned long __lockfunc _read_lock_irqsave(rwlock_t *lock)
+#ifndef CONFIG_INLINE_READ_TRYLOCK
+int __lockfunc _raw_read_trylock(rwlock_t *lock)
 {
-        return __read_lock_irqsave(lock);
+        return __raw_read_trylock(lock);
 }
-EXPORT_SYMBOL(_read_lock_irqsave);
+EXPORT_SYMBOL(_raw_read_trylock);
 #endif
 
-#ifndef CONFIG_INLINE_READ_LOCK_IRQ
-void __lockfunc _read_lock_irq(rwlock_t *lock)
+#ifndef CONFIG_INLINE_READ_LOCK
+void __lockfunc _raw_read_lock(rwlock_t *lock)
 {
-        __read_lock_irq(lock);
+        __raw_read_lock(lock);
 }
-EXPORT_SYMBOL(_read_lock_irq);
+EXPORT_SYMBOL(_raw_read_lock);
 #endif
 
-#ifndef CONFIG_INLINE_READ_LOCK_BH
-void __lockfunc _read_lock_bh(rwlock_t *lock)
+#ifndef CONFIG_INLINE_READ_LOCK_IRQSAVE
+unsigned long __lockfunc _raw_read_lock_irqsave(rwlock_t *lock)
 {
-        __read_lock_bh(lock);
+        return __raw_read_lock_irqsave(lock);
 }
-EXPORT_SYMBOL(_read_lock_bh);
+EXPORT_SYMBOL(_raw_read_lock_irqsave);
 #endif
 
-#ifndef CONFIG_INLINE_WRITE_LOCK_IRQSAVE
-unsigned long __lockfunc _write_lock_irqsave(rwlock_t *lock)
+#ifndef CONFIG_INLINE_READ_LOCK_IRQ
+void __lockfunc _raw_read_lock_irq(rwlock_t *lock)
 {
-        return __write_lock_irqsave(lock);
+        __raw_read_lock_irq(lock);
 }
-EXPORT_SYMBOL(_write_lock_irqsave);
+EXPORT_SYMBOL(_raw_read_lock_irq);
 #endif
 
-#ifndef CONFIG_INLINE_WRITE_LOCK_IRQ
-void __lockfunc _write_lock_irq(rwlock_t *lock)
+#ifndef CONFIG_INLINE_READ_LOCK_BH
+void __lockfunc _raw_read_lock_bh(rwlock_t *lock)
 {
-        __write_lock_irq(lock);
+        __raw_read_lock_bh(lock);
 }
-EXPORT_SYMBOL(_write_lock_irq);
+EXPORT_SYMBOL(_raw_read_lock_bh);
 #endif
 
-#ifndef CONFIG_INLINE_WRITE_LOCK_BH
-void __lockfunc _write_lock_bh(rwlock_t *lock)
+#ifndef CONFIG_INLINE_READ_UNLOCK
+void __lockfunc _raw_read_unlock(rwlock_t *lock)
 {
-        __write_lock_bh(lock);
+        __raw_read_unlock(lock);
 }
-EXPORT_SYMBOL(_write_lock_bh);
+EXPORT_SYMBOL(_raw_read_unlock);
 #endif
 
-#ifndef CONFIG_INLINE_SPIN_LOCK
-void __lockfunc _spin_lock(spinlock_t *lock)
+#ifndef CONFIG_INLINE_READ_UNLOCK_IRQRESTORE
+void __lockfunc _raw_read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
 {
-        __spin_lock(lock);
+        __raw_read_unlock_irqrestore(lock, flags);
 }
-EXPORT_SYMBOL(_spin_lock);
+EXPORT_SYMBOL(_raw_read_unlock_irqrestore);
 #endif
 
-#ifndef CONFIG_INLINE_WRITE_LOCK
-void __lockfunc _write_lock(rwlock_t *lock)
+#ifndef CONFIG_INLINE_READ_UNLOCK_IRQ
+void __lockfunc _raw_read_unlock_irq(rwlock_t *lock)
 {
-        __write_lock(lock);
+        __raw_read_unlock_irq(lock);
 }
-EXPORT_SYMBOL(_write_lock);
+EXPORT_SYMBOL(_raw_read_unlock_irq);
 #endif
 
-#ifndef CONFIG_INLINE_SPIN_UNLOCK
-void __lockfunc _spin_unlock(spinlock_t *lock)
+#ifndef CONFIG_INLINE_READ_UNLOCK_BH
+void __lockfunc _raw_read_unlock_bh(rwlock_t *lock)
 {
-        __spin_unlock(lock);
+        __raw_read_unlock_bh(lock);
 }
-EXPORT_SYMBOL(_spin_unlock);
+EXPORT_SYMBOL(_raw_read_unlock_bh);
 #endif
 
-#ifndef CONFIG_INLINE_WRITE_UNLOCK
-void __lockfunc _write_unlock(rwlock_t *lock)
+#ifndef CONFIG_INLINE_WRITE_TRYLOCK
+int __lockfunc _raw_write_trylock(rwlock_t *lock)
 {
-        __write_unlock(lock);
+        return __raw_write_trylock(lock);
 }
-EXPORT_SYMBOL(_write_unlock);
+EXPORT_SYMBOL(_raw_write_trylock);
 #endif
 
-#ifndef CONFIG_INLINE_READ_UNLOCK
-void __lockfunc _read_unlock(rwlock_t *lock)
+#ifndef CONFIG_INLINE_WRITE_LOCK
+void __lockfunc _raw_write_lock(rwlock_t *lock)
 {
-        __read_unlock(lock);
+        __raw_write_lock(lock);
 }
-EXPORT_SYMBOL(_read_unlock);
+EXPORT_SYMBOL(_raw_write_lock);
 #endif
 
-#ifndef CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE
-void __lockfunc _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags)
+#ifndef CONFIG_INLINE_WRITE_LOCK_IRQSAVE
+unsigned long __lockfunc _raw_write_lock_irqsave(rwlock_t *lock)
 {
-        __spin_unlock_irqrestore(lock, flags);
+        return __raw_write_lock_irqsave(lock);
 }
-EXPORT_SYMBOL(_spin_unlock_irqrestore);
+EXPORT_SYMBOL(_raw_write_lock_irqsave);
 #endif
 
-#ifndef CONFIG_INLINE_SPIN_UNLOCK_IRQ
-void __lockfunc _spin_unlock_irq(spinlock_t *lock)
+#ifndef CONFIG_INLINE_WRITE_LOCK_IRQ
+void __lockfunc _raw_write_lock_irq(rwlock_t *lock)
 {
-        __spin_unlock_irq(lock);
+        __raw_write_lock_irq(lock);
 }
-EXPORT_SYMBOL(_spin_unlock_irq);
+EXPORT_SYMBOL(_raw_write_lock_irq);
 #endif
 
-#ifndef CONFIG_INLINE_SPIN_UNLOCK_BH
-void __lockfunc _spin_unlock_bh(spinlock_t *lock)
+#ifndef CONFIG_INLINE_WRITE_LOCK_BH
+void __lockfunc _raw_write_lock_bh(rwlock_t *lock)
 {
-        __spin_unlock_bh(lock);
+        __raw_write_lock_bh(lock);
 }
-EXPORT_SYMBOL(_spin_unlock_bh);
+EXPORT_SYMBOL(_raw_write_lock_bh);
 #endif
 
-#ifndef CONFIG_INLINE_READ_UNLOCK_IRQRESTORE
-void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
+#ifndef CONFIG_INLINE_WRITE_UNLOCK
+void __lockfunc _raw_write_unlock(rwlock_t *lock)
 {
-        __read_unlock_irqrestore(lock, flags);
+        __raw_write_unlock(lock);
 }
-EXPORT_SYMBOL(_read_unlock_irqrestore);
+EXPORT_SYMBOL(_raw_write_unlock);
 #endif
 
-#ifndef CONFIG_INLINE_READ_UNLOCK_IRQ
-void __lockfunc _read_unlock_irq(rwlock_t *lock)
+#ifndef CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE
+void __lockfunc _raw_write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
 {
-        __read_unlock_irq(lock);
+        __raw_write_unlock_irqrestore(lock, flags);
 }
-EXPORT_SYMBOL(_read_unlock_irq);
+EXPORT_SYMBOL(_raw_write_unlock_irqrestore);
 #endif
 
-#ifndef CONFIG_INLINE_READ_UNLOCK_BH
-void __lockfunc _read_unlock_bh(rwlock_t *lock)
+#ifndef CONFIG_INLINE_WRITE_UNLOCK_IRQ
+void __lockfunc _raw_write_unlock_irq(rwlock_t *lock)
 {
-        __read_unlock_bh(lock);
+        __raw_write_unlock_irq(lock);
 }
-EXPORT_SYMBOL(_read_unlock_bh);
+EXPORT_SYMBOL(_raw_write_unlock_irq);
 #endif
 
-#ifndef CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE
-void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
+#ifndef CONFIG_INLINE_WRITE_UNLOCK_BH
+void __lockfunc _raw_write_unlock_bh(rwlock_t *lock)
 {
-        __write_unlock_irqrestore(lock, flags);
+        __raw_write_unlock_bh(lock);
 }
-EXPORT_SYMBOL(_write_unlock_irqrestore);
+EXPORT_SYMBOL(_raw_write_unlock_bh);
 #endif
 
-#ifndef CONFIG_INLINE_WRITE_UNLOCK_IRQ
-void __lockfunc _write_unlock_irq(rwlock_t *lock)
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+
+void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass)
 {
-        __write_unlock_irq(lock);
+        preempt_disable();
+        spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
+        LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
 }
-EXPORT_SYMBOL(_write_unlock_irq);
-#endif
+EXPORT_SYMBOL(_raw_spin_lock_nested);
 
-#ifndef CONFIG_INLINE_WRITE_UNLOCK_BH
-void __lockfunc _write_unlock_bh(rwlock_t *lock)
+unsigned long __lockfunc _raw_spin_lock_irqsave_nested(raw_spinlock_t *lock,
+                                                   int subclass)
 {
-        __write_unlock_bh(lock);
+        unsigned long flags;
+
+        local_irq_save(flags);
+        preempt_disable();
+        spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
+        LOCK_CONTENDED_FLAGS(lock, do_raw_spin_trylock, do_raw_spin_lock,
+                                do_raw_spin_lock_flags, &flags);
+        return flags;
 }
-EXPORT_SYMBOL(_write_unlock_bh);
-#endif
+EXPORT_SYMBOL(_raw_spin_lock_irqsave_nested);
 
-#ifndef CONFIG_INLINE_SPIN_TRYLOCK_BH
-int __lockfunc _spin_trylock_bh(spinlock_t *lock)
+void __lockfunc _raw_spin_lock_nest_lock(raw_spinlock_t *lock,
+                                     struct lockdep_map *nest_lock)
 {
-        return __spin_trylock_bh(lock);
+        preempt_disable();
+        spin_acquire_nest(&lock->dep_map, 0, 0, nest_lock, _RET_IP_);
+        LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
 }
-EXPORT_SYMBOL(_spin_trylock_bh);
+EXPORT_SYMBOL(_raw_spin_lock_nest_lock);
+
 #endif
 
 notrace int in_lock_functions(unsigned long addr)
diff --git a/kernel/sys.c b/kernel/sys.c
index 585d6cd10040..20ccfb5da6af 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -189,10 +189,10 @@ SYSCALL_DEFINE3(setpriority, int, which, int, who, int, niceval)
                                  !(user = find_user(who)))
                                 goto out_unlock;        /* No processes for this user */
 
-                        do_each_thread(g, p)
+                        do_each_thread(g, p) {
                                 if (__task_cred(p)->uid == who)
                                         error = set_one_prio(p, niceval, error);
-                        while_each_thread(g, p);
+                        } while_each_thread(g, p);
                         if (who != cred->uid)
                                 free_uid(user);         /* For find_user() */
                         break;
@@ -252,13 +252,13 @@ SYSCALL_DEFINE2(getpriority, int, which, int, who)
                                  !(user = find_user(who)))
                                 goto out_unlock;        /* No processes for this user */
 
-                        do_each_thread(g, p)
+                        do_each_thread(g, p) {
                                 if (__task_cred(p)->uid == who) {
                                         niceval = 20 - task_nice(p);
                                         if (niceval > retval)
                                                 retval = niceval;
                                 }
-                        while_each_thread(g, p);
+                        } while_each_thread(g, p);
                         if (who != cred->uid)
                                 free_uid(user);         /* for find_user() */
                         break;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 554ac4894f0f..45e4bef0012a 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1051,7 +1051,7 @@ static struct ctl_table vm_table[] = {
                 .extra2         = &one_hundred,
         },
 #ifdef CONFIG_HUGETLB_PAGE
-         {
+        {
                 .procname       = "nr_hugepages",
                 .data           = NULL,
                 .maxlen         = sizeof(unsigned long),
@@ -1059,7 +1059,18 @@ static struct ctl_table vm_table[] = {
                 .proc_handler   = hugetlb_sysctl_handler,
                 .extra1         = (void *)&hugetlb_zero,
                 .extra2         = (void *)&hugetlb_infinity,
-         },
+        },
+#ifdef CONFIG_NUMA
+        {
+                .procname       = "nr_hugepages_mempolicy",
+                .data           = NULL,
+                .maxlen         = sizeof(unsigned long),
+                .mode           = 0644,
+                .proc_handler   = &hugetlb_mempolicy_sysctl_handler,
+                .extra1         = (void *)&hugetlb_zero,
+                .extra2         = (void *)&hugetlb_infinity,
+        },
+#endif
          {
                 .procname       = "hugetlb_shm_group",
                 .data           = &sysctl_hugetlb_shm_group,
@@ -1120,7 +1131,8 @@ static struct ctl_table vm_table[] = {
                 .data           = &sysctl_max_map_count,
                 .maxlen         = sizeof(sysctl_max_map_count),
                 .mode           = 0644,
-                .proc_handler   = proc_dointvec
+                .proc_handler   = proc_dointvec,
+                .extra1         = &zero,
         },
 #else
         {
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 20a8920029ee..3d5fc0fd1cca 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -30,7 +30,7 @@ static LIST_HEAD(clockevents_released);
 static RAW_NOTIFIER_HEAD(clockevents_chain);
 
 /* Protection for the above */
-static DEFINE_SPINLOCK(clockevents_lock);
+static DEFINE_RAW_SPINLOCK(clockevents_lock);
 
 /**
  * clockevents_delta2ns - Convert a latch value (device ticks) to nanoseconds
@@ -141,9 +141,9 @@ int clockevents_register_notifier(struct notifier_block *nb)
         unsigned long flags;
         int ret;
 
-        spin_lock_irqsave(&clockevents_lock, flags);
+        raw_spin_lock_irqsave(&clockevents_lock, flags);
         ret = raw_notifier_chain_register(&clockevents_chain, nb);
-        spin_unlock_irqrestore(&clockevents_lock, flags);
+        raw_spin_unlock_irqrestore(&clockevents_lock, flags);
 
         return ret;
 }
@@ -185,13 +185,13 @@ void clockevents_register_device(struct clock_event_device *dev)
         BUG_ON(dev->mode != CLOCK_EVT_MODE_UNUSED);
         BUG_ON(!dev->cpumask);
 
-        spin_lock_irqsave(&clockevents_lock, flags);
+        raw_spin_lock_irqsave(&clockevents_lock, flags);
 
         list_add(&dev->list, &clockevent_devices);
         clockevents_do_notify(CLOCK_EVT_NOTIFY_ADD, dev);
         clockevents_notify_released();
 
-        spin_unlock_irqrestore(&clockevents_lock, flags);
+        raw_spin_unlock_irqrestore(&clockevents_lock, flags);
 }
 EXPORT_SYMBOL_GPL(clockevents_register_device);
 
@@ -241,7 +241,7 @@ void clockevents_notify(unsigned long reason, void *arg)
         struct list_head *node, *tmp;
         unsigned long flags;
 
-        spin_lock_irqsave(&clockevents_lock, flags);
+        raw_spin_lock_irqsave(&clockevents_lock, flags);
         clockevents_do_notify(reason, arg);
 
         switch (reason) {
@@ -256,7 +256,7 @@ void clockevents_notify(unsigned long reason, void *arg)
         default:
                 break;
         }
-        spin_unlock_irqrestore(&clockevents_lock, flags);
+        raw_spin_unlock_irqrestore(&clockevents_lock, flags);
 }
 EXPORT_SYMBOL_GPL(clockevents_notify);
 #endif
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index c2ec25087a35..b3bafd5fc66d 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -31,7 +31,7 @@ static struct tick_device tick_broadcast_device;
 /* FIXME: Use cpumask_var_t. */
 static DECLARE_BITMAP(tick_broadcast_mask, NR_CPUS);
 static DECLARE_BITMAP(tmpmask, NR_CPUS);
-static DEFINE_SPINLOCK(tick_broadcast_lock);
+static DEFINE_RAW_SPINLOCK(tick_broadcast_lock);
 static int tick_broadcast_force;
 
 #ifdef CONFIG_TICK_ONESHOT
@@ -96,7 +96,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
         unsigned long flags;
         int ret = 0;
 
-        spin_lock_irqsave(&tick_broadcast_lock, flags);
+        raw_spin_lock_irqsave(&tick_broadcast_lock, flags);
 
         /*
          * Devices might be registered with both periodic and oneshot
@@ -122,7 +122,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
                         tick_broadcast_clear_oneshot(cpu);
                 }
         }
-        spin_unlock_irqrestore(&tick_broadcast_lock, flags);
+        raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);
         return ret;
 }
 
@@ -161,13 +161,13 @@ static void tick_do_broadcast(struct cpumask *mask)
  */
 static void tick_do_periodic_broadcast(void)
 {
-        spin_lock(&tick_broadcast_lock);
+        raw_spin_lock(&tick_broadcast_lock);
 
         cpumask_and(to_cpumask(tmpmask),
                     cpu_online_mask, tick_get_broadcast_mask());
         tick_do_broadcast(to_cpumask(tmpmask));
 
-        spin_unlock(&tick_broadcast_lock);
+        raw_spin_unlock(&tick_broadcast_lock);
 }
 
 /*
@@ -212,7 +212,7 @@ static void tick_do_broadcast_on_off(unsigned long *reason)
         unsigned long flags;
         int cpu, bc_stopped;
 
-        spin_lock_irqsave(&tick_broadcast_lock, flags);
+        raw_spin_lock_irqsave(&tick_broadcast_lock, flags);
 
         cpu = smp_processor_id();
         td = &per_cpu(tick_cpu_device, cpu);
@@ -263,7 +263,7 @@ static void tick_do_broadcast_on_off(unsigned long *reason)
                         tick_broadcast_setup_oneshot(bc);
         }
 out:
-        spin_unlock_irqrestore(&tick_broadcast_lock, flags);
+        raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);
 }
 
 /*
@@ -299,7 +299,7 @@ void tick_shutdown_broadcast(unsigned int *cpup)
         unsigned long flags;
         unsigned int cpu = *cpup;
 
-        spin_lock_irqsave(&tick_broadcast_lock, flags);
+        raw_spin_lock_irqsave(&tick_broadcast_lock, flags);
 
         bc = tick_broadcast_device.evtdev;
         cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
@@ -309,7 +309,7 @@ void tick_shutdown_broadcast(unsigned int *cpup)
                         clockevents_shutdown(bc);
         }
 
-        spin_unlock_irqrestore(&tick_broadcast_lock, flags);
+        raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);
 }
 
 void tick_suspend_broadcast(void)
@@ -317,13 +317,13 @@ void tick_suspend_broadcast(void)
         struct clock_event_device *bc;
         unsigned long flags;
 
-        spin_lock_irqsave(&tick_broadcast_lock, flags);
+        raw_spin_lock_irqsave(&tick_broadcast_lock, flags);
 
         bc = tick_broadcast_device.evtdev;
         if (bc)
                 clockevents_shutdown(bc);
 
-        spin_unlock_irqrestore(&tick_broadcast_lock, flags);
+        raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);
 }
 
 int tick_resume_broadcast(void)
@@ -332,7 +332,7 @@ int tick_resume_broadcast(void)
         unsigned long flags;
         int broadcast = 0;
 
-        spin_lock_irqsave(&tick_broadcast_lock, flags);
+        raw_spin_lock_irqsave(&tick_broadcast_lock, flags);
 
         bc = tick_broadcast_device.evtdev;
 
@@ -351,7 +351,7 @@ int tick_resume_broadcast(void)
                         break;
                 }
         }
-        spin_unlock_irqrestore(&tick_broadcast_lock, flags);
+        raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);
 
         return broadcast;
 }
@@ -405,7 +405,7 @@ static void tick_handle_oneshot_broadcast(struct clock_event_device *dev)
         ktime_t now, next_event;
         int cpu;
 
-        spin_lock(&tick_broadcast_lock);
+        raw_spin_lock(&tick_broadcast_lock);
 again:
         dev->next_event.tv64 = KTIME_MAX;
         next_event.tv64 = KTIME_MAX;
@@ -443,7 +443,7 @@ again:
                 if (tick_broadcast_set_event(next_event, 0))
                         goto again;
         }
-        spin_unlock(&tick_broadcast_lock);
+        raw_spin_unlock(&tick_broadcast_lock);
 }
 
 /*
@@ -457,7 +457,7 @@ void tick_broadcast_oneshot_control(unsigned long reason)
         unsigned long flags;
         int cpu;
 
-        spin_lock_irqsave(&tick_broadcast_lock, flags);
+        raw_spin_lock_irqsave(&tick_broadcast_lock, flags);
 
         /*
          * Periodic mode does not care about the enter/exit of power
@@ -492,7 +492,7 @@ void tick_broadcast_oneshot_control(unsigned long reason)
         }
 
 out:
-        spin_unlock_irqrestore(&tick_broadcast_lock, flags);
+        raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);
 }
 
 /*
@@ -563,13 +563,13 @@ void tick_broadcast_switch_to_oneshot(void)
         struct clock_event_device *bc;
         unsigned long flags;
 
-        spin_lock_irqsave(&tick_broadcast_lock, flags);
+        raw_spin_lock_irqsave(&tick_broadcast_lock, flags);
 
         tick_broadcast_device.mode = TICKDEV_MODE_ONESHOT;
         bc = tick_broadcast_device.evtdev;
         if (bc)
                 tick_broadcast_setup_oneshot(bc);
-        spin_unlock_irqrestore(&tick_broadcast_lock, flags);
+        raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);
 }
 
 
@@ -581,7 +581,7 @@ void tick_shutdown_broadcast_oneshot(unsigned int *cpup)
         unsigned long flags;
         unsigned int cpu = *cpup;
 
-        spin_lock_irqsave(&tick_broadcast_lock, flags);
+        raw_spin_lock_irqsave(&tick_broadcast_lock, flags);
 
         /*
          * Clear the broadcast mask flag for the dead cpu, but do not
@@ -589,7 +589,7 @@ void tick_shutdown_broadcast_oneshot(unsigned int *cpup)
          */
         cpumask_clear_cpu(cpu, tick_get_broadcast_oneshot_mask());
 
-        spin_unlock_irqrestore(&tick_broadcast_lock, flags);
+        raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);
 }
 
 /*
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 83c4417b6a3c..b6b898d2eeef 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -34,7 +34,7 @@ DEFINE_PER_CPU(struct tick_device, tick_cpu_device);
 ktime_t tick_next_period;
 ktime_t tick_period;
 int tick_do_timer_cpu __read_mostly = TICK_DO_TIMER_BOOT;
-DEFINE_SPINLOCK(tick_device_lock);
+static DEFINE_RAW_SPINLOCK(tick_device_lock);
 
 /*
  * Debugging: see timer_list.c
@@ -209,7 +209,7 @@ static int tick_check_new_device(struct clock_event_device *newdev)
         int cpu, ret = NOTIFY_OK;
         unsigned long flags;
 
-        spin_lock_irqsave(&tick_device_lock, flags);
+        raw_spin_lock_irqsave(&tick_device_lock, flags);
 
         cpu = smp_processor_id();
         if (!cpumask_test_cpu(cpu, newdev->cpumask))
@@ -268,7 +268,7 @@ static int tick_check_new_device(struct clock_event_device *newdev)
         if (newdev->features & CLOCK_EVT_FEAT_ONESHOT)
                 tick_oneshot_notify();
 
-        spin_unlock_irqrestore(&tick_device_lock, flags);
+        raw_spin_unlock_irqrestore(&tick_device_lock, flags);
         return NOTIFY_STOP;
 
 out_bc:
@@ -278,7 +278,7 @@ out_bc:
         if (tick_check_broadcast_device(newdev))
                 ret = NOTIFY_STOP;
 
-        spin_unlock_irqrestore(&tick_device_lock, flags);
+        raw_spin_unlock_irqrestore(&tick_device_lock, flags);
 
         return ret;
 }
@@ -311,7 +311,7 @@ static void tick_shutdown(unsigned int *cpup)
         struct clock_event_device *dev = td->evtdev;
         unsigned long flags;
 
-        spin_lock_irqsave(&tick_device_lock, flags);
+        raw_spin_lock_irqsave(&tick_device_lock, flags);
         td->mode = TICKDEV_MODE_PERIODIC;
         if (dev) {
                 /*
@@ -322,7 +322,7 @@ static void tick_shutdown(unsigned int *cpup)
                 clockevents_exchange_device(dev, NULL);
                 td->evtdev = NULL;
         }
-        spin_unlock_irqrestore(&tick_device_lock, flags);
+        raw_spin_unlock_irqrestore(&tick_device_lock, flags);
 }
 
 static void tick_suspend(void)
@@ -330,9 +330,9 @@ static void tick_suspend(void)
         struct tick_device *td = &__get_cpu_var(tick_cpu_device);
         unsigned long flags;
 
-        spin_lock_irqsave(&tick_device_lock, flags);
+        raw_spin_lock_irqsave(&tick_device_lock, flags);
         clockevents_shutdown(td->evtdev);
-        spin_unlock_irqrestore(&tick_device_lock, flags);
+        raw_spin_unlock_irqrestore(&tick_device_lock, flags);
 }
 
 static void tick_resume(void)
@@ -341,7 +341,7 @@ static void tick_resume(void)
         unsigned long flags;
         int broadcast = tick_resume_broadcast();
 
-        spin_lock_irqsave(&tick_device_lock, flags);
+        raw_spin_lock_irqsave(&tick_device_lock, flags);
         clockevents_set_mode(td->evtdev, CLOCK_EVT_MODE_RESUME);
 
         if (!broadcast) {
@@ -350,7 +350,7 @@ static void tick_resume(void)
                 else
                         tick_resume_oneshot();
         }
-        spin_unlock_irqrestore(&tick_device_lock, flags);
+        raw_spin_unlock_irqrestore(&tick_device_lock, flags);
 }
 
 /*
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h
index b1c05bf75ee0..290eefbc1f60 100644
--- a/kernel/time/tick-internal.h
+++ b/kernel/time/tick-internal.h
@@ -6,7 +6,6 @@
 #define TICK_DO_TIMER_BOOT      -2
 
 DECLARE_PER_CPU(struct tick_device, tick_cpu_device);
-extern spinlock_t tick_device_lock;
 extern ktime_t tick_next_period;
 extern ktime_t tick_period;
 extern int tick_do_timer_cpu __read_mostly;
diff --git a/kernel/time/timecompare.c b/kernel/time/timecompare.c
index 96ff643a5a59..12f5c55090be 100644
--- a/kernel/time/timecompare.c
+++ b/kernel/time/timecompare.c
@@ -89,7 +89,7 @@ int timecompare_offset(struct timecompare *sync,
                          * source time
                          */
                         sample.offset =
-                                ktime_to_ns(ktime_add(end, start)) / 2 -
+                                (ktime_to_ns(end) + ktime_to_ns(start)) / 2 -
                                 ts;
 
                         /* simple insertion sort based on duration */
diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index 9d80db4747d4..28265636b6c2 100644
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -84,7 +84,7 @@ print_active_timers(struct seq_file *m, struct hrtimer_clock_base *base,
 
 next_one:
         i = 0;
-        spin_lock_irqsave(&base->cpu_base->lock, flags);
+        raw_spin_lock_irqsave(&base->cpu_base->lock, flags);
 
         curr = base->first;
         /*
@@ -100,13 +100,13 @@ next_one:
 
                 timer = rb_entry(curr, struct hrtimer, node);
                 tmp = *timer;
-                spin_unlock_irqrestore(&base->cpu_base->lock, flags);
+                raw_spin_unlock_irqrestore(&base->cpu_base->lock, flags);
 
                 print_timer(m, timer, &tmp, i, now);
                 next++;
                 goto next_one;
         }
-        spin_unlock_irqrestore(&base->cpu_base->lock, flags);
+        raw_spin_unlock_irqrestore(&base->cpu_base->lock, flags);
 }
 
 static void
diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
index 63b117e9eba1..2f3b585b8d7d 100644
--- a/kernel/time/timer_stats.c
+++ b/kernel/time/timer_stats.c
@@ -86,7 +86,7 @@ static DEFINE_SPINLOCK(table_lock);
 /*
  * Per-CPU lookup locks for fast hash lookup:
  */
-static DEFINE_PER_CPU(spinlock_t, tstats_lookup_lock);
+static DEFINE_PER_CPU(raw_spinlock_t, tstats_lookup_lock);
 
 /*
  * Mutex to serialize state changes with show-stats activities:
@@ -238,7 +238,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
         /*
          * It doesnt matter which lock we take:
          */
-        spinlock_t *lock;
+        raw_spinlock_t *lock;
         struct entry *entry, input;
         unsigned long flags;
 
@@ -253,7 +253,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
         input.pid = pid;
         input.timer_flag = timer_flag;
 
-        spin_lock_irqsave(lock, flags);
+        raw_spin_lock_irqsave(lock, flags);
         if (!timer_stats_active)
                 goto out_unlock;
 
@@ -264,7 +264,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
                 atomic_inc(&overflow_count);
 
  out_unlock:
-        spin_unlock_irqrestore(lock, flags);
+        raw_spin_unlock_irqrestore(lock, flags);
 }
 
 static void print_name_offset(struct seq_file *m, unsigned long addr)
@@ -348,10 +348,11 @@ static void sync_access(void)
         int cpu;
 
         for_each_online_cpu(cpu) {
-                spinlock_t *lock = &per_cpu(tstats_lookup_lock, cpu);
-                spin_lock_irqsave(lock, flags);
+                raw_spinlock_t *lock = &per_cpu(tstats_lookup_lock, cpu);
+
+                raw_spin_lock_irqsave(lock, flags);
                 /* nothing */
-                spin_unlock_irqrestore(lock, flags);
+                raw_spin_unlock_irqrestore(lock, flags);
         }
 }
 
@@ -409,7 +410,7 @@ void __init init_timer_stats(void)
         int cpu;
 
         for_each_possible_cpu(cpu)
-                spin_lock_init(&per_cpu(tstats_lookup_lock, cpu));
+                raw_spin_lock_init(&per_cpu(tstats_lookup_lock, cpu));
 }
 
 static int __init init_tstats_procfs(void)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index a1ca4956ab5e..f58c9ad15830 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -423,7 +423,7 @@ struct ring_buffer_per_cpu {
         int                             cpu;
         struct ring_buffer              *buffer;
         spinlock_t                      reader_lock;    /* serialize readers */
-        raw_spinlock_t                  lock;
+        arch_spinlock_t                 lock;
         struct lock_class_key           lock_key;
         struct list_head                *pages;
         struct buffer_page              *head_page;     /* read from head */
@@ -998,7 +998,7 @@ rb_allocate_cpu_buffer(struct ring_buffer *buffer, int cpu)
         cpu_buffer->buffer = buffer;
         spin_lock_init(&cpu_buffer->reader_lock);
         lockdep_set_class(&cpu_buffer->reader_lock, buffer->reader_lock_key);
-        cpu_buffer->lock = (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
+        cpu_buffer->lock = (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED;
 
         bpage = kzalloc_node(ALIGN(sizeof(*bpage), cache_line_size()),
                             GFP_KERNEL, cpu_to_node(cpu));
@@ -2834,7 +2834,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
         int ret;
 
         local_irq_save(flags);
-        __raw_spin_lock(&cpu_buffer->lock);
+        arch_spin_lock(&cpu_buffer->lock);
 
  again:
         /*
@@ -2923,7 +2923,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
         goto again;
 
  out:
-        __raw_spin_unlock(&cpu_buffer->lock);
+        arch_spin_unlock(&cpu_buffer->lock);
         local_irq_restore(flags);
 
         return reader;
@@ -3286,9 +3286,9 @@ ring_buffer_read_start(struct ring_buffer *buffer, int cpu)
         synchronize_sched();
 
         spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
-        __raw_spin_lock(&cpu_buffer->lock);
+        arch_spin_lock(&cpu_buffer->lock);
         rb_iter_reset(iter);
-        __raw_spin_unlock(&cpu_buffer->lock);
+        arch_spin_unlock(&cpu_buffer->lock);
         spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
 
         return iter;
@@ -3408,11 +3408,11 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu)
         if (RB_WARN_ON(cpu_buffer, local_read(&cpu_buffer->committing)))
                 goto out;
 
-        __raw_spin_lock(&cpu_buffer->lock);
+        arch_spin_lock(&cpu_buffer->lock);
 
         rb_reset_cpu(cpu_buffer);
 
-        __raw_spin_unlock(&cpu_buffer->lock);
+        arch_spin_unlock(&cpu_buffer->lock);
 
  out:
         spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index c82dfd92fdfd..31118ae16f03 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -493,15 +493,15 @@ static ssize_t trace_seq_to_buffer(struct trace_seq *s, void *buf, size_t cnt)
  * protected by per_cpu spinlocks. But the action of the swap
  * needs its own lock.
  *
- * This is defined as a raw_spinlock_t in order to help
+ * This is defined as a arch_spinlock_t in order to help
  * with performance when lockdep debugging is enabled.
  *
  * It is also used in other places outside the update_max_tr
  * so it needs to be defined outside of the
  * CONFIG_TRACER_MAX_TRACE.
  */
-static raw_spinlock_t ftrace_max_lock =
-        (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
+static arch_spinlock_t ftrace_max_lock =
+        (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED;
 
 #ifdef CONFIG_TRACER_MAX_TRACE
 unsigned long __read_mostly     tracing_max_latency;
@@ -555,13 +555,13 @@ update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu)
                 return;
 
         WARN_ON_ONCE(!irqs_disabled());
-        __raw_spin_lock(&ftrace_max_lock);
+        arch_spin_lock(&ftrace_max_lock);
 
         tr->buffer = max_tr.buffer;
         max_tr.buffer = buf;
 
         __update_max_tr(tr, tsk, cpu);
-        __raw_spin_unlock(&ftrace_max_lock);
+        arch_spin_unlock(&ftrace_max_lock);
 }
 
 /**
@@ -581,7 +581,7 @@ update_max_tr_single(struct trace_array *tr, struct task_struct *tsk, int cpu)
                 return;
 
         WARN_ON_ONCE(!irqs_disabled());
-        __raw_spin_lock(&ftrace_max_lock);
+        arch_spin_lock(&ftrace_max_lock);
 
         ftrace_disable_cpu();
 
@@ -603,7 +603,7 @@ update_max_tr_single(struct trace_array *tr, struct task_struct *tsk, int cpu)
         WARN_ON_ONCE(ret && ret != -EAGAIN && ret != -EBUSY);
 
         __update_max_tr(tr, tsk, cpu);
-        __raw_spin_unlock(&ftrace_max_lock);
+        arch_spin_unlock(&ftrace_max_lock);
 }
 #endif /* CONFIG_TRACER_MAX_TRACE */
 
@@ -802,7 +802,7 @@ static unsigned map_pid_to_cmdline[PID_MAX_DEFAULT+1];
 static unsigned map_cmdline_to_pid[SAVED_CMDLINES];
 static char saved_cmdlines[SAVED_CMDLINES][TASK_COMM_LEN];
 static int cmdline_idx;
-static raw_spinlock_t trace_cmdline_lock = __RAW_SPIN_LOCK_UNLOCKED;
+static arch_spinlock_t trace_cmdline_lock = __ARCH_SPIN_LOCK_UNLOCKED;
 
 /* temporary disable recording */
 static atomic_t trace_record_cmdline_disabled __read_mostly;
@@ -915,7 +915,7 @@ static void trace_save_cmdline(struct task_struct *tsk)
          * nor do we want to disable interrupts,
          * so if we miss here, then better luck next time.
          */
-        if (!__raw_spin_trylock(&trace_cmdline_lock))
+        if (!arch_spin_trylock(&trace_cmdline_lock))
                 return;
 
         idx = map_pid_to_cmdline[tsk->pid];
@@ -940,7 +940,7 @@ static void trace_save_cmdline(struct task_struct *tsk)
 
         memcpy(&saved_cmdlines[idx], tsk->comm, TASK_COMM_LEN);
 
-        __raw_spin_unlock(&trace_cmdline_lock);
+        arch_spin_unlock(&trace_cmdline_lock);
 }
 
 void trace_find_cmdline(int pid, char comm[])
@@ -958,14 +958,14 @@ void trace_find_cmdline(int pid, char comm[])
         }
 
         preempt_disable();
-        __raw_spin_lock(&trace_cmdline_lock);
+        arch_spin_lock(&trace_cmdline_lock);
         map = map_pid_to_cmdline[pid];
         if (map != NO_CMDLINE_MAP)
                 strcpy(comm, saved_cmdlines[map]);
         else
                 strcpy(comm, "<...>");
 
-        __raw_spin_unlock(&trace_cmdline_lock);
+        arch_spin_unlock(&trace_cmdline_lock);
         preempt_enable();
 }
 
@@ -1251,8 +1251,8 @@ ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3)
  */
 int trace_vbprintk(unsigned long ip, const char *fmt, va_list args)
 {
-        static raw_spinlock_t trace_buf_lock =
-                (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
+        static arch_spinlock_t trace_buf_lock =
+                (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED;
         static u32 trace_buf[TRACE_BUF_SIZE];
 
         struct ftrace_event_call *call = &event_bprint;
@@ -1283,7 +1283,7 @@ int trace_vbprintk(unsigned long ip, const char *fmt, va_list args)
 
         /* Lockdep uses trace_printk for lock tracing */
         local_irq_save(flags);
-        __raw_spin_lock(&trace_buf_lock);
+        arch_spin_lock(&trace_buf_lock);
         len = vbin_printf(trace_buf, TRACE_BUF_SIZE, fmt, args);
 
         if (len > TRACE_BUF_SIZE || len < 0)
@@ -1304,7 +1304,7 @@ int trace_vbprintk(unsigned long ip, const char *fmt, va_list args)
                 ring_buffer_unlock_commit(buffer, event);
 
 out_unlock:
-        __raw_spin_unlock(&trace_buf_lock);
+        arch_spin_unlock(&trace_buf_lock);
         local_irq_restore(flags);
 
 out:
@@ -1334,7 +1334,7 @@ int trace_array_printk(struct trace_array *tr,
 int trace_array_vprintk(struct trace_array *tr,
                         unsigned long ip, const char *fmt, va_list args)
 {
-        static raw_spinlock_t trace_buf_lock = __RAW_SPIN_LOCK_UNLOCKED;
+        static arch_spinlock_t trace_buf_lock = __ARCH_SPIN_LOCK_UNLOCKED;
         static char trace_buf[TRACE_BUF_SIZE];
 
         struct ftrace_event_call *call = &event_print;
@@ -1360,7 +1360,7 @@ int trace_array_vprintk(struct trace_array *tr,
 
         pause_graph_tracing();
         raw_local_irq_save(irq_flags);
-        __raw_spin_lock(&trace_buf_lock);
+        arch_spin_lock(&trace_buf_lock);
         len = vsnprintf(trace_buf, TRACE_BUF_SIZE, fmt, args);
 
         size = sizeof(*entry) + len + 1;
@@ -1378,7 +1378,7 @@ int trace_array_vprintk(struct trace_array *tr,
                 ring_buffer_unlock_commit(buffer, event);
 
  out_unlock:
-        __raw_spin_unlock(&trace_buf_lock);
+        arch_spin_unlock(&trace_buf_lock);
         raw_local_irq_restore(irq_flags);
         unpause_graph_tracing();
  out:
@@ -2279,7 +2279,7 @@ tracing_cpumask_write(struct file *filp, const char __user *ubuf,
         mutex_lock(&tracing_cpumask_update_lock);
 
         local_irq_disable();
-        __raw_spin_lock(&ftrace_max_lock);
+        arch_spin_lock(&ftrace_max_lock);
         for_each_tracing_cpu(cpu) {
                 /*
                  * Increase/decrease the disabled counter if we are
@@ -2294,7 +2294,7 @@ tracing_cpumask_write(struct file *filp, const char __user *ubuf,
                         atomic_dec(&global_trace.data[cpu]->disabled);
                 }
         }
-        __raw_spin_unlock(&ftrace_max_lock);
+        arch_spin_unlock(&ftrace_max_lock);
         local_irq_enable();
 
         cpumask_copy(tracing_cpumask, tracing_cpumask_new);
@@ -3133,7 +3133,7 @@ static void tracing_spd_release_pipe(struct splice_pipe_desc *spd,
         __free_page(spd->pages[idx]);
 }
 
-static struct pipe_buf_operations tracing_pipe_buf_ops = {
+static const struct pipe_buf_operations tracing_pipe_buf_ops = {
         .can_merge              = 0,
         .map                    = generic_pipe_buf_map,
         .unmap                  = generic_pipe_buf_unmap,
@@ -3617,7 +3617,7 @@ static void buffer_pipe_buf_get(struct pipe_inode_info *pipe,
 }
 
 /* Pipe buffer operations for a buffer. */
-static struct pipe_buf_operations buffer_pipe_buf_ops = {
+static const struct pipe_buf_operations buffer_pipe_buf_ops = {
         .can_merge              = 0,
         .map                    = generic_pipe_buf_map,
         .unmap                  = generic_pipe_buf_unmap,
@@ -4307,8 +4307,8 @@ trace_printk_seq(struct trace_seq *s)
 
 static void __ftrace_dump(bool disable_tracing)
 {
-        static raw_spinlock_t ftrace_dump_lock =
-                (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
+        static arch_spinlock_t ftrace_dump_lock =
+                (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED;
         /* use static because iter can be a bit big for the stack */
         static struct trace_iterator iter;
         unsigned int old_userobj;
@@ -4318,7 +4318,7 @@ static void __ftrace_dump(bool disable_tracing)
 
         /* only one dump */
         local_irq_save(flags);
-        __raw_spin_lock(&ftrace_dump_lock);
+        arch_spin_lock(&ftrace_dump_lock);
         if (dump_ran)
                 goto out;
 
@@ -4393,7 +4393,7 @@ static void __ftrace_dump(bool disable_tracing)
         }
 
  out:
-        __raw_spin_unlock(&ftrace_dump_lock);
+        arch_spin_unlock(&ftrace_dump_lock);
         local_irq_restore(flags);
 }
 
diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
index 878c03f386ba..84a3a7ba072a 100644
--- a/kernel/trace/trace_clock.c
+++ b/kernel/trace/trace_clock.c
@@ -71,10 +71,10 @@ u64 notrace trace_clock(void)
 /* keep prev_time and lock in the same cacheline. */
 static struct {
         u64 prev_time;
-        raw_spinlock_t lock;
+        arch_spinlock_t lock;
 } trace_clock_struct ____cacheline_aligned_in_smp =
         {
-                .lock = (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED,
+                .lock = (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED,
         };
 
 u64 notrace trace_clock_global(void)
@@ -94,7 +94,7 @@ u64 notrace trace_clock_global(void)
         if (unlikely(in_nmi()))
                 goto out;
 
-        __raw_spin_lock(&trace_clock_struct.lock);
+        arch_spin_lock(&trace_clock_struct.lock);
 
         /*
          * TODO: if this happens often then maybe we should reset
@@ -106,7 +106,7 @@ u64 notrace trace_clock_global(void)
 
         trace_clock_struct.prev_time = now;
 
-        __raw_spin_unlock(&trace_clock_struct.lock);
+        arch_spin_unlock(&trace_clock_struct.lock);
 
  out:
         raw_local_irq_restore(flags);
diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c
index 26185d727676..0271742abb8d 100644
--- a/kernel/trace/trace_sched_wakeup.c
+++ b/kernel/trace/trace_sched_wakeup.c
@@ -28,8 +28,8 @@ static int			wakeup_current_cpu;
 static unsigned                 wakeup_prio = -1;
 static int                      wakeup_rt;
 
-static raw_spinlock_t wakeup_lock =
-        (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
+static arch_spinlock_t wakeup_lock =
+        (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED;
 
 static void __wakeup_reset(struct trace_array *tr);
 
@@ -143,7 +143,7 @@ probe_wakeup_sched_switch(struct rq *rq, struct task_struct *prev,
                 goto out;
 
         local_irq_save(flags);
-        __raw_spin_lock(&wakeup_lock);
+        arch_spin_lock(&wakeup_lock);
 
         /* We could race with grabbing wakeup_lock */
         if (unlikely(!tracer_enabled || next != wakeup_task))
@@ -169,7 +169,7 @@ probe_wakeup_sched_switch(struct rq *rq, struct task_struct *prev,
 
 out_unlock:
         __wakeup_reset(wakeup_trace);
-        __raw_spin_unlock(&wakeup_lock);
+        arch_spin_unlock(&wakeup_lock);
         local_irq_restore(flags);
 out:
         atomic_dec(&wakeup_trace->data[cpu]->disabled);
@@ -193,9 +193,9 @@ static void wakeup_reset(struct trace_array *tr)
         tracing_reset_online_cpus(tr);
 
         local_irq_save(flags);
-        __raw_spin_lock(&wakeup_lock);
+        arch_spin_lock(&wakeup_lock);
         __wakeup_reset(tr);
-        __raw_spin_unlock(&wakeup_lock);
+        arch_spin_unlock(&wakeup_lock);
         local_irq_restore(flags);
 }
 
@@ -225,7 +225,7 @@ probe_wakeup(struct rq *rq, struct task_struct *p, int success)
                 goto out;
 
         /* interrupts should be off from try_to_wake_up */
-        __raw_spin_lock(&wakeup_lock);
+        arch_spin_lock(&wakeup_lock);
 
         /* check for races. */
         if (!tracer_enabled || p->prio >= wakeup_prio)
@@ -255,7 +255,7 @@ probe_wakeup(struct rq *rq, struct task_struct *p, int success)
         trace_function(wakeup_trace, CALLER_ADDR1, CALLER_ADDR2, flags, pc);
 
 out_locked:
-        __raw_spin_unlock(&wakeup_lock);
+        arch_spin_unlock(&wakeup_lock);
 out:
         atomic_dec(&wakeup_trace->data[cpu]->disabled);
 }
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index dc98309e839a..280fea470d67 100644
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -67,7 +67,7 @@ static int trace_test_buffer(struct trace_array *tr, unsigned long *count)
 
         /* Don't allow flipping of max traces now */
         local_irq_save(flags);
-        __raw_spin_lock(&ftrace_max_lock);
+        arch_spin_lock(&ftrace_max_lock);
 
         cnt = ring_buffer_entries(tr->buffer);
 
@@ -85,7 +85,7 @@ static int trace_test_buffer(struct trace_array *tr, unsigned long *count)
                         break;
         }
         tracing_on();
-        __raw_spin_unlock(&ftrace_max_lock);
+        arch_spin_unlock(&ftrace_max_lock);
         local_irq_restore(flags);
 
         if (count)
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index 8504ac71e4e8..678a5120ee30 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -27,8 +27,8 @@ static struct stack_trace max_stack_trace = {
 };
 
 static unsigned long max_stack_size;
-static raw_spinlock_t max_stack_lock =
-        (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
+static arch_spinlock_t max_stack_lock =
+        (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED;
 
 static int stack_trace_disabled __read_mostly;
 static DEFINE_PER_CPU(int, trace_active);
@@ -54,7 +54,7 @@ static inline void check_stack(void)
                 return;
 
         local_irq_save(flags);
-        __raw_spin_lock(&max_stack_lock);
+        arch_spin_lock(&max_stack_lock);
 
         /* a race could have already updated it */
         if (this_size <= max_stack_size)
@@ -103,7 +103,7 @@ static inline void check_stack(void)
         }
 
  out:
-        __raw_spin_unlock(&max_stack_lock);
+        arch_spin_unlock(&max_stack_lock);
         local_irq_restore(flags);
 }
 
@@ -171,9 +171,9 @@ stack_max_size_write(struct file *filp, const char __user *ubuf,
                 return ret;
 
         local_irq_save(flags);
-        __raw_spin_lock(&max_stack_lock);
+        arch_spin_lock(&max_stack_lock);
         *ptr = val;
-        __raw_spin_unlock(&max_stack_lock);
+        arch_spin_unlock(&max_stack_lock);
         local_irq_restore(flags);
 
         return count;
@@ -207,7 +207,7 @@ t_next(struct seq_file *m, void *v, loff_t *pos)
 static void *t_start(struct seq_file *m, loff_t *pos)
 {
         local_irq_disable();
-        __raw_spin_lock(&max_stack_lock);
+        arch_spin_lock(&max_stack_lock);
 
         if (*pos == 0)
                 return SEQ_START_TOKEN;
@@ -217,7 +217,7 @@ static void *t_start(struct seq_file *m, loff_t *pos)
 
 static void t_stop(struct seq_file *m, void *p)
 {
-        __raw_spin_unlock(&max_stack_lock);
+        arch_spin_unlock(&max_stack_lock);
         local_irq_enable();
 }
 
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 2f22cf4576db..8cf9938dd147 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -575,7 +575,7 @@ config DEBUG_BUGVERBOSE
         depends on BUG
         depends on ARM || AVR32 || M32R || M68K || SPARC32 || SPARC64 || \
                    FRV || SUPERH || GENERIC_BUG || BLACKFIN || MN10300
-        default !EMBEDDED
+        default y
         help
           Say Y here to make BUG() panics output the file name and line number
           of the BUG call as well as the EIP and oops trace.  This aids
diff --git a/lib/argv_split.c b/lib/argv_split.c
index 5205a8dae5bc..4b1b083f219c 100644
--- a/lib/argv_split.c
+++ b/lib/argv_split.c
@@ -4,17 +4,10 @@
 
 #include <linux/kernel.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 
-static const char *skip_sep(const char *cp)
-{
-        while (*cp && isspace(*cp))
-                cp++;
-
-        return cp;
-}
-
 static const char *skip_arg(const char *cp)
 {
         while (*cp && !isspace(*cp))
@@ -28,7 +21,7 @@ static int count_argc(const char *str)
         int count = 0;
 
         while (*str) {
-                str = skip_sep(str);
+                str = skip_spaces(str);
                 if (*str) {
                         count++;
                         str = skip_arg(str);
@@ -82,7 +75,7 @@ char **argv_split(gfp_t gfp, const char *str, int *argcp)
         argvp = argv;
 
         while (*str) {
-                str = skip_sep(str);
+                str = skip_spaces(str);
 
                 if (*str) {
                         const char *p = str;
diff --git a/lib/bitmap.c b/lib/bitmap.c
index 702565821c99..11bf49750583 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -271,6 +271,87 @@ int __bitmap_weight(const unsigned long *bitmap, int bits)
 }
 EXPORT_SYMBOL(__bitmap_weight);
 
+#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) % BITS_PER_LONG))
+
+void bitmap_set(unsigned long *map, int start, int nr)
+{
+        unsigned long *p = map + BIT_WORD(start);
+        const int size = start + nr;
+        int bits_to_set = BITS_PER_LONG - (start % BITS_PER_LONG);
+        unsigned long mask_to_set = BITMAP_FIRST_WORD_MASK(start);
+
+        while (nr - bits_to_set >= 0) {
+                *p |= mask_to_set;
+                nr -= bits_to_set;
+                bits_to_set = BITS_PER_LONG;
+                mask_to_set = ~0UL;
+                p++;
+        }
+        if (nr) {
+                mask_to_set &= BITMAP_LAST_WORD_MASK(size);
+                *p |= mask_to_set;
+        }
+}
+EXPORT_SYMBOL(bitmap_set);
+
+void bitmap_clear(unsigned long *map, int start, int nr)
+{
+        unsigned long *p = map + BIT_WORD(start);
+        const int size = start + nr;
+        int bits_to_clear = BITS_PER_LONG - (start % BITS_PER_LONG);
+        unsigned long mask_to_clear = BITMAP_FIRST_WORD_MASK(start);
+
+        while (nr - bits_to_clear >= 0) {
+                *p &= ~mask_to_clear;
+                nr -= bits_to_clear;
+                bits_to_clear = BITS_PER_LONG;
+                mask_to_clear = ~0UL;
+                p++;
+        }
+        if (nr) {
+                mask_to_clear &= BITMAP_LAST_WORD_MASK(size);
+                *p &= ~mask_to_clear;
+        }
+}
+EXPORT_SYMBOL(bitmap_clear);
+
+/*
+ * bitmap_find_next_zero_area - find a contiguous aligned zero area
+ * @map: The address to base the search on
+ * @size: The bitmap size in bits
+ * @start: The bitnumber to start searching at
+ * @nr: The number of zeroed bits we're looking for
+ * @align_mask: Alignment mask for zero area
+ *
+ * The @align_mask should be one less than a power of 2; the effect is that
+ * the bit offset of all zero areas this function finds is multiples of that
+ * power of 2. A @align_mask of 0 means no alignment is required.
+ */
+unsigned long bitmap_find_next_zero_area(unsigned long *map,
+                                         unsigned long size,
+                                         unsigned long start,
+                                         unsigned int nr,
+                                         unsigned long align_mask)
+{
+        unsigned long index, end, i;
+again:
+        index = find_next_zero_bit(map, size, start);
+
+        /* Align allocation */
+        index = __ALIGN_MASK(index, align_mask);
+
+        end = index + nr;
+        if (end > size)
+                return end;
+        i = find_next_bit(map, end, index);
+        if (i < end) {
+                start = i + 1;
+                goto again;
+        }
+        return index;
+}
+EXPORT_SYMBOL(bitmap_find_next_zero_area);
+
 /*
  * Bitmap printing & parsing functions: first version by Bill Irwin,
  * second version by Paul Jackson, third by Joe Korty.
diff --git a/lib/crc32.c b/lib/crc32.c
index 49d1c9e3ce38..02e3b31b3a79 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -42,6 +42,48 @@ MODULE_AUTHOR("Matt Domsch <Matt_Domsch@dell.com>");
 MODULE_DESCRIPTION("Ethernet CRC32 calculations");
 MODULE_LICENSE("GPL");
 
+#if CRC_LE_BITS == 8 || CRC_BE_BITS == 8
+
+static inline u32
+crc32_body(u32 crc, unsigned char const *buf, size_t len, const u32 *tab)
+{
+# ifdef __LITTLE_ENDIAN
+#  define DO_CRC(x) crc = tab[(crc ^ (x)) & 255 ] ^ (crc >> 8)
+# else
+#  define DO_CRC(x) crc = tab[((crc >> 24) ^ (x)) & 255] ^ (crc << 8)
+# endif
+        const u32 *b = (const u32 *)buf;
+        size_t    rem_len;
+
+        /* Align it */
+        if (unlikely((long)b & 3 && len)) {
+                u8 *p = (u8 *)b;
+                do {
+                        DO_CRC(*p++);
+                } while ((--len) && ((long)p)&3);
+                b = (u32 *)p;
+        }
+        rem_len = len & 3;
+        /* load data 32 bits wide, xor data 32 bits wide. */
+        len = len >> 2;
+        for (--b; len; --len) {
+                crc ^= *++b; /* use pre increment for speed */
+                DO_CRC(0);
+                DO_CRC(0);
+                DO_CRC(0);
+                DO_CRC(0);
+        }
+        len = rem_len;
+        /* And the last few bytes */
+        if (len) {
+                u8 *p = (u8 *)(b + 1) - 1;
+                do {
+                        DO_CRC(*++p); /* use pre increment for speed */
+                } while (--len);
+        }
+        return crc;
+}
+#endif
 /**
  * crc32_le() - Calculate bitwise little-endian Ethernet AUTODIN II CRC32
  * @crc: seed value for computation.  ~0 for Ethernet, sometimes 0 for
@@ -72,48 +114,10 @@ u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)
 u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)
 {
 # if CRC_LE_BITS == 8
-        const u32      *b =(u32 *)p;
         const u32      *tab = crc32table_le;
 
-# ifdef __LITTLE_ENDIAN
-#  define DO_CRC(x) crc = tab[ (crc ^ (x)) & 255 ] ^ (crc>>8)
-# else
-#  define DO_CRC(x) crc = tab[ ((crc >> 24) ^ (x)) & 255] ^ (crc<<8)
-# endif
-
         crc = __cpu_to_le32(crc);
-        /* Align it */
-        if(unlikely(((long)b)&3 && len)){
-                do {
-                        u8 *p = (u8 *)b;
-                        DO_CRC(*p++);
-                        b = (void *)p;
-                } while ((--len) && ((long)b)&3 );
-        }
-        if(likely(len >= 4)){
-                /* load data 32 bits wide, xor data 32 bits wide. */
-                size_t save_len = len & 3;
-                len = len >> 2;
-                --b; /* use pre increment below(*++b) for speed */
-                do {
-                        crc ^= *++b;
-                        DO_CRC(0);
-                        DO_CRC(0);
-                        DO_CRC(0);
-                        DO_CRC(0);
-                } while (--len);
-                b++; /* point to next byte(s) */
-                len = save_len;
-        }
-        /* And the last few bytes */
-        if(len){
-                do {
-                        u8 *p = (u8 *)b;
-                        DO_CRC(*p++);
-                        b = (void *)p;
-                } while (--len);
-        }
-
+        crc = crc32_body(crc, p, len, tab);
         return __le32_to_cpu(crc);
 #undef ENDIAN_SHIFT
 #undef DO_CRC
@@ -170,47 +174,10 @@ u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
 u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
 {
 # if CRC_BE_BITS == 8
-        const u32      *b =(u32 *)p;
         const u32      *tab = crc32table_be;
 
-# ifdef __LITTLE_ENDIAN
-#  define DO_CRC(x) crc = tab[ (crc ^ (x)) & 255 ] ^ (crc>>8)
-# else
-#  define DO_CRC(x) crc = tab[ ((crc >> 24) ^ (x)) & 255] ^ (crc<<8)
-# endif
-
         crc = __cpu_to_be32(crc);
-        /* Align it */
-        if(unlikely(((long)b)&3 && len)){
-                do {
-                        u8 *p = (u8 *)b;
-                        DO_CRC(*p++);
-                        b = (u32 *)p;
-                } while ((--len) && ((long)b)&3 );
-        }
-        if(likely(len >= 4)){
-                /* load data 32 bits wide, xor data 32 bits wide. */
-                size_t save_len = len & 3;
-                len = len >> 2;
-                --b; /* use pre increment below(*++b) for speed */
-                do {
-                        crc ^= *++b;
-                        DO_CRC(0);
-                        DO_CRC(0);
-                        DO_CRC(0);
-                        DO_CRC(0);
-                } while (--len);
-                b++; /* point to next byte(s) */
-                len = save_len;
-        }
-        /* And the last few bytes */
-        if(len){
-                do {
-                        u8 *p = (u8 *)b;
-                        DO_CRC(*p++);
-                        b = (void *)p;
-                } while (--len);
-        }
+        crc = crc32_body(crc, p, len, tab);
         return __be32_to_cpu(crc);
 #undef ENDIAN_SHIFT
 #undef DO_CRC
diff --git a/lib/ctype.c b/lib/ctype.c
index d02ace14a322..26baa620e95b 100644
--- a/lib/ctype.c
+++ b/lib/ctype.c
@@ -7,30 +7,30 @@
 #include <linux/ctype.h>
 #include <linux/module.h>
 
-unsigned char _ctype[] = {
-_C,_C,_C,_C,_C,_C,_C,_C,                        /* 0-7 */
-_C,_C|_S,_C|_S,_C|_S,_C|_S,_C|_S,_C,_C,         /* 8-15 */
-_C,_C,_C,_C,_C,_C,_C,_C,                        /* 16-23 */
-_C,_C,_C,_C,_C,_C,_C,_C,                        /* 24-31 */
-_S|_SP,_P,_P,_P,_P,_P,_P,_P,                    /* 32-39 */
-_P,_P,_P,_P,_P,_P,_P,_P,                        /* 40-47 */
-_D,_D,_D,_D,_D,_D,_D,_D,                        /* 48-55 */
-_D,_D,_P,_P,_P,_P,_P,_P,                        /* 56-63 */
-_P,_U|_X,_U|_X,_U|_X,_U|_X,_U|_X,_U|_X,_U,      /* 64-71 */
-_U,_U,_U,_U,_U,_U,_U,_U,                        /* 72-79 */
-_U,_U,_U,_U,_U,_U,_U,_U,                        /* 80-87 */
-_U,_U,_U,_P,_P,_P,_P,_P,                        /* 88-95 */
-_P,_L|_X,_L|_X,_L|_X,_L|_X,_L|_X,_L|_X,_L,      /* 96-103 */
-_L,_L,_L,_L,_L,_L,_L,_L,                        /* 104-111 */
-_L,_L,_L,_L,_L,_L,_L,_L,                        /* 112-119 */
-_L,_L,_L,_P,_P,_P,_P,_C,                        /* 120-127 */
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,                /* 128-143 */
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,                /* 144-159 */
-_S|_SP,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,   /* 160-175 */
-_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,       /* 176-191 */
-_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,       /* 192-207 */
-_U,_U,_U,_U,_U,_U,_U,_P,_U,_U,_U,_U,_U,_U,_U,_L,       /* 208-223 */
-_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,       /* 224-239 */
-_L,_L,_L,_L,_L,_L,_L,_P,_L,_L,_L,_L,_L,_L,_L,_L};      /* 240-255 */
+const unsigned char _ctype[] = {
+_C,_C,_C,_C,_C,_C,_C,_C,                                /* 0-7 */
+_C,_C|_S,_C|_S,_C|_S,_C|_S,_C|_S,_C,_C,                 /* 8-15 */
+_C,_C,_C,_C,_C,_C,_C,_C,                                /* 16-23 */
+_C,_C,_C,_C,_C,_C,_C,_C,                                /* 24-31 */
+_S|_SP,_P,_P,_P,_P,_P,_P,_P,                            /* 32-39 */
+_P,_P,_P,_P,_P,_P,_P,_P,                                /* 40-47 */
+_D,_D,_D,_D,_D,_D,_D,_D,                                /* 48-55 */
+_D,_D,_P,_P,_P,_P,_P,_P,                                /* 56-63 */
+_P,_U|_X,_U|_X,_U|_X,_U|_X,_U|_X,_U|_X,_U,              /* 64-71 */
+_U,_U,_U,_U,_U,_U,_U,_U,                                /* 72-79 */
+_U,_U,_U,_U,_U,_U,_U,_U,                                /* 80-87 */
+_U,_U,_U,_P,_P,_P,_P,_P,                                /* 88-95 */
+_P,_L|_X,_L|_X,_L|_X,_L|_X,_L|_X,_L|_X,_L,              /* 96-103 */
+_L,_L,_L,_L,_L,_L,_L,_L,                                /* 104-111 */
+_L,_L,_L,_L,_L,_L,_L,_L,                                /* 112-119 */
+_L,_L,_L,_P,_P,_P,_P,_C,                                /* 120-127 */
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,                        /* 128-143 */
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,                        /* 144-159 */
+_S|_SP,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,    /* 160-175 */
+_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,        /* 176-191 */
+_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,        /* 192-207 */
+_U,_U,_U,_U,_U,_U,_U,_P,_U,_U,_U,_U,_U,_U,_U,_L,        /* 208-223 */
+_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,        /* 224-239 */
+_L,_L,_L,_L,_L,_L,_L,_P,_L,_L,_L,_L,_L,_L,_L,_L};       /* 240-255 */
 
 EXPORT_SYMBOL(_ctype);
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index eae56fddfa3b..a9a8996d286a 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -26,14 +26,14 @@
 
 struct debug_bucket {
         struct hlist_head       list;
-        spinlock_t              lock;
+        raw_spinlock_t          lock;
 };
 
 static struct debug_bucket      obj_hash[ODEBUG_HASH_SIZE];
 
 static struct debug_obj         obj_static_pool[ODEBUG_POOL_SIZE] __initdata;
 
-static DEFINE_SPINLOCK(pool_lock);
+static DEFINE_RAW_SPINLOCK(pool_lock);
 
 static HLIST_HEAD(obj_pool);
 
@@ -96,10 +96,10 @@ static int fill_pool(void)
                 if (!new)
                         return obj_pool_free;
 
-                spin_lock_irqsave(&pool_lock, flags);
+                raw_spin_lock_irqsave(&pool_lock, flags);
                 hlist_add_head(&new->node, &obj_pool);
                 obj_pool_free++;
-                spin_unlock_irqrestore(&pool_lock, flags);
+                raw_spin_unlock_irqrestore(&pool_lock, flags);
         }
         return obj_pool_free;
 }
@@ -133,7 +133,7 @@ alloc_object(void *addr, struct debug_bucket *b, struct debug_obj_descr *descr)
 {
         struct debug_obj *obj = NULL;
 
-        spin_lock(&pool_lock);
+        raw_spin_lock(&pool_lock);
         if (obj_pool.first) {
                 obj         = hlist_entry(obj_pool.first, typeof(*obj), node);
 
@@ -152,7 +152,7 @@ alloc_object(void *addr, struct debug_bucket *b, struct debug_obj_descr *descr)
                 if (obj_pool_free < obj_pool_min_free)
                         obj_pool_min_free = obj_pool_free;
         }
-        spin_unlock(&pool_lock);
+        raw_spin_unlock(&pool_lock);
 
         return obj;
 }
@@ -165,7 +165,7 @@ static void free_obj_work(struct work_struct *work)
         struct debug_obj *obj;
         unsigned long flags;
 
-        spin_lock_irqsave(&pool_lock, flags);
+        raw_spin_lock_irqsave(&pool_lock, flags);
         while (obj_pool_free > ODEBUG_POOL_SIZE) {
                 obj = hlist_entry(obj_pool.first, typeof(*obj), node);
                 hlist_del(&obj->node);
@@ -174,11 +174,11 @@ static void free_obj_work(struct work_struct *work)
                  * We release pool_lock across kmem_cache_free() to
                  * avoid contention on pool_lock.
                  */
-                spin_unlock_irqrestore(&pool_lock, flags);
+                raw_spin_unlock_irqrestore(&pool_lock, flags);
                 kmem_cache_free(obj_cache, obj);
-                spin_lock_irqsave(&pool_lock, flags);
+                raw_spin_lock_irqsave(&pool_lock, flags);
         }
-        spin_unlock_irqrestore(&pool_lock, flags);
+        raw_spin_unlock_irqrestore(&pool_lock, flags);
 }
 
 /*
@@ -190,7 +190,7 @@ static void free_object(struct debug_obj *obj)
         unsigned long flags;
         int sched = 0;
 
-        spin_lock_irqsave(&pool_lock, flags);
+        raw_spin_lock_irqsave(&pool_lock, flags);
         /*
          * schedule work when the pool is filled and the cache is
          * initialized:
@@ -200,7 +200,7 @@ static void free_object(struct debug_obj *obj)
         hlist_add_head(&obj->node, &obj_pool);
         obj_pool_free++;
         obj_pool_used--;
-        spin_unlock_irqrestore(&pool_lock, flags);
+        raw_spin_unlock_irqrestore(&pool_lock, flags);
         if (sched)
                 schedule_work(&debug_obj_work);
 }
@@ -221,9 +221,9 @@ static void debug_objects_oom(void)
         printk(KERN_WARNING "ODEBUG: Out of memory. ODEBUG disabled\n");
 
         for (i = 0; i < ODEBUG_HASH_SIZE; i++, db++) {
-                spin_lock_irqsave(&db->lock, flags);
+                raw_spin_lock_irqsave(&db->lock, flags);
                 hlist_move_list(&db->list, &freelist);
-                spin_unlock_irqrestore(&db->lock, flags);
+                raw_spin_unlock_irqrestore(&db->lock, flags);
 
                 /* Now free them */
                 hlist_for_each_entry_safe(obj, node, tmp, &freelist, node) {
@@ -303,14 +303,14 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)
 
         db = get_bucket((unsigned long) addr);
 
-        spin_lock_irqsave(&db->lock, flags);
+        raw_spin_lock_irqsave(&db->lock, flags);
 
         obj = lookup_object(addr, db);
         if (!obj) {
                 obj = alloc_object(addr, db, descr);
                 if (!obj) {
                         debug_objects_enabled = 0;
-                        spin_unlock_irqrestore(&db->lock, flags);
+                        raw_spin_unlock_irqrestore(&db->lock, flags);
                         debug_objects_oom();
                         return;
                 }
@@ -327,7 +327,7 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)
         case ODEBUG_STATE_ACTIVE:
                 debug_print_object(obj, "init");
                 state = obj->state;
-                spin_unlock_irqrestore(&db->lock, flags);
+                raw_spin_unlock_irqrestore(&db->lock, flags);
                 debug_object_fixup(descr->fixup_init, addr, state);
                 return;
 
@@ -338,7 +338,7 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)
                 break;
         }
 
-        spin_unlock_irqrestore(&db->lock, flags);
+        raw_spin_unlock_irqrestore(&db->lock, flags);
 }
 
 /**
@@ -385,7 +385,7 @@ void debug_object_activate(void *addr, struct debug_obj_descr *descr)
 
         db = get_bucket((unsigned long) addr);
 
-        spin_lock_irqsave(&db->lock, flags);
+        raw_spin_lock_irqsave(&db->lock, flags);
 
         obj = lookup_object(addr, db);
         if (obj) {
@@ -398,7 +398,7 @@ void debug_object_activate(void *addr, struct debug_obj_descr *descr)
                 case ODEBUG_STATE_ACTIVE:
                         debug_print_object(obj, "activate");
                         state = obj->state;
-                        spin_unlock_irqrestore(&db->lock, flags);
+                        raw_spin_unlock_irqrestore(&db->lock, flags);
                         debug_object_fixup(descr->fixup_activate, addr, state);
                         return;
 
@@ -408,11 +408,11 @@ void debug_object_activate(void *addr, struct debug_obj_descr *descr)
                 default:
                         break;
                 }
-                spin_unlock_irqrestore(&db->lock, flags);
+                raw_spin_unlock_irqrestore(&db->lock, flags);
                 return;
         }
 
-        spin_unlock_irqrestore(&db->lock, flags);
+        raw_spin_unlock_irqrestore(&db->lock, flags);
         /*
          * This happens when a static object is activated. We
          * let the type specific code decide whether this is
@@ -438,7 +438,7 @@ void debug_object_deactivate(void *addr, struct debug_obj_descr *descr)
 
         db = get_bucket((unsigned long) addr);
 
-        spin_lock_irqsave(&db->lock, flags);
+        raw_spin_lock_irqsave(&db->lock, flags);
 
         obj = lookup_object(addr, db);
         if (obj) {
@@ -463,7 +463,7 @@ void debug_object_deactivate(void *addr, struct debug_obj_descr *descr)
                 debug_print_object(&o, "deactivate");
         }
 
-        spin_unlock_irqrestore(&db->lock, flags);
+        raw_spin_unlock_irqrestore(&db->lock, flags);
 }
 
 /**
@@ -483,7 +483,7 @@ void debug_object_destroy(void *addr, struct debug_obj_descr *descr)
 
         db = get_bucket((unsigned long) addr);
 
-        spin_lock_irqsave(&db->lock, flags);
+        raw_spin_lock_irqsave(&db->lock, flags);
 
         obj = lookup_object(addr, db);
         if (!obj)
@@ -498,7 +498,7 @@ void debug_object_destroy(void *addr, struct debug_obj_descr *descr)
         case ODEBUG_STATE_ACTIVE:
                 debug_print_object(obj, "destroy");
                 state = obj->state;
-                spin_unlock_irqrestore(&db->lock, flags);
+                raw_spin_unlock_irqrestore(&db->lock, flags);
                 debug_object_fixup(descr->fixup_destroy, addr, state);
                 return;
 
@@ -509,7 +509,7 @@ void debug_object_destroy(void *addr, struct debug_obj_descr *descr)
                 break;
         }
 out_unlock:
-        spin_unlock_irqrestore(&db->lock, flags);
+        raw_spin_unlock_irqrestore(&db->lock, flags);
 }
 
 /**
@@ -529,7 +529,7 @@ void debug_object_free(void *addr, struct debug_obj_descr *descr)
 
         db = get_bucket((unsigned long) addr);
 
-        spin_lock_irqsave(&db->lock, flags);
+        raw_spin_lock_irqsave(&db->lock, flags);
 
         obj = lookup_object(addr, db);
         if (!obj)
@@ -539,17 +539,17 @@ void debug_object_free(void *addr, struct debug_obj_descr *descr)
         case ODEBUG_STATE_ACTIVE:
                 debug_print_object(obj, "free");
                 state = obj->state;
-                spin_unlock_irqrestore(&db->lock, flags);
+                raw_spin_unlock_irqrestore(&db->lock, flags);
                 debug_object_fixup(descr->fixup_free, addr, state);
                 return;
         default:
                 hlist_del(&obj->node);
-                spin_unlock_irqrestore(&db->lock, flags);
+                raw_spin_unlock_irqrestore(&db->lock, flags);
                 free_object(obj);
                 return;
         }
 out_unlock:
-        spin_unlock_irqrestore(&db->lock, flags);
+        raw_spin_unlock_irqrestore(&db->lock, flags);
 }
 
 #ifdef CONFIG_DEBUG_OBJECTS_FREE
@@ -575,7 +575,7 @@ static void __debug_check_no_obj_freed(const void *address, unsigned long size)
 
 repeat:
                 cnt = 0;
-                spin_lock_irqsave(&db->lock, flags);
+                raw_spin_lock_irqsave(&db->lock, flags);
                 hlist_for_each_entry_safe(obj, node, tmp, &db->list, node) {
                         cnt++;
                         oaddr = (unsigned long) obj->object;
@@ -587,7 +587,7 @@ repeat:
                                 debug_print_object(obj, "free");
                                 descr = obj->descr;
                                 state = obj->state;
-                                spin_unlock_irqrestore(&db->lock, flags);
+                                raw_spin_unlock_irqrestore(&db->lock, flags);
                                 debug_object_fixup(descr->fixup_free,
                                                    (void *) oaddr, state);
                                 goto repeat;
@@ -597,7 +597,7 @@ repeat:
                                 break;
                         }
                 }
-                spin_unlock_irqrestore(&db->lock, flags);
+                raw_spin_unlock_irqrestore(&db->lock, flags);
 
                 /* Now free them */
                 hlist_for_each_entry_safe(obj, node, tmp, &freelist, node) {
@@ -783,7 +783,7 @@ check_results(void *addr, enum debug_obj_state state, int fixups, int warnings)
 
         db = get_bucket((unsigned long) addr);
 
-        spin_lock_irqsave(&db->lock, flags);
+        raw_spin_lock_irqsave(&db->lock, flags);
 
         obj = lookup_object(addr, db);
         if (!obj && state != ODEBUG_STATE_NONE) {
@@ -807,7 +807,7 @@ check_results(void *addr, enum debug_obj_state state, int fixups, int warnings)
         }
         res = 0;
 out:
-        spin_unlock_irqrestore(&db->lock, flags);
+        raw_spin_unlock_irqrestore(&db->lock, flags);
         if (res)
                 debug_objects_enabled = 0;
         return res;
@@ -907,7 +907,7 @@ void __init debug_objects_early_init(void)
         int i;
 
         for (i = 0; i < ODEBUG_HASH_SIZE; i++)
-                spin_lock_init(&obj_hash[i].lock);
+                raw_spin_lock_init(&obj_hash[i].lock);
 
         for (i = 0; i < ODEBUG_POOL_SIZE; i++)
                 hlist_add_head(&obj_static_pool[i].node, &obj_pool);
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index e22c148e4b7f..f93502915988 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -21,6 +21,7 @@
 #include <linux/list.h>
 #include <linux/sysctl.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/uaccess.h>
 #include <linux/dynamic_debug.h>
 #include <linux/debugfs.h>
@@ -209,8 +210,7 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords)
                 char *end;
 
                 /* Skip leading whitespace */
-                while (*buf && isspace(*buf))
-                        buf++;
+                buf = skip_spaces(buf);
                 if (!*buf)
                         break;  /* oh, it was trailing whitespace */
 
diff --git a/lib/genalloc.c b/lib/genalloc.c
index eed2bdb865e7..e67f97495dd5 100644
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -11,6 +11,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/bitmap.h>
 #include <linux/genalloc.h>
 
 
@@ -114,7 +115,7 @@ unsigned long gen_pool_alloc(struct gen_pool *pool, size_t size)
         struct gen_pool_chunk *chunk;
         unsigned long addr, flags;
         int order = pool->min_alloc_order;
-        int nbits, bit, start_bit, end_bit;
+        int nbits, start_bit, end_bit;
 
         if (size == 0)
                 return 0;
@@ -129,29 +130,19 @@ unsigned long gen_pool_alloc(struct gen_pool *pool, size_t size)
                 end_bit -= nbits + 1;
 
                 spin_lock_irqsave(&chunk->lock, flags);
-                bit = -1;
-                while (bit + 1 < end_bit) {
-                        bit = find_next_zero_bit(chunk->bits, end_bit, bit + 1);
-                        if (bit >= end_bit)
-                                break;
-
-                        start_bit = bit;
-                        if (nbits > 1) {
-                                bit = find_next_bit(chunk->bits, bit + nbits,
-                                                        bit + 1);
-                                if (bit - start_bit < nbits)
-                                        continue;
-                        }
-
-                        addr = chunk->start_addr +
-                                            ((unsigned long)start_bit << order);
-                        while (nbits--)
-                                __set_bit(start_bit++, chunk->bits);
+                start_bit = bitmap_find_next_zero_area(chunk->bits, end_bit, 0,
+                                                nbits, 0);
+                if (start_bit >= end_bit) {
                         spin_unlock_irqrestore(&chunk->lock, flags);
-                        read_unlock(&pool->lock);
-                        return addr;
+                        continue;
                 }
+
+                addr = chunk->start_addr + ((unsigned long)start_bit << order);
+
+                bitmap_set(chunk->bits, start_bit, nbits);
                 spin_unlock_irqrestore(&chunk->lock, flags);
+                read_unlock(&pool->lock);
+                return addr;
         }
         read_unlock(&pool->lock);
         return 0;
diff --git a/lib/iommu-helper.c b/lib/iommu-helper.c
index 75dbda03f4fb..c0251f4ad08b 100644
--- a/lib/iommu-helper.c
+++ b/lib/iommu-helper.c
@@ -3,41 +3,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/bitops.h>
-
-static unsigned long find_next_zero_area(unsigned long *map,
-                                         unsigned long size,
-                                         unsigned long start,
-                                         unsigned int nr,
-                                         unsigned long align_mask)
-{
-        unsigned long index, end, i;
-again:
-        index = find_next_zero_bit(map, size, start);
-
-        /* Align allocation */
-        index = (index + align_mask) & ~align_mask;
-
-        end = index + nr;
-        if (end >= size)
-                return -1;
-        for (i = index; i < end; i++) {
-                if (test_bit(i, map)) {
-                        start = i+1;
-                        goto again;
-                }
-        }
-        return index;
-}
-
-void iommu_area_reserve(unsigned long *map, unsigned long i, int len)
-{
-        unsigned long end = i + len;
-        while (i < end) {
-                __set_bit(i, map);
-                i++;
-        }
-}
+#include <linux/bitmap.h>
 
 int iommu_is_span_boundary(unsigned int index, unsigned int nr,
                            unsigned long shift,
@@ -55,31 +21,24 @@ unsigned long iommu_area_alloc(unsigned long *map, unsigned long size,
                                unsigned long align_mask)
 {
         unsigned long index;
+
+        /* We don't want the last of the limit */
+        size -= 1;
 again:
-        index = find_next_zero_area(map, size, start, nr, align_mask);
-        if (index != -1) {
+        index = bitmap_find_next_zero_area(map, size, start, nr, align_mask);
+        if (index < size) {
                 if (iommu_is_span_boundary(index, nr, shift, boundary_size)) {
                         /* we could do more effectively */
                         start = index + 1;
                         goto again;
                 }
-                iommu_area_reserve(map, index, nr);
+                bitmap_set(map, index, nr);
+                return index;
         }
-        return index;
+        return -1;
 }
 EXPORT_SYMBOL(iommu_area_alloc);
 
-void iommu_area_free(unsigned long *map, unsigned long start, unsigned int nr)
-{
-        unsigned long end = start + nr;
-
-        while (start < end) {
-                __clear_bit(start, map);
-                start++;
-        }
-}
-EXPORT_SYMBOL(iommu_area_free);
-
 unsigned long iommu_num_pages(unsigned long addr, unsigned long len,
                               unsigned long io_page_size)
 {
diff --git a/lib/kernel_lock.c b/lib/kernel_lock.c
index 5526b46aba94..b135d04aa48a 100644
--- a/lib/kernel_lock.c
+++ b/lib/kernel_lock.c
@@ -23,7 +23,7 @@
  *
  * Don't use in new code.
  */
-static  __cacheline_aligned_in_smp DEFINE_SPINLOCK(kernel_flag);
+static  __cacheline_aligned_in_smp DEFINE_RAW_SPINLOCK(kernel_flag);
 
 
 /*
@@ -36,12 +36,12 @@ static  __cacheline_aligned_in_smp DEFINE_SPINLOCK(kernel_flag);
  * If it successfully gets the lock, it should increment
  * the preemption count like any spinlock does.
  *
- * (This works on UP too - _raw_spin_trylock will never
+ * (This works on UP too - do_raw_spin_trylock will never
  * return false in that case)
  */
 int __lockfunc __reacquire_kernel_lock(void)
 {
-        while (!_raw_spin_trylock(&kernel_flag)) {
+        while (!do_raw_spin_trylock(&kernel_flag)) {
                 if (need_resched())
                         return -EAGAIN;
                 cpu_relax();
@@ -52,27 +52,27 @@ int __lockfunc __reacquire_kernel_lock(void)
 
 void __lockfunc __release_kernel_lock(void)
 {
-        _raw_spin_unlock(&kernel_flag);
+        do_raw_spin_unlock(&kernel_flag);
         preempt_enable_no_resched();
 }
 
 /*
  * These are the BKL spinlocks - we try to be polite about preemption.
  * If SMP is not on (ie UP preemption), this all goes away because the
- * _raw_spin_trylock() will always succeed.
+ * do_raw_spin_trylock() will always succeed.
  */
 #ifdef CONFIG_PREEMPT
 static inline void __lock_kernel(void)
 {
         preempt_disable();
-        if (unlikely(!_raw_spin_trylock(&kernel_flag))) {
+        if (unlikely(!do_raw_spin_trylock(&kernel_flag))) {
                 /*
                  * If preemption was disabled even before this
                  * was called, there's nothing we can be polite
                  * about - just spin.
                  */
                 if (preempt_count() > 1) {
-                        _raw_spin_lock(&kernel_flag);
+                        do_raw_spin_lock(&kernel_flag);
                         return;
                 }
 
@@ -82,10 +82,10 @@ static inline void __lock_kernel(void)
                  */
                 do {
                         preempt_enable();
-                        while (spin_is_locked(&kernel_flag))
+                        while (raw_spin_is_locked(&kernel_flag))
                                 cpu_relax();
                         preempt_disable();
-                } while (!_raw_spin_trylock(&kernel_flag));
+                } while (!do_raw_spin_trylock(&kernel_flag));
         }
 }
 
@@ -96,7 +96,7 @@ static inline void __lock_kernel(void)
  */
 static inline void __lock_kernel(void)
 {
-        _raw_spin_lock(&kernel_flag);
+        do_raw_spin_lock(&kernel_flag);
 }
 #endif
 
@@ -106,7 +106,7 @@ static inline void __unlock_kernel(void)
          * the BKL is not covered by lockdep, so we open-code the
          * unlocking sequence (and thus avoid the dep-chain ops):
          */
-        _raw_spin_unlock(&kernel_flag);
+        do_raw_spin_unlock(&kernel_flag);
         preempt_enable();
 }
 
diff --git a/lib/parser.c b/lib/parser.c
index b00d02059a5f..fb34977246bb 100644
--- a/lib/parser.c
+++ b/lib/parser.c
@@ -56,13 +56,16 @@ static int match_one(char *s, const char *p, substring_t args[])
 
                 args[argc].from = s;
                 switch (*p++) {
-                case 's':
-                        if (strlen(s) == 0)
+                case 's': {
+                        size_t str_len = strlen(s);
+
+                        if (str_len == 0)
                                 return 0;
-                        else if (len == -1 || len > strlen(s))
-                                len = strlen(s);
+                        if (len == -1 || len > str_len)
+                                len = str_len;
                         args[argc].to = s + len;
                         break;
+                }
                 case 'd':
                         simple_strtol(s, &args[argc].to, 0);
                         goto num;
diff --git a/lib/plist.c b/lib/plist.c
index d6c64a824e1d..1471988d9190 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -54,9 +54,11 @@ static void plist_check_list(struct list_head *top)
 
 static void plist_check_head(struct plist_head *head)
 {
-        WARN_ON(!head->lock);
-        if (head->lock)
-                WARN_ON_SMP(!spin_is_locked(head->lock));
+        WARN_ON(!head->rawlock && !head->spinlock);
+        if (head->rawlock)
+                WARN_ON_SMP(!raw_spin_is_locked(head->rawlock));
+        if (head->spinlock)
+                WARN_ON_SMP(!spin_is_locked(head->spinlock));
         plist_check_list(&head->prio_list);
         plist_check_list(&head->node_list);
 }
diff --git a/lib/rwsem-spinlock.c b/lib/rwsem-spinlock.c
index 9df3ca56db11..ccf95bff7984 100644
--- a/lib/rwsem-spinlock.c
+++ b/lib/rwsem-spinlock.c
@@ -17,6 +17,19 @@ struct rwsem_waiter {
 #define RWSEM_WAITING_FOR_WRITE 0x00000002
 };
 
+int rwsem_is_locked(struct rw_semaphore *sem)
+{
+        int ret = 1;
+        unsigned long flags;
+
+        if (spin_trylock_irqsave(&sem->wait_lock, flags)) {
+                ret = (sem->activity != 0);
+                spin_unlock_irqrestore(&sem->wait_lock, flags);
+        }
+        return ret;
+}
+EXPORT_SYMBOL(rwsem_is_locked);
+
 /*
  * initialise the semaphore
  */
@@ -34,6 +47,7 @@ void __init_rwsem(struct rw_semaphore *sem, const char *name,
         spin_lock_init(&sem->wait_lock);
         INIT_LIST_HEAD(&sem->wait_list);
 }
+EXPORT_SYMBOL(__init_rwsem);
 
 /*
  * handle the lock release when processes blocked on it that can now run
@@ -305,12 +319,3 @@ void __downgrade_write(struct rw_semaphore *sem)
         spin_unlock_irqrestore(&sem->wait_lock, flags);
 }
 
-EXPORT_SYMBOL(__init_rwsem);
-EXPORT_SYMBOL(__down_read);
-EXPORT_SYMBOL(__down_read_trylock);
-EXPORT_SYMBOL(__down_write_nested);
-EXPORT_SYMBOL(__down_write);
-EXPORT_SYMBOL(__down_write_trylock);
-EXPORT_SYMBOL(__up_read);
-EXPORT_SYMBOL(__up_write);
-EXPORT_SYMBOL(__downgrade_write);
diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c
index 9c4b0256490b..4755b98b6dfb 100644
--- a/lib/spinlock_debug.c
+++ b/lib/spinlock_debug.c
@@ -13,8 +13,8 @@
 #include <linux/delay.h>
 #include <linux/module.h>
 
-void __spin_lock_init(spinlock_t *lock, const char *name,
-                      struct lock_class_key *key)
+void __raw_spin_lock_init(raw_spinlock_t *lock, const char *name,
+                          struct lock_class_key *key)
 {
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
         /*
@@ -23,13 +23,13 @@ void __spin_lock_init(spinlock_t *lock, const char *name,
         debug_check_no_locks_freed((void *)lock, sizeof(*lock));
         lockdep_init_map(&lock->dep_map, name, key, 0);
 #endif
-        lock->raw_lock = (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
+        lock->raw_lock = (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED;
         lock->magic = SPINLOCK_MAGIC;
         lock->owner = SPINLOCK_OWNER_INIT;
         lock->owner_cpu = -1;
 }
 
-EXPORT_SYMBOL(__spin_lock_init);
+EXPORT_SYMBOL(__raw_spin_lock_init);
 
 void __rwlock_init(rwlock_t *lock, const char *name,
                    struct lock_class_key *key)
@@ -41,7 +41,7 @@ void __rwlock_init(rwlock_t *lock, const char *name,
         debug_check_no_locks_freed((void *)lock, sizeof(*lock));
         lockdep_init_map(&lock->dep_map, name, key, 0);
 #endif
-        lock->raw_lock = (raw_rwlock_t) __RAW_RW_LOCK_UNLOCKED;
+        lock->raw_lock = (arch_rwlock_t) __ARCH_RW_LOCK_UNLOCKED;
         lock->magic = RWLOCK_MAGIC;
         lock->owner = SPINLOCK_OWNER_INIT;
         lock->owner_cpu = -1;
@@ -49,7 +49,7 @@ void __rwlock_init(rwlock_t *lock, const char *name,
 
 EXPORT_SYMBOL(__rwlock_init);
 
-static void spin_bug(spinlock_t *lock, const char *msg)
+static void spin_bug(raw_spinlock_t *lock, const char *msg)
 {
         struct task_struct *owner = NULL;
 
@@ -73,7 +73,7 @@ static void spin_bug(spinlock_t *lock, const char *msg)
 #define SPIN_BUG_ON(cond, lock, msg) if (unlikely(cond)) spin_bug(lock, msg)
 
 static inline void
-debug_spin_lock_before(spinlock_t *lock)
+debug_spin_lock_before(raw_spinlock_t *lock)
 {
         SPIN_BUG_ON(lock->magic != SPINLOCK_MAGIC, lock, "bad magic");
         SPIN_BUG_ON(lock->owner == current, lock, "recursion");
@@ -81,16 +81,16 @@ debug_spin_lock_before(spinlock_t *lock)
                                                         lock, "cpu recursion");
 }
 
-static inline void debug_spin_lock_after(spinlock_t *lock)
+static inline void debug_spin_lock_after(raw_spinlock_t *lock)
 {
         lock->owner_cpu = raw_smp_processor_id();
         lock->owner = current;
 }
 
-static inline void debug_spin_unlock(spinlock_t *lock)
+static inline void debug_spin_unlock(raw_spinlock_t *lock)
 {
         SPIN_BUG_ON(lock->magic != SPINLOCK_MAGIC, lock, "bad magic");
-        SPIN_BUG_ON(!spin_is_locked(lock), lock, "already unlocked");
+        SPIN_BUG_ON(!raw_spin_is_locked(lock), lock, "already unlocked");
         SPIN_BUG_ON(lock->owner != current, lock, "wrong owner");
         SPIN_BUG_ON(lock->owner_cpu != raw_smp_processor_id(),
                                                         lock, "wrong CPU");
@@ -98,7 +98,7 @@ static inline void debug_spin_unlock(spinlock_t *lock)
         lock->owner_cpu = -1;
 }
 
-static void __spin_lock_debug(spinlock_t *lock)
+static void __spin_lock_debug(raw_spinlock_t *lock)
 {
         u64 i;
         u64 loops = loops_per_jiffy * HZ;
@@ -106,7 +106,7 @@ static void __spin_lock_debug(spinlock_t *lock)
 
         for (;;) {
                 for (i = 0; i < loops; i++) {
-                        if (__raw_spin_trylock(&lock->raw_lock))
+                        if (arch_spin_trylock(&lock->raw_lock))
                                 return;
                         __delay(1);
                 }
@@ -125,17 +125,17 @@ static void __spin_lock_debug(spinlock_t *lock)
         }
 }
 
-void _raw_spin_lock(spinlock_t *lock)
+void do_raw_spin_lock(raw_spinlock_t *lock)
 {
         debug_spin_lock_before(lock);
-        if (unlikely(!__raw_spin_trylock(&lock->raw_lock)))
+        if (unlikely(!arch_spin_trylock(&lock->raw_lock)))
                 __spin_lock_debug(lock);
         debug_spin_lock_after(lock);
 }
 
-int _raw_spin_trylock(spinlock_t *lock)
+int do_raw_spin_trylock(raw_spinlock_t *lock)
 {
-        int ret = __raw_spin_trylock(&lock->raw_lock);
+        int ret = arch_spin_trylock(&lock->raw_lock);
 
         if (ret)
                 debug_spin_lock_after(lock);
@@ -148,10 +148,10 @@ int _raw_spin_trylock(spinlock_t *lock)
         return ret;
 }
 
-void _raw_spin_unlock(spinlock_t *lock)
+void do_raw_spin_unlock(raw_spinlock_t *lock)
 {
         debug_spin_unlock(lock);
-        __raw_spin_unlock(&lock->raw_lock);
+        arch_spin_unlock(&lock->raw_lock);
 }
 
 static void rwlock_bug(rwlock_t *lock, const char *msg)
@@ -176,7 +176,7 @@ static void __read_lock_debug(rwlock_t *lock)
 
         for (;;) {
                 for (i = 0; i < loops; i++) {
-                        if (__raw_read_trylock(&lock->raw_lock))
+                        if (arch_read_trylock(&lock->raw_lock))
                                 return;
                         __delay(1);
                 }
@@ -193,15 +193,15 @@ static void __read_lock_debug(rwlock_t *lock)
 }
 #endif
 
-void _raw_read_lock(rwlock_t *lock)
+void do_raw_read_lock(rwlock_t *lock)
 {
         RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic");
-        __raw_read_lock(&lock->raw_lock);
+        arch_read_lock(&lock->raw_lock);
 }
 
-int _raw_read_trylock(rwlock_t *lock)
+int do_raw_read_trylock(rwlock_t *lock)
 {
-        int ret = __raw_read_trylock(&lock->raw_lock);
+        int ret = arch_read_trylock(&lock->raw_lock);
 
 #ifndef CONFIG_SMP
         /*
@@ -212,10 +212,10 @@ int _raw_read_trylock(rwlock_t *lock)
         return ret;
 }
 
-void _raw_read_unlock(rwlock_t *lock)
+void do_raw_read_unlock(rwlock_t *lock)
 {
         RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic");
-        __raw_read_unlock(&lock->raw_lock);
+        arch_read_unlock(&lock->raw_lock);
 }
 
 static inline void debug_write_lock_before(rwlock_t *lock)
@@ -251,7 +251,7 @@ static void __write_lock_debug(rwlock_t *lock)
 
         for (;;) {
                 for (i = 0; i < loops; i++) {
-                        if (__raw_write_trylock(&lock->raw_lock))
+                        if (arch_write_trylock(&lock->raw_lock))
                                 return;
                         __delay(1);
                 }
@@ -268,16 +268,16 @@ static void __write_lock_debug(rwlock_t *lock)
 }
 #endif
 
-void _raw_write_lock(rwlock_t *lock)
+void do_raw_write_lock(rwlock_t *lock)
 {
         debug_write_lock_before(lock);
-        __raw_write_lock(&lock->raw_lock);
+        arch_write_lock(&lock->raw_lock);
         debug_write_lock_after(lock);
 }
 
-int _raw_write_trylock(rwlock_t *lock)
+int do_raw_write_trylock(rwlock_t *lock)
 {
-        int ret = __raw_write_trylock(&lock->raw_lock);
+        int ret = arch_write_trylock(&lock->raw_lock);
 
         if (ret)
                 debug_write_lock_after(lock);
@@ -290,8 +290,8 @@ int _raw_write_trylock(rwlock_t *lock)
         return ret;
 }
 
-void _raw_write_unlock(rwlock_t *lock)
+void do_raw_write_unlock(rwlock_t *lock)
 {
         debug_write_unlock(lock);
-        __raw_write_unlock(&lock->raw_lock);
+        arch_write_unlock(&lock->raw_lock);
 }
diff --git a/lib/string.c b/lib/string.c
index e96421ab9a9a..afce96af3afd 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -338,20 +338,34 @@ EXPORT_SYMBOL(strnchr);
 #endif
 
 /**
- * strstrip - Removes leading and trailing whitespace from @s.
+ * skip_spaces - Removes leading whitespace from @s.
+ * @s: The string to be stripped.
+ *
+ * Returns a pointer to the first non-whitespace character in @s.
+ */
+char *skip_spaces(const char *str)
+{
+        while (isspace(*str))
+                ++str;
+        return (char *)str;
+}
+EXPORT_SYMBOL(skip_spaces);
+
+/**
+ * strim - Removes leading and trailing whitespace from @s.
  * @s: The string to be stripped.
  *
  * Note that the first trailing whitespace is replaced with a %NUL-terminator
  * in the given string @s. Returns a pointer to the first non-whitespace
  * character in @s.
  */
-char *strstrip(char *s)
+char *strim(char *s)
 {
         size_t size;
         char *end;
 
+        s = skip_spaces(s);
         size = strlen(s);
-
         if (!size)
                 return s;
 
@@ -360,12 +374,9 @@ char *strstrip(char *s)
                 end--;
         *(end + 1) = '\0';
 
-        while (*s && isspace(*s))
-                s++;
-
         return s;
 }
-EXPORT_SYMBOL(strstrip);
+EXPORT_SYMBOL(strim);
 
 #ifndef __HAVE_ARCH_STRLEN
 /**
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 5bc01803f8f8..437eedb5a53b 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -549,7 +549,7 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
                 dma_mask = hwdev->coherent_dma_mask;
 
         ret = (void *)__get_free_pages(flags, order);
-        if (ret && swiotlb_virt_to_bus(hwdev, ret) + size > dma_mask) {
+        if (ret && swiotlb_virt_to_bus(hwdev, ret) + size - 1 > dma_mask) {
                 /*
                  * The allocated memory isn't reachable by the device.
                  */
@@ -571,7 +571,7 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
         dev_addr = swiotlb_virt_to_bus(hwdev, ret);
 
         /* Confirm address can be DMA'd by device */
-        if (dev_addr + size > dma_mask) {
+        if (dev_addr + size - 1 > dma_mask) {
                 printk("hwdev DMA mask = 0x%016Lx, dev_addr = 0x%016Lx\n",
                        (unsigned long long)dma_mask,
                        (unsigned long long)dev_addr);
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 6438cd5599ee..735343fc857a 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -9,7 +9,7 @@
  * Wirzenius wrote this portably, Torvalds fucked it up :-)
  */
 
-/* 
+/*
  * Fri Jul 13 2001 Crutcher Dunnavant <crutcher+kernel@datastacks.com>
  * - changed to provide snprintf and vsnprintf functions
  * So Feb  1 16:51:32 CET 2004 Juergen Quade <quade@hsnr.de>
@@ -47,14 +47,14 @@ static unsigned int simple_guess_base(const char *cp)
 }
 
 /**
- * simple_strtoul - convert a string to an unsigned long
+ * simple_strtoull - convert a string to an unsigned long long
  * @cp: The start of the string
  * @endp: A pointer to the end of the parsed string will be placed here
  * @base: The number base to use
  */
-unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base)
+unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base)
 {
-        unsigned long result = 0;
+        unsigned long long result = 0;
 
         if (!base)
                 base = simple_guess_base(cp);
@@ -71,58 +71,39 @@ unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base)
                 result = result * base + value;
                 cp++;
         }
-
         if (endp)
                 *endp = (char *)cp;
+
         return result;
 }
-EXPORT_SYMBOL(simple_strtoul);
+EXPORT_SYMBOL(simple_strtoull);
 
 /**
- * simple_strtol - convert a string to a signed long
+ * simple_strtoul - convert a string to an unsigned long
  * @cp: The start of the string
  * @endp: A pointer to the end of the parsed string will be placed here
  * @base: The number base to use
  */
-long simple_strtol(const char *cp, char **endp, unsigned int base)
+unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base)
 {
-        if(*cp == '-')
-                return -simple_strtoul(cp + 1, endp, base);
-        return simple_strtoul(cp, endp, base);
+        return simple_strtoull(cp, endp, base);
 }
-EXPORT_SYMBOL(simple_strtol);
+EXPORT_SYMBOL(simple_strtoul);
 
 /**
- * simple_strtoull - convert a string to an unsigned long long
+ * simple_strtol - convert a string to a signed long
  * @cp: The start of the string
  * @endp: A pointer to the end of the parsed string will be placed here
  * @base: The number base to use
  */
-unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base)
+long simple_strtol(const char *cp, char **endp, unsigned int base)
 {
-        unsigned long long result = 0;
-
-        if (!base)
-                base = simple_guess_base(cp);
-
-        if (base == 16 && cp[0] == '0' && TOLOWER(cp[1]) == 'x')
-                cp += 2;
-
-        while (isxdigit(*cp)) {
-                unsigned int value;
-
-                value = isdigit(*cp) ? *cp - '0' : TOLOWER(*cp) - 'a' + 10;
-                if (value >= base)
-                        break;
-                result = result * base + value;
-                cp++;
-        }
+        if (*cp == '-')
+                return -simple_strtoul(cp + 1, endp, base);
 
-        if (endp)
-                *endp = (char *)cp;
-        return result;
+        return simple_strtoul(cp, endp, base);
 }
-EXPORT_SYMBOL(simple_strtoull);
+EXPORT_SYMBOL(simple_strtol);
 
 /**
  * simple_strtoll - convert a string to a signed long long
@@ -132,8 +113,9 @@ EXPORT_SYMBOL(simple_strtoull);
  */
 long long simple_strtoll(const char *cp, char **endp, unsigned int base)
 {
-        if(*cp=='-')
+        if (*cp == '-')
                 return -simple_strtoull(cp + 1, endp, base);
+
         return simple_strtoull(cp, endp, base);
 }
 
@@ -173,6 +155,7 @@ int strict_strtoul(const char *cp, unsigned int base, unsigned long *res)
         val = simple_strtoul(cp, &tail, base);
         if (tail == cp)
                 return -EINVAL;
+
         if ((*tail == '\0') ||
                 ((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {
                 *res = val;
@@ -285,10 +268,11 @@ EXPORT_SYMBOL(strict_strtoll);
 
 static int skip_atoi(const char **s)
 {
-        int i=0;
+        int i = 0;
 
         while (isdigit(**s))
                 i = i*10 + *((*s)++) - '0';
+
         return i;
 }
 
@@ -302,7 +286,7 @@ static int skip_atoi(const char **s)
 /* Formats correctly any integer in [0,99999].
  * Outputs from one to five digits depending on input.
  * On i386 gcc 4.1.2 -O2: ~250 bytes of code. */
-static char* put_dec_trunc(char *buf, unsigned q)
+static char *put_dec_trunc(char *buf, unsigned q)
 {
         unsigned d3, d2, d1, d0;
         d1 = (q>>4) & 0xf;
@@ -331,14 +315,15 @@ static char* put_dec_trunc(char *buf, unsigned q)
                                 d3 = d3 - 10*q;
                                 *buf++ = d3 + '0';  /* next digit */
                                 if (q != 0)
-                                        *buf++ = q + '0';  /* most sign. digit */
+                                        *buf++ = q + '0'; /* most sign. digit */
                         }
                 }
         }
+
         return buf;
 }
 /* Same with if's removed. Always emits five digits */
-static char* put_dec_full(char *buf, unsigned q)
+static char *put_dec_full(char *buf, unsigned q)
 {
         /* BTW, if q is in [0,9999], 8-bit ints will be enough, */
         /* but anyway, gcc produces better code with full-sized ints */
@@ -347,14 +332,15 @@ static char* put_dec_full(char *buf, unsigned q)
         d2 = (q>>8) & 0xf;
         d3 = (q>>12);
 
-        /* Possible ways to approx. divide by 10 */
-        /* gcc -O2 replaces multiply with shifts and adds */
-        // (x * 0xcd) >> 11: 11001101 - shorter code than * 0x67 (on i386)
-        // (x * 0x67) >> 10:  1100111
-        // (x * 0x34) >> 9:    110100 - same
-        // (x * 0x1a) >> 8:     11010 - same
-        // (x * 0x0d) >> 7:      1101 - same, shortest code (on i386)
-
+        /*
+         * Possible ways to approx. divide by 10
+         * gcc -O2 replaces multiply with shifts and adds
+         * (x * 0xcd) >> 11: 11001101 - shorter code than * 0x67 (on i386)
+         * (x * 0x67) >> 10:  1100111
+         * (x * 0x34) >> 9:    110100 - same
+         * (x * 0x1a) >> 8:     11010 - same
+         * (x * 0x0d) >> 7:      1101 - same, shortest code (on i386)
+         */
         d0 = 6*(d3 + d2 + d1) + (q & 0xf);
         q = (d0 * 0xcd) >> 11;
         d0 = d0 - 10*q;
@@ -375,10 +361,11 @@ static char* put_dec_full(char *buf, unsigned q)
                                 d3 = d3 - 10*q;
                                 *buf++ = d3 + '0';
                                         *buf++ = q + '0';
+
         return buf;
 }
 /* No inlining helps gcc to use registers better */
-static noinline char* put_dec(char *buf, unsigned long long num)
+static noinline char *put_dec(char *buf, unsigned long long num)
 {
         while (1) {
                 unsigned rem;
@@ -448,9 +435,9 @@ static char *number(char *buf, char *end, unsigned long long num,
                 spec.flags &= ~ZEROPAD;
         sign = 0;
         if (spec.flags & SIGN) {
-                if ((signed long long) num < 0) {
+                if ((signed long long)num < 0) {
                         sign = '-';
-                        num = - (signed long long) num;
+                        num = -(signed long long)num;
                         spec.field_width--;
                 } else if (spec.flags & PLUS) {
                         sign = '+';
@@ -478,7 +465,9 @@ static char *number(char *buf, char *end, unsigned long long num,
         else if (spec.base != 10) { /* 8 or 16 */
                 int mask = spec.base - 1;
                 int shift = 3;
-                if (spec.base == 16) shift = 4;
+
+                if (spec.base == 16)
+                        shift = 4;
                 do {
                         tmp[i++] = (digits[((unsigned char)num) & mask] | locase);
                         num >>= shift;
@@ -493,7 +482,7 @@ static char *number(char *buf, char *end, unsigned long long num,
         /* leading space padding */
         spec.field_width -= spec.precision;
         if (!(spec.flags & (ZEROPAD+LEFT))) {
-                while(--spec.field_width >= 0) {
+                while (--spec.field_width >= 0) {
                         if (buf < end)
                                 *buf = ' ';
                         ++buf;
@@ -543,15 +532,16 @@ static char *number(char *buf, char *end, unsigned long long num,
                         *buf = ' ';
                 ++buf;
         }
+
         return buf;
 }
 
-static char *string(char *buf, char *end, char *s, struct printf_spec spec)
+static char *string(char *buf, char *end, const char *s, struct printf_spec spec)
 {
         int len, i;
 
         if ((unsigned long)s < PAGE_SIZE)
-                s = "<NULL>";
+                s = "(null)";
 
         len = strnlen(s, spec.precision);
 
@@ -572,6 +562,7 @@ static char *string(char *buf, char *end, char *s, struct printf_spec spec)
                         *buf = ' ';
                 ++buf;
         }
+
         return buf;
 }
 
@@ -585,11 +576,13 @@ static char *symbol_string(char *buf, char *end, void *ptr,
                 sprint_symbol(sym, value);
         else
                 kallsyms_lookup(value, NULL, NULL, NULL, sym);
+
         return string(buf, end, sym, spec);
 #else
-        spec.field_width = 2*sizeof(void *);
+        spec.field_width = 2 * sizeof(void *);
         spec.flags |= SPECIAL | SMALL | ZEROPAD;
         spec.base = 16;
+
         return number(buf, end, value, spec);
 #endif
 }
@@ -718,22 +711,19 @@ static char *ip4_string(char *p, const u8 *addr, bool leading_zeros)
                 if (i < 3)
                         *p++ = '.';
         }
-
         *p = '\0';
+
         return p;
 }
 
 static char *ip6_compressed_string(char *p, const char *addr)
 {
-        int i;
-        int j;
-        int range;
+        int i, j, range;
         unsigned char zerolength[8];
         int longest = 1;
         int colonpos = -1;
         u16 word;
-        u8 hi;
-        u8 lo;
+        u8 hi, lo;
         bool needcolon = false;
         bool useIPv4;
         struct in6_addr in6;
@@ -787,8 +777,9 @@ static char *ip6_compressed_string(char *p, const char *addr)
                                 p = pack_hex_byte(p, hi);
                         else
                                 *p++ = hex_asc_lo(hi);
+                        p = pack_hex_byte(p, lo);
                 }
-                if (hi || lo > 0x0f)
+                else if (lo > 0x0f)
                         p = pack_hex_byte(p, lo);
                 else
                         *p++ = hex_asc_lo(lo);
@@ -800,22 +791,23 @@ static char *ip6_compressed_string(char *p, const char *addr)
                         *p++ = ':';
                 p = ip4_string(p, &in6.s6_addr[12], false);
         }
-
         *p = '\0';
+
         return p;
 }
 
 static char *ip6_string(char *p, const char *addr, const char *fmt)
 {
         int i;
+
         for (i = 0; i < 8; i++) {
                 p = pack_hex_byte(p, *addr++);
                 p = pack_hex_byte(p, *addr++);
                 if (fmt[0] == 'I' && i != 7)
                         *p++ = ':';
         }
-
         *p = '\0';
+
         return p;
 }
 
@@ -842,6 +834,52 @@ static char *ip4_addr_string(char *buf, char *end, const u8 *addr,
         return string(buf, end, ip4_addr, spec);
 }
 
+static char *uuid_string(char *buf, char *end, const u8 *addr,
+                         struct printf_spec spec, const char *fmt)
+{
+        char uuid[sizeof("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")];
+        char *p = uuid;
+        int i;
+        static const u8 be[16] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
+        static const u8 le[16] = {3,2,1,0,5,4,7,6,8,9,10,11,12,13,14,15};
+        const u8 *index = be;
+        bool uc = false;
+
+        switch (*(++fmt)) {
+        case 'L':
+                uc = true;              /* fall-through */
+        case 'l':
+                index = le;
+                break;
+        case 'B':
+                uc = true;
+                break;
+        }
+
+        for (i = 0; i < 16; i++) {
+                p = pack_hex_byte(p, addr[index[i]]);
+                switch (i) {
+                case 3:
+                case 5:
+                case 7:
+                case 9:
+                        *p++ = '-';
+                        break;
+                }
+        }
+
+        *p = 0;
+
+        if (uc) {
+                p = uuid;
+                do {
+                        *p = toupper(*p);
+                } while (*(++p));
+        }
+
+        return string(buf, end, uuid, spec);
+}
+
 /*
  * Show a '%p' thing.  A kernel extension is that the '%p' is followed
  * by an extra set of alphanumeric characters that are extended format
@@ -866,6 +904,18 @@ static char *ip4_addr_string(char *buf, char *end, const u8 *addr,
  *       IPv4 uses dot-separated decimal with leading 0's (010.123.045.006)
  * - 'I6c' for IPv6 addresses printed as specified by
  *       http://www.ietf.org/id/draft-kawamura-ipv6-text-representation-03.txt
+ * - 'U' For a 16 byte UUID/GUID, it prints the UUID/GUID in the form
+ *       "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+ *       Options for %pU are:
+ *         b big endian lower case hex (default)
+ *         B big endian UPPER case hex
+ *         l little endian lower case hex
+ *         L little endian UPPER case hex
+ *           big endian output byte order is:
+ *             [0][1][2][3]-[4][5]-[6][7]-[8][9]-[10][11][12][13][14][15]
+ *           little endian output byte order is:
+ *             [3][2][1][0]-[5][4]-[7][6]-[8][9]-[10][11][12][13][14][15]
+ *
  * Note: The difference between 'S' and 'F' is that on ia64 and ppc64
  * function pointers are really function descriptors, which contain a
  * pointer to the real address.
@@ -880,9 +930,9 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
         case 'F':
         case 'f':
                 ptr = dereference_function_descriptor(ptr);
-        case 's':
                 /* Fallthrough */
         case 'S':
+        case 's':
                 return symbol_string(buf, end, ptr, spec, *fmt);
         case 'R':
         case 'r':
@@ -906,6 +956,8 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
                         return ip4_addr_string(buf, end, ptr, spec, fmt);
                 }
                 break;
+        case 'U':
+                return uuid_string(buf, end, ptr, spec, fmt);
         }
         spec.flags |= SMALL;
         if (spec.field_width == -1) {
@@ -1023,8 +1075,8 @@ precision:
 qualifier:
         /* get the conversion qualifier */
         spec->qualifier = -1;
-        if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ||
-            *fmt == 'Z' || *fmt == 'z' || *fmt == 't') {
+        if (*fmt == 'h' || TOLOWER(*fmt) == 'l' ||
+            TOLOWER(*fmt) == 'z' || *fmt == 't') {
                 spec->qualifier = *fmt++;
                 if (unlikely(spec->qualifier == *fmt)) {
                         if (spec->qualifier == 'l') {
@@ -1091,7 +1143,7 @@ qualifier:
                         spec->type = FORMAT_TYPE_LONG;
                 else
                         spec->type = FORMAT_TYPE_ULONG;
-        } else if (spec->qualifier == 'Z' || spec->qualifier == 'z') {
+        } else if (TOLOWER(spec->qualifier) == 'z') {
                 spec->type = FORMAT_TYPE_SIZE_T;
         } else if (spec->qualifier == 't') {
                 spec->type = FORMAT_TYPE_PTRDIFF;
@@ -1144,8 +1196,7 @@ qualifier:
 int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
 {
         unsigned long long num;
-        char *str, *end, c;
-        int read;
+        char *str, *end;
         struct printf_spec spec = {0};
 
         /* Reject out-of-range values early.  Large positive sizes are
@@ -1164,8 +1215,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
 
         while (*fmt) {
                 const char *old_fmt = fmt;
-
-                read = format_decode(fmt, &spec);
+                int read = format_decode(fmt, &spec);
 
                 fmt += read;
 
@@ -1189,7 +1239,9 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
                         spec.precision = va_arg(args, int);
                         break;
 
-                case FORMAT_TYPE_CHAR:
+                case FORMAT_TYPE_CHAR: {
+                        char c;
+
                         if (!(spec.flags & LEFT)) {
                                 while (--spec.field_width > 0) {
                                         if (str < end)
@@ -1208,6 +1260,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
                                 ++str;
                         }
                         break;
+                }
 
                 case FORMAT_TYPE_STR:
                         str = string(str, end, va_arg(args, char *), spec);
@@ -1238,8 +1291,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
                         if (qualifier == 'l') {
                                 long *ip = va_arg(args, long *);
                                 *ip = (str - buf);
-                        } else if (qualifier == 'Z' ||
-                                        qualifier == 'z') {
+                        } else if (TOLOWER(qualifier) == 'z') {
                                 size_t *ip = va_arg(args, size_t *);
                                 *ip = (str - buf);
                         } else {
@@ -1322,7 +1374,8 @@ int vscnprintf(char *buf, size_t size, const char *fmt, va_list args)
 {
         int i;
 
-        i=vsnprintf(buf,size,fmt,args);
+        i = vsnprintf(buf, size, fmt, args);
+
         return (i >= size) ? (size - 1) : i;
 }
 EXPORT_SYMBOL(vscnprintf);
@@ -1341,14 +1394,15 @@ EXPORT_SYMBOL(vscnprintf);
  *
  * See the vsnprintf() documentation for format string extensions over C99.
  */
-int snprintf(char * buf, size_t size, const char *fmt, ...)
+int snprintf(char *buf, size_t size, const char *fmt, ...)
 {
         va_list args;
         int i;
 
         va_start(args, fmt);
-        i=vsnprintf(buf,size,fmt,args);
+        i = vsnprintf(buf, size, fmt, args);
         va_end(args);
+
         return i;
 }
 EXPORT_SYMBOL(snprintf);
@@ -1364,7 +1418,7 @@ EXPORT_SYMBOL(snprintf);
  * the trailing '\0'. If @size is <= 0 the function returns 0.
  */
 
-int scnprintf(char * buf, size_t size, const char *fmt, ...)
+int scnprintf(char *buf, size_t size, const char *fmt, ...)
 {
         va_list args;
         int i;
@@ -1372,6 +1426,7 @@ int scnprintf(char * buf, size_t size, const char *fmt, ...)
         va_start(args, fmt);
         i = vsnprintf(buf, size, fmt, args);
         va_end(args);
+
         return (i >= size) ? (size - 1) : i;
 }
 EXPORT_SYMBOL(scnprintf);
@@ -1409,14 +1464,15 @@ EXPORT_SYMBOL(vsprintf);
  *
  * See the vsnprintf() documentation for format string extensions over C99.
  */
-int sprintf(char * buf, const char *fmt, ...)
+int sprintf(char *buf, const char *fmt, ...)
 {
         va_list args;
         int i;
 
         va_start(args, fmt);
-        i=vsnprintf(buf, INT_MAX, fmt, args);
+        i = vsnprintf(buf, INT_MAX, fmt, args);
         va_end(args);
+
         return i;
 }
 EXPORT_SYMBOL(sprintf);
@@ -1449,7 +1505,6 @@ int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args)
 {
         struct printf_spec spec = {0};
         char *str, *end;
-        int read;
 
         str = (char *)bin_buf;
         end = (char *)(bin_buf + size);
@@ -1474,14 +1529,15 @@ do {									\
         str += sizeof(type);                                            \
 } while (0)
 
-
         while (*fmt) {
-                read = format_decode(fmt, &spec);
+                int read = format_decode(fmt, &spec);
 
                 fmt += read;
 
                 switch (spec.type) {
                 case FORMAT_TYPE_NONE:
+                case FORMAT_TYPE_INVALID:
+                case FORMAT_TYPE_PERCENT_CHAR:
                         break;
 
                 case FORMAT_TYPE_WIDTH:
@@ -1496,13 +1552,14 @@ do {									\
                 case FORMAT_TYPE_STR: {
                         const char *save_str = va_arg(args, char *);
                         size_t len;
+
                         if ((unsigned long)save_str > (unsigned long)-PAGE_SIZE
                                         || (unsigned long)save_str < PAGE_SIZE)
-                                save_str = "<NULL>";
-                        len = strlen(save_str);
-                        if (str + len + 1 < end)
-                                memcpy(str, save_str, len + 1);
-                        str += len + 1;
+                                save_str = "(null)";
+                        len = strlen(save_str) + 1;
+                        if (str + len < end)
+                                memcpy(str, save_str, len);
+                        str += len;
                         break;
                 }
 
@@ -1513,19 +1570,13 @@ do {									\
                                 fmt++;
                         break;
 
-                case FORMAT_TYPE_PERCENT_CHAR:
-                        break;
-
-                case FORMAT_TYPE_INVALID:
-                        break;
-
                 case FORMAT_TYPE_NRCHARS: {
                         /* skip %n 's argument */
                         int qualifier = spec.qualifier;
                         void *skip_arg;
                         if (qualifier == 'l')
                                 skip_arg = va_arg(args, long *);
-                        else if (qualifier == 'Z' || qualifier == 'z')
+                        else if (TOLOWER(qualifier) == 'z')
                                 skip_arg = va_arg(args, size_t *);
                         else
                                 skip_arg = va_arg(args, int *);
@@ -1561,8 +1612,8 @@ do {									\
                         }
                 }
         }
-        return (u32 *)(PTR_ALIGN(str, sizeof(u32))) - bin_buf;
 
+        return (u32 *)(PTR_ALIGN(str, sizeof(u32))) - bin_buf;
 #undef save_arg
 }
 EXPORT_SYMBOL_GPL(vbin_printf);
@@ -1591,11 +1642,9 @@ EXPORT_SYMBOL_GPL(vbin_printf);
  */
 int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
 {
-        unsigned long long num;
-        char *str, *end, c;
-        const char *args = (const char *)bin_buf;
-
         struct printf_spec spec = {0};
+        char *str, *end;
+        const char *args = (const char *)bin_buf;
 
         if (WARN_ON_ONCE((int) size < 0))
                 return 0;
@@ -1625,10 +1674,8 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
         }
 
         while (*fmt) {
-                int read;
                 const char *old_fmt = fmt;
-
-                read = format_decode(fmt, &spec);
+                int read = format_decode(fmt, &spec);
 
                 fmt += read;
 
@@ -1652,7 +1699,9 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
                         spec.precision = get_arg(int);
                         break;
 
-                case FORMAT_TYPE_CHAR:
+                case FORMAT_TYPE_CHAR: {
+                        char c;
+
                         if (!(spec.flags & LEFT)) {
                                 while (--spec.field_width > 0) {
                                         if (str < end)
@@ -1670,11 +1719,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
                                 ++str;
                         }
                         break;
+                }
 
                 case FORMAT_TYPE_STR: {
                         const char *str_arg = args;
-                        size_t len = strlen(str_arg);
-                        args += len + 1;
+                        args += strlen(str_arg) + 1;
                         str = string(str, end, (char *)str_arg, spec);
                         break;
                 }
@@ -1686,11 +1735,6 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
                         break;
 
                 case FORMAT_TYPE_PERCENT_CHAR:
-                        if (str < end)
-                                *str = '%';
-                        ++str;
-                        break;
-
                 case FORMAT_TYPE_INVALID:
                         if (str < end)
                                 *str = '%';
@@ -1701,15 +1745,15 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
                         /* skip */
                         break;
 
-                default:
+                default: {
+                        unsigned long long num;
+
                         switch (spec.type) {
 
                         case FORMAT_TYPE_LONG_LONG:
                                 num = get_arg(long long);
                                 break;
                         case FORMAT_TYPE_ULONG:
-                                num = get_arg(unsigned long);
-                                break;
                         case FORMAT_TYPE_LONG:
                                 num = get_arg(unsigned long);
                                 break;
@@ -1739,8 +1783,9 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
                         }
 
                         str = number(str, end, num, spec);
-                }
-        }
+                } /* default: */
+                } /* switch(spec.type) */
+        } /* while(*fmt) */
 
         if (size > 0) {
                 if (str < end)
@@ -1774,6 +1819,7 @@ int bprintf(u32 *bin_buf, size_t size, const char *fmt, ...)
         va_start(args, fmt);
         ret = vbin_printf(bin_buf, size, fmt, args);
         va_end(args);
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(bprintf);
@@ -1786,27 +1832,23 @@ EXPORT_SYMBOL_GPL(bprintf);
  * @fmt:        format of buffer
  * @args:       arguments
  */
-int vsscanf(const char * buf, const char * fmt, va_list args)
+int vsscanf(const char *buf, const char *fmt, va_list args)
 {
         const char *str = buf;
         char *next;
         char digit;
         int num = 0;
-        int qualifier;
-        int base;
-        int field_width;
-        int is_sign = 0;
+        int qualifier, base, field_width;
+        bool is_sign;
 
-        while(*fmt && *str) {
+        while (*fmt && *str) {
                 /* skip any white space in format */
                 /* white space in format matchs any amount of
                  * white space, including none, in the input.
                  */
                 if (isspace(*fmt)) {
-                        while (isspace(*fmt))
-                                ++fmt;
-                        while (isspace(*str))
-                                ++str;
+                        fmt = skip_spaces(++fmt);
+                        str = skip_spaces(str);
                 }
 
                 /* anything that is not a conversion must match exactly */
@@ -1819,7 +1861,7 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
                 if (!*fmt)
                         break;
                 ++fmt;
-                
+
                 /* skip this conversion.
                  * advance both strings to next white space
                  */
@@ -1838,8 +1880,8 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
 
                 /* get conversion qualifier */
                 qualifier = -1;
-                if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ||
-                    *fmt == 'Z' || *fmt == 'z') {
+                if (*fmt == 'h' || TOLOWER(*fmt) == 'l' ||
+                    TOLOWER(*fmt) == 'z') {
                         qualifier = *fmt++;
                         if (unlikely(qualifier == *fmt)) {
                                 if (qualifier == 'h') {
@@ -1851,16 +1893,17 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
                                 }
                         }
                 }
-                base = 10;
-                is_sign = 0;
 
                 if (!*fmt || !*str)
                         break;
 
-                switch(*fmt++) {
+                base = 10;
+                is_sign = 0;
+
+                switch (*fmt++) {
                 case 'c':
                 {
-                        char *s = (char *) va_arg(args,char*);
+                        char *s = (char *)va_arg(args, char*);
                         if (field_width == -1)
                                 field_width = 1;
                         do {
@@ -1871,17 +1914,15 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
                 continue;
                 case 's':
                 {
-                        char *s = (char *) va_arg(args, char *);
-                        if(field_width == -1)
+                        char *s = (char *)va_arg(args, char *);
+                        if (field_width == -1)
                                 field_width = INT_MAX;
                         /* first, skip leading white space in buffer */
-                        while (isspace(*str))
-                                str++;
+                        str = skip_spaces(str);
 
                         /* now copy until next white space */
-                        while (*str && !isspace(*str) && field_width--) {
+                        while (*str && !isspace(*str) && field_width--)
                                 *s++ = *str++;
-                        }
                         *s = '\0';
                         num++;
                 }
@@ -1889,7 +1930,7 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
                 case 'n':
                         /* return number of characters read so far */
                 {
-                        int *i = (int *)va_arg(args,int*);
+                        int *i = (int *)va_arg(args, int*);
                         *i = str - buf;
                 }
                 continue;
@@ -1901,14 +1942,14 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
                         base = 16;
                         break;
                 case 'i':
-                        base = 0;
+                        base = 0;
                 case 'd':
                         is_sign = 1;
                 case 'u':
                         break;
                 case '%':
                         /* looking for '%' in str */
-                        if (*str++ != '%') 
+                        if (*str++ != '%')
                                 return num;
                         continue;
                 default:
@@ -1919,71 +1960,70 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
                 /* have some sort of integer conversion.
                  * first, skip white space in buffer.
                  */
-                while (isspace(*str))
-                        str++;
+                str = skip_spaces(str);
 
                 digit = *str;
                 if (is_sign && digit == '-')
                         digit = *(str + 1);
 
                 if (!digit
-                    || (base == 16 && !isxdigit(digit))
-                    || (base == 10 && !isdigit(digit))
-                    || (base == 8 && (!isdigit(digit) || digit > '7'))
-                    || (base == 0 && !isdigit(digit)))
-                                break;
+                    || (base == 16 && !isxdigit(digit))
+                    || (base == 10 && !isdigit(digit))
+                    || (base == 8 && (!isdigit(digit) || digit > '7'))
+                    || (base == 0 && !isdigit(digit)))
+                        break;
 
-                switch(qualifier) {
+                switch (qualifier) {
                 case 'H':       /* that's 'hh' in format */
                         if (is_sign) {
-                                signed char *s = (signed char *) va_arg(args,signed char *);
-                                *s = (signed char) simple_strtol(str,&next,base);
+                                signed char *s = (signed char *)va_arg(args, signed char *);
+                                *s = (signed char)simple_strtol(str, &next, base);
                         } else {
-                                unsigned char *s = (unsigned char *) va_arg(args, unsigned char *);
-                                *s = (unsigned char) simple_strtoul(str, &next, base);
+                                unsigned char *s = (unsigned char *)va_arg(args, unsigned char *);
+                                *s = (unsigned char)simple_strtoul(str, &next, base);
                         }
                         break;
                 case 'h':
                         if (is_sign) {
-                                short *s = (short *) va_arg(args,short *);
-                                *s = (short) simple_strtol(str,&next,base);
+                                short *s = (short *)va_arg(args, short *);
+                                *s = (short)simple_strtol(str, &next, base);
                         } else {
-                                unsigned short *s = (unsigned short *) va_arg(args, unsigned short *);
-                                *s = (unsigned short) simple_strtoul(str, &next, base);
+                                unsigned short *s = (unsigned short *)va_arg(args, unsigned short *);
+                                *s = (unsigned short)simple_strtoul(str, &next, base);
                         }
                         break;
                 case 'l':
                         if (is_sign) {
-                                long *l = (long *) va_arg(args,long *);
-                                *l = simple_strtol(str,&next,base);
+                                long *l = (long *)va_arg(args, long *);
+                                *l = simple_strtol(str, &next, base);
                         } else {
-                                unsigned long *l = (unsigned long*) va_arg(args,unsigned long*);
-                                *l = simple_strtoul(str,&next,base);
+                                unsigned long *l = (unsigned long *)va_arg(args, unsigned long *);
+                                *l = simple_strtoul(str, &next, base);
                         }
                         break;
                 case 'L':
                         if (is_sign) {
-                                long long *l = (long long*) va_arg(args,long long *);
-                                *l = simple_strtoll(str,&next,base);
+                                long long *l = (long long *)va_arg(args, long long *);
+                                *l = simple_strtoll(str, &next, base);
                         } else {
-                                unsigned long long *l = (unsigned long long*) va_arg(args,unsigned long long*);
-                                *l = simple_strtoull(str,&next,base);
+                                unsigned long long *l = (unsigned long long *)va_arg(args, unsigned long long *);
+                                *l = simple_strtoull(str, &next, base);
                         }
                         break;
                 case 'Z':
                 case 'z':
                 {
-                        size_t *s = (size_t*) va_arg(args,size_t*);
-                        *s = (size_t) simple_strtoul(str,&next,base);
+                        size_t *s = (size_t *)va_arg(args, size_t *);
+                        *s = (size_t)simple_strtoul(str, &next, base);
                 }
                 break;
                 default:
                         if (is_sign) {
-                                int *i = (int *) va_arg(args, int*);
-                                *i = (int) simple_strtol(str,&next,base);
+                                int *i = (int *)va_arg(args, int *);
+                                *i = (int)simple_strtol(str, &next, base);
                         } else {
-                                unsigned int *i = (unsigned int*) va_arg(args, unsigned int*);
-                                *i = (unsigned int) simple_strtoul(str,&next,base);
+                                unsigned int *i = (unsigned int *)va_arg(args, unsigned int*);
+                                *i = (unsigned int)simple_strtoul(str, &next, base);
                         }
                         break;
                 }
@@ -2014,14 +2054,15 @@ EXPORT_SYMBOL(vsscanf);
  * @fmt:        formatting of buffer
  * @...:        resulting arguments
  */
-int sscanf(const char * buf, const char * fmt, ...)
+int sscanf(const char *buf, const char *fmt, ...)
 {
         va_list args;
         int i;
 
-        va_start(args,fmt);
-        i = vsscanf(buf,fmt,args);
+        va_start(args, fmt);
+        i = vsscanf(buf, fmt, args);
         va_end(args);
+
         return i;
 }
 EXPORT_SYMBOL(sscanf);
diff --git a/mm/Kconfig b/mm/Kconfig
index 44cf6f0a3a6d..2310984591ed 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -158,11 +158,13 @@ config PAGEFLAGS_EXTENDED
 # Default to 4 for wider testing, though 8 might be more appropriate.
 # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
 # PA-RISC 7xxx's spinlock_t would enlarge struct page from 32 to 44 bytes.
+# DEBUG_SPINLOCK and DEBUG_LOCK_ALLOC spinlock_t also enlarge struct page.
 #
 config SPLIT_PTLOCK_CPUS
         int
-        default "4096" if ARM && !CPU_CACHE_VIPT
-        default "4096" if PARISC && !PA20
+        default "999999" if ARM && !CPU_CACHE_VIPT
+        default "999999" if PARISC && !PA20
+        default "999999" if DEBUG_SPINLOCK || DEBUG_LOCK_ALLOC
         default "4"
 
 #
@@ -200,14 +202,6 @@ config VIRT_TO_BUS
         def_bool y
         depends on !ARCH_NO_VIRT_TO_BUS
 
-config HAVE_MLOCK
-        bool
-        default y if MMU=y
-
-config HAVE_MLOCKED_PAGE_BIT
-        bool
-        default y if HAVE_MLOCK=y
-
 config MMU_NOTIFIER
         bool
 
@@ -218,7 +212,7 @@ config KSM
           Enable Kernel Samepage Merging: KSM periodically scans those areas
           of an application's address space that an app has advised may be
           mergeable.  When it finds pages of identical content, it replaces
-          the many instances by a single resident page with that content, so
+          the many instances by a single page with that content, so
           saving memory until one or another app needs to modify the content.
           Recommended for use with KVM, or with other duplicative applications.
           See Documentation/vm/ksm.txt for more information: KSM is inactive
diff --git a/mm/bootmem.c b/mm/bootmem.c
index d1dc23cc7f10..7d1486875e1c 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -432,8 +432,8 @@ int __init reserve_bootmem(unsigned long addr, unsigned long size,
         return mark_bootmem(start, end, 1, flags);
 }
 
-static unsigned long align_idx(struct bootmem_data *bdata, unsigned long idx,
-                        unsigned long step)
+static unsigned long __init align_idx(struct bootmem_data *bdata,
+                                      unsigned long idx, unsigned long step)
 {
         unsigned long base = bdata->node_min_pfn;
 
@@ -445,8 +445,8 @@ static unsigned long align_idx(struct bootmem_data *bdata, unsigned long idx,
         return ALIGN(base + idx, step) - base;
 }
 
-static unsigned long align_off(struct bootmem_data *bdata, unsigned long off,
-                        unsigned long align)
+static unsigned long __init align_off(struct bootmem_data *bdata,
+                                      unsigned long off, unsigned long align)
 {
         unsigned long base = PFN_PHYS(bdata->node_min_pfn);
 
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 5d7601b02874..65f38c218207 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 
 #include <linux/hugetlb.h>
+#include <linux/node.h>
 #include "internal.h"
 
 const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
@@ -622,42 +623,66 @@ static struct page *alloc_fresh_huge_page_node(struct hstate *h, int nid)
 }
 
 /*
- * Use a helper variable to find the next node and then
- * copy it back to next_nid_to_alloc afterwards:
- * otherwise there's a window in which a racer might
- * pass invalid nid MAX_NUMNODES to alloc_pages_exact_node.
- * But we don't need to use a spin_lock here: it really
- * doesn't matter if occasionally a racer chooses the
- * same nid as we do.  Move nid forward in the mask even
- * if we just successfully allocated a hugepage so that
- * the next caller gets hugepages on the next node.
+ * common helper functions for hstate_next_node_to_{alloc|free}.
+ * We may have allocated or freed a huge page based on a different
+ * nodes_allowed previously, so h->next_node_to_{alloc|free} might
+ * be outside of *nodes_allowed.  Ensure that we use an allowed
+ * node for alloc or free.
  */
-static int hstate_next_node_to_alloc(struct hstate *h)
+static int next_node_allowed(int nid, nodemask_t *nodes_allowed)
 {
-        int next_nid;
-        next_nid = next_node(h->next_nid_to_alloc, node_online_map);
-        if (next_nid == MAX_NUMNODES)
-                next_nid = first_node(node_online_map);
-        h->next_nid_to_alloc = next_nid;
-        return next_nid;
+        nid = next_node(nid, *nodes_allowed);
+        if (nid == MAX_NUMNODES)
+                nid = first_node(*nodes_allowed);
+        VM_BUG_ON(nid >= MAX_NUMNODES);
+
+        return nid;
+}
+
+static int get_valid_node_allowed(int nid, nodemask_t *nodes_allowed)
+{
+        if (!node_isset(nid, *nodes_allowed))
+                nid = next_node_allowed(nid, nodes_allowed);
+        return nid;
+}
+
+/*
+ * returns the previously saved node ["this node"] from which to
+ * allocate a persistent huge page for the pool and advance the
+ * next node from which to allocate, handling wrap at end of node
+ * mask.
+ */
+static int hstate_next_node_to_alloc(struct hstate *h,
+                                        nodemask_t *nodes_allowed)
+{
+        int nid;
+
+        VM_BUG_ON(!nodes_allowed);
+
+        nid = get_valid_node_allowed(h->next_nid_to_alloc, nodes_allowed);
+        h->next_nid_to_alloc = next_node_allowed(nid, nodes_allowed);
+
+        return nid;
 }
 
-static int alloc_fresh_huge_page(struct hstate *h)
+static int alloc_fresh_huge_page(struct hstate *h, nodemask_t *nodes_allowed)
 {
         struct page *page;
         int start_nid;
         int next_nid;
         int ret = 0;
 
-        start_nid = h->next_nid_to_alloc;
+        start_nid = hstate_next_node_to_alloc(h, nodes_allowed);
         next_nid = start_nid;
 
         do {
                 page = alloc_fresh_huge_page_node(h, next_nid);
-                if (page)
+                if (page) {
                         ret = 1;
-                next_nid = hstate_next_node_to_alloc(h);
-        } while (!page && next_nid != start_nid);
+                        break;
+                }
+                next_nid = hstate_next_node_to_alloc(h, nodes_allowed);
+        } while (next_nid != start_nid);
 
         if (ret)
                 count_vm_event(HTLB_BUDDY_PGALLOC);
@@ -668,17 +693,21 @@ static int alloc_fresh_huge_page(struct hstate *h)
 }
 
 /*
- * helper for free_pool_huge_page() - find next node
- * from which to free a huge page
+ * helper for free_pool_huge_page() - return the previously saved
+ * node ["this node"] from which to free a huge page.  Advance the
+ * next node id whether or not we find a free huge page to free so
+ * that the next attempt to free addresses the next node.
  */
-static int hstate_next_node_to_free(struct hstate *h)
+static int hstate_next_node_to_free(struct hstate *h, nodemask_t *nodes_allowed)
 {
-        int next_nid;
-        next_nid = next_node(h->next_nid_to_free, node_online_map);
-        if (next_nid == MAX_NUMNODES)
-                next_nid = first_node(node_online_map);
-        h->next_nid_to_free = next_nid;
-        return next_nid;
+        int nid;
+
+        VM_BUG_ON(!nodes_allowed);
+
+        nid = get_valid_node_allowed(h->next_nid_to_free, nodes_allowed);
+        h->next_nid_to_free = next_node_allowed(nid, nodes_allowed);
+
+        return nid;
 }
 
 /*
@@ -687,13 +716,14 @@ static int hstate_next_node_to_free(struct hstate *h)
  * balanced over allowed nodes.
  * Called with hugetlb_lock locked.
  */
-static int free_pool_huge_page(struct hstate *h, bool acct_surplus)
+static int free_pool_huge_page(struct hstate *h, nodemask_t *nodes_allowed,
+                                                         bool acct_surplus)
 {
         int start_nid;
         int next_nid;
         int ret = 0;
 
-        start_nid = h->next_nid_to_free;
+        start_nid = hstate_next_node_to_free(h, nodes_allowed);
         next_nid = start_nid;
 
         do {
@@ -715,9 +745,10 @@ static int free_pool_huge_page(struct hstate *h, bool acct_surplus)
                         }
                         update_and_free_page(h, page);
                         ret = 1;
+                        break;
                 }
-                next_nid = hstate_next_node_to_free(h);
-        } while (!ret && next_nid != start_nid);
+                next_nid = hstate_next_node_to_free(h, nodes_allowed);
+        } while (next_nid != start_nid);
 
         return ret;
 }
@@ -911,14 +942,14 @@ static void return_unused_surplus_pages(struct hstate *h,
 
         /*
          * We want to release as many surplus pages as possible, spread
-         * evenly across all nodes. Iterate across all nodes until we
-         * can no longer free unreserved surplus pages. This occurs when
-         * the nodes with surplus pages have no free pages.
-         * free_pool_huge_page() will balance the the frees across the
-         * on-line nodes for us and will handle the hstate accounting.
+         * evenly across all nodes with memory. Iterate across these nodes
+         * until we can no longer free unreserved surplus pages. This occurs
+         * when the nodes with surplus pages have no free pages.
+         * free_pool_huge_page() will balance the the freed pages across the
+         * on-line nodes with memory and will handle the hstate accounting.
          */
         while (nr_pages--) {
-                if (!free_pool_huge_page(h, 1))
+                if (!free_pool_huge_page(h, &node_states[N_HIGH_MEMORY], 1))
                         break;
         }
 }
@@ -1022,16 +1053,16 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma,
 int __weak alloc_bootmem_huge_page(struct hstate *h)
 {
         struct huge_bootmem_page *m;
-        int nr_nodes = nodes_weight(node_online_map);
+        int nr_nodes = nodes_weight(node_states[N_HIGH_MEMORY]);
 
         while (nr_nodes) {
                 void *addr;
 
                 addr = __alloc_bootmem_node_nopanic(
-                                NODE_DATA(h->next_nid_to_alloc),
+                                NODE_DATA(hstate_next_node_to_alloc(h,
+                                                &node_states[N_HIGH_MEMORY])),
                                 huge_page_size(h), huge_page_size(h), 0);
 
-                hstate_next_node_to_alloc(h);
                 if (addr) {
                         /*
                          * Use the beginning of the huge page to store the
@@ -1084,7 +1115,8 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h)
                 if (h->order >= MAX_ORDER) {
                         if (!alloc_bootmem_huge_page(h))
                                 break;
-                } else if (!alloc_fresh_huge_page(h))
+                } else if (!alloc_fresh_huge_page(h,
+                                         &node_states[N_HIGH_MEMORY]))
                         break;
         }
         h->max_huge_pages = i;
@@ -1126,14 +1158,15 @@ static void __init report_hugepages(void)
 }
 
 #ifdef CONFIG_HIGHMEM
-static void try_to_free_low(struct hstate *h, unsigned long count)
+static void try_to_free_low(struct hstate *h, unsigned long count,
+                                                nodemask_t *nodes_allowed)
 {
         int i;
 
         if (h->order >= MAX_ORDER)
                 return;
 
-        for (i = 0; i < MAX_NUMNODES; ++i) {
+        for_each_node_mask(i, *nodes_allowed) {
                 struct page *page, *next;
                 struct list_head *freel = &h->hugepage_freelists[i];
                 list_for_each_entry_safe(page, next, freel, lru) {
@@ -1149,7 +1182,8 @@ static void try_to_free_low(struct hstate *h, unsigned long count)
         }
 }
 #else
-static inline void try_to_free_low(struct hstate *h, unsigned long count)
+static inline void try_to_free_low(struct hstate *h, unsigned long count,
+                                                nodemask_t *nodes_allowed)
 {
 }
 #endif
@@ -1159,7 +1193,8 @@ static inline void try_to_free_low(struct hstate *h, unsigned long count)
  * balanced by operating on them in a round-robin fashion.
  * Returns 1 if an adjustment was made.
  */
-static int adjust_pool_surplus(struct hstate *h, int delta)
+static int adjust_pool_surplus(struct hstate *h, nodemask_t *nodes_allowed,
+                                int delta)
 {
         int start_nid, next_nid;
         int ret = 0;
@@ -1167,29 +1202,33 @@ static int adjust_pool_surplus(struct hstate *h, int delta)
         VM_BUG_ON(delta != -1 && delta != 1);
 
         if (delta < 0)
-                start_nid = h->next_nid_to_alloc;
+                start_nid = hstate_next_node_to_alloc(h, nodes_allowed);
         else
-                start_nid = h->next_nid_to_free;
+                start_nid = hstate_next_node_to_free(h, nodes_allowed);
         next_nid = start_nid;
 
         do {
                 int nid = next_nid;
                 if (delta < 0)  {
-                        next_nid = hstate_next_node_to_alloc(h);
                         /*
                          * To shrink on this node, there must be a surplus page
                          */
-                        if (!h->surplus_huge_pages_node[nid])
+                        if (!h->surplus_huge_pages_node[nid]) {
+                                next_nid = hstate_next_node_to_alloc(h,
+                                                                nodes_allowed);
                                 continue;
+                        }
                 }
                 if (delta > 0) {
-                        next_nid = hstate_next_node_to_free(h);
                         /*
                          * Surplus cannot exceed the total number of pages
                          */
                         if (h->surplus_huge_pages_node[nid] >=
-                                                h->nr_huge_pages_node[nid])
+                                                h->nr_huge_pages_node[nid]) {
+                                next_nid = hstate_next_node_to_free(h,
+                                                                nodes_allowed);
                                 continue;
+                        }
                 }
 
                 h->surplus_huge_pages += delta;
@@ -1202,7 +1241,8 @@ static int adjust_pool_surplus(struct hstate *h, int delta)
 }
 
 #define persistent_huge_pages(h) (h->nr_huge_pages - h->surplus_huge_pages)
-static unsigned long set_max_huge_pages(struct hstate *h, unsigned long count)
+static unsigned long set_max_huge_pages(struct hstate *h, unsigned long count,
+                                                nodemask_t *nodes_allowed)
 {
         unsigned long min_count, ret;
 
@@ -1222,7 +1262,7 @@ static unsigned long set_max_huge_pages(struct hstate *h, unsigned long count)
          */
         spin_lock(&hugetlb_lock);
         while (h->surplus_huge_pages && count > persistent_huge_pages(h)) {
-                if (!adjust_pool_surplus(h, -1))
+                if (!adjust_pool_surplus(h, nodes_allowed, -1))
                         break;
         }
 
@@ -1233,11 +1273,14 @@ static unsigned long set_max_huge_pages(struct hstate *h, unsigned long count)
                  * and reducing the surplus.
                  */
                 spin_unlock(&hugetlb_lock);
-                ret = alloc_fresh_huge_page(h);
+                ret = alloc_fresh_huge_page(h, nodes_allowed);
                 spin_lock(&hugetlb_lock);
                 if (!ret)
                         goto out;
 
+                /* Bail for signals. Probably ctrl-c from user */
+                if (signal_pending(current))
+                        goto out;
         }
 
         /*
@@ -1257,13 +1300,13 @@ static unsigned long set_max_huge_pages(struct hstate *h, unsigned long count)
          */
         min_count = h->resv_huge_pages + h->nr_huge_pages - h->free_huge_pages;
         min_count = max(count, min_count);
-        try_to_free_low(h, min_count);
+        try_to_free_low(h, min_count, nodes_allowed);
         while (min_count < persistent_huge_pages(h)) {
-                if (!free_pool_huge_page(h, 0))
+                if (!free_pool_huge_page(h, nodes_allowed, 0))
                         break;
         }
         while (count < persistent_huge_pages(h)) {
-                if (!adjust_pool_surplus(h, 1))
+                if (!adjust_pool_surplus(h, nodes_allowed, 1))
                         break;
         }
 out:
@@ -1282,43 +1325,117 @@ out:
 static struct kobject *hugepages_kobj;
 static struct kobject *hstate_kobjs[HUGE_MAX_HSTATE];
 
-static struct hstate *kobj_to_hstate(struct kobject *kobj)
+static struct hstate *kobj_to_node_hstate(struct kobject *kobj, int *nidp);
+
+static struct hstate *kobj_to_hstate(struct kobject *kobj, int *nidp)
 {
         int i;
+
         for (i = 0; i < HUGE_MAX_HSTATE; i++)
-                if (hstate_kobjs[i] == kobj)
+                if (hstate_kobjs[i] == kobj) {
+                        if (nidp)
+                                *nidp = NUMA_NO_NODE;
                         return &hstates[i];
-        BUG();
-        return NULL;
+                }
+
+        return kobj_to_node_hstate(kobj, nidp);
 }
 
-static ssize_t nr_hugepages_show(struct kobject *kobj,
+static ssize_t nr_hugepages_show_common(struct kobject *kobj,
                                         struct kobj_attribute *attr, char *buf)
 {
-        struct hstate *h = kobj_to_hstate(kobj);
-        return sprintf(buf, "%lu\n", h->nr_huge_pages);
+        struct hstate *h;
+        unsigned long nr_huge_pages;
+        int nid;
+
+        h = kobj_to_hstate(kobj, &nid);
+        if (nid == NUMA_NO_NODE)
+                nr_huge_pages = h->nr_huge_pages;
+        else
+                nr_huge_pages = h->nr_huge_pages_node[nid];
+
+        return sprintf(buf, "%lu\n", nr_huge_pages);
 }
-static ssize_t nr_hugepages_store(struct kobject *kobj,
-                struct kobj_attribute *attr, const char *buf, size_t count)
+static ssize_t nr_hugepages_store_common(bool obey_mempolicy,
+                        struct kobject *kobj, struct kobj_attribute *attr,
+                        const char *buf, size_t len)
 {
         int err;
-        unsigned long input;
-        struct hstate *h = kobj_to_hstate(kobj);
+        int nid;
+        unsigned long count;
+        struct hstate *h;
+        NODEMASK_ALLOC(nodemask_t, nodes_allowed, GFP_KERNEL | __GFP_NORETRY);
 
-        err = strict_strtoul(buf, 10, &input);
+        err = strict_strtoul(buf, 10, &count);
         if (err)
                 return 0;
 
-        h->max_huge_pages = set_max_huge_pages(h, input);
+        h = kobj_to_hstate(kobj, &nid);
+        if (nid == NUMA_NO_NODE) {
+                /*
+                 * global hstate attribute
+                 */
+                if (!(obey_mempolicy &&
+                                init_nodemask_of_mempolicy(nodes_allowed))) {
+                        NODEMASK_FREE(nodes_allowed);
+                        nodes_allowed = &node_states[N_HIGH_MEMORY];
+                }
+        } else if (nodes_allowed) {
+                /*
+                 * per node hstate attribute: adjust count to global,
+                 * but restrict alloc/free to the specified node.
+                 */
+                count += h->nr_huge_pages - h->nr_huge_pages_node[nid];
+                init_nodemask_of_node(nodes_allowed, nid);
+        } else
+                nodes_allowed = &node_states[N_HIGH_MEMORY];
+
+        h->max_huge_pages = set_max_huge_pages(h, count, nodes_allowed);
 
-        return count;
+        if (nodes_allowed != &node_states[N_HIGH_MEMORY])
+                NODEMASK_FREE(nodes_allowed);
+
+        return len;
+}
+
+static ssize_t nr_hugepages_show(struct kobject *kobj,
+                                       struct kobj_attribute *attr, char *buf)
+{
+        return nr_hugepages_show_common(kobj, attr, buf);
+}
+
+static ssize_t nr_hugepages_store(struct kobject *kobj,
+               struct kobj_attribute *attr, const char *buf, size_t len)
+{
+        return nr_hugepages_store_common(false, kobj, attr, buf, len);
 }
 HSTATE_ATTR(nr_hugepages);
 
+#ifdef CONFIG_NUMA
+
+/*
+ * hstate attribute for optionally mempolicy-based constraint on persistent
+ * huge page alloc/free.
+ */
+static ssize_t nr_hugepages_mempolicy_show(struct kobject *kobj,
+                                       struct kobj_attribute *attr, char *buf)
+{
+        return nr_hugepages_show_common(kobj, attr, buf);
+}
+
+static ssize_t nr_hugepages_mempolicy_store(struct kobject *kobj,
+               struct kobj_attribute *attr, const char *buf, size_t len)
+{
+        return nr_hugepages_store_common(true, kobj, attr, buf, len);
+}
+HSTATE_ATTR(nr_hugepages_mempolicy);
+#endif
+
+
 static ssize_t nr_overcommit_hugepages_show(struct kobject *kobj,
                                         struct kobj_attribute *attr, char *buf)
 {
-        struct hstate *h = kobj_to_hstate(kobj);
+        struct hstate *h = kobj_to_hstate(kobj, NULL);
         return sprintf(buf, "%lu\n", h->nr_overcommit_huge_pages);
 }
 static ssize_t nr_overcommit_hugepages_store(struct kobject *kobj,
@@ -1326,7 +1443,7 @@ static ssize_t nr_overcommit_hugepages_store(struct kobject *kobj,
 {
         int err;
         unsigned long input;
-        struct hstate *h = kobj_to_hstate(kobj);
+        struct hstate *h = kobj_to_hstate(kobj, NULL);
 
         err = strict_strtoul(buf, 10, &input);
         if (err)
@@ -1343,15 +1460,24 @@ HSTATE_ATTR(nr_overcommit_hugepages);
 static ssize_t free_hugepages_show(struct kobject *kobj,
                                         struct kobj_attribute *attr, char *buf)
 {
-        struct hstate *h = kobj_to_hstate(kobj);
-        return sprintf(buf, "%lu\n", h->free_huge_pages);
+        struct hstate *h;
+        unsigned long free_huge_pages;
+        int nid;
+
+        h = kobj_to_hstate(kobj, &nid);
+        if (nid == NUMA_NO_NODE)
+                free_huge_pages = h->free_huge_pages;
+        else
+                free_huge_pages = h->free_huge_pages_node[nid];
+
+        return sprintf(buf, "%lu\n", free_huge_pages);
 }
 HSTATE_ATTR_RO(free_hugepages);
 
 static ssize_t resv_hugepages_show(struct kobject *kobj,
                                         struct kobj_attribute *attr, char *buf)
 {
-        struct hstate *h = kobj_to_hstate(kobj);
+        struct hstate *h = kobj_to_hstate(kobj, NULL);
         return sprintf(buf, "%lu\n", h->resv_huge_pages);
 }
 HSTATE_ATTR_RO(resv_hugepages);
@@ -1359,8 +1485,17 @@ HSTATE_ATTR_RO(resv_hugepages);
 static ssize_t surplus_hugepages_show(struct kobject *kobj,
                                         struct kobj_attribute *attr, char *buf)
 {
-        struct hstate *h = kobj_to_hstate(kobj);
-        return sprintf(buf, "%lu\n", h->surplus_huge_pages);
+        struct hstate *h;
+        unsigned long surplus_huge_pages;
+        int nid;
+
+        h = kobj_to_hstate(kobj, &nid);
+        if (nid == NUMA_NO_NODE)
+                surplus_huge_pages = h->surplus_huge_pages;
+        else
+                surplus_huge_pages = h->surplus_huge_pages_node[nid];
+
+        return sprintf(buf, "%lu\n", surplus_huge_pages);
 }
 HSTATE_ATTR_RO(surplus_hugepages);
 
@@ -1370,6 +1505,9 @@ static struct attribute *hstate_attrs[] = {
         &free_hugepages_attr.attr,
         &resv_hugepages_attr.attr,
         &surplus_hugepages_attr.attr,
+#ifdef CONFIG_NUMA
+        &nr_hugepages_mempolicy_attr.attr,
+#endif
         NULL,
 };
 
@@ -1377,19 +1515,21 @@ static struct attribute_group hstate_attr_group = {
         .attrs = hstate_attrs,
 };
 
-static int __init hugetlb_sysfs_add_hstate(struct hstate *h)
+static int __init hugetlb_sysfs_add_hstate(struct hstate *h,
+                                struct kobject *parent,
+                                struct kobject **hstate_kobjs,
+                                struct attribute_group *hstate_attr_group)
 {
         int retval;
+        int hi = h - hstates;
 
-        hstate_kobjs[h - hstates] = kobject_create_and_add(h->name,
-                                                        hugepages_kobj);
-        if (!hstate_kobjs[h - hstates])
+        hstate_kobjs[hi] = kobject_create_and_add(h->name, parent);
+        if (!hstate_kobjs[hi])
                 return -ENOMEM;
 
-        retval = sysfs_create_group(hstate_kobjs[h - hstates],
-                                                        &hstate_attr_group);
+        retval = sysfs_create_group(hstate_kobjs[hi], hstate_attr_group);
         if (retval)
-                kobject_put(hstate_kobjs[h - hstates]);
+                kobject_put(hstate_kobjs[hi]);
 
         return retval;
 }
@@ -1404,17 +1544,184 @@ static void __init hugetlb_sysfs_init(void)
                 return;
 
         for_each_hstate(h) {
-                err = hugetlb_sysfs_add_hstate(h);
+                err = hugetlb_sysfs_add_hstate(h, hugepages_kobj,
+                                         hstate_kobjs, &hstate_attr_group);
                 if (err)
                         printk(KERN_ERR "Hugetlb: Unable to add hstate %s",
                                                                 h->name);
         }
 }
 
+#ifdef CONFIG_NUMA
+
+/*
+ * node_hstate/s - associate per node hstate attributes, via their kobjects,
+ * with node sysdevs in node_devices[] using a parallel array.  The array
+ * index of a node sysdev or _hstate == node id.
+ * This is here to avoid any static dependency of the node sysdev driver, in
+ * the base kernel, on the hugetlb module.
+ */
+struct node_hstate {
+        struct kobject          *hugepages_kobj;
+        struct kobject          *hstate_kobjs[HUGE_MAX_HSTATE];
+};
+struct node_hstate node_hstates[MAX_NUMNODES];
+
+/*
+ * A subset of global hstate attributes for node sysdevs
+ */
+static struct attribute *per_node_hstate_attrs[] = {
+        &nr_hugepages_attr.attr,
+        &free_hugepages_attr.attr,
+        &surplus_hugepages_attr.attr,
+        NULL,
+};
+
+static struct attribute_group per_node_hstate_attr_group = {
+        .attrs = per_node_hstate_attrs,
+};
+
+/*
+ * kobj_to_node_hstate - lookup global hstate for node sysdev hstate attr kobj.
+ * Returns node id via non-NULL nidp.
+ */
+static struct hstate *kobj_to_node_hstate(struct kobject *kobj, int *nidp)
+{
+        int nid;
+
+        for (nid = 0; nid < nr_node_ids; nid++) {
+                struct node_hstate *nhs = &node_hstates[nid];
+                int i;
+                for (i = 0; i < HUGE_MAX_HSTATE; i++)
+                        if (nhs->hstate_kobjs[i] == kobj) {
+                                if (nidp)
+                                        *nidp = nid;
+                                return &hstates[i];
+                        }
+        }
+
+        BUG();
+        return NULL;
+}
+
+/*
+ * Unregister hstate attributes from a single node sysdev.
+ * No-op if no hstate attributes attached.
+ */
+void hugetlb_unregister_node(struct node *node)
+{
+        struct hstate *h;
+        struct node_hstate *nhs = &node_hstates[node->sysdev.id];
+
+        if (!nhs->hugepages_kobj)
+                return;         /* no hstate attributes */
+
+        for_each_hstate(h)
+                if (nhs->hstate_kobjs[h - hstates]) {
+                        kobject_put(nhs->hstate_kobjs[h - hstates]);
+                        nhs->hstate_kobjs[h - hstates] = NULL;
+                }
+
+        kobject_put(nhs->hugepages_kobj);
+        nhs->hugepages_kobj = NULL;
+}
+
+/*
+ * hugetlb module exit:  unregister hstate attributes from node sysdevs
+ * that have them.
+ */
+static void hugetlb_unregister_all_nodes(void)
+{
+        int nid;
+
+        /*
+         * disable node sysdev registrations.
+         */
+        register_hugetlbfs_with_node(NULL, NULL);
+
+        /*
+         * remove hstate attributes from any nodes that have them.
+         */
+        for (nid = 0; nid < nr_node_ids; nid++)
+                hugetlb_unregister_node(&node_devices[nid]);
+}
+
+/*
+ * Register hstate attributes for a single node sysdev.
+ * No-op if attributes already registered.
+ */
+void hugetlb_register_node(struct node *node)
+{
+        struct hstate *h;
+        struct node_hstate *nhs = &node_hstates[node->sysdev.id];
+        int err;
+
+        if (nhs->hugepages_kobj)
+                return;         /* already allocated */
+
+        nhs->hugepages_kobj = kobject_create_and_add("hugepages",
+                                                        &node->sysdev.kobj);
+        if (!nhs->hugepages_kobj)
+                return;
+
+        for_each_hstate(h) {
+                err = hugetlb_sysfs_add_hstate(h, nhs->hugepages_kobj,
+                                                nhs->hstate_kobjs,
+                                                &per_node_hstate_attr_group);
+                if (err) {
+                        printk(KERN_ERR "Hugetlb: Unable to add hstate %s"
+                                        " for node %d\n",
+                                                h->name, node->sysdev.id);
+                        hugetlb_unregister_node(node);
+                        break;
+                }
+        }
+}
+
+/*
+ * hugetlb init time:  register hstate attributes for all registered node
+ * sysdevs of nodes that have memory.  All on-line nodes should have
+ * registered their associated sysdev by this time.
+ */
+static void hugetlb_register_all_nodes(void)
+{
+        int nid;
+
+        for_each_node_state(nid, N_HIGH_MEMORY) {
+                struct node *node = &node_devices[nid];
+                if (node->sysdev.id == nid)
+                        hugetlb_register_node(node);
+        }
+
+        /*
+         * Let the node sysdev driver know we're here so it can
+         * [un]register hstate attributes on node hotplug.
+         */
+        register_hugetlbfs_with_node(hugetlb_register_node,
+                                     hugetlb_unregister_node);
+}
+#else   /* !CONFIG_NUMA */
+
+static struct hstate *kobj_to_node_hstate(struct kobject *kobj, int *nidp)
+{
+        BUG();
+        if (nidp)
+                *nidp = -1;
+        return NULL;
+}
+
+static void hugetlb_unregister_all_nodes(void) { }
+
+static void hugetlb_register_all_nodes(void) { }
+
+#endif
+
 static void __exit hugetlb_exit(void)
 {
         struct hstate *h;
 
+        hugetlb_unregister_all_nodes();
+
         for_each_hstate(h) {
                 kobject_put(hstate_kobjs[h - hstates]);
         }
@@ -1449,6 +1756,8 @@ static int __init hugetlb_init(void)
 
         hugetlb_sysfs_init();
 
+        hugetlb_register_all_nodes();
+
         return 0;
 }
 module_init(hugetlb_init);
@@ -1472,8 +1781,8 @@ void __init hugetlb_add_hstate(unsigned order)
         h->free_huge_pages = 0;
         for (i = 0; i < MAX_NUMNODES; ++i)
                 INIT_LIST_HEAD(&h->hugepage_freelists[i]);
-        h->next_nid_to_alloc = first_node(node_online_map);
-        h->next_nid_to_free = first_node(node_online_map);
+        h->next_nid_to_alloc = first_node(node_states[N_HIGH_MEMORY]);
+        h->next_nid_to_free = first_node(node_states[N_HIGH_MEMORY]);
         snprintf(h->name, HSTATE_NAME_LEN, "hugepages-%lukB",
                                         huge_page_size(h)/1024);
 
@@ -1536,9 +1845,9 @@ static unsigned int cpuset_mems_nr(unsigned int *array)
 }
 
 #ifdef CONFIG_SYSCTL
-int hugetlb_sysctl_handler(struct ctl_table *table, int write,
-                           void __user *buffer,
-                           size_t *length, loff_t *ppos)
+static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
+                         struct ctl_table *table, int write,
+                         void __user *buffer, size_t *length, loff_t *ppos)
 {
         struct hstate *h = &default_hstate;
         unsigned long tmp;
@@ -1550,12 +1859,40 @@ int hugetlb_sysctl_handler(struct ctl_table *table, int write,
         table->maxlen = sizeof(unsigned long);
         proc_doulongvec_minmax(table, write, buffer, length, ppos);
 
-        if (write)
-                h->max_huge_pages = set_max_huge_pages(h, tmp);
+        if (write) {
+                NODEMASK_ALLOC(nodemask_t, nodes_allowed,
+                                                GFP_KERNEL | __GFP_NORETRY);
+                if (!(obey_mempolicy &&
+                               init_nodemask_of_mempolicy(nodes_allowed))) {
+                        NODEMASK_FREE(nodes_allowed);
+                        nodes_allowed = &node_states[N_HIGH_MEMORY];
+                }
+                h->max_huge_pages = set_max_huge_pages(h, tmp, nodes_allowed);
+
+                if (nodes_allowed != &node_states[N_HIGH_MEMORY])
+                        NODEMASK_FREE(nodes_allowed);
+        }
 
         return 0;
 }
 
+int hugetlb_sysctl_handler(struct ctl_table *table, int write,
+                          void __user *buffer, size_t *length, loff_t *ppos)
+{
+
+        return hugetlb_sysctl_handler_common(false, table, write,
+                                                        buffer, length, ppos);
+}
+
+#ifdef CONFIG_NUMA
+int hugetlb_mempolicy_sysctl_handler(struct ctl_table *table, int write,
+                          void __user *buffer, size_t *length, loff_t *ppos)
+{
+        return hugetlb_sysctl_handler_common(true, table, write,
+                                                        buffer, length, ppos);
+}
+#endif /* CONFIG_NUMA */
+
 int hugetlb_treat_movable_handler(struct ctl_table *table, int write,
                         void __user *buffer,
                         size_t *length, loff_t *ppos)
@@ -1903,6 +2240,12 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
                 + (vma->vm_pgoff >> PAGE_SHIFT);
         mapping = (struct address_space *)page_private(page);
 
+        /*
+         * Take the mapping lock for the duration of the table walk. As
+         * this mapping should be shared between all the VMAs,
+         * __unmap_hugepage_range() is called as the lock is already held
+         */
+        spin_lock(&mapping->i_mmap_lock);
         vma_prio_tree_foreach(iter_vma, &iter, &mapping->i_mmap, pgoff, pgoff) {
                 /* Do not unmap the current VMA */
                 if (iter_vma == vma)
@@ -1916,10 +2259,11 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
                  * from the time of fork. This would look like data corruption
                  */
                 if (!is_vma_resv_set(iter_vma, HPAGE_RESV_OWNER))
-                        unmap_hugepage_range(iter_vma,
+                        __unmap_hugepage_range(iter_vma,
                                 address, address + huge_page_size(h),
                                 page);
         }
+        spin_unlock(&mapping->i_mmap_lock);
 
         return 1;
 }
@@ -1959,6 +2303,9 @@ retry_avoidcopy:
                 outside_reserve = 1;
 
         page_cache_get(old_page);
+
+        /* Drop page_table_lock as buddy allocator may be called */
+        spin_unlock(&mm->page_table_lock);
         new_page = alloc_huge_page(vma, address, outside_reserve);
 
         if (IS_ERR(new_page)) {
@@ -1976,19 +2323,25 @@ retry_avoidcopy:
                         if (unmap_ref_private(mm, vma, old_page, address)) {
                                 BUG_ON(page_count(old_page) != 1);
                                 BUG_ON(huge_pte_none(pte));
+                                spin_lock(&mm->page_table_lock);
                                 goto retry_avoidcopy;
                         }
                         WARN_ON_ONCE(1);
                 }
 
+                /* Caller expects lock to be held */
+                spin_lock(&mm->page_table_lock);
                 return -PTR_ERR(new_page);
         }
 
-        spin_unlock(&mm->page_table_lock);
         copy_huge_page(new_page, old_page, address, vma);
         __SetPageUptodate(new_page);
-        spin_lock(&mm->page_table_lock);
 
+        /*
+         * Retake the page_table_lock to check for racing updates
+         * before the page tables are altered
+         */
+        spin_lock(&mm->page_table_lock);
         ptep = huge_pte_offset(mm, address & huge_page_mask(h));
         if (likely(pte_same(huge_ptep_get(ptep), pte))) {
                 /* Break COW */
diff --git a/mm/internal.h b/mm/internal.h
index 22ec8d2b0fb8..4fe67a162cb4 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -63,7 +63,7 @@ static inline unsigned long page_order(struct page *page)
         return page_private(page);
 }
 
-#ifdef CONFIG_HAVE_MLOCK
+#ifdef CONFIG_MMU
 extern long mlock_vma_pages_range(struct vm_area_struct *vma,
                         unsigned long start, unsigned long end);
 extern void munlock_vma_pages_range(struct vm_area_struct *vma,
@@ -72,21 +72,7 @@ static inline void munlock_vma_pages_all(struct vm_area_struct *vma)
 {
         munlock_vma_pages_range(vma, vma->vm_start, vma->vm_end);
 }
-#endif
-
-/*
- * unevictable_migrate_page() called only from migrate_page_copy() to
- * migrate unevictable flag to new page.
- * Note that the old page has been isolated from the LRU lists at this
- * point so we don't need to worry about LRU statistics.
- */
-static inline void unevictable_migrate_page(struct page *new, struct page *old)
-{
-        if (TestClearPageUnevictable(old))
-                SetPageUnevictable(new);
-}
 
-#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT
 /*
  * Called only in fault path via page_evictable() for a new page
  * to determine if it's being mapped into a LOCKED vma.
@@ -107,9 +93,10 @@ static inline int is_mlocked_vma(struct vm_area_struct *vma, struct page *page)
 }
 
 /*
- * must be called with vma's mmap_sem held for read, and page locked.
+ * must be called with vma's mmap_sem held for read or write, and page locked.
  */
 extern void mlock_vma_page(struct page *page);
+extern void munlock_vma_page(struct page *page);
 
 /*
  * Clear the page's PageMlocked().  This can be useful in a situation where
@@ -144,7 +131,7 @@ static inline void mlock_migrate_page(struct page *newpage, struct page *page)
         }
 }
 
-#else /* CONFIG_HAVE_MLOCKED_PAGE_BIT */
+#else /* !CONFIG_MMU */
 static inline int is_mlocked_vma(struct vm_area_struct *v, struct page *p)
 {
         return 0;
@@ -153,7 +140,7 @@ static inline void clear_page_mlock(struct page *page) { }
 static inline void mlock_vma_page(struct page *page) { }
 static inline void mlock_migrate_page(struct page *new, struct page *old) { }
 
-#endif /* CONFIG_HAVE_MLOCKED_PAGE_BIT */
+#endif /* !CONFIG_MMU */
 
 /*
  * Return the mem_map entry representing the 'offset' subpage within
diff --git a/mm/ksm.c b/mm/ksm.c
index 5575f8628fef..56a0da1f9979 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -29,11 +29,13 @@
 #include <linux/wait.h>
 #include <linux/slab.h>
 #include <linux/rbtree.h>
+#include <linux/memory.h>
 #include <linux/mmu_notifier.h>
 #include <linux/swap.h>
 #include <linux/ksm.h>
 
 #include <asm/tlbflush.h>
+#include "internal.h"
 
 /*
  * A few notes about the KSM scanning process,
@@ -79,13 +81,13 @@
  * struct mm_slot - ksm information per mm that is being scanned
  * @link: link to the mm_slots hash list
  * @mm_list: link into the mm_slots list, rooted in ksm_mm_head
- * @rmap_list: head for this mm_slot's list of rmap_items
+ * @rmap_list: head for this mm_slot's singly-linked list of rmap_items
  * @mm: the mm that this information is valid for
  */
 struct mm_slot {
         struct hlist_node link;
         struct list_head mm_list;
-        struct list_head rmap_list;
+        struct rmap_item *rmap_list;
         struct mm_struct *mm;
 };
 
@@ -93,7 +95,7 @@ struct mm_slot {
  * struct ksm_scan - cursor for scanning
  * @mm_slot: the current mm_slot we are scanning
  * @address: the next address inside that to be scanned
- * @rmap_item: the current rmap that we are scanning inside the rmap_list
+ * @rmap_list: link to the next rmap to be scanned in the rmap_list
  * @seqnr: count of completed full scans (needed when removing unstable node)
  *
  * There is only the one ksm_scan instance of this cursor structure.
@@ -101,37 +103,51 @@ struct mm_slot {
 struct ksm_scan {
         struct mm_slot *mm_slot;
         unsigned long address;
-        struct rmap_item *rmap_item;
+        struct rmap_item **rmap_list;
         unsigned long seqnr;
 };
 
 /**
+ * struct stable_node - node of the stable rbtree
+ * @node: rb node of this ksm page in the stable tree
+ * @hlist: hlist head of rmap_items using this ksm page
+ * @kpfn: page frame number of this ksm page
+ */
+struct stable_node {
+        struct rb_node node;
+        struct hlist_head hlist;
+        unsigned long kpfn;
+};
+
+/**
  * struct rmap_item - reverse mapping item for virtual addresses
- * @link: link into mm_slot's rmap_list (rmap_list is per mm)
+ * @rmap_list: next rmap_item in mm_slot's singly-linked rmap_list
+ * @anon_vma: pointer to anon_vma for this mm,address, when in stable tree
  * @mm: the memory structure this rmap_item is pointing into
  * @address: the virtual address this rmap_item tracks (+ flags in low bits)
  * @oldchecksum: previous checksum of the page at that virtual address
- * @node: rb_node of this rmap_item in either unstable or stable tree
- * @next: next rmap_item hanging off the same node of the stable tree
- * @prev: previous rmap_item hanging off the same node of the stable tree
+ * @node: rb node of this rmap_item in the unstable tree
+ * @head: pointer to stable_node heading this list in the stable tree
+ * @hlist: link into hlist of rmap_items hanging off that stable_node
  */
 struct rmap_item {
-        struct list_head link;
+        struct rmap_item *rmap_list;
+        struct anon_vma *anon_vma;      /* when stable */
         struct mm_struct *mm;
         unsigned long address;          /* + low bits used for flags below */
+        unsigned int oldchecksum;       /* when unstable */
         union {
-                unsigned int oldchecksum;               /* when unstable */
-                struct rmap_item *next;                 /* when stable */
-        };
-        union {
-                struct rb_node node;                    /* when tree node */
-                struct rmap_item *prev;                 /* in stable list */
+                struct rb_node node;    /* when node of unstable tree */
+                struct {                /* when listed from stable tree */
+                        struct stable_node *head;
+                        struct hlist_node hlist;
+                };
         };
 };
 
 #define SEQNR_MASK      0x0ff   /* low bits of unstable tree seqnr */
-#define NODE_FLAG       0x100   /* is a node of unstable or stable tree */
-#define STABLE_FLAG     0x200   /* is a node or list item of stable tree */
+#define UNSTABLE_FLAG   0x100   /* is a node of the unstable tree */
+#define STABLE_FLAG     0x200   /* is listed from the stable tree */
 
 /* The stable and unstable tree heads */
 static struct rb_root root_stable_tree = RB_ROOT;
@@ -148,6 +164,7 @@ static struct ksm_scan ksm_scan = {
 };
 
 static struct kmem_cache *rmap_item_cache;
+static struct kmem_cache *stable_node_cache;
 static struct kmem_cache *mm_slot_cache;
 
 /* The number of nodes in the stable tree */
@@ -162,9 +179,6 @@ static unsigned long ksm_pages_unshared;
 /* The number of rmap_items in use: to calculate pages_volatile */
 static unsigned long ksm_rmap_items;
 
-/* Limit on the number of unswappable pages used */
-static unsigned long ksm_max_kernel_pages;
-
 /* Number of pages ksmd should scan in one batch */
 static unsigned int ksm_thread_pages_to_scan = 100;
 
@@ -190,13 +204,19 @@ static int __init ksm_slab_init(void)
         if (!rmap_item_cache)
                 goto out;
 
+        stable_node_cache = KSM_KMEM_CACHE(stable_node, 0);
+        if (!stable_node_cache)
+                goto out_free1;
+
         mm_slot_cache = KSM_KMEM_CACHE(mm_slot, 0);
         if (!mm_slot_cache)
-                goto out_free;
+                goto out_free2;
 
         return 0;
 
-out_free:
+out_free2:
+        kmem_cache_destroy(stable_node_cache);
+out_free1:
         kmem_cache_destroy(rmap_item_cache);
 out:
         return -ENOMEM;
@@ -205,6 +225,7 @@ out:
 static void __init ksm_slab_free(void)
 {
         kmem_cache_destroy(mm_slot_cache);
+        kmem_cache_destroy(stable_node_cache);
         kmem_cache_destroy(rmap_item_cache);
         mm_slot_cache = NULL;
 }
@@ -226,6 +247,16 @@ static inline void free_rmap_item(struct rmap_item *rmap_item)
         kmem_cache_free(rmap_item_cache, rmap_item);
 }
 
+static inline struct stable_node *alloc_stable_node(void)
+{
+        return kmem_cache_alloc(stable_node_cache, GFP_KERNEL);
+}
+
+static inline void free_stable_node(struct stable_node *stable_node)
+{
+        kmem_cache_free(stable_node_cache, stable_node);
+}
+
 static inline struct mm_slot *alloc_mm_slot(void)
 {
         if (!mm_slot_cache)     /* initialization failed */
@@ -275,7 +306,6 @@ static void insert_to_mm_slots_hash(struct mm_struct *mm,
         bucket = &mm_slots_hash[((unsigned long)mm / sizeof(struct mm_struct))
                                 % MM_SLOTS_HASH_HEADS];
         mm_slot->mm = mm;
-        INIT_LIST_HEAD(&mm_slot->rmap_list);
         hlist_add_head(&mm_slot->link, bucket);
 }
 
@@ -284,6 +314,25 @@ static inline int in_stable_tree(struct rmap_item *rmap_item)
         return rmap_item->address & STABLE_FLAG;
 }
 
+static void hold_anon_vma(struct rmap_item *rmap_item,
+                          struct anon_vma *anon_vma)
+{
+        rmap_item->anon_vma = anon_vma;
+        atomic_inc(&anon_vma->ksm_refcount);
+}
+
+static void drop_anon_vma(struct rmap_item *rmap_item)
+{
+        struct anon_vma *anon_vma = rmap_item->anon_vma;
+
+        if (atomic_dec_and_lock(&anon_vma->ksm_refcount, &anon_vma->lock)) {
+                int empty = list_empty(&anon_vma->head);
+                spin_unlock(&anon_vma->lock);
+                if (empty)
+                        anon_vma_free(anon_vma);
+        }
+}
+
 /*
  * ksmd, and unmerge_and_remove_all_rmap_items(), must not touch an mm's
  * page tables after it has passed through ksm_exit() - which, if necessary,
@@ -356,10 +405,18 @@ static int break_ksm(struct vm_area_struct *vma, unsigned long addr)
         return (ret & VM_FAULT_OOM) ? -ENOMEM : 0;
 }
 
-static void break_cow(struct mm_struct *mm, unsigned long addr)
+static void break_cow(struct rmap_item *rmap_item)
 {
+        struct mm_struct *mm = rmap_item->mm;
+        unsigned long addr = rmap_item->address;
         struct vm_area_struct *vma;
 
+        /*
+         * It is not an accident that whenever we want to break COW
+         * to undo, we also need to drop a reference to the anon_vma.
+         */
+        drop_anon_vma(rmap_item);
+
         down_read(&mm->mmap_sem);
         if (ksm_test_exit(mm))
                 goto out;
@@ -403,21 +460,77 @@ out:		page = NULL;
         return page;
 }
 
+static void remove_node_from_stable_tree(struct stable_node *stable_node)
+{
+        struct rmap_item *rmap_item;
+        struct hlist_node *hlist;
+
+        hlist_for_each_entry(rmap_item, hlist, &stable_node->hlist, hlist) {
+                if (rmap_item->hlist.next)
+                        ksm_pages_sharing--;
+                else
+                        ksm_pages_shared--;
+                drop_anon_vma(rmap_item);
+                rmap_item->address &= PAGE_MASK;
+                cond_resched();
+        }
+
+        rb_erase(&stable_node->node, &root_stable_tree);
+        free_stable_node(stable_node);
+}
+
 /*
- * get_ksm_page: checks if the page at the virtual address in rmap_item
- * is still PageKsm, in which case we can trust the content of the page,
- * and it returns the gotten page; but NULL if the page has been zapped.
+ * get_ksm_page: checks if the page indicated by the stable node
+ * is still its ksm page, despite having held no reference to it.
+ * In which case we can trust the content of the page, and it
+ * returns the gotten page; but if the page has now been zapped,
+ * remove the stale node from the stable tree and return NULL.
+ *
+ * You would expect the stable_node to hold a reference to the ksm page.
+ * But if it increments the page's count, swapping out has to wait for
+ * ksmd to come around again before it can free the page, which may take
+ * seconds or even minutes: much too unresponsive.  So instead we use a
+ * "keyhole reference": access to the ksm page from the stable node peeps
+ * out through its keyhole to see if that page still holds the right key,
+ * pointing back to this stable node.  This relies on freeing a PageAnon
+ * page to reset its page->mapping to NULL, and relies on no other use of
+ * a page to put something that might look like our key in page->mapping.
+ *
+ * include/linux/pagemap.h page_cache_get_speculative() is a good reference,
+ * but this is different - made simpler by ksm_thread_mutex being held, but
+ * interesting for assuming that no other use of the struct page could ever
+ * put our expected_mapping into page->mapping (or a field of the union which
+ * coincides with page->mapping).  The RCU calls are not for KSM at all, but
+ * to keep the page_count protocol described with page_cache_get_speculative.
+ *
+ * Note: it is possible that get_ksm_page() will return NULL one moment,
+ * then page the next, if the page is in between page_freeze_refs() and
+ * page_unfreeze_refs(): this shouldn't be a problem anywhere, the page
+ * is on its way to being freed; but it is an anomaly to bear in mind.
  */
-static struct page *get_ksm_page(struct rmap_item *rmap_item)
+static struct page *get_ksm_page(struct stable_node *stable_node)
 {
         struct page *page;
-
-        page = get_mergeable_page(rmap_item);
-        if (page && !PageKsm(page)) {
+        void *expected_mapping;
+
+        page = pfn_to_page(stable_node->kpfn);
+        expected_mapping = (void *)stable_node +
+                                (PAGE_MAPPING_ANON | PAGE_MAPPING_KSM);
+        rcu_read_lock();
+        if (page->mapping != expected_mapping)
+                goto stale;
+        if (!get_page_unless_zero(page))
+                goto stale;
+        if (page->mapping != expected_mapping) {
                 put_page(page);
-                page = NULL;
+                goto stale;
         }
+        rcu_read_unlock();
         return page;
+stale:
+        rcu_read_unlock();
+        remove_node_from_stable_tree(stable_node);
+        return NULL;
 }
 
 /*
@@ -426,35 +539,29 @@ static struct page *get_ksm_page(struct rmap_item *rmap_item)
  */
 static void remove_rmap_item_from_tree(struct rmap_item *rmap_item)
 {
-        if (in_stable_tree(rmap_item)) {
-                struct rmap_item *next_item = rmap_item->next;
-
-                if (rmap_item->address & NODE_FLAG) {
-                        if (next_item) {
-                                rb_replace_node(&rmap_item->node,
-                                                &next_item->node,
-                                                &root_stable_tree);
-                                next_item->address |= NODE_FLAG;
-                                ksm_pages_sharing--;
-                        } else {
-                                rb_erase(&rmap_item->node, &root_stable_tree);
-                                ksm_pages_shared--;
-                        }
-                } else {
-                        struct rmap_item *prev_item = rmap_item->prev;
+        if (rmap_item->address & STABLE_FLAG) {
+                struct stable_node *stable_node;
+                struct page *page;
 
-                        BUG_ON(prev_item->next != rmap_item);
-                        prev_item->next = next_item;
-                        if (next_item) {
-                                BUG_ON(next_item->prev != rmap_item);
-                                next_item->prev = rmap_item->prev;
-                        }
+                stable_node = rmap_item->head;
+                page = get_ksm_page(stable_node);
+                if (!page)
+                        goto out;
+
+                lock_page(page);
+                hlist_del(&rmap_item->hlist);
+                unlock_page(page);
+                put_page(page);
+
+                if (stable_node->hlist.first)
                         ksm_pages_sharing--;
-                }
+                else
+                        ksm_pages_shared--;
 
-                rmap_item->next = NULL;
+                drop_anon_vma(rmap_item);
+                rmap_item->address &= PAGE_MASK;
 
-        } else if (rmap_item->address & NODE_FLAG) {
+        } else if (rmap_item->address & UNSTABLE_FLAG) {
                 unsigned char age;
                 /*
                  * Usually ksmd can and must skip the rb_erase, because
@@ -467,24 +574,21 @@ static void remove_rmap_item_from_tree(struct rmap_item *rmap_item)
                 BUG_ON(age > 1);
                 if (!age)
                         rb_erase(&rmap_item->node, &root_unstable_tree);
+
                 ksm_pages_unshared--;
+                rmap_item->address &= PAGE_MASK;
         }
-
-        rmap_item->address &= PAGE_MASK;
-
+out:
         cond_resched();         /* we're called from many long loops */
 }
 
 static void remove_trailing_rmap_items(struct mm_slot *mm_slot,
-                                       struct list_head *cur)
+                                       struct rmap_item **rmap_list)
 {
-        struct rmap_item *rmap_item;
-
-        while (cur != &mm_slot->rmap_list) {
-                rmap_item = list_entry(cur, struct rmap_item, link);
-                cur = cur->next;
+        while (*rmap_list) {
+                struct rmap_item *rmap_item = *rmap_list;
+                *rmap_list = rmap_item->rmap_list;
                 remove_rmap_item_from_tree(rmap_item);
-                list_del(&rmap_item->link);
                 free_rmap_item(rmap_item);
         }
 }
@@ -550,7 +654,7 @@ static int unmerge_and_remove_all_rmap_items(void)
                                 goto error;
                 }
 
-                remove_trailing_rmap_items(mm_slot, mm_slot->rmap_list.next);
+                remove_trailing_rmap_items(mm_slot, &mm_slot->rmap_list);
 
                 spin_lock(&ksm_mmlist_lock);
                 ksm_scan.mm_slot = list_entry(mm_slot->mm_list.next,
@@ -646,7 +750,7 @@ static int write_protect_page(struct vm_area_struct *vma, struct page *page,
                  * Check that no O_DIRECT or similar I/O is in progress on the
                  * page
                  */
-                if ((page_mapcount(page) + 2 + swapped) != page_count(page)) {
+                if (page_mapcount(page) + 1 + swapped != page_count(page)) {
                         set_pte_at_notify(mm, addr, ptep, entry);
                         goto out_unlock;
                 }
@@ -664,15 +768,15 @@ out:
 
 /**
  * replace_page - replace page in vma by new ksm page
- * @vma:      vma that holds the pte pointing to oldpage
- * @oldpage:  the page we are replacing by newpage
- * @newpage:  the ksm page we replace oldpage by
+ * @vma:      vma that holds the pte pointing to page
+ * @page:     the page we are replacing by kpage
+ * @kpage:    the ksm page we replace page by
  * @orig_pte: the original value of the pte
  *
  * Returns 0 on success, -EFAULT on failure.
  */
-static int replace_page(struct vm_area_struct *vma, struct page *oldpage,
-                        struct page *newpage, pte_t orig_pte)
+static int replace_page(struct vm_area_struct *vma, struct page *page,
+                        struct page *kpage, pte_t orig_pte)
 {
         struct mm_struct *mm = vma->vm_mm;
         pgd_t *pgd;
@@ -681,12 +785,9 @@ static int replace_page(struct vm_area_struct *vma, struct page *oldpage,
         pte_t *ptep;
         spinlock_t *ptl;
         unsigned long addr;
-        pgprot_t prot;
         int err = -EFAULT;
 
-        prot = vm_get_page_prot(vma->vm_flags & ~VM_WRITE);
-
-        addr = page_address_in_vma(oldpage, vma);
+        addr = page_address_in_vma(page, vma);
         if (addr == -EFAULT)
                 goto out;
 
@@ -708,15 +809,15 @@ static int replace_page(struct vm_area_struct *vma, struct page *oldpage,
                 goto out;
         }
 
-        get_page(newpage);
-        page_add_ksm_rmap(newpage);
+        get_page(kpage);
+        page_add_anon_rmap(kpage, vma, addr);
 
         flush_cache_page(vma, addr, pte_pfn(*ptep));
         ptep_clear_flush(vma, addr, ptep);
-        set_pte_at_notify(mm, addr, ptep, mk_pte(newpage, prot));
+        set_pte_at_notify(mm, addr, ptep, mk_pte(kpage, vma->vm_page_prot));
 
-        page_remove_rmap(oldpage);
-        put_page(oldpage);
+        page_remove_rmap(page);
+        put_page(page);
 
         pte_unmap_unlock(ptep, ptl);
         err = 0;
@@ -726,32 +827,27 @@ out:
 
 /*
  * try_to_merge_one_page - take two pages and merge them into one
- * @vma: the vma that hold the pte pointing into oldpage
- * @oldpage: the page that we want to replace with newpage
- * @newpage: the page that we want to map instead of oldpage
- *
- * Note:
- * oldpage should be a PageAnon page, while newpage should be a PageKsm page,
- * or a newly allocated kernel page which page_add_ksm_rmap will make PageKsm.
+ * @vma: the vma that holds the pte pointing to page
+ * @page: the PageAnon page that we want to replace with kpage
+ * @kpage: the PageKsm page that we want to map instead of page,
+ *         or NULL the first time when we want to use page as kpage.
  *
  * This function returns 0 if the pages were merged, -EFAULT otherwise.
  */
 static int try_to_merge_one_page(struct vm_area_struct *vma,
-                                 struct page *oldpage,
-                                 struct page *newpage)
+                                 struct page *page, struct page *kpage)
 {
         pte_t orig_pte = __pte(0);
         int err = -EFAULT;
 
+        if (page == kpage)                      /* ksm page forked */
+                return 0;
+
         if (!(vma->vm_flags & VM_MERGEABLE))
                 goto out;
-
-        if (!PageAnon(oldpage))
+        if (!PageAnon(page))
                 goto out;
 
-        get_page(newpage);
-        get_page(oldpage);
-
         /*
          * We need the page lock to read a stable PageSwapCache in
          * write_protect_page().  We use trylock_page() instead of
@@ -759,26 +855,39 @@ static int try_to_merge_one_page(struct vm_area_struct *vma,
          * prefer to continue scanning and merging different pages,
          * then come back to this page when it is unlocked.
          */
-        if (!trylock_page(oldpage))
-                goto out_putpage;
+        if (!trylock_page(page))
+                goto out;
         /*
          * If this anonymous page is mapped only here, its pte may need
          * to be write-protected.  If it's mapped elsewhere, all of its
          * ptes are necessarily already write-protected.  But in either
          * case, we need to lock and check page_count is not raised.
          */
-        if (write_protect_page(vma, oldpage, &orig_pte)) {
-                unlock_page(oldpage);
-                goto out_putpage;
+        if (write_protect_page(vma, page, &orig_pte) == 0) {
+                if (!kpage) {
+                        /*
+                         * While we hold page lock, upgrade page from
+                         * PageAnon+anon_vma to PageKsm+NULL stable_node:
+                         * stable_tree_insert() will update stable_node.
+                         */
+                        set_page_stable_node(page, NULL);
+                        mark_page_accessed(page);
+                        err = 0;
+                } else if (pages_identical(page, kpage))
+                        err = replace_page(vma, page, kpage, orig_pte);
         }
-        unlock_page(oldpage);
 
-        if (pages_identical(oldpage, newpage))
-                err = replace_page(vma, oldpage, newpage, orig_pte);
+        if ((vma->vm_flags & VM_LOCKED) && kpage && !err) {
+                munlock_vma_page(page);
+                if (!PageMlocked(kpage)) {
+                        unlock_page(page);
+                        lock_page(kpage);
+                        mlock_vma_page(kpage);
+                        page = kpage;           /* for final unlock */
+                }
+        }
 
-out_putpage:
-        put_page(oldpage);
-        put_page(newpage);
+        unlock_page(page);
 out:
         return err;
 }
@@ -786,26 +895,31 @@ out:
 /*
  * try_to_merge_with_ksm_page - like try_to_merge_two_pages,
  * but no new kernel page is allocated: kpage must already be a ksm page.
+ *
+ * This function returns 0 if the pages were merged, -EFAULT otherwise.
  */
-static int try_to_merge_with_ksm_page(struct mm_struct *mm1,
-                                      unsigned long addr1,
-                                      struct page *page1,
-                                      struct page *kpage)
+static int try_to_merge_with_ksm_page(struct rmap_item *rmap_item,
+                                      struct page *page, struct page *kpage)
 {
+        struct mm_struct *mm = rmap_item->mm;
         struct vm_area_struct *vma;
         int err = -EFAULT;
 
-        down_read(&mm1->mmap_sem);
-        if (ksm_test_exit(mm1))
+        down_read(&mm->mmap_sem);
+        if (ksm_test_exit(mm))
+                goto out;
+        vma = find_vma(mm, rmap_item->address);
+        if (!vma || vma->vm_start > rmap_item->address)
                 goto out;
 
-        vma = find_vma(mm1, addr1);
-        if (!vma || vma->vm_start > addr1)
+        err = try_to_merge_one_page(vma, page, kpage);
+        if (err)
                 goto out;
 
-        err = try_to_merge_one_page(vma, page1, kpage);
+        /* Must get reference to anon_vma while still holding mmap_sem */
+        hold_anon_vma(rmap_item, vma->anon_vma);
 out:
-        up_read(&mm1->mmap_sem);
+        up_read(&mm->mmap_sem);
         return err;
 }
 
@@ -813,109 +927,73 @@ out:
  * try_to_merge_two_pages - take two identical pages and prepare them
  * to be merged into one page.
  *
- * This function returns 0 if we successfully mapped two identical pages
- * into one page, -EFAULT otherwise.
+ * This function returns the kpage if we successfully merged two identical
+ * pages into one ksm page, NULL otherwise.
  *
- * Note that this function allocates a new kernel page: if one of the pages
+ * Note that this function upgrades page to ksm page: if one of the pages
  * is already a ksm page, try_to_merge_with_ksm_page should be used.
  */
-static int try_to_merge_two_pages(struct mm_struct *mm1, unsigned long addr1,
-                                  struct page *page1, struct mm_struct *mm2,
-                                  unsigned long addr2, struct page *page2)
+static struct page *try_to_merge_two_pages(struct rmap_item *rmap_item,
+                                           struct page *page,
+                                           struct rmap_item *tree_rmap_item,
+                                           struct page *tree_page)
 {
-        struct vm_area_struct *vma;
-        struct page *kpage;
-        int err = -EFAULT;
-
-        /*
-         * The number of nodes in the stable tree
-         * is the number of kernel pages that we hold.
-         */
-        if (ksm_max_kernel_pages &&
-            ksm_max_kernel_pages <= ksm_pages_shared)
-                return err;
-
-        kpage = alloc_page(GFP_HIGHUSER);
-        if (!kpage)
-                return err;
-
-        down_read(&mm1->mmap_sem);
-        if (ksm_test_exit(mm1)) {
-                up_read(&mm1->mmap_sem);
-                goto out;
-        }
-        vma = find_vma(mm1, addr1);
-        if (!vma || vma->vm_start > addr1) {
-                up_read(&mm1->mmap_sem);
-                goto out;
-        }
-
-        copy_user_highpage(kpage, page1, addr1, vma);
-        err = try_to_merge_one_page(vma, page1, kpage);
-        up_read(&mm1->mmap_sem);
+        int err;
 
+        err = try_to_merge_with_ksm_page(rmap_item, page, NULL);
         if (!err) {
-                err = try_to_merge_with_ksm_page(mm2, addr2, page2, kpage);
+                err = try_to_merge_with_ksm_page(tree_rmap_item,
+                                                        tree_page, page);
                 /*
                  * If that fails, we have a ksm page with only one pte
                  * pointing to it: so break it.
                  */
                 if (err)
-                        break_cow(mm1, addr1);
+                        break_cow(rmap_item);
         }
-out:
-        put_page(kpage);
-        return err;
+        return err ? NULL : page;
 }
 
 /*
- * stable_tree_search - search page inside the stable tree
- * @page: the page that we are searching identical pages to.
- * @page2: pointer into identical page that we are holding inside the stable
- *         tree that we have found.
- * @rmap_item: the reverse mapping item
+ * stable_tree_search - search for page inside the stable tree
  *
  * This function checks if there is a page inside the stable tree
  * with identical content to the page that we are scanning right now.
  *
- * This function return rmap_item pointer to the identical item if found,
+ * This function returns the stable tree node of identical content if found,
  * NULL otherwise.
  */
-static struct rmap_item *stable_tree_search(struct page *page,
-                                            struct page **page2,
-                                            struct rmap_item *rmap_item)
+static struct page *stable_tree_search(struct page *page)
 {
         struct rb_node *node = root_stable_tree.rb_node;
+        struct stable_node *stable_node;
+
+        stable_node = page_stable_node(page);
+        if (stable_node) {                      /* ksm page forked */
+                get_page(page);
+                return page;
+        }
 
         while (node) {
-                struct rmap_item *tree_rmap_item, *next_rmap_item;
+                struct page *tree_page;
                 int ret;
 
-                tree_rmap_item = rb_entry(node, struct rmap_item, node);
-                while (tree_rmap_item) {
-                        BUG_ON(!in_stable_tree(tree_rmap_item));
-                        cond_resched();
-                        page2[0] = get_ksm_page(tree_rmap_item);
-                        if (page2[0])
-                                break;
-                        next_rmap_item = tree_rmap_item->next;
-                        remove_rmap_item_from_tree(tree_rmap_item);
-                        tree_rmap_item = next_rmap_item;
-                }
-                if (!tree_rmap_item)
+                cond_resched();
+                stable_node = rb_entry(node, struct stable_node, node);
+                tree_page = get_ksm_page(stable_node);
+                if (!tree_page)
                         return NULL;
 
-                ret = memcmp_pages(page, page2[0]);
+                ret = memcmp_pages(page, tree_page);
 
                 if (ret < 0) {
-                        put_page(page2[0]);
+                        put_page(tree_page);
                         node = node->rb_left;
                 } else if (ret > 0) {
-                        put_page(page2[0]);
+                        put_page(tree_page);
                         node = node->rb_right;
-                } else {
-                        return tree_rmap_item;
-                }
+                } else
+                        return tree_page;
         }
 
         return NULL;
@@ -925,38 +1003,26 @@ static struct rmap_item *stable_tree_search(struct page *page,
  * stable_tree_insert - insert rmap_item pointing to new ksm page
  * into the stable tree.
  *
- * @page: the page that we are searching identical page to inside the stable
- *        tree.
- * @rmap_item: pointer to the reverse mapping item.
- *
- * This function returns rmap_item if success, NULL otherwise.
+ * This function returns the stable tree node just allocated on success,
+ * NULL otherwise.
  */
-static struct rmap_item *stable_tree_insert(struct page *page,
-                                            struct rmap_item *rmap_item)
+static struct stable_node *stable_tree_insert(struct page *kpage)
 {
         struct rb_node **new = &root_stable_tree.rb_node;
         struct rb_node *parent = NULL;
+        struct stable_node *stable_node;
 
         while (*new) {
-                struct rmap_item *tree_rmap_item, *next_rmap_item;
                 struct page *tree_page;
                 int ret;
 
-                tree_rmap_item = rb_entry(*new, struct rmap_item, node);
-                while (tree_rmap_item) {
-                        BUG_ON(!in_stable_tree(tree_rmap_item));
-                        cond_resched();
-                        tree_page = get_ksm_page(tree_rmap_item);
-                        if (tree_page)
-                                break;
-                        next_rmap_item = tree_rmap_item->next;
-                        remove_rmap_item_from_tree(tree_rmap_item);
-                        tree_rmap_item = next_rmap_item;
-                }
-                if (!tree_rmap_item)
+                cond_resched();
+                stable_node = rb_entry(*new, struct stable_node, node);
+                tree_page = get_ksm_page(stable_node);
+                if (!tree_page)
                         return NULL;
 
-                ret = memcmp_pages(page, tree_page);
+                ret = memcmp_pages(kpage, tree_page);
                 put_page(tree_page);
 
                 parent = *new;
@@ -974,22 +1040,24 @@ static struct rmap_item *stable_tree_insert(struct page *page,
                 }
         }
 
-        rmap_item->address |= NODE_FLAG | STABLE_FLAG;
-        rmap_item->next = NULL;
-        rb_link_node(&rmap_item->node, parent, new);
-        rb_insert_color(&rmap_item->node, &root_stable_tree);
+        stable_node = alloc_stable_node();
+        if (!stable_node)
+                return NULL;
 
-        ksm_pages_shared++;
-        return rmap_item;
+        rb_link_node(&stable_node->node, parent, new);
+        rb_insert_color(&stable_node->node, &root_stable_tree);
+
+        INIT_HLIST_HEAD(&stable_node->hlist);
+
+        stable_node->kpfn = page_to_pfn(kpage);
+        set_page_stable_node(kpage, stable_node);
+
+        return stable_node;
 }
 
 /*
- * unstable_tree_search_insert - search and insert items into the unstable tree.
- *
- * @page: the page that we are going to search for identical page or to insert
- *        into the unstable tree
- * @page2: pointer into identical page that was found inside the unstable tree
- * @rmap_item: the reverse mapping item of page
+ * unstable_tree_search_insert - search for identical page,
+ * else insert rmap_item into the unstable tree.
  *
  * This function searches for a page in the unstable tree identical to the
  * page currently being scanned; and if no identical page is found in the
@@ -1001,47 +1069,50 @@ static struct rmap_item *stable_tree_insert(struct page *page,
  * This function does both searching and inserting, because they share
  * the same walking algorithm in an rbtree.
  */
-static struct rmap_item *unstable_tree_search_insert(struct page *page,
-                                                struct page **page2,
-                                                struct rmap_item *rmap_item)
+static
+struct rmap_item *unstable_tree_search_insert(struct rmap_item *rmap_item,
+                                              struct page *page,
+                                              struct page **tree_pagep)
+
 {
         struct rb_node **new = &root_unstable_tree.rb_node;
         struct rb_node *parent = NULL;
 
         while (*new) {
                 struct rmap_item *tree_rmap_item;
+                struct page *tree_page;
                 int ret;
 
                 cond_resched();
                 tree_rmap_item = rb_entry(*new, struct rmap_item, node);
-                page2[0] = get_mergeable_page(tree_rmap_item);
-                if (!page2[0])
+                tree_page = get_mergeable_page(tree_rmap_item);
+                if (!tree_page)
                         return NULL;
 
                 /*
-                 * Don't substitute an unswappable ksm page
-                 * just for one good swappable forked page.
+                 * Don't substitute a ksm page for a forked page.
                  */
-                if (page == page2[0]) {
-                        put_page(page2[0]);
+                if (page == tree_page) {
+                        put_page(tree_page);
                         return NULL;
                 }
 
-                ret = memcmp_pages(page, page2[0]);
+                ret = memcmp_pages(page, tree_page);
 
                 parent = *new;
                 if (ret < 0) {
-                        put_page(page2[0]);
+                        put_page(tree_page);
                         new = &parent->rb_left;
                 } else if (ret > 0) {
-                        put_page(page2[0]);
+                        put_page(tree_page);
                         new = &parent->rb_right;
                 } else {
+                        *tree_pagep = tree_page;
                         return tree_rmap_item;
                 }
         }
 
-        rmap_item->address |= NODE_FLAG;
+        rmap_item->address |= UNSTABLE_FLAG;
         rmap_item->address |= (ksm_scan.seqnr & SEQNR_MASK);
         rb_link_node(&rmap_item->node, parent, new);
         rb_insert_color(&rmap_item->node, &root_unstable_tree);
@@ -1056,18 +1127,16 @@ static struct rmap_item *unstable_tree_search_insert(struct page *page,
  * the same ksm page.
  */
 static void stable_tree_append(struct rmap_item *rmap_item,
-                               struct rmap_item *tree_rmap_item)
+                               struct stable_node *stable_node)
 {
-        rmap_item->next = tree_rmap_item->next;
-        rmap_item->prev = tree_rmap_item;
-
-        if (tree_rmap_item->next)
-                tree_rmap_item->next->prev = rmap_item;
-
-        tree_rmap_item->next = rmap_item;
+        rmap_item->head = stable_node;
         rmap_item->address |= STABLE_FLAG;
+        hlist_add_head(&rmap_item->hlist, &stable_node->hlist);
 
-        ksm_pages_sharing++;
+        if (rmap_item->hlist.next)
+                ksm_pages_sharing++;
+        else
+                ksm_pages_shared++;
 }
 
 /*
@@ -1081,49 +1150,37 @@ static void stable_tree_append(struct rmap_item *rmap_item,
  */
 static void cmp_and_merge_page(struct page *page, struct rmap_item *rmap_item)
 {
-        struct page *page2[1];
         struct rmap_item *tree_rmap_item;
+        struct page *tree_page = NULL;
+        struct stable_node *stable_node;
+        struct page *kpage;
         unsigned int checksum;
         int err;
 
-        if (in_stable_tree(rmap_item))
-                remove_rmap_item_from_tree(rmap_item);
+        remove_rmap_item_from_tree(rmap_item);
 
         /* We first start with searching the page inside the stable tree */
-        tree_rmap_item = stable_tree_search(page, page2, rmap_item);
-        if (tree_rmap_item) {
-                if (page == page2[0])                   /* forked */
-                        err = 0;
-                else
-                        err = try_to_merge_with_ksm_page(rmap_item->mm,
-                                                         rmap_item->address,
-                                                         page, page2[0]);
-                put_page(page2[0]);
-
+        kpage = stable_tree_search(page);
+        if (kpage) {
+                err = try_to_merge_with_ksm_page(rmap_item, page, kpage);
                 if (!err) {
                         /*
                          * The page was successfully merged:
                          * add its rmap_item to the stable tree.
                          */
-                        stable_tree_append(rmap_item, tree_rmap_item);
+                        lock_page(kpage);
+                        stable_tree_append(rmap_item, page_stable_node(kpage));
+                        unlock_page(kpage);
                 }
+                put_page(kpage);
                 return;
         }
 
         /*
-         * A ksm page might have got here by fork, but its other
-         * references have already been removed from the stable tree.
-         * Or it might be left over from a break_ksm which failed
-         * when the mem_cgroup had reached its limit: try again now.
-         */
-        if (PageKsm(page))
-                break_cow(rmap_item->mm, rmap_item->address);
-
-        /*
-         * In case the hash value of the page was changed from the last time we
-         * have calculated it, this page to be changed frequely, therefore we
-         * don't want to insert it to the unstable tree, and we don't want to
-         * waste our time to search if there is something identical to it there.
+         * If the hash value of the page has changed from the last time
+         * we calculated it, this page is changing frequently: therefore we
+         * don't want to insert it in the unstable tree, and we don't want
+         * to waste our time searching for something identical to it there.
          */
         checksum = calc_checksum(page);
         if (rmap_item->oldchecksum != checksum) {
@@ -1131,21 +1188,27 @@ static void cmp_and_merge_page(struct page *page, struct rmap_item *rmap_item)
                 return;
         }
 
-        tree_rmap_item = unstable_tree_search_insert(page, page2, rmap_item);
+        tree_rmap_item =
+                unstable_tree_search_insert(rmap_item, page, &tree_page);
         if (tree_rmap_item) {
-                err = try_to_merge_two_pages(rmap_item->mm,
-                                             rmap_item->address, page,
-                                             tree_rmap_item->mm,
-                                             tree_rmap_item->address, page2[0]);
+                kpage = try_to_merge_two_pages(rmap_item, page,
+                                                tree_rmap_item, tree_page);
+                put_page(tree_page);
                 /*
                  * As soon as we merge this page, we want to remove the
                  * rmap_item of the page we have merged with from the unstable
                  * tree, and insert it instead as new node in the stable tree.
                  */
-                if (!err) {
-                        rb_erase(&tree_rmap_item->node, &root_unstable_tree);
-                        tree_rmap_item->address &= ~NODE_FLAG;
-                        ksm_pages_unshared--;
+                if (kpage) {
+                        remove_rmap_item_from_tree(tree_rmap_item);
+
+                        lock_page(kpage);
+                        stable_node = stable_tree_insert(kpage);
+                        if (stable_node) {
+                                stable_tree_append(tree_rmap_item, stable_node);
+                                stable_tree_append(rmap_item, stable_node);
+                        }
+                        unlock_page(kpage);
 
                         /*
                          * If we fail to insert the page into the stable tree,
@@ -1153,37 +1216,28 @@ static void cmp_and_merge_page(struct page *page, struct rmap_item *rmap_item)
                          * to a ksm page left outside the stable tree,
                          * in which case we need to break_cow on both.
                          */
-                        if (stable_tree_insert(page2[0], tree_rmap_item))
-                                stable_tree_append(rmap_item, tree_rmap_item);
-                        else {
-                                break_cow(tree_rmap_item->mm,
-                                                tree_rmap_item->address);
-                                break_cow(rmap_item->mm, rmap_item->address);
+                        if (!stable_node) {
+                                break_cow(tree_rmap_item);
+                                break_cow(rmap_item);
                         }
                 }
-
-                put_page(page2[0]);
         }
 }
 
 static struct rmap_item *get_next_rmap_item(struct mm_slot *mm_slot,
-                                            struct list_head *cur,
+                                            struct rmap_item **rmap_list,
                                             unsigned long addr)
 {
         struct rmap_item *rmap_item;
 
-        while (cur != &mm_slot->rmap_list) {
-                rmap_item = list_entry(cur, struct rmap_item, link);
-                if ((rmap_item->address & PAGE_MASK) == addr) {
-                        if (!in_stable_tree(rmap_item))
-                                remove_rmap_item_from_tree(rmap_item);
+        while (*rmap_list) {
+                rmap_item = *rmap_list;
+                if ((rmap_item->address & PAGE_MASK) == addr)
                         return rmap_item;
-                }
                 if (rmap_item->address > addr)
                         break;
-                cur = cur->next;
+                *rmap_list = rmap_item->rmap_list;
                 remove_rmap_item_from_tree(rmap_item);
-                list_del(&rmap_item->link);
                 free_rmap_item(rmap_item);
         }
 
@@ -1192,7 +1246,8 @@ static struct rmap_item *get_next_rmap_item(struct mm_slot *mm_slot,
                 /* It has already been zeroed */
                 rmap_item->mm = mm_slot->mm;
                 rmap_item->address = addr;
-                list_add_tail(&rmap_item->link, cur);
+                rmap_item->rmap_list = *rmap_list;
+                *rmap_list = rmap_item;
         }
         return rmap_item;
 }
@@ -1217,8 +1272,7 @@ static struct rmap_item *scan_get_next_rmap_item(struct page **page)
                 spin_unlock(&ksm_mmlist_lock);
 next_mm:
                 ksm_scan.address = 0;
-                ksm_scan.rmap_item = list_entry(&slot->rmap_list,
-                                                struct rmap_item, link);
+                ksm_scan.rmap_list = &slot->rmap_list;
         }
 
         mm = slot->mm;
@@ -1244,10 +1298,10 @@ next_mm:
                                 flush_anon_page(vma, *page, ksm_scan.address);
                                 flush_dcache_page(*page);
                                 rmap_item = get_next_rmap_item(slot,
-                                        ksm_scan.rmap_item->link.next,
-                                        ksm_scan.address);
+                                        ksm_scan.rmap_list, ksm_scan.address);
                                 if (rmap_item) {
-                                        ksm_scan.rmap_item = rmap_item;
+                                        ksm_scan.rmap_list =
+                                                        &rmap_item->rmap_list;
                                         ksm_scan.address += PAGE_SIZE;
                                 } else
                                         put_page(*page);
@@ -1263,14 +1317,13 @@ next_mm:
 
         if (ksm_test_exit(mm)) {
                 ksm_scan.address = 0;
-                ksm_scan.rmap_item = list_entry(&slot->rmap_list,
-                                                struct rmap_item, link);
+                ksm_scan.rmap_list = &slot->rmap_list;
         }
         /*
          * Nuke all the rmap_items that are above this current rmap:
          * because there were no VM_MERGEABLE vmas with such addresses.
          */
-        remove_trailing_rmap_items(slot, ksm_scan.rmap_item->link.next);
+        remove_trailing_rmap_items(slot, ksm_scan.rmap_list);
 
         spin_lock(&ksm_mmlist_lock);
         ksm_scan.mm_slot = list_entry(slot->mm_list.next,
@@ -1323,14 +1376,6 @@ static void ksm_do_scan(unsigned int scan_npages)
                         return;
                 if (!PageKsm(page) || !in_stable_tree(rmap_item))
                         cmp_and_merge_page(page, rmap_item);
-                else if (page_mapcount(page) == 1) {
-                        /*
-                         * Replace now-unshared ksm page by ordinary page.
-                         */
-                        break_cow(rmap_item->mm, rmap_item->address);
-                        remove_rmap_item_from_tree(rmap_item);
-                        rmap_item->oldchecksum = calc_checksum(page);
-                }
                 put_page(page);
         }
 }
@@ -1375,7 +1420,7 @@ int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
                 if (*vm_flags & (VM_MERGEABLE | VM_SHARED  | VM_MAYSHARE   |
                                  VM_PFNMAP    | VM_IO      | VM_DONTEXPAND |
                                  VM_RESERVED  | VM_HUGETLB | VM_INSERTPAGE |
-                                 VM_MIXEDMAP  | VM_SAO))
+                                 VM_NONLINEAR | VM_MIXEDMAP | VM_SAO))
                         return 0;               /* just ignore the advice */
 
                 if (!test_bit(MMF_VM_MERGEABLE, &mm->flags)) {
@@ -1452,7 +1497,7 @@ void __ksm_exit(struct mm_struct *mm)
         spin_lock(&ksm_mmlist_lock);
         mm_slot = get_mm_slot(mm);
         if (mm_slot && ksm_scan.mm_slot != mm_slot) {
-                if (list_empty(&mm_slot->rmap_list)) {
+                if (!mm_slot->rmap_list) {
                         hlist_del(&mm_slot->link);
                         list_del(&mm_slot->mm_list);
                         easy_to_free = 1;
@@ -1473,6 +1518,249 @@ void __ksm_exit(struct mm_struct *mm)
         }
 }
 
+struct page *ksm_does_need_to_copy(struct page *page,
+                        struct vm_area_struct *vma, unsigned long address)
+{
+        struct page *new_page;
+
+        unlock_page(page);      /* any racers will COW it, not modify it */
+
+        new_page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, address);
+        if (new_page) {
+                copy_user_highpage(new_page, page, address, vma);
+
+                SetPageDirty(new_page);
+                __SetPageUptodate(new_page);
+                SetPageSwapBacked(new_page);
+                __set_page_locked(new_page);
+
+                if (page_evictable(new_page, vma))
+                        lru_cache_add_lru(new_page, LRU_ACTIVE_ANON);
+                else
+                        add_page_to_unevictable_list(new_page);
+        }
+
+        page_cache_release(page);
+        return new_page;
+}
+
+int page_referenced_ksm(struct page *page, struct mem_cgroup *memcg,
+                        unsigned long *vm_flags)
+{
+        struct stable_node *stable_node;
+        struct rmap_item *rmap_item;
+        struct hlist_node *hlist;
+        unsigned int mapcount = page_mapcount(page);
+        int referenced = 0;
+        int search_new_forks = 0;
+
+        VM_BUG_ON(!PageKsm(page));
+        VM_BUG_ON(!PageLocked(page));
+
+        stable_node = page_stable_node(page);
+        if (!stable_node)
+                return 0;
+again:
+        hlist_for_each_entry(rmap_item, hlist, &stable_node->hlist, hlist) {
+                struct anon_vma *anon_vma = rmap_item->anon_vma;
+                struct vm_area_struct *vma;
+
+                spin_lock(&anon_vma->lock);
+                list_for_each_entry(vma, &anon_vma->head, anon_vma_node) {
+                        if (rmap_item->address < vma->vm_start ||
+                            rmap_item->address >= vma->vm_end)
+                                continue;
+                        /*
+                         * Initially we examine only the vma which covers this
+                         * rmap_item; but later, if there is still work to do,
+                         * we examine covering vmas in other mms: in case they
+                         * were forked from the original since ksmd passed.
+                         */
+                        if ((rmap_item->mm == vma->vm_mm) == search_new_forks)
+                                continue;
+
+                        if (memcg && !mm_match_cgroup(vma->vm_mm, memcg))
+                                continue;
+
+                        referenced += page_referenced_one(page, vma,
+                                rmap_item->address, &mapcount, vm_flags);
+                        if (!search_new_forks || !mapcount)
+                                break;
+                }
+                spin_unlock(&anon_vma->lock);
+                if (!mapcount)
+                        goto out;
+        }
+        if (!search_new_forks++)
+                goto again;
+out:
+        return referenced;
+}
+
+int try_to_unmap_ksm(struct page *page, enum ttu_flags flags)
+{
+        struct stable_node *stable_node;
+        struct hlist_node *hlist;
+        struct rmap_item *rmap_item;
+        int ret = SWAP_AGAIN;
+        int search_new_forks = 0;
+
+        VM_BUG_ON(!PageKsm(page));
+        VM_BUG_ON(!PageLocked(page));
+
+        stable_node = page_stable_node(page);
+        if (!stable_node)
+                return SWAP_FAIL;
+again:
+        hlist_for_each_entry(rmap_item, hlist, &stable_node->hlist, hlist) {
+                struct anon_vma *anon_vma = rmap_item->anon_vma;
+                struct vm_area_struct *vma;
+
+                spin_lock(&anon_vma->lock);
+                list_for_each_entry(vma, &anon_vma->head, anon_vma_node) {
+                        if (rmap_item->address < vma->vm_start ||
+                            rmap_item->address >= vma->vm_end)
+                                continue;
+                        /*
+                         * Initially we examine only the vma which covers this
+                         * rmap_item; but later, if there is still work to do,
+                         * we examine covering vmas in other mms: in case they
+                         * were forked from the original since ksmd passed.
+                         */
+                        if ((rmap_item->mm == vma->vm_mm) == search_new_forks)
+                                continue;
+
+                        ret = try_to_unmap_one(page, vma,
+                                        rmap_item->address, flags);
+                        if (ret != SWAP_AGAIN || !page_mapped(page)) {
+                                spin_unlock(&anon_vma->lock);
+                                goto out;
+                        }
+                }
+                spin_unlock(&anon_vma->lock);
+        }
+        if (!search_new_forks++)
+                goto again;
+out:
+        return ret;
+}
+
+#ifdef CONFIG_MIGRATION
+int rmap_walk_ksm(struct page *page, int (*rmap_one)(struct page *,
+                  struct vm_area_struct *, unsigned long, void *), void *arg)
+{
+        struct stable_node *stable_node;
+        struct hlist_node *hlist;
+        struct rmap_item *rmap_item;
+        int ret = SWAP_AGAIN;
+        int search_new_forks = 0;
+
+        VM_BUG_ON(!PageKsm(page));
+        VM_BUG_ON(!PageLocked(page));
+
+        stable_node = page_stable_node(page);
+        if (!stable_node)
+                return ret;
+again:
+        hlist_for_each_entry(rmap_item, hlist, &stable_node->hlist, hlist) {
+                struct anon_vma *anon_vma = rmap_item->anon_vma;
+                struct vm_area_struct *vma;
+
+                spin_lock(&anon_vma->lock);
+                list_for_each_entry(vma, &anon_vma->head, anon_vma_node) {
+                        if (rmap_item->address < vma->vm_start ||
+                            rmap_item->address >= vma->vm_end)
+                                continue;
+                        /*
+                         * Initially we examine only the vma which covers this
+                         * rmap_item; but later, if there is still work to do,
+                         * we examine covering vmas in other mms: in case they
+                         * were forked from the original since ksmd passed.
+                         */
+                        if ((rmap_item->mm == vma->vm_mm) == search_new_forks)
+                                continue;
+
+                        ret = rmap_one(page, vma, rmap_item->address, arg);
+                        if (ret != SWAP_AGAIN) {
+                                spin_unlock(&anon_vma->lock);
+                                goto out;
+                        }
+                }
+                spin_unlock(&anon_vma->lock);
+        }
+        if (!search_new_forks++)
+                goto again;
+out:
+        return ret;
+}
+
+void ksm_migrate_page(struct page *newpage, struct page *oldpage)
+{
+        struct stable_node *stable_node;
+
+        VM_BUG_ON(!PageLocked(oldpage));
+        VM_BUG_ON(!PageLocked(newpage));
+        VM_BUG_ON(newpage->mapping != oldpage->mapping);
+
+        stable_node = page_stable_node(newpage);
+        if (stable_node) {
+                VM_BUG_ON(stable_node->kpfn != page_to_pfn(oldpage));
+                stable_node->kpfn = page_to_pfn(newpage);
+        }
+}
+#endif /* CONFIG_MIGRATION */
+
+#ifdef CONFIG_MEMORY_HOTREMOVE
+static struct stable_node *ksm_check_stable_tree(unsigned long start_pfn,
+                                                 unsigned long end_pfn)
+{
+        struct rb_node *node;
+
+        for (node = rb_first(&root_stable_tree); node; node = rb_next(node)) {
+                struct stable_node *stable_node;
+
+                stable_node = rb_entry(node, struct stable_node, node);
+                if (stable_node->kpfn >= start_pfn &&
+                    stable_node->kpfn < end_pfn)
+                        return stable_node;
+        }
+        return NULL;
+}
+
+static int ksm_memory_callback(struct notifier_block *self,
+                               unsigned long action, void *arg)
+{
+        struct memory_notify *mn = arg;
+        struct stable_node *stable_node;
+
+        switch (action) {
+        case MEM_GOING_OFFLINE:
+                /*
+                 * Keep it very simple for now: just lock out ksmd and
+                 * MADV_UNMERGEABLE while any memory is going offline.
+                 */
+                mutex_lock(&ksm_thread_mutex);
+                break;
+
+        case MEM_OFFLINE:
+                /*
+                 * Most of the work is done by page migration; but there might
+                 * be a few stable_nodes left over, still pointing to struct
+                 * pages which have been offlined: prune those from the tree.
+                 */
+                while ((stable_node = ksm_check_stable_tree(mn->start_pfn,
+                                        mn->start_pfn + mn->nr_pages)) != NULL)
+                        remove_node_from_stable_tree(stable_node);
+                /* fallthrough */
+
+        case MEM_CANCEL_OFFLINE:
+                mutex_unlock(&ksm_thread_mutex);
+                break;
+        }
+        return NOTIFY_OK;
+}
+#endif /* CONFIG_MEMORY_HOTREMOVE */
+
 #ifdef CONFIG_SYSFS
 /*
  * This all compiles without CONFIG_SYSFS, but is a waste of space.
@@ -1551,8 +1839,8 @@ static ssize_t run_store(struct kobject *kobj, struct kobj_attribute *attr,
         /*
          * KSM_RUN_MERGE sets ksmd running, and 0 stops it running.
          * KSM_RUN_UNMERGE stops it running and unmerges all rmap_items,
-         * breaking COW to free the unswappable pages_shared (but leaves
-         * mm_slots on the list for when ksmd may be set running again).
+         * breaking COW to free the pages_shared (but leaves mm_slots
+         * on the list for when ksmd may be set running again).
          */
 
         mutex_lock(&ksm_thread_mutex);
@@ -1577,29 +1865,6 @@ static ssize_t run_store(struct kobject *kobj, struct kobj_attribute *attr,
 }
 KSM_ATTR(run);
 
-static ssize_t max_kernel_pages_store(struct kobject *kobj,
-                                      struct kobj_attribute *attr,
-                                      const char *buf, size_t count)
-{
-        int err;
-        unsigned long nr_pages;
-
-        err = strict_strtoul(buf, 10, &nr_pages);
-        if (err)
-                return -EINVAL;
-
-        ksm_max_kernel_pages = nr_pages;
-
-        return count;
-}
-
-static ssize_t max_kernel_pages_show(struct kobject *kobj,
-                                     struct kobj_attribute *attr, char *buf)
-{
-        return sprintf(buf, "%lu\n", ksm_max_kernel_pages);
-}
-KSM_ATTR(max_kernel_pages);
-
 static ssize_t pages_shared_show(struct kobject *kobj,
                                  struct kobj_attribute *attr, char *buf)
 {
@@ -1649,7 +1914,6 @@ static struct attribute *ksm_attrs[] = {
         &sleep_millisecs_attr.attr,
         &pages_to_scan_attr.attr,
         &run_attr.attr,
-        &max_kernel_pages_attr.attr,
         &pages_shared_attr.attr,
         &pages_sharing_attr.attr,
         &pages_unshared_attr.attr,
@@ -1669,8 +1933,6 @@ static int __init ksm_init(void)
         struct task_struct *ksm_thread;
         int err;
 
-        ksm_max_kernel_pages = totalram_pages / 4;
-
         err = ksm_slab_init();
         if (err)
                 goto out;
@@ -1698,6 +1960,13 @@ static int __init ksm_init(void)
 
 #endif /* CONFIG_SYSFS */
 
+#ifdef CONFIG_MEMORY_HOTREMOVE
+        /*
+         * Choose a high priority since the callback takes ksm_thread_mutex:
+         * later callbacks could only be taking locks which nest within that.
+         */
+        hotplug_memory_notifier(ksm_memory_callback, 100);
+#endif
         return 0;
 
 out_free2:
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index c31a310aa146..878808c4fcbe 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -38,6 +38,7 @@
 #include <linux/vmalloc.h>
 #include <linux/mm_inline.h>
 #include <linux/page_cgroup.h>
+#include <linux/cpu.h>
 #include "internal.h"
 
 #include <asm/uaccess.h>
@@ -54,7 +55,6 @@ static int really_do_swap_account __initdata = 1; /* for remember boot option*/
 #define do_swap_account         (0)
 #endif
 
-static DEFINE_MUTEX(memcg_tasklist);    /* can be hold under cgroup_mutex */
 #define SOFTLIMIT_EVENTS_THRESH (1000)
 
 /*
@@ -66,7 +66,7 @@ enum mem_cgroup_stat_index {
          */
         MEM_CGROUP_STAT_CACHE,     /* # of pages charged as cache */
         MEM_CGROUP_STAT_RSS,       /* # of pages charged as anon rss */
-        MEM_CGROUP_STAT_MAPPED_FILE,  /* # of pages charged as file rss */
+        MEM_CGROUP_STAT_FILE_MAPPED,  /* # of pages charged as file rss */
         MEM_CGROUP_STAT_PGPGIN_COUNT,   /* # of pages paged in */
         MEM_CGROUP_STAT_PGPGOUT_COUNT,  /* # of pages paged out */
         MEM_CGROUP_STAT_EVENTS, /* sum of pagein + pageout for internal use */
@@ -275,6 +275,7 @@ enum charge_type {
 static void mem_cgroup_get(struct mem_cgroup *mem);
 static void mem_cgroup_put(struct mem_cgroup *mem);
 static struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *mem);
+static void drain_all_stock_async(void);
 
 static struct mem_cgroup_per_zone *
 mem_cgroup_zoneinfo(struct mem_cgroup *mem, int nid, int zid)
@@ -758,7 +759,13 @@ int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *mem)
         task_unlock(task);
         if (!curr)
                 return 0;
-        if (curr->use_hierarchy)
+        /*
+         * We should check use_hierarchy of "mem" not "curr". Because checking
+         * use_hierarchy of "curr" here make this function true if hierarchy is
+         * enabled in "curr" and "curr" is a child of "mem" in *cgroup*
+         * hierarchy(even if use_hierarchy is disabled in "mem").
+         */
+        if (mem->use_hierarchy)
                 ret = css_is_ancestor(&curr->css, &mem->css);
         else
                 ret = (curr == mem);
@@ -1007,7 +1014,7 @@ void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
         static char memcg_name[PATH_MAX];
         int ret;
 
-        if (!memcg)
+        if (!memcg || !p)
                 return;
 
 
@@ -1137,6 +1144,8 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem,
                 victim = mem_cgroup_select_victim(root_mem);
                 if (victim == root_mem) {
                         loop++;
+                        if (loop >= 1)
+                                drain_all_stock_async();
                         if (loop >= 2) {
                                 /*
                                  * If we have not been able to reclaim
@@ -1223,7 +1232,7 @@ static void record_last_oom(struct mem_cgroup *mem)
  * Currently used to update mapped file statistics, but the routine can be
  * generalized to update other statistics as well.
  */
-void mem_cgroup_update_mapped_file_stat(struct page *page, int val)
+void mem_cgroup_update_file_mapped(struct page *page, int val)
 {
         struct mem_cgroup *mem;
         struct mem_cgroup_stat *stat;
@@ -1231,9 +1240,6 @@ void mem_cgroup_update_mapped_file_stat(struct page *page, int val)
         int cpu;
         struct page_cgroup *pc;
 
-        if (!page_is_file_cache(page))
-                return;
-
         pc = lookup_page_cgroup(page);
         if (unlikely(!pc))
                 return;
@@ -1253,12 +1259,139 @@ void mem_cgroup_update_mapped_file_stat(struct page *page, int val)
         stat = &mem->stat;
         cpustat = &stat->cpustat[cpu];
 
-        __mem_cgroup_stat_add_safe(cpustat, MEM_CGROUP_STAT_MAPPED_FILE, val);
+        __mem_cgroup_stat_add_safe(cpustat, MEM_CGROUP_STAT_FILE_MAPPED, val);
 done:
         unlock_page_cgroup(pc);
 }
 
 /*
+ * size of first charge trial. "32" comes from vmscan.c's magic value.
+ * TODO: maybe necessary to use big numbers in big irons.
+ */
+#define CHARGE_SIZE     (32 * PAGE_SIZE)
+struct memcg_stock_pcp {
+        struct mem_cgroup *cached; /* this never be root cgroup */
+        int charge;
+        struct work_struct work;
+};
+static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock);
+static atomic_t memcg_drain_count;
+
+/*
+ * Try to consume stocked charge on this cpu. If success, PAGE_SIZE is consumed
+ * from local stock and true is returned. If the stock is 0 or charges from a
+ * cgroup which is not current target, returns false. This stock will be
+ * refilled.
+ */
+static bool consume_stock(struct mem_cgroup *mem)
+{
+        struct memcg_stock_pcp *stock;
+        bool ret = true;
+
+        stock = &get_cpu_var(memcg_stock);
+        if (mem == stock->cached && stock->charge)
+                stock->charge -= PAGE_SIZE;
+        else /* need to call res_counter_charge */
+                ret = false;
+        put_cpu_var(memcg_stock);
+        return ret;
+}
+
+/*
+ * Returns stocks cached in percpu to res_counter and reset cached information.
+ */
+static void drain_stock(struct memcg_stock_pcp *stock)
+{
+        struct mem_cgroup *old = stock->cached;
+
+        if (stock->charge) {
+                res_counter_uncharge(&old->res, stock->charge);
+                if (do_swap_account)
+                        res_counter_uncharge(&old->memsw, stock->charge);
+        }
+        stock->cached = NULL;
+        stock->charge = 0;
+}
+
+/*
+ * This must be called under preempt disabled or must be called by
+ * a thread which is pinned to local cpu.
+ */
+static void drain_local_stock(struct work_struct *dummy)
+{
+        struct memcg_stock_pcp *stock = &__get_cpu_var(memcg_stock);
+        drain_stock(stock);
+}
+
+/*
+ * Cache charges(val) which is from res_counter, to local per_cpu area.
+ * This will be consumed by consumt_stock() function, later.
+ */
+static void refill_stock(struct mem_cgroup *mem, int val)
+{
+        struct memcg_stock_pcp *stock = &get_cpu_var(memcg_stock);
+
+        if (stock->cached != mem) { /* reset if necessary */
+                drain_stock(stock);
+                stock->cached = mem;
+        }
+        stock->charge += val;
+        put_cpu_var(memcg_stock);
+}
+
+/*
+ * Tries to drain stocked charges in other cpus. This function is asynchronous
+ * and just put a work per cpu for draining localy on each cpu. Caller can
+ * expects some charges will be back to res_counter later but cannot wait for
+ * it.
+ */
+static void drain_all_stock_async(void)
+{
+        int cpu;
+        /* This function is for scheduling "drain" in asynchronous way.
+         * The result of "drain" is not directly handled by callers. Then,
+         * if someone is calling drain, we don't have to call drain more.
+         * Anyway, WORK_STRUCT_PENDING check in queue_work_on() will catch if
+         * there is a race. We just do loose check here.
+         */
+        if (atomic_read(&memcg_drain_count))
+                return;
+        /* Notify other cpus that system-wide "drain" is running */
+        atomic_inc(&memcg_drain_count);
+        get_online_cpus();
+        for_each_online_cpu(cpu) {
+                struct memcg_stock_pcp *stock = &per_cpu(memcg_stock, cpu);
+                schedule_work_on(cpu, &stock->work);
+        }
+        put_online_cpus();
+        atomic_dec(&memcg_drain_count);
+        /* We don't wait for flush_work */
+}
+
+/* This is a synchronous drain interface. */
+static void drain_all_stock_sync(void)
+{
+        /* called when force_empty is called */
+        atomic_inc(&memcg_drain_count);
+        schedule_on_each_cpu(drain_local_stock);
+        atomic_dec(&memcg_drain_count);
+}
+
+static int __cpuinit memcg_stock_cpu_callback(struct notifier_block *nb,
+                                        unsigned long action,
+                                        void *hcpu)
+{
+        int cpu = (unsigned long)hcpu;
+        struct memcg_stock_pcp *stock;
+
+        if (action != CPU_DEAD)
+                return NOTIFY_OK;
+        stock = &per_cpu(memcg_stock, cpu);
+        drain_stock(stock);
+        return NOTIFY_OK;
+}
+
+/*
  * Unlike exported interface, "oom" parameter is added. if oom==true,
  * oom-killer can be invoked.
  */
@@ -1269,6 +1402,7 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
         struct mem_cgroup *mem, *mem_over_limit;
         int nr_retries = MEM_CGROUP_RECLAIM_RETRIES;
         struct res_counter *fail_res;
+        int csize = CHARGE_SIZE;
 
         if (unlikely(test_thread_flag(TIF_MEMDIE))) {
                 /* Don't account this! */
@@ -1293,23 +1427,25 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
                 return 0;
 
         VM_BUG_ON(css_is_removed(&mem->css));
+        if (mem_cgroup_is_root(mem))
+                goto done;
 
         while (1) {
                 int ret = 0;
                 unsigned long flags = 0;
 
-                if (mem_cgroup_is_root(mem))
-                        goto done;
-                ret = res_counter_charge(&mem->res, PAGE_SIZE, &fail_res);
+                if (consume_stock(mem))
+                        goto charged;
+
+                ret = res_counter_charge(&mem->res, csize, &fail_res);
                 if (likely(!ret)) {
                         if (!do_swap_account)
                                 break;
-                        ret = res_counter_charge(&mem->memsw, PAGE_SIZE,
-                                                        &fail_res);
+                        ret = res_counter_charge(&mem->memsw, csize, &fail_res);
                         if (likely(!ret))
                                 break;
                         /* mem+swap counter fails */
-                        res_counter_uncharge(&mem->res, PAGE_SIZE);
+                        res_counter_uncharge(&mem->res, csize);
                         flags |= MEM_CGROUP_RECLAIM_NOSWAP;
                         mem_over_limit = mem_cgroup_from_res_counter(fail_res,
                                                                         memsw);
@@ -1318,6 +1454,11 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
                         mem_over_limit = mem_cgroup_from_res_counter(fail_res,
                                                                         res);
 
+                /* reduce request size and retry */
+                if (csize > PAGE_SIZE) {
+                        csize = PAGE_SIZE;
+                        continue;
+                }
                 if (!(gfp_mask & __GFP_WAIT))
                         goto nomem;
 
@@ -1339,14 +1480,15 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
 
                 if (!nr_retries--) {
                         if (oom) {
-                                mutex_lock(&memcg_tasklist);
                                 mem_cgroup_out_of_memory(mem_over_limit, gfp_mask);
-                                mutex_unlock(&memcg_tasklist);
                                 record_last_oom(mem_over_limit);
                         }
                         goto nomem;
                 }
         }
+        if (csize > PAGE_SIZE)
+                refill_stock(mem, csize - PAGE_SIZE);
+charged:
         /*
          * Insert ancestor (and ancestor's ancestors), to softlimit RB-tree.
          * if they exceeds softlimit.
@@ -1361,6 +1503,21 @@ nomem:
 }
 
 /*
+ * Somemtimes we have to undo a charge we got by try_charge().
+ * This function is for that and do uncharge, put css's refcnt.
+ * gotten by try_charge().
+ */
+static void mem_cgroup_cancel_charge(struct mem_cgroup *mem)
+{
+        if (!mem_cgroup_is_root(mem)) {
+                res_counter_uncharge(&mem->res, PAGE_SIZE);
+                if (do_swap_account)
+                        res_counter_uncharge(&mem->memsw, PAGE_SIZE);
+        }
+        css_put(&mem->css);
+}
+
+/*
  * A helper function to get mem_cgroup from ID. must be called under
  * rcu_read_lock(). The caller must check css_is_removed() or some if
  * it's concern. (dropping refcnt from swap can be called against removed
@@ -1426,12 +1583,7 @@ static void __mem_cgroup_commit_charge(struct mem_cgroup *mem,
         lock_page_cgroup(pc);
         if (unlikely(PageCgroupUsed(pc))) {
                 unlock_page_cgroup(pc);
-                if (!mem_cgroup_is_root(mem)) {
-                        res_counter_uncharge(&mem->res, PAGE_SIZE);
-                        if (do_swap_account)
-                                res_counter_uncharge(&mem->memsw, PAGE_SIZE);
-                }
-                css_put(&mem->css);
+                mem_cgroup_cancel_charge(mem);
                 return;
         }
 
@@ -1464,27 +1616,22 @@ static void __mem_cgroup_commit_charge(struct mem_cgroup *mem,
 }
 
 /**
- * mem_cgroup_move_account - move account of the page
+ * __mem_cgroup_move_account - move account of the page
  * @pc: page_cgroup of the page.
  * @from: mem_cgroup which the page is moved from.
  * @to: mem_cgroup which the page is moved to. @from != @to.
  *
  * The caller must confirm following.
  * - page is not on LRU (isolate_page() is useful.)
- *
- * returns 0 at success,
- * returns -EBUSY when lock is busy or "pc" is unstable.
+ * - the pc is locked, used, and ->mem_cgroup points to @from.
  *
  * This function does "uncharge" from old cgroup but doesn't do "charge" to
  * new cgroup. It should be done by a caller.
  */
 
-static int mem_cgroup_move_account(struct page_cgroup *pc,
+static void __mem_cgroup_move_account(struct page_cgroup *pc,
         struct mem_cgroup *from, struct mem_cgroup *to)
 {
-        struct mem_cgroup_per_zone *from_mz, *to_mz;
-        int nid, zid;
-        int ret = -EBUSY;
         struct page *page;
         int cpu;
         struct mem_cgroup_stat *stat;
@@ -1492,38 +1639,27 @@ static int mem_cgroup_move_account(struct page_cgroup *pc,
 
         VM_BUG_ON(from == to);
         VM_BUG_ON(PageLRU(pc->page));
-
-        nid = page_cgroup_nid(pc);
-        zid = page_cgroup_zid(pc);
-        from_mz =  mem_cgroup_zoneinfo(from, nid, zid);
-        to_mz =  mem_cgroup_zoneinfo(to, nid, zid);
-
-        if (!trylock_page_cgroup(pc))
-                return ret;
-
-        if (!PageCgroupUsed(pc))
-                goto out;
-
-        if (pc->mem_cgroup != from)
-                goto out;
+        VM_BUG_ON(!PageCgroupLocked(pc));
+        VM_BUG_ON(!PageCgroupUsed(pc));
+        VM_BUG_ON(pc->mem_cgroup != from);
 
         if (!mem_cgroup_is_root(from))
                 res_counter_uncharge(&from->res, PAGE_SIZE);
         mem_cgroup_charge_statistics(from, pc, false);
 
         page = pc->page;
-        if (page_is_file_cache(page) && page_mapped(page)) {
+        if (page_mapped(page) && !PageAnon(page)) {
                 cpu = smp_processor_id();
                 /* Update mapped_file data for mem_cgroup "from" */
                 stat = &from->stat;
                 cpustat = &stat->cpustat[cpu];
-                __mem_cgroup_stat_add_safe(cpustat, MEM_CGROUP_STAT_MAPPED_FILE,
+                __mem_cgroup_stat_add_safe(cpustat, MEM_CGROUP_STAT_FILE_MAPPED,
                                                 -1);
 
                 /* Update mapped_file data for mem_cgroup "to" */
                 stat = &to->stat;
                 cpustat = &stat->cpustat[cpu];
-                __mem_cgroup_stat_add_safe(cpustat, MEM_CGROUP_STAT_MAPPED_FILE,
+                __mem_cgroup_stat_add_safe(cpustat, MEM_CGROUP_STAT_FILE_MAPPED,
                                                 1);
         }
 
@@ -1534,15 +1670,28 @@ static int mem_cgroup_move_account(struct page_cgroup *pc,
         css_get(&to->css);
         pc->mem_cgroup = to;
         mem_cgroup_charge_statistics(to, pc, true);
-        ret = 0;
-out:
-        unlock_page_cgroup(pc);
         /*
          * We charges against "to" which may not have any tasks. Then, "to"
          * can be under rmdir(). But in current implementation, caller of
          * this function is just force_empty() and it's garanteed that
          * "to" is never removed. So, we don't check rmdir status here.
          */
+}
+
+/*
+ * check whether the @pc is valid for moving account and call
+ * __mem_cgroup_move_account()
+ */
+static int mem_cgroup_move_account(struct page_cgroup *pc,
+                                struct mem_cgroup *from, struct mem_cgroup *to)
+{
+        int ret = -EINVAL;
+        lock_page_cgroup(pc);
+        if (PageCgroupUsed(pc) && pc->mem_cgroup == from) {
+                __mem_cgroup_move_account(pc, from, to);
+                ret = 0;
+        }
+        unlock_page_cgroup(pc);
         return ret;
 }
 
@@ -1564,45 +1713,27 @@ static int mem_cgroup_move_parent(struct page_cgroup *pc,
         if (!pcg)
                 return -EINVAL;
 
+        ret = -EBUSY;
+        if (!get_page_unless_zero(page))
+                goto out;
+        if (isolate_lru_page(page))
+                goto put;
 
         parent = mem_cgroup_from_cont(pcg);
-
-
         ret = __mem_cgroup_try_charge(NULL, gfp_mask, &parent, false, page);
         if (ret || !parent)
-                return ret;
-
-        if (!get_page_unless_zero(page)) {
-                ret = -EBUSY;
-                goto uncharge;
-        }
-
-        ret = isolate_lru_page(page);
-
-        if (ret)
-                goto cancel;
+                goto put_back;
 
         ret = mem_cgroup_move_account(pc, child, parent);
-
+        if (!ret)
+                css_put(&parent->css);  /* drop extra refcnt by try_charge() */
+        else
+                mem_cgroup_cancel_charge(parent);       /* does css_put */
+put_back:
         putback_lru_page(page);
-        if (!ret) {
-                put_page(page);
-                /* drop extra refcnt by try_charge() */
-                css_put(&parent->css);
-                return 0;
-        }
-
-cancel:
+put:
         put_page(page);
-uncharge:
-        /* drop extra refcnt by try_charge() */
-        css_put(&parent->css);
-        /* uncharge if move fails */
-        if (!mem_cgroup_is_root(parent)) {
-                res_counter_uncharge(&parent->res, PAGE_SIZE);
-                if (do_swap_account)
-                        res_counter_uncharge(&parent->memsw, PAGE_SIZE);
-        }
+out:
         return ret;
 }
 
@@ -1737,11 +1868,12 @@ int mem_cgroup_try_charge_swapin(struct mm_struct *mm,
                 goto charge_cur_mm;
         /*
          * A racing thread's fault, or swapoff, may have already updated
-         * the pte, and even removed page from swap cache: return success
-         * to go on to do_swap_page()'s pte_same() test, which should fail.
+         * the pte, and even removed page from swap cache: in those cases
+         * do_swap_page()'s pte_same() test will fail; but there's also a
+         * KSM case which does need to charge the page.
          */
         if (!PageSwapCache(page))
-                return 0;
+                goto charge_cur_mm;
         mem = try_get_mem_cgroup_from_swapcache(page);
         if (!mem)
                 goto charge_cur_mm;
@@ -1818,14 +1950,53 @@ void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *mem)
                 return;
         if (!mem)
                 return;
-        if (!mem_cgroup_is_root(mem)) {
-                res_counter_uncharge(&mem->res, PAGE_SIZE);
-                if (do_swap_account)
-                        res_counter_uncharge(&mem->memsw, PAGE_SIZE);
-        }
-        css_put(&mem->css);
+        mem_cgroup_cancel_charge(mem);
 }
 
+static void
+__do_uncharge(struct mem_cgroup *mem, const enum charge_type ctype)
+{
+        struct memcg_batch_info *batch = NULL;
+        bool uncharge_memsw = true;
+        /* If swapout, usage of swap doesn't decrease */
+        if (!do_swap_account || ctype == MEM_CGROUP_CHARGE_TYPE_SWAPOUT)
+                uncharge_memsw = false;
+        /*
+         * do_batch > 0 when unmapping pages or inode invalidate/truncate.
+         * In those cases, all pages freed continously can be expected to be in
+         * the same cgroup and we have chance to coalesce uncharges.
+         * But we do uncharge one by one if this is killed by OOM(TIF_MEMDIE)
+         * because we want to do uncharge as soon as possible.
+         */
+        if (!current->memcg_batch.do_batch || test_thread_flag(TIF_MEMDIE))
+                goto direct_uncharge;
+
+        batch = &current->memcg_batch;
+        /*
+         * In usual, we do css_get() when we remember memcg pointer.
+         * But in this case, we keep res->usage until end of a series of
+         * uncharges. Then, it's ok to ignore memcg's refcnt.
+         */
+        if (!batch->memcg)
+                batch->memcg = mem;
+        /*
+         * In typical case, batch->memcg == mem. This means we can
+         * merge a series of uncharges to an uncharge of res_counter.
+         * If not, we uncharge res_counter ony by one.
+         */
+        if (batch->memcg != mem)
+                goto direct_uncharge;
+        /* remember freed charge and uncharge it later */
+        batch->bytes += PAGE_SIZE;
+        if (uncharge_memsw)
+                batch->memsw_bytes += PAGE_SIZE;
+        return;
+direct_uncharge:
+        res_counter_uncharge(&mem->res, PAGE_SIZE);
+        if (uncharge_memsw)
+                res_counter_uncharge(&mem->memsw, PAGE_SIZE);
+        return;
+}
 
 /*
  * uncharge if !page_mapped(page)
@@ -1874,12 +2045,8 @@ __mem_cgroup_uncharge_common(struct page *page, enum charge_type ctype)
                 break;
         }
 
-        if (!mem_cgroup_is_root(mem)) {
-                res_counter_uncharge(&mem->res, PAGE_SIZE);
-                if (do_swap_account &&
-                                (ctype != MEM_CGROUP_CHARGE_TYPE_SWAPOUT))
-                        res_counter_uncharge(&mem->memsw, PAGE_SIZE);
-        }
+        if (!mem_cgroup_is_root(mem))
+                __do_uncharge(mem, ctype);
         if (ctype == MEM_CGROUP_CHARGE_TYPE_SWAPOUT)
                 mem_cgroup_swap_statistics(mem, true);
         mem_cgroup_charge_statistics(mem, pc, false);
@@ -1925,6 +2092,50 @@ void mem_cgroup_uncharge_cache_page(struct page *page)
         __mem_cgroup_uncharge_common(page, MEM_CGROUP_CHARGE_TYPE_CACHE);
 }
 
+/*
+ * Batch_start/batch_end is called in unmap_page_range/invlidate/trucate.
+ * In that cases, pages are freed continuously and we can expect pages
+ * are in the same memcg. All these calls itself limits the number of
+ * pages freed at once, then uncharge_start/end() is called properly.
+ * This may be called prural(2) times in a context,
+ */
+
+void mem_cgroup_uncharge_start(void)
+{
+        current->memcg_batch.do_batch++;
+        /* We can do nest. */
+        if (current->memcg_batch.do_batch == 1) {
+                current->memcg_batch.memcg = NULL;
+                current->memcg_batch.bytes = 0;
+                current->memcg_batch.memsw_bytes = 0;
+        }
+}
+
+void mem_cgroup_uncharge_end(void)
+{
+        struct memcg_batch_info *batch = &current->memcg_batch;
+
+        if (!batch->do_batch)
+                return;
+
+        batch->do_batch--;
+        if (batch->do_batch) /* If stacked, do nothing. */
+                return;
+
+        if (!batch->memcg)
+                return;
+        /*
+         * This "batch->memcg" is valid without any css_get/put etc...
+         * bacause we hide charges behind us.
+         */
+        if (batch->bytes)
+                res_counter_uncharge(&batch->memcg->res, batch->bytes);
+        if (batch->memsw_bytes)
+                res_counter_uncharge(&batch->memcg->memsw, batch->memsw_bytes);
+        /* forget this pointer (for sanity check) */
+        batch->memcg = NULL;
+}
+
 #ifdef CONFIG_SWAP
 /*
  * called after __delete_from_swap_cache() and drop "page" account.
@@ -2100,7 +2311,6 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
                                 unsigned long long val)
 {
         int retry_count;
-        int progress;
         u64 memswlimit;
         int ret = 0;
         int children = mem_cgroup_count_children(memcg);
@@ -2144,8 +2354,7 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
                 if (!ret)
                         break;
 
-                progress = mem_cgroup_hierarchical_reclaim(memcg, NULL,
-                                                GFP_KERNEL,
+                mem_cgroup_hierarchical_reclaim(memcg, NULL, GFP_KERNEL,
                                                 MEM_CGROUP_RECLAIM_SHRINK);
                 curusage = res_counter_read_u64(&memcg->res, RES_USAGE);
                 /* Usage is reduced ? */
@@ -2384,6 +2593,7 @@ move_account:
                         goto out;
                 /* This is for making all *used* pages to be on LRU. */
                 lru_add_drain_all();
+                drain_all_stock_sync();
                 ret = 0;
                 for_each_node_state(node, N_HIGH_MEMORY) {
                         for (zid = 0; !ret && zid < MAX_NR_ZONES; zid++) {
@@ -2541,6 +2751,7 @@ static u64 mem_cgroup_read(struct cgroup *cont, struct cftype *cft)
                         val += idx_val;
                         mem_cgroup_get_recursive_idx_stat(mem,
                                 MEM_CGROUP_STAT_SWAPOUT, &idx_val);
+                        val += idx_val;
                         val <<= PAGE_SHIFT;
                 } else
                         val = res_counter_read_u64(&mem->memsw, name);
@@ -2660,7 +2871,7 @@ static int mem_cgroup_reset(struct cgroup *cont, unsigned int event)
 enum {
         MCS_CACHE,
         MCS_RSS,
-        MCS_MAPPED_FILE,
+        MCS_FILE_MAPPED,
         MCS_PGPGIN,
         MCS_PGPGOUT,
         MCS_SWAP,
@@ -2704,8 +2915,8 @@ static int mem_cgroup_get_local_stat(struct mem_cgroup *mem, void *data)
         s->stat[MCS_CACHE] += val * PAGE_SIZE;
         val = mem_cgroup_read_stat(&mem->stat, MEM_CGROUP_STAT_RSS);
         s->stat[MCS_RSS] += val * PAGE_SIZE;
-        val = mem_cgroup_read_stat(&mem->stat, MEM_CGROUP_STAT_MAPPED_FILE);
-        s->stat[MCS_MAPPED_FILE] += val * PAGE_SIZE;
+        val = mem_cgroup_read_stat(&mem->stat, MEM_CGROUP_STAT_FILE_MAPPED);
+        s->stat[MCS_FILE_MAPPED] += val * PAGE_SIZE;
         val = mem_cgroup_read_stat(&mem->stat, MEM_CGROUP_STAT_PGPGIN_COUNT);
         s->stat[MCS_PGPGIN] += val;
         val = mem_cgroup_read_stat(&mem->stat, MEM_CGROUP_STAT_PGPGOUT_COUNT);
@@ -3097,11 +3308,18 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
 
         /* root ? */
         if (cont->parent == NULL) {
+                int cpu;
                 enable_swap_cgroup();
                 parent = NULL;
                 root_mem_cgroup = mem;
                 if (mem_cgroup_soft_limit_tree_init())
                         goto free_out;
+                for_each_possible_cpu(cpu) {
+                        struct memcg_stock_pcp *stock =
+                                                &per_cpu(memcg_stock, cpu);
+                        INIT_WORK(&stock->work, drain_local_stock);
+                }
+                hotcpu_notifier(memcg_stock_cpu_callback, 0);
 
         } else {
                 parent = mem_cgroup_from_cont(cont->parent);
@@ -3170,12 +3388,10 @@ static void mem_cgroup_move_task(struct cgroup_subsys *ss,
                                 struct task_struct *p,
                                 bool threadgroup)
 {
-        mutex_lock(&memcg_tasklist);
         /*
          * FIXME: It's better to move charges of this process from old
          * memcg to new memcg. But it's just on TODO-List now.
          */
-        mutex_unlock(&memcg_tasklist);
 }
 
 struct cgroup_subsys mem_cgroup_subsys = {
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 1ac49fef95ab..50d4f8d7024a 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -582,10 +582,8 @@ static struct page_state {
         { unevict|dirty, unevict|dirty, "unevictable LRU", me_pagecache_dirty},
         { unevict,      unevict,        "unevictable LRU", me_pagecache_clean},
 
-#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT
         { mlock|dirty,  mlock|dirty,    "mlocked LRU",  me_pagecache_dirty },
         { mlock,        mlock,          "mlocked LRU",  me_pagecache_clean },
-#endif
 
         { lru|dirty,    lru|dirty,      "LRU",          me_pagecache_dirty },
         { lru|dirty,    lru,            "clean LRU",    me_pagecache_clean },
diff --git a/mm/memory.c b/mm/memory.c
index 6ab19dd4a199..aed45eaf8ac9 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -572,7 +572,7 @@ out:
  * covered by this vma.
  */
 
-static inline void
+static inline unsigned long
 copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,
                 pte_t *dst_pte, pte_t *src_pte, struct vm_area_struct *vma,
                 unsigned long addr, int *rss)
@@ -586,7 +586,9 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,
                 if (!pte_file(pte)) {
                         swp_entry_t entry = pte_to_swp_entry(pte);
 
-                        swap_duplicate(entry);
+                        if (swap_duplicate(entry) < 0)
+                                return entry.val;
+
                         /* make sure dst_mm is on swapoff's mmlist. */
                         if (unlikely(list_empty(&dst_mm->mmlist))) {
                                 spin_lock(&mmlist_lock);
@@ -635,6 +637,7 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,
 
 out_set_pte:
         set_pte_at(dst_mm, addr, dst_pte, pte);
+        return 0;
 }
 
 static int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
@@ -646,6 +649,7 @@ static int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
         spinlock_t *src_ptl, *dst_ptl;
         int progress = 0;
         int rss[2];
+        swp_entry_t entry = (swp_entry_t){0};
 
 again:
         rss[1] = rss[0] = 0;
@@ -674,7 +678,10 @@ again:
                         progress++;
                         continue;
                 }
-                copy_one_pte(dst_mm, src_mm, dst_pte, src_pte, vma, addr, rss);
+                entry.val = copy_one_pte(dst_mm, src_mm, dst_pte, src_pte,
+                                                        vma, addr, rss);
+                if (entry.val)
+                        break;
                 progress += 8;
         } while (dst_pte++, src_pte++, addr += PAGE_SIZE, addr != end);
 
@@ -684,6 +691,12 @@ again:
         add_mm_rss(dst_mm, rss[0], rss[1]);
         pte_unmap_unlock(orig_dst_pte, dst_ptl);
         cond_resched();
+
+        if (entry.val) {
+                if (add_swap_count_continuation(entry, GFP_KERNEL) < 0)
+                        return -ENOMEM;
+                progress = 0;
+        }
         if (addr != end)
                 goto again;
         return 0;
@@ -943,6 +956,7 @@ static unsigned long unmap_page_range(struct mmu_gather *tlb,
                 details = NULL;
 
         BUG_ON(addr >= end);
+        mem_cgroup_uncharge_start();
         tlb_start_vma(tlb, vma);
         pgd = pgd_offset(vma->vm_mm, addr);
         do {
@@ -955,6 +969,7 @@ static unsigned long unmap_page_range(struct mmu_gather *tlb,
                                                 zap_work, details);
         } while (pgd++, addr = next, (addr != end && *zap_work > 0));
         tlb_end_vma(tlb, vma);
+        mem_cgroup_uncharge_end();
 
         return addr;
 }
@@ -2514,7 +2529,7 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
                         ret = VM_FAULT_HWPOISON;
                 } else {
                         print_bad_pte(vma, address, orig_pte, NULL);
-                        ret = VM_FAULT_OOM;
+                        ret = VM_FAULT_SIGBUS;
                 }
                 goto out;
         }
@@ -2548,6 +2563,12 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
         lock_page(page);
         delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
 
+        page = ksm_might_need_to_copy(page, vma, address);
+        if (!page) {
+                ret = VM_FAULT_OOM;
+                goto out;
+        }
+
         if (mem_cgroup_try_charge_swapin(mm, page, GFP_KERNEL, &ptr)) {
                 ret = VM_FAULT_OOM;
                 goto out_page;
@@ -2910,7 +2931,7 @@ static int do_nonlinear_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                  * Page table corrupted: show pte and kill process.
                  */
                 print_bad_pte(vma, address, orig_pte, NULL);
-                return VM_FAULT_OOM;
+                return VM_FAULT_SIGBUS;
         }
 
         pgoff = pte_to_pgoff(orig_pte);
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 2047465cd27c..030ce8a5bb0e 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -27,6 +27,7 @@
 #include <linux/page-isolation.h>
 #include <linux/pfn.h>
 #include <linux/suspend.h>
+#include <linux/mm_inline.h>
 
 #include <asm/tlbflush.h>
 
@@ -71,7 +72,9 @@ static void get_page_bootmem(unsigned long info,  struct page *page, int type)
         atomic_inc(&page->_count);
 }
 
-void put_page_bootmem(struct page *page)
+/* reference to __meminit __free_pages_bootmem is valid
+ * so use __ref to tell modpost not to generate a warning */
+void __ref put_page_bootmem(struct page *page)
 {
         int type;
 
@@ -672,6 +675,9 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
                 if (!ret) { /* Success */
                         list_add_tail(&page->lru, &source);
                         move_pages--;
+                        inc_zone_page_state(page, NR_ISOLATED_ANON +
+                                            page_is_file_cache(page));
+
                 } else {
                         /* Becasue we don't have big zone->lock. we should
                            check this again here. */
@@ -694,7 +700,7 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
         if (list_empty(&source))
                 goto out;
         /* this function returns # of failed pages */
-        ret = migrate_pages(&source, hotremove_migrate_alloc, 0);
+        ret = migrate_pages(&source, hotremove_migrate_alloc, 0, 1);
 
 out:
         return ret;
@@ -747,7 +753,7 @@ check_pages_isolated(unsigned long start_pfn, unsigned long end_pfn)
         return offlined;
 }
 
-int offline_pages(unsigned long start_pfn,
+static int offline_pages(unsigned long start_pfn,
                   unsigned long end_pfn, unsigned long timeout)
 {
         unsigned long pfn, nr_pages, expire;
@@ -849,6 +855,10 @@ repeat:
 
         setup_per_zone_wmarks();
         calculate_zone_inactive_ratio(zone);
+        if (!node_present_pages(node)) {
+                node_clear_state(node, N_HIGH_MEMORY);
+                kswapd_stop(node);
+        }
 
         vm_total_pages = nr_free_pagecache_pages();
         writeback_set_ratelimit();
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 4545d5944243..290fb5bf0440 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -85,10 +85,12 @@
 #include <linux/seq_file.h>
 #include <linux/proc_fs.h>
 #include <linux/migrate.h>
+#include <linux/ksm.h>
 #include <linux/rmap.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/ctype.h>
+#include <linux/mm_inline.h>
 
 #include <asm/tlbflush.h>
 #include <asm/uaccess.h>
@@ -412,17 +414,11 @@ static int check_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
                 if (!page)
                         continue;
                 /*
-                 * The check for PageReserved here is important to avoid
-                 * handling zero pages and other pages that may have been
-                 * marked special by the system.
-                 *
-                 * If the PageReserved would not be checked here then f.e.
-                 * the location of the zero page could have an influence
-                 * on MPOL_MF_STRICT, zero pages would be counted for
-                 * the per node stats, and there would be useless attempts
-                 * to put zero pages on the migration list.
+                 * vm_normal_page() filters out zero pages, but there might
+                 * still be PageReserved pages to skip, perhaps in a VDSO.
+                 * And we cannot move PageKsm pages sensibly or safely yet.
                  */
-                if (PageReserved(page))
+                if (PageReserved(page) || PageKsm(page))
                         continue;
                 nid = page_to_nid(page);
                 if (node_isset(nid, *nodes) == !!(flags & MPOL_MF_INVERT))
@@ -809,6 +805,8 @@ static void migrate_page_add(struct page *page, struct list_head *pagelist,
         if ((flags & MPOL_MF_MOVE_ALL) || page_mapcount(page) == 1) {
                 if (!isolate_lru_page(page)) {
                         list_add_tail(&page->lru, pagelist);
+                        inc_zone_page_state(page, NR_ISOLATED_ANON +
+                                            page_is_file_cache(page));
                 }
         }
 }
@@ -836,7 +834,7 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest,
                         flags | MPOL_MF_DISCONTIG_OK, &pagelist);
 
         if (!list_empty(&pagelist))
-                err = migrate_pages(&pagelist, new_node_page, dest);
+                err = migrate_pages(&pagelist, new_node_page, dest, 0);
 
         return err;
 }
@@ -1053,7 +1051,7 @@ static long do_mbind(unsigned long start, unsigned long len,
 
                 if (!list_empty(&pagelist))
                         nr_failed = migrate_pages(&pagelist, new_vma_page,
-                                                (unsigned long)vma);
+                                                (unsigned long)vma, 0);
 
                 if (!err && nr_failed && (flags & MPOL_MF_STRICT))
                         err = -EIO;
@@ -1565,6 +1563,53 @@ struct zonelist *huge_zonelist(struct vm_area_struct *vma, unsigned long addr,
         }
         return zl;
 }
+
+/*
+ * init_nodemask_of_mempolicy
+ *
+ * If the current task's mempolicy is "default" [NULL], return 'false'
+ * to indicate default policy.  Otherwise, extract the policy nodemask
+ * for 'bind' or 'interleave' policy into the argument nodemask, or
+ * initialize the argument nodemask to contain the single node for
+ * 'preferred' or 'local' policy and return 'true' to indicate presence
+ * of non-default mempolicy.
+ *
+ * We don't bother with reference counting the mempolicy [mpol_get/put]
+ * because the current task is examining it's own mempolicy and a task's
+ * mempolicy is only ever changed by the task itself.
+ *
+ * N.B., it is the caller's responsibility to free a returned nodemask.
+ */
+bool init_nodemask_of_mempolicy(nodemask_t *mask)
+{
+        struct mempolicy *mempolicy;
+        int nid;
+
+        if (!(mask && current->mempolicy))
+                return false;
+
+        mempolicy = current->mempolicy;
+        switch (mempolicy->mode) {
+        case MPOL_PREFERRED:
+                if (mempolicy->flags & MPOL_F_LOCAL)
+                        nid = numa_node_id();
+                else
+                        nid = mempolicy->v.preferred_node;
+                init_nodemask_of_node(mask, nid);
+                break;
+
+        case MPOL_BIND:
+                /* Fall through */
+        case MPOL_INTERLEAVE:
+                *mask =  mempolicy->v.nodes;
+                break;
+
+        default:
+                BUG();
+        }
+
+        return true;
+}
 #endif
 
 /* Allocate a page in interleaved policy.
diff --git a/mm/migrate.c b/mm/migrate.c
index 0bc640fd68fa..efddbf0926b2 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -21,6 +21,7 @@
 #include <linux/mm_inline.h>
 #include <linux/nsproxy.h>
 #include <linux/pagevec.h>
+#include <linux/ksm.h>
 #include <linux/rmap.h>
 #include <linux/topology.h>
 #include <linux/cpu.h>
@@ -78,8 +79,8 @@ int putback_lru_pages(struct list_head *l)
 /*
  * Restore a potential migration pte to a working pte entry
  */
-static void remove_migration_pte(struct vm_area_struct *vma,
-                struct page *old, struct page *new)
+static int remove_migration_pte(struct page *new, struct vm_area_struct *vma,
+                                 unsigned long addr, void *old)
 {
         struct mm_struct *mm = vma->vm_mm;
         swp_entry_t entry;
@@ -88,40 +89,37 @@ static void remove_migration_pte(struct vm_area_struct *vma,
         pmd_t *pmd;
         pte_t *ptep, pte;
         spinlock_t *ptl;
-        unsigned long addr = page_address_in_vma(new, vma);
-
-        if (addr == -EFAULT)
-                return;
 
         pgd = pgd_offset(mm, addr);
         if (!pgd_present(*pgd))
-                return;
+                goto out;
 
         pud = pud_offset(pgd, addr);
         if (!pud_present(*pud))
-                return;
+                goto out;
 
         pmd = pmd_offset(pud, addr);
         if (!pmd_present(*pmd))
-                return;
+                goto out;
 
         ptep = pte_offset_map(pmd, addr);
 
         if (!is_swap_pte(*ptep)) {
                 pte_unmap(ptep);
-                return;
+                goto out;
         }
 
         ptl = pte_lockptr(mm, pmd);
         spin_lock(ptl);
         pte = *ptep;
         if (!is_swap_pte(pte))
-                goto out;
+                goto unlock;
 
         entry = pte_to_swp_entry(pte);
 
-        if (!is_migration_entry(entry) || migration_entry_to_page(entry) != old)
-                goto out;
+        if (!is_migration_entry(entry) ||
+            migration_entry_to_page(entry) != old)
+                goto unlock;
 
         get_page(new);
         pte = pte_mkold(mk_pte(new, vma->vm_page_prot));
@@ -137,58 +135,10 @@ static void remove_migration_pte(struct vm_area_struct *vma,
 
         /* No need to invalidate - it was non-present before */
         update_mmu_cache(vma, addr, pte);
-
-out:
+unlock:
         pte_unmap_unlock(ptep, ptl);
-}
-
-/*
- * Note that remove_file_migration_ptes will only work on regular mappings,
- * Nonlinear mappings do not use migration entries.
- */
-static void remove_file_migration_ptes(struct page *old, struct page *new)
-{
-        struct vm_area_struct *vma;
-        struct address_space *mapping = new->mapping;
-        struct prio_tree_iter iter;
-        pgoff_t pgoff = new->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
-
-        if (!mapping)
-                return;
-
-        spin_lock(&mapping->i_mmap_lock);
-
-        vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff)
-                remove_migration_pte(vma, old, new);
-
-        spin_unlock(&mapping->i_mmap_lock);
-}
-
-/*
- * Must hold mmap_sem lock on at least one of the vmas containing
- * the page so that the anon_vma cannot vanish.
- */
-static void remove_anon_migration_ptes(struct page *old, struct page *new)
-{
-        struct anon_vma *anon_vma;
-        struct vm_area_struct *vma;
-        unsigned long mapping;
-
-        mapping = (unsigned long)new->mapping;
-
-        if (!mapping || (mapping & PAGE_MAPPING_ANON) == 0)
-                return;
-
-        /*
-         * We hold the mmap_sem lock. So no need to call page_lock_anon_vma.
-         */
-        anon_vma = (struct anon_vma *) (mapping - PAGE_MAPPING_ANON);
-        spin_lock(&anon_vma->lock);
-
-        list_for_each_entry(vma, &anon_vma->head, anon_vma_node)
-                remove_migration_pte(vma, old, new);
-
-        spin_unlock(&anon_vma->lock);
+out:
+        return SWAP_AGAIN;
 }
 
 /*
@@ -197,10 +147,7 @@ static void remove_anon_migration_ptes(struct page *old, struct page *new)
  */
 static void remove_migration_ptes(struct page *old, struct page *new)
 {
-        if (PageAnon(new))
-                remove_anon_migration_ptes(old, new);
-        else
-                remove_file_migration_ptes(old, new);
+        rmap_walk(new, remove_migration_pte, old);
 }
 
 /*
@@ -341,8 +288,8 @@ static void migrate_page_copy(struct page *newpage, struct page *page)
         if (TestClearPageActive(page)) {
                 VM_BUG_ON(PageUnevictable(page));
                 SetPageActive(newpage);
-        } else
-                unevictable_migrate_page(newpage, page);
+        } else if (TestClearPageUnevictable(page))
+                SetPageUnevictable(newpage);
         if (PageChecked(page))
                 SetPageChecked(newpage);
         if (PageMappedToDisk(page))
@@ -361,6 +308,7 @@ static void migrate_page_copy(struct page *newpage, struct page *page)
         }
 
         mlock_migrate_page(newpage, page);
+        ksm_migrate_page(newpage, page);
 
         ClearPageSwapCache(page);
         ClearPagePrivate(page);
@@ -580,9 +528,9 @@ static int move_to_new_page(struct page *newpage, struct page *page)
         else
                 rc = fallback_migrate_page(mapping, newpage, page);
 
-        if (!rc) {
+        if (!rc)
                 remove_migration_ptes(page, newpage);
-        } else
+        else
                 newpage->mapping = NULL;
 
         unlock_page(newpage);
@@ -595,7 +543,7 @@ static int move_to_new_page(struct page *newpage, struct page *page)
  * to the newly allocated page in newpage.
  */
 static int unmap_and_move(new_page_t get_new_page, unsigned long private,
-                        struct page *page, int force)
+                        struct page *page, int force, int offlining)
 {
         int rc = 0;
         int *result = NULL;
@@ -621,6 +569,20 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
                 lock_page(page);
         }
 
+        /*
+         * Only memory hotplug's offline_pages() caller has locked out KSM,
+         * and can safely migrate a KSM page.  The other cases have skipped
+         * PageKsm along with PageReserved - but it is only now when we have
+         * the page lock that we can be certain it will not go KSM beneath us
+         * (KSM will not upgrade a page from PageAnon to PageKsm when it sees
+         * its pagecount raised, but only here do we take the page lock which
+         * serializes that).
+         */
+        if (PageKsm(page) && !offlining) {
+                rc = -EBUSY;
+                goto unlock;
+        }
+
         /* charge against new page */
         charge = mem_cgroup_prepare_migration(page, &mem);
         if (charge == -ENOMEM) {
@@ -737,7 +699,7 @@ move_newpage:
  * Return: Number of pages not migrated or error code.
  */
 int migrate_pages(struct list_head *from,
-                new_page_t get_new_page, unsigned long private)
+                new_page_t get_new_page, unsigned long private, int offlining)
 {
         int retry = 1;
         int nr_failed = 0;
@@ -746,13 +708,6 @@ int migrate_pages(struct list_head *from,
         struct page *page2;
         int swapwrite = current->flags & PF_SWAPWRITE;
         int rc;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        list_for_each_entry(page, from, lru)
-                __inc_zone_page_state(page, NR_ISOLATED_ANON +
-                                page_is_file_cache(page));
-        local_irq_restore(flags);
 
         if (!swapwrite)
                 current->flags |= PF_SWAPWRITE;
@@ -764,7 +719,7 @@ int migrate_pages(struct list_head *from,
                         cond_resched();
 
                         rc = unmap_and_move(get_new_page, private,
-                                                page, pass > 2);
+                                                page, pass > 2, offlining);
 
                         switch(rc) {
                         case -ENOMEM:
@@ -860,7 +815,8 @@ static int do_move_page_to_node_array(struct mm_struct *mm,
                 if (!page)
                         goto set_status;
 
-                if (PageReserved(page))         /* Check for zero page */
+                /* Use PageReserved to check for zero page */
+                if (PageReserved(page) || PageKsm(page))
                         goto put_and_set;
 
                 pp->page = page;
@@ -878,8 +834,11 @@ static int do_move_page_to_node_array(struct mm_struct *mm,
                         goto put_and_set;
 
                 err = isolate_lru_page(page);
-                if (!err)
+                if (!err) {
                         list_add_tail(&page->lru, &pagelist);
+                        inc_zone_page_state(page, NR_ISOLATED_ANON +
+                                            page_is_file_cache(page));
+                }
 put_and_set:
                 /*
                  * Either remove the duplicate refcount from
@@ -894,7 +853,7 @@ set_status:
         err = 0;
         if (!list_empty(&pagelist))
                 err = migrate_pages(&pagelist, new_page_node,
-                                (unsigned long)pm);
+                                (unsigned long)pm, 0);
 
         up_read(&mm->mmap_sem);
         return err;
@@ -1015,7 +974,7 @@ static void do_pages_stat_array(struct mm_struct *mm, unsigned long nr_pages,
 
                 err = -ENOENT;
                 /* Use PageReserved to check for zero page */
-                if (!page || PageReserved(page))
+                if (!page || PageReserved(page) || PageKsm(page))
                         goto set_status;
 
                 err = page_to_nid(page);
diff --git a/mm/mincore.c b/mm/mincore.c
index 8cb508f84ea4..7a3436ef39eb 100644
--- a/mm/mincore.c
+++ b/mm/mincore.c
@@ -14,6 +14,7 @@
 #include <linux/syscalls.h>
 #include <linux/swap.h>
 #include <linux/swapops.h>
+#include <linux/hugetlb.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -72,6 +73,42 @@ static long do_mincore(unsigned long addr, unsigned char *vec, unsigned long pag
         if (!vma || addr < vma->vm_start)
                 return -ENOMEM;
 
+#ifdef CONFIG_HUGETLB_PAGE
+        if (is_vm_hugetlb_page(vma)) {
+                struct hstate *h;
+                unsigned long nr_huge;
+                unsigned char present;
+
+                i = 0;
+                nr = min(pages, (vma->vm_end - addr) >> PAGE_SHIFT);
+                h = hstate_vma(vma);
+                nr_huge = ((addr + pages * PAGE_SIZE - 1) >> huge_page_shift(h))
+                          - (addr >> huge_page_shift(h)) + 1;
+                nr_huge = min(nr_huge,
+                              (vma->vm_end - addr) >> huge_page_shift(h));
+                while (1) {
+                        /* hugepage always in RAM for now,
+                         * but generally it needs to be check */
+                        ptep = huge_pte_offset(current->mm,
+                                               addr & huge_page_mask(h));
+                        present = !!(ptep &&
+                                     !huge_pte_none(huge_ptep_get(ptep)));
+                        while (1) {
+                                vec[i++] = present;
+                                addr += PAGE_SIZE;
+                                /* reach buffer limit */
+                                if (i == nr)
+                                        return nr;
+                                /* check hugepage border */
+                                if (!((addr & ~huge_page_mask(h))
+                                      >> PAGE_SHIFT))
+                                        break;
+                        }
+                }
+                return nr;
+        }
+#endif
+
         /*
          * Calculate how many pages there are left in the last level of the
          * PTE array for our address.
diff --git a/mm/mlock.c b/mm/mlock.c
index bd6f0e466f6c..2b8335a89400 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -88,25 +88,22 @@ void mlock_vma_page(struct page *page)
         }
 }
 
-/*
- * called from munlock()/munmap() path with page supposedly on the LRU.
+/**
+ * munlock_vma_page - munlock a vma page
+ * @page - page to be unlocked
  *
- * Note:  unlike mlock_vma_page(), we can't just clear the PageMlocked
- * [in try_to_munlock()] and then attempt to isolate the page.  We must
- * isolate the page to keep others from messing with its unevictable
- * and mlocked state while trying to munlock.  However, we pre-clear the
- * mlocked state anyway as we might lose the isolation race and we might
- * not get another chance to clear PageMlocked.  If we successfully
- * isolate the page and try_to_munlock() detects other VM_LOCKED vmas
- * mapping the page, it will restore the PageMlocked state, unless the page
- * is mapped in a non-linear vma.  So, we go ahead and SetPageMlocked(),
- * perhaps redundantly.
- * If we lose the isolation race, and the page is mapped by other VM_LOCKED
- * vmas, we'll detect this in vmscan--via try_to_munlock() or try_to_unmap()
- * either of which will restore the PageMlocked state by calling
- * mlock_vma_page() above, if it can grab the vma's mmap sem.
+ * called from munlock()/munmap() path with page supposedly on the LRU.
+ * When we munlock a page, because the vma where we found the page is being
+ * munlock()ed or munmap()ed, we want to check whether other vmas hold the
+ * page locked so that we can leave it on the unevictable lru list and not
+ * bother vmscan with it.  However, to walk the page's rmap list in
+ * try_to_munlock() we must isolate the page from the LRU.  If some other
+ * task has removed the page from the LRU, we won't be able to do that.
+ * So we clear the PageMlocked as we might not get another chance.  If we
+ * can't isolate the page, we leave it for putback_lru_page() and vmscan
+ * [page_referenced()/try_to_unmap()] to deal with.
  */
-static void munlock_vma_page(struct page *page)
+void munlock_vma_page(struct page *page)
 {
         BUG_ON(!PageLocked(page));
 
@@ -117,18 +114,18 @@ static void munlock_vma_page(struct page *page)
                         /*
                          * did try_to_unlock() succeed or punt?
                          */
-                        if (ret == SWAP_SUCCESS || ret == SWAP_AGAIN)
+                        if (ret != SWAP_MLOCK)
                                 count_vm_event(UNEVICTABLE_PGMUNLOCKED);
 
                         putback_lru_page(page);
                 } else {
                         /*
-                         * We lost the race.  let try_to_unmap() deal
-                         * with it.  At least we get the page state and
-                         * mlock stats right.  However, page is still on
-                         * the noreclaim list.  We'll fix that up when
-                         * the page is eventually freed or we scan the
-                         * noreclaim list.
+                         * Some other task has removed the page from the LRU.
+                         * putback_lru_page() will take care of removing the
+                         * page from the unevictable list, if necessary.
+                         * vmscan [page_referenced()] will move the page back
+                         * to the unevictable list if some other vma has it
+                         * mlocked.
                          */
                         if (PageUnevictable(page))
                                 count_vm_event(UNEVICTABLE_PGSTRANDED);
diff --git a/mm/mmap.c b/mm/mmap.c
index ed70a68e882a..d9c77b2dbe9d 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1198,8 +1198,20 @@ munmap_back:
                         goto free_vma;
         }
 
-        if (vma_wants_writenotify(vma))
+        if (vma_wants_writenotify(vma)) {
+                pgprot_t pprot = vma->vm_page_prot;
+
+                /* Can vma->vm_page_prot have changed??
+                 *
+                 * Answer: Yes, drivers may have changed it in their
+                 *         f_op->mmap method.
+                 *
+                 * Ensures that vmas marked as uncached stay that way.
+                 */
                 vma->vm_page_prot = vm_get_page_prot(vm_flags & ~VM_SHARED);
+                if (pgprot_val(pprot) == pgprot_val(pgprot_noncached(pprot)))
+                        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+        }
 
         vma_link(mm, vma, prev, rb_link, rb_parent);
         file = vma->vm_file;
@@ -1811,10 +1823,10 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
 }
 
 /*
- * Split a vma into two pieces at address 'addr', a new vma is allocated
- * either for the first part or the tail.
+ * __split_vma() bypasses sysctl_max_map_count checking.  We use this on the
+ * munmap path where it doesn't make sense to fail.
  */
-int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
               unsigned long addr, int new_below)
 {
         struct mempolicy *pol;
@@ -1824,9 +1836,6 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
                                         ~(huge_page_mask(hstate_vma(vma)))))
                 return -EINVAL;
 
-        if (mm->map_count >= sysctl_max_map_count)
-                return -ENOMEM;
-
         new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
         if (!new)
                 return -ENOMEM;
@@ -1866,6 +1875,19 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
         return 0;
 }
 
+/*
+ * Split a vma into two pieces at address 'addr', a new vma is allocated
+ * either for the first part or the tail.
+ */
+int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+              unsigned long addr, int new_below)
+{
+        if (mm->map_count >= sysctl_max_map_count)
+                return -ENOMEM;
+
+        return __split_vma(mm, vma, addr, new_below);
+}
+
 /* Munmap is split into 2 main parts -- this part which finds
  * what needs doing, and the areas themselves, which do the
  * work.  This now handles partial unmappings.
@@ -1901,7 +1923,17 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
          * places tmp vma above, and higher split_vma places tmp vma below.
          */
         if (start > vma->vm_start) {
-                int error = split_vma(mm, vma, start, 0);
+                int error;
+
+                /*
+                 * Make sure that map_count on return from munmap() will
+                 * not exceed its limit; but let map_count go just above
+                 * its limit temporarily, to help free resources as expected.
+                 */
+                if (end < vma->vm_end && mm->map_count >= sysctl_max_map_count)
+                        return -ENOMEM;
+
+                error = __split_vma(mm, vma, start, 0);
                 if (error)
                         return error;
                 prev = vma;
@@ -1910,7 +1942,7 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
         /* Does it split the last one? */
         last = find_vma(mm, end);
         if (last && end > last->vm_start) {
-                int error = split_vma(mm, last, end, 1);
+                int error = __split_vma(mm, last, end, 1);
                 if (error)
                         return error;
         }
diff --git a/mm/nommu.c b/mm/nommu.c
index 9876fa0c3ad3..8687973462bb 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1143,9 +1143,6 @@ static int do_mmap_private(struct vm_area_struct *vma,
                 if (ret < rlen)
                         memset(base + ret, 0, rlen - ret);
 
-        } else {
-                /* if it's an anonymous mapping, then just clear it */
-                memset(base, 0, rlen);
         }
 
         return 0;
@@ -1343,6 +1340,11 @@ unsigned long do_mmap_pgoff(struct file *file,
                 goto error_just_free;
         add_nommu_region(region);
 
+        /* clear anonymous mappings that don't ask for uninitialized data */
+        if (!vma->vm_file && !(flags & MAP_UNINITIALIZED))
+                memset((void *)region->vm_start, 0,
+                       region->vm_end - region->vm_start);
+
         /* okay... we have a mapping; now we have to register it */
         result = vma->vm_start;
 
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index ea2147dabba6..f52481b1c1e5 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -196,27 +196,46 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
 /*
  * Determine the type of allocation constraint.
  */
-static inline enum oom_constraint constrained_alloc(struct zonelist *zonelist,
-                                                    gfp_t gfp_mask)
-{
 #ifdef CONFIG_NUMA
+static enum oom_constraint constrained_alloc(struct zonelist *zonelist,
+                                    gfp_t gfp_mask, nodemask_t *nodemask)
+{
         struct zone *zone;
         struct zoneref *z;
         enum zone_type high_zoneidx = gfp_zone(gfp_mask);
-        nodemask_t nodes = node_states[N_HIGH_MEMORY];
 
-        for_each_zone_zonelist(zone, z, zonelist, high_zoneidx)
-                if (cpuset_zone_allowed_softwall(zone, gfp_mask))
-                        node_clear(zone_to_nid(zone), nodes);
-                else
-                        return CONSTRAINT_CPUSET;
+        /*
+         * Reach here only when __GFP_NOFAIL is used. So, we should avoid
+         * to kill current.We have to random task kill in this case.
+         * Hopefully, CONSTRAINT_THISNODE...but no way to handle it, now.
+         */
+        if (gfp_mask & __GFP_THISNODE)
+                return CONSTRAINT_NONE;
 
-        if (!nodes_empty(nodes))
+        /*
+         * The nodemask here is a nodemask passed to alloc_pages(). Now,
+         * cpuset doesn't use this nodemask for its hardwall/softwall/hierarchy
+         * feature. mempolicy is an only user of nodemask here.
+         * check mempolicy's nodemask contains all N_HIGH_MEMORY
+         */
+        if (nodemask && !nodes_subset(node_states[N_HIGH_MEMORY], *nodemask))
                 return CONSTRAINT_MEMORY_POLICY;
-#endif
 
+        /* Check this allocation failure is caused by cpuset's wall function */
+        for_each_zone_zonelist_nodemask(zone, z, zonelist,
+                        high_zoneidx, nodemask)
+                if (!cpuset_zone_allowed_softwall(zone, gfp_mask))
+                        return CONSTRAINT_CPUSET;
+
+        return CONSTRAINT_NONE;
+}
+#else
+static enum oom_constraint constrained_alloc(struct zonelist *zonelist,
+                                gfp_t gfp_mask, nodemask_t *nodemask)
+{
         return CONSTRAINT_NONE;
 }
+#endif
 
 /*
  * Simple selection loop. We chose the process with the highest
@@ -337,6 +356,24 @@ static void dump_tasks(const struct mem_cgroup *mem)
         } while_each_thread(g, p);
 }
 
+static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order,
+                                                        struct mem_cgroup *mem)
+{
+        pr_warning("%s invoked oom-killer: gfp_mask=0x%x, order=%d, "
+                "oom_adj=%d\n",
+                current->comm, gfp_mask, order, current->signal->oom_adj);
+        task_lock(current);
+        cpuset_print_task_mems_allowed(current);
+        task_unlock(current);
+        dump_stack();
+        mem_cgroup_print_oom_info(mem, p);
+        show_mem();
+        if (sysctl_oom_dump_tasks)
+                dump_tasks(mem);
+}
+
+#define K(x) ((x) << (PAGE_SHIFT-10))
+
 /*
  * Send SIGKILL to the selected  process irrespective of  CAP_SYS_RAW_IO
  * flag though it's unlikely that  we select a process with CAP_SYS_RAW_IO
@@ -350,15 +387,23 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
                 return;
         }
 
+        task_lock(p);
         if (!p->mm) {
                 WARN_ON(1);
-                printk(KERN_WARNING "tried to kill an mm-less task!\n");
+                printk(KERN_WARNING "tried to kill an mm-less task %d (%s)!\n",
+                        task_pid_nr(p), p->comm);
+                task_unlock(p);
                 return;
         }
 
         if (verbose)
-                printk(KERN_ERR "Killed process %d (%s)\n",
-                                task_pid_nr(p), p->comm);
+                printk(KERN_ERR "Killed process %d (%s) "
+                       "vsz:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
+                       task_pid_nr(p), p->comm,
+                       K(p->mm->total_vm),
+                       K(get_mm_counter(p->mm, anon_rss)),
+                       K(get_mm_counter(p->mm, file_rss)));
+        task_unlock(p);
 
         /*
          * We give our sacrificial lamb high priority and access to
@@ -395,20 +440,8 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
 {
         struct task_struct *c;
 
-        if (printk_ratelimit()) {
-                printk(KERN_WARNING "%s invoked oom-killer: "
-                        "gfp_mask=0x%x, order=%d, oom_adj=%d\n",
-                        current->comm, gfp_mask, order,
-                        current->signal->oom_adj);
-                task_lock(current);
-                cpuset_print_task_mems_allowed(current);
-                task_unlock(current);
-                dump_stack();
-                mem_cgroup_print_oom_info(mem, current);
-                show_mem();
-                if (sysctl_oom_dump_tasks)
-                        dump_tasks(mem);
-        }
+        if (printk_ratelimit())
+                dump_header(p, gfp_mask, order, mem);
 
         /*
          * If the task is already exiting, don't alarm the sysadmin or kill
@@ -544,6 +577,7 @@ retry:
         /* Found nothing?!?! Either we hang forever, or we panic. */
         if (!p) {
                 read_unlock(&tasklist_lock);
+                dump_header(NULL, gfp_mask, order, NULL);
                 panic("Out of memory and no killable processes...\n");
         }
 
@@ -599,7 +633,8 @@ rest_and_return:
  * OR try to be smart about which process to kill. Note that we
  * don't have to be perfect here, we just have to be good.
  */
-void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order)
+void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
+                int order, nodemask_t *nodemask)
 {
         unsigned long freed = 0;
         enum oom_constraint constraint;
@@ -609,14 +644,16 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order)
                 /* Got some memory back in the last second. */
                 return;
 
-        if (sysctl_panic_on_oom == 2)
+        if (sysctl_panic_on_oom == 2) {
+                dump_header(NULL, gfp_mask, order, NULL);
                 panic("out of memory. Compulsory panic_on_oom is selected.\n");
+        }
 
         /*
          * Check if there were limitations on the allocation (only relevant for
          * NUMA) that may require different handling.
          */
-        constraint = constrained_alloc(zonelist, gfp_mask);
+        constraint = constrained_alloc(zonelist, gfp_mask, nodemask);
         read_lock(&tasklist_lock);
 
         switch (constraint) {
@@ -626,8 +663,10 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order)
                 break;
 
         case CONSTRAINT_NONE:
-                if (sysctl_panic_on_oom)
+                if (sysctl_panic_on_oom) {
+                        dump_header(NULL, gfp_mask, order, NULL);
                         panic("out of memory. panic_on_oom is selected\n");
+                }
                 /* Fall-through */
         case CONSTRAINT_CPUSET:
                 __out_of_memory(gfp_mask, order);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 2bc2ac63f41e..850c4a7e2fe5 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -486,7 +486,6 @@ static inline void __free_one_page(struct page *page,
         zone->free_area[order].nr_free++;
 }
 
-#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT
 /*
  * free_page_mlock() -- clean up attempts to free and mlocked() page.
  * Page should not be on lru, so no need to fix that up.
@@ -497,9 +496,6 @@ static inline void free_page_mlock(struct page *page)
         __dec_zone_page_state(page, NR_MLOCK);
         __count_vm_event(UNEVICTABLE_MLOCKFREED);
 }
-#else
-static void free_page_mlock(struct page *page) { }
-#endif
 
 static inline int free_pages_check(struct page *page)
 {
@@ -1658,12 +1654,22 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
         if (page)
                 goto out;
 
-        /* The OOM killer will not help higher order allocs */
-        if (order > PAGE_ALLOC_COSTLY_ORDER && !(gfp_mask & __GFP_NOFAIL))
-                goto out;
-
+        if (!(gfp_mask & __GFP_NOFAIL)) {
+                /* The OOM killer will not help higher order allocs */
+                if (order > PAGE_ALLOC_COSTLY_ORDER)
+                        goto out;
+                /*
+                 * GFP_THISNODE contains __GFP_NORETRY and we never hit this.
+                 * Sanity check for bare calls of __GFP_THISNODE, not real OOM.
+                 * The caller should handle page allocation failure by itself if
+                 * it specifies __GFP_THISNODE.
+                 * Note: Hugepage uses it but will hit PAGE_ALLOC_COSTLY_ORDER.
+                 */
+                if (gfp_mask & __GFP_THISNODE)
+                        goto out;
+        }
         /* Exhausted what can be done so it's blamo time */
-        out_of_memory(zonelist, gfp_mask, order);
+        out_of_memory(zonelist, gfp_mask, order, nodemask);
 
 out:
         clear_zonelist_oom(zonelist, gfp_mask);
@@ -3127,7 +3133,7 @@ static int __cpuinit process_zones(int cpu)
 
                 if (percpu_pagelist_fraction)
                         setup_pagelist_highmark(zone_pcp(zone, cpu),
-                                (zone->present_pages / percpu_pagelist_fraction));
+                            (zone->present_pages / percpu_pagelist_fraction));
         }
 
         return 0;
diff --git a/mm/page_io.c b/mm/page_io.c
index c6f3e5071de3..a19af956ee1b 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -19,20 +19,15 @@
 #include <linux/writeback.h>
 #include <asm/pgtable.h>
 
-static struct bio *get_swap_bio(gfp_t gfp_flags, pgoff_t index,
+static struct bio *get_swap_bio(gfp_t gfp_flags,
                                 struct page *page, bio_end_io_t end_io)
 {
         struct bio *bio;
 
         bio = bio_alloc(gfp_flags, 1);
         if (bio) {
-                struct swap_info_struct *sis;
-                swp_entry_t entry = { .val = index, };
-
-                sis = get_swap_info_struct(swp_type(entry));
-                bio->bi_sector = map_swap_page(sis, swp_offset(entry)) *
-                                        (PAGE_SIZE >> 9);
-                bio->bi_bdev = sis->bdev;
+                bio->bi_sector = map_swap_page(page, &bio->bi_bdev);
+                bio->bi_sector <<= PAGE_SHIFT - 9;
                 bio->bi_io_vec[0].bv_page = page;
                 bio->bi_io_vec[0].bv_len = PAGE_SIZE;
                 bio->bi_io_vec[0].bv_offset = 0;
@@ -102,8 +97,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
                 unlock_page(page);
                 goto out;
         }
-        bio = get_swap_bio(GFP_NOIO, page_private(page), page,
-                                end_swap_bio_write);
+        bio = get_swap_bio(GFP_NOIO, page, end_swap_bio_write);
         if (bio == NULL) {
                 set_page_dirty(page);
                 unlock_page(page);
@@ -127,8 +121,7 @@ int swap_readpage(struct page *page)
 
         VM_BUG_ON(!PageLocked(page));
         VM_BUG_ON(PageUptodate(page));
-        bio = get_swap_bio(GFP_KERNEL, page_private(page), page,
-                                end_swap_bio_read);
+        bio = get_swap_bio(GFP_KERNEL, page, end_swap_bio_read);
         if (bio == NULL) {
                 unlock_page(page);
                 ret = -ENOMEM;
diff --git a/mm/pagewalk.c b/mm/pagewalk.c
index d5878bed7841..7b47a57b6646 100644
--- a/mm/pagewalk.c
+++ b/mm/pagewalk.c
@@ -1,6 +1,7 @@
 #include <linux/mm.h>
 #include <linux/highmem.h>
 #include <linux/sched.h>
+#include <linux/hugetlb.h>
 
 static int walk_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
                           struct mm_walk *walk)
@@ -107,6 +108,7 @@ int walk_page_range(unsigned long addr, unsigned long end,
         pgd_t *pgd;
         unsigned long next;
         int err = 0;
+        struct vm_area_struct *vma;
 
         if (addr >= end)
                 return err;
@@ -117,11 +119,38 @@ int walk_page_range(unsigned long addr, unsigned long end,
         pgd = pgd_offset(walk->mm, addr);
         do {
                 next = pgd_addr_end(addr, end);
+
+                /*
+                 * handle hugetlb vma individually because pagetable walk for
+                 * the hugetlb page is dependent on the architecture and
+                 * we can't handled it in the same manner as non-huge pages.
+                 */
+                vma = find_vma(walk->mm, addr);
+#ifdef CONFIG_HUGETLB_PAGE
+                if (vma && is_vm_hugetlb_page(vma)) {
+                        pte_t *pte;
+                        struct hstate *hs;
+
+                        if (vma->vm_end < next)
+                                next = vma->vm_end;
+                        hs = hstate_vma(vma);
+                        pte = huge_pte_offset(walk->mm,
+                                              addr & huge_page_mask(hs));
+                        if (pte && !huge_pte_none(huge_ptep_get(pte))
+                            && walk->hugetlb_entry)
+                                err = walk->hugetlb_entry(pte, addr,
+                                                          next, walk);
+                        if (err)
+                                break;
+                        continue;
+                }
+#endif
                 if (pgd_none_or_clear_bad(pgd)) {
                         if (walk->pte_hole)
                                 err = walk->pte_hole(addr, next, walk);
                         if (err)
                                 break;
+                        pgd++;
                         continue;
                 }
                 if (walk->pgd_entry)
@@ -131,7 +160,8 @@ int walk_page_range(unsigned long addr, unsigned long end,
                         err = walk_pud_range(pgd, addr, next, walk);
                 if (err)
                         break;
-        } while (pgd++, addr = next, addr != end);
+                pgd++;
+        } while (addr = next, addr != end);
 
         return err;
 }
diff --git a/mm/rmap.c b/mm/rmap.c
index dd43373a483f..278cd277bdec 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -49,6 +49,7 @@
 #include <linux/swapops.h>
 #include <linux/slab.h>
 #include <linux/init.h>
+#include <linux/ksm.h>
 #include <linux/rmap.h>
 #include <linux/rcupdate.h>
 #include <linux/module.h>
@@ -67,7 +68,7 @@ static inline struct anon_vma *anon_vma_alloc(void)
         return kmem_cache_alloc(anon_vma_cachep, GFP_KERNEL);
 }
 
-static inline void anon_vma_free(struct anon_vma *anon_vma)
+void anon_vma_free(struct anon_vma *anon_vma)
 {
         kmem_cache_free(anon_vma_cachep, anon_vma);
 }
@@ -171,7 +172,7 @@ void anon_vma_unlink(struct vm_area_struct *vma)
         list_del(&vma->anon_vma_node);
 
         /* We must garbage collect the anon_vma if it's empty */
-        empty = list_empty(&anon_vma->head);
+        empty = list_empty(&anon_vma->head) && !ksm_refcount(anon_vma);
         spin_unlock(&anon_vma->lock);
 
         if (empty)
@@ -183,6 +184,7 @@ static void anon_vma_ctor(void *data)
         struct anon_vma *anon_vma = data;
 
         spin_lock_init(&anon_vma->lock);
+        ksm_refcount_init(anon_vma);
         INIT_LIST_HEAD(&anon_vma->head);
 }
 
@@ -202,8 +204,8 @@ struct anon_vma *page_lock_anon_vma(struct page *page)
         unsigned long anon_mapping;
 
         rcu_read_lock();
-        anon_mapping = (unsigned long) page->mapping;
-        if (!(anon_mapping & PAGE_MAPPING_ANON))
+        anon_mapping = (unsigned long) ACCESS_ONCE(page->mapping);
+        if ((anon_mapping & PAGE_MAPPING_FLAGS) != PAGE_MAPPING_ANON)
                 goto out;
         if (!page_mapped(page))
                 goto out;
@@ -248,8 +250,7 @@ vma_address(struct page *page, struct vm_area_struct *vma)
 unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma)
 {
         if (PageAnon(page)) {
-                if ((void *)vma->anon_vma !=
-                    (void *)page->mapping - PAGE_MAPPING_ANON)
+                if (vma->anon_vma != page_anon_vma(page))
                         return -EFAULT;
         } else if (page->mapping && !(vma->vm_flags & VM_NONLINEAR)) {
                 if (!vma->vm_file ||
@@ -337,21 +338,15 @@ int page_mapped_in_vma(struct page *page, struct vm_area_struct *vma)
  * Subfunctions of page_referenced: page_referenced_one called
  * repeatedly from either page_referenced_anon or page_referenced_file.
  */
-static int page_referenced_one(struct page *page,
-                               struct vm_area_struct *vma,
-                               unsigned int *mapcount,
-                               unsigned long *vm_flags)
+int page_referenced_one(struct page *page, struct vm_area_struct *vma,
+                        unsigned long address, unsigned int *mapcount,
+                        unsigned long *vm_flags)
 {
         struct mm_struct *mm = vma->vm_mm;
-        unsigned long address;
         pte_t *pte;
         spinlock_t *ptl;
         int referenced = 0;
 
-        address = vma_address(page, vma);
-        if (address == -EFAULT)
-                goto out;
-
         pte = page_check_address(page, mm, address, &ptl, 0);
         if (!pte)
                 goto out;
@@ -388,9 +383,10 @@ static int page_referenced_one(struct page *page,
 out_unmap:
         (*mapcount)--;
         pte_unmap_unlock(pte, ptl);
-out:
+
         if (referenced)
                 *vm_flags |= vma->vm_flags;
+out:
         return referenced;
 }
 
@@ -409,6 +405,9 @@ static int page_referenced_anon(struct page *page,
 
         mapcount = page_mapcount(page);
         list_for_each_entry(vma, &anon_vma->head, anon_vma_node) {
+                unsigned long address = vma_address(page, vma);
+                if (address == -EFAULT)
+                        continue;
                 /*
                  * If we are reclaiming on behalf of a cgroup, skip
                  * counting on behalf of references from different
@@ -416,7 +415,7 @@ static int page_referenced_anon(struct page *page,
                  */
                 if (mem_cont && !mm_match_cgroup(vma->vm_mm, mem_cont))
                         continue;
-                referenced += page_referenced_one(page, vma,
+                referenced += page_referenced_one(page, vma, address,
                                                   &mapcount, vm_flags);
                 if (!mapcount)
                         break;
@@ -474,6 +473,9 @@ static int page_referenced_file(struct page *page,
         mapcount = page_mapcount(page);
 
         vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff) {
+                unsigned long address = vma_address(page, vma);
+                if (address == -EFAULT)
+                        continue;
                 /*
                  * If we are reclaiming on behalf of a cgroup, skip
                  * counting on behalf of references from different
@@ -481,7 +483,7 @@ static int page_referenced_file(struct page *page,
                  */
                 if (mem_cont && !mm_match_cgroup(vma->vm_mm, mem_cont))
                         continue;
-                referenced += page_referenced_one(page, vma,
+                referenced += page_referenced_one(page, vma, address,
                                                   &mapcount, vm_flags);
                 if (!mapcount)
                         break;
@@ -507,46 +509,47 @@ int page_referenced(struct page *page,
                     unsigned long *vm_flags)
 {
         int referenced = 0;
+        int we_locked = 0;
 
         if (TestClearPageReferenced(page))
                 referenced++;
 
         *vm_flags = 0;
-        if (page_mapped(page) && page->mapping) {
-                if (PageAnon(page))
+        if (page_mapped(page) && page_rmapping(page)) {
+                if (!is_locked && (!PageAnon(page) || PageKsm(page))) {
+                        we_locked = trylock_page(page);
+                        if (!we_locked) {
+                                referenced++;
+                                goto out;
+                        }
+                }
+                if (unlikely(PageKsm(page)))
+                        referenced += page_referenced_ksm(page, mem_cont,
+                                                                vm_flags);
+                else if (PageAnon(page))
                         referenced += page_referenced_anon(page, mem_cont,
                                                                 vm_flags);
-                else if (is_locked)
+                else if (page->mapping)
                         referenced += page_referenced_file(page, mem_cont,
                                                                 vm_flags);
-                else if (!trylock_page(page))
-                        referenced++;
-                else {
-                        if (page->mapping)
-                                referenced += page_referenced_file(page,
-                                                        mem_cont, vm_flags);
+                if (we_locked)
                         unlock_page(page);
-                }
         }
-
+out:
         if (page_test_and_clear_young(page))
                 referenced++;
 
         return referenced;
 }
 
-static int page_mkclean_one(struct page *page, struct vm_area_struct *vma)
+static int page_mkclean_one(struct page *page, struct vm_area_struct *vma,
+                            unsigned long address)
 {
         struct mm_struct *mm = vma->vm_mm;
-        unsigned long address;
         pte_t *pte;
         spinlock_t *ptl;
         int ret = 0;
 
-        address = vma_address(page, vma);
-        if (address == -EFAULT)
-                goto out;
-
         pte = page_check_address(page, mm, address, &ptl, 1);
         if (!pte)
                 goto out;
@@ -578,8 +581,12 @@ static int page_mkclean_file(struct address_space *mapping, struct page *page)
 
         spin_lock(&mapping->i_mmap_lock);
         vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff) {
-                if (vma->vm_flags & VM_SHARED)
-                        ret += page_mkclean_one(page, vma);
+                if (vma->vm_flags & VM_SHARED) {
+                        unsigned long address = vma_address(page, vma);
+                        if (address == -EFAULT)
+                                continue;
+                        ret += page_mkclean_one(page, vma, address);
+                }
         }
         spin_unlock(&mapping->i_mmap_lock);
         return ret;
@@ -620,14 +627,7 @@ static void __page_set_anon_rmap(struct page *page,
         BUG_ON(!anon_vma);
         anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON;
         page->mapping = (struct address_space *) anon_vma;
-
         page->index = linear_page_index(vma, address);
-
-        /*
-         * nr_mapped state can be updated without turning off
-         * interrupts because it is not modified via interrupt.
-         */
-        __inc_zone_page_state(page, NR_ANON_PAGES);
 }
 
 /**
@@ -665,14 +665,23 @@ static void __page_check_anon_rmap(struct page *page,
  * @vma:        the vm area in which the mapping is added
  * @address:    the user virtual address mapped
  *
- * The caller needs to hold the pte lock and the page must be locked.
+ * The caller needs to hold the pte lock, and the page must be locked in
+ * the anon_vma case: to serialize mapping,index checking after setting,
+ * and to ensure that PageAnon is not being upgraded racily to PageKsm
+ * (but PageKsm is never downgraded to PageAnon).
  */
 void page_add_anon_rmap(struct page *page,
         struct vm_area_struct *vma, unsigned long address)
 {
+        int first = atomic_inc_and_test(&page->_mapcount);
+        if (first)
+                __inc_zone_page_state(page, NR_ANON_PAGES);
+        if (unlikely(PageKsm(page)))
+                return;
+
         VM_BUG_ON(!PageLocked(page));
         VM_BUG_ON(address < vma->vm_start || address >= vma->vm_end);
-        if (atomic_inc_and_test(&page->_mapcount))
+        if (first)
                 __page_set_anon_rmap(page, vma, address);
         else
                 __page_check_anon_rmap(page, vma, address);
@@ -694,6 +703,7 @@ void page_add_new_anon_rmap(struct page *page,
         VM_BUG_ON(address < vma->vm_start || address >= vma->vm_end);
         SetPageSwapBacked(page);
         atomic_set(&page->_mapcount, 0); /* increment count (starts at -1) */
+        __inc_zone_page_state(page, NR_ANON_PAGES);
         __page_set_anon_rmap(page, vma, address);
         if (page_evictable(page, vma))
                 lru_cache_add_lru(page, LRU_ACTIVE_ANON);
@@ -711,7 +721,7 @@ void page_add_file_rmap(struct page *page)
 {
         if (atomic_inc_and_test(&page->_mapcount)) {
                 __inc_zone_page_state(page, NR_FILE_MAPPED);
-                mem_cgroup_update_mapped_file_stat(page, 1);
+                mem_cgroup_update_file_mapped(page, 1);
         }
 }
 
@@ -743,8 +753,8 @@ void page_remove_rmap(struct page *page)
                 __dec_zone_page_state(page, NR_ANON_PAGES);
         } else {
                 __dec_zone_page_state(page, NR_FILE_MAPPED);
+                mem_cgroup_update_file_mapped(page, -1);
         }
-        mem_cgroup_update_mapped_file_stat(page, -1);
         /*
          * It would be tidy to reset the PageAnon mapping here,
          * but that might overwrite a racing page_add_anon_rmap
@@ -760,20 +770,15 @@ void page_remove_rmap(struct page *page)
  * Subfunctions of try_to_unmap: try_to_unmap_one called
  * repeatedly from either try_to_unmap_anon or try_to_unmap_file.
  */
-static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
-                                enum ttu_flags flags)
+int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
+                     unsigned long address, enum ttu_flags flags)
 {
         struct mm_struct *mm = vma->vm_mm;
-        unsigned long address;
         pte_t *pte;
         pte_t pteval;
         spinlock_t *ptl;
         int ret = SWAP_AGAIN;
 
-        address = vma_address(page, vma);
-        if (address == -EFAULT)
-                goto out;
-
         pte = page_check_address(page, mm, address, &ptl, 0);
         if (!pte)
                 goto out;
@@ -784,10 +789,11 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
          * skipped over this mm) then we should reactivate it.
          */
         if (!(flags & TTU_IGNORE_MLOCK)) {
-                if (vma->vm_flags & VM_LOCKED) {
-                        ret = SWAP_MLOCK;
+                if (vma->vm_flags & VM_LOCKED)
+                        goto out_mlock;
+
+                if (TTU_ACTION(flags) == TTU_MUNLOCK)
                         goto out_unmap;
-                }
         }
         if (!(flags & TTU_IGNORE_ACCESS)) {
                 if (ptep_clear_flush_young_notify(vma, address, pte)) {
@@ -822,7 +828,11 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
                          * Store the swap location in the pte.
                          * See handle_pte_fault() ...
                          */
-                        swap_duplicate(entry);
+                        if (swap_duplicate(entry) < 0) {
+                                set_pte_at(mm, address, pte, pteval);
+                                ret = SWAP_FAIL;
+                                goto out_unmap;
+                        }
                         if (list_empty(&mm->mmlist)) {
                                 spin_lock(&mmlist_lock);
                                 if (list_empty(&mm->mmlist))
@@ -849,7 +859,6 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
         } else
                 dec_mm_counter(mm, file_rss);
 
-
         page_remove_rmap(page);
         page_cache_release(page);
 
@@ -857,6 +866,27 @@ out_unmap:
         pte_unmap_unlock(pte, ptl);
 out:
         return ret;
+
+out_mlock:
+        pte_unmap_unlock(pte, ptl);
+
+
+        /*
+         * We need mmap_sem locking, Otherwise VM_LOCKED check makes
+         * unstable result and race. Plus, We can't wait here because
+         * we now hold anon_vma->lock or mapping->i_mmap_lock.
+         * if trylock failed, the page remain in evictable lru and later
+         * vmscan could retry to move the page to unevictable lru if the
+         * page is actually mlocked.
+         */
+        if (down_read_trylock(&vma->vm_mm->mmap_sem)) {
+                if (vma->vm_flags & VM_LOCKED) {
+                        mlock_vma_page(page);
+                        ret = SWAP_MLOCK;
+                }
+                up_read(&vma->vm_mm->mmap_sem);
+        }
+        return ret;
 }
 
 /*
@@ -922,11 +952,10 @@ static int try_to_unmap_cluster(unsigned long cursor, unsigned int *mapcount,
                 return ret;
 
         /*
-         * MLOCK_PAGES => feature is configured.
-         * if we can acquire the mmap_sem for read, and vma is VM_LOCKED,
+         * If we can acquire the mmap_sem for read, and vma is VM_LOCKED,
          * keep the sem while scanning the cluster for mlocking pages.
          */
-        if (MLOCK_PAGES && down_read_trylock(&vma->vm_mm->mmap_sem)) {
+        if (down_read_trylock(&vma->vm_mm->mmap_sem)) {
                 locked_vma = (vma->vm_flags & VM_LOCKED);
                 if (!locked_vma)
                         up_read(&vma->vm_mm->mmap_sem); /* don't need it */
@@ -976,29 +1005,11 @@ static int try_to_unmap_cluster(unsigned long cursor, unsigned int *mapcount,
         return ret;
 }
 
-/*
- * common handling for pages mapped in VM_LOCKED vmas
- */
-static int try_to_mlock_page(struct page *page, struct vm_area_struct *vma)
-{
-        int mlocked = 0;
-
-        if (down_read_trylock(&vma->vm_mm->mmap_sem)) {
-                if (vma->vm_flags & VM_LOCKED) {
-                        mlock_vma_page(page);
-                        mlocked++;      /* really mlocked the page */
-                }
-                up_read(&vma->vm_mm->mmap_sem);
-        }
-        return mlocked;
-}
-
 /**
  * try_to_unmap_anon - unmap or unlock anonymous page using the object-based
  * rmap method
  * @page: the page to unmap/unlock
- * @unlock:  request for unlock rather than unmap [unlikely]
- * @migration:  unmapping for migration - ignored if @unlock
+ * @flags: action and flags
  *
  * Find all the mappings of a page using the mapping pointer and the vma chains
  * contained in the anon_vma struct it points to.
@@ -1014,42 +1025,22 @@ static int try_to_unmap_anon(struct page *page, enum ttu_flags flags)
 {
         struct anon_vma *anon_vma;
         struct vm_area_struct *vma;
-        unsigned int mlocked = 0;
         int ret = SWAP_AGAIN;
-        int unlock = TTU_ACTION(flags) == TTU_MUNLOCK;
-
-        if (MLOCK_PAGES && unlikely(unlock))
-                ret = SWAP_SUCCESS;     /* default for try_to_munlock() */
 
         anon_vma = page_lock_anon_vma(page);
         if (!anon_vma)
                 return ret;
 
         list_for_each_entry(vma, &anon_vma->head, anon_vma_node) {
-                if (MLOCK_PAGES && unlikely(unlock)) {
-                        if (!((vma->vm_flags & VM_LOCKED) &&
-                              page_mapped_in_vma(page, vma)))
-                                continue;  /* must visit all unlocked vmas */
-                        ret = SWAP_MLOCK;  /* saw at least one mlocked vma */
-                } else {
-                        ret = try_to_unmap_one(page, vma, flags);
-                        if (ret == SWAP_FAIL || !page_mapped(page))
-                                break;
-                }
-                if (ret == SWAP_MLOCK) {
-                        mlocked = try_to_mlock_page(page, vma);
-                        if (mlocked)
-                                break;  /* stop if actually mlocked page */
-                }
+                unsigned long address = vma_address(page, vma);
+                if (address == -EFAULT)
+                        continue;
+                ret = try_to_unmap_one(page, vma, address, flags);
+                if (ret != SWAP_AGAIN || !page_mapped(page))
+                        break;
         }
 
         page_unlock_anon_vma(anon_vma);
-
-        if (mlocked)
-                ret = SWAP_MLOCK;       /* actually mlocked the page */
-        else if (ret == SWAP_MLOCK)
-                ret = SWAP_AGAIN;       /* saw VM_LOCKED vma */
-
         return ret;
 }
 
@@ -1079,48 +1070,30 @@ static int try_to_unmap_file(struct page *page, enum ttu_flags flags)
         unsigned long max_nl_cursor = 0;
         unsigned long max_nl_size = 0;
         unsigned int mapcount;
-        unsigned int mlocked = 0;
-        int unlock = TTU_ACTION(flags) == TTU_MUNLOCK;
-
-        if (MLOCK_PAGES && unlikely(unlock))
-                ret = SWAP_SUCCESS;     /* default for try_to_munlock() */
 
         spin_lock(&mapping->i_mmap_lock);
         vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff) {
-                if (MLOCK_PAGES && unlikely(unlock)) {
-                        if (!((vma->vm_flags & VM_LOCKED) &&
-                                                page_mapped_in_vma(page, vma)))
-                                continue;       /* must visit all vmas */
-                        ret = SWAP_MLOCK;
-                } else {
-                        ret = try_to_unmap_one(page, vma, flags);
-                        if (ret == SWAP_FAIL || !page_mapped(page))
-                                goto out;
-                }
-                if (ret == SWAP_MLOCK) {
-                        mlocked = try_to_mlock_page(page, vma);
-                        if (mlocked)
-                                break;  /* stop if actually mlocked page */
-                }
+                unsigned long address = vma_address(page, vma);
+                if (address == -EFAULT)
+                        continue;
+                ret = try_to_unmap_one(page, vma, address, flags);
+                if (ret != SWAP_AGAIN || !page_mapped(page))
+                        goto out;
         }
 
-        if (mlocked)
+        if (list_empty(&mapping->i_mmap_nonlinear))
                 goto out;
 
-        if (list_empty(&mapping->i_mmap_nonlinear))
+        /*
+         * We don't bother to try to find the munlocked page in nonlinears.
+         * It's costly. Instead, later, page reclaim logic may call
+         * try_to_unmap(TTU_MUNLOCK) and recover PG_mlocked lazily.
+         */
+        if (TTU_ACTION(flags) == TTU_MUNLOCK)
                 goto out;
 
         list_for_each_entry(vma, &mapping->i_mmap_nonlinear,
                                                 shared.vm_set.list) {
-                if (MLOCK_PAGES && unlikely(unlock)) {
-                        if (!(vma->vm_flags & VM_LOCKED))
-                                continue;       /* must visit all vmas */
-                        ret = SWAP_MLOCK;       /* leave mlocked == 0 */
-                        goto out;               /* no need to look further */
-                }
-                if (!MLOCK_PAGES && !(flags & TTU_IGNORE_MLOCK) &&
-                        (vma->vm_flags & VM_LOCKED))
-                        continue;
                 cursor = (unsigned long) vma->vm_private_data;
                 if (cursor > max_nl_cursor)
                         max_nl_cursor = cursor;
@@ -1153,16 +1126,12 @@ static int try_to_unmap_file(struct page *page, enum ttu_flags flags)
         do {
                 list_for_each_entry(vma, &mapping->i_mmap_nonlinear,
                                                 shared.vm_set.list) {
-                        if (!MLOCK_PAGES && !(flags & TTU_IGNORE_MLOCK) &&
-                            (vma->vm_flags & VM_LOCKED))
-                                continue;
                         cursor = (unsigned long) vma->vm_private_data;
                         while ( cursor < max_nl_cursor &&
                                 cursor < vma->vm_end - vma->vm_start) {
-                                ret = try_to_unmap_cluster(cursor, &mapcount,
-                                                                vma, page);
-                                if (ret == SWAP_MLOCK)
-                                        mlocked = 2;    /* to return below */
+                                if (try_to_unmap_cluster(cursor, &mapcount,
+                                                vma, page) == SWAP_MLOCK)
+                                        ret = SWAP_MLOCK;
                                 cursor += CLUSTER_SIZE;
                                 vma->vm_private_data = (void *) cursor;
                                 if ((int)mapcount <= 0)
@@ -1183,10 +1152,6 @@ static int try_to_unmap_file(struct page *page, enum ttu_flags flags)
                 vma->vm_private_data = NULL;
 out:
         spin_unlock(&mapping->i_mmap_lock);
-        if (mlocked)
-                ret = SWAP_MLOCK;       /* actually mlocked the page */
-        else if (ret == SWAP_MLOCK)
-                ret = SWAP_AGAIN;       /* saw VM_LOCKED vma */
         return ret;
 }
 
@@ -1210,7 +1175,9 @@ int try_to_unmap(struct page *page, enum ttu_flags flags)
 
         BUG_ON(!PageLocked(page));
 
-        if (PageAnon(page))
+        if (unlikely(PageKsm(page)))
+                ret = try_to_unmap_ksm(page, flags);
+        else if (PageAnon(page))
                 ret = try_to_unmap_anon(page, flags);
         else
                 ret = try_to_unmap_file(page, flags);
@@ -1229,17 +1196,98 @@ int try_to_unmap(struct page *page, enum ttu_flags flags)
  *
  * Return values are:
  *
- * SWAP_SUCCESS - no vma's holding page mlocked.
+ * SWAP_AGAIN   - no vma is holding page mlocked, or,
  * SWAP_AGAIN   - page mapped in mlocked vma -- couldn't acquire mmap sem
+ * SWAP_FAIL    - page cannot be located at present
  * SWAP_MLOCK   - page is now mlocked.
  */
 int try_to_munlock(struct page *page)
 {
         VM_BUG_ON(!PageLocked(page) || PageLRU(page));
 
-        if (PageAnon(page))
+        if (unlikely(PageKsm(page)))
+                return try_to_unmap_ksm(page, TTU_MUNLOCK);
+        else if (PageAnon(page))
                 return try_to_unmap_anon(page, TTU_MUNLOCK);
         else
                 return try_to_unmap_file(page, TTU_MUNLOCK);
 }
 
+#ifdef CONFIG_MIGRATION
+/*
+ * rmap_walk() and its helpers rmap_walk_anon() and rmap_walk_file():
+ * Called by migrate.c to remove migration ptes, but might be used more later.
+ */
+static int rmap_walk_anon(struct page *page, int (*rmap_one)(struct page *,
+                struct vm_area_struct *, unsigned long, void *), void *arg)
+{
+        struct anon_vma *anon_vma;
+        struct vm_area_struct *vma;
+        int ret = SWAP_AGAIN;
+
+        /*
+         * Note: remove_migration_ptes() cannot use page_lock_anon_vma()
+         * because that depends on page_mapped(); but not all its usages
+         * are holding mmap_sem, which also gave the necessary guarantee
+         * (that this anon_vma's slab has not already been destroyed).
+         * This needs to be reviewed later: avoiding page_lock_anon_vma()
+         * is risky, and currently limits the usefulness of rmap_walk().
+         */
+        anon_vma = page_anon_vma(page);
+        if (!anon_vma)
+                return ret;
+        spin_lock(&anon_vma->lock);
+        list_for_each_entry(vma, &anon_vma->head, anon_vma_node) {
+                unsigned long address = vma_address(page, vma);
+                if (address == -EFAULT)
+                        continue;
+                ret = rmap_one(page, vma, address, arg);
+                if (ret != SWAP_AGAIN)
+                        break;
+        }
+        spin_unlock(&anon_vma->lock);
+        return ret;
+}
+
+static int rmap_walk_file(struct page *page, int (*rmap_one)(struct page *,
+                struct vm_area_struct *, unsigned long, void *), void *arg)
+{
+        struct address_space *mapping = page->mapping;
+        pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
+        struct vm_area_struct *vma;
+        struct prio_tree_iter iter;
+        int ret = SWAP_AGAIN;
+
+        if (!mapping)
+                return ret;
+        spin_lock(&mapping->i_mmap_lock);
+        vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff) {
+                unsigned long address = vma_address(page, vma);
+                if (address == -EFAULT)
+                        continue;
+                ret = rmap_one(page, vma, address, arg);
+                if (ret != SWAP_AGAIN)
+                        break;
+        }
+        /*
+         * No nonlinear handling: being always shared, nonlinear vmas
+         * never contain migration ptes.  Decide what to do about this
+         * limitation to linear when we need rmap_walk() on nonlinear.
+         */
+        spin_unlock(&mapping->i_mmap_lock);
+        return ret;
+}
+
+int rmap_walk(struct page *page, int (*rmap_one)(struct page *,
+                struct vm_area_struct *, unsigned long, void *), void *arg)
+{
+        VM_BUG_ON(!PageLocked(page));
+
+        if (unlikely(PageKsm(page)))
+                return rmap_walk_ksm(page, rmap_one, arg);
+        else if (PageAnon(page))
+                return rmap_walk_anon(page, rmap_one, arg);
+        else
+                return rmap_walk_file(page, rmap_one, arg);
+}
+#endif /* CONFIG_MIGRATION */
diff --git a/mm/shmem.c b/mm/shmem.c
index 356dd99566ec..4fb41c83daca 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1017,7 +1017,14 @@ int shmem_unuse(swp_entry_t entry, struct page *page)
                         goto out;
         }
         mutex_unlock(&shmem_swaplist_mutex);
-out:    return found;   /* 0 or 1 or -ENOMEM */
+        /*
+         * Can some race bring us here?  We've been holding page lock,
+         * so I think not; but would rather try again later than BUG()
+         */
+        unlock_page(page);
+        page_cache_release(page);
+out:
+        return (found < 0) ? found : 0;
 }
 
 /*
@@ -1080,7 +1087,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
                 else
                         inode = NULL;
                 spin_unlock(&info->lock);
-                swap_duplicate(swap);
+                swap_shmem_alloc(swap);
                 BUG_ON(page_mapped(page));
                 page_cache_release(page);       /* pagecache ref */
                 swap_writepage(page, wbc);
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 9c590eef7912..6c0585b16418 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -22,6 +22,7 @@
 #include <linux/seq_file.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/ksm.h>
 #include <linux/rmap.h>
 #include <linux/security.h>
 #include <linux/backing-dev.h>
@@ -35,11 +36,15 @@
 #include <linux/swapops.h>
 #include <linux/page_cgroup.h>
 
+static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
+                                 unsigned char);
+static void free_swap_count_continuations(struct swap_info_struct *);
+static sector_t map_swap_entry(swp_entry_t, struct block_device**);
+
 static DEFINE_SPINLOCK(swap_lock);
 static unsigned int nr_swapfiles;
 long nr_swap_pages;
 long total_swap_pages;
-static int swap_overflow;
 static int least_priority;
 
 static const char Bad_file[] = "Bad swap file entry ";
@@ -49,42 +54,20 @@ static const char Unused_offset[] = "Unused swap offset entry ";
 
 static struct swap_list_t swap_list = {-1, -1};
 
-static struct swap_info_struct swap_info[MAX_SWAPFILES];
+static struct swap_info_struct *swap_info[MAX_SWAPFILES];
 
 static DEFINE_MUTEX(swapon_mutex);
 
-/* For reference count accounting in swap_map */
-/* enum for swap_map[] handling. internal use only */
-enum {
-        SWAP_MAP = 0,   /* ops for reference from swap users */
-        SWAP_CACHE,     /* ops for reference from swap cache */
-};
-
-static inline int swap_count(unsigned short ent)
-{
-        return ent & SWAP_COUNT_MASK;
-}
-
-static inline bool swap_has_cache(unsigned short ent)
+static inline unsigned char swap_count(unsigned char ent)
 {
-        return !!(ent & SWAP_HAS_CACHE);
+        return ent & ~SWAP_HAS_CACHE;   /* may include SWAP_HAS_CONT flag */
 }
 
-static inline unsigned short encode_swapmap(int count, bool has_cache)
-{
-        unsigned short ret = count;
-
-        if (has_cache)
-                return SWAP_HAS_CACHE | ret;
-        return ret;
-}
-
-/* returnes 1 if swap entry is freed */
+/* returns 1 if swap entry is freed */
 static int
 __try_to_reclaim_swap(struct swap_info_struct *si, unsigned long offset)
 {
-        int type = si - swap_info;
-        swp_entry_t entry = swp_entry(type, offset);
+        swp_entry_t entry = swp_entry(si->type, offset);
         struct page *page;
         int ret = 0;
 
@@ -120,7 +103,7 @@ void swap_unplug_io_fn(struct backing_dev_info *unused_bdi, struct page *page)
         down_read(&swap_unplug_sem);
         entry.val = page_private(page);
         if (PageSwapCache(page)) {
-                struct block_device *bdev = swap_info[swp_type(entry)].bdev;
+                struct block_device *bdev = swap_info[swp_type(entry)]->bdev;
                 struct backing_dev_info *bdi;
 
                 /*
@@ -146,23 +129,28 @@ void swap_unplug_io_fn(struct backing_dev_info *unused_bdi, struct page *page)
 static int discard_swap(struct swap_info_struct *si)
 {
         struct swap_extent *se;
+        sector_t start_block;
+        sector_t nr_blocks;
         int err = 0;
 
-        list_for_each_entry(se, &si->extent_list, list) {
-                sector_t start_block = se->start_block << (PAGE_SHIFT - 9);
-                sector_t nr_blocks = (sector_t)se->nr_pages << (PAGE_SHIFT - 9);
+        /* Do not discard the swap header page! */
+        se = &si->first_swap_extent;
+        start_block = (se->start_block + 1) << (PAGE_SHIFT - 9);
+        nr_blocks = ((sector_t)se->nr_pages - 1) << (PAGE_SHIFT - 9);
+        if (nr_blocks) {
+                err = blkdev_issue_discard(si->bdev, start_block,
+                                nr_blocks, GFP_KERNEL, DISCARD_FL_BARRIER);
+                if (err)
+                        return err;
+                cond_resched();
+        }
 
-                if (se->start_page == 0) {
-                        /* Do not discard the swap header page! */
-                        start_block += 1 << (PAGE_SHIFT - 9);
-                        nr_blocks -= 1 << (PAGE_SHIFT - 9);
-                        if (!nr_blocks)
-                                continue;
-                }
+        list_for_each_entry(se, &si->first_swap_extent.list, list) {
+                start_block = se->start_block << (PAGE_SHIFT - 9);
+                nr_blocks = (sector_t)se->nr_pages << (PAGE_SHIFT - 9);
 
                 err = blkdev_issue_discard(si->bdev, start_block,
-                                                nr_blocks, GFP_KERNEL,
-                                                DISCARD_FL_BARRIER);
+                                nr_blocks, GFP_KERNEL, DISCARD_FL_BARRIER);
                 if (err)
                         break;
 
@@ -201,14 +189,11 @@ static void discard_swap_cluster(struct swap_info_struct *si,
                         start_block <<= PAGE_SHIFT - 9;
                         nr_blocks <<= PAGE_SHIFT - 9;
                         if (blkdev_issue_discard(si->bdev, start_block,
-                                                        nr_blocks, GFP_NOIO,
-                                                        DISCARD_FL_BARRIER))
+                                    nr_blocks, GFP_NOIO, DISCARD_FL_BARRIER))
                                 break;
                 }
 
                 lh = se->list.next;
-                if (lh == &si->extent_list)
-                        lh = lh->next;
                 se = list_entry(lh, struct swap_extent, list);
         }
 }
@@ -223,7 +208,7 @@ static int wait_for_discard(void *word)
 #define LATENCY_LIMIT           256
 
 static inline unsigned long scan_swap_map(struct swap_info_struct *si,
-                                          int cache)
+                                          unsigned char usage)
 {
         unsigned long offset;
         unsigned long scan_base;
@@ -354,10 +339,7 @@ checks:
                 si->lowest_bit = si->max;
                 si->highest_bit = 0;
         }
-        if (cache == SWAP_CACHE) /* at usual swap-out via vmscan.c */
-                si->swap_map[offset] = encode_swapmap(0, true);
-        else /* at suspend */
-                si->swap_map[offset] = encode_swapmap(1, false);
+        si->swap_map[offset] = usage;
         si->cluster_next = offset + 1;
         si->flags -= SWP_SCANNING;
 
@@ -467,10 +449,10 @@ swp_entry_t get_swap_page(void)
         nr_swap_pages--;
 
         for (type = swap_list.next; type >= 0 && wrapped < 2; type = next) {
-                si = swap_info + type;
+                si = swap_info[type];
                 next = si->next;
                 if (next < 0 ||
-                    (!wrapped && si->prio != swap_info[next].prio)) {
+                    (!wrapped && si->prio != swap_info[next]->prio)) {
                         next = swap_list.head;
                         wrapped++;
                 }
@@ -482,7 +464,7 @@ swp_entry_t get_swap_page(void)
 
                 swap_list.next = next;
                 /* This is called for allocating swap entry for cache */
-                offset = scan_swap_map(si, SWAP_CACHE);
+                offset = scan_swap_map(si, SWAP_HAS_CACHE);
                 if (offset) {
                         spin_unlock(&swap_lock);
                         return swp_entry(type, offset);
@@ -503,11 +485,11 @@ swp_entry_t get_swap_page_of_type(int type)
         pgoff_t offset;
 
         spin_lock(&swap_lock);
-        si = swap_info + type;
-        if (si->flags & SWP_WRITEOK) {
+        si = swap_info[type];
+        if (si && (si->flags & SWP_WRITEOK)) {
                 nr_swap_pages--;
                 /* This is called for allocating swap entry, not cache */
-                offset = scan_swap_map(si, SWAP_MAP);
+                offset = scan_swap_map(si, 1);
                 if (offset) {
                         spin_unlock(&swap_lock);
                         return swp_entry(type, offset);
@@ -518,9 +500,9 @@ swp_entry_t get_swap_page_of_type(int type)
         return (swp_entry_t) {0};
 }
 
-static struct swap_info_struct * swap_info_get(swp_entry_t entry)
+static struct swap_info_struct *swap_info_get(swp_entry_t entry)
 {
-        struct swap_info_struct * p;
+        struct swap_info_struct *p;
         unsigned long offset, type;
 
         if (!entry.val)
@@ -528,7 +510,7 @@ static struct swap_info_struct * swap_info_get(swp_entry_t entry)
         type = swp_type(entry);
         if (type >= nr_swapfiles)
                 goto bad_nofile;
-        p = & swap_info[type];
+        p = swap_info[type];
         if (!(p->flags & SWP_USED))
                 goto bad_device;
         offset = swp_offset(entry);
@@ -554,41 +536,56 @@ out:
         return NULL;
 }
 
-static int swap_entry_free(struct swap_info_struct *p,
-                           swp_entry_t ent, int cache)
+static unsigned char swap_entry_free(struct swap_info_struct *p,
+                                     swp_entry_t entry, unsigned char usage)
 {
-        unsigned long offset = swp_offset(ent);
-        int count = swap_count(p->swap_map[offset]);
-        bool has_cache;
+        unsigned long offset = swp_offset(entry);
+        unsigned char count;
+        unsigned char has_cache;
 
-        has_cache = swap_has_cache(p->swap_map[offset]);
+        count = p->swap_map[offset];
+        has_cache = count & SWAP_HAS_CACHE;
+        count &= ~SWAP_HAS_CACHE;
 
-        if (cache == SWAP_MAP) { /* dropping usage count of swap */
-                if (count < SWAP_MAP_MAX) {
-                        count--;
-                        p->swap_map[offset] = encode_swapmap(count, has_cache);
-                }
-        } else { /* dropping swap cache flag */
+        if (usage == SWAP_HAS_CACHE) {
                 VM_BUG_ON(!has_cache);
-                p->swap_map[offset] = encode_swapmap(count, false);
-
+                has_cache = 0;
+        } else if (count == SWAP_MAP_SHMEM) {
+                /*
+                 * Or we could insist on shmem.c using a special
+                 * swap_shmem_free() and free_shmem_swap_and_cache()...
+                 */
+                count = 0;
+        } else if ((count & ~COUNT_CONTINUED) <= SWAP_MAP_MAX) {
+                if (count == COUNT_CONTINUED) {
+                        if (swap_count_continued(p, offset, count))
+                                count = SWAP_MAP_MAX | COUNT_CONTINUED;
+                        else
+                                count = SWAP_MAP_MAX;
+                } else
+                        count--;
         }
-        /* return code. */
-        count = p->swap_map[offset];
+
+        if (!count)
+                mem_cgroup_uncharge_swap(entry);
+
+        usage = count | has_cache;
+        p->swap_map[offset] = usage;
+
         /* free if no reference */
-        if (!count) {
+        if (!usage) {
                 if (offset < p->lowest_bit)
                         p->lowest_bit = offset;
                 if (offset > p->highest_bit)
                         p->highest_bit = offset;
-                if (p->prio > swap_info[swap_list.next].prio)
-                        swap_list.next = p - swap_info;
+                if (swap_list.next >= 0 &&
+                    p->prio > swap_info[swap_list.next]->prio)
+                        swap_list.next = p->type;
                 nr_swap_pages++;
                 p->inuse_pages--;
         }
-        if (!swap_count(count))
-                mem_cgroup_uncharge_swap(ent);
-        return count;
+
+        return usage;
 }
 
 /*
@@ -597,11 +594,11 @@ static int swap_entry_free(struct swap_info_struct *p,
  */
 void swap_free(swp_entry_t entry)
 {
-        struct swap_info_struct * p;
+        struct swap_info_struct *p;
 
         p = swap_info_get(entry);
         if (p) {
-                swap_entry_free(p, entry, SWAP_MAP);
+                swap_entry_free(p, entry, 1);
                 spin_unlock(&swap_lock);
         }
 }
@@ -612,26 +609,21 @@ void swap_free(swp_entry_t entry)
 void swapcache_free(swp_entry_t entry, struct page *page)
 {
         struct swap_info_struct *p;
-        int ret;
+        unsigned char count;
 
         p = swap_info_get(entry);
         if (p) {
-                ret = swap_entry_free(p, entry, SWAP_CACHE);
-                if (page) {
-                        bool swapout;
-                        if (ret)
-                                swapout = true; /* the end of swap out */
-                        else
-                                swapout = false; /* no more swap users! */
-                        mem_cgroup_uncharge_swapcache(page, entry, swapout);
-                }
+                count = swap_entry_free(p, entry, SWAP_HAS_CACHE);
+                if (page)
+                        mem_cgroup_uncharge_swapcache(page, entry, count != 0);
                 spin_unlock(&swap_lock);
         }
-        return;
 }
 
 /*
  * How many references to page are currently swapped out?
+ * This does not give an exact answer when swap count is continued,
+ * but does include the high COUNT_CONTINUED flag to allow for that.
  */
 static inline int page_swapcount(struct page *page)
 {
@@ -659,6 +651,8 @@ int reuse_swap_page(struct page *page)
         int count;
 
         VM_BUG_ON(!PageLocked(page));
+        if (unlikely(PageKsm(page)))
+                return 0;
         count = page_mapcount(page);
         if (count <= 1 && PageSwapCache(page)) {
                 count += page_swapcount(page);
@@ -667,7 +661,7 @@ int reuse_swap_page(struct page *page)
                         SetPageDirty(page);
                 }
         }
-        return count == 1;
+        return count <= 1;
 }
 
 /*
@@ -704,7 +698,7 @@ int free_swap_and_cache(swp_entry_t entry)
 
         p = swap_info_get(entry);
         if (p) {
-                if (swap_entry_free(p, entry, SWAP_MAP) == SWAP_HAS_CACHE) {
+                if (swap_entry_free(p, entry, 1) == SWAP_HAS_CACHE) {
                         page = find_get_page(&swapper_space, entry.val);
                         if (page && !trylock_page(page)) {
                                 page_cache_release(page);
@@ -741,14 +735,14 @@ int free_swap_and_cache(swp_entry_t entry)
 int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)
 {
         struct block_device *bdev = NULL;
-        int i;
+        int type;
 
         if (device)
                 bdev = bdget(device);
 
         spin_lock(&swap_lock);
-        for (i = 0; i < nr_swapfiles; i++) {
-                struct swap_info_struct *sis = swap_info + i;
+        for (type = 0; type < nr_swapfiles; type++) {
+                struct swap_info_struct *sis = swap_info[type];
 
                 if (!(sis->flags & SWP_WRITEOK))
                         continue;
@@ -758,20 +752,18 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)
                                 *bdev_p = bdgrab(sis->bdev);
 
                         spin_unlock(&swap_lock);
-                        return i;
+                        return type;
                 }
                 if (bdev == sis->bdev) {
-                        struct swap_extent *se;
+                        struct swap_extent *se = &sis->first_swap_extent;
 
-                        se = list_entry(sis->extent_list.next,
-                                        struct swap_extent, list);
                         if (se->start_block == offset) {
                                 if (bdev_p)
                                         *bdev_p = bdgrab(sis->bdev);
 
                                 spin_unlock(&swap_lock);
                                 bdput(bdev);
-                                return i;
+                                return type;
                         }
                 }
         }
@@ -783,6 +775,21 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)
 }
 
 /*
+ * Get the (PAGE_SIZE) block corresponding to given offset on the swapdev
+ * corresponding to given index in swap_info (swap type).
+ */
+sector_t swapdev_block(int type, pgoff_t offset)
+{
+        struct block_device *bdev;
+
+        if ((unsigned int)type >= nr_swapfiles)
+                return 0;
+        if (!(swap_info[type]->flags & SWP_WRITEOK))
+                return 0;
+        return map_swap_entry(swp_entry(type, offset), &bdev);
+}
+
+/*
  * Return either the total number of swap pages of given type, or the number
  * of free pages of that type (depending on @free)
  *
@@ -792,18 +799,20 @@ unsigned int count_swap_pages(int type, int free)
 {
         unsigned int n = 0;
 
-        if (type < nr_swapfiles) {
-                spin_lock(&swap_lock);
-                if (swap_info[type].flags & SWP_WRITEOK) {
-                        n = swap_info[type].pages;
+        spin_lock(&swap_lock);
+        if ((unsigned int)type < nr_swapfiles) {
+                struct swap_info_struct *sis = swap_info[type];
+
+                if (sis->flags & SWP_WRITEOK) {
+                        n = sis->pages;
                         if (free)
-                                n -= swap_info[type].inuse_pages;
+                                n -= sis->inuse_pages;
                 }
-                spin_unlock(&swap_lock);
         }
+        spin_unlock(&swap_lock);
         return n;
 }
-#endif
+#endif /* CONFIG_HIBERNATION */
 
 /*
  * No need to decide whether this PTE shares the swap entry with others,
@@ -932,7 +941,7 @@ static int unuse_vma(struct vm_area_struct *vma,
         unsigned long addr, end, next;
         int ret;
 
-        if (page->mapping) {
+        if (page_anon_vma(page)) {
                 addr = page_address_in_vma(page, vma);
                 if (addr == -EFAULT)
                         return 0;
@@ -988,7 +997,7 @@ static unsigned int find_next_to_unuse(struct swap_info_struct *si,
 {
         unsigned int max = si->max;
         unsigned int i = prev;
-        int count;
+        unsigned char count;
 
         /*
          * No need for swap_lock here: we're just looking
@@ -1024,16 +1033,14 @@ static unsigned int find_next_to_unuse(struct swap_info_struct *si,
  */
 static int try_to_unuse(unsigned int type)
 {
-        struct swap_info_struct * si = &swap_info[type];
+        struct swap_info_struct *si = swap_info[type];
         struct mm_struct *start_mm;
-        unsigned short *swap_map;
-        unsigned short swcount;
+        unsigned char *swap_map;
+        unsigned char swcount;
         struct page *page;
         swp_entry_t entry;
         unsigned int i = 0;
         int retval = 0;
-        int reset_overflow = 0;
-        int shmem;
 
         /*
          * When searching mms for an entry, a good strategy is to
@@ -1047,8 +1054,7 @@ static int try_to_unuse(unsigned int type)
          * together, child after parent.  If we race with dup_mmap(), we
          * prefer to resolve parent before child, lest we miss entries
          * duplicated after we scanned child: using last mm would invert
-         * that.  Though it's only a serious concern when an overflowed
-         * swap count is reset from SWAP_MAP_MAX, preventing a rescan.
+         * that.
          */
         start_mm = &init_mm;
         atomic_inc(&init_mm.mm_users);
@@ -1110,17 +1116,18 @@ static int try_to_unuse(unsigned int type)
 
                 /*
                  * Remove all references to entry.
-                 * Whenever we reach init_mm, there's no address space
-                 * to search, but use it as a reminder to search shmem.
                  */
-                shmem = 0;
                 swcount = *swap_map;
-                if (swap_count(swcount)) {
-                        if (start_mm == &init_mm)
-                                shmem = shmem_unuse(entry, page);
-                        else
-                                retval = unuse_mm(start_mm, entry, page);
+                if (swap_count(swcount) == SWAP_MAP_SHMEM) {
+                        retval = shmem_unuse(entry, page);
+                        /* page has already been unlocked and released */
+                        if (retval < 0)
+                                break;
+                        continue;
                 }
+                if (swap_count(swcount) && start_mm != &init_mm)
+                        retval = unuse_mm(start_mm, entry, page);
+
                 if (swap_count(*swap_map)) {
                         int set_start_mm = (*swap_map >= swcount);
                         struct list_head *p = &start_mm->mmlist;
@@ -1131,7 +1138,7 @@ static int try_to_unuse(unsigned int type)
                         atomic_inc(&new_start_mm->mm_users);
                         atomic_inc(&prev_mm->mm_users);
                         spin_lock(&mmlist_lock);
-                        while (swap_count(*swap_map) && !retval && !shmem &&
+                        while (swap_count(*swap_map) && !retval &&
                                         (p = p->next) != &start_mm->mmlist) {
                                 mm = list_entry(p, struct mm_struct, mmlist);
                                 if (!atomic_inc_not_zero(&mm->mm_users))
@@ -1145,10 +1152,9 @@ static int try_to_unuse(unsigned int type)
                                 swcount = *swap_map;
                                 if (!swap_count(swcount)) /* any usage ? */
                                         ;
-                                else if (mm == &init_mm) {
+                                else if (mm == &init_mm)
                                         set_start_mm = 1;
-                                        shmem = shmem_unuse(entry, page);
-                                } else
+                                else
                                         retval = unuse_mm(mm, entry, page);
 
                                 if (set_start_mm && *swap_map < swcount) {
@@ -1164,13 +1170,6 @@ static int try_to_unuse(unsigned int type)
                         mmput(start_mm);
                         start_mm = new_start_mm;
                 }
-                if (shmem) {
-                        /* page has already been unlocked and released */
-                        if (shmem > 0)
-                                continue;
-                        retval = shmem;
-                        break;
-                }
                 if (retval) {
                         unlock_page(page);
                         page_cache_release(page);
@@ -1178,30 +1177,6 @@ static int try_to_unuse(unsigned int type)
                 }
 
                 /*
-                 * How could swap count reach 0x7ffe ?
-                 * There's no way to repeat a swap page within an mm
-                 * (except in shmem, where it's the shared object which takes
-                 * the reference count)?
-                 * We believe SWAP_MAP_MAX cannot occur.(if occur, unsigned
-                 * short is too small....)
-                 * If that's wrong, then we should worry more about
-                 * exit_mmap() and do_munmap() cases described above:
-                 * we might be resetting SWAP_MAP_MAX too early here.
-                 * We know "Undead"s can happen, they're okay, so don't
-                 * report them; but do report if we reset SWAP_MAP_MAX.
-                 */
-                /* We might release the lock_page() in unuse_mm(). */
-                if (!PageSwapCache(page) || page_private(page) != entry.val)
-                        goto retry;
-
-                if (swap_count(*swap_map) == SWAP_MAP_MAX) {
-                        spin_lock(&swap_lock);
-                        *swap_map = encode_swapmap(0, true);
-                        spin_unlock(&swap_lock);
-                        reset_overflow = 1;
-                }
-
-                /*
                  * If a reference remains (rare), we would like to leave
                  * the page in the swap cache; but try_to_unmap could
                  * then re-duplicate the entry once we drop page lock,
@@ -1213,6 +1188,12 @@ static int try_to_unuse(unsigned int type)
                  * read from disk into another page.  Splitting into two
                  * pages would be incorrect if swap supported "shared
                  * private" pages, but they are handled by tmpfs files.
+                 *
+                 * Given how unuse_vma() targets one particular offset
+                 * in an anon_vma, once the anon_vma has been determined,
+                 * this splitting happens to be just what is needed to
+                 * handle where KSM pages have been swapped out: re-reading
+                 * is unnecessarily slow, but we can fix that later on.
                  */
                 if (swap_count(*swap_map) &&
                      PageDirty(page) && PageSwapCache(page)) {
@@ -1242,7 +1223,6 @@ static int try_to_unuse(unsigned int type)
                  * mark page dirty so shrink_page_list will preserve it.
                  */
                 SetPageDirty(page);
-retry:
                 unlock_page(page);
                 page_cache_release(page);
 
@@ -1254,10 +1234,6 @@ retry:
         }
 
         mmput(start_mm);
-        if (reset_overflow) {
-                printk(KERN_WARNING "swapoff: cleared swap entry overflow\n");
-                swap_overflow = 0;
-        }
         return retval;
 }
 
@@ -1270,10 +1246,10 @@ retry:
 static void drain_mmlist(void)
 {
         struct list_head *p, *next;
-        unsigned int i;
+        unsigned int type;
 
-        for (i = 0; i < nr_swapfiles; i++)
-                if (swap_info[i].inuse_pages)
+        for (type = 0; type < nr_swapfiles; type++)
+                if (swap_info[type]->inuse_pages)
                         return;
         spin_lock(&mmlist_lock);
         list_for_each_safe(p, next, &init_mm.mmlist)
@@ -1283,12 +1259,23 @@ static void drain_mmlist(void)
 
 /*
  * Use this swapdev's extent info to locate the (PAGE_SIZE) block which
- * corresponds to page offset `offset'.
+ * corresponds to page offset for the specified swap entry.
+ * Note that the type of this function is sector_t, but it returns page offset
+ * into the bdev, not sector offset.
  */
-sector_t map_swap_page(struct swap_info_struct *sis, pgoff_t offset)
+static sector_t map_swap_entry(swp_entry_t entry, struct block_device **bdev)
 {
-        struct swap_extent *se = sis->curr_swap_extent;
-        struct swap_extent *start_se = se;
+        struct swap_info_struct *sis;
+        struct swap_extent *start_se;
+        struct swap_extent *se;
+        pgoff_t offset;
+
+        sis = swap_info[swp_type(entry)];
+        *bdev = sis->bdev;
+
+        offset = swp_offset(entry);
+        start_se = sis->curr_swap_extent;
+        se = start_se;
 
         for ( ; ; ) {
                 struct list_head *lh;
@@ -1298,40 +1285,31 @@ sector_t map_swap_page(struct swap_info_struct *sis, pgoff_t offset)
                         return se->start_block + (offset - se->start_page);
                 }
                 lh = se->list.next;
-                if (lh == &sis->extent_list)
-                        lh = lh->next;
                 se = list_entry(lh, struct swap_extent, list);
                 sis->curr_swap_extent = se;
                 BUG_ON(se == start_se);         /* It *must* be present */
         }
 }
 
-#ifdef CONFIG_HIBERNATION
 /*
- * Get the (PAGE_SIZE) block corresponding to given offset on the swapdev
- * corresponding to given index in swap_info (swap type).
+ * Returns the page offset into bdev for the specified page's swap entry.
  */
-sector_t swapdev_block(int swap_type, pgoff_t offset)
+sector_t map_swap_page(struct page *page, struct block_device **bdev)
 {
-        struct swap_info_struct *sis;
-
-        if (swap_type >= nr_swapfiles)
-                return 0;
-
-        sis = swap_info + swap_type;
-        return (sis->flags & SWP_WRITEOK) ? map_swap_page(sis, offset) : 0;
+        swp_entry_t entry;
+        entry.val = page_private(page);
+        return map_swap_entry(entry, bdev);
 }
-#endif /* CONFIG_HIBERNATION */
 
 /*
  * Free all of a swapdev's extent information
  */
 static void destroy_swap_extents(struct swap_info_struct *sis)
 {
-        while (!list_empty(&sis->extent_list)) {
+        while (!list_empty(&sis->first_swap_extent.list)) {
                 struct swap_extent *se;
 
-                se = list_entry(sis->extent_list.next,
+                se = list_entry(sis->first_swap_extent.list.next,
                                 struct swap_extent, list);
                 list_del(&se->list);
                 kfree(se);
@@ -1352,8 +1330,15 @@ add_swap_extent(struct swap_info_struct *sis, unsigned long start_page,
         struct swap_extent *new_se;
         struct list_head *lh;
 
-        lh = sis->extent_list.prev;     /* The highest page extent */
-        if (lh != &sis->extent_list) {
+        if (start_page == 0) {
+                se = &sis->first_swap_extent;
+                sis->curr_swap_extent = se;
+                se->start_page = 0;
+                se->nr_pages = nr_pages;
+                se->start_block = start_block;
+                return 1;
+        } else {
+                lh = sis->first_swap_extent.list.prev;  /* Highest extent */
                 se = list_entry(lh, struct swap_extent, list);
                 BUG_ON(se->start_page + se->nr_pages != start_page);
                 if (se->start_block + se->nr_pages == start_block) {
@@ -1373,7 +1358,7 @@ add_swap_extent(struct swap_info_struct *sis, unsigned long start_page,
         new_se->nr_pages = nr_pages;
         new_se->start_block = start_block;
 
-        list_add_tail(&new_se->list, &sis->extent_list);
+        list_add_tail(&new_se->list, &sis->first_swap_extent.list);
         return 1;
 }
 
@@ -1425,7 +1410,7 @@ static int setup_swap_extents(struct swap_info_struct *sis, sector_t *span)
         if (S_ISBLK(inode->i_mode)) {
                 ret = add_swap_extent(sis, 0, sis->max, 0);
                 *span = sis->pages;
-                goto done;
+                goto out;
         }
 
         blkbits = inode->i_blkbits;
@@ -1496,25 +1481,22 @@ reprobe:
         sis->max = page_no;
         sis->pages = page_no - 1;
         sis->highest_bit = page_no - 1;
-done:
-        sis->curr_swap_extent = list_entry(sis->extent_list.prev,
-                                        struct swap_extent, list);
-        goto out;
+out:
+        return ret;
 bad_bmap:
         printk(KERN_ERR "swapon: swapfile has holes\n");
         ret = -EINVAL;
-out:
-        return ret;
+        goto out;
 }
 
 SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
 {
-        struct swap_info_struct * p = NULL;
-        unsigned short *swap_map;
+        struct swap_info_struct *p = NULL;
+        unsigned char *swap_map;
         struct file *swap_file, *victim;
         struct address_space *mapping;
         struct inode *inode;
-        char * pathname;
+        char *pathname;
         int i, type, prev;
         int err;
 
@@ -1535,8 +1517,8 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
         mapping = victim->f_mapping;
         prev = -1;
         spin_lock(&swap_lock);
-        for (type = swap_list.head; type >= 0; type = swap_info[type].next) {
-                p = swap_info + type;
+        for (type = swap_list.head; type >= 0; type = swap_info[type]->next) {
+                p = swap_info[type];
                 if (p->flags & SWP_WRITEOK) {
                         if (p->swap_file->f_mapping == mapping)
                                 break;
@@ -1555,18 +1537,17 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
                 spin_unlock(&swap_lock);
                 goto out_dput;
         }
-        if (prev < 0) {
+        if (prev < 0)
                 swap_list.head = p->next;
-        } else {
-                swap_info[prev].next = p->next;
-        }
+        else
+                swap_info[prev]->next = p->next;
         if (type == swap_list.next) {
                 /* just pick something that's safe... */
                 swap_list.next = swap_list.head;
         }
         if (p->prio < 0) {
-                for (i = p->next; i >= 0; i = swap_info[i].next)
-                        swap_info[i].prio = p->prio--;
+                for (i = p->next; i >= 0; i = swap_info[i]->next)
+                        swap_info[i]->prio = p->prio--;
                 least_priority++;
         }
         nr_swap_pages -= p->pages;
@@ -1584,16 +1565,16 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
                 if (p->prio < 0)
                         p->prio = --least_priority;
                 prev = -1;
-                for (i = swap_list.head; i >= 0; i = swap_info[i].next) {
-                        if (p->prio >= swap_info[i].prio)
+                for (i = swap_list.head; i >= 0; i = swap_info[i]->next) {
+                        if (p->prio >= swap_info[i]->prio)
                                 break;
                         prev = i;
                 }
                 p->next = i;
                 if (prev < 0)
-                        swap_list.head = swap_list.next = p - swap_info;
+                        swap_list.head = swap_list.next = type;
                 else
-                        swap_info[prev].next = p - swap_info;
+                        swap_info[prev]->next = type;
                 nr_swap_pages += p->pages;
                 total_swap_pages += p->pages;
                 p->flags |= SWP_WRITEOK;
@@ -1606,6 +1587,9 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
         up_write(&swap_unplug_sem);
 
         destroy_swap_extents(p);
+        if (p->flags & SWP_CONTINUED)
+                free_swap_count_continuations(p);
+
         mutex_lock(&swapon_mutex);
         spin_lock(&swap_lock);
         drain_mmlist();
@@ -1653,8 +1637,8 @@ out:
 /* iterator */
 static void *swap_start(struct seq_file *swap, loff_t *pos)
 {
-        struct swap_info_struct *ptr = swap_info;
-        int i;
+        struct swap_info_struct *si;
+        int type;
         loff_t l = *pos;
 
         mutex_lock(&swapon_mutex);
@@ -1662,11 +1646,13 @@ static void *swap_start(struct seq_file *swap, loff_t *pos)
         if (!l)
                 return SEQ_START_TOKEN;
 
-        for (i = 0; i < nr_swapfiles; i++, ptr++) {
-                if (!(ptr->flags & SWP_USED) || !ptr->swap_map)
+        for (type = 0; type < nr_swapfiles; type++) {
+                smp_rmb();      /* read nr_swapfiles before swap_info[type] */
+                si = swap_info[type];
+                if (!(si->flags & SWP_USED) || !si->swap_map)
                         continue;
                 if (!--l)
-                        return ptr;
+                        return si;
         }
 
         return NULL;
@@ -1674,21 +1660,21 @@ static void *swap_start(struct seq_file *swap, loff_t *pos)
 
 static void *swap_next(struct seq_file *swap, void *v, loff_t *pos)
 {
-        struct swap_info_struct *ptr;
-        struct swap_info_struct *endptr = swap_info + nr_swapfiles;
+        struct swap_info_struct *si = v;
+        int type;
 
         if (v == SEQ_START_TOKEN)
-                ptr = swap_info;
-        else {
-                ptr = v;
-                ptr++;
-        }
+                type = 0;
+        else
+                type = si->type + 1;
 
-        for (; ptr < endptr; ptr++) {
-                if (!(ptr->flags & SWP_USED) || !ptr->swap_map)
+        for (; type < nr_swapfiles; type++) {
+                smp_rmb();      /* read nr_swapfiles before swap_info[type] */
+                si = swap_info[type];
+                if (!(si->flags & SWP_USED) || !si->swap_map)
                         continue;
                 ++*pos;
-                return ptr;
+                return si;
         }
 
         return NULL;
@@ -1701,24 +1687,24 @@ static void swap_stop(struct seq_file *swap, void *v)
 
 static int swap_show(struct seq_file *swap, void *v)
 {
-        struct swap_info_struct *ptr = v;
+        struct swap_info_struct *si = v;
         struct file *file;
         int len;
 
-        if (ptr == SEQ_START_TOKEN) {
+        if (si == SEQ_START_TOKEN) {
                 seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
                 return 0;
         }
 
-        file = ptr->swap_file;
+        file = si->swap_file;
         len = seq_path(swap, &file->f_path, " \t\n\\");
         seq_printf(swap, "%*s%s\t%u\t%u\t%d\n",
                         len < 40 ? 40 - len : 1, " ",
                         S_ISBLK(file->f_path.dentry->d_inode->i_mode) ?
                                 "partition" : "file\t",
-                        ptr->pages << (PAGE_SHIFT - 10),
-                        ptr->inuse_pages << (PAGE_SHIFT - 10),
-                        ptr->prio);
+                        si->pages << (PAGE_SHIFT - 10),
+                        si->inuse_pages << (PAGE_SHIFT - 10),
+                        si->prio);
         return 0;
 }
 
@@ -1765,7 +1751,7 @@ late_initcall(max_swapfiles_check);
  */
 SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
 {
-        struct swap_info_struct * p;
+        struct swap_info_struct *p;
         char *name = NULL;
         struct block_device *bdev = NULL;
         struct file *swap_file = NULL;
@@ -1779,30 +1765,52 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
         sector_t span;
         unsigned long maxpages = 1;
         unsigned long swapfilepages;
-        unsigned short *swap_map = NULL;
+        unsigned char *swap_map = NULL;
         struct page *page = NULL;
         struct inode *inode = NULL;
         int did_down = 0;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
+
+        p = kzalloc(sizeof(*p), GFP_KERNEL);
+        if (!p)
+                return -ENOMEM;
+
         spin_lock(&swap_lock);
-        p = swap_info;
-        for (type = 0 ; type < nr_swapfiles ; type++,p++)
-                if (!(p->flags & SWP_USED))
+        for (type = 0; type < nr_swapfiles; type++) {
+                if (!(swap_info[type]->flags & SWP_USED))
                         break;
+        }
         error = -EPERM;
         if (type >= MAX_SWAPFILES) {
                 spin_unlock(&swap_lock);
+                kfree(p);
                 goto out;
         }
-        if (type >= nr_swapfiles)
-                nr_swapfiles = type+1;
-        memset(p, 0, sizeof(*p));
-        INIT_LIST_HEAD(&p->extent_list);
+        if (type >= nr_swapfiles) {
+                p->type = type;
+                swap_info[type] = p;
+                /*
+                 * Write swap_info[type] before nr_swapfiles, in case a
+                 * racing procfs swap_start() or swap_next() is reading them.
+                 * (We never shrink nr_swapfiles, we never free this entry.)
+                 */
+                smp_wmb();
+                nr_swapfiles++;
+        } else {
+                kfree(p);
+                p = swap_info[type];
+                /*
+                 * Do not memset this entry: a racing procfs swap_next()
+                 * would be relying on p->type to remain valid.
+                 */
+        }
+        INIT_LIST_HEAD(&p->first_swap_extent.list);
         p->flags = SWP_USED;
         p->next = -1;
         spin_unlock(&swap_lock);
+
         name = getname(specialfile);
         error = PTR_ERR(name);
         if (IS_ERR(name)) {
@@ -1822,7 +1830,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
 
         error = -EBUSY;
         for (i = 0; i < nr_swapfiles; i++) {
-                struct swap_info_struct *q = &swap_info[i];
+                struct swap_info_struct *q = swap_info[i];
 
                 if (i == type || !q->swap_file)
                         continue;
@@ -1897,6 +1905,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
 
         p->lowest_bit  = 1;
         p->cluster_next = 1;
+        p->cluster_nr = 0;
 
         /*
          * Find out how many pages are allowed for a single swap
@@ -1932,13 +1941,13 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
                 goto bad_swap;
 
         /* OK, set up the swap map and apply the bad block list */
-        swap_map = vmalloc(maxpages * sizeof(short));
+        swap_map = vmalloc(maxpages);
         if (!swap_map) {
                 error = -ENOMEM;
                 goto bad_swap;
         }
 
-        memset(swap_map, 0, maxpages * sizeof(short));
+        memset(swap_map, 0, maxpages);
         for (i = 0; i < swap_header->info.nr_badpages; i++) {
                 int page_nr = swap_header->info.badpages[i];
                 if (page_nr <= 0 || page_nr >= swap_header->info.last_page) {
@@ -2003,18 +2012,16 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
 
         /* insert swap space into swap_list: */
         prev = -1;
-        for (i = swap_list.head; i >= 0; i = swap_info[i].next) {
-                if (p->prio >= swap_info[i].prio) {
+        for (i = swap_list.head; i >= 0; i = swap_info[i]->next) {
+                if (p->prio >= swap_info[i]->prio)
                         break;
-                }
                 prev = i;
         }
         p->next = i;
-        if (prev < 0) {
-                swap_list.head = swap_list.next = p - swap_info;
-        } else {
-                swap_info[prev].next = p - swap_info;
-        }
+        if (prev < 0)
+                swap_list.head = swap_list.next = type;
+        else
+                swap_info[prev]->next = type;
         spin_unlock(&swap_lock);
         mutex_unlock(&swapon_mutex);
         error = 0;
@@ -2051,15 +2058,15 @@ out:
 
 void si_swapinfo(struct sysinfo *val)
 {
-        unsigned int i;
+        unsigned int type;
         unsigned long nr_to_be_unused = 0;
 
         spin_lock(&swap_lock);
-        for (i = 0; i < nr_swapfiles; i++) {
-                if (!(swap_info[i].flags & SWP_USED) ||
-                     (swap_info[i].flags & SWP_WRITEOK))
-                        continue;
-                nr_to_be_unused += swap_info[i].inuse_pages;
+        for (type = 0; type < nr_swapfiles; type++) {
+                struct swap_info_struct *si = swap_info[type];
+
+                if ((si->flags & SWP_USED) && !(si->flags & SWP_WRITEOK))
+                        nr_to_be_unused += si->inuse_pages;
         }
         val->freeswap = nr_swap_pages + nr_to_be_unused;
         val->totalswap = total_swap_pages + nr_to_be_unused;
@@ -2069,101 +2076,107 @@ void si_swapinfo(struct sysinfo *val)
 /*
  * Verify that a swap entry is valid and increment its swap map count.
  *
- * Note: if swap_map[] reaches SWAP_MAP_MAX the entries are treated as
- * "permanent", but will be reclaimed by the next swapoff.
  * Returns error code in following case.
  * - success -> 0
  * - swp_entry is invalid -> EINVAL
  * - swp_entry is migration entry -> EINVAL
  * - swap-cache reference is requested but there is already one. -> EEXIST
  * - swap-cache reference is requested but the entry is not used. -> ENOENT
+ * - swap-mapped reference requested but needs continued swap count. -> ENOMEM
  */
-static int __swap_duplicate(swp_entry_t entry, bool cache)
+static int __swap_duplicate(swp_entry_t entry, unsigned char usage)
 {
-        struct swap_info_struct * p;
+        struct swap_info_struct *p;
         unsigned long offset, type;
-        int result = -EINVAL;
-        int count;
-        bool has_cache;
+        unsigned char count;
+        unsigned char has_cache;
+        int err = -EINVAL;
 
         if (non_swap_entry(entry))
-                return -EINVAL;
+                goto out;
 
         type = swp_type(entry);
         if (type >= nr_swapfiles)
                 goto bad_file;
-        p = type + swap_info;
+        p = swap_info[type];
         offset = swp_offset(entry);
 
         spin_lock(&swap_lock);
-
         if (unlikely(offset >= p->max))
                 goto unlock_out;
 
-        count = swap_count(p->swap_map[offset]);
-        has_cache = swap_has_cache(p->swap_map[offset]);
+        count = p->swap_map[offset];
+        has_cache = count & SWAP_HAS_CACHE;
+        count &= ~SWAP_HAS_CACHE;
+        err = 0;
 
-        if (cache == SWAP_CACHE) { /* called for swapcache/swapin-readahead */
+        if (usage == SWAP_HAS_CACHE) {
 
                 /* set SWAP_HAS_CACHE if there is no cache and entry is used */
-                if (!has_cache && count) {
-                        p->swap_map[offset] = encode_swapmap(count, true);
-                        result = 0;
-                } else if (has_cache) /* someone added cache */
-                        result = -EEXIST;
-                else if (!count) /* no users */
-                        result = -ENOENT;
+                if (!has_cache && count)
+                        has_cache = SWAP_HAS_CACHE;
+                else if (has_cache)             /* someone else added cache */
+                        err = -EEXIST;
+                else                            /* no users remaining */
+                        err = -ENOENT;
 
         } else if (count || has_cache) {
-                if (count < SWAP_MAP_MAX - 1) {
-                        p->swap_map[offset] = encode_swapmap(count + 1,
-                                                             has_cache);
-                        result = 0;
-                } else if (count <= SWAP_MAP_MAX) {
-                        if (swap_overflow++ < 5)
-                                printk(KERN_WARNING
-                                       "swap_dup: swap entry overflow\n");
-                        p->swap_map[offset] = encode_swapmap(SWAP_MAP_MAX,
-                                                              has_cache);
-                        result = 0;
-                }
+
+                if ((count & ~COUNT_CONTINUED) < SWAP_MAP_MAX)
+                        count += usage;
+                else if ((count & ~COUNT_CONTINUED) > SWAP_MAP_MAX)
+                        err = -EINVAL;
+                else if (swap_count_continued(p, offset, count))
+                        count = COUNT_CONTINUED;
+                else
+                        err = -ENOMEM;
         } else
-                result = -ENOENT; /* unused swap entry */
+                err = -ENOENT;                  /* unused swap entry */
+
+        p->swap_map[offset] = count | has_cache;
+
 unlock_out:
         spin_unlock(&swap_lock);
 out:
-        return result;
+        return err;
 
 bad_file:
         printk(KERN_ERR "swap_dup: %s%08lx\n", Bad_file, entry.val);
         goto out;
 }
+
+/*
+ * Help swapoff by noting that swap entry belongs to shmem/tmpfs
+ * (in which case its reference count is never incremented).
+ */
+void swap_shmem_alloc(swp_entry_t entry)
+{
+        __swap_duplicate(entry, SWAP_MAP_SHMEM);
+}
+
 /*
  * increase reference count of swap entry by 1.
  */
-void swap_duplicate(swp_entry_t entry)
+int swap_duplicate(swp_entry_t entry)
 {
-        __swap_duplicate(entry, SWAP_MAP);
+        int err = 0;
+
+        while (!err && __swap_duplicate(entry, 1) == -ENOMEM)
+                err = add_swap_count_continuation(entry, GFP_ATOMIC);
+        return err;
 }
 
 /*
  * @entry: swap entry for which we allocate swap cache.
  *
- * Called when allocating swap cache for exising swap entry,
+ * Called when allocating swap cache for existing swap entry,
  * This can return error codes. Returns 0 at success.
  * -EBUSY means there is a swap cache.
  * Note: return code is different from swap_duplicate().
  */
 int swapcache_prepare(swp_entry_t entry)
 {
-        return __swap_duplicate(entry, SWAP_CACHE);
-}
-
-
-struct swap_info_struct *
-get_swap_info_struct(unsigned type)
-{
-        return &swap_info[type];
+        return __swap_duplicate(entry, SWAP_HAS_CACHE);
 }
 
 /*
@@ -2181,7 +2194,7 @@ int valid_swaphandles(swp_entry_t entry, unsigned long *offset)
         if (!our_page_cluster)  /* no readahead */
                 return 0;
 
-        si = &swap_info[swp_type(entry)];
+        si = swap_info[swp_type(entry)];
         target = swp_offset(entry);
         base = (target >> our_page_cluster) << our_page_cluster;
         end = base + (1 << our_page_cluster);
@@ -2217,3 +2230,219 @@ int valid_swaphandles(swp_entry_t entry, unsigned long *offset)
         *offset = ++toff;
         return nr_pages? ++nr_pages: 0;
 }
+
+/*
+ * add_swap_count_continuation - called when a swap count is duplicated
+ * beyond SWAP_MAP_MAX, it allocates a new page and links that to the entry's
+ * page of the original vmalloc'ed swap_map, to hold the continuation count
+ * (for that entry and for its neighbouring PAGE_SIZE swap entries).  Called
+ * again when count is duplicated beyond SWAP_MAP_MAX * SWAP_CONT_MAX, etc.
+ *
+ * These continuation pages are seldom referenced: the common paths all work
+ * on the original swap_map, only referring to a continuation page when the
+ * low "digit" of a count is incremented or decremented through SWAP_MAP_MAX.
+ *
+ * add_swap_count_continuation(, GFP_ATOMIC) can be called while holding
+ * page table locks; if it fails, add_swap_count_continuation(, GFP_KERNEL)
+ * can be called after dropping locks.
+ */
+int add_swap_count_continuation(swp_entry_t entry, gfp_t gfp_mask)
+{
+        struct swap_info_struct *si;
+        struct page *head;
+        struct page *page;
+        struct page *list_page;
+        pgoff_t offset;
+        unsigned char count;
+
+        /*
+         * When debugging, it's easier to use __GFP_ZERO here; but it's better
+         * for latency not to zero a page while GFP_ATOMIC and holding locks.
+         */
+        page = alloc_page(gfp_mask | __GFP_HIGHMEM);
+
+        si = swap_info_get(entry);
+        if (!si) {
+                /*
+                 * An acceptable race has occurred since the failing
+                 * __swap_duplicate(): the swap entry has been freed,
+                 * perhaps even the whole swap_map cleared for swapoff.
+                 */
+                goto outer;
+        }
+
+        offset = swp_offset(entry);
+        count = si->swap_map[offset] & ~SWAP_HAS_CACHE;
+
+        if ((count & ~COUNT_CONTINUED) != SWAP_MAP_MAX) {
+                /*
+                 * The higher the swap count, the more likely it is that tasks
+                 * will race to add swap count continuation: we need to avoid
+                 * over-provisioning.
+                 */
+                goto out;
+        }
+
+        if (!page) {
+                spin_unlock(&swap_lock);
+                return -ENOMEM;
+        }
+
+        /*
+         * We are fortunate that although vmalloc_to_page uses pte_offset_map,
+         * no architecture is using highmem pages for kernel pagetables: so it
+         * will not corrupt the GFP_ATOMIC caller's atomic pagetable kmaps.
+         */
+        head = vmalloc_to_page(si->swap_map + offset);
+        offset &= ~PAGE_MASK;
+
+        /*
+         * Page allocation does not initialize the page's lru field,
+         * but it does always reset its private field.
+         */
+        if (!page_private(head)) {
+                BUG_ON(count & COUNT_CONTINUED);
+                INIT_LIST_HEAD(&head->lru);
+                set_page_private(head, SWP_CONTINUED);
+                si->flags |= SWP_CONTINUED;
+        }
+
+        list_for_each_entry(list_page, &head->lru, lru) {
+                unsigned char *map;
+
+                /*
+                 * If the previous map said no continuation, but we've found
+                 * a continuation page, free our allocation and use this one.
+                 */
+                if (!(count & COUNT_CONTINUED))
+                        goto out;
+
+                map = kmap_atomic(list_page, KM_USER0) + offset;
+                count = *map;
+                kunmap_atomic(map, KM_USER0);
+
+                /*
+                 * If this continuation count now has some space in it,
+                 * free our allocation and use this one.
+                 */
+                if ((count & ~COUNT_CONTINUED) != SWAP_CONT_MAX)
+                        goto out;
+        }
+
+        list_add_tail(&page->lru, &head->lru);
+        page = NULL;                    /* now it's attached, don't free it */
+out:
+        spin_unlock(&swap_lock);
+outer:
+        if (page)
+                __free_page(page);
+        return 0;
+}
+
+/*
+ * swap_count_continued - when the original swap_map count is incremented
+ * from SWAP_MAP_MAX, check if there is already a continuation page to carry
+ * into, carry if so, or else fail until a new continuation page is allocated;
+ * when the original swap_map count is decremented from 0 with continuation,
+ * borrow from the continuation and report whether it still holds more.
+ * Called while __swap_duplicate() or swap_entry_free() holds swap_lock.
+ */
+static bool swap_count_continued(struct swap_info_struct *si,
+                                 pgoff_t offset, unsigned char count)
+{
+        struct page *head;
+        struct page *page;
+        unsigned char *map;
+
+        head = vmalloc_to_page(si->swap_map + offset);
+        if (page_private(head) != SWP_CONTINUED) {
+                BUG_ON(count & COUNT_CONTINUED);
+                return false;           /* need to add count continuation */
+        }
+
+        offset &= ~PAGE_MASK;
+        page = list_entry(head->lru.next, struct page, lru);
+        map = kmap_atomic(page, KM_USER0) + offset;
+
+        if (count == SWAP_MAP_MAX)      /* initial increment from swap_map */
+                goto init_map;          /* jump over SWAP_CONT_MAX checks */
+
+        if (count == (SWAP_MAP_MAX | COUNT_CONTINUED)) { /* incrementing */
+                /*
+                 * Think of how you add 1 to 999
+                 */
+                while (*map == (SWAP_CONT_MAX | COUNT_CONTINUED)) {
+                        kunmap_atomic(map, KM_USER0);
+                        page = list_entry(page->lru.next, struct page, lru);
+                        BUG_ON(page == head);
+                        map = kmap_atomic(page, KM_USER0) + offset;
+                }
+                if (*map == SWAP_CONT_MAX) {
+                        kunmap_atomic(map, KM_USER0);
+                        page = list_entry(page->lru.next, struct page, lru);
+                        if (page == head)
+                                return false;   /* add count continuation */
+                        map = kmap_atomic(page, KM_USER0) + offset;
+init_map:               *map = 0;               /* we didn't zero the page */
+                }
+                *map += 1;
+                kunmap_atomic(map, KM_USER0);
+                page = list_entry(page->lru.prev, struct page, lru);
+                while (page != head) {
+                        map = kmap_atomic(page, KM_USER0) + offset;
+                        *map = COUNT_CONTINUED;
+                        kunmap_atomic(map, KM_USER0);
+                        page = list_entry(page->lru.prev, struct page, lru);
+                }
+                return true;                    /* incremented */
+
+        } else {                                /* decrementing */
+                /*
+                 * Think of how you subtract 1 from 1000
+                 */
+                BUG_ON(count != COUNT_CONTINUED);
+                while (*map == COUNT_CONTINUED) {
+                        kunmap_atomic(map, KM_USER0);
+                        page = list_entry(page->lru.next, struct page, lru);
+                        BUG_ON(page == head);
+                        map = kmap_atomic(page, KM_USER0) + offset;
+                }
+                BUG_ON(*map == 0);
+                *map -= 1;
+                if (*map == 0)
+                        count = 0;
+                kunmap_atomic(map, KM_USER0);
+                page = list_entry(page->lru.prev, struct page, lru);
+                while (page != head) {
+                        map = kmap_atomic(page, KM_USER0) + offset;
+                        *map = SWAP_CONT_MAX | count;
+                        count = COUNT_CONTINUED;
+                        kunmap_atomic(map, KM_USER0);
+                        page = list_entry(page->lru.prev, struct page, lru);
+                }
+                return count == COUNT_CONTINUED;
+        }
+}
+
+/*
+ * free_swap_count_continuations - swapoff free all the continuation pages
+ * appended to the swap_map, after swap_map is quiesced, before vfree'ing it.
+ */
+static void free_swap_count_continuations(struct swap_info_struct *si)
+{
+        pgoff_t offset;
+
+        for (offset = 0; offset < si->max; offset += PAGE_SIZE) {
+                struct page *head;
+                head = vmalloc_to_page(si->swap_map + offset);
+                if (page_private(head)) {
+                        struct list_head *this, *next;
+                        list_for_each_safe(this, next, &head->lru) {
+                                struct page *page;
+                                page = list_entry(this, struct page, lru);
+                                list_del(this);
+                                __free_page(page);
+                        }
+                }
+        }
+}
diff --git a/mm/truncate.c b/mm/truncate.c
index 2c147a7e5f2c..342deee22684 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -272,6 +272,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
                         pagevec_release(&pvec);
                         break;
                 }
+                mem_cgroup_uncharge_start();
                 for (i = 0; i < pagevec_count(&pvec); i++) {
                         struct page *page = pvec.pages[i];
 
@@ -286,6 +287,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
                         unlock_page(page);
                 }
                 pagevec_release(&pvec);
+                mem_cgroup_uncharge_end();
         }
 }
 EXPORT_SYMBOL(truncate_inode_pages_range);
@@ -327,6 +329,7 @@ unsigned long invalidate_mapping_pages(struct address_space *mapping,
         pagevec_init(&pvec, 0);
         while (next <= end &&
                         pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
+                mem_cgroup_uncharge_start();
                 for (i = 0; i < pagevec_count(&pvec); i++) {
                         struct page *page = pvec.pages[i];
                         pgoff_t index;
@@ -354,6 +357,7 @@ unsigned long invalidate_mapping_pages(struct address_space *mapping,
                                 break;
                 }
                 pagevec_release(&pvec);
+                mem_cgroup_uncharge_end();
                 cond_resched();
         }
         return ret;
@@ -428,6 +432,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
         while (next <= end && !wrapped &&
                 pagevec_lookup(&pvec, mapping, next,
                         min(end - next, (pgoff_t)PAGEVEC_SIZE - 1) + 1)) {
+                mem_cgroup_uncharge_start();
                 for (i = 0; i < pagevec_count(&pvec); i++) {
                         struct page *page = pvec.pages[i];
                         pgoff_t page_index;
@@ -477,6 +482,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
                         unlock_page(page);
                 }
                 pagevec_release(&pvec);
+                mem_cgroup_uncharge_end();
                 cond_resched();
         }
         return ret;
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 9b08d790df6f..37e69295f250 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1411,6 +1411,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
 {
         struct page **pages;
         unsigned int nr_pages, array_size, i;
+        gfp_t nested_gfp = (gfp_mask & GFP_RECLAIM_MASK) | __GFP_ZERO;
 
         nr_pages = (area->size - PAGE_SIZE) >> PAGE_SHIFT;
         array_size = (nr_pages * sizeof(struct page *));
@@ -1418,13 +1419,11 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
         area->nr_pages = nr_pages;
         /* Please note that the recursion is strictly bounded. */
         if (array_size > PAGE_SIZE) {
-                pages = __vmalloc_node(array_size, 1, gfp_mask | __GFP_ZERO,
+                pages = __vmalloc_node(array_size, 1, nested_gfp|__GFP_HIGHMEM,
                                 PAGE_KERNEL, node, caller);
                 area->flags |= VM_VPAGES;
         } else {
-                pages = kmalloc_node(array_size,
-                                (gfp_mask & GFP_RECLAIM_MASK) | __GFP_ZERO,
-                                node);
+                pages = kmalloc_node(array_size, nested_gfp, node);
         }
         area->pages = pages;
         area->caller = caller;
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 777af57fd8c8..885207a6b6b7 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -55,6 +55,11 @@ struct scan_control {
         /* Number of pages freed so far during a call to shrink_zones() */
         unsigned long nr_reclaimed;
 
+        /* How many pages shrink_list() should reclaim */
+        unsigned long nr_to_reclaim;
+
+        unsigned long hibernation_mode;
+
         /* This context's GFP mask */
         gfp_t gfp_mask;
 
@@ -66,12 +71,6 @@ struct scan_control {
         /* Can pages be swapped as part of reclaim? */
         int may_swap;
 
-        /* This context's SWAP_CLUSTER_MAX. If freeing memory for
-         * suspend, we effectively ignore SWAP_CLUSTER_MAX.
-         * In this context, it doesn't matter that we scan the
-         * whole list at once. */
-        int swap_cluster_max;
-
         int swappiness;
 
         int all_unreclaimable;
@@ -358,7 +357,7 @@ static pageout_t pageout(struct page *page, struct address_space *mapping,
          * stalls if we need to run get_block().  We could test
          * PagePrivate for that.
          *
-         * If this process is currently in generic_file_write() against
+         * If this process is currently in __generic_file_aio_write() against
          * this page's queue, we can perform writeback even if that
          * will block.
          *
@@ -1132,7 +1131,7 @@ static unsigned long shrink_inactive_list(unsigned long max_scan,
                 unsigned long nr_anon;
                 unsigned long nr_file;
 
-                nr_taken = sc->isolate_pages(sc->swap_cluster_max,
+                nr_taken = sc->isolate_pages(SWAP_CLUSTER_MAX,
                              &page_list, &nr_scan, sc->order, mode,
                                 zone, sc->mem_cgroup, 0, file);
 
@@ -1166,10 +1165,8 @@ static unsigned long shrink_inactive_list(unsigned long max_scan,
                 __mod_zone_page_state(zone, NR_ISOLATED_ANON, nr_anon);
                 __mod_zone_page_state(zone, NR_ISOLATED_FILE, nr_file);
 
-                reclaim_stat->recent_scanned[0] += count[LRU_INACTIVE_ANON];
-                reclaim_stat->recent_scanned[0] += count[LRU_ACTIVE_ANON];
-                reclaim_stat->recent_scanned[1] += count[LRU_INACTIVE_FILE];
-                reclaim_stat->recent_scanned[1] += count[LRU_ACTIVE_FILE];
+                reclaim_stat->recent_scanned[0] += nr_anon;
+                reclaim_stat->recent_scanned[1] += nr_file;
 
                 spin_unlock_irq(&zone->lru_lock);
 
@@ -1464,20 +1461,26 @@ static int inactive_file_is_low(struct zone *zone, struct scan_control *sc)
         return low;
 }
 
+static int inactive_list_is_low(struct zone *zone, struct scan_control *sc,
+                                int file)
+{
+        if (file)
+                return inactive_file_is_low(zone, sc);
+        else
+                return inactive_anon_is_low(zone, sc);
+}
+
 static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan,
         struct zone *zone, struct scan_control *sc, int priority)
 {
         int file = is_file_lru(lru);
 
-        if (lru == LRU_ACTIVE_FILE && inactive_file_is_low(zone, sc)) {
-                shrink_active_list(nr_to_scan, zone, sc, priority, file);
+        if (is_active_lru(lru)) {
+                if (inactive_list_is_low(zone, sc, file))
+                    shrink_active_list(nr_to_scan, zone, sc, priority, file);
                 return 0;
         }
 
-        if (lru == LRU_ACTIVE_ANON && inactive_anon_is_low(zone, sc)) {
-                shrink_active_list(nr_to_scan, zone, sc, priority, file);
-                return 0;
-        }
         return shrink_inactive_list(nr_to_scan, zone, sc, priority, file);
 }
 
@@ -1567,15 +1570,14 @@ static void get_scan_ratio(struct zone *zone, struct scan_control *sc,
  * until we collected @swap_cluster_max pages to scan.
  */
 static unsigned long nr_scan_try_batch(unsigned long nr_to_scan,
-                                       unsigned long *nr_saved_scan,
-                                       unsigned long swap_cluster_max)
+                                       unsigned long *nr_saved_scan)
 {
         unsigned long nr;
 
         *nr_saved_scan += nr_to_scan;
         nr = *nr_saved_scan;
 
-        if (nr >= swap_cluster_max)
+        if (nr >= SWAP_CLUSTER_MAX)
                 *nr_saved_scan = 0;
         else
                 nr = 0;
@@ -1594,7 +1596,7 @@ static void shrink_zone(int priority, struct zone *zone,
         unsigned long percent[2];       /* anon @ 0; file @ 1 */
         enum lru_list l;
         unsigned long nr_reclaimed = sc->nr_reclaimed;
-        unsigned long swap_cluster_max = sc->swap_cluster_max;
+        unsigned long nr_to_reclaim = sc->nr_to_reclaim;
         struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc);
         int noswap = 0;
 
@@ -1616,15 +1618,15 @@ static void shrink_zone(int priority, struct zone *zone,
                         scan = (scan * percent[file]) / 100;
                 }
                 nr[l] = nr_scan_try_batch(scan,
-                                          &reclaim_stat->nr_saved_scan[l],
-                                          swap_cluster_max);
+                                          &reclaim_stat->nr_saved_scan[l]);
         }
 
         while (nr[LRU_INACTIVE_ANON] || nr[LRU_ACTIVE_FILE] ||
                                         nr[LRU_INACTIVE_FILE]) {
                 for_each_evictable_lru(l) {
                         if (nr[l]) {
-                                nr_to_scan = min(nr[l], swap_cluster_max);
+                                nr_to_scan = min_t(unsigned long,
+                                                   nr[l], SWAP_CLUSTER_MAX);
                                 nr[l] -= nr_to_scan;
 
                                 nr_reclaimed += shrink_list(l, nr_to_scan,
@@ -1639,8 +1641,7 @@ static void shrink_zone(int priority, struct zone *zone,
                  * with multiple processes reclaiming pages, the total
                  * freeing target can get unreasonably large.
                  */
-                if (nr_reclaimed > swap_cluster_max &&
-                        priority < DEF_PRIORITY && !current_is_kswapd())
+                if (nr_reclaimed >= nr_to_reclaim && priority < DEF_PRIORITY)
                         break;
         }
 
@@ -1738,6 +1739,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
         struct zoneref *z;
         struct zone *zone;
         enum zone_type high_zoneidx = gfp_zone(sc->gfp_mask);
+        unsigned long writeback_threshold;
 
         delayacct_freepages_start();
 
@@ -1773,7 +1775,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
                         }
                 }
                 total_scanned += sc->nr_scanned;
-                if (sc->nr_reclaimed >= sc->swap_cluster_max) {
+                if (sc->nr_reclaimed >= sc->nr_to_reclaim) {
                         ret = sc->nr_reclaimed;
                         goto out;
                 }
@@ -1785,14 +1787,15 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
                  * that's undesirable in laptop mode, where we *want* lumpy
                  * writeout.  So in laptop mode, write out the whole world.
                  */
-                if (total_scanned > sc->swap_cluster_max +
-                                        sc->swap_cluster_max / 2) {
+                writeback_threshold = sc->nr_to_reclaim + sc->nr_to_reclaim / 2;
+                if (total_scanned > writeback_threshold) {
                         wakeup_flusher_threads(laptop_mode ? 0 : total_scanned);
                         sc->may_writepage = 1;
                 }
 
                 /* Take a nap, wait for some writeback to complete */
-                if (sc->nr_scanned && priority < DEF_PRIORITY - 2)
+                if (!sc->hibernation_mode && sc->nr_scanned &&
+                    priority < DEF_PRIORITY - 2)
                         congestion_wait(BLK_RW_ASYNC, HZ/10);
         }
         /* top priority shrink_zones still had more to do? don't OOM, then */
@@ -1831,7 +1834,7 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
         struct scan_control sc = {
                 .gfp_mask = gfp_mask,
                 .may_writepage = !laptop_mode,
-                .swap_cluster_max = SWAP_CLUSTER_MAX,
+                .nr_to_reclaim = SWAP_CLUSTER_MAX,
                 .may_unmap = 1,
                 .may_swap = 1,
                 .swappiness = vm_swappiness,
@@ -1855,7 +1858,6 @@ unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem,
                 .may_writepage = !laptop_mode,
                 .may_unmap = 1,
                 .may_swap = !noswap,
-                .swap_cluster_max = SWAP_CLUSTER_MAX,
                 .swappiness = swappiness,
                 .order = 0,
                 .mem_cgroup = mem,
@@ -1889,7 +1891,7 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem_cont,
                 .may_writepage = !laptop_mode,
                 .may_unmap = 1,
                 .may_swap = !noswap,
-                .swap_cluster_max = SWAP_CLUSTER_MAX,
+                .nr_to_reclaim = SWAP_CLUSTER_MAX,
                 .swappiness = swappiness,
                 .order = 0,
                 .mem_cgroup = mem_cont,
@@ -1904,6 +1906,30 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem_cont,
 }
 #endif
 
+/* is kswapd sleeping prematurely? */
+static int sleeping_prematurely(pg_data_t *pgdat, int order, long remaining)
+{
+        int i;
+
+        /* If a direct reclaimer woke kswapd within HZ/10, it's premature */
+        if (remaining)
+                return 1;
+
+        /* If after HZ/10, a zone is below the high mark, it's premature */
+        for (i = 0; i < pgdat->nr_zones; i++) {
+                struct zone *zone = pgdat->node_zones + i;
+
+                if (!populated_zone(zone))
+                        continue;
+
+                if (!zone_watermark_ok(zone, order, high_wmark_pages(zone),
+                                                                0, 0))
+                        return 1;
+        }
+
+        return 0;
+}
+
 /*
  * For kswapd, balance_pgdat() will work across all this node's zones until
  * they are all at high_wmark_pages(zone).
@@ -1936,7 +1962,11 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order)
                 .gfp_mask = GFP_KERNEL,
                 .may_unmap = 1,
                 .may_swap = 1,
-                .swap_cluster_max = SWAP_CLUSTER_MAX,
+                /*
+                 * kswapd doesn't want to be bailed out while reclaim. because
+                 * we want to put equal scanning pressure on each zone.
+                 */
+                .nr_to_reclaim = ULONG_MAX,
                 .swappiness = vm_swappiness,
                 .order = order,
                 .mem_cgroup = NULL,
@@ -1961,6 +1991,7 @@ loop_again:
         for (priority = DEF_PRIORITY; priority >= 0; priority--) {
                 int end_zone = 0;       /* Inclusive.  0 = ZONE_DMA */
                 unsigned long lru_pages = 0;
+                int has_under_min_watermark_zone = 0;
 
                 /* The swap token gets in the way of swapout... */
                 if (!priority)
@@ -2067,6 +2098,15 @@ loop_again:
                         if (total_scanned > SWAP_CLUSTER_MAX * 2 &&
                             total_scanned > sc.nr_reclaimed + sc.nr_reclaimed / 2)
                                 sc.may_writepage = 1;
+
+                        /*
+                         * We are still under min water mark. it mean we have
+                         * GFP_ATOMIC allocation failure risk. Hurry up!
+                         */
+                        if (!zone_watermark_ok(zone, order, min_wmark_pages(zone),
+                                              end_zone, 0))
+                                has_under_min_watermark_zone = 1;
+
                 }
                 if (all_zones_ok)
                         break;          /* kswapd: all done */
@@ -2074,8 +2114,12 @@ loop_again:
                  * OK, kswapd is getting into trouble.  Take a nap, then take
                  * another pass across the zones.
                  */
-                if (total_scanned && priority < DEF_PRIORITY - 2)
-                        congestion_wait(BLK_RW_ASYNC, HZ/10);
+                if (total_scanned && (priority < DEF_PRIORITY - 2)) {
+                        if (has_under_min_watermark_zone)
+                                count_vm_event(KSWAPD_SKIP_CONGESTION_WAIT);
+                        else
+                                congestion_wait(BLK_RW_ASYNC, HZ/10);
+                }
 
                 /*
                  * We do this so kswapd doesn't build up large priorities for
@@ -2173,6 +2217,7 @@ static int kswapd(void *p)
         order = 0;
         for ( ; ; ) {
                 unsigned long new_order;
+                int ret;
 
                 prepare_to_wait(&pgdat->kswapd_wait, &wait, TASK_INTERRUPTIBLE);
                 new_order = pgdat->kswapd_max_order;
@@ -2184,19 +2229,45 @@ static int kswapd(void *p)
                          */
                         order = new_order;
                 } else {
-                        if (!freezing(current))
-                                schedule();
+                        if (!freezing(current) && !kthread_should_stop()) {
+                                long remaining = 0;
+
+                                /* Try to sleep for a short interval */
+                                if (!sleeping_prematurely(pgdat, order, remaining)) {
+                                        remaining = schedule_timeout(HZ/10);
+                                        finish_wait(&pgdat->kswapd_wait, &wait);
+                                        prepare_to_wait(&pgdat->kswapd_wait, &wait, TASK_INTERRUPTIBLE);
+                                }
+
+                                /*
+                                 * After a short sleep, check if it was a
+                                 * premature sleep. If not, then go fully
+                                 * to sleep until explicitly woken up
+                                 */
+                                if (!sleeping_prematurely(pgdat, order, remaining))
+                                        schedule();
+                                else {
+                                        if (remaining)
+                                                count_vm_event(KSWAPD_LOW_WMARK_HIT_QUICKLY);
+                                        else
+                                                count_vm_event(KSWAPD_HIGH_WMARK_HIT_QUICKLY);
+                                }
+                        }
 
                         order = pgdat->kswapd_max_order;
                 }
                 finish_wait(&pgdat->kswapd_wait, &wait);
 
-                if (!try_to_freeze()) {
-                        /* We can speed up thawing tasks if we don't call
-                         * balance_pgdat after returning from the refrigerator
-                         */
+                ret = try_to_freeze();
+                if (kthread_should_stop())
+                        break;
+
+                /*
+                 * We can speed up thawing tasks if we don't call balance_pgdat
+                 * after returning from the refrigerator
+                 */
+                if (!ret)
                         balance_pgdat(pgdat, order);
-                }
         }
         return 0;
 }
@@ -2260,148 +2331,43 @@ unsigned long zone_reclaimable_pages(struct zone *zone)
 
 #ifdef CONFIG_HIBERNATION
 /*
- * Helper function for shrink_all_memory().  Tries to reclaim 'nr_pages' pages
- * from LRU lists system-wide, for given pass and priority.
- *
- * For pass > 3 we also try to shrink the LRU lists that contain a few pages
- */
-static void shrink_all_zones(unsigned long nr_pages, int prio,
-                                      int pass, struct scan_control *sc)
-{
-        struct zone *zone;
-        unsigned long nr_reclaimed = 0;
-        struct zone_reclaim_stat *reclaim_stat;
-
-        for_each_populated_zone(zone) {
-                enum lru_list l;
-
-                if (zone_is_all_unreclaimable(zone) && prio != DEF_PRIORITY)
-                        continue;
-
-                for_each_evictable_lru(l) {
-                        enum zone_stat_item ls = NR_LRU_BASE + l;
-                        unsigned long lru_pages = zone_page_state(zone, ls);
-
-                        /* For pass = 0, we don't shrink the active list */
-                        if (pass == 0 && (l == LRU_ACTIVE_ANON ||
-                                                l == LRU_ACTIVE_FILE))
-                                continue;
-
-                        reclaim_stat = get_reclaim_stat(zone, sc);
-                        reclaim_stat->nr_saved_scan[l] +=
-                                                (lru_pages >> prio) + 1;
-                        if (reclaim_stat->nr_saved_scan[l]
-                                                >= nr_pages || pass > 3) {
-                                unsigned long nr_to_scan;
-
-                                reclaim_stat->nr_saved_scan[l] = 0;
-                                nr_to_scan = min(nr_pages, lru_pages);
-                                nr_reclaimed += shrink_list(l, nr_to_scan, zone,
-                                                                sc, prio);
-                                if (nr_reclaimed >= nr_pages) {
-                                        sc->nr_reclaimed += nr_reclaimed;
-                                        return;
-                                }
-                        }
-                }
-        }
-        sc->nr_reclaimed += nr_reclaimed;
-}
-
-/*
- * Try to free `nr_pages' of memory, system-wide, and return the number of
+ * Try to free `nr_to_reclaim' of memory, system-wide, and return the number of
  * freed pages.
  *
  * Rather than trying to age LRUs the aim is to preserve the overall
  * LRU order by reclaiming preferentially
  * inactive > active > active referenced > active mapped
  */
-unsigned long shrink_all_memory(unsigned long nr_pages)
+unsigned long shrink_all_memory(unsigned long nr_to_reclaim)
 {
-        unsigned long lru_pages, nr_slab;
-        int pass;
         struct reclaim_state reclaim_state;
         struct scan_control sc = {
-                .gfp_mask = GFP_KERNEL,
-                .may_unmap = 0,
+                .gfp_mask = GFP_HIGHUSER_MOVABLE,
+                .may_swap = 1,
+                .may_unmap = 1,
                 .may_writepage = 1,
+                .nr_to_reclaim = nr_to_reclaim,
+                .hibernation_mode = 1,
+                .swappiness = vm_swappiness,
+                .order = 0,
                 .isolate_pages = isolate_pages_global,
-                .nr_reclaimed = 0,
         };
+        struct zonelist * zonelist = node_zonelist(numa_node_id(), sc.gfp_mask);
+        struct task_struct *p = current;
+        unsigned long nr_reclaimed;
 
-        current->reclaim_state = &reclaim_state;
-
-        lru_pages = global_reclaimable_pages();
-        nr_slab = global_page_state(NR_SLAB_RECLAIMABLE);
-        /* If slab caches are huge, it's better to hit them first */
-        while (nr_slab >= lru_pages) {
-                reclaim_state.reclaimed_slab = 0;
-                shrink_slab(nr_pages, sc.gfp_mask, lru_pages);
-                if (!reclaim_state.reclaimed_slab)
-                        break;
-
-                sc.nr_reclaimed += reclaim_state.reclaimed_slab;
-                if (sc.nr_reclaimed >= nr_pages)
-                        goto out;
-
-                nr_slab -= reclaim_state.reclaimed_slab;
-        }
-
-        /*
-         * We try to shrink LRUs in 5 passes:
-         * 0 = Reclaim from inactive_list only
-         * 1 = Reclaim from active list but don't reclaim mapped
-         * 2 = 2nd pass of type 1
-         * 3 = Reclaim mapped (normal reclaim)
-         * 4 = 2nd pass of type 3
-         */
-        for (pass = 0; pass < 5; pass++) {
-                int prio;
-
-                /* Force reclaiming mapped pages in the passes #3 and #4 */
-                if (pass > 2)
-                        sc.may_unmap = 1;
-
-                for (prio = DEF_PRIORITY; prio >= 0; prio--) {
-                        unsigned long nr_to_scan = nr_pages - sc.nr_reclaimed;
-
-                        sc.nr_scanned = 0;
-                        sc.swap_cluster_max = nr_to_scan;
-                        shrink_all_zones(nr_to_scan, prio, pass, &sc);
-                        if (sc.nr_reclaimed >= nr_pages)
-                                goto out;
-
-                        reclaim_state.reclaimed_slab = 0;
-                        shrink_slab(sc.nr_scanned, sc.gfp_mask,
-                                    global_reclaimable_pages());
-                        sc.nr_reclaimed += reclaim_state.reclaimed_slab;
-                        if (sc.nr_reclaimed >= nr_pages)
-                                goto out;
-
-                        if (sc.nr_scanned && prio < DEF_PRIORITY - 2)
-                                congestion_wait(BLK_RW_ASYNC, HZ / 10);
-                }
-        }
-
-        /*
-         * If sc.nr_reclaimed = 0, we could not shrink LRUs, but there may be
-         * something in slab caches
-         */
-        if (!sc.nr_reclaimed) {
-                do {
-                        reclaim_state.reclaimed_slab = 0;
-                        shrink_slab(nr_pages, sc.gfp_mask,
-                                    global_reclaimable_pages());
-                        sc.nr_reclaimed += reclaim_state.reclaimed_slab;
-                } while (sc.nr_reclaimed < nr_pages &&
-                                reclaim_state.reclaimed_slab > 0);
-        }
+        p->flags |= PF_MEMALLOC;
+        lockdep_set_current_reclaim_state(sc.gfp_mask);
+        reclaim_state.reclaimed_slab = 0;
+        p->reclaim_state = &reclaim_state;
 
+        nr_reclaimed = do_try_to_free_pages(zonelist, &sc);
 
-out:
-        current->reclaim_state = NULL;
+        p->reclaim_state = NULL;
+        lockdep_clear_current_reclaim_state();
+        p->flags &= ~PF_MEMALLOC;
 
-        return sc.nr_reclaimed;
+        return nr_reclaimed;
 }
 #endif /* CONFIG_HIBERNATION */
 
@@ -2451,6 +2417,17 @@ int kswapd_run(int nid)
         return ret;
 }
 
+/*
+ * Called by memory hotplug when all memory in a node is offlined.
+ */
+void kswapd_stop(int nid)
+{
+        struct task_struct *kswapd = NODE_DATA(nid)->kswapd;
+
+        if (kswapd)
+                kthread_stop(kswapd);
+}
+
 static int __init kswapd_init(void)
 {
         int nid;
@@ -2553,8 +2530,8 @@ static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
                 .may_writepage = !!(zone_reclaim_mode & RECLAIM_WRITE),
                 .may_unmap = !!(zone_reclaim_mode & RECLAIM_SWAP),
                 .may_swap = 1,
-                .swap_cluster_max = max_t(unsigned long, nr_pages,
-                                        SWAP_CLUSTER_MAX),
+                .nr_to_reclaim = max_t(unsigned long, nr_pages,
+                                       SWAP_CLUSTER_MAX),
                 .gfp_mask = gfp_mask,
                 .swappiness = vm_swappiness,
                 .order = order,
diff --git a/mm/vmstat.c b/mm/vmstat.c
index dad2327e4580..6051fbab67ba 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -683,6 +683,9 @@ static const char * const vmstat_text[] = {
         "slabs_scanned",
         "kswapd_steal",
         "kswapd_inodesteal",
+        "kswapd_low_wmark_hit_quickly",
+        "kswapd_high_wmark_hit_quickly",
+        "kswapd_skip_congestion_wait",
         "pageoutrun",
         "allocstall",
 
diff --git a/net/core/dev.c b/net/core/dev.c
index 6fe7d739e59b..be9924f60ec3 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5035,6 +5035,11 @@ int register_netdevice(struct net_device *dev)
                 rollback_registered(dev);
                 dev->reg_state = NETREG_UNREGISTERED;
         }
+        /*
+         *      Prevent userspace races by waiting until the network
+         *      device is fully setup before sending notifications.
+         */
+        rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U);
 
 out:
         return ret;
@@ -5597,6 +5602,12 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
         /* Notify protocols, that a new device appeared. */
         call_netdevice_notifiers(NETDEV_REGISTER, dev);
 
+        /*
+         *      Prevent userspace races by waiting until the network
+         *      device is fully setup before sending notifications.
+         */
+        rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U);
+
         synchronize_net();
         err = 0;
 out:
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 33148a568199..794bcb897ff0 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1364,15 +1364,15 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi
         case NETDEV_UNREGISTER:
                 rtmsg_ifinfo(RTM_DELLINK, dev, ~0U);
                 break;
-        case NETDEV_REGISTER:
-                rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U);
-                break;
         case NETDEV_UP:
         case NETDEV_DOWN:
                 rtmsg_ifinfo(RTM_NEWLINK, dev, IFF_UP|IFF_RUNNING);
                 break;
+        case NETDEV_POST_INIT:
+        case NETDEV_REGISTER:
         case NETDEV_CHANGE:
         case NETDEV_GOING_DOWN:
+        case NETDEV_UNREGISTER_BATCH:
                 break;
         default:
                 rtmsg_ifinfo(RTM_NEWLINK, dev, 0);
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index bfa3e7865a8c..93c4e060c91e 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -93,7 +93,7 @@ static int sock_pipe_buf_steal(struct pipe_inode_info *pipe,
 
 
 /* Pipe buffer operations for a socket. */
-static struct pipe_buf_operations sock_pipe_buf_ops = {
+static const struct pipe_buf_operations sock_pipe_buf_ops = {
         .can_merge = 0,
         .map = generic_pipe_buf_map,
         .unmap = generic_pipe_buf_unmap,
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 70491d9035eb..0c94a1ac2946 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -166,7 +166,7 @@ config IP_PNP_DHCP
 
           If unsure, say Y. Note that if you want to use DHCP, a DHCP server
           must be operating on your network.  Read
-          <file:Documentation/filesystems/nfsroot.txt> for details.
+          <file:Documentation/filesystems/nfs/nfsroot.txt> for details.
 
 config IP_PNP_BOOTP
         bool "IP: BOOTP support"
@@ -181,7 +181,7 @@ config IP_PNP_BOOTP
           does BOOTP itself, providing all necessary information on the kernel
           command line, you can say N here. If unsure, say Y. Note that if you
           want to use BOOTP, a BOOTP server must be operating on your network.
-          Read <file:Documentation/filesystems/nfsroot.txt> for details.
+          Read <file:Documentation/filesystems/nfs/nfsroot.txt> for details.
 
 config IP_PNP_RARP
         bool "IP: RARP support"
@@ -194,7 +194,7 @@ config IP_PNP_RARP
           older protocol which is being obsoleted by BOOTP and DHCP), say Y
           here. Note that if you want to use RARP, a RARP server must be
           operating on your network. Read
-          <file:Documentation/filesystems/nfsroot.txt> for details.
+          <file:Documentation/filesystems/nfs/nfsroot.txt> for details.
 
 # not yet ready..
 #   bool '    IP: ARP support' CONFIG_IP_PNP_ARP
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 4e08b7f2331c..10a6a604bf32 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1446,7 +1446,7 @@ late_initcall(ip_auto_config);
 
 /*
  *  Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel
- *  command line parameter.  See Documentation/filesystems/nfsroot.txt.
+ *  command line parameter.  See Documentation/filesystems/nfs/nfsroot.txt.
  */
 static int __init ic_proto_name(char *name)
 {
diff --git a/net/ipv4/netfilter/nf_defrag_ipv4.c b/net/ipv4/netfilter/nf_defrag_ipv4.c
index fa2d6b6fc3e5..331ead3ebd1b 100644
--- a/net/ipv4/netfilter/nf_defrag_ipv4.c
+++ b/net/ipv4/netfilter/nf_defrag_ipv4.c
@@ -14,6 +14,7 @@
 #include <net/route.h>
 #include <net/ip.h>
 
+#include <linux/netfilter_bridge.h>
 #include <linux/netfilter_ipv4.h>
 #include <net/netfilter/ipv4/nf_defrag_ipv4.h>
 
@@ -34,6 +35,20 @@ static int nf_ct_ipv4_gather_frags(struct sk_buff *skb, u_int32_t user)
         return err;
 }
 
+static enum ip_defrag_users nf_ct_defrag_user(unsigned int hooknum,
+                                              struct sk_buff *skb)
+{
+#ifdef CONFIG_BRIDGE_NETFILTER
+        if (skb->nf_bridge &&
+            skb->nf_bridge->mask & BRNF_NF_BRIDGE_PREROUTING)
+                return IP_DEFRAG_CONNTRACK_BRIDGE_IN;
+#endif
+        if (hooknum == NF_INET_PRE_ROUTING)
+                return IP_DEFRAG_CONNTRACK_IN;
+        else
+                return IP_DEFRAG_CONNTRACK_OUT;
+}
+
 static unsigned int ipv4_conntrack_defrag(unsigned int hooknum,
                                           struct sk_buff *skb,
                                           const struct net_device *in,
@@ -50,10 +65,8 @@ static unsigned int ipv4_conntrack_defrag(unsigned int hooknum,
 #endif
         /* Gather fragments. */
         if (ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) {
-                if (nf_ct_ipv4_gather_frags(skb,
-                                            hooknum == NF_INET_PRE_ROUTING ?
-                                            IP_DEFRAG_CONNTRACK_IN :
-                                            IP_DEFRAG_CONNTRACK_OUT))
+                enum ip_defrag_users user = nf_ct_defrag_user(hooknum, skb);
+                if (nf_ct_ipv4_gather_frags(skb, user))
                         return NF_STOLEN;
         }
         return NF_ACCEPT;
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index 26399ad2a289..66fd80ef2473 100644
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -277,6 +277,13 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
 
         NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_SYNCOOKIESRECV);
 
+        /* check for timestamp cookie support */
+        memset(&tcp_opt, 0, sizeof(tcp_opt));
+        tcp_parse_options(skb, &tcp_opt, &hash_location, 0);
+
+        if (tcp_opt.saw_tstamp)
+                cookie_check_timestamp(&tcp_opt);
+
         ret = NULL;
         req = inet_reqsk_alloc(&tcp_request_sock_ops); /* for safety */
         if (!req)
@@ -292,6 +299,12 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
         ireq->loc_addr          = ip_hdr(skb)->daddr;
         ireq->rmt_addr          = ip_hdr(skb)->saddr;
         ireq->ecn_ok            = 0;
+        ireq->snd_wscale        = tcp_opt.snd_wscale;
+        ireq->rcv_wscale        = tcp_opt.rcv_wscale;
+        ireq->sack_ok           = tcp_opt.sack_ok;
+        ireq->wscale_ok         = tcp_opt.wscale_ok;
+        ireq->tstamp_ok         = tcp_opt.saw_tstamp;
+        req->ts_recent          = tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;
 
         /* We throwed the options of the initial SYN away, so we hope
          * the ACK carries the same options again (see RFC1122 4.2.3.8)
@@ -340,20 +353,6 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
                 }
         }
 
-        /* check for timestamp cookie support */
-        memset(&tcp_opt, 0, sizeof(tcp_opt));
-        tcp_parse_options(skb, &tcp_opt, &hash_location, 0, &rt->u.dst);
-
-        if (tcp_opt.saw_tstamp)
-                cookie_check_timestamp(&tcp_opt);
-
-        ireq->snd_wscale        = tcp_opt.snd_wscale;
-        ireq->rcv_wscale        = tcp_opt.rcv_wscale;
-        ireq->sack_ok           = tcp_opt.sack_ok;
-        ireq->wscale_ok         = tcp_opt.wscale_ok;
-        ireq->tstamp_ok         = tcp_opt.saw_tstamp;
-        req->ts_recent          = tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;
-
         /* Try to redo what tcp_v4_send_synack did. */
         req->window_clamp = tp->window_clamp ? :dst_metric(&rt->u.dst, RTAX_WINDOW);
 
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 12cab7d74dba..28e029632493 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3727,7 +3727,7 @@ old_ack:
  * the fast version below fails.
  */
 void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
-                       u8 **hvpp, int estab,  struct dst_entry *dst)
+                       u8 **hvpp, int estab)
 {
         unsigned char *ptr;
         struct tcphdr *th = tcp_hdr(skb);
@@ -3766,8 +3766,7 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                                 break;
                         case TCPOPT_WINDOW:
                                 if (opsize == TCPOLEN_WINDOW && th->syn &&
-                                    !estab && sysctl_tcp_window_scaling &&
-                                    !dst_feature(dst, RTAX_FEATURE_NO_WSCALE)) {
+                                    !estab && sysctl_tcp_window_scaling) {
                                         __u8 snd_wscale = *(__u8 *)ptr;
                                         opt_rx->wscale_ok = 1;
                                         if (snd_wscale > 14) {
@@ -3783,8 +3782,7 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                         case TCPOPT_TIMESTAMP:
                                 if ((opsize == TCPOLEN_TIMESTAMP) &&
                                     ((estab && opt_rx->tstamp_ok) ||
-                                     (!estab && sysctl_tcp_timestamps &&
-                                      !dst_feature(dst, RTAX_FEATURE_NO_TSTAMP)))) {
+                                     (!estab && sysctl_tcp_timestamps))) {
                                         opt_rx->saw_tstamp = 1;
                                         opt_rx->rcv_tsval = get_unaligned_be32(ptr);
                                         opt_rx->rcv_tsecr = get_unaligned_be32(ptr + 4);
@@ -3792,8 +3790,7 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                                 break;
                         case TCPOPT_SACK_PERM:
                                 if (opsize == TCPOLEN_SACK_PERM && th->syn &&
-                                    !estab && sysctl_tcp_sack &&
-                                    !dst_feature(dst, RTAX_FEATURE_NO_SACK)) {
+                                    !estab && sysctl_tcp_sack) {
                                         opt_rx->sack_ok = 1;
                                         tcp_sack_reset(opt_rx);
                                 }
@@ -3878,7 +3875,7 @@ static int tcp_fast_parse_options(struct sk_buff *skb, struct tcphdr *th,
                 if (tcp_parse_aligned_timestamp(tp, th))
                         return 1;
         }
-        tcp_parse_options(skb, &tp->rx_opt, hvpp, 1, NULL);
+        tcp_parse_options(skb, &tp->rx_opt, hvpp, 1);
         return 1;
 }
 
@@ -4133,10 +4130,8 @@ static inline int tcp_sack_extend(struct tcp_sack_block *sp, u32 seq,
 static void tcp_dsack_set(struct sock *sk, u32 seq, u32 end_seq)
 {
         struct tcp_sock *tp = tcp_sk(sk);
-        struct dst_entry *dst = __sk_dst_get(sk);
 
-        if (tcp_is_sack(tp) && sysctl_tcp_dsack &&
-            !dst_feature(dst, RTAX_FEATURE_NO_DSACK)) {
+        if (tcp_is_sack(tp) && sysctl_tcp_dsack) {
                 int mib_idx;
 
                 if (before(seq, tp->rcv_nxt))
@@ -4165,15 +4160,13 @@ static void tcp_dsack_extend(struct sock *sk, u32 seq, u32 end_seq)
 static void tcp_send_dupack(struct sock *sk, struct sk_buff *skb)
 {
         struct tcp_sock *tp = tcp_sk(sk);
-        struct dst_entry *dst = __sk_dst_get(sk);
 
         if (TCP_SKB_CB(skb)->end_seq != TCP_SKB_CB(skb)->seq &&
             before(TCP_SKB_CB(skb)->seq, tp->rcv_nxt)) {
                 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKLOST);
                 tcp_enter_quickack_mode(sk);
 
-                if (tcp_is_sack(tp) && sysctl_tcp_dsack &&
-                    !dst_feature(dst, RTAX_FEATURE_NO_DSACK)) {
+                if (tcp_is_sack(tp) && sysctl_tcp_dsack) {
                         u32 end_seq = TCP_SKB_CB(skb)->end_seq;
 
                         if (after(TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt))
@@ -5428,11 +5421,10 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
         u8 *hash_location;
         struct inet_connection_sock *icsk = inet_csk(sk);
         struct tcp_sock *tp = tcp_sk(sk);
-        struct dst_entry *dst = __sk_dst_get(sk);
         struct tcp_cookie_values *cvp = tp->cookie_values;
         int saved_clamp = tp->rx_opt.mss_clamp;
 
-        tcp_parse_options(skb, &tp->rx_opt, &hash_location, 0, dst);
+        tcp_parse_options(skb, &tp->rx_opt, &hash_location, 0);
 
         if (th->ack) {
                 /* rfc793:
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 15e96030ce47..65b8ebfd078a 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1262,20 +1262,10 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
         tcp_rsk(req)->af_specific = &tcp_request_sock_ipv4_ops;
 #endif
 
-        ireq = inet_rsk(req);
-        ireq->loc_addr = daddr;
-        ireq->rmt_addr = saddr;
-        ireq->no_srccheck = inet_sk(sk)->transparent;
-        ireq->opt = tcp_v4_save_options(sk, skb);
-
-        dst = inet_csk_route_req(sk, req);
-        if(!dst)
-                goto drop_and_free;
-
         tcp_clear_options(&tmp_opt);
         tmp_opt.mss_clamp = TCP_MSS_DEFAULT;
         tmp_opt.user_mss  = tp->rx_opt.user_mss;
-        tcp_parse_options(skb, &tmp_opt, &hash_location, 0, dst);
+        tcp_parse_options(skb, &tmp_opt, &hash_location, 0);
 
         if (tmp_opt.cookie_plus > 0 &&
             tmp_opt.saw_tstamp &&
@@ -1319,8 +1309,14 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
         tmp_opt.tstamp_ok = tmp_opt.saw_tstamp;
         tcp_openreq_init(req, &tmp_opt, skb);
 
+        ireq = inet_rsk(req);
+        ireq->loc_addr = daddr;
+        ireq->rmt_addr = saddr;
+        ireq->no_srccheck = inet_sk(sk)->transparent;
+        ireq->opt = tcp_v4_save_options(sk, skb);
+
         if (security_inet_conn_request(sk, skb, req))
-                goto drop_and_release;
+                goto drop_and_free;
 
         if (!want_cookie)
                 TCP_ECN_create_request(req, tcp_hdr(skb));
@@ -1345,6 +1341,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
                  */
                 if (tmp_opt.saw_tstamp &&
                     tcp_death_row.sysctl_tw_recycle &&
+                    (dst = inet_csk_route_req(sk, req)) != NULL &&
                     (peer = rt_get_peer((struct rtable *)dst)) != NULL &&
                     peer->v4daddr == saddr) {
                         if ((u32)get_seconds() - peer->tcp_ts_stamp < TCP_PAWS_MSL &&
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index 87accec8d097..f206ee5dda80 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -95,9 +95,9 @@ tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb,
         struct tcp_timewait_sock *tcptw = tcp_twsk((struct sock *)tw);
         int paws_reject = 0;
 
+        tmp_opt.saw_tstamp = 0;
         if (th->doff > (sizeof(*th) >> 2) && tcptw->tw_ts_recent_stamp) {
-                tmp_opt.tstamp_ok = 1;
-                tcp_parse_options(skb, &tmp_opt, &hash_location, 1, NULL);
+                tcp_parse_options(skb, &tmp_opt, &hash_location, 0);
 
                 if (tmp_opt.saw_tstamp) {
                         tmp_opt.ts_recent       = tcptw->tw_ts_recent;
@@ -526,9 +526,9 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,
         __be32 flg = tcp_flag_word(th) & (TCP_FLAG_RST|TCP_FLAG_SYN|TCP_FLAG_ACK);
         int paws_reject = 0;
 
-        if ((th->doff > (sizeof(*th) >> 2)) && (req->ts_recent)) {
-                tmp_opt.tstamp_ok = 1;
-                tcp_parse_options(skb, &tmp_opt, &hash_location, 1, NULL);
+        tmp_opt.saw_tstamp = 0;
+        if (th->doff > (sizeof(struct tcphdr)>>2)) {
+                tcp_parse_options(skb, &tmp_opt, &hash_location, 0);
 
                 if (tmp_opt.saw_tstamp) {
                         tmp_opt.ts_recent = req->ts_recent;
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 93316a96d820..383ce237640f 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -553,7 +553,6 @@ static unsigned tcp_syn_options(struct sock *sk, struct sk_buff *skb,
                                 struct tcp_md5sig_key **md5) {
         struct tcp_sock *tp = tcp_sk(sk);
         struct tcp_cookie_values *cvp = tp->cookie_values;
-        struct dst_entry *dst = __sk_dst_get(sk);
         unsigned remaining = MAX_TCP_OPTION_SPACE;
         u8 cookie_size = (!tp->rx_opt.cookie_out_never && cvp != NULL) ?
                          tcp_cookie_size_check(cvp->cookie_desired) :
@@ -581,22 +580,18 @@ static unsigned tcp_syn_options(struct sock *sk, struct sk_buff *skb,
         opts->mss = tcp_advertise_mss(sk);
         remaining -= TCPOLEN_MSS_ALIGNED;
 
-        if (likely(sysctl_tcp_timestamps &&
-                   !dst_feature(dst, RTAX_FEATURE_NO_TSTAMP) &&
-                   *md5 == NULL)) {
+        if (likely(sysctl_tcp_timestamps && *md5 == NULL)) {
                 opts->options |= OPTION_TS;
                 opts->tsval = TCP_SKB_CB(skb)->when;
                 opts->tsecr = tp->rx_opt.ts_recent;
                 remaining -= TCPOLEN_TSTAMP_ALIGNED;
         }
-        if (likely(sysctl_tcp_window_scaling &&
-                   !dst_feature(dst, RTAX_FEATURE_NO_WSCALE))) {
+        if (likely(sysctl_tcp_window_scaling)) {
                 opts->ws = tp->rx_opt.rcv_wscale;
                 opts->options |= OPTION_WSCALE;
                 remaining -= TCPOLEN_WSCALE_ALIGNED;
         }
-        if (likely(sysctl_tcp_sack &&
-                   !dst_feature(dst, RTAX_FEATURE_NO_SACK))) {
+        if (likely(sysctl_tcp_sack)) {
                 opts->options |= OPTION_SACK_ADVERTISE;
                 if (unlikely(!(OPTION_TS & opts->options)))
                         remaining -= TCPOLEN_SACKPERM_ALIGNED;
@@ -2527,9 +2522,7 @@ static void tcp_connect_init(struct sock *sk)
          * See tcp_input.c:tcp_rcv_state_process case TCP_SYN_SENT.
          */
         tp->tcp_header_len = sizeof(struct tcphdr) +
-                (sysctl_tcp_timestamps &&
-                (!dst_feature(dst, RTAX_FEATURE_NO_TSTAMP) ?
-                  TCPOLEN_TSTAMP_ALIGNED : 0));
+                (sysctl_tcp_timestamps ? TCPOLEN_TSTAMP_ALIGNED : 0);
 
 #ifdef CONFIG_TCP_MD5SIG
         if (tp->af_specific->md5_lookup(sk, sk) != NULL)
@@ -2555,8 +2548,7 @@ static void tcp_connect_init(struct sock *sk)
                                   tp->advmss - (tp->rx_opt.ts_recent_stamp ? tp->tcp_header_len - sizeof(struct tcphdr) : 0),
                                   &tp->rcv_wnd,
                                   &tp->window_clamp,
-                                  (sysctl_tcp_window_scaling &&
-                                   !dst_feature(dst, RTAX_FEATURE_NO_WSCALE)),
+                                  sysctl_tcp_window_scaling,
                                   &rcv_wscale);
 
         tp->rx_opt.rcv_wscale = rcv_wscale;
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 1f9534846ca9..f0126fdd7e04 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -216,9 +216,8 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum,
                  * force rand to be an odd multiple of UDP_HTABLE_SIZE
                  */
                 rand = (rand | 1) * (udptable->mask + 1);
-                for (last = first + udptable->mask + 1;
-                     first != last;
-                     first++) {
+                last = first + udptable->mask + 1;
+                do {
                         hslot = udp_hashslot(udptable, net, first);
                         bitmap_zero(bitmap, PORTS_PER_CHAIN);
                         spin_lock_bh(&hslot->lock);
@@ -238,7 +237,7 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum,
                                 snum += rand;
                         } while (snum != first);
                         spin_unlock_bh(&hslot->lock);
-                }
+                } while (++first != last);
                 goto fail;
         } else {
                 hslot = udp_hashslot(udptable, net, snum);
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index 5f2ec208a8c3..0956ebabbff2 100644
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -20,6 +20,7 @@
 #include <net/ipv6.h>
 #include <net/inet_frag.h>
 
+#include <linux/netfilter_bridge.h>
 #include <linux/netfilter_ipv6.h>
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_helper.h>
@@ -187,6 +188,21 @@ out:
         return nf_conntrack_confirm(skb);
 }
 
+static enum ip6_defrag_users nf_ct6_defrag_user(unsigned int hooknum,
+                                                struct sk_buff *skb)
+{
+#ifdef CONFIG_BRIDGE_NETFILTER
+        if (skb->nf_bridge &&
+            skb->nf_bridge->mask & BRNF_NF_BRIDGE_PREROUTING)
+                return IP6_DEFRAG_CONNTRACK_BRIDGE_IN;
+#endif
+        if (hooknum == NF_INET_PRE_ROUTING)
+                return IP6_DEFRAG_CONNTRACK_IN;
+        else
+                return IP6_DEFRAG_CONNTRACK_OUT;
+
+}
+
 static unsigned int ipv6_defrag(unsigned int hooknum,
                                 struct sk_buff *skb,
                                 const struct net_device *in,
@@ -199,8 +215,7 @@ static unsigned int ipv6_defrag(unsigned int hooknum,
         if (skb->nfct)
                 return NF_ACCEPT;
 
-        reasm = nf_ct_frag6_gather(skb);
-
+        reasm = nf_ct_frag6_gather(skb, nf_ct6_defrag_user(hooknum, skb));
         /* queued */
         if (reasm == NULL)
                 return NF_STOLEN;
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index e0b9424fa1b2..312c20adc83f 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -168,13 +168,14 @@ out:
 /* Creation primitives. */
 
 static __inline__ struct nf_ct_frag6_queue *
-fq_find(__be32 id, struct in6_addr *src, struct in6_addr *dst)
+fq_find(__be32 id, u32 user, struct in6_addr *src, struct in6_addr *dst)
 {
         struct inet_frag_queue *q;
         struct ip6_create_arg arg;
         unsigned int hash;
 
         arg.id = id;
+        arg.user = user;
         arg.src = src;
         arg.dst = dst;
 
@@ -559,7 +560,7 @@ find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff)
         return 0;
 }
 
-struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb)
+struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user)
 {
         struct sk_buff *clone;
         struct net_device *dev = skb->dev;
@@ -605,7 +606,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb)
         if (atomic_read(&nf_init_frags.mem) > nf_init_frags.high_thresh)
                 nf_ct_frag6_evictor();
 
-        fq = fq_find(fhdr->identification, &hdr->saddr, &hdr->daddr);
+        fq = fq_find(fhdr->identification, user, &hdr->saddr, &hdr->daddr);
         if (fq == NULL) {
                 pr_debug("Can't find and can't create new queue\n");
                 goto ret_orig;
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 4d98549a6868..3b3a95607125 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -72,6 +72,7 @@ struct frag_queue
         struct inet_frag_queue  q;
 
         __be32                  id;             /* fragment id          */
+        u32                     user;
         struct in6_addr         saddr;
         struct in6_addr         daddr;
 
@@ -141,7 +142,7 @@ int ip6_frag_match(struct inet_frag_queue *q, void *a)
         struct ip6_create_arg *arg = a;
 
         fq = container_of(q, struct frag_queue, q);
-        return (fq->id == arg->id &&
+        return (fq->id == arg->id && fq->user == arg->user &&
                         ipv6_addr_equal(&fq->saddr, arg->src) &&
                         ipv6_addr_equal(&fq->daddr, arg->dst));
 }
@@ -163,6 +164,7 @@ void ip6_frag_init(struct inet_frag_queue *q, void *a)
         struct ip6_create_arg *arg = a;
 
         fq->id = arg->id;
+        fq->user = arg->user;
         ipv6_addr_copy(&fq->saddr, arg->src);
         ipv6_addr_copy(&fq->daddr, arg->dst);
 }
@@ -243,6 +245,7 @@ fq_find(struct net *net, __be32 id, struct in6_addr *src, struct in6_addr *dst,
         unsigned int hash;
 
         arg.id = id;
+        arg.user = IP6_DEFRAG_LOCAL_DELIVER;
         arg.src = src;
         arg.dst = dst;
 
diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c
index 5b9af508b8f2..7208a06576c6 100644
--- a/net/ipv6/syncookies.c
+++ b/net/ipv6/syncookies.c
@@ -185,6 +185,13 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
 
         NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_SYNCOOKIESRECV);
 
+        /* check for timestamp cookie support */
+        memset(&tcp_opt, 0, sizeof(tcp_opt));
+        tcp_parse_options(skb, &tcp_opt, &hash_location, 0);
+
+        if (tcp_opt.saw_tstamp)
+                cookie_check_timestamp(&tcp_opt);
+
         ret = NULL;
         req = inet6_reqsk_alloc(&tcp6_request_sock_ops);
         if (!req)
@@ -218,6 +225,12 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
         req->expires = 0UL;
         req->retrans = 0;
         ireq->ecn_ok            = 0;
+        ireq->snd_wscale        = tcp_opt.snd_wscale;
+        ireq->rcv_wscale        = tcp_opt.rcv_wscale;
+        ireq->sack_ok           = tcp_opt.sack_ok;
+        ireq->wscale_ok         = tcp_opt.wscale_ok;
+        ireq->tstamp_ok         = tcp_opt.saw_tstamp;
+        req->ts_recent          = tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;
         treq->rcv_isn = ntohl(th->seq) - 1;
         treq->snt_isn = cookie;
 
@@ -253,21 +266,6 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
                         goto out_free;
         }
 
-        /* check for timestamp cookie support */
-        memset(&tcp_opt, 0, sizeof(tcp_opt));
-        tcp_parse_options(skb, &tcp_opt, &hash_location, 0, dst);
-
-        if (tcp_opt.saw_tstamp)
-                cookie_check_timestamp(&tcp_opt);
-
-        req->ts_recent          = tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;
-
-        ireq->snd_wscale        = tcp_opt.snd_wscale;
-        ireq->rcv_wscale        = tcp_opt.rcv_wscale;
-        ireq->sack_ok           = tcp_opt.sack_ok;
-        ireq->wscale_ok         = tcp_opt.wscale_ok;
-        ireq->tstamp_ok         = tcp_opt.saw_tstamp;
-
         req->window_clamp = tp->window_clamp ? :dst_metric(dst, RTAX_WINDOW);
         tcp_select_initial_window(tcp_full_space(sk), req->mss,
                                   &req->rcv_wnd, &req->window_clamp,
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index ee9cf62458d4..febfd595a40d 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1169,7 +1169,6 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
         struct inet6_request_sock *treq;
         struct ipv6_pinfo *np = inet6_sk(sk);
         struct tcp_sock *tp = tcp_sk(sk);
-        struct dst_entry *dst = __sk_dst_get(sk);
         __u32 isn = TCP_SKB_CB(skb)->when;
 #ifdef CONFIG_SYN_COOKIES
         int want_cookie = 0;
@@ -1208,7 +1207,7 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
         tcp_clear_options(&tmp_opt);
         tmp_opt.mss_clamp = IPV6_MIN_MTU - sizeof(struct tcphdr) - sizeof(struct ipv6hdr);
         tmp_opt.user_mss = tp->rx_opt.user_mss;
-        tcp_parse_options(skb, &tmp_opt, &hash_location, 0, dst);
+        tcp_parse_options(skb, &tmp_opt, &hash_location, 0);
 
         if (tmp_opt.cookie_plus > 0 &&
             tmp_opt.saw_tstamp &&
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h
index b001c361ad30..4300df35d37d 100644
--- a/net/irda/irnet/irnet.h
+++ b/net/irda/irnet/irnet.h
@@ -249,6 +249,7 @@
 #include <linux/poll.h>
 #include <linux/capability.h>
 #include <linux/ctype.h>        /* isspace() */
+#include <linux/string.h>       /* skip_spaces() */
 #include <asm/uaccess.h>
 #include <linux/init.h>
 
diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c
index 7dea882dbb75..156020d138b5 100644
--- a/net/irda/irnet/irnet_ppp.c
+++ b/net/irda/irnet/irnet_ppp.c
@@ -76,9 +76,8 @@ irnet_ctrl_write(irnet_socket *	ap,
       /* Look at the next command */
       start = next;
 
-      /* Scrap whitespaces before the command */
-      while(isspace(*start))
-        start++;
+        /* Scrap whitespaces before the command */
+        start = skip_spaces(start);
 
       /* ',' is our command separator */
       next = strchr(start, ',');
@@ -133,8 +132,7 @@ irnet_ctrl_write(irnet_socket *	ap,
               char *    endp;
 
               /* Scrap whitespaces before the command */
-              while(isspace(*begp))
-                begp++;
+              begp = skip_spaces(begp);
 
               /* Convert argument to a number (last arg is the base) */
               addr = simple_strtoul(begp, &endp, 16);
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 1e428863574f..c18286a2167b 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -221,7 +221,7 @@ static int afiucv_pm_restore_thaw(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops afiucv_pm_ops = {
+static const struct dev_pm_ops afiucv_pm_ops = {
         .prepare = afiucv_pm_prepare,
         .complete = afiucv_pm_complete,
         .freeze = afiucv_pm_freeze,
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 3b1f5f5f8de7..fd8b28361a64 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -93,7 +93,7 @@ static int iucv_pm_freeze(struct device *);
 static int iucv_pm_thaw(struct device *);
 static int iucv_pm_restore(struct device *);
 
-static struct dev_pm_ops iucv_pm_ops = {
+static const struct dev_pm_ops iucv_pm_ops = {
         .prepare = iucv_pm_prepare,
         .complete = iucv_pm_complete,
         .freeze = iucv_pm_freeze,
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index b95699f00545..847ffca40184 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -1366,6 +1366,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb,
                == sysctl_ip_vs_sync_threshold[0])) ||
              ((cp->protocol == IPPROTO_TCP) && (cp->old_state != cp->state) &&
               ((cp->state == IP_VS_TCP_S_FIN_WAIT) ||
+               (cp->state == IP_VS_TCP_S_CLOSE) ||
                (cp->state == IP_VS_TCP_S_CLOSE_WAIT) ||
                (cp->state == IP_VS_TCP_S_TIME_WAIT)))))
                 ip_vs_sync_conn(cp);
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index e55a6861d26f..6bde12da2fe0 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -2714,6 +2714,8 @@ static int ip_vs_genl_parse_service(struct ip_vs_service_user_kern *usvc,
         if (!(nla_af && (nla_fwmark || (nla_port && nla_protocol && nla_addr))))
                 return -EINVAL;
 
+        memset(usvc, 0, sizeof(*usvc));
+
         usvc->af = nla_get_u16(nla_af);
 #ifdef CONFIG_IP_VS_IPV6
         if (usvc->af != AF_INET && usvc->af != AF_INET6)
@@ -2901,6 +2903,8 @@ static int ip_vs_genl_parse_dest(struct ip_vs_dest_user_kern *udest,
         if (!(nla_addr && nla_port))
                 return -EINVAL;
 
+        memset(udest, 0, sizeof(*udest));
+
         nla_memcpy(&udest->addr, nla_addr, sizeof(udest->addr));
         udest->port = nla_get_u16(nla_port);
 
diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index eb0ceb846527..fc70a49c0afd 100644
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -482,8 +482,7 @@ static ssize_t recent_old_proc_write(struct file *file,
         if (copy_from_user(buf, input, size))
                 return -EFAULT;
 
-        while (isspace(*c))
-                c++;
+        c = skip_spaces(c);
 
         if (size - (c - buf) < 5)
                 return c - buf;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 020562164b56..e0516a22be2e 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -415,7 +415,7 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,
 {
         struct sock *sk = sock->sk;
         struct sockaddr_pkt *saddr = (struct sockaddr_pkt *)msg->msg_name;
-        struct sk_buff *skb;
+        struct sk_buff *skb = NULL;
         struct net_device *dev;
         __be16 proto = 0;
         int err;
@@ -437,6 +437,7 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,
          */
 
         saddr->spkt_device[13] = 0;
+retry:
         rcu_read_lock();
         dev = dev_get_by_name_rcu(sock_net(sk), saddr->spkt_device);
         err = -ENODEV;
@@ -456,58 +457,48 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,
         if (len > dev->mtu + dev->hard_header_len)
                 goto out_unlock;
 
-        err = -ENOBUFS;
-        skb = sock_wmalloc(sk, len + LL_RESERVED_SPACE(dev), 0, GFP_KERNEL);
-
-        /*
-         * If the write buffer is full, then tough. At this level the user
-         * gets to deal with the problem - do your own algorithmic backoffs.
-         * That's far more flexible.
-         */
-
-        if (skb == NULL)
-                goto out_unlock;
-
-        /*
-         *      Fill it in
-         */
-
-        /* FIXME: Save some space for broken drivers that write a
-         * hard header at transmission time by themselves. PPP is the
-         * notable one here. This should really be fixed at the driver level.
-         */
-        skb_reserve(skb, LL_RESERVED_SPACE(dev));
-        skb_reset_network_header(skb);
-
-        /* Try to align data part correctly */
-        if (dev->header_ops) {
-                skb->data -= dev->hard_header_len;
-                skb->tail -= dev->hard_header_len;
-                if (len < dev->hard_header_len)
-                        skb_reset_network_header(skb);
+        if (!skb) {
+                size_t reserved = LL_RESERVED_SPACE(dev);
+                unsigned int hhlen = dev->header_ops ? dev->hard_header_len : 0;
+
+                rcu_read_unlock();
+                skb = sock_wmalloc(sk, len + reserved, 0, GFP_KERNEL);
+                if (skb == NULL)
+                        return -ENOBUFS;
+                /* FIXME: Save some space for broken drivers that write a hard
+                 * header at transmission time by themselves. PPP is the notable
+                 * one here. This should really be fixed at the driver level.
+                 */
+                skb_reserve(skb, reserved);
+                skb_reset_network_header(skb);
+
+                /* Try to align data part correctly */
+                if (hhlen) {
+                        skb->data -= hhlen;
+                        skb->tail -= hhlen;
+                        if (len < hhlen)
+                                skb_reset_network_header(skb);
+                }
+                err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
+                if (err)
+                        goto out_free;
+                goto retry;
         }
 
-        /* Returns -EFAULT on error */
-        err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
+
         skb->protocol = proto;
         skb->dev = dev;
         skb->priority = sk->sk_priority;
         skb->mark = sk->sk_mark;
-        if (err)
-                goto out_free;
-
-        /*
-         *      Now send it
-         */
 
         dev_queue_xmit(skb);
         rcu_read_unlock();
         return len;
 
-out_free:
-        kfree_skb(skb);
 out_unlock:
         rcu_read_unlock();
+out_free:
+        kfree_skb(skb);
         return err;
 }
 
diff --git a/net/rds/ib.c b/net/rds/ib.c
index 536ebe5d3f6b..3b8992361042 100644
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -182,8 +182,8 @@ static int rds_ib_conn_info_visitor(struct rds_connection *conn,
                 ic = conn->c_transport_data;
                 dev_addr = &ic->i_cm_id->route.addr.dev_addr;
 
-                ib_addr_get_sgid(dev_addr, (union ib_gid *) &iinfo->src_gid);
-                ib_addr_get_dgid(dev_addr, (union ib_gid *) &iinfo->dst_gid);
+                rdma_addr_get_sgid(dev_addr, (union ib_gid *) &iinfo->src_gid);
+                rdma_addr_get_dgid(dev_addr, (union ib_gid *) &iinfo->dst_gid);
 
                 rds_ibdev = ib_get_client_data(ic->i_cm_id->device, &rds_ib_client);
                 iinfo->max_send_wr = ic->i_send_ring.w_nr;
diff --git a/net/rds/iw.c b/net/rds/iw.c
index db224f7c2937..b28fa8525b24 100644
--- a/net/rds/iw.c
+++ b/net/rds/iw.c
@@ -184,8 +184,8 @@ static int rds_iw_conn_info_visitor(struct rds_connection *conn,
                 ic = conn->c_transport_data;
                 dev_addr = &ic->i_cm_id->route.addr.dev_addr;
 
-                ib_addr_get_sgid(dev_addr, (union ib_gid *) &iinfo->src_gid);
-                ib_addr_get_dgid(dev_addr, (union ib_gid *) &iinfo->dst_gid);
+                rdma_addr_get_sgid(dev_addr, (union ib_gid *) &iinfo->src_gid);
+                rdma_addr_get_dgid(dev_addr, (union ib_gid *) &iinfo->dst_gid);
 
                 rds_iwdev = ib_get_client_data(ic->i_cm_id->device, &rds_iw_client);
                 iinfo->max_send_wr = ic->i_send_ring.w_nr;
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index b845e2293dfe..1c924ee0a1ef 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -16,8 +16,6 @@
 
 #define RPCDBG_FACILITY RPCDBG_SVCXPRT
 
-#define SVC_MAX_WAKING 5
-
 static struct svc_deferred_req *svc_deferred_dequeue(struct svc_xprt *xprt);
 static int svc_deferred_recv(struct svc_rqst *rqstp);
 static struct cache_deferred_req *svc_defer(struct cache_req *req);
@@ -306,7 +304,6 @@ void svc_xprt_enqueue(struct svc_xprt *xprt)
         struct svc_pool *pool;
         struct svc_rqst *rqstp;
         int cpu;
-        int thread_avail;
 
         if (!(xprt->xpt_flags &
               ((1<<XPT_CONN)|(1<<XPT_DATA)|(1<<XPT_CLOSE)|(1<<XPT_DEFERRED))))
@@ -318,6 +315,12 @@ void svc_xprt_enqueue(struct svc_xprt *xprt)
 
         spin_lock_bh(&pool->sp_lock);
 
+        if (!list_empty(&pool->sp_threads) &&
+            !list_empty(&pool->sp_sockets))
+                printk(KERN_ERR
+                       "svc_xprt_enqueue: "
+                       "threads and transports both waiting??\n");
+
         if (test_bit(XPT_DEAD, &xprt->xpt_flags)) {
                 /* Don't enqueue dead transports */
                 dprintk("svc: transport %p is dead, not enqueued\n", xprt);
@@ -358,15 +361,7 @@ void svc_xprt_enqueue(struct svc_xprt *xprt)
         }
 
  process:
-        /* Work out whether threads are available */
-        thread_avail = !list_empty(&pool->sp_threads);  /* threads are asleep */
-        if (pool->sp_nwaking >= SVC_MAX_WAKING) {
-                /* too many threads are runnable and trying to wake up */
-                thread_avail = 0;
-                pool->sp_stats.overloads_avoided++;
-        }
-
-        if (thread_avail) {
+        if (!list_empty(&pool->sp_threads)) {
                 rqstp = list_entry(pool->sp_threads.next,
                                    struct svc_rqst,
                                    rq_list);
@@ -381,8 +376,6 @@ void svc_xprt_enqueue(struct svc_xprt *xprt)
                 svc_xprt_get(xprt);
                 rqstp->rq_reserved = serv->sv_max_mesg;
                 atomic_add(rqstp->rq_reserved, &xprt->xpt_reserved);
-                rqstp->rq_waking = 1;
-                pool->sp_nwaking++;
                 pool->sp_stats.threads_woken++;
                 BUG_ON(xprt->xpt_pool != pool);
                 wake_up(&rqstp->rq_wait);
@@ -651,11 +644,6 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
                 return -EINTR;
 
         spin_lock_bh(&pool->sp_lock);
-        if (rqstp->rq_waking) {
-                rqstp->rq_waking = 0;
-                pool->sp_nwaking--;
-                BUG_ON(pool->sp_nwaking < 0);
-        }
         xprt = svc_xprt_dequeue(pool);
         if (xprt) {
                 rqstp->rq_xprt = xprt;
@@ -1204,16 +1192,15 @@ static int svc_pool_stats_show(struct seq_file *m, void *p)
         struct svc_pool *pool = p;
 
         if (p == SEQ_START_TOKEN) {
-                seq_puts(m, "# pool packets-arrived sockets-enqueued threads-woken overloads-avoided threads-timedout\n");
+                seq_puts(m, "# pool packets-arrived sockets-enqueued threads-woken threads-timedout\n");
                 return 0;
         }
 
-        seq_printf(m, "%u %lu %lu %lu %lu %lu\n",
+        seq_printf(m, "%u %lu %lu %lu %lu\n",
                 pool->sp_id,
                 pool->sp_stats.packets,
                 pool->sp_stats.sockets_queued,
                 pool->sp_stats.threads_woken,
-                pool->sp_stats.overloads_avoided,
                 pool->sp_stats.threads_timedout);
 
         return 0;
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 4a8f6558718a..d8c041114497 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -655,23 +655,25 @@ static struct unix_gid *unix_gid_lookup(uid_t uid)
                 return NULL;
 }
 
-static int unix_gid_find(uid_t uid, struct group_info **gip,
-                         struct svc_rqst *rqstp)
+static struct group_info *unix_gid_find(uid_t uid, struct svc_rqst *rqstp)
 {
-        struct unix_gid *ug = unix_gid_lookup(uid);
+        struct unix_gid *ug;
+        struct group_info *gi;
+        int ret;
+
+        ug = unix_gid_lookup(uid);
         if (!ug)
-                return -EAGAIN;
-        switch (cache_check(&unix_gid_cache, &ug->h, &rqstp->rq_chandle)) {
+                return ERR_PTR(-EAGAIN);
+        ret = cache_check(&unix_gid_cache, &ug->h, &rqstp->rq_chandle);
+        switch (ret) {
         case -ENOENT:
-                *gip = NULL;
-                return 0;
+                return ERR_PTR(-ENOENT);
         case 0:
-                *gip = ug->gi;
-                get_group_info(*gip);
+                gi = get_group_info(ug->gi);
                 cache_put(&ug->h, &unix_gid_cache);
-                return 0;
+                return gi;
         default:
-                return -EAGAIN;
+                return ERR_PTR(-EAGAIN);
         }
 }
 
@@ -681,6 +683,8 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
         struct sockaddr_in *sin;
         struct sockaddr_in6 *sin6, sin6_storage;
         struct ip_map *ipm;
+        struct group_info *gi;
+        struct svc_cred *cred = &rqstp->rq_cred;
 
         switch (rqstp->rq_addr.ss_family) {
         case AF_INET:
@@ -721,6 +725,17 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
                         ip_map_cached_put(rqstp, ipm);
                         break;
         }
+
+        gi = unix_gid_find(cred->cr_uid, rqstp);
+        switch (PTR_ERR(gi)) {
+        case -EAGAIN:
+                return SVC_DROP;
+        case -ENOENT:
+                break;
+        default:
+                put_group_info(cred->cr_group_info);
+                cred->cr_group_info = gi;
+        }
         return SVC_OK;
 }
 
@@ -817,19 +832,11 @@ svcauth_unix_accept(struct svc_rqst *rqstp, __be32 *authp)
         slen = svc_getnl(argv);                 /* gids length */
         if (slen > 16 || (len -= (slen + 2)*4) < 0)
                 goto badcred;
-        if (unix_gid_find(cred->cr_uid, &cred->cr_group_info, rqstp)
-            == -EAGAIN)
+        cred->cr_group_info = groups_alloc(slen);
+        if (cred->cr_group_info == NULL)
                 return SVC_DROP;
-        if (cred->cr_group_info == NULL) {
-                cred->cr_group_info = groups_alloc(slen);
-                if (cred->cr_group_info == NULL)
-                        return SVC_DROP;
-                for (i = 0; i < slen; i++)
-                        GROUP_AT(cred->cr_group_info, i) = svc_getnl(argv);
-        } else {
-                for (i = 0; i < slen ; i++)
-                        svc_getnl(argv);
-        }
+        for (i = 0; i < slen; i++)
+                GROUP_AT(cred->cr_group_info, i) = svc_getnl(argv);
         if (svc_getu32(argv) != htonl(RPC_AUTH_NULL) || svc_getu32(argv) != 0) {
                 *authp = rpc_autherr_badverf;
                 return SVC_DENIED;
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 81a67a458e78..445e8845f0a4 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -13,7 +13,7 @@
 use strict;
 
 my $P = $0;
-my $V = '0.21';
+my $V = '0.23';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -23,16 +23,19 @@ my $email_usename = 1;
 my $email_maintainer = 1;
 my $email_list = 1;
 my $email_subscriber_list = 0;
-my $email_git = 1;
 my $email_git_penguin_chiefs = 0;
+my $email_git = 1;
+my $email_git_blame = 0;
 my $email_git_min_signatures = 1;
 my $email_git_max_maintainers = 5;
 my $email_git_min_percent = 5;
 my $email_git_since = "1-year-ago";
-my $email_git_blame = 0;
+my $email_hg_since = "-365";
 my $email_remove_duplicates = 1;
 my $output_multiline = 1;
 my $output_separator = ", ";
+my $output_roles = 0;
+my $output_rolestats = 0;
 my $scm = 0;
 my $web = 0;
 my $subsystem = 0;
@@ -64,21 +67,52 @@ my $penguin_chiefs = "\(" . join("|",@penguin_chief_names) . "\)";
 my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])";
 my $rfc822_char = '[\\000-\\377]';
 
+# VCS command support: class-like functions and strings
+
+my %VCS_cmds;
+
+my %VCS_cmds_git = (
+    "execute_cmd" => \&git_execute_cmd,
+    "available" => '(which("git") ne "") && (-d ".git")',
+    "find_signers_cmd" => "git log --since=\$email_git_since -- \$file",
+    "find_commit_signers_cmd" => "git log -1 \$commit",
+    "blame_range_cmd" => "git blame -l -L \$diff_start,+\$diff_length \$file",
+    "blame_file_cmd" => "git blame -l \$file",
+    "commit_pattern" => "^commit [0-9a-f]{40,40}",
+    "blame_commit_pattern" => "^([0-9a-f]+) "
+);
+
+my %VCS_cmds_hg = (
+    "execute_cmd" => \&hg_execute_cmd,
+    "available" => '(which("hg") ne "") && (-d ".hg")',
+    "find_signers_cmd" =>
+        "hg log --date=\$email_hg_since" .
+                " --template='commit {node}\\n{desc}\\n' -- \$file",
+    "find_commit_signers_cmd" => "hg log --template='{desc}\\n' -r \$commit",
+    "blame_range_cmd" => "",            # not supported
+    "blame_file_cmd" => "hg blame -c \$file",
+    "commit_pattern" => "^commit [0-9a-f]{40,40}",
+    "blame_commit_pattern" => "^([0-9a-f]+):"
+);
+
 if (!GetOptions(
                 'email!' => \$email,
                 'git!' => \$email_git,
+                'git-blame!' => \$email_git_blame,
                 'git-chief-penguins!' => \$email_git_penguin_chiefs,
                 'git-min-signatures=i' => \$email_git_min_signatures,
                 'git-max-maintainers=i' => \$email_git_max_maintainers,
                 'git-min-percent=i' => \$email_git_min_percent,
                 'git-since=s' => \$email_git_since,
-                'git-blame!' => \$email_git_blame,
+                'hg-since=s' => \$email_hg_since,
                 'remove-duplicates!' => \$email_remove_duplicates,
                 'm!' => \$email_maintainer,
                 'n!' => \$email_usename,
                 'l!' => \$email_list,
                 's!' => \$email_subscriber_list,
                 'multiline!' => \$output_multiline,
+                'roles!' => \$output_roles,
+                'rolestats!' => \$output_rolestats,
                 'separator=s' => \$output_separator,
                 'subsystem!' => \$subsystem,
                 'status!' => \$status,
@@ -90,8 +124,7 @@ if (!GetOptions(
                 'v|version' => \$version,
                 'h|help' => \$help,
                 )) {
-    usage();
-    die "$P: invalid argument\n";
+    die "$P: invalid argument - use --help if necessary\n";
 }
 
 if ($help != 0) {
@@ -113,6 +146,10 @@ if ($output_separator ne ", ") {
     $output_multiline = 0;
 }
 
+if ($output_rolestats) {
+    $output_roles = 1;
+}
+
 my $selections = $email + $scm + $status + $subsystem + $web;
 if ($selections == 0) {
     usage();
@@ -175,7 +212,7 @@ if ($email_remove_duplicates) {
         next if ($line =~ m/^\s*$/);
 
         my ($name, $address) = parse_email($line);
-        $line = format_email($name, $address);
+        $line = format_email($name, $address, $email_usename);
 
         next if ($line =~ m/^\s*$/);
 
@@ -207,12 +244,10 @@ foreach my $file (@ARGV) {
         push(@files, $file);
         if (-f $file && $keywords) {
             open(FILE, "<$file") or die "$P: Can't open ${file}\n";
-            while (<FILE>) {
-                my $patch_line = $_;
-                foreach my $line (keys %keyword_hash) {
-                    if ($patch_line =~ m/^.*$keyword_hash{$line}/x) {
-                        push(@keyword_tvi, $line);
-                    }
+            my $text = do { local($/) ; <FILE> };
+            foreach my $line (keys %keyword_hash) {
+                if ($text =~ m/$keyword_hash{$line}/x) {
+                    push(@keyword_tvi, $line);
                 }
             }
             close(FILE);
@@ -304,11 +339,11 @@ foreach my $file (@files) {
     }
 
     if ($email && $email_git) {
-        recent_git_signoffs($file);
+        vcs_file_signoffs($file);
     }
 
     if ($email && $email_git_blame) {
-        git_assign_blame($file);
+        vcs_file_blame($file);
     }
 }
 
@@ -324,11 +359,11 @@ if ($email) {
         if ($chief =~ m/^(.*):(.*)/) {
             my $email_address;
 
-            $email_address = format_email($1, $2);
+            $email_address = format_email($1, $2, $email_usename);
             if ($email_git_penguin_chiefs) {
-                push(@email_to, $email_address);
+                push(@email_to, [$email_address, 'chief penguin']);
             } else {
-                @email_to = grep(!/${email_address}/, @email_to);
+                @email_to = grep($_->[0] !~ /${email_address}/, @email_to);
             }
         }
     }
@@ -342,7 +377,7 @@ if ($email || $email_list) {
     if ($email_list) {
         @to = (@to, @list_to);
     }
-    output(uniq(@to));
+    output(merge_email(@to));
 }
 
 if ($scm) {
@@ -398,13 +433,16 @@ MAINTAINER field selection options:
     --git-min-signatures => number of signatures required (default: 1)
     --git-max-maintainers => maximum maintainers to add (default: 5)
     --git-min-percent => minimum percentage of commits required (default: 5)
-    --git-since => git history to use (default: 1-year-ago)
     --git-blame => use git blame to find modified commits for patch or file
+    --git-since => git history to use (default: 1-year-ago)
+    --hg-since => hg history to use (default: -365)
     --m => include maintainer(s) if any
     --n => include name 'Full Name <addr\@domain.tld>'
     --l => include list(s) if any
     --s => include subscriber only list(s) if any
     --remove-duplicates => minimize duplicate email names/addresses
+    --roles => show roles (status:subsystem, git-signer, list, etc...)
+    --rolestats => show roles and statistics (commits/total_commits, %)
   --scm => print SCM tree(s) if any
   --status => print status if any
   --subsystem => print subsystem name if any
@@ -430,11 +468,24 @@ Notes:
           directory are examined as git recurses directories.
           Any specified X: (exclude) pattern matches are _not_ ignored.
       Used with "--nogit", directory is used as a pattern match,
-         no individual file within the directory or subdirectory
-         is matched.
+          no individual file within the directory or subdirectory
+          is matched.
       Used with "--git-blame", does not iterate all files in directory
   Using "--git-blame" is slow and may add old committers and authors
       that are no longer active maintainers to the output.
+  Using "--roles" or "--rolestats" with git send-email --cc-cmd or any
+      other automated tools that expect only ["name"] <email address>
+      may not work because of additional output after <email address>.
+  Using "--rolestats" and "--git-blame" shows the #/total=% commits,
+      not the percentage of the entire file authored.  # of commits is
+      not a good measure of amount of code authored.  1 major commit may
+      contain a thousand lines, 5 trivial commits may modify a single line.
+  If git is not installed, but mercurial (hg) is installed and an .hg
+      repository exists, the following options apply to mercurial:
+          --git,
+          --git-min-signatures, --git-max-maintainers, --git-min-percent, and
+          --git-blame
+      Use --hg-since not --git-since to control date selection
 EOT
 }
 
@@ -493,7 +544,7 @@ sub parse_email {
 }
 
 sub format_email {
-    my ($name, $address) = @_;
+    my ($name, $address, $usename) = @_;
 
     my $formatted_email;
 
@@ -506,11 +557,11 @@ sub format_email {
         $name = "\"$name\"";
     }
 
-    if ($email_usename) {
+    if ($usename) {
         if ("$name" eq "") {
             $formatted_email = "$address";
         } else {
-            $formatted_email = "$name <${address}>";
+            $formatted_email = "$name <$address>";
         }
     } else {
         $formatted_email = $address;
@@ -547,6 +598,71 @@ sub find_ending_index {
     return $index;
 }
 
+sub get_maintainer_role {
+    my ($index) = @_;
+
+    my $i;
+    my $start = find_starting_index($index);
+    my $end = find_ending_index($index);
+
+    my $role;
+    my $subsystem = $typevalue[$start];
+    if (length($subsystem) > 20) {
+        $subsystem = substr($subsystem, 0, 17);
+        $subsystem =~ s/\s*$//;
+        $subsystem = $subsystem . "...";
+    }
+
+    for ($i = $start + 1; $i < $end; $i++) {
+        my $tv = $typevalue[$i];
+        if ($tv =~ m/^(\C):\s*(.*)/) {
+            my $ptype = $1;
+            my $pvalue = $2;
+            if ($ptype eq "S") {
+                $role = $pvalue;
+            }
+        }
+    }
+
+    $role = lc($role);
+    if      ($role eq "supported") {
+        $role = "supporter";
+    } elsif ($role eq "maintained") {
+        $role = "maintainer";
+    } elsif ($role eq "odd fixes") {
+        $role = "odd fixer";
+    } elsif ($role eq "orphan") {
+        $role = "orphan minder";
+    } elsif ($role eq "obsolete") {
+        $role = "obsolete minder";
+    } elsif ($role eq "buried alive in reporters") {
+        $role = "chief penguin";
+    }
+
+    return $role . ":" . $subsystem;
+}
+
+sub get_list_role {
+    my ($index) = @_;
+
+    my $i;
+    my $start = find_starting_index($index);
+    my $end = find_ending_index($index);
+
+    my $subsystem = $typevalue[$start];
+    if (length($subsystem) > 20) {
+        $subsystem = substr($subsystem, 0, 17);
+        $subsystem =~ s/\s*$//;
+        $subsystem = $subsystem . "...";
+    }
+
+    if ($subsystem eq "THE REST") {
+        $subsystem = "";
+    }
+
+    return $subsystem;
+}
+
 sub add_categories {
     my ($index) = @_;
 
@@ -564,17 +680,22 @@ sub add_categories {
             if ($ptype eq "L") {
                 my $list_address = $pvalue;
                 my $list_additional = "";
+                my $list_role = get_list_role($i);
+
+                if ($list_role ne "") {
+                    $list_role = ":" . $list_role;
+                }
                 if ($list_address =~ m/([^\s]+)\s+(.*)$/) {
                     $list_address = $1;
                     $list_additional = $2;
                 }
                 if ($list_additional =~ m/subscribers-only/) {
                     if ($email_subscriber_list) {
-                        push(@list_to, $list_address);
+                        push(@list_to, [$list_address, "subscriber list${list_role}"]);
                     }
                 } else {
                     if ($email_list) {
-                        push(@list_to, $list_address);
+                        push(@list_to, [$list_address, "open list${list_role}"]);
                     }
                 }
             } elsif ($ptype eq "M") {
@@ -585,13 +706,14 @@ sub add_categories {
                         if ($tv =~ m/^(\C):\s*(.*)/) {
                             if ($1 eq "P") {
                                 $name = $2;
-                                $pvalue = format_email($name, $address);
+                                $pvalue = format_email($name, $address, $email_usename);
                             }
                         }
                     }
                 }
                 if ($email_maintainer) {
-                    push_email_addresses($pvalue);
+                    my $role = get_maintainer_role($i);
+                    push_email_addresses($pvalue, $role);
                 }
             } elsif ($ptype eq "T") {
                 push(@scm, $pvalue);
@@ -618,7 +740,7 @@ sub email_inuse {
 }
 
 sub push_email_address {
-    my ($line) = @_;
+    my ($line, $role) = @_;
 
     my ($name, $address) = parse_email($line);
 
@@ -627,9 +749,9 @@ sub push_email_address {
     }
 
     if (!$email_remove_duplicates) {
-        push(@email_to, format_email($name, $address));
+        push(@email_to, [format_email($name, $address, $email_usename), $role]);
     } elsif (!email_inuse($name, $address)) {
-        push(@email_to, format_email($name, $address));
+        push(@email_to, [format_email($name, $address, $email_usename), $role]);
         $email_hash_name{$name}++;
         $email_hash_address{$address}++;
     }
@@ -638,24 +760,52 @@ sub push_email_address {
 }
 
 sub push_email_addresses {
-    my ($address) = @_;
+    my ($address, $role) = @_;
 
     my @address_list = ();
 
     if (rfc822_valid($address)) {
-        push_email_address($address);
+        push_email_address($address, $role);
     } elsif (@address_list = rfc822_validlist($address)) {
         my $array_count = shift(@address_list);
         while (my $entry = shift(@address_list)) {
-            push_email_address($entry);
+            push_email_address($entry, $role);
         }
     } else {
-        if (!push_email_address($address)) {
+        if (!push_email_address($address, $role)) {
             warn("Invalid MAINTAINERS address: '" . $address . "'\n");
         }
     }
 }
 
+sub add_role {
+    my ($line, $role) = @_;
+
+    my ($name, $address) = parse_email($line);
+    my $email = format_email($name, $address, $email_usename);
+
+    foreach my $entry (@email_to) {
+        if ($email_remove_duplicates) {
+            my ($entry_name, $entry_address) = parse_email($entry->[0]);
+            if ($name eq $entry_name || $address eq $entry_address) {
+                if ($entry->[1] eq "") {
+                    $entry->[1] = "$role";
+                } else {
+                    $entry->[1] = "$entry->[1],$role";
+                }
+            }
+        } else {
+            if ($email eq $entry->[0]) {
+                if ($entry->[1] eq "") {
+                    $entry->[1] = "$role";
+                } else {
+                    $entry->[1] = "$entry->[1],$role";
+                }
+            }
+        }
+    }
+}
+
 sub which {
     my ($bin) = @_;
 
@@ -669,7 +819,7 @@ sub which {
 }
 
 sub mailmap {
-    my @lines = @_;
+    my (@lines) = @_;
     my %hash;
 
     foreach my $line (@lines) {
@@ -678,14 +828,14 @@ sub mailmap {
             $hash{$name} = $address;
         } elsif ($address ne $hash{$name}) {
             $address = $hash{$name};
-            $line = format_email($name, $address);
+            $line = format_email($name, $address, $email_usename);
         }
         if (exists($mailmap{$name})) {
             my $obj = $mailmap{$name};
             foreach my $map_address (@$obj) {
                 if (($map_address eq $address) &&
                     ($map_address ne $hash{$name})) {
-                    $line = format_email($name, $hash{$name});
+                    $line = format_email($name, $hash{$name}, $email_usename);
                 }
             }
         }
@@ -694,34 +844,38 @@ sub mailmap {
     return @lines;
 }
 
-sub recent_git_signoffs {
-    my ($file) = @_;
-
-    my $sign_offs = "";
-    my $cmd = "";
-    my $output = "";
-    my $count = 0;
+sub git_execute_cmd {
+    my ($cmd) = @_;
     my @lines = ();
-    my %hash;
-    my $total_sign_offs;
 
-    if (which("git") eq "") {
-        warn("$P: git not found.  Add --nogit to options?\n");
-        return;
-    }
-    if (!(-d ".git")) {
-        warn("$P: .git directory not found.  Use a git repository for better results.\n");
-        warn("$P: perhaps 'git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git'\n");
-        return;
-    }
+    my $output = `$cmd`;
+    $output =~ s/^\s*//gm;
+    @lines = split("\n", $output);
 
-    $cmd = "git log --since=${email_git_since} -- ${file}";
+    return @lines;
+}
 
-    $output = `${cmd}`;
-    $output =~ s/^\s*//gm;
+sub hg_execute_cmd {
+    my ($cmd) = @_;
+    my @lines = ();
 
+    my $output = `$cmd`;
     @lines = split("\n", $output);
 
+    return @lines;
+}
+
+sub vcs_find_signers {
+    my ($cmd) = @_;
+    my @lines = ();
+    my $commits;
+
+    @lines = &{$VCS_cmds{"execute_cmd"}}($cmd);
+
+    my $pattern = $VCS_cmds{"commit_pattern"};
+
+    $commits = grep(/$pattern/, @lines);        # of commits
+
     @lines = grep(/^[-_         a-z]+by:.*\@.*$/i, @lines);
     if (!$email_git_penguin_chiefs) {
         @lines = grep(!/${penguin_chiefs}/i, @lines);
@@ -729,111 +883,183 @@ sub recent_git_signoffs {
     # cut -f2- -d":"
     s/.*:\s*(.+)\s*/$1/ for (@lines);
 
-    $total_sign_offs = @lines;
+## Reformat email addresses (with names) to avoid badly written signatures
 
-    if ($email_remove_duplicates) {
-        @lines = mailmap(@lines);
+    foreach my $line (@lines) {
+        my ($name, $address) = parse_email($line);
+        $line = format_email($name, $address, 1);
     }
 
-    @lines = sort(@lines);
-
-    # uniq -c
-    $hash{$_}++ for @lines;
-
-    # sort -rn
-    foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
-        my $sign_offs = $hash{$line};
-        $count++;
-        last if ($sign_offs < $email_git_min_signatures ||
-                 $count > $email_git_max_maintainers ||
-                 $sign_offs * 100 / $total_sign_offs < $email_git_min_percent);
-        push_email_address($line);
-    }
+    return ($commits, @lines);
 }
 
-sub save_commits {
-    my ($cmd, @commits) = @_;
-    my $output;
+sub vcs_save_commits {
+    my ($cmd) = @_;
     my @lines = ();
+    my @commits = ();
 
-    $output = `${cmd}`;
+    @lines = &{$VCS_cmds{"execute_cmd"}}($cmd);
 
-    @lines = split("\n", $output);
     foreach my $line (@lines) {
-        if ($line =~ m/^(\w+) /) {
-            push (@commits, $1);
+        if ($line =~ m/$VCS_cmds{"blame_commit_pattern"}/) {
+            push(@commits, $1);
         }
     }
+
     return @commits;
 }
 
-sub git_assign_blame {
+sub vcs_blame {
     my ($file) = @_;
-
-    my @lines = ();
-    my @commits = ();
     my $cmd;
-    my $output;
-    my %hash;
-    my $total_sign_offs;
-    my $count;
+    my @commits = ();
+
+    return @commits if (!(-f $file));
+
+    if (@range && $VCS_cmds{"blame_range_cmd"} eq "") {
+        my @all_commits = ();
+
+        $cmd = $VCS_cmds{"blame_file_cmd"};
+        $cmd =~ s/(\$\w+)/$1/eeg;               #interpolate $cmd
+        @all_commits = vcs_save_commits($cmd);
 
-    if (@range) {
         foreach my $file_range_diff (@range) {
             next if (!($file_range_diff =~ m/(.+):(.+):(.+)/));
             my $diff_file = $1;
             my $diff_start = $2;
             my $diff_length = $3;
-            next if (!("$file" eq "$diff_file"));
-            $cmd = "git blame -l -L $diff_start,+$diff_length $file";
-            @commits = save_commits($cmd, @commits);
+            next if ("$file" ne "$diff_file");
+            for (my $i = $diff_start; $i < $diff_start + $diff_length; $i++) {
+                push(@commits, $all_commits[$i]);
+            }
         }
-    } else {
-        if (-f $file) {
-            $cmd = "git blame -l $file";
-            @commits = save_commits($cmd, @commits);
+    } elsif (@range) {
+        foreach my $file_range_diff (@range) {
+            next if (!($file_range_diff =~ m/(.+):(.+):(.+)/));
+            my $diff_file = $1;
+            my $diff_start = $2;
+            my $diff_length = $3;
+            next if ("$file" ne "$diff_file");
+            $cmd = $VCS_cmds{"blame_range_cmd"};
+            $cmd =~ s/(\$\w+)/$1/eeg;           #interpolate $cmd
+            push(@commits, vcs_save_commits($cmd));
         }
+    } else {
+        $cmd = $VCS_cmds{"blame_file_cmd"};
+        $cmd =~ s/(\$\w+)/$1/eeg;               #interpolate $cmd
+        @commits = vcs_save_commits($cmd);
     }
 
-    $total_sign_offs = 0;
-    @commits = uniq(@commits);
-    foreach my $commit (@commits) {
-        $cmd = "git log -1 ${commit}";
+    return @commits;
+}
 
-        $output = `${cmd}`;
-        $output =~ s/^\s*//gm;
-        @lines = split("\n", $output);
+my $printed_novcs = 0;
+sub vcs_exists {
+    %VCS_cmds = %VCS_cmds_git;
+    return 1 if eval $VCS_cmds{"available"};
+    %VCS_cmds = %VCS_cmds_hg;
+    return 1 if eval $VCS_cmds{"available"};
+    %VCS_cmds = ();
+    if (!$printed_novcs) {
+        warn("$P: No supported VCS found.  Add --nogit to options?\n");
+        warn("Using a git repository produces better results.\n");
+        warn("Try Linus Torvalds' latest git repository using:\n");
+        warn("git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n");
+        $printed_novcs = 1;
+    }
+    return 0;
+}
 
-        @lines = grep(/^[-_     a-z]+by:.*\@.*$/i, @lines);
-        if (!$email_git_penguin_chiefs) {
-            @lines = grep(!/${penguin_chiefs}/i, @lines);
-        }
+sub vcs_assign {
+    my ($role, $divisor, @lines) = @_;
 
-        # cut -f2- -d":"
-        s/.*:\s*(.+)\s*/$1/ for (@lines);
+    my %hash;
+    my $count = 0;
 
-        $total_sign_offs += @lines;
+    return if (@lines <= 0);
 
-        if ($email_remove_duplicates) {
-            @lines = mailmap(@lines);
-        }
+    if ($divisor <= 0) {
+        warn("Bad divisor in " . (caller(0))[3] . ": $divisor\n");
+        $divisor = 1;
+    }
 
-        $hash{$_}++ for @lines;
+    if ($email_remove_duplicates) {
+        @lines = mailmap(@lines);
     }
 
-    $count = 0;
+    @lines = sort(@lines);
+
+    # uniq -c
+    $hash{$_}++ for @lines;
+
+    # sort -rn
     foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
         my $sign_offs = $hash{$line};
+        my $percent = $sign_offs * 100 / $divisor;
+
+        $percent = 100 if ($percent > 100);
         $count++;
         last if ($sign_offs < $email_git_min_signatures ||
                  $count > $email_git_max_maintainers ||
-                 $sign_offs * 100 / $total_sign_offs < $email_git_min_percent);
-        push_email_address($line);
+                 $percent < $email_git_min_percent);
+        push_email_address($line, '');
+        if ($output_rolestats) {
+            my $fmt_percent = sprintf("%.0f", $percent);
+            add_role($line, "$role:$sign_offs/$divisor=$fmt_percent%");
+        } else {
+            add_role($line, $role);
+        }
+    }
+}
+
+sub vcs_file_signoffs {
+    my ($file) = @_;
+
+    my @signers = ();
+    my $commits;
+
+    return if (!vcs_exists());
+
+    my $cmd = $VCS_cmds{"find_signers_cmd"};
+    $cmd =~ s/(\$\w+)/$1/eeg;           # interpolate $cmd
+
+    ($commits, @signers) = vcs_find_signers($cmd);
+    vcs_assign("commit_signer", $commits, @signers);
+}
+
+sub vcs_file_blame {
+    my ($file) = @_;
+
+    my @signers = ();
+    my @commits = ();
+    my $total_commits;
+
+    return if (!vcs_exists());
+
+    @commits = vcs_blame($file);
+    @commits = uniq(@commits);
+    $total_commits = @commits;
+
+    foreach my $commit (@commits) {
+        my $commit_count;
+        my @commit_signers = ();
+
+        my $cmd = $VCS_cmds{"find_commit_signers_cmd"};
+        $cmd =~ s/(\$\w+)/$1/eeg;       #interpolate $cmd
+
+        ($commit_count, @commit_signers) = vcs_find_signers($cmd);
+        push(@signers, @commit_signers);
+    }
+
+    if ($from_filename) {
+        vcs_assign("commits", $total_commits, @signers);
+    } else {
+        vcs_assign("modified commits", $total_commits, @signers);
     }
 }
 
 sub uniq {
-    my @parms = @_;
+    my (@parms) = @_;
 
     my %saw;
     @parms = grep(!$saw{$_}++, @parms);
@@ -841,7 +1067,7 @@ sub uniq {
 }
 
 sub sort_and_uniq {
-    my @parms = @_;
+    my (@parms) = @_;
 
     my %saw;
     @parms = sort @parms;
@@ -849,8 +1075,27 @@ sub sort_and_uniq {
     return @parms;
 }
 
+sub merge_email {
+    my @lines;
+    my %saw;
+
+    for (@_) {
+        my ($address, $role) = @$_;
+        if (!$saw{$address}) {
+            if ($output_roles) {
+                push(@lines, "$address ($role)");
+            } else {
+                push(@lines, $address);
+            }
+            $saw{$address} = 1;
+        }
+    }
+
+    return @lines;
+}
+
 sub output {
-    my @parms = @_;
+    my (@parms) = @_;
 
     if ($output_multiline) {
         foreach my $line (@parms) {
@@ -947,11 +1192,9 @@ sub rfc822_validlist ($) {
     if ($s =~ m/^(?:$rfc822re)?(?:,(?:$rfc822re)?)*$/so &&
         $s =~ m/^$rfc822_char*$/) {
         while ($s =~ m/(?:^|,$rfc822_lwsp*)($rfc822re)/gos) {
-            push @r, $1;
+            push(@r, $1);
         }
         return wantarray ? (scalar(@r), @r) : 1;
     }
-    else {
-        return wantarray ? () : 0;
-    }
+    return wantarray ? () : 0;
 }
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index b4b48afb6de6..5d9411839cd7 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -159,7 +159,7 @@ static int pxa2xx_ac97_resume(struct device *dev)
         return ret;
 }
 
-static struct dev_pm_ops pxa2xx_ac97_pm_ops = {
+static const struct dev_pm_ops pxa2xx_ac97_pm_ops = {
         .suspend        = pxa2xx_ac97_suspend,
         .resume         = pxa2xx_ac97_resume,
 };
diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c
index 661205c4dcea..af888a022fc0 100644
--- a/sound/isa/gus/gus_mem.c
+++ b/sound/isa/gus/gus_mem.c
@@ -127,7 +127,8 @@ static struct snd_gf1_mem_block *snd_gf1_mem_share(struct snd_gf1_mem * alloc,
             !share_id[2] && !share_id[3])
                 return NULL;
         for (block = alloc->first; block; block = block->next)
-                if (!memcmp(share_id, block->share_id, sizeof(share_id)))
+                if (!memcmp(share_id, block->share_id,
+                                sizeof(block->share_id)))
                         return block;
         return NULL;
 }
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 20cb60afb200..c11920623009 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -2122,7 +2122,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
                 }
                 /* nothing should be in powerdown mode */
                 snd_ac97_write_cache(ac97, AC97_GENERAL_PURPOSE, 0);
-                end_time = jiffies + msecs_to_jiffies(120);
+                end_time = jiffies + msecs_to_jiffies(5000);
                 do {
                         if ((snd_ac97_read(ac97, AC97_POWERDOWN) & 0x0f) == 0x0f)
                                 goto __ready_ok;
diff --git a/sound/pci/cs5535audio/Makefile b/sound/pci/cs5535audio/Makefile
index fda7a94c992f..ccc642269b9e 100644
--- a/sound/pci/cs5535audio/Makefile
+++ b/sound/pci/cs5535audio/Makefile
@@ -4,9 +4,7 @@
 
 snd-cs5535audio-y := cs5535audio.o cs5535audio_pcm.o
 snd-cs5535audio-$(CONFIG_PM) += cs5535audio_pm.o
-ifdef CONFIG_MGEODE_LX
 snd-cs5535audio-$(CONFIG_OLPC) += cs5535audio_olpc.o
-endif
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_CS5535AUDIO) += snd-cs5535audio.o
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 05f56e04849b..91e7faf69bbb 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -389,6 +389,7 @@ probefail_out:
 
 static void __devexit snd_cs5535audio_remove(struct pci_dev *pci)
 {
+        olpc_quirks_cleanup();
         snd_card_free(pci_get_drvdata(pci));
         pci_set_drvdata(pci, NULL);
 }
diff --git a/sound/pci/cs5535audio/cs5535audio.h b/sound/pci/cs5535audio/cs5535audio.h
index 7a298ac662e3..51966d782a3c 100644
--- a/sound/pci/cs5535audio/cs5535audio.h
+++ b/sound/pci/cs5535audio/cs5535audio.h
@@ -99,10 +99,11 @@ int snd_cs5535audio_suspend(struct pci_dev *pci, pm_message_t state);
 int snd_cs5535audio_resume(struct pci_dev *pci);
 #endif
 
-#if defined(CONFIG_OLPC) && defined(CONFIG_MGEODE_LX)
+#ifdef CONFIG_OLPC
 void __devinit olpc_prequirks(struct snd_card *card,
                 struct snd_ac97_template *ac97);
 int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97);
+void __devexit olpc_quirks_cleanup(void);
 void olpc_analog_input(struct snd_ac97 *ac97, int on);
 void olpc_mic_bias(struct snd_ac97 *ac97, int on);
 
@@ -128,6 +129,7 @@ static inline int olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)
 {
         return 0;
 }
+static inline void olpc_quirks_cleanup(void) { }
 static inline void olpc_analog_input(struct snd_ac97 *ac97, int on) { }
 static inline void olpc_mic_bias(struct snd_ac97 *ac97, int on) { }
 static inline void olpc_capture_open(struct snd_ac97 *ac97) { }
diff --git a/sound/pci/cs5535audio/cs5535audio_olpc.c b/sound/pci/cs5535audio/cs5535audio_olpc.c
index 5c6814335cd7..50da49be9ae5 100644
--- a/sound/pci/cs5535audio/cs5535audio_olpc.c
+++ b/sound/pci/cs5535audio/cs5535audio_olpc.c
@@ -13,10 +13,13 @@
 #include <sound/info.h>
 #include <sound/control.h>
 #include <sound/ac97_codec.h>
+#include <linux/gpio.h>
 
 #include <asm/olpc.h>
 #include "cs5535audio.h"
 
+#define DRV_NAME "cs5535audio-olpc"
+
 /*
  * OLPC has an additional feature on top of the regular AD1888 codec features.
  * It has an Analog Input mode that is switched into (after disabling the
@@ -38,10 +41,7 @@ void olpc_analog_input(struct snd_ac97 *ac97, int on)
         }
 
         /* set Analog Input through GPIO */
-        if (on)
-                geode_gpio_set(OLPC_GPIO_MIC_AC, GPIO_OUTPUT_VAL);
-        else
-                geode_gpio_clear(OLPC_GPIO_MIC_AC, GPIO_OUTPUT_VAL);
+        gpio_set_value(OLPC_GPIO_MIC_AC, on);
 }
 
 /*
@@ -73,8 +73,7 @@ static int olpc_dc_info(struct snd_kcontrol *kctl,
 
 static int olpc_dc_get(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *v)
 {
-        v->value.integer.value[0] = geode_gpio_isset(OLPC_GPIO_MIC_AC,
-                        GPIO_OUTPUT_VAL);
+        v->value.integer.value[0] = gpio_get_value(OLPC_GPIO_MIC_AC);
         return 0;
 }
 
@@ -153,6 +152,12 @@ int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)
         if (!machine_is_olpc())
                 return 0;
 
+        if (gpio_request(OLPC_GPIO_MIC_AC, DRV_NAME)) {
+                printk(KERN_ERR DRV_NAME ": unable to allocate MIC GPIO\n");
+                return -EIO;
+        }
+        gpio_direction_output(OLPC_GPIO_MIC_AC, 0);
+
         /* drop the original AD1888 HPF control */
         memset(&elem, 0, sizeof(elem));
         elem.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
@@ -169,11 +174,18 @@ int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)
         for (i = 0; i < ARRAY_SIZE(olpc_cs5535audio_ctls); i++) {
                 err = snd_ctl_add(card, snd_ctl_new1(&olpc_cs5535audio_ctls[i],
                                 ac97->private_data));
-                if (err < 0)
+                if (err < 0) {
+                        gpio_free(OLPC_GPIO_MIC_AC);
                         return err;
+                }
         }
 
         /* turn off the mic by default */
         olpc_mic_bias(ac97, 0);
         return 0;
 }
+
+void __devexit olpc_quirks_cleanup(void)
+{
+        gpio_free(OLPC_GPIO_MIC_AC);
+}
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index d24328661c6a..40ccb419b6e9 100644
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -24,6 +24,7 @@
 #include <linux/compat.h>
 #include <linux/mutex.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/firmware.h>
 #include <sound/core.h>
 #include "hda_codec.h"
@@ -428,8 +429,7 @@ static int parse_hints(struct hda_codec *codec, const char *buf)
         char *key, *val;
         struct hda_hint *hint;
 
-        while (isspace(*buf))
-                buf++;
+        buf = skip_spaces(buf);
         if (!*buf || *buf == '#' || *buf == '\n')
                 return 0;
         if (*buf == '=')
@@ -444,8 +444,7 @@ static int parse_hints(struct hda_codec *codec, const char *buf)
                 return -EINVAL;
         }
         *val++ = 0;
-        while (isspace(*val))
-                val++;
+        val = skip_spaces(val);
         remove_trail_spaces(key);
         remove_trail_spaces(val);
         hint = get_hint(codec, key);
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index e54420e691ae..9b56f937913e 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2713,6 +2713,9 @@ static struct pci_device_id azx_ids[] = {
         { PCI_DEVICE(0x10de, 0x0ac1), .driver_data = AZX_DRIVER_NVIDIA },
         { PCI_DEVICE(0x10de, 0x0ac2), .driver_data = AZX_DRIVER_NVIDIA },
         { PCI_DEVICE(0x10de, 0x0ac3), .driver_data = AZX_DRIVER_NVIDIA },
+        { PCI_DEVICE(0x10de, 0x0be2), .driver_data = AZX_DRIVER_NVIDIA },
+        { PCI_DEVICE(0x10de, 0x0be3), .driver_data = AZX_DRIVER_NVIDIA },
+        { PCI_DEVICE(0x10de, 0x0be4), .driver_data = AZX_DRIVER_NVIDIA },
         { PCI_DEVICE(0x10de, 0x0d94), .driver_data = AZX_DRIVER_NVIDIA },
         { PCI_DEVICE(0x10de, 0x0d95), .driver_data = AZX_DRIVER_NVIDIA },
         { PCI_DEVICE(0x10de, 0x0d96), .driver_data = AZX_DRIVER_NVIDIA },
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 447eda1f6770..1a36137e13ec 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -1789,6 +1789,14 @@ static int patch_ad1981(struct hda_codec *codec)
 
                 codec->patch_ops.init = ad1981_hp_init;
                 codec->patch_ops.unsol_event = ad1981_hp_unsol_event;
+                /* set the upper-limit for mixer amp to 0dB for avoiding the
+                 * possible damage by overloading
+                 */
+                snd_hda_override_amp_caps(codec, 0x11, HDA_INPUT,
+                                          (0x17 << AC_AMPCAP_OFFSET_SHIFT) |
+                                          (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) |
+                                          (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) |
+                                          (1 << AC_AMPCAP_MUTE_SHIFT));
                 break;
         case AD1981_THINKPAD:
                 spec->mixers[0] = ad1981_thinkpad_mixers;
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 888b6313eeca..aeed4cc5aa79 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6248,6 +6248,7 @@ static const char *alc260_models[ALC260_MODEL_LAST] = {
 
 static struct snd_pci_quirk alc260_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x007b, "Acer C20x", ALC260_ACER),
+        SND_PCI_QUIRK(0x1025, 0x007f, "Acer", ALC260_WILL),
         SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_ACER),
         SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FAVORIT100),
         SND_PCI_QUIRK(0x103c, 0x2808, "HP d5700", ALC260_HP_3013),
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index c9438dd62df3..dbc368c08263 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -199,7 +199,7 @@ static void wm8900_reset(struct snd_soc_codec *codec)
         snd_soc_write(codec, WM8900_REG_RESET, 0);
 
         memcpy(codec->reg_cache, wm8900_reg_defaults,
-               sizeof(codec->reg_cache));
+               sizeof(wm8900_reg_defaults));
 }
 
 static int wm8900_hp_event(struct snd_soc_dapm_widget *w,
diff --git a/sound/soc/s3c24xx/s3c24xx_simtec.c b/sound/soc/s3c24xx/s3c24xx_simtec.c
index d441c3b64631..4984754f3298 100644
--- a/sound/soc/s3c24xx/s3c24xx_simtec.c
+++ b/sound/soc/s3c24xx/s3c24xx_simtec.c
@@ -312,7 +312,7 @@ int simtec_audio_resume(struct device *dev)
         return 0;
 }
 
-struct dev_pm_ops simtec_audio_pmops = {
+const struct dev_pm_ops simtec_audio_pmops = {
         .resume = simtec_audio_resume,
 };
 EXPORT_SYMBOL_GPL(simtec_audio_pmops);
diff --git a/sound/soc/s3c24xx/s3c24xx_simtec.h b/sound/soc/s3c24xx/s3c24xx_simtec.h
index 2714203af161..e18faee30cce 100644
--- a/sound/soc/s3c24xx/s3c24xx_simtec.h
+++ b/sound/soc/s3c24xx/s3c24xx_simtec.h
@@ -15,7 +15,7 @@ extern int simtec_audio_core_probe(struct platform_device *pdev,
 extern int simtec_audio_remove(struct platform_device *pdev);
 
 #ifdef CONFIG_PM
-extern struct dev_pm_ops simtec_audio_pmops;
+extern const struct dev_pm_ops simtec_audio_pmops;
 #define simtec_audio_pm &simtec_audio_pmops
 #else
 #define simtec_audio_pm NULL
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ef8f28284cb9..0a6440c6f54a 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1236,7 +1236,7 @@ static int soc_poweroff(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops soc_pm_ops = {
+static const struct dev_pm_ops soc_pm_ops = {
         .suspend = soc_suspend,
         .resume = soc_resume,
         .poweroff = soc_poweroff,