545 files changed, 10488 insertions, 4583 deletions

diff --git a/Documentation/cachetlb.txt b/Documentation/cachetlb.txt
index 53245c429f7d..73e794f0ff09 100644
--- a/Documentation/cachetlb.txt
+++ b/Documentation/cachetlb.txt
@@ -179,10 +179,21 @@ Here are the routines, one by one:
         lines associated with 'mm'.
 
         This interface is used to handle whole address space
-        page table operations such as what happens during
-        fork, exit, and exec.
+        page table operations such as what happens during exit and exec.
+
+2) void flush_cache_dup_mm(struct mm_struct *mm)
+
+        This interface flushes an entire user address space from
+        the caches.  That is, after running, there will be no cache
+        lines associated with 'mm'.
+
+        This interface is used to handle whole address space
+        page table operations such as what happens during fork.
+
+        This option is separate from flush_cache_mm to allow some
+        optimizations for VIPT caches.
 
-2) void flush_cache_range(struct vm_area_struct *vma,
+3) void flush_cache_range(struct vm_area_struct *vma,
                           unsigned long start, unsigned long end)
 
         Here we are flushing a specific range of (user) virtual
@@ -199,7 +210,7 @@ Here are the routines, one by one:
         call flush_cache_page (see below) for each entry which may be
         modified.
 
-3) void flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn)
+4) void flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn)
 
         This time we need to remove a PAGE_SIZE sized range
         from the cache.  The 'vma' is the backing structure used by
@@ -220,7 +231,7 @@ Here are the routines, one by one:
 
         This is used primarily during fault processing.
 
-4) void flush_cache_kmaps(void)
+5) void flush_cache_kmaps(void)
 
         This routine need only be implemented if the platform utilizes
         highmem.  It will be called right before all of the kmaps
@@ -232,7 +243,7 @@ Here are the routines, one by one:
 
         This routing should be implemented in asm/highmem.h
 
-5) void flush_cache_vmap(unsigned long start, unsigned long end)
+6) void flush_cache_vmap(unsigned long start, unsigned long end)
    void flush_cache_vunmap(unsigned long start, unsigned long end)
 
         Here in these two interfaces we are flushing a specific range
diff --git a/Documentation/cpu-freq/core.txt b/Documentation/cpu-freq/core.txt
index 29b3f9ffc66c..ce0666e51036 100644
--- a/Documentation/cpu-freq/core.txt
+++ b/Documentation/cpu-freq/core.txt
@@ -24,7 +24,7 @@ Contents:
 1. General Information
 =======================
 
-The CPUFreq core code is located in linux/kernel/cpufreq.c. This
+The CPUFreq core code is located in drivers/cpufreq/cpufreq.c. This
 cpufreq code offers a standardized interface for the CPUFreq
 architecture drivers (those pieces of code that do actual
 frequency transitions), as well as to "notifiers". These are device
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 031029e89fd9..040f437c421b 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -151,15 +151,6 @@ Who:	Thomas Gleixner <tglx@linutronix.de>
 
 ---------------------------
 
-What:   I2C interface of the it87 driver
-When:   January 2007
-Why:    The ISA interface is faster and should be always available. The I2C
-        probing is also known to cause trouble in at least one case (see
-        bug #5889.)
-Who:    Jean Delvare <khali@linux-fr.org>
-
----------------------------
-
 What:   Unused EXPORT_SYMBOL/EXPORT_SYMBOL_GPL exports
         (temporary transition config option provided until then)
         The transition config option will also be removed at the same time.
@@ -259,3 +250,25 @@ Why:	The new layer 3 independant connection tracking replaces the old
 Who:    Patrick McHardy <kaber@trash.net>
 
 ---------------------------
+
+What:   ACPI hooks (X86_SPEEDSTEP_CENTRINO_ACPI) in speedstep-centrino driver
+When:   December 2006
+Why:    Speedstep-centrino driver with ACPI hooks and acpi-cpufreq driver are
+        functionally very much similar. They talk to ACPI in same way. Only
+        difference between them is the way they do frequency transitions.
+        One uses MSRs and the other one uses IO ports. Functionaliy of
+        speedstep_centrino with ACPI hooks is now merged into acpi-cpufreq.
+        That means one common driver will support all Intel Enhanced Speedstep
+        capable CPUs. That means less confusion over name of
+        speedstep-centrino driver (with that driver supposed to be used on
+        non-centrino platforms). That means less duplication of code and
+        less maintenance effort and no possibility of these two drivers
+        going out of sync.
+        Current users of speedstep_centrino with ACPI hooks are requested to
+        switch over to acpi-cpufreq driver. speedstep-centrino will continue
+        to work using older non-ACPI static table based scheme even after this
+        date.
+
+Who:    Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
+
+---------------------------
diff --git a/Documentation/filesystems/bfs.txt b/Documentation/filesystems/bfs.txt
index d2841e0bcf02..ea825e178e79 100644
--- a/Documentation/filesystems/bfs.txt
+++ b/Documentation/filesystems/bfs.txt
@@ -54,4 +54,4 @@ The first 4 bytes should be 0x1badface.
 If you have any patches, questions or suggestions regarding this BFS
 implementation please contact the author:
 
-Tigran A. Aivazian <tigran@veritas.com>
+Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
diff --git a/Documentation/hwmon/f71805f b/Documentation/hwmon/f71805f
index 2ca69df669c3..bfd0f154959c 100644
--- a/Documentation/hwmon/f71805f
+++ b/Documentation/hwmon/f71805f
@@ -6,6 +6,10 @@ Supported chips:
     Prefix: 'f71805f'
     Addresses scanned: none, address read from Super I/O config space
     Datasheet: Provided by Fintek on request
+  * Fintek F71872F/FG
+    Prefix: 'f71872f'
+    Addresses scanned: none, address read from Super I/O config space
+    Datasheet: Provided by Fintek on request
 
 Author: Jean Delvare <khali@linux-fr.org>
 
@@ -13,8 +17,8 @@ Thanks to Denis Kieft from Barracuda Networks for the donation of a
 test system (custom Jetway K8M8MS motherboard, with CPU and RAM) and
 for providing initial documentation.
 
-Thanks to Kris Chen from Fintek for answering technical questions and
-providing additional documentation.
+Thanks to Kris Chen and Aaron Huang from Fintek for answering technical
+questions and providing additional documentation.
 
 Thanks to Chris Lin from Jetway for providing wiring schematics and
 answering technical questions.
@@ -28,8 +32,11 @@ capabilities. It can monitor up to 9 voltages (counting its own power
 source), 3 fans and 3 temperature sensors.
 
 This chip also has fan controlling features, using either DC or PWM, in
-three different modes (one manual, two automatic). The driver doesn't
-support these features yet.
+three different modes (one manual, two automatic).
+
+The Fintek F71872F/FG Super I/O chip is almost the same, with two
+additional internal voltages monitored (VSB and battery). It also features
+6 VID inputs. The VID inputs are not yet supported by this driver.
 
 The driver assumes that no more than one chip is present, which seems
 reasonable.
@@ -42,7 +49,8 @@ Voltages are sampled by an 8-bit ADC with a LSB of 8 mV. The supported
 range is thus from 0 to 2.040 V. Voltage values outside of this range
 need external resistors. An exception is in0, which is used to monitor
 the chip's own power source (+3.3V), and is divided internally by a
-factor 2.
+factor 2. For the F71872F/FG, in9 (VSB) and in10 (battery) are also
+divided internally by a factor 2.
 
 The two LSB of the voltage limit registers are not used (always 0), so
 you can only set the limits in steps of 32 mV (before scaling).
@@ -61,9 +69,12 @@ in5     VIN5    +12V        200K     20K       11.00    1.05 V
 in6     VIN6    VCC1.5V      10K       -        1.00    1.50 V
 in7     VIN7    VCORE        10K       -        1.00   ~1.40 V (1)
 in8     VIN8    VSB5V       200K     47K        1.00    0.95 V
+in10    VSB     VSB3.3V     int.    int.        2.00    1.65 V (3)
+in9     VBAT    VBATTERY    int.    int.        2.00    1.50 V (3)
 
 (1) Depends on your hardware setup.
 (2) Obviously not correct, swapping R1 and R2 would make more sense.
+(3) F71872F/FG only.
 
 These values can be used as hints at best, as motherboard manufacturers
 are free to use a completely different setup. As a matter of fact, the
@@ -103,3 +114,38 @@ sensor. Each channel can be used for connecting either a thermal diode
 or a thermistor. The driver reports the currently selected mode, but
 doesn't allow changing it. In theory, the BIOS should have configured
 everything properly.
+
+
+Fan Control
+-----------
+
+Both PWM (pulse-width modulation) and DC fan speed control methods are
+supported. The right one to use depends on external circuitry on the
+motherboard, so the driver assumes that the BIOS set the method
+properly. The driver will report the method, but won't let you change
+it.
+
+When the PWM method is used, you can select the operating frequency,
+from 187.5 kHz (default) to 31 Hz. The best frequency depends on the
+fan model. As a rule of thumb, lower frequencies seem to give better
+control, but may generate annoying high-pitch noise. Fintek recommends
+not going below 1 kHz, as the fan tachometers get confused by lower
+frequencies as well.
+
+When the DC method is used, Fintek recommends not going below 5 V, which
+corresponds to a pwm value of 106 for the driver. The driver doesn't
+enforce this limit though.
+
+Three different fan control modes are supported:
+
+* Manual mode
+  You ask for a specific PWM duty cycle or DC voltage.
+
+* Fan speed mode
+  You ask for a specific fan speed. This mode assumes that pwm1
+  corresponds to fan1, pwm2 to fan2 and pwm3 to fan3.
+
+* Temperature mode
+  You define 3 temperature/fan speed trip points, and the fan speed is
+  adjusted depending on the measured temperature, using interpolation.
+  This mode is not yet supported by the driver.
diff --git a/Documentation/hwmon/it87 b/Documentation/hwmon/it87
index e783fd62e308..74a80992d237 100644
--- a/Documentation/hwmon/it87
+++ b/Documentation/hwmon/it87
@@ -9,8 +9,7 @@ Supported chips:
                http://www.ite.com.tw/
   * IT8712F
     Prefix: 'it8712'
-    Addresses scanned: I2C 0x2d
-                       from Super I/O config space (8 I/O ports)
+    Addresses scanned: from Super I/O config space (8 I/O ports)
     Datasheet: Publicly available at the ITE website
                http://www.ite.com.tw/
   * IT8716F
@@ -53,6 +52,18 @@ Module Parameters
   misconfigured by BIOS - PWM values would be inverted. This option tries
   to fix this. Please contact your BIOS manufacturer and ask him for fix.
 
+
+Hardware Interfaces
+-------------------
+
+All the chips suported by this driver are LPC Super-I/O chips, accessed
+through the LPC bus (ISA-like I/O ports). The IT8712F additionally has an
+SMBus interface to the hardware monitoring functions. This driver no
+longer supports this interface though, as it is slower and less reliable
+than the ISA access, and was only available on a small number of
+motherboard models.
+
+
 Description
 -----------
 
diff --git a/Documentation/hwmon/k8temp b/Documentation/hwmon/k8temp
index 30d123b8d920..0005c7166146 100644
--- a/Documentation/hwmon/k8temp
+++ b/Documentation/hwmon/k8temp
@@ -8,7 +8,7 @@ Supported chips:
     Datasheet: http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf
 
 Author: Rudolf Marek
-Contact: Rudolf Marek <r.marek@sh.cvut.cz>
+Contact: Rudolf Marek <r.marek@assembler.cz>
 
 Description
 -----------
diff --git a/Documentation/hwmon/pc87427 b/Documentation/hwmon/pc87427
new file mode 100644
index 000000000000..9a0708f9f49e
--- /dev/null
+++ b/Documentation/hwmon/pc87427
@@ -0,0 +1,38 @@
+Kernel driver pc87427
+=====================
+
+Supported chips:
+  * National Semiconductor PC87427
+    Prefix: 'pc87427'
+    Addresses scanned: none, address read from Super I/O config space
+    Datasheet: http://www.winbond.com.tw/E-WINBONDHTM/partner/apc_007.html
+
+Author: Jean Delvare <khali@linux-fr.org>
+
+Thanks to Amir Habibi at Candelis for setting up a test system, and to
+Michael Kress for testing several iterations of this driver.
+
+
+Description
+-----------
+
+The National Semiconductor Super I/O chip includes complete hardware
+monitoring capabilities. It can monitor up to 18 voltages, 8 fans and
+6 temperature sensors. Only the fans are supported at the moment.
+
+This chip also has fan controlling features, which are not yet supported
+by this driver either.
+
+The driver assumes that no more than one chip is present, which seems
+reasonable.
+
+
+Fan Monitoring
+--------------
+
+Fan rotation speeds are reported as 14-bit values from a gated clock
+signal. Speeds down to 83 RPM can be measured.
+
+An alarm is triggered if the rotation speed drops below a programmable
+limit. Another alarm is triggered if the speed is too low to to be measured
+(including stalled or missing fan).
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index d1d390aaf620..efef3b962cd3 100644
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -208,12 +208,14 @@ temp[1-*]_auto_point[1-*]_temp_hyst
 ****************
 
 temp[1-*]_type  Sensor type selection.
-                Integers 1 to 4 or thermistor Beta value (typically 3435)
+                Integers 1 to 6 or thermistor Beta value (typically 3435)
                 RW
                 1: PII/Celeron Diode
                 2: 3904 transistor
                 3: thermal diode
                 4: thermistor (default/unknown Beta)
+                5: AMD AMDSI
+                6: Intel PECI
                 Not all types are supported by all chips
 
 temp[1-*]_max   Temperature max value.
diff --git a/Documentation/hwmon/w83627ehf b/Documentation/hwmon/w83627ehf
index caa610a297e8..8a15a7408753 100644
--- a/Documentation/hwmon/w83627ehf
+++ b/Documentation/hwmon/w83627ehf
@@ -10,7 +10,7 @@ Supported chips:
 Authors:
         Jean Delvare <khali@linux-fr.org>
         Yuan Mu (Winbond)
-        Rudolf Marek <r.marek@sh.cvut.cz>
+        Rudolf Marek <r.marek@assembler.cz>
 
 Description
 -----------
diff --git a/Documentation/hwmon/w83791d b/Documentation/hwmon/w83791d
index 19b2ed739fa1..db9881df88a5 100644
--- a/Documentation/hwmon/w83791d
+++ b/Documentation/hwmon/w83791d
@@ -18,7 +18,7 @@ Credits:
     and Mark Studebaker <mdsxyz123@yahoo.com>
   w83792d.c:
     Chunhao Huang <DZShen@Winbond.com.tw>,
-    Rudolf Marek <r.marek@sh.cvut.cz>
+    Rudolf Marek <r.marek@assembler.cz>
 
 Additional contributors:
     Sven Anders <anders@anduras.de>
diff --git a/Documentation/hwmon/w83793 b/Documentation/hwmon/w83793
new file mode 100644
index 000000000000..45e5408340e0
--- /dev/null
+++ b/Documentation/hwmon/w83793
@@ -0,0 +1,110 @@
+Kernel driver w83793
+====================
+
+Supported chips:
+  * Winbond W83793G/W83793R
+    Prefix: 'w83793'
+    Addresses scanned: I2C 0x2c - 0x2f
+    Datasheet: Still not published
+
+Authors:
+    Yuan Mu (Winbond Electronics)
+    Rudolf Marek <r.marek@assembler.cz>
+
+
+Module parameters
+-----------------
+
+* reset int
+  (default 0)
+  This parameter is not recommended, it will lose motherboard specific
+  settings. Use 'reset=1' to reset the chip when loading this module.
+
+* force_subclients=bus,caddr,saddr1,saddr2
+  This is used to force the i2c addresses for subclients of
+  a certain chip. Typical usage is `force_subclients=0,0x2f,0x4a,0x4b'
+  to force the subclients of chip 0x2f on bus 0 to i2c addresses
+  0x4a and 0x4b.
+
+
+Description
+-----------
+
+This driver implements support for Winbond W83793G/W83793R chips.
+
+* Exported features
+  This driver exports 10 voltage sensors, up to 12 fan tachometer inputs,
+  6 remote temperatures, up to 8 sets of PWM fan controls, SmartFan
+  (automatic fan speed control) on all temperature/PWM combinations, 2
+  sets of 6-pin CPU VID input.
+
+* Sensor resolutions
+  If your motherboard maker used the reference design, the resolution of
+  voltage0-2 is 2mV, resolution of voltage3/4/5 is 16mV, 8mV for voltage6,
+  24mV for voltage7/8. Temp1-4 have a 0.25 degree Celsius resolution,
+  temp5-6 have a 1 degree Celsiis resolution.
+
+* Temperature sensor types
+  Temp1-4 have 3 possible types. It can be read from (and written to)
+  temp[1-4]_type.
+  - If the value of 0, the related temperature channel stops
+    monitoring.
+  - If the value is 3, it starts monitoring using a remote termal diode
+    (default).
+  - If the value is 5, it starts monitoring using the temperature sensor
+    in AMD CPU and get result by AMDSI.
+  - If the value is 6, it starts monitoring using the temperature sensor
+    in Intel CPU and get result by PECI.
+  Temp5-6 can be connected to external thermistors (value of
+  temp[5-6]_type is 4). They can also be disabled (value is 0).
+
+* Alarm mechanism
+  For voltage sensors, an alarm triggers if the measured value is below
+  the low voltage limit or over the high voltage limit.
+  For temperature sensors, an alarm triggers if the measured value goes
+  above the high temperature limit, and wears off only after the measured
+  value drops below the hysteresis value.
+  For fan sensors, an alarm triggers if the measured value is below the
+  low speed limit.
+
+* SmartFan/PWM control
+  If you want to set a pwm fan to manual mode, you just need to make sure it
+  is not controlled by any temp channel, for example, you want to set fan1
+  to manual mode, you need to check the value of temp[1-6]_fan_map, make
+  sure bit 0 is cleared in the 6 values. And then set the pwm1 value to
+  control the fan.
+
+  Each temperature channel can control all the 8 PWM outputs (by setting the
+  corresponding bit in tempX_fan_map), you can set the temperature channel
+  mode using temp[1-6]_pwm_enable, 2 is Thermal Cruise mode and 3
+  is the SmartFanII mode. Temperature channels will try to speed up or
+  slow down all controlled fans, this means one fan can receive different
+  PWM value requests from different temperature channels, but the chip
+  will always pick the safest (max) PWM value for each fan.
+
+  In Thermal Cruise mode, the chip attempts to keep the temperature at a
+  predefined value, within a tolerance margin. So if tempX_input >
+  thermal_cruiseX + toleranceX, the chip will increase the PWM value,
+  if tempX_input < thermal_cruiseX - toleranceX, the chip will decrease
+  the PWM value. If the temperature is within the tolerance range, the PWM
+  value is left unchanged.
+
+  SmartFanII works differently, you have to define up to 7 PWM, temperature
+  trip points, defining a PWM/temperature curve which the chip will follow.
+  While not fundamentally different from the Thermal Cruise mode, the
+  implementation is quite different, giving you a finer-grained control.
+
+* Chassis
+  If the case open alarm triggers, it will stay in this state unless cleared
+  by any write to the sysfs file "chassis".
+
+* VID and VRM
+  The VRM version is detected automatically, don't modify the it unless you
+  *do* know the cpu VRM version and it's not properly detected.
+
+
+Notes
+-----
+
+  Only Fan1-5 and PWM1-3 are guaranteed to always exist, other fan inputs and
+  PWM outputs may or may not exist depending on the chip pin configuration.
diff --git a/Documentation/kbuild/kconfig-language.txt b/Documentation/kbuild/kconfig-language.txt
index 125093c3ef76..536d5bfbdb8d 100644
--- a/Documentation/kbuild/kconfig-language.txt
+++ b/Documentation/kbuild/kconfig-language.txt
@@ -29,7 +29,7 @@ them. A single configuration option is defined like this:
 
 config MODVERSIONS
         bool "Set version information on all module symbols"
-        depends MODULES
+        depends on MODULES
         help
           Usually, modules have to be recompiled whenever you switch to a new
           kernel.  ...
@@ -163,7 +163,7 @@ The position of a menu entry in the tree is determined in two ways. First
 it can be specified explicitly:
 
 menu "Network device support"
-        depends NET
+        depends on NET
 
 config NETDEVICES
         ...
@@ -188,10 +188,10 @@ config MODULES
 
 config MODVERSIONS
         bool "Set version information on all module symbols"
-        depends MODULES
+        depends on MODULES
 
 comment "module support disabled"
-        depends !MODULES
+        depends on !MODULES
 
 MODVERSIONS directly depends on MODULES, this means it's only visible if
 MODULES is different from 'n'. The comment on the other hand is always
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d8323b8893c3..ef69c75780bf 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1656,6 +1656,12 @@ and is between 256 and 4096 characters. It is defined in the file
         sym53c416=      [HW,SCSI]
                         See header of drivers/scsi/sym53c416.c.
 
+        sysrq_always_enabled
+                        [KNL]
+                        Ignore sysrq setting - this boot parameter will
+                        neutralize any effect of /proc/sys/kernel/sysrq.
+                        Useful for debugging.
+
         t128=           [HW,SCSI]
                         See header of drivers/scsi/t128.c.
 
diff --git a/MAINTAINERS b/MAINTAINERS
index b2024938adcf..dea5b2a6de0a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -277,7 +277,7 @@ S:	Maintained
 
 ALI1563 I2C DRIVER
 P:      Rudolf Marek
-M:      r.marek@sh.cvut.cz
+M:      r.marek@assembler.cz
 L:      i2c@lm-sensors.org
 S:      Maintained
 
@@ -296,6 +296,13 @@ L:	info-linux@geode.amd.com
 W:      http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
 S:      Supported
 
+AMS (Apple Motion Sensor) DRIVER
+P:      Stelian Pop
+M:      stelian@popies.net
+P:      Michael Hanselmann
+M:      linux-kernel@hansmi.ch
+S:      Supported
+
 AMSO1100 RNIC DRIVER
 P:      Tom Tucker
 M:      tom@opengridcomputing.com
@@ -740,7 +747,7 @@ P:	Dave Jones
 M:      davej@codemonkey.org.uk
 L:      cpufreq@lists.linux.org.uk
 W:      http://www.codemonkey.org.uk/projects/cpufreq/
-T:      git kernel.org/pub/scm/linux/kernel/davej/cpufreq.git
+T:      git kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
 S:      Maintained
 
 CPUID/MSR DRIVER
@@ -1504,8 +1511,10 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
 S:      Maintained
 
 INOTIFY
-P:      John McCutchan and Robert Love
-M:      ttb@tentacle.dhs.org and rml@novell.com
+P:      John McCutchan
+M:      ttb@tentacle.dhs.org
+P:      Robert Love
+M:      rml@novell.com
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
@@ -1745,6 +1754,13 @@ W:	http://nfs.sourceforge.net/
 W:      http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/
 S:      Maintained
 
+KERNEL VIRTUAL MACHINE (KVM)
+P:      Avi Kivity
+M:      avi@qumranet.com
+L:      kvm-devel@lists.sourceforge.net
+W:      kvm.sourceforge.net
+S:      Supported
+
 KEXEC
 P:      Eric Biederman
 M:      ebiederm@xmission.com
@@ -3427,6 +3443,12 @@ M:	bezaur@gmail.com
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
+W83793 HARDWARE MONITORING DRIVER
+P:      Rudolf Marek
+M:      r.marek@assembler.cz
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 W83L51xD SD/MMC CARD INTERFACE DRIVER
 P:      Pierre Ossman
 M:      drzeus-wbsd@drzeus.cx
diff --git a/Makefile b/Makefile
index 73e825b39a08..f732e75be43d 100644
--- a/Makefile
+++ b/Makefile
@@ -1100,9 +1100,9 @@ boards := $(notdir $(boards))
 
 help:
         @echo  'Cleaning targets:'
-        @echo  '  clean           - remove most generated files but keep the config and'
+        @echo  '  clean           - Remove most generated files but keep the config and'
         @echo  '                    enough build support to build external modules'
-        @echo  '  mrproper        - remove all generated files + config + various backup files'
+        @echo  '  mrproper        - Remove all generated files + config + various backup files'
         @echo  '  distclean       - mrproper + remove editor backup and patch files'
         @echo  ''
         @echo  'Configuration targets:'
@@ -1390,12 +1390,18 @@ endif #ifeq ($(mixed-targets),1)
 
 PHONY += checkstack kernelrelease kernelversion
 
-# Use $(SUBARCH) here instead of $(ARCH) so that this works for UML.
-# In the UML case, $(SUBARCH) is the name of the underlying
-# architecture, while for all other arches, it is the same as $(ARCH).
+# UML needs a little special treatment here.  It wants to use the host
+# toolchain, so needs $(SUBARCH) passed to checkstack.pl.  Everyone
+# else wants $(ARCH), including people doing cross-builds, which means
+# that $(SUBARCH) doesn't work here.
+ifeq ($(ARCH), um)
+CHECKSTACK_ARCH := $(SUBARCH)
+else
+CHECKSTACK_ARCH := $(ARCH)
+endif
 checkstack:
         $(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
-        $(PERL) $(src)/scripts/checkstack.pl $(SUBARCH)
+        $(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH)
 
 kernelrelease:
         $(if $(wildcard include/config/kernel.release), $(Q)echo $(KERNELRELEASE), \
diff --git a/arch/arm/kernel/apm.c b/arch/arm/kernel/apm.c
index a11fb9a40c04..2c37b70b17ab 100644
--- a/arch/arm/kernel/apm.c
+++ b/arch/arm/kernel/apm.c
@@ -423,7 +423,7 @@ static int apm_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *as;
 
-        as = (struct apm_user *)kzalloc(sizeof(*as), GFP_KERNEL);
+        as = kzalloc(sizeof(*as), GFP_KERNEL);
         if (as) {
                 /*
                  * XXX - this is a tiny bit broken, when we consider BSD
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index a786f769035d..71257e3d513f 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -353,7 +353,7 @@ int ecard_readchunk(struct in_chunk_dir *cd, ecard_t *ec, int id, int num)
                 }
                 if (c_id(&excd) == 0x80) { /* loader */
                         if (!ec->loader) {
-                                ec->loader = (loader_t)kmalloc(c_len(&excd),
+                                ec->loader = kmalloc(c_len(&excd),
                                                                GFP_KERNEL);
                                 if (ec->loader)
                                         ecard_readbytes(ec->loader, ec,
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index d135568dc9e7..8781aaeb576b 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -43,6 +43,7 @@ config MACH_OMAP_H3
 config MACH_OMAP_OSK
         bool "TI OSK Support"
         depends on ARCH_OMAP1 && ARCH_OMAP16XX
+        select TPS65010
         help
           TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
           if you have such a board.
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 3a622801d7b0..7d0cf7af88ce 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -30,6 +30,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 9e3d0bdcba07..5c0a10041cd1 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -75,28 +75,28 @@ endmenu
 
 config MACH_POODLE
         bool "Enable Sharp SL-5600 (Poodle) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
         select SHARP_LOCOMO
         select PXA_SSP
 
 config MACH_CORGI
         bool "Enable Sharp SL-C700 (Corgi) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
         select PXA_SHARP_C7xx
 
 config MACH_SHEPHERD
         bool "Enable Sharp SL-C750 (Shepherd) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
         select PXA_SHARP_C7xx
 
 config MACH_HUSKY
         bool "Enable Sharp SL-C760 (Husky) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
         select PXA_SHARP_C7xx
 
 config MACH_AKITA
         bool "Enable Sharp SL-1000 (Akita) Support"
-        depends PXA_SHARPSL_27x
+        depends on PXA_SHARPSL_27x
         select PXA_SHARP_Cxx00
         select MACH_SPITZ
         select I2C
@@ -104,17 +104,17 @@ config MACH_AKITA
 
 config MACH_SPITZ
         bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
-        depends PXA_SHARPSL_27x
+        depends on PXA_SHARPSL_27x
         select PXA_SHARP_Cxx00
 
 config MACH_BORZOI
         bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
-        depends PXA_SHARPSL_27x
+        depends on PXA_SHARPSL_27x
         select PXA_SHARP_Cxx00
 
 config MACH_TOSA
         bool "Enable Sharp SL-6000x (Tosa) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
 
 config PXA25x
         bool
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index ec752e16d618..f2dc363de66b 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -113,7 +113,7 @@ endchoice
 
 config OMAP_SERIAL_WAKE
         bool "Enable wake-up events for serial ports"
-        depends OMAP_MUX
+        depends on OMAP_MUX
         default y
         help
           Select this option if you want to have your system wake up
diff --git a/arch/arm26/kernel/ecard.c b/arch/arm26/kernel/ecard.c
index 43dd41be71fb..9dbc17247c6f 100644
--- a/arch/arm26/kernel/ecard.c
+++ b/arch/arm26/kernel/ecard.c
@@ -215,7 +215,7 @@ int ecard_readchunk(struct in_chunk_dir *cd, ecard_t *ec, int id, int num)
                 }
                 if (c_id(&excd) == 0x80) { /* loader */
                         if (!ec->loader) {
-                                ec->loader = (loader_t)kmalloc(c_len(&excd),
+                                ec->loader = kmalloc(c_len(&excd),
                                                                GFP_KERNEL);
                                 if (ec->loader)
                                         ecard_readbytes(ec->loader, ec,
diff --git a/arch/arm26/kernel/irq.c b/arch/arm26/kernel/irq.c
index d87d68b77d66..d53382c83bf9 100644
--- a/arch/arm26/kernel/irq.c
+++ b/arch/arm26/kernel/irq.c
@@ -545,7 +545,7 @@ int request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_
             (irq_flags & IRQF_SHARED && !dev_id))
                 return -EINVAL;
 
-        action = (struct irqaction *)kmalloc(sizeof(struct irqaction), GFP_KERNEL);
+        action = kmalloc(sizeof(struct irqaction), GFP_KERNEL);
         if (!action)
                 return -ENOMEM;
 
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c
index 4fa81abab0c7..ffade19a14e6 100644
--- a/arch/cris/arch-v10/drivers/axisflashmap.c
+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
@@ -516,7 +516,7 @@ static int __init init_axis_flash(void)
 #else
                 struct mtd_info *mtd_ram;
 
-                mtd_ram = (struct mtd_info *)kmalloc(sizeof(struct mtd_info),
+                mtd_ram = kmalloc(sizeof(struct mtd_info),
                                                      GFP_KERNEL);
                 if (!mtd_ram) {
                         panic("axisflashmap couldn't allocate memory for "
diff --git a/arch/cris/arch-v10/drivers/gpio.c b/arch/cris/arch-v10/drivers/gpio.c
index fcba6632ed7b..9aba18b931dd 100644
--- a/arch/cris/arch-v10/drivers/gpio.c
+++ b/arch/cris/arch-v10/drivers/gpio.c
@@ -440,7 +440,7 @@ gpio_open(struct inode *inode, struct file *filp)
         if (p > GPIO_MINOR_LAST)
                 return -EINVAL;
 
-        priv = (struct gpio_private *)kmalloc(sizeof(struct gpio_private), 
+        priv = kmalloc(sizeof(struct gpio_private),
                                               GFP_KERNEL);
 
         if (!priv)
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index 41952320e00a..5180d45412fc 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -427,7 +427,7 @@ static int __init init_axis_flash(void)
 #else
                 struct mtd_info *mtd_ram;
 
-                mtd_ram = (struct mtd_info *)kmalloc(sizeof(struct mtd_info),
+                mtd_ram = kmalloc(sizeof(struct mtd_info),
                                                      GFP_KERNEL);
                 if (!mtd_ram) {
                         panic("axisflashmap couldn't allocate memory for "
diff --git a/arch/cris/arch-v32/drivers/gpio.c b/arch/cris/arch-v32/drivers/gpio.c
index c3f876b4da6b..08d36f0955c6 100644
--- a/arch/cris/arch-v32/drivers/gpio.c
+++ b/arch/cris/arch-v32/drivers/gpio.c
@@ -423,7 +423,7 @@ gpio_open(struct inode *inode, struct file *filp)
         if (p > GPIO_MINOR_LAST)
                 return -EINVAL;
 
-        priv = (struct gpio_private *)kmalloc(sizeof(struct gpio_private),
+        priv = kmalloc(sizeof(struct gpio_private),
                                               GFP_KERNEL);
 
         if (!priv)
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index 99e59b3eacf8..7cd6ac803409 100644
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -686,7 +686,7 @@ keep_debug_flags(unsigned long oldccs, unsigned long oldspc,
 int __init
 cris_init_signal(void)
 {
-        u16* data = (u16*)kmalloc(PAGE_SIZE, GFP_KERNEL);
+        u16* data = kmalloc(PAGE_SIZE, GFP_KERNEL);
 
         /* This is movu.w __NR_sigreturn, r9; break 13; */
         data[0] = 0x9c5f;
diff --git a/arch/cris/kernel/profile.c b/arch/cris/kernel/profile.c
index 69c52189f044..f60ab785f235 100644
--- a/arch/cris/kernel/profile.c
+++ b/arch/cris/kernel/profile.c
@@ -59,7 +59,7 @@ static int
 __init init_cris_profile(void)
 {
   struct proc_dir_entry *entry;
-  sample_buffer = (char*)kmalloc(SAMPLE_BUFFER_SIZE, GFP_KERNEL);
+  sample_buffer = kmalloc(SAMPLE_BUFFER_SIZE, GFP_KERNEL);
   sample_buffer_pos = sample_buffer;
   entry = create_proc_entry("system_profile", S_IWUSR | S_IRUGO, NULL);
   if (entry) {
diff --git a/arch/h8300/kernel/ints.c b/arch/h8300/kernel/ints.c
index 1bfc77e391d5..587ef7f4fcc7 100644
--- a/arch/h8300/kernel/ints.c
+++ b/arch/h8300/kernel/ints.c
@@ -141,7 +141,7 @@ int request_irq(unsigned int irq,
                 return -EBUSY;
 
         if (use_kmalloc)
-                irq_handle = (irq_handler_t *)kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
+                irq_handle = kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
         else {
                 /* use bootmem allocater */
                 irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));
diff --git a/arch/h8300/platform/h8s/ints.c b/arch/h8300/platform/h8s/ints.c
index 270440de4610..567f681ddfec 100644
--- a/arch/h8300/platform/h8s/ints.c
+++ b/arch/h8300/platform/h8s/ints.c
@@ -176,7 +176,7 @@ int request_irq(unsigned int irq,
         }               
 
         if (use_kmalloc)
-                irq_handle = (irq_handler_t *)kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
+                irq_handle = kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
         else {
                 /* use bootmem allocater */
                 irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index a97847da9ed5..b75cff25de4b 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -1604,7 +1604,7 @@ static int do_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *       as;
 
-        as = (struct apm_user *)kmalloc(sizeof(*as), GFP_KERNEL);
+        as = kmalloc(sizeof(*as), GFP_KERNEL);
         if (as == NULL) {
                 printk(KERN_ERR "apm: cannot allocate struct of size %d bytes\n",
                        sizeof(*as));
diff --git a/arch/i386/kernel/cpu/cpufreq/Kconfig b/arch/i386/kernel/cpu/cpufreq/Kconfig
index ccc1edff5c97..5299c5bf4454 100644
--- a/arch/i386/kernel/cpu/cpufreq/Kconfig
+++ b/arch/i386/kernel/cpu/cpufreq/Kconfig
@@ -17,6 +17,7 @@ config X86_ACPI_CPUFREQ
         help
           This driver adds a CPUFreq driver which utilizes the ACPI
           Processor Performance States.
+          This driver also supports Intel Enhanced Speedstep.
 
           For details, take a look at <file:Documentation/cpu-freq/>.
 
@@ -121,11 +122,14 @@ config X86_SPEEDSTEP_CENTRINO
           If in doubt, say N.
 
 config X86_SPEEDSTEP_CENTRINO_ACPI
-        bool "Use ACPI tables to decode valid frequency/voltage pairs"
+        bool "Use ACPI tables to decode valid frequency/voltage (deprecated)"
         depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR
         depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m)
         default y
         help
+          This is deprecated and this functionality is now merged into
+          acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
+          speedstep_centrino.
           Use primarily the information provided in the BIOS ACPI tables
           to determine valid CPU frequency and voltage pairings. It is
           required for the driver to work on non-Banias CPUs.
diff --git a/arch/i386/kernel/cpu/cpufreq/Makefile b/arch/i386/kernel/cpu/cpufreq/Makefile
index 2e894f1c8910..8de3abe322a9 100644
--- a/arch/i386/kernel/cpu/cpufreq/Makefile
+++ b/arch/i386/kernel/cpu/cpufreq/Makefile
@@ -7,9 +7,9 @@ obj-$(CONFIG_SC520_CPUFREQ)		+= sc520_freq.o
 obj-$(CONFIG_X86_LONGRUN)               += longrun.o  
 obj-$(CONFIG_X86_GX_SUSPMOD)            += gx-suspmod.o
 obj-$(CONFIG_X86_SPEEDSTEP_ICH)         += speedstep-ich.o
-obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO)    += speedstep-centrino.o
 obj-$(CONFIG_X86_SPEEDSTEP_LIB)         += speedstep-lib.o
 obj-$(CONFIG_X86_SPEEDSTEP_SMI)         += speedstep-smi.o
 obj-$(CONFIG_X86_ACPI_CPUFREQ)          += acpi-cpufreq.o
+obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO)    += speedstep-centrino.o
 obj-$(CONFIG_X86_P4_CLOCKMOD)           += p4-clockmod.o
 obj-$(CONFIG_X86_CPUFREQ_NFORCE2)       += cpufreq-nforce2.o
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 57c880bf0bd6..18f4715c655d 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -1,9 +1,10 @@
 /*
- * acpi-cpufreq.c - ACPI Processor P-States Driver ($Revision: 1.3 $)
+ * acpi-cpufreq.c - ACPI Processor P-States Driver ($Revision: 1.4 $)
  *
  *  Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
  *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
  *  Copyright (C) 2002 - 2004 Dominik Brodowski <linux@brodo.de>
+ *  Copyright (C) 2006       Denis Sadykov <denis.m.sadykov@intel.com>
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
@@ -27,202 +28,387 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/smp.h>
+#include <linux/sched.h>
 #include <linux/cpufreq.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
 #include <linux/compiler.h>
-#include <linux/sched.h>        /* current */
 #include <linux/dmi.h>
-#include <asm/io.h>
-#include <asm/delay.h>
-#include <asm/uaccess.h>
 
 #include <linux/acpi.h>
 #include <acpi/processor.h>
 
+#include <asm/io.h>
+#include <asm/msr.h>
+#include <asm/processor.h>
+#include <asm/cpufeature.h>
+#include <asm/delay.h>
+#include <asm/uaccess.h>
+
 #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "acpi-cpufreq", msg)
 
 MODULE_AUTHOR("Paul Diefenbaugh, Dominik Brodowski");
 MODULE_DESCRIPTION("ACPI Processor P-States Driver");
 MODULE_LICENSE("GPL");
 
+enum {
+        UNDEFINED_CAPABLE = 0,
+        SYSTEM_INTEL_MSR_CAPABLE,
+        SYSTEM_IO_CAPABLE,
+};
+
+#define INTEL_MSR_RANGE         (0xffff)
+#define CPUID_6_ECX_APERFMPERF_CAPABILITY       (0x1)
 
-struct cpufreq_acpi_io {
-        struct acpi_processor_performance       *acpi_data;
-        struct cpufreq_frequency_table          *freq_table;
-        unsigned int                            resume;
+struct acpi_cpufreq_data {
+        struct acpi_processor_performance *acpi_data;
+        struct cpufreq_frequency_table *freq_table;
+        unsigned int max_freq;
+        unsigned int resume;
+        unsigned int cpu_feature;
 };
 
-static struct cpufreq_acpi_io   *acpi_io_data[NR_CPUS];
-static struct acpi_processor_performance        *acpi_perf_data[NR_CPUS];
+static struct acpi_cpufreq_data *drv_data[NR_CPUS];
+static struct acpi_processor_performance *acpi_perf_data[NR_CPUS];
 
 static struct cpufreq_driver acpi_cpufreq_driver;
 
 static unsigned int acpi_pstate_strict;
 
-static int
-acpi_processor_write_port(
-        u16     port,
-        u8      bit_width,
-        u32     value)
+static int check_est_cpu(unsigned int cpuid)
+{
+        struct cpuinfo_x86 *cpu = &cpu_data[cpuid];
+
+        if (cpu->x86_vendor != X86_VENDOR_INTEL ||
+            !cpu_has(cpu, X86_FEATURE_EST))
+                return 0;
+
+        return 1;
+}
+
+static unsigned extract_io(u32 value, struct acpi_cpufreq_data *data)
+{
+        struct acpi_processor_performance *perf;
+        int i;
+
+        perf = data->acpi_data;
+
+        for (i=0; i<perf->state_count; i++) {
+                if (value == perf->states[i].status)
+                        return data->freq_table[i].frequency;
+        }
+        return 0;
+}
+
+static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
 {
-        if (bit_width <= 8) {
+        int i;
+        struct acpi_processor_performance *perf;
+
+        msr &= INTEL_MSR_RANGE;
+        perf = data->acpi_data;
+
+        for (i=0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
+                if (msr == perf->states[data->freq_table[i].index].status)
+                        return data->freq_table[i].frequency;
+        }
+        return data->freq_table[0].frequency;
+}
+
+static unsigned extract_freq(u32 val, struct acpi_cpufreq_data *data)
+{
+        switch (data->cpu_feature) {
+        case SYSTEM_INTEL_MSR_CAPABLE:
+                return extract_msr(val, data);
+        case SYSTEM_IO_CAPABLE:
+                return extract_io(val, data);
+        default:
+                return 0;
+        }
+}
+
+static void wrport(u16 port, u8 bit_width, u32 value)
+{
+        if (bit_width <= 8)
                 outb(value, port);
-        } else if (bit_width <= 16) {
+        else if (bit_width <= 16)
                 outw(value, port);
-        } else if (bit_width <= 32) {
+        else if (bit_width <= 32)
                 outl(value, port);
-        } else {
-                return -ENODEV;
-        }
-        return 0;
 }
 
-static int
-acpi_processor_read_port(
-        u16     port,
-        u8      bit_width,
-        u32     *ret)
+static void rdport(u16 port, u8 bit_width, u32 * ret)
 {
         *ret = 0;
-        if (bit_width <= 8) {
+        if (bit_width <= 8)
                 *ret = inb(port);
-        } else if (bit_width <= 16) {
+        else if (bit_width <= 16)
                 *ret = inw(port);
-        } else if (bit_width <= 32) {
+        else if (bit_width <= 32)
                 *ret = inl(port);
-        } else {
-                return -ENODEV;
+}
+
+struct msr_addr {
+        u32 reg;
+};
+
+struct io_addr {
+        u16 port;
+        u8 bit_width;
+};
+
+typedef union {
+        struct msr_addr msr;
+        struct io_addr io;
+} drv_addr_union;
+
+struct drv_cmd {
+        unsigned int type;
+        cpumask_t mask;
+        drv_addr_union addr;
+        u32 val;
+};
+
+static void do_drv_read(struct drv_cmd *cmd)
+{
+        u32 h;
+
+        switch (cmd->type) {
+        case SYSTEM_INTEL_MSR_CAPABLE:
+                rdmsr(cmd->addr.msr.reg, cmd->val, h);
+                break;
+        case SYSTEM_IO_CAPABLE:
+                rdport(cmd->addr.io.port, cmd->addr.io.bit_width, &cmd->val);
+                break;
+        default:
+                break;
         }
-        return 0;
 }
 
-static int
-acpi_processor_set_performance (
-        struct cpufreq_acpi_io  *data,
-        unsigned int            cpu,
-        int                     state)
+static void do_drv_write(struct drv_cmd *cmd)
 {
-        u16                     port = 0;
-        u8                      bit_width = 0;
-        int                     i = 0;
-        int                     ret = 0;
-        u32                     value = 0;
-        int                     retval;
-        struct acpi_processor_performance       *perf;
-
-        dprintk("acpi_processor_set_performance\n");
-
-        retval = 0;
-        perf = data->acpi_data; 
-        if (state == perf->state) {
-                if (unlikely(data->resume)) {
-                        dprintk("Called after resume, resetting to P%d\n", state);
-                        data->resume = 0;
-                } else {
-                        dprintk("Already at target state (P%d)\n", state);
-                        return (retval);
-                }
+        u32 h = 0;
+
+        switch (cmd->type) {
+        case SYSTEM_INTEL_MSR_CAPABLE:
+                wrmsr(cmd->addr.msr.reg, cmd->val, h);
+                break;
+        case SYSTEM_IO_CAPABLE:
+                wrport(cmd->addr.io.port, cmd->addr.io.bit_width, cmd->val);
+                break;
+        default:
+                break;
         }
+}
 
-        dprintk("Transitioning from P%d to P%d\n", perf->state, state);
+static void drv_read(struct drv_cmd *cmd)
+{
+        cpumask_t saved_mask = current->cpus_allowed;
+        cmd->val = 0;
 
-        /*
-         * First we write the target state's 'control' value to the
-         * control_register.
-         */
+        set_cpus_allowed(current, cmd->mask);
+        do_drv_read(cmd);
+        set_cpus_allowed(current, saved_mask);
+}
+
+static void drv_write(struct drv_cmd *cmd)
+{
+        cpumask_t saved_mask = current->cpus_allowed;
+        unsigned int i;
+
+        for_each_cpu_mask(i, cmd->mask) {
+                set_cpus_allowed(current, cpumask_of_cpu(i));
+                do_drv_write(cmd);
+        }
+
+        set_cpus_allowed(current, saved_mask);
+        return;
+}
+
+static u32 get_cur_val(cpumask_t mask)
+{
+        struct acpi_processor_performance *perf;
+        struct drv_cmd cmd;
+
+        if (unlikely(cpus_empty(mask)))
+                return 0;
+
+        switch (drv_data[first_cpu(mask)]->cpu_feature) {
+        case SYSTEM_INTEL_MSR_CAPABLE:
+                cmd.type = SYSTEM_INTEL_MSR_CAPABLE;
+                cmd.addr.msr.reg = MSR_IA32_PERF_STATUS;
+                break;
+        case SYSTEM_IO_CAPABLE:
+                cmd.type = SYSTEM_IO_CAPABLE;
+                perf = drv_data[first_cpu(mask)]->acpi_data;
+                cmd.addr.io.port = perf->control_register.address;
+                cmd.addr.io.bit_width = perf->control_register.bit_width;
+                break;
+        default:
+                return 0;
+        }
+
+        cmd.mask = mask;
 
-        port = perf->control_register.address;
-        bit_width = perf->control_register.bit_width;
-        value = (u32) perf->states[state].control;
+        drv_read(&cmd);
 
-        dprintk("Writing 0x%08x to port 0x%04x\n", value, port);
+        dprintk("get_cur_val = %u\n", cmd.val);
 
-        ret = acpi_processor_write_port(port, bit_width, value);
-        if (ret) {
-                dprintk("Invalid port width 0x%04x\n", bit_width);
-                return (ret);
+        return cmd.val;
+}
+
+/*
+ * Return the measured active (C0) frequency on this CPU since last call
+ * to this function.
+ * Input: cpu number
+ * Return: Average CPU frequency in terms of max frequency (zero on error)
+ *
+ * We use IA32_MPERF and IA32_APERF MSRs to get the measured performance
+ * over a period of time, while CPU is in C0 state.
+ * IA32_MPERF counts at the rate of max advertised frequency
+ * IA32_APERF counts at the rate of actual CPU frequency
+ * Only IA32_APERF/IA32_MPERF ratio is architecturally defined and
+ * no meaning should be associated with absolute values of these MSRs.
+ */
+static unsigned int get_measured_perf(unsigned int cpu)
+{
+        union {
+                struct {
+                        u32 lo;
+                        u32 hi;
+                } split;
+                u64 whole;
+        } aperf_cur, mperf_cur;
+
+        cpumask_t saved_mask;
+        unsigned int perf_percent;
+        unsigned int retval;
+
+        saved_mask = current->cpus_allowed;
+        set_cpus_allowed(current, cpumask_of_cpu(cpu));
+        if (get_cpu() != cpu) {
+                /* We were not able to run on requested processor */
+                put_cpu();
+                return 0;
         }
 
+        rdmsr(MSR_IA32_APERF, aperf_cur.split.lo, aperf_cur.split.hi);
+        rdmsr(MSR_IA32_MPERF, mperf_cur.split.lo, mperf_cur.split.hi);
+
+        wrmsr(MSR_IA32_APERF, 0,0);
+        wrmsr(MSR_IA32_MPERF, 0,0);
+
+#ifdef __i386__
         /*
-         * Assume the write went through when acpi_pstate_strict is not used.
-         * As read status_register is an expensive operation and there 
-         * are no specific error cases where an IO port write will fail.
+         * We dont want to do 64 bit divide with 32 bit kernel
+         * Get an approximate value. Return failure in case we cannot get
+         * an approximate value.
          */
-        if (acpi_pstate_strict) {
-                /* Then we read the 'status_register' and compare the value 
-                 * with the target state's 'status' to make sure the 
-                 * transition was successful.
-                 * Note that we'll poll for up to 1ms (100 cycles of 10us) 
-                 * before giving up.
-                 */
-
-                port = perf->status_register.address;
-                bit_width = perf->status_register.bit_width;
-
-                dprintk("Looking for 0x%08x from port 0x%04x\n",
-                        (u32) perf->states[state].status, port);
-
-                for (i = 0; i < 100; i++) {
-                        ret = acpi_processor_read_port(port, bit_width, &value);
-                        if (ret) {      
-                                dprintk("Invalid port width 0x%04x\n", bit_width);
-                                return (ret);
-                        }
-                        if (value == (u32) perf->states[state].status)
-                                break;
-                        udelay(10);
-                }
-        } else {
-                value = (u32) perf->states[state].status;
+        if (unlikely(aperf_cur.split.hi || mperf_cur.split.hi)) {
+                int shift_count;
+                u32 h;
+
+                h = max_t(u32, aperf_cur.split.hi, mperf_cur.split.hi);
+                shift_count = fls(h);
+
+                aperf_cur.whole >>= shift_count;
+                mperf_cur.whole >>= shift_count;
+        }
+
+        if (((unsigned long)(-1) / 100) < aperf_cur.split.lo) {
+                int shift_count = 7;
+                aperf_cur.split.lo >>= shift_count;
+                mperf_cur.split.lo >>= shift_count;
+        }
+
+        if (aperf_cur.split.lo && mperf_cur.split.lo)
+                perf_percent = (aperf_cur.split.lo * 100) / mperf_cur.split.lo;
+        else
+                perf_percent = 0;
+
+#else
+        if (unlikely(((unsigned long)(-1) / 100) < aperf_cur.whole)) {
+                int shift_count = 7;
+                aperf_cur.whole >>= shift_count;
+                mperf_cur.whole >>= shift_count;
         }
 
-        if (unlikely(value != (u32) perf->states[state].status)) {
-                printk(KERN_WARNING "acpi-cpufreq: Transition failed\n");
-                retval = -ENODEV;
-                return (retval);
+        if (aperf_cur.whole && mperf_cur.whole)
+                perf_percent = (aperf_cur.whole * 100) / mperf_cur.whole;
+        else
+                perf_percent = 0;
+
+#endif
+
+        retval = drv_data[cpu]->max_freq * perf_percent / 100;
+
+        put_cpu();
+        set_cpus_allowed(current, saved_mask);
+
+        dprintk("cpu %d: performance percent %d\n", cpu, perf_percent);
+        return retval;
+}
+
+static unsigned int get_cur_freq_on_cpu(unsigned int cpu)
+{
+        struct acpi_cpufreq_data *data = drv_data[cpu];
+        unsigned int freq;
+
+        dprintk("get_cur_freq_on_cpu (%d)\n", cpu);
+
+        if (unlikely(data == NULL ||
+                     data->acpi_data == NULL || data->freq_table == NULL)) {
+                return 0;
         }
 
-        dprintk("Transition successful after %d microseconds\n", i * 10);
+        freq = extract_freq(get_cur_val(cpumask_of_cpu(cpu)), data);
+        dprintk("cur freq = %u\n", freq);
 
-        perf->state = state;
-        return (retval);
+        return freq;
 }
 
+static unsigned int check_freqs(cpumask_t mask, unsigned int freq,
+                                struct acpi_cpufreq_data *data)
+{
+        unsigned int cur_freq;
+        unsigned int i;
+
+        for (i=0; i<100; i++) {
+                cur_freq = extract_freq(get_cur_val(mask), data);
+                if (cur_freq == freq)
+                        return 1;
+                udelay(10);
+        }
+        return 0;
+}
 
-static int
-acpi_cpufreq_target (
-        struct cpufreq_policy   *policy,
-        unsigned int target_freq,
-        unsigned int relation)
+static int acpi_cpufreq_target(struct cpufreq_policy *policy,
+                               unsigned int target_freq, unsigned int relation)
 {
-        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
+        struct acpi_cpufreq_data *data = drv_data[policy->cpu];
         struct acpi_processor_performance *perf;
         struct cpufreq_freqs freqs;
         cpumask_t online_policy_cpus;
-        cpumask_t saved_mask;
-        cpumask_t set_mask;
-        cpumask_t covered_cpus;
-        unsigned int cur_state = 0;
+        struct drv_cmd cmd;
+        unsigned int msr;
         unsigned int next_state = 0;
-        unsigned int result = 0;
-        unsigned int j;
-        unsigned int tmp;
+        unsigned int next_perf_state = 0;
+        unsigned int i;
+        int result = 0;
 
-        dprintk("acpi_cpufreq_setpolicy\n");
+        dprintk("acpi_cpufreq_target %d (%d)\n", target_freq, policy->cpu);
 
-        result = cpufreq_frequency_table_target(policy,
-                        data->freq_table,
-                        target_freq,
-                        relation,
-                        &next_state);
-        if (unlikely(result))
-                return (result);
+        if (unlikely(data == NULL ||
+             data->acpi_data == NULL || data->freq_table == NULL)) {
+                return -ENODEV;
+        }
 
         perf = data->acpi_data;
-        cur_state = perf->state;
-        freqs.old = data->freq_table[cur_state].frequency;
-        freqs.new = data->freq_table[next_state].frequency;
+        result = cpufreq_frequency_table_target(policy,
+                                                data->freq_table,
+                                                target_freq,
+                                                relation, &next_state);
+        if (unlikely(result))
+                return -ENODEV;
 
 #ifdef CONFIG_HOTPLUG_CPU
         /* cpufreq holds the hotplug lock, so we are safe from here on */
@@ -231,106 +417,84 @@ acpi_cpufreq_target (
         online_policy_cpus = policy->cpus;
 #endif
 
-        for_each_cpu_mask(j, online_policy_cpus) {
-                freqs.cpu = j;
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        next_perf_state = data->freq_table[next_state].index;
+        if (perf->state == next_perf_state) {
+                if (unlikely(data->resume)) {
+                        dprintk("Called after resume, resetting to P%d\n",
+                                next_perf_state);
+                        data->resume = 0;
+                } else {
+                        dprintk("Already at target state (P%d)\n",
+                                next_perf_state);
+                        return 0;
+                }
         }
 
-        /*
-         * We need to call driver->target() on all or any CPU in
-         * policy->cpus, depending on policy->shared_type.
-         */
-        saved_mask = current->cpus_allowed;
-        cpus_clear(covered_cpus);
-        for_each_cpu_mask(j, online_policy_cpus) {
-                /*
-                 * Support for SMP systems.
-                 * Make sure we are running on CPU that wants to change freq
-                 */
-                cpus_clear(set_mask);
-                if (policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)
-                        cpus_or(set_mask, set_mask, online_policy_cpus);
-                else
-                        cpu_set(j, set_mask);
-
-                set_cpus_allowed(current, set_mask);
-                if (unlikely(!cpu_isset(smp_processor_id(), set_mask))) {
-                        dprintk("couldn't limit to CPUs in this domain\n");
-                        result = -EAGAIN;
-                        break;
-                }
+        switch (data->cpu_feature) {
+        case SYSTEM_INTEL_MSR_CAPABLE:
+                cmd.type = SYSTEM_INTEL_MSR_CAPABLE;
+                cmd.addr.msr.reg = MSR_IA32_PERF_CTL;
+                msr =
+                    (u32) perf->states[next_perf_state].
+                    control & INTEL_MSR_RANGE;
+                cmd.val = (cmd.val & ~INTEL_MSR_RANGE) | msr;
+                break;
+        case SYSTEM_IO_CAPABLE:
+                cmd.type = SYSTEM_IO_CAPABLE;
+                cmd.addr.io.port = perf->control_register.address;
+                cmd.addr.io.bit_width = perf->control_register.bit_width;
+                cmd.val = (u32) perf->states[next_perf_state].control;
+                break;
+        default:
+                return -ENODEV;
+        }
 
-                result = acpi_processor_set_performance (data, j, next_state);
-                if (result) {
-                        result = -EAGAIN;
-                        break;
-                }
+        cpus_clear(cmd.mask);
 
-                if (policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)
-                        break;
- 
-                cpu_set(j, covered_cpus);
-        }
+        if (policy->shared_type != CPUFREQ_SHARED_TYPE_ANY)
+                cmd.mask = online_policy_cpus;
+        else
+                cpu_set(policy->cpu, cmd.mask);
 
-        for_each_cpu_mask(j, online_policy_cpus) {
-                freqs.cpu = j;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        freqs.old = data->freq_table[perf->state].frequency;
+        freqs.new = data->freq_table[next_perf_state].frequency;
+        for_each_cpu_mask(i, cmd.mask) {
+                freqs.cpu = i;
+                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
         }
 
-        if (unlikely(result)) {
-                /*
-                 * We have failed halfway through the frequency change.
-                 * We have sent callbacks to online_policy_cpus and
-                 * acpi_processor_set_performance() has been called on 
-                 * coverd_cpus. Best effort undo..
-                 */
-
-                if (!cpus_empty(covered_cpus)) {
-                        for_each_cpu_mask(j, covered_cpus) {
-                                policy->cpu = j;
-                                acpi_processor_set_performance (data, 
-                                                j, 
-                                                cur_state);
-                        }
-                }
+        drv_write(&cmd);
 
-                tmp = freqs.new;
-                freqs.new = freqs.old;
-                freqs.old = tmp;
-                for_each_cpu_mask(j, online_policy_cpus) {
-                        freqs.cpu = j;
-                        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-                        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        if (acpi_pstate_strict) {
+                if (!check_freqs(cmd.mask, freqs.new, data)) {
+                        dprintk("acpi_cpufreq_target failed (%d)\n",
+                                policy->cpu);
+                        return -EAGAIN;
                 }
         }
 
-        set_cpus_allowed(current, saved_mask);
-        return (result);
-}
+        for_each_cpu_mask(i, cmd.mask) {
+                freqs.cpu = i;
+                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        }
+        perf->state = next_perf_state;
 
+        return result;
+}
 
-static int
-acpi_cpufreq_verify (
-        struct cpufreq_policy   *policy)
+static int acpi_cpufreq_verify(struct cpufreq_policy *policy)
 {
-        unsigned int result = 0;
-        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
+        struct acpi_cpufreq_data *data = drv_data[policy->cpu];
 
         dprintk("acpi_cpufreq_verify\n");
 
-        result = cpufreq_frequency_table_verify(policy, 
-                        data->freq_table);
-
-        return (result);
+        return cpufreq_frequency_table_verify(policy, data->freq_table);
 }
 
-
 static unsigned long
-acpi_cpufreq_guess_freq (
-        struct cpufreq_acpi_io  *data,
-        unsigned int            cpu)
+acpi_cpufreq_guess_freq(struct acpi_cpufreq_data *data, unsigned int cpu)
 {
-        struct acpi_processor_performance       *perf = data->acpi_data;
+        struct acpi_processor_performance *perf = data->acpi_data;
 
         if (cpu_khz) {
                 /* search the closest match to cpu_khz */
@@ -338,16 +502,16 @@ acpi_cpufreq_guess_freq (
                 unsigned long freq;
                 unsigned long freqn = perf->states[0].core_frequency * 1000;
 
-                for (i = 0; i < (perf->state_count - 1); i++) {
+                for (i=0; i<(perf->state_count-1); i++) {
                         freq = freqn;
                         freqn = perf->states[i+1].core_frequency * 1000;
                         if ((2 * cpu_khz) > (freqn + freq)) {
                                 perf->state = i;
-                                return (freq);
+                                return freq;
                         }
                 }
-                perf->state = perf->state_count - 1;
-                return (freqn);
+                perf->state = perf->state_count-1;
+                return freqn;
         } else {
                 /* assume CPU is at P0... */
                 perf->state = 0;
@@ -355,7 +519,6 @@ acpi_cpufreq_guess_freq (
         }
 }
 
-
 /*
  * acpi_cpufreq_early_init - initialize ACPI P-States library
  *
@@ -364,30 +527,34 @@ acpi_cpufreq_guess_freq (
  * do _PDC and _PSD and find out the processor dependency for the
  * actual init that will happen later...
  */
-static int acpi_cpufreq_early_init_acpi(void)
+static int acpi_cpufreq_early_init(void)
 {
-        struct acpi_processor_performance       *data;
-        unsigned int                            i, j;
+        struct acpi_processor_performance *data;
+        cpumask_t covered;
+        unsigned int i, j;
 
         dprintk("acpi_cpufreq_early_init\n");
 
         for_each_possible_cpu(i) {
-                data = kzalloc(sizeof(struct acpi_processor_performance), 
-                        GFP_KERNEL);
+                data = kzalloc(sizeof(struct acpi_processor_performance),
+                               GFP_KERNEL);
                 if (!data) {
-                        for_each_possible_cpu(j) {
+                        for_each_cpu_mask(j, covered) {
                                 kfree(acpi_perf_data[j]);
                                 acpi_perf_data[j] = NULL;
                         }
-                        return (-ENOMEM);
+                        return -ENOMEM;
                 }
                 acpi_perf_data[i] = data;
+                cpu_set(i, covered);
         }
 
         /* Do initialization in ACPI core */
-        return acpi_processor_preregister_performance(acpi_perf_data);
+        acpi_processor_preregister_performance(acpi_perf_data);
+        return 0;
 }
 
+#ifdef CONFIG_SMP
 /*
  * Some BIOSes do SW_ANY coordination internally, either set it up in hw
  * or do it in BIOS firmware and won't inform about it to OS. If not
@@ -414,39 +581,42 @@ static struct dmi_system_id sw_any_bug_dmi_table[] = {
         },
         { }
 };
+#endif
 
-static int
-acpi_cpufreq_cpu_init (
-        struct cpufreq_policy   *policy)
+static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
-        unsigned int            i;
-        unsigned int            cpu = policy->cpu;
-        struct cpufreq_acpi_io  *data;
-        unsigned int            result = 0;
+        unsigned int i;
+        unsigned int valid_states = 0;
+        unsigned int cpu = policy->cpu;
+        struct acpi_cpufreq_data *data;
+        unsigned int result = 0;
         struct cpuinfo_x86 *c = &cpu_data[policy->cpu];
-        struct acpi_processor_performance       *perf;
+        struct acpi_processor_performance *perf;
 
         dprintk("acpi_cpufreq_cpu_init\n");
 
         if (!acpi_perf_data[cpu])
-                return (-ENODEV);
+                return -ENODEV;
 
-        data = kzalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL);
+        data = kzalloc(sizeof(struct acpi_cpufreq_data), GFP_KERNEL);
         if (!data)
-                return (-ENOMEM);
+                return -ENOMEM;
 
         data->acpi_data = acpi_perf_data[cpu];
-        acpi_io_data[cpu] = data;
+        drv_data[cpu] = data;
 
-        result = acpi_processor_register_performance(data->acpi_data, cpu);
+        if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
+                acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
 
+        result = acpi_processor_register_performance(data->acpi_data, cpu);
         if (result)
                 goto err_free;
 
         perf = data->acpi_data;
         policy->shared_type = perf->shared_type;
+
         /*
-         * Will let policy->cpus know about dependency only when software 
+         * Will let policy->cpus know about dependency only when software
          * coordination is required.
          */
         if (policy->shared_type == CPUFREQ_SHARED_TYPE_ALL ||
@@ -462,10 +632,6 @@ acpi_cpufreq_cpu_init (
         }
 #endif
 
-        if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
-                acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
-        }
-
         /* capability check */
         if (perf->state_count <= 1) {
                 dprintk("No P-States\n");
@@ -473,17 +639,33 @@ acpi_cpufreq_cpu_init (
                 goto err_unreg;
         }
 
-        if ((perf->control_register.space_id != ACPI_ADR_SPACE_SYSTEM_IO) ||
-            (perf->status_register.space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {
-                dprintk("Unsupported address space [%d, %d]\n",
-                        (u32) (perf->control_register.space_id),
-                        (u32) (perf->status_register.space_id));
+        if (perf->control_register.space_id != perf->status_register.space_id) {
+                result = -ENODEV;
+                goto err_unreg;
+        }
+
+        switch (perf->control_register.space_id) {
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+                dprintk("SYSTEM IO addr space\n");
+                data->cpu_feature = SYSTEM_IO_CAPABLE;
+                break;
+        case ACPI_ADR_SPACE_FIXED_HARDWARE:
+                dprintk("HARDWARE addr space\n");
+                if (!check_est_cpu(cpu)) {
+                        result = -ENODEV;
+                        goto err_unreg;
+                }
+                data->cpu_feature = SYSTEM_INTEL_MSR_CAPABLE;
+                break;
+        default:
+                dprintk("Unknown addr space %d\n",
+                        (u32) (perf->control_register.space_id));
                 result = -ENODEV;
                 goto err_unreg;
         }
 
-        /* alloc freq_table */
-        data->freq_table = kmalloc(sizeof(struct cpufreq_frequency_table) * (perf->state_count + 1), GFP_KERNEL);
+        data->freq_table = kmalloc(sizeof(struct cpufreq_frequency_table) *
+                    (perf->state_count+1), GFP_KERNEL);
         if (!data->freq_table) {
                 result = -ENOMEM;
                 goto err_unreg;
@@ -492,129 +674,140 @@ acpi_cpufreq_cpu_init (
         /* detect transition latency */
         policy->cpuinfo.transition_latency = 0;
         for (i=0; i<perf->state_count; i++) {
-                if ((perf->states[i].transition_latency * 1000) > policy->cpuinfo.transition_latency)
-                        policy->cpuinfo.transition_latency = perf->states[i].transition_latency * 1000;
+                if ((perf->states[i].transition_latency * 1000) >
+                    policy->cpuinfo.transition_latency)
+                        policy->cpuinfo.transition_latency =
+                            perf->states[i].transition_latency * 1000;
         }
         policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
 
-        /* The current speed is unknown and not detectable by ACPI...  */
-        policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
-
+        data->max_freq = perf->states[0].core_frequency * 1000;
         /* table init */
-        for (i=0; i<=perf->state_count; i++)
-        {
-                data->freq_table[i].index = i;
-                if (i<perf->state_count)
-                        data->freq_table[i].frequency = perf->states[i].core_frequency * 1000;
-                else
-                        data->freq_table[i].frequency = CPUFREQ_TABLE_END;
+        for (i=0; i<perf->state_count; i++) {
+                if (i>0 && perf->states[i].core_frequency ==
+                    perf->states[i-1].core_frequency)
+                        continue;
+
+                data->freq_table[valid_states].index = i;
+                data->freq_table[valid_states].frequency =
+                    perf->states[i].core_frequency * 1000;
+                valid_states++;
         }
+        data->freq_table[valid_states].frequency = CPUFREQ_TABLE_END;
 
         result = cpufreq_frequency_table_cpuinfo(policy, data->freq_table);
-        if (result) {
+        if (result)
                 goto err_freqfree;
+
+        switch (data->cpu_feature) {
+        case ACPI_ADR_SPACE_SYSTEM_IO:
+                /* Current speed is unknown and not detectable by IO port */
+                policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
+                break;
+        case ACPI_ADR_SPACE_FIXED_HARDWARE:
+                acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
+                get_cur_freq_on_cpu(cpu);
+                break;
+        default:
+                break;
         }
 
         /* notify BIOS that we exist */
         acpi_processor_notify_smm(THIS_MODULE);
 
-        printk(KERN_INFO "acpi-cpufreq: CPU%u - ACPI performance management activated.\n",
-               cpu);
+        /* Check for APERF/MPERF support in hardware */
+        if (c->x86_vendor == X86_VENDOR_INTEL && c->cpuid_level >= 6) {
+                unsigned int ecx;
+                ecx = cpuid_ecx(6);
+                if (ecx & CPUID_6_ECX_APERFMPERF_CAPABILITY)
+                        acpi_cpufreq_driver.getavg = get_measured_perf;
+        }
+
+        dprintk("CPU%u - ACPI performance management activated.\n", cpu);
         for (i = 0; i < perf->state_count; i++)
                 dprintk("     %cP%d: %d MHz, %d mW, %d uS\n",
-                        (i == perf->state?'*':' '), i,
+                        (i == perf->state ? '*' : ' '), i,
                         (u32) perf->states[i].core_frequency,
                         (u32) perf->states[i].power,
                         (u32) perf->states[i].transition_latency);
 
         cpufreq_frequency_table_get_attr(data->freq_table, policy->cpu);
-        
+
         /*
          * the first call to ->target() should result in us actually
          * writing something to the appropriate registers.
          */
         data->resume = 1;
-        
-        return (result);
 
- err_freqfree:
+        return result;
+
+err_freqfree:
         kfree(data->freq_table);
- err_unreg:
+err_unreg:
         acpi_processor_unregister_performance(perf, cpu);
- err_free:
+err_free:
         kfree(data);
-        acpi_io_data[cpu] = NULL;
+        drv_data[cpu] = NULL;
 
-        return (result);
+        return result;
 }
 
-
-static int
-acpi_cpufreq_cpu_exit (
-        struct cpufreq_policy   *policy)
+static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)
 {
-        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
-
+        struct acpi_cpufreq_data *data = drv_data[policy->cpu];
 
         dprintk("acpi_cpufreq_cpu_exit\n");
 
         if (data) {
                 cpufreq_frequency_table_put_attr(policy->cpu);
-                acpi_io_data[policy->cpu] = NULL;
-                acpi_processor_unregister_performance(data->acpi_data, policy->cpu);
+                drv_data[policy->cpu] = NULL;
+                acpi_processor_unregister_performance(data->acpi_data,
+                                                      policy->cpu);
                 kfree(data);
         }
 
-        return (0);
+        return 0;
 }
 
-static int
-acpi_cpufreq_resume (
-        struct cpufreq_policy   *policy)
+static int acpi_cpufreq_resume(struct cpufreq_policy *policy)
 {
-        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
-
+        struct acpi_cpufreq_data *data = drv_data[policy->cpu];
 
         dprintk("acpi_cpufreq_resume\n");
 
         data->resume = 1;
 
-        return (0);
+        return 0;
 }
 
-
-static struct freq_attr* acpi_cpufreq_attr[] = {
+static struct freq_attr *acpi_cpufreq_attr[] = {
         &cpufreq_freq_attr_scaling_available_freqs,
         NULL,
 };
 
 static struct cpufreq_driver acpi_cpufreq_driver = {
-        .verify = acpi_cpufreq_verify,
-        .target = acpi_cpufreq_target,
-        .init   = acpi_cpufreq_cpu_init,
-        .exit   = acpi_cpufreq_cpu_exit,
-        .resume = acpi_cpufreq_resume,
-        .name   = "acpi-cpufreq",
-        .owner  = THIS_MODULE,
-        .attr   = acpi_cpufreq_attr,
+        .verify = acpi_cpufreq_verify,
+        .target = acpi_cpufreq_target,
+        .init = acpi_cpufreq_cpu_init,
+        .exit = acpi_cpufreq_cpu_exit,
+        .resume = acpi_cpufreq_resume,
+        .name = "acpi-cpufreq",
+        .owner = THIS_MODULE,
+        .attr = acpi_cpufreq_attr,
 };
 
-
-static int __init
-acpi_cpufreq_init (void)
+static int __init acpi_cpufreq_init(void)
 {
         dprintk("acpi_cpufreq_init\n");
 
-        acpi_cpufreq_early_init_acpi();
+        acpi_cpufreq_early_init();
 
         return cpufreq_register_driver(&acpi_cpufreq_driver);
 }
 
-
-static void __exit
-acpi_cpufreq_exit (void)
+static void __exit acpi_cpufreq_exit(void)
 {
-        unsigned int    i;
+        unsigned int i;
         dprintk("acpi_cpufreq_exit\n");
 
         cpufreq_unregister_driver(&acpi_cpufreq_driver);
@@ -627,7 +820,9 @@ acpi_cpufreq_exit (void)
 }
 
 module_param(acpi_pstate_strict, uint, 0644);
-MODULE_PARM_DESC(acpi_pstate_strict, "value 0 or non-zero. non-zero -> strict ACPI checks are performed during frequency changes.");
+MODULE_PARM_DESC(acpi_pstate_strict,
+        "value 0 or non-zero. non-zero -> strict ACPI checks are "
+        "performed during frequency changes.");
 
 late_initcall(acpi_cpufreq_init);
 module_exit(acpi_cpufreq_exit);
diff --git a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c b/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
index 92afa3bc84f1..6667e9cceb9f 100644
--- a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
+++ b/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
@@ -447,7 +447,6 @@ static int __init cpufreq_gx_init(void)
         int ret;
         struct gxfreq_params *params;
         struct pci_dev *gx_pci;
-        u32 class_rev;
 
         /* Test if we have the right hardware */
         if ((gx_pci = gx_detect_chipset()) == NULL)
@@ -472,8 +471,7 @@ static int __init cpufreq_gx_init(void)
         pci_read_config_byte(params->cs55x0, PCI_PMER2, &(params->pci_pmer2));
         pci_read_config_byte(params->cs55x0, PCI_MODON, &(params->on_duration));
         pci_read_config_byte(params->cs55x0, PCI_MODOFF, &(params->off_duration));
-        pci_read_config_dword(params->cs55x0, PCI_CLASS_REVISION, &class_rev);
-        params->pci_rev = class_rev && 0xff;
+        pci_read_config_byte(params->cs55x0, PCI_REVISION_ID, &params->pci_rev);
 
         if ((ret = cpufreq_register_driver(&gx_suspmod_driver))) {
                 kfree(params);
diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c
index 7233abe5d695..c548daad3476 100644
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
@@ -410,7 +410,7 @@ static int __init longhaul_get_ranges(void)
                         maxmult=longhaul_get_cpu_mult();
 
                         /* Starting with the 1.2GHz parts, theres a 200MHz bus. */
-                        if ((cpu_khz/1000) > 1200)
+                        if ((cpu_khz/maxmult) > 13400)
                                 fsb = 200;
                         else
                                 fsb = eblcr_fsb_table_v2[longhaul.bits.MaxMHzFSB];
@@ -583,6 +583,10 @@ static int enable_arbiter_disable(void)
         if (dev == NULL) {
                 reg = 0x76;
                 dev = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_862X_0, NULL);
+                /* Find CN400 V-Link host bridge */
+                if (dev == NULL)
+                        dev = pci_find_device(PCI_VENDOR_ID_VIA, 0x7259, NULL);
+
         }
         if (dev != NULL) {
                 /* Enable access to port 0x22 */
@@ -734,7 +738,7 @@ print_support_type:
         return 0;
 
 err_acpi:
-        printk(KERN_ERR PFX "No ACPI support. No VT8601 or VT8623 northbridge. Aborting.\n");
+        printk(KERN_ERR PFX "No ACPI support. Unsupported northbridge. Aborting.\n");
         return -ENODEV;
 }
 
diff --git a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
index 304d2eaa4a1b..bec50170b75a 100644
--- a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
+++ b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
@@ -163,29 +163,27 @@ static int cpufreq_p4_verify(struct cpufreq_policy *policy)
 
 static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
 {
-        if ((c->x86 == 0x06) && (c->x86_model == 0x09)) {
-                /* Pentium M (Banias) */
-                printk(KERN_WARNING PFX "Warning: Pentium M detected. "
-                       "The speedstep_centrino module offers voltage scaling"
-                       " in addition of frequency scaling. You should use "
-                       "that instead of p4-clockmod, if possible.\n");
-                return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PM);
-        }
-
-        if ((c->x86 == 0x06) && (c->x86_model == 0x0D)) {
-                /* Pentium M (Dothan) */
-                printk(KERN_WARNING PFX "Warning: Pentium M detected. "
-                       "The speedstep_centrino module offers voltage scaling"
-                       " in addition of frequency scaling. You should use "
-                       "that instead of p4-clockmod, if possible.\n");
-                /* on P-4s, the TSC runs with constant frequency independent whether
-                 * throttling is active or not. */
-                p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
-                return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PM);
+        if (c->x86 == 0x06) {
+                if (cpu_has(c, X86_FEATURE_EST))
+                        printk(KERN_WARNING PFX "Warning: EST-capable CPU detected. "
+                               "The acpi-cpufreq module offers voltage scaling"
+                               " in addition of frequency scaling. You should use "
+                               "that instead of p4-clockmod, if possible.\n");
+                switch (c->x86_model) {
+                case 0x0E: /* Core */
+                case 0x0F: /* Core Duo */
+                        p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
+                        return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PCORE);
+                case 0x0D: /* Pentium M (Dothan) */
+                        p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
+                        /* fall through */
+                case 0x09: /* Pentium M (Banias) */
+                        return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PM);
+                }
         }
 
         if (c->x86 != 0xF) {
-                printk(KERN_WARNING PFX "Unknown p4-clockmod-capable CPU. Please send an e-mail to <linux@brodo.de>\n");
+                printk(KERN_WARNING PFX "Unknown p4-clockmod-capable CPU. Please send an e-mail to <cpufreq@lists.linux.org.uk>\n");
                 return 0;
         }
 
diff --git a/arch/i386/kernel/cpu/cpufreq/sc520_freq.c b/arch/i386/kernel/cpu/cpufreq/sc520_freq.c
index ef457d50f4ac..b8fb4b521c62 100644
--- a/arch/i386/kernel/cpu/cpufreq/sc520_freq.c
+++ b/arch/i386/kernel/cpu/cpufreq/sc520_freq.c
@@ -153,6 +153,7 @@ static struct cpufreq_driver sc520_freq_driver = {
 static int __init sc520_freq_init(void)
 {
         struct cpuinfo_x86 *c = cpu_data;
+        int err;
 
         /* Test if we have the right hardware */
         if(c->x86_vendor != X86_VENDOR_AMD ||
@@ -166,7 +167,11 @@ static int __init sc520_freq_init(void)
                 return -ENOMEM;
         }
 
-        return cpufreq_register_driver(&sc520_freq_driver);
+        err = cpufreq_register_driver(&sc520_freq_driver);
+        if (err)
+                iounmap(cpuctl);
+
+        return err;
 }
 
 
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
index e8993baf3d14..5113e9231634 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -36,6 +36,7 @@
 
 #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "speedstep-centrino", msg)
 
+#define INTEL_MSR_RANGE (0xffff)
 
 struct cpu_id
 {
@@ -379,6 +380,7 @@ static int centrino_cpu_early_init_acpi(void)
 }
 
 
+#ifdef CONFIG_SMP
 /*
  * Some BIOSes do SW_ANY coordination internally, either set it up in hw
  * or do it in BIOS firmware and won't inform about it to OS. If not
@@ -392,7 +394,6 @@ static int sw_any_bug_found(struct dmi_system_id *d)
         return 0;
 }
 
-
 static struct dmi_system_id sw_any_bug_dmi_table[] = {
         {
                 .callback = sw_any_bug_found,
@@ -405,7 +406,7 @@ static struct dmi_system_id sw_any_bug_dmi_table[] = {
         },
         { }
 };
-
+#endif
 
 /*
  * centrino_cpu_init_acpi - register with ACPI P-States library
@@ -463,8 +464,9 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)
         }
 
         for (i=0; i<p->state_count; i++) {
-                if (p->states[i].control != p->states[i].status) {
-                        dprintk("Different control (%llu) and status values (%llu)\n",
+                if ((p->states[i].control & INTEL_MSR_RANGE) !=
+                    (p->states[i].status & INTEL_MSR_RANGE)) {
+                        dprintk("Different MSR bits in control (%llu) and status (%llu)\n",
                                 p->states[i].control, p->states[i].status);
                         result = -EINVAL;
                         goto err_unreg;
@@ -500,7 +502,7 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)
         }
 
         for (i=0; i<p->state_count; i++) {
-                centrino_model[cpu]->op_points[i].index = p->states[i].control;
+                centrino_model[cpu]->op_points[i].index = p->states[i].control & INTEL_MSR_RANGE;
                 centrino_model[cpu]->op_points[i].frequency = p->states[i].core_frequency * 1000;
                 dprintk("adding state %i with frequency %u and control value %04x\n", 
                         i, centrino_model[cpu]->op_points[i].frequency, centrino_model[cpu]->op_points[i].index);
@@ -531,6 +533,9 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)
 
         /* notify BIOS that we exist */
         acpi_processor_notify_smm(THIS_MODULE);
+        printk("speedstep-centrino with X86_SPEEDSTEP_CENTRINO_ACPI"
+                        "config is deprecated.\n "
+                        "Use X86_ACPI_CPUFREQ (acpi-cpufreq instead.\n" );
 
         return 0;
 
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
index 4f46cac155c4..d59277c00911 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
@@ -123,6 +123,36 @@ static unsigned int pentiumM_get_frequency(void)
         return (msr_tmp * 100 * 1000);
 }
 
+static unsigned int pentium_core_get_frequency(void)
+{
+        u32 fsb = 0;
+        u32 msr_lo, msr_tmp;
+
+        rdmsr(MSR_FSB_FREQ, msr_lo, msr_tmp);
+        /* see table B-2 of 25366920.pdf */
+        switch (msr_lo & 0x07) {
+        case 5:
+                fsb = 100000;
+                break;
+        case 1:
+                fsb = 133333;
+                break;
+        case 3:
+                fsb = 166667;
+                break;
+        default:
+                printk(KERN_ERR "PCORE - MSR_FSB_FREQ undefined value");
+        }
+
+        rdmsr(MSR_IA32_EBL_CR_POWERON, msr_lo, msr_tmp);
+        dprintk("PCORE - MSR_IA32_EBL_CR_POWERON: 0x%x 0x%x\n", msr_lo, msr_tmp);
+
+        msr_tmp = (msr_lo >> 22) & 0x1f;
+        dprintk("bits 22-26 are 0x%x, speed is %u\n", msr_tmp, (msr_tmp * fsb));
+
+        return (msr_tmp * fsb);
+}
+
 
 static unsigned int pentium4_get_frequency(void)
 {
@@ -174,6 +204,8 @@ static unsigned int pentium4_get_frequency(void)
 unsigned int speedstep_get_processor_frequency(unsigned int processor)
 {
         switch (processor) {
+        case SPEEDSTEP_PROCESSOR_PCORE:
+                return pentium_core_get_frequency();
         case SPEEDSTEP_PROCESSOR_PM:
                 return pentiumM_get_frequency();
         case SPEEDSTEP_PROCESSOR_P4D:
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.h b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.h
index b735429c50b4..b11bcc608cac 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.h
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.h
@@ -22,6 +22,7 @@
  * the speedstep_get_processor_frequency() call. */
 #define SPEEDSTEP_PROCESSOR_PM                  0xFFFFFF03  /* Pentium M  */
 #define SPEEDSTEP_PROCESSOR_P4D                 0xFFFFFF04  /* desktop P4  */
+#define SPEEDSTEP_PROCESSOR_PCORE               0xFFFFFF05  /* Core */
 
 /* speedstep states -- only two of them */
 
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c b/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
index c28333d53646..ff0d89806114 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
@@ -360,9 +360,6 @@ static int __init speedstep_init(void)
         case SPEEDSTEP_PROCESSOR_PIII_C:
         case SPEEDSTEP_PROCESSOR_PIII_C_EARLY:
                 break;
-        case SPEEDSTEP_PROCESSOR_P4M:
-                printk(KERN_INFO "speedstep-smi: you're trying to use this cpufreq driver on a Pentium 4-based CPU. Most likely it will not work.\n");
-                break;
         default:
                 speedstep_processor = 0;
         }
diff --git a/arch/i386/kernel/microcode.c b/arch/i386/kernel/microcode.c
index 972346604f9d..47ffec57c0cb 100644
--- a/arch/i386/kernel/microcode.c
+++ b/arch/i386/kernel/microcode.c
@@ -1,7 +1,7 @@
 /*
  *      Intel CPU Microcode Update Driver for Linux
  *
- *      Copyright (C) 2000-2004 Tigran Aivazian
+ *      Copyright (C) 2000-2006 Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
  *                    2006      Shaohua Li <shaohua.li@intel.com>
  *
  *      This driver allows to upgrade microcode on Intel processors
@@ -92,7 +92,7 @@
 #include <asm/processor.h>
 
 MODULE_DESCRIPTION("Intel CPU (IA-32) Microcode Update Driver");
-MODULE_AUTHOR("Tigran Aivazian <tigran@veritas.com>");
+MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");
 MODULE_LICENSE("GPL");
 
 #define MICROCODE_VERSION       "1.14a"
@@ -752,7 +752,7 @@ static int __init microcode_init (void)
         register_hotcpu_notifier(&mc_cpu_notifier);
 
         printk(KERN_INFO 
-                "IA-32 Microcode Update Driver: v" MICROCODE_VERSION " <tigran@veritas.com>\n");
+                "IA-32 Microcode Update Driver: v" MICROCODE_VERSION " <tigran@aivazian.fsnet.co.uk>\n");
         return 0;
 }
 
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index b0f84e5778ad..aef39be81361 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -69,9 +69,7 @@ static int __devinitdata smp_b_stepping;
 
 /* Number of siblings per CPU package */
 int smp_num_siblings = 1;
-#ifdef CONFIG_SMP
 EXPORT_SYMBOL(smp_num_siblings);
-#endif
 
 /* Last level cache ID of each logical CPU */
 int cpu_llc_id[NR_CPUS] __cpuinitdata = {[0 ... NR_CPUS-1] = BAD_APICID};
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 1f16ebb9a800..324ea7565e2c 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -488,7 +488,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
 
 #define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
 
-static void rs_set_termios(struct tty_struct *tty, struct termios *old_termios)
+static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 {
         unsigned int cflag = tty->termios->c_cflag;
 
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index 8ae384eb5357..098ee605bf5e 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
 obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o
 obj-$(CONFIG_KPROBES)           += kprobes.o jprobes.o
 obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o crash.o
+obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
 obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR)   += uncached.o
 obj-$(CONFIG_AUDIT)             += audit.o
 obj-$(CONFIG_PCI_MSI)           += msi_ia64.o
diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c
index 0aabedf95dad..bc2f64d72244 100644
--- a/arch/ia64/kernel/crash.c
+++ b/arch/ia64/kernel/crash.c
@@ -19,29 +19,11 @@
 
 #include <asm/kdebug.h>
 #include <asm/mca.h>
-#include <asm/uaccess.h>
 
 int kdump_status[NR_CPUS];
 atomic_t kdump_cpu_freezed;
 atomic_t kdump_in_progress;
 int kdump_on_init = 1;
-ssize_t
-copy_oldmem_page(unsigned long pfn, char *buf,
-                size_t csize, unsigned long offset, int userbuf)
-{
-        void  *vaddr;
-
-        if (!csize)
-                return 0;
-        vaddr = __va(pfn<<PAGE_SHIFT);
-        if (userbuf) {
-                if (copy_to_user(buf, (vaddr + offset), csize)) {
-                        return -EFAULT;
-                }
-        } else
-                memcpy(buf, (vaddr + offset), csize);
-        return csize;
-}
 
 static inline Elf64_Word
 *append_elf_note(Elf64_Word *buf, char *name, unsigned type, void *data,
@@ -225,14 +207,10 @@ static ctl_table sys_table[] = {
 static int
 machine_crash_setup(void)
 {
-        char *from = strstr(saved_command_line, "elfcorehdr=");
         static struct notifier_block kdump_init_notifier_nb = {
                 .notifier_call = kdump_init_notifier,
         };
         int ret;
-        if (from)
-                elfcorehdr_addr = memparse(from+11, &from);
-        saved_max_pfn = (unsigned long)-1;
         if((ret = register_die_notifier(&kdump_init_notifier_nb)) != 0)
                 return ret;
 #ifdef CONFIG_SYSCTL
diff --git a/arch/ia64/kernel/crash_dump.c b/arch/ia64/kernel/crash_dump.c
new file mode 100644
index 000000000000..83b8c91c1408
--- /dev/null
+++ b/arch/ia64/kernel/crash_dump.c
@@ -0,0 +1,48 @@
+/*
+ *      kernel/crash_dump.c - Memory preserving reboot related code.
+ *
+ *      Created by: Simon Horman <horms@verge.net.au>
+ *      Original code moved from kernel/crash.c
+ *      Original code comment copied from the i386 version of this file
+ */
+
+#include <linux/errno.h>
+#include <linux/types.h>
+
+#include <linux/uaccess.h>
+
+/**
+ * copy_oldmem_page - copy one page from "oldmem"
+ * @pfn: page frame number to be copied
+ * @buf: target memory address for the copy; this can be in kernel address
+ *      space or user address space (see @userbuf)
+ * @csize: number of bytes to copy
+ * @offset: offset in bytes into the page (based on pfn) to begin the copy
+ * @userbuf: if set, @buf is in user address space, use copy_to_user(),
+ *      otherwise @buf is in kernel address space, use memcpy().
+ *
+ * Copy a page from "oldmem". For this page, there is no pte mapped
+ * in the current kernel. We stitch up a pte, similar to kmap_atomic.
+ *
+ * Calling copy_to_user() in atomic context is not desirable. Hence first
+ * copying the data to a pre-allocated kernel page and then copying to user
+ * space in non-atomic context.
+ */
+ssize_t
+copy_oldmem_page(unsigned long pfn, char *buf,
+                size_t csize, unsigned long offset, int userbuf)
+{
+        void  *vaddr;
+
+        if (!csize)
+                return 0;
+        vaddr = __va(pfn<<PAGE_SHIFT);
+        if (userbuf) {
+                if (copy_to_user(buf, (vaddr + offset), csize)) {
+                        return -EFAULT;
+                }
+        } else
+                memcpy(buf, (vaddr + offset), csize);
+        return csize;
+}
+
diff --git a/arch/ia64/kernel/jprobes.S b/arch/ia64/kernel/jprobes.S
index 5cd6226f44f2..621630256c4a 100644
--- a/arch/ia64/kernel/jprobes.S
+++ b/arch/ia64/kernel/jprobes.S
@@ -45,13 +45,14 @@
  * to the correct location.
  */
 #include <asm/asmmacro.h>
+#include <asm-ia64/break.h>
 
         /*
          * void jprobe_break(void)
          */
         .section .kprobes.text, "ax"
 ENTRY(jprobe_break)
-        break.m 0x80300
+        break.m __IA64_BREAK_JPROBE
 END(jprobe_break)
 
         /*
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 76e778951e20..6cb56dd4056d 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -88,6 +88,7 @@ static void __kprobes update_kprobe_inst_flag(uint template, uint  slot,
 {
         p->ainsn.inst_flag = 0;
         p->ainsn.target_br_reg = 0;
+        p->ainsn.slot = slot;
 
         /* Check for Break instruction
          * Bits 37:40 Major opcode to be zero
@@ -129,48 +130,6 @@ static void __kprobes update_kprobe_inst_flag(uint template, uint  slot,
 
 /*
  * In this function we check to see if the instruction
- * on which we are inserting kprobe is supported.
- * Returns 0 if supported
- * Returns -EINVAL if unsupported
- */
-static int __kprobes unsupported_inst(uint template, uint  slot,
-                                      uint major_opcode,
-                                      unsigned long kprobe_inst,
-                                      unsigned long addr)
-{
-        if (bundle_encoding[template][slot] == I) {
-                switch (major_opcode) {
-                        case 0x0: //I_UNIT_MISC_OPCODE:
-                        /*
-                         * Check for Integer speculation instruction
-                         * - Bit 33-35 to be equal to 0x1
-                         */
-                        if (((kprobe_inst >> 33) & 0x7) == 1) {
-                                printk(KERN_WARNING
-                                        "Kprobes on speculation inst at <0x%lx> not supported\n",
-                                        addr);
-                                return -EINVAL;
-                        }
-
-                        /*
-                         * IP relative mov instruction
-                         *  - Bit 27-35 to be equal to 0x30
-                         */
-                        if (((kprobe_inst >> 27) & 0x1FF) == 0x30) {
-                                printk(KERN_WARNING
-                                        "Kprobes on \"mov r1=ip\" at <0x%lx> not supported\n",
-                                        addr);
-                                return -EINVAL;
-
-                        }
-                }
-        }
-        return 0;
-}
-
-
-/*
- * In this function we check to see if the instruction
  * (qp) cmpx.crel.ctype p1,p2=r2,r3
  * on which we are inserting kprobe is cmp instruction
  * with ctype as unc.
@@ -206,26 +165,136 @@ out:
 }
 
 /*
+ * In this function we check to see if the instruction
+ * on which we are inserting kprobe is supported.
+ * Returns qp value if supported
+ * Returns -EINVAL if unsupported
+ */
+static int __kprobes unsupported_inst(uint template, uint  slot,
+                                      uint major_opcode,
+                                      unsigned long kprobe_inst,
+                                      unsigned long addr)
+{
+        int qp;
+
+        qp = kprobe_inst & 0x3f;
+        if (is_cmp_ctype_unc_inst(template, slot, major_opcode, kprobe_inst)) {
+                if (slot == 1 && qp)  {
+                        printk(KERN_WARNING "Kprobes on cmp unc"
+                                        "instruction on slot 1 at <0x%lx>"
+                                        "is not supported\n", addr);
+                        return -EINVAL;
+
+                }
+                qp = 0;
+        }
+        else if (bundle_encoding[template][slot] == I) {
+                if (major_opcode == 0) {
+                        /*
+                         * Check for Integer speculation instruction
+                         * - Bit 33-35 to be equal to 0x1
+                         */
+                        if (((kprobe_inst >> 33) & 0x7) == 1) {
+                                printk(KERN_WARNING
+                                        "Kprobes on speculation inst at <0x%lx> not supported\n",
+                                                addr);
+                                return -EINVAL;
+                        }
+                        /*
+                         * IP relative mov instruction
+                         *  - Bit 27-35 to be equal to 0x30
+                         */
+                        if (((kprobe_inst >> 27) & 0x1FF) == 0x30) {
+                                printk(KERN_WARNING
+                                        "Kprobes on \"mov r1=ip\" at <0x%lx> not supported\n",
+                                                addr);
+                                return -EINVAL;
+
+                        }
+                }
+                else if ((major_opcode == 5) && !(kprobe_inst & (0xFUl << 33)) &&
+                                (kprobe_inst & (0x1UL << 12))) {
+                        /* test bit instructions, tbit,tnat,tf
+                         * bit 33-36 to be equal to 0
+                         * bit 12 to be equal to 1
+                         */
+                        if (slot == 1 && qp) {
+                                printk(KERN_WARNING "Kprobes on test bit"
+                                                "instruction on slot at <0x%lx>"
+                                                "is not supported\n", addr);
+                                return -EINVAL;
+                        }
+                        qp = 0;
+                }
+        }
+        else if (bundle_encoding[template][slot] == B) {
+                if (major_opcode == 7) {
+                        /* IP-Relative Predict major code is 7 */
+                        printk(KERN_WARNING "Kprobes on IP-Relative"
+                                        "Predict is not supported\n");
+                        return -EINVAL;
+                }
+                else if (major_opcode == 2) {
+                        /* Indirect Predict, major code is 2
+                         * bit 27-32 to be equal to 10 or 11
+                         */
+                        int x6=(kprobe_inst >> 27) & 0x3F;
+                        if ((x6 == 0x10) || (x6 == 0x11)) {
+                                printk(KERN_WARNING "Kprobes on"
+                                        "Indirect Predict is not supported\n");
+                                return -EINVAL;
+                        }
+                }
+        }
+        /* kernel does not use float instruction, here for safety kprobe
+         * will judge whether it is fcmp/flass/float approximation instruction
+         */
+        else if (unlikely(bundle_encoding[template][slot] == F)) {
+                if ((major_opcode == 4 || major_opcode == 5) &&
+                                (kprobe_inst  & (0x1 << 12))) {
+                        /* fcmp/fclass unc instruction */
+                        if (slot == 1 && qp) {
+                                printk(KERN_WARNING "Kprobes on fcmp/fclass "
+                                        "instruction on slot at <0x%lx> "
+                                        "is not supported\n", addr);
+                                return -EINVAL;
+
+                        }
+                        qp = 0;
+                }
+                if ((major_opcode == 0 || major_opcode == 1) &&
+                        (kprobe_inst & (0x1UL << 33))) {
+                        /* float Approximation instruction */
+                        if (slot == 1 && qp) {
+                                printk(KERN_WARNING "Kprobes on float Approx "
+                                        "instr at <0x%lx> is not supported\n",
+                                                addr);
+                                return -EINVAL;
+                        }
+                        qp = 0;
+                }
+        }
+        return qp;
+}
+
+/*
  * In this function we override the bundle with
  * the break instruction at the given slot.
  */
 static void __kprobes prepare_break_inst(uint template, uint  slot,
                                          uint major_opcode,
                                          unsigned long kprobe_inst,
-                                         struct kprobe *p)
+                                         struct kprobe *p,
+                                         int qp)
 {
         unsigned long break_inst = BREAK_INST;
         bundle_t *bundle = &p->opcode.bundle;
 
         /*
          * Copy the original kprobe_inst qualifying predicate(qp)
-         * to the break instruction iff !is_cmp_ctype_unc_inst
-         * because for cmp instruction with ctype equal to unc,
-         * which is a special instruction always needs to be
-         * executed regradless of qp
+         * to the break instruction
          */
-        if (!is_cmp_ctype_unc_inst(template, slot, major_opcode, kprobe_inst))
-                break_inst |= (0x3f & kprobe_inst);
+        break_inst |= qp;
 
         switch (slot) {
           case 0:
@@ -296,12 +365,6 @@ static int __kprobes valid_kprobe_addr(int template, int slot,
                 return -EINVAL;
         }
 
-        if (slot == 1 && bundle_encoding[template][1] != L) {
-                printk(KERN_WARNING "Inserting kprobes on slot #1 "
-                       "is not supported\n");
-                return -EINVAL;
-        }
-
         return 0;
 }
 
@@ -427,6 +490,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
         unsigned long kprobe_inst=0;
         unsigned int slot = addr & 0xf, template, major_opcode = 0;
         bundle_t *bundle;
+        int qp;
 
         bundle = &((kprobe_opcode_t *)kprobe_addr)->bundle;
         template = bundle->quad0.template;
@@ -441,9 +505,9 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
         /* Get kprobe_inst and major_opcode from the bundle */
         get_kprobe_inst(bundle, slot, &kprobe_inst, &major_opcode);
 
-        if (unsupported_inst(template, slot, major_opcode, kprobe_inst, addr))
-                        return -EINVAL;
-
+        qp = unsupported_inst(template, slot, major_opcode, kprobe_inst, addr);
+        if (qp < 0)
+                return -EINVAL;
 
         p->ainsn.insn = get_insn_slot();
         if (!p->ainsn.insn)
@@ -451,30 +515,56 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
         memcpy(&p->opcode, kprobe_addr, sizeof(kprobe_opcode_t));
         memcpy(p->ainsn.insn, kprobe_addr, sizeof(kprobe_opcode_t));
 
-        prepare_break_inst(template, slot, major_opcode, kprobe_inst, p);
+        prepare_break_inst(template, slot, major_opcode, kprobe_inst, p, qp);
 
         return 0;
 }
 
 void __kprobes arch_arm_kprobe(struct kprobe *p)
 {
-        unsigned long addr = (unsigned long)p->addr;
-        unsigned long arm_addr = addr & ~0xFULL;
+        unsigned long arm_addr;
+        bundle_t *src, *dest;
+
+        arm_addr = ((unsigned long)p->addr) & ~0xFUL;
+        dest = &((kprobe_opcode_t *)arm_addr)->bundle;
+        src = &p->opcode.bundle;
 
         flush_icache_range((unsigned long)p->ainsn.insn,
                         (unsigned long)p->ainsn.insn + sizeof(kprobe_opcode_t));
-        memcpy((char *)arm_addr, &p->opcode, sizeof(kprobe_opcode_t));
+        switch (p->ainsn.slot) {
+                case 0:
+                        dest->quad0.slot0 = src->quad0.slot0;
+                        break;
+                case 1:
+                        dest->quad1.slot1_p1 = src->quad1.slot1_p1;
+                        break;
+                case 2:
+                        dest->quad1.slot2 = src->quad1.slot2;
+                        break;
+        }
         flush_icache_range(arm_addr, arm_addr + sizeof(kprobe_opcode_t));
 }
 
 void __kprobes arch_disarm_kprobe(struct kprobe *p)
 {
-        unsigned long addr = (unsigned long)p->addr;
-        unsigned long arm_addr = addr & ~0xFULL;
+        unsigned long arm_addr;
+        bundle_t *src, *dest;
 
+        arm_addr = ((unsigned long)p->addr) & ~0xFUL;
+        dest = &((kprobe_opcode_t *)arm_addr)->bundle;
         /* p->ainsn.insn contains the original unaltered kprobe_opcode_t */
-        memcpy((char *) arm_addr, (char *) p->ainsn.insn,
-                                         sizeof(kprobe_opcode_t));
+        src = &p->ainsn.insn->bundle;
+        switch (p->ainsn.slot) {
+                case 0:
+                        dest->quad0.slot0 = src->quad0.slot0;
+                        break;
+                case 1:
+                        dest->quad1.slot1_p1 = src->quad1.slot1_p1;
+                        break;
+                case 2:
+                        dest->quad1.slot2 = src->quad1.slot2;
+                        break;
+        }
         flush_icache_range(arm_addr, arm_addr + sizeof(kprobe_opcode_t));
 }
 
@@ -807,7 +897,9 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
         switch(val) {
         case DIE_BREAK:
                 /* err is break number from ia64_bad_break() */
-                if (args->err == 0x80200 || args->err == 0x80300 || args->err == 0)
+                if ((args->err >> 12) == (__IA64_BREAK_KPROBE >> 12)
+                        || args->err == __IA64_BREAK_JPROBE
+                        || args->err == 0)
                         if (pre_kprobes_handler(args))
                                 ret = NOTIFY_STOP;
                 break;
diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
index 468233fa2cee..e2ccc9f660c5 100644
--- a/arch/ia64/kernel/machine_kexec.c
+++ b/arch/ia64/kernel/machine_kexec.c
@@ -19,8 +19,11 @@
 #include <asm/delay.h>
 #include <asm/meminit.h>
 
-typedef void (*relocate_new_kernel_t)(unsigned long, unsigned long,
-                struct ia64_boot_param *, unsigned long);
+typedef NORET_TYPE void (*relocate_new_kernel_t)(
+                                        unsigned long indirection_page,
+                                        unsigned long start_address,
+                                        struct ia64_boot_param *boot_param,
+                                        unsigned long pal_addr) ATTRIB_NORET;
 
 struct kimage *ia64_kimage;
 
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 87c1c4f42872..a76add3e76a2 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1239,7 +1239,7 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
         } else {
                 /* Dump buffered message to console */
                 ia64_mlogbuf_finish(1);
-#ifdef CONFIG_CRASH_DUMP
+#ifdef CONFIG_KEXEC
                 atomic_set(&kdump_in_progress, 1);
                 monarch_cpu = -1;
 #endif
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 14e1200376a9..ad567b8d432e 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -256,7 +256,7 @@ reserve_memory (void)
 
 #ifdef CONFIG_KEXEC
         /* crashkernel=size@offset specifies the size to reserve for a crash
-         * kernel.(offset is ingored for keep compatibility with other archs)
+         * kernel. If offset is 0, then it is determined automatically.
          * By reserving this memory we guarantee that linux never set's it
          * up as a DMA target.Useful for holding code to do something
          * appropriate after a kernel panic.
@@ -266,10 +266,16 @@ reserve_memory (void)
                 unsigned long base, size;
                 if (from) {
                         size = memparse(from + 12, &from);
+                        if (*from == '@')
+                                base = memparse(from+1, &from);
+                        else
+                                base = 0;
                         if (size) {
-                                sort_regions(rsvd_region, n);
-                                base = kdump_find_rsvd_region(size,
-                                rsvd_region, n);
+                                if (!base) {
+                                        sort_regions(rsvd_region, n);
+                                        base = kdump_find_rsvd_region(size,
+                                                                rsvd_region, n);
+                                        }
                                 if (base != ~0UL) {
                                         rsvd_region[n].start =
                                                 (unsigned long)__va(base);
@@ -434,6 +440,21 @@ static __init int setup_nomca(char *s)
 }
 early_param("nomca", setup_nomca);
 
+#ifdef CONFIG_PROC_VMCORE
+/* elfcorehdr= specifies the location of elf core header
+ * stored by the crashed kernel.
+ */
+static int __init parse_elfcorehdr(char *arg)
+{
+        if (!arg)
+                return -EINVAL;
+
+        elfcorehdr_addr = memparse(arg, &arg);
+        return 0;
+}
+early_param("elfcorehdr", parse_elfcorehdr);
+#endif /* CONFIG_PROC_VMCORE */
+
 void __init
 setup_arch (char **cmdline_p)
 {
@@ -653,6 +674,7 @@ get_model_name(__u8 family, __u8 model)
 {
         char brand[128];
 
+        memcpy(brand, "Unknown", 8);
         if (ia64_pal_get_brand_info(brand)) {
                 if (family == 0x7)
                         memcpy(brand, "Merced", 7);
@@ -660,8 +682,7 @@ get_model_name(__u8 family, __u8 model)
                         case 0: memcpy(brand, "McKinley", 9); break;
                         case 1: memcpy(brand, "Madison", 8); break;
                         case 2: memcpy(brand, "Madison up to 9M cache", 23); break;
-                } else
-                        memcpy(brand, "Unknown", 8);
+                }
         }
         if (brandname[0] == '\0')
                 return strcpy(brandname, brand);
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index b1b9aa4364b9..f4c7f7769cf7 100644
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -157,7 +157,7 @@ handle_IPI (int irq, void *dev_id)
                               case IPI_CPU_STOP:
                                 stop_this_cpu();
                                 break;
-#ifdef CONFIG_CRASH_DUMP
+#ifdef CONFIG_KEXEC
                               case IPI_KDUMP_CPU_STOP:
                                 unw_init_running(kdump_cpu_freeze, NULL);
                                 break;
@@ -219,7 +219,7 @@ send_IPI_self (int op)
         send_IPI_single(smp_processor_id(), op);
 }
 
-#ifdef CONFIG_CRASH_DUMP
+#ifdef CONFIG_KEXEC
 void
 kdump_smp_send_stop()
 {
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index fffa9e0826bc..ab684747036f 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -307,6 +307,15 @@ fp_emulate (int fp_fault, void *bundle, long *ipsr, long *fpsr, long *isr, long
         return ret.status;
 }
 
+struct fpu_swa_msg {
+        unsigned long count;
+        unsigned long time;
+};
+static DEFINE_PER_CPU(struct fpu_swa_msg, cpulast);
+DECLARE_PER_CPU(struct fpu_swa_msg, cpulast);
+static struct fpu_swa_msg last __cacheline_aligned;
+
+
 /*
  * Handle floating-point assist faults and traps.
  */
@@ -316,8 +325,6 @@ handle_fpu_swa (int fp_fault, struct pt_regs *regs, unsigned long isr)
         long exception, bundle[2];
         unsigned long fault_ip;
         struct siginfo siginfo;
-        static int fpu_swa_count = 0;
-        static unsigned long last_time;
 
         fault_ip = regs->cr_iip;
         if (!fp_fault && (ia64_psr(regs)->ri == 0))
@@ -325,14 +332,37 @@ handle_fpu_swa (int fp_fault, struct pt_regs *regs, unsigned long isr)
         if (copy_from_user(bundle, (void __user *) fault_ip, sizeof(bundle)))
                 return -1;
 
-        if (jiffies - last_time > 5*HZ)
-                fpu_swa_count = 0;
-        if ((fpu_swa_count < 4) && !(current->thread.flags & IA64_THREAD_FPEMU_NOPRINT)) {
-                last_time = jiffies;
-                ++fpu_swa_count;
-                printk(KERN_WARNING
-                       "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
-                       current->comm, current->pid, regs->cr_iip + ia64_psr(regs)->ri, isr);
+        if (!(current->thread.flags & IA64_THREAD_FPEMU_NOPRINT))  {
+                unsigned long count, current_jiffies = jiffies;
+                struct fpu_swa_msg *cp = &__get_cpu_var(cpulast);
+
+                if (unlikely(current_jiffies > cp->time))
+                        cp->count = 0;
+                if (unlikely(cp->count < 5)) {
+                        cp->count++;
+                        cp->time = current_jiffies + 5 * HZ;
+
+                        /* minimize races by grabbing a copy of count BEFORE checking last.time. */
+                        count = last.count;
+                        barrier();
+
+                        /*
+                         * Lower 4 bits are used as a count. Upper bits are a sequence
+                         * number that is updated when count is reset. The cmpxchg will
+                         * fail is seqno has changed. This minimizes mutiple cpus
+                         * reseting the count.
+                         */
+                        if (current_jiffies > last.time)
+                                (void) cmpxchg_acq(&last.count, count, 16 + (count & ~15));
+
+                        /* used fetchadd to atomically update the count */
+                        if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
+                                last.time = current_jiffies + 5 * HZ;
+                                printk(KERN_WARNING
+                                        "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
+                                        current->comm, current->pid, regs->cr_iip + ia64_psr(regs)->ri, isr);
+                        }
+                }
         }
 
         exception = fp_emulate(fp_fault, bundle, &regs->cr_ipsr, &regs->ar_fpsr, &isr, &regs->pr,
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 82deaa3a7c48..1e79551231b9 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -174,6 +174,12 @@ find_memory (void)
         reserve_bootmem(bootmap_start, bootmap_size);
 
         find_initrd();
+
+#ifdef CONFIG_CRASH_DUMP
+        /* If we are doing a crash dump, we still need to know the real mem
+         * size before original memory map is * reset. */
+        saved_max_pfn = max_pfn;
+#endif
 }
 
 #ifdef CONFIG_SMP
@@ -226,7 +232,6 @@ void __init
 paging_init (void)
 {
         unsigned long max_dma;
-        unsigned long nid = 0;
         unsigned long max_zone_pfns[MAX_NR_ZONES];
 
         num_physpages = 0;
@@ -238,7 +243,7 @@ paging_init (void)
         max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
 
 #ifdef CONFIG_VIRTUAL_MEM_MAP
-        efi_memmap_walk(register_active_ranges, &nid);
+        efi_memmap_walk(register_active_ranges, NULL);
         efi_memmap_walk(find_largest_hole, (u64 *)&max_gap);
         if (max_gap < LARGE_GAP) {
                 vmem_map = (struct page *) 0;
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 56dc2024220e..1a3d8a2feb94 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -595,14 +595,9 @@ find_largest_hole (u64 start, u64 end, void *arg)
 }
 
 int __init
-register_active_ranges(u64 start, u64 end, void *nid)
+register_active_ranges(u64 start, u64 end, void *arg)
 {
-        BUG_ON(nid == NULL);
-        BUG_ON(*(unsigned long *)nid >= MAX_NUMNODES);
-
-        add_active_range(*(unsigned long *)nid,
-                                __pa(start) >> PAGE_SHIFT,
-                                __pa(end) >> PAGE_SHIFT);
+        add_active_range(0, __pa(start) >> PAGE_SHIFT, __pa(end) >> PAGE_SHIFT);
         return 0;
 }
 #endif /* CONFIG_VIRTUAL_MEM_MAP */
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index a934ad069425..8571e52c2efd 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -580,7 +580,7 @@ void __cpuinit sn_cpu_init(void)
         int slice;
         int cnode;
         int i;
-        static int wars_have_been_checked;
+        static int wars_have_been_checked, set_cpu0_number;
 
         cpuid = smp_processor_id();
         if (cpuid == 0 && IS_MEDUSA()) {
@@ -605,8 +605,16 @@ void __cpuinit sn_cpu_init(void)
         /*
          * Don't check status. The SAL call is not supported on all PROMs
          * but a failure is harmless.
+         * Architechtuallly, cpu_init is always called twice on cpu 0. We
+         * should set cpu_number on cpu 0 once.
          */
-        (void) ia64_sn_set_cpu_number(cpuid);
+        if (cpuid == 0) {
+                if (!set_cpu0_number) {
+                        (void) ia64_sn_set_cpu_number(cpuid);
+                        set_cpu0_number = 1;
+                }
+        } else
+                (void) ia64_sn_set_cpu_number(cpuid);
 
         /*
          * The boot cpu makes this call again after platform initialization is
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 462ea178f49a..33367996d72d 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -189,7 +189,7 @@ static void print_pci_topology(struct seq_file *s)
         int e;
 
         for (sz = PAGE_SIZE; sz < 16 * PAGE_SIZE; sz += PAGE_SIZE) {
-                if (!(p = (char *)kmalloc(sz, GFP_KERNEL)))
+                if (!(p = kmalloc(sz, GFP_KERNEL)))
                         break;
                 e = ia64_sn_ioif_get_pci_topology(__pa(p), sz);
                 if (e == SALRET_OK)
diff --git a/arch/ia64/sn/kernel/xpc_channel.c b/arch/ia64/sn/kernel/xpc_channel.c
index 1f3540826e68..c08db9c2375d 100644
--- a/arch/ia64/sn/kernel/xpc_channel.c
+++ b/arch/ia64/sn/kernel/xpc_channel.c
@@ -632,7 +632,7 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)
                 ch->number, ch->partid);
 
         spin_unlock_irqrestore(&ch->lock, *irq_flags);
-        xpc_create_kthreads(ch, 1);
+        xpc_create_kthreads(ch, 1, 0);
         spin_lock_irqsave(&ch->lock, *irq_flags);
 }
 
@@ -754,12 +754,12 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
 
         /* make sure all activity has settled down first */
 
-        if (atomic_read(&ch->references) > 0 ||
-                        ((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
-                        !(ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE))) {
+        if (atomic_read(&ch->kthreads_assigned) > 0 ||
+                                atomic_read(&ch->references) > 0) {
                 return;
         }
-        DBUG_ON(atomic_read(&ch->kthreads_assigned) != 0);
+        DBUG_ON((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
+                        !(ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE));
 
         if (part->act_state == XPC_P_DEACTIVATING) {
                 /* can't proceed until the other side disengages from us */
@@ -1651,6 +1651,11 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,
         /* wake all idle kthreads so they can exit */
         if (atomic_read(&ch->kthreads_idle) > 0) {
                 wake_up_all(&ch->idle_wq);
+
+        } else if ((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
+                        !(ch->flags & XPC_C_DISCONNECTINGCALLOUT)) {
+                /* start a kthread that will do the xpcDisconnecting callout */
+                xpc_create_kthreads(ch, 1, 1);
         }
 
         /* wake those waiting to allocate an entry from the local msg queue */
diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c
index fa96dfc0e1aa..7a387d237363 100644
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/arch/ia64/sn/kernel/xpc_main.c
@@ -681,7 +681,7 @@ xpc_activate_kthreads(struct xpc_channel *ch, int needed)
         dev_dbg(xpc_chan, "create %d new kthreads, partid=%d, channel=%d\n",
                 needed, ch->partid, ch->number);
 
-        xpc_create_kthreads(ch, needed);
+        xpc_create_kthreads(ch, needed, 0);
 }
 
 
@@ -775,26 +775,28 @@ xpc_daemonize_kthread(void *args)
                 xpc_kthread_waitmsgs(part, ch);
         }
 
-        if (atomic_dec_return(&ch->kthreads_assigned) == 0) {
-                spin_lock_irqsave(&ch->lock, irq_flags);
-                if ((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
-                                !(ch->flags & XPC_C_DISCONNECTINGCALLOUT)) {
-                        ch->flags |= XPC_C_DISCONNECTINGCALLOUT;
-                        spin_unlock_irqrestore(&ch->lock, irq_flags);
+        /* let registerer know that connection is disconnecting */
 
-                        xpc_disconnect_callout(ch, xpcDisconnecting);
-
-                        spin_lock_irqsave(&ch->lock, irq_flags);
-                        ch->flags |= XPC_C_DISCONNECTINGCALLOUT_MADE;
-                }
+        spin_lock_irqsave(&ch->lock, irq_flags);
+        if ((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
+                        !(ch->flags & XPC_C_DISCONNECTINGCALLOUT)) {
+                ch->flags |= XPC_C_DISCONNECTINGCALLOUT;
                 spin_unlock_irqrestore(&ch->lock, irq_flags);
+
+                xpc_disconnect_callout(ch, xpcDisconnecting);
+
+                spin_lock_irqsave(&ch->lock, irq_flags);
+                ch->flags |= XPC_C_DISCONNECTINGCALLOUT_MADE;
+        }
+        spin_unlock_irqrestore(&ch->lock, irq_flags);
+
+        if (atomic_dec_return(&ch->kthreads_assigned) == 0) {
                 if (atomic_dec_return(&part->nchannels_engaged) == 0) {
                         xpc_mark_partition_disengaged(part);
                         xpc_IPI_send_disengage(part);
                 }
         }
 
-
         xpc_msgqueue_deref(ch);
 
         dev_dbg(xpc_chan, "kthread exiting, partid=%d, channel=%d\n",
@@ -818,7 +820,8 @@ xpc_daemonize_kthread(void *args)
  * partition.
  */
 void
-xpc_create_kthreads(struct xpc_channel *ch, int needed)
+xpc_create_kthreads(struct xpc_channel *ch, int needed,
+                        int ignore_disconnecting)
 {
         unsigned long irq_flags;
         pid_t pid;
@@ -833,16 +836,38 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed)
                  * kthread. That kthread is responsible for doing the
                  * counterpart to the following before it exits.
                  */
+                if (ignore_disconnecting) {
+                        if (!atomic_inc_not_zero(&ch->kthreads_assigned)) {
+                                /* kthreads assigned had gone to zero */
+                                BUG_ON(!(ch->flags &
+                                        XPC_C_DISCONNECTINGCALLOUT_MADE));
+                                break;
+                        }
+
+                } else if (ch->flags & XPC_C_DISCONNECTING) {
+                        break;
+
+                } else if (atomic_inc_return(&ch->kthreads_assigned) == 1) {
+                        if (atomic_inc_return(&part->nchannels_engaged) == 1)
+                                xpc_mark_partition_engaged(part);
+                }
                 (void) xpc_part_ref(part);
                 xpc_msgqueue_ref(ch);
-                if (atomic_inc_return(&ch->kthreads_assigned) == 1 &&
-                    atomic_inc_return(&part->nchannels_engaged) == 1) {
-                        xpc_mark_partition_engaged(part);
-                }
 
                 pid = kernel_thread(xpc_daemonize_kthread, (void *) args, 0);
                 if (pid < 0) {
                         /* the fork failed */
+
+                        /*
+                         * NOTE: if (ignore_disconnecting &&
+                         * !(ch->flags & XPC_C_DISCONNECTINGCALLOUT)) is true,
+                         * then we'll deadlock if all other kthreads assigned
+                         * to this channel are blocked in the channel's
+                         * registerer, because the only thing that will unblock
+                         * them is the xpcDisconnecting callout that this
+                         * failed kernel_thread would have made.
+                         */
+
                         if (atomic_dec_return(&ch->kthreads_assigned) == 0 &&
                             atomic_dec_return(&part->nchannels_engaged) == 0) {
                                 xpc_mark_partition_disengaged(part);
@@ -857,9 +882,6 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed)
                                  * Flag this as an error only if we have an
                                  * insufficient #of kthreads for the channel
                                  * to function.
-                                 *
-                                 * No xpc_msgqueue_ref() is needed here since
-                                 * the channel mgr is doing this.
                                  */
                                 spin_lock_irqsave(&ch->lock, irq_flags);
                                 XPC_DISCONNECT_CHANNEL(ch, xpcLackOfResources,
diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c
index b54ef1726c55..46b7d6035aab 100644
--- a/arch/m68k/mm/kmap.c
+++ b/arch/m68k/mm/kmap.c
@@ -59,7 +59,7 @@ static struct vm_struct *get_io_area(unsigned long size)
         unsigned long addr;
         struct vm_struct **p, *tmp, *area;
 
-        area = (struct vm_struct *)kmalloc(sizeof(*area), GFP_KERNEL);
+        area = kmalloc(sizeof(*area), GFP_KERNEL);
         if (!area)
                 return NULL;
         addr = KMAP_START;
diff --git a/arch/mips/kernel/apm.c b/arch/mips/kernel/apm.c
index 528e731049c1..ba16d07588cb 100644
--- a/arch/mips/kernel/apm.c
+++ b/arch/mips/kernel/apm.c
@@ -356,7 +356,7 @@ static int apm_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *as;
 
-        as = (struct apm_user *)kzalloc(sizeof(*as), GFP_KERNEL);
+        as = kzalloc(sizeof(*as), GFP_KERNEL);
         if (as) {
                 /*
                  * XXX - this is a tiny bit broken, when we consider BSD
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index ea2d15370bb7..30245c09d025 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -203,6 +203,31 @@ static inline void kunmap_coherent(struct page *page)
         preempt_check_resched();
 }
 
+void copy_user_highpage(struct page *to, struct page *from,
+        unsigned long vaddr, struct vm_area_struct *vma)
+{
+        void *vfrom, *vto;
+
+        vto = kmap_atomic(to, KM_USER1);
+        if (cpu_has_dc_aliases) {
+                vfrom = kmap_coherent(from, vaddr);
+                copy_page(vto, vfrom);
+                kunmap_coherent(from);
+        } else {
+                vfrom = kmap_atomic(from, KM_USER0);
+                copy_page(vto, vfrom);
+                kunmap_atomic(vfrom, KM_USER0);
+        }
+        if (((vma->vm_flags & VM_EXEC) && !cpu_has_ic_fills_f_dc) ||
+            pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
+                flush_data_cache_page((unsigned long)vto);
+        kunmap_atomic(vto, KM_USER1);
+        /* Make sure this page is cleared on other CPU's too before using it */
+        smp_wmb();
+}
+
+EXPORT_SYMBOL(copy_user_highpage);
+
 void copy_to_user_page(struct vm_area_struct *vma,
         struct page *page, unsigned long vaddr, void *dst, const void *src,
         unsigned long len)
diff --git a/arch/parisc/hpux/sys_hpux.c b/arch/parisc/hpux/sys_hpux.c
index d88309209f56..04c2ff444396 100644
--- a/arch/parisc/hpux/sys_hpux.c
+++ b/arch/parisc/hpux/sys_hpux.c
@@ -475,7 +475,7 @@ int hpux_sysfs(int opcode, unsigned long arg1, unsigned long arg2)
                 printk(KERN_DEBUG "len of arg1 = %d\n", len);
                 if (len == 0)
                         return 0;
-                fsname = (char *) kmalloc(len, GFP_KERNEL);
+                fsname = kmalloc(len, GFP_KERNEL);
                 if ( !fsname ) {
                         printk(KERN_DEBUG "failed to kmalloc fsname\n");
                         return 0;
diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c
index 920bdbf8404f..c10ab47d81fa 100644
--- a/arch/parisc/kernel/unwind.c
+++ b/arch/parisc/kernel/unwind.c
@@ -343,7 +343,7 @@ void unwind_frame_init_from_blocked_task(struct unwind_frame_info *info, struct
         struct pt_regs *r = &t->thread.regs;
         struct pt_regs *r2;
 
-        r2 = (struct pt_regs *)kmalloc(sizeof(struct pt_regs), GFP_KERNEL);
+        r2 = kmalloc(sizeof(struct pt_regs), GFP_KERNEL);
         if (!r2)
                 return;
         *r2 = *r;
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index 6960f090991e..869cebbba967 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -505,7 +505,7 @@ static int nvram_scan_partitions(void)
                 return -ENODEV;
         total_size = ppc_md.nvram_size();
         
-        header = (char *) kmalloc(NVRAM_HEADER_LEN, GFP_KERNEL);
+        header = kmalloc(NVRAM_HEADER_LEN, GFP_KERNEL);
         if (!header) {
                 printk(KERN_ERR "nvram_scan_partitions: Failed kmalloc\n");
                 return -ENOMEM;
@@ -574,7 +574,7 @@ static int __init nvram_init(void)
         }
         
         /* initialize our anchor for the nvram partition list */
-        nvram_part = (struct nvram_partition *) kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);
+        nvram_part = kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);
         if (!nvram_part) {
                 printk(KERN_ERR "nvram_init: Failed kmalloc\n");
                 return -ENOMEM;
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 8336deafc624..2847cd51a2d7 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -670,7 +670,7 @@ pcibios_make_OF_bus_map(void)
         struct pci_controller* hose;
         struct property *map_prop;
 
-        pci_to_OF_bus_map = (u8*)kmalloc(pci_bus_count, GFP_KERNEL);
+        pci_to_OF_bus_map = kmalloc(pci_bus_count, GFP_KERNEL);
         if (!pci_to_OF_bus_map) {
                 printk(KERN_ERR "Can't allocate OF bus map !\n");
                 return;
diff --git a/arch/powerpc/mm/imalloc.c b/arch/powerpc/mm/imalloc.c
index add8c1a9af68..c831815c31f0 100644
--- a/arch/powerpc/mm/imalloc.c
+++ b/arch/powerpc/mm/imalloc.c
@@ -138,7 +138,7 @@ static struct vm_struct * split_im_region(unsigned long v_addr,
         struct vm_struct *vm2 = NULL;
         struct vm_struct *new_vm = NULL;
         
-        vm1 = (struct vm_struct *) kmalloc(sizeof(*vm1), GFP_KERNEL);
+        vm1 = kmalloc(sizeof(*vm1), GFP_KERNEL);
         if (vm1 == NULL) {
                 printk(KERN_ERR "%s() out of memory\n", __FUNCTION__);
                 return NULL;
@@ -172,7 +172,7 @@ static struct vm_struct * split_im_region(unsigned long v_addr,
                  * uppermost remainder, and use existing parent one for the
                  * lower remainder of parent range
                  */
-                vm2 = (struct vm_struct *) kmalloc(sizeof(*vm2), GFP_KERNEL);
+                vm2 = kmalloc(sizeof(*vm2), GFP_KERNEL);
                 if (vm2 == NULL) {
                         printk(KERN_ERR "%s() out of memory\n", __FUNCTION__);
                         kfree(vm1);
@@ -206,7 +206,7 @@ static struct vm_struct * __add_new_im_area(unsigned long req_addr,
                         break;
         }
         
-        area = (struct vm_struct *) kmalloc(sizeof(*area), GFP_KERNEL);
+        area = kmalloc(sizeof(*area), GFP_KERNEL);
         if (!area)
                 return NULL;
         area->flags = 0;
diff --git a/arch/powerpc/platforms/4xx/Kconfig b/arch/powerpc/platforms/4xx/Kconfig
index ed39d6a3d22a..2f2a13ed7667 100644
--- a/arch/powerpc/platforms/4xx/Kconfig
+++ b/arch/powerpc/platforms/4xx/Kconfig
@@ -179,7 +179,7 @@ config BIOS_FIXUP
 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
 config 403GCX
         bool
-        depends OAK
+        depends on OAK
         default y
 
 config 405EP
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index ddbe398fbd48..b3c2ce4cb7a8 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -35,7 +35,7 @@ config HDPU
           Select HDPU if configuring a Sky Computers Compute Blade.
 
 config HDPU_FEATURES
-        depends HDPU
+        depends on HDPU
         tristate "HDPU-Features"
         help
           Select to enable HDPU enhanced features.
diff --git a/arch/powerpc/platforms/pseries/eeh_cache.c b/arch/powerpc/platforms/pseries/eeh_cache.c
index b6b462d3c604..f2bae04424f8 100644
--- a/arch/powerpc/platforms/pseries/eeh_cache.c
+++ b/arch/powerpc/platforms/pseries/eeh_cache.c
@@ -153,7 +153,7 @@ pci_addr_cache_insert(struct pci_dev *dev, unsigned long alo,
                         return piar;
                 }
         }
-        piar = (struct pci_io_addr_range *)kmalloc(sizeof(struct pci_io_addr_range), GFP_ATOMIC);
+        piar = kmalloc(sizeof(struct pci_io_addr_range), GFP_ATOMIC);
         if (!piar)
                 return NULL;
 
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c
index 709952c25f29..06b84c372e58 100644
--- a/arch/ppc/8260_io/fcc_enet.c
+++ b/arch/ppc/8260_io/fcc_enet.c
@@ -1892,10 +1892,10 @@ init_fcc_param(fcc_info_t *fip, struct net_device *dev,
         /* Allocate space for the buffer descriptors from regular memory.
          * Initialize base addresses for the buffer descriptors.
          */
-        cep->rx_bd_base = (cbd_t *)kmalloc(sizeof(cbd_t) * RX_RING_SIZE,
+        cep->rx_bd_base = kmalloc(sizeof(cbd_t) * RX_RING_SIZE,
                         GFP_KERNEL | GFP_DMA);
         ep->fen_genfcc.fcc_rbase = __pa(cep->rx_bd_base);
-        cep->tx_bd_base = (cbd_t *)kmalloc(sizeof(cbd_t) * TX_RING_SIZE,
+        cep->tx_bd_base = kmalloc(sizeof(cbd_t) * TX_RING_SIZE,
                         GFP_KERNEL | GFP_DMA);
         ep->fen_genfcc.fcc_tbase = __pa(cep->tx_bd_base);
 
diff --git a/arch/ppc/8xx_io/cs4218_tdm.c b/arch/ppc/8xx_io/cs4218_tdm.c
index c71ef3c2e7bf..b7bb5f0b3c5f 100644
--- a/arch/ppc/8xx_io/cs4218_tdm.c
+++ b/arch/ppc/8xx_io/cs4218_tdm.c
@@ -2601,7 +2601,7 @@ int __init tdm8xx_sound_init(void)
         /* Initialize beep stuff */
         orig_mksound = kd_mksound;
         kd_mksound = cs_mksound;
-        beep_buf = (short *) kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL);
+        beep_buf = kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL);
         if (beep_buf == NULL)
                 printk(KERN_WARNING "dmasound: no memory for "
                        "beep buffer\n");
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 692b5ba53209..8eb82efe05a1 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -624,7 +624,7 @@ config HDPU
           Select HDPU if configuring a Sky Computers Compute Blade.
 
 config HDPU_FEATURES
-        depends HDPU
+        depends on HDPU
         tristate "HDPU-Features"
         help
           Select to enable HDPU enhanced features.
@@ -735,7 +735,7 @@ config LITE5200
 
 config LITE5200B
         bool "Freescale LITE5200B"
-        depends LITE5200
+        depends on LITE5200
         help
           Support for the LITE5200B dev board for the MPC5200 from Freescale.
           This is the new board with 2 PCI slots.
diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig
index 293bd489e7d9..6980de420e92 100644
--- a/arch/ppc/platforms/4xx/Kconfig
+++ b/arch/ppc/platforms/4xx/Kconfig
@@ -189,7 +189,7 @@ config BIOS_FIXUP
 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
 config 403GCX
         bool
-        depends OAK
+        depends on OAK
         default y
 
 config 405EP
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index ff690564edbd..12272361c018 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -407,7 +407,7 @@ config APPLDATA_BASE
 
 config APPLDATA_MEM
         tristate "Monitor memory management statistics"
-        depends on APPLDATA_BASE
+        depends on APPLDATA_BASE && VM_EVENT_COUNTERS
         help
           This provides memory management related data to the Linux - VM Monitor
           Stream, like paging/swapping rate, memory utilisation, etc.
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index ef5266fbce62..bb57bc0e3fc8 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -191,13 +191,13 @@ debug_areas_alloc(int pages_per_area, int nr_areas)
         debug_entry_t*** areas;
         int i,j;
 
-        areas = (debug_entry_t ***) kmalloc(nr_areas *
+        areas = kmalloc(nr_areas *
                                         sizeof(debug_entry_t**),
                                         GFP_KERNEL);
         if (!areas)
                 goto fail_malloc_areas;
         for (i = 0; i < nr_areas; i++) {
-                areas[i] = (debug_entry_t**) kmalloc(pages_per_area *
+                areas[i] = kmalloc(pages_per_area *
                                 sizeof(debug_entry_t*),GFP_KERNEL);
                 if (!areas[i]) {
                         goto fail_malloc_areas2;
@@ -242,7 +242,7 @@ debug_info_alloc(char *name, int pages_per_area, int nr_areas, int buf_size,
 
         /* alloc everything */
 
-        rc = (debug_info_t*) kmalloc(sizeof(debug_info_t), GFP_KERNEL);
+        rc = kmalloc(sizeof(debug_info_t), GFP_KERNEL);
         if(!rc)
                 goto fail_malloc_rc;
         rc->active_entries = kcalloc(nr_areas, sizeof(int), GFP_KERNEL);
@@ -634,7 +634,7 @@ found:
                 rc = -ENOMEM;
                 goto out;
         }
-        p_info = (file_private_info_t *) kmalloc(sizeof(file_private_info_t),
+        p_info = kmalloc(sizeof(file_private_info_t),
                                                 GFP_KERNEL);
         if(!p_info){
                 if(debug_info_snapshot)
diff --git a/arch/s390/kernel/s390_ext.c b/arch/s390/kernel/s390_ext.c
index 4faf96f8a834..bc5beaa8f98e 100644
--- a/arch/s390/kernel/s390_ext.c
+++ b/arch/s390/kernel/s390_ext.c
@@ -37,7 +37,7 @@ int register_external_interrupt(__u16 code, ext_int_handler_t handler)
         ext_int_info_t *p;
         int index;
 
-        p = (ext_int_info_t *) kmalloc(sizeof(ext_int_info_t), GFP_ATOMIC);
+        p = kmalloc(sizeof(ext_int_info_t), GFP_ATOMIC);
         if (p == NULL)
                 return -ENOMEM;
         p->code = code;
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index c8cb211b9072..5b4841d067c1 100644
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -425,7 +425,7 @@ int request_fast_irq(unsigned int irq,
         }
         
         if (action == NULL)
-            action = (struct irqaction *)kmalloc(sizeof(struct irqaction),
+            action = kmalloc(sizeof(struct irqaction),
                                                  GFP_ATOMIC);
         
         if (!action) { 
@@ -528,7 +528,7 @@ int request_irq(unsigned int irq,
         }
         
         if (action == NULL)
-                action = (struct irqaction *)kmalloc(sizeof(struct irqaction),
+                action = kmalloc(sizeof(struct irqaction),
                                                      GFP_ATOMIC);
         
         if (!action) { 
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index cf1b8baa57ea..0e27e226e0e2 100644
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -327,7 +327,7 @@ int sun4d_request_irq(unsigned int irq,
         }
         
         if (action == NULL)
-                action = (struct irqaction *)kmalloc(sizeof(struct irqaction),
+                action = kmalloc(sizeof(struct irqaction),
                                                      GFP_ATOMIC);
         
         if (!action) { 
diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c
index 4446f66590fa..2ebc2c051383 100644
--- a/arch/sparc64/kernel/sys_sunos32.c
+++ b/arch/sparc64/kernel/sys_sunos32.c
@@ -1055,7 +1055,7 @@ asmlinkage int sunos_msgsys(int op, u32 arg1, u32 arg2, u32 arg3, u32 arg4)
                 break;
         case 2:
                 rval = -EFAULT;
-                kmbuf = (struct msgbuf *)kmalloc(sizeof(struct msgbuf) + arg3,
+                kmbuf = kmalloc(sizeof(struct msgbuf) + arg3,
                                                  GFP_KERNEL);
                 if (!kmbuf)
                         break;
@@ -1078,7 +1078,7 @@ asmlinkage int sunos_msgsys(int op, u32 arg1, u32 arg2, u32 arg3, u32 arg4)
                 break;
         case 3:
                 rval = -EFAULT;
-                kmbuf = (struct msgbuf *)kmalloc(sizeof(struct msgbuf) + arg3,
+                kmbuf = kmalloc(sizeof(struct msgbuf) + arg3,
                                                  GFP_KERNEL);
                 if (!kmbuf || sunos_msgbuf_get((struct msgbuf32 __user *)(unsigned long)arg2,
                                                kmbuf, arg3))
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 286bc0b3207f..afe3d427ddfa 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -72,9 +72,11 @@ static int uml_net_rx(struct net_device *dev)
         return pkt_len;
 }
 
-static void uml_dev_close(void* dev)
+static void uml_dev_close(struct work_struct *work)
 {
-        dev_close( (struct net_device *) dev);
+        struct uml_net_private *lp =
+                container_of(work, struct uml_net_private, work);
+        dev_close(lp->dev);
 }
 
 irqreturn_t uml_net_interrupt(int irq, void *dev_id)
@@ -89,7 +91,6 @@ irqreturn_t uml_net_interrupt(int irq, void *dev_id)
         spin_lock(&lp->lock);
         while((err = uml_net_rx(dev)) > 0) ;
         if(err < 0) {
-                DECLARE_WORK(close_work, uml_dev_close, dev);
                 printk(KERN_ERR 
                        "Device '%s' read returned %d, shutting it down\n", 
                        dev->name, err);
@@ -97,9 +98,10 @@ irqreturn_t uml_net_interrupt(int irq, void *dev_id)
                  * again lp->lock.
                  * And dev_close() can be safely called multiple times on the
                  * same device, since it tests for (dev->flags & IFF_UP). So
-                 * there's no harm in delaying the device shutdown. */
-                schedule_work(&close_work);
-#error this is not permitted - close_work will go out of scope
+                 * there's no harm in delaying the device shutdown.
+                 * Furthermore, the workqueue will not re-enqueue an already
+                 * enqueued work item. */
+                schedule_work(&lp->work);
                 goto out;
         }
         reactivate_fd(lp->fd, UM_ETH_IRQ);
@@ -334,13 +336,12 @@ static int eth_configure(int n, void *init, char *mac,
         size = transport->private_size + sizeof(struct uml_net_private) + 
                 sizeof(((struct uml_net_private *) 0)->user);
 
-        device = kmalloc(sizeof(*device), GFP_KERNEL);
+        device = kzalloc(sizeof(*device), GFP_KERNEL);
         if (device == NULL) {
                 printk(KERN_ERR "eth_configure failed to allocate uml_net\n");
                 return(1);
         }
 
-        memset(device, 0, sizeof(*device));
         INIT_LIST_HEAD(&device->list);
         device->index = n;
 
@@ -366,6 +367,7 @@ static int eth_configure(int n, void *init, char *mac,
         /* This points to the transport private data. It's still clear, but we
          * must memset it to 0 *now*. Let's help the drivers. */
         memset(lp, 0, size);
+        INIT_WORK(&lp->work, uml_dev_close);
 
         /* sysfs register */
         if (!driver_registered) {
diff --git a/arch/um/include/net_kern.h b/arch/um/include/net_kern.h
index 280459fb0b26..218f8b47fdcd 100644
--- a/arch/um/include/net_kern.h
+++ b/arch/um/include/net_kern.h
@@ -11,6 +11,7 @@
 #include <linux/skbuff.h>
 #include <linux/socket.h>
 #include <linux/list.h>
+#include <linux/workqueue.h>
 
 struct uml_net {
         struct list_head list;
@@ -26,6 +27,7 @@ struct uml_net_private {
         struct net_device *dev;
         struct timer_list tl;
         struct net_device_stats stats;
+        struct work_struct work;
         int fd;
         unsigned char mac[ETH_ALEN];
         unsigned short (*protocol)(struct sk_buff *);
diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index 49057d8bc668..5db7737df0ff 100644
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -166,7 +166,7 @@ static long read_ldt_from_host(void __user * ptr, unsigned long bytecount)
         struct ptrace_ldt ptrace_ldt = (struct ptrace_ldt) {
                         .func = 0,
                         .bytecount = bytecount,
-                        .ptr = (void *)kmalloc(bytecount, GFP_KERNEL)};
+                        .ptr = kmalloc(bytecount, GFP_KERNEL)};
         u32 cpu;
 
         if(ptrace_ldt.ptr == NULL)
@@ -426,7 +426,7 @@ void ldt_get_host_info(void)
                 host_ldt_entries = dummy_list;
         else {
                 size = (size + 1) * sizeof(dummy_list[0]);
-                host_ldt_entries = (short *)kmalloc(size, GFP_KERNEL);
+                host_ldt_entries = kmalloc(size, GFP_KERNEL);
                 if(host_ldt_entries == NULL) {
                         printk("ldt_get_host_info: couldn't allocate host ldt list\n");
                         goto out_free;
diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index bcf825875d17..f0d4d72e560f 100644
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -105,17 +105,17 @@ menu "Processor type and features"
    # currently support
    config V850E_MA1
           bool
-          depends RTE_CB_MA1
+          depends on RTE_CB_MA1
           default y
    # Similarly for the RTE-V850E/NB85E-CB - V850E/TEG
    config V850E_TEG
           bool
-          depends RTE_CB_NB85E
+          depends on RTE_CB_NB85E
           default y
    # ... and the RTE-V850E/ME2-CB - V850E/ME2
    config V850E_ME2
           bool
-          depends RTE_CB_ME2
+          depends on RTE_CB_ME2
           default y
 
 
@@ -123,7 +123,7 @@ menu "Processor type and features"
 
    config V850E2_SIM85E2
           bool
-          depends V850E2_SIM85E2C || V850E2_SIM85E2S
+          depends on V850E2_SIM85E2C || V850E2_SIM85E2S
           default y
 
 
@@ -132,7 +132,7 @@ menu "Processor type and features"
    # V850E2 processors
    config V850E2
           bool
-          depends V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA
+          depends on V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA
           default y
 
 
@@ -141,7 +141,7 @@ menu "Processor type and features"
    # Boards in the RTE-x-CB series
    config RTE_CB
           bool
-          depends RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2
+          depends on RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2
           default y
 
    config RTE_CB_MULTI
@@ -149,28 +149,28 @@ menu "Processor type and features"
           # RTE_CB_NB85E can either have multi ROM support or not, but
           # other platforms (currently only RTE_CB_MA1) require it.
           prompt "Multi monitor ROM support" if RTE_CB_NB85E
-          depends RTE_CB_MA1 || RTE_CB_NB85E
+          depends on RTE_CB_MA1 || RTE_CB_NB85E
           default y
 
    config RTE_CB_MULTI_DBTRAP
           bool "Pass illegal insn trap / dbtrap to kernel"
-          depends RTE_CB_MULTI
+          depends on RTE_CB_MULTI
           default n
 
    config RTE_CB_MA1_KSRAM
           bool "Kernel in SRAM (limits size of kernel)"
-          depends RTE_CB_MA1 && RTE_CB_MULTI
+          depends on RTE_CB_MA1 && RTE_CB_MULTI
           default n
 
    config RTE_MB_A_PCI
           bool "Mother-A PCI support"
-          depends RTE_CB
+          depends on RTE_CB
           default y
 
    # The GBUS is used to talk to the RTE-MOTHER-A board
    config RTE_GBUS_INT
           bool
-          depends RTE_MB_A_PCI
+          depends on RTE_MB_A_PCI
           default y
 
    # The only PCI bus we support is on the RTE-MOTHER-A board
@@ -209,7 +209,7 @@ menu "Processor type and features"
 
    config ROM_KERNEL
           bool "Kernel in ROM"
-          depends V850E2_ANNA || V850E_AS85EP1 || RTE_CB_ME2
+          depends on V850E2_ANNA || V850E_AS85EP1 || RTE_CB_ME2
 
    # Some platforms pre-zero memory, in which case the kernel doesn't need to
    config ZERO_BSS
@@ -225,10 +225,10 @@ menu "Processor type and features"
 
    config V850E_HIGHRES_TIMER
           bool "High resolution timer support"
-          depends V850E_TIMER_D
+          depends on V850E_TIMER_D
    config TIME_BOOTUP
           bool "Time bootup"
-          depends V850E_HIGHRES_TIMER
+          depends on V850E_HIGHRES_TIMER
 
    config RESET_GUARD
           bool "Reset Guard"
diff --git a/arch/x86_64/kernel/cpufreq/Kconfig b/arch/x86_64/kernel/cpufreq/Kconfig
index 81f1562e5393..3abcfa3e1ed7 100644
--- a/arch/x86_64/kernel/cpufreq/Kconfig
+++ b/arch/x86_64/kernel/cpufreq/Kconfig
@@ -27,10 +27,13 @@ config X86_POWERNOW_K8_ACPI
         default y
 
 config X86_SPEEDSTEP_CENTRINO
-        tristate "Intel Enhanced SpeedStep"
+        tristate "Intel Enhanced SpeedStep (deprecated)"
         select CPU_FREQ_TABLE
         depends on ACPI_PROCESSOR
         help
+          This is deprecated and this functionality is now merged into
+          acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
+          speedstep_centrino.
           This adds the CPUFreq driver for Enhanced SpeedStep enabled
           mobile CPUs.  This means Intel Pentium M (Centrino) CPUs
           or 64bit enabled Intel Xeons.
@@ -50,6 +53,7 @@ config X86_ACPI_CPUFREQ
         help
           This driver adds a CPUFreq driver which utilizes the ACPI
           Processor Performance States.
+          This driver also supports Intel Enhanced Speedstep.
 
           For details, take a look at <file:Documentation/cpu-freq/>.
 
diff --git a/arch/x86_64/kernel/cpufreq/Makefile b/arch/x86_64/kernel/cpufreq/Makefile
index d8b593879224..753ce1dd418e 100644
--- a/arch/x86_64/kernel/cpufreq/Makefile
+++ b/arch/x86_64/kernel/cpufreq/Makefile
@@ -5,8 +5,8 @@
 SRCDIR := ../../../i386/kernel/cpu/cpufreq
 
 obj-$(CONFIG_X86_POWERNOW_K8) += powernow-k8.o
-obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO) += speedstep-centrino.o
 obj-$(CONFIG_X86_ACPI_CPUFREQ) += acpi-cpufreq.o
+obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO) += speedstep-centrino.o
 obj-$(CONFIG_X86_P4_CLOCKMOD) += p4-clockmod.o
 obj-$(CONFIG_X86_SPEEDSTEP_LIB) += speedstep-lib.o
 
diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile
index d573017a5dde..71f733c4f66d 100644
--- a/arch/xtensa/kernel/Makefile
+++ b/arch/xtensa/kernel/Makefile
@@ -6,7 +6,7 @@ extra-y := head.o vmlinux.lds
 
 
 obj-y := align.o entry.o irq.o coprocessor.o process.o ptrace.o semaphore.o  \
-         setup.o signal.o syscalls.o time.o traps.o vectors.o platform.o  \
+         setup.o signal.o syscall.o time.o traps.o vectors.o platform.o  \
          pci-dma.o
 
 ## windowspill.o
diff --git a/arch/xtensa/kernel/syscall.c b/arch/xtensa/kernel/syscall.c
index 418268f49766..fe3834bc1dbf 100644
--- a/arch/xtensa/kernel/syscall.c
+++ b/arch/xtensa/kernel/syscall.c
@@ -16,7 +16,7 @@
  *
  */
 #include <asm/uaccess.h>
-#include <asm/syscalls.h>
+#include <asm/syscall.h>
 #include <asm/unistd.h>
 #include <linux/linkage.h>
 #include <linux/stringify.h>
diff --git a/block/as-iosched.c b/block/as-iosched.c
index 5934c4bfd52a..ef126277b4b3 100644
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
@@ -1462,20 +1462,7 @@ static struct elevator_type iosched_as = {
 
 static int __init as_init(void)
 {
-        int ret;
-
-        ret = elv_register(&iosched_as);
-        if (!ret) {
-                /*
-                 * don't allow AS to get unregistered, since we would have
-                 * to browse all tasks in the system and release their
-                 * as_io_context first
-                 */
-                __module_get(THIS_MODULE);
-                return 0;
-        }
-
-        return ret;
+        return elv_register(&iosched_as);
 }
 
 static void __exit as_exit(void)
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 78c6b312bd30..533a2938ffd6 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -219,9 +219,12 @@ static int cfq_queue_empty(request_queue_t *q)
         return !cfqd->busy_queues;
 }
 
-static inline pid_t cfq_queue_pid(struct task_struct *task, int rw)
+static inline pid_t cfq_queue_pid(struct task_struct *task, int rw, int is_sync)
 {
-        if (rw == READ || rw == WRITE_SYNC)
+        /*
+         * Use the per-process queue, for read requests and syncronous writes
+         */
+        if (!(rw & REQ_RW) || is_sync)
                 return task->pid;
 
         return CFQ_KEY_ASYNC;
@@ -473,7 +476,7 @@ static struct request *
 cfq_find_rq_fmerge(struct cfq_data *cfqd, struct bio *bio)
 {
         struct task_struct *tsk = current;
-        pid_t key = cfq_queue_pid(tsk, bio_data_dir(bio));
+        pid_t key = cfq_queue_pid(tsk, bio_data_dir(bio), bio_sync(bio));
         struct cfq_queue *cfqq;
 
         cfqq = cfq_find_cfq_hash(cfqd, key, tsk->ioprio);
@@ -1748,6 +1751,9 @@ static int cfq_may_queue(request_queue_t *q, int rw)
         struct cfq_data *cfqd = q->elevator->elevator_data;
         struct task_struct *tsk = current;
         struct cfq_queue *cfqq;
+        unsigned int key;
+
+        key = cfq_queue_pid(tsk, rw, rw & REQ_RW_SYNC);
 
         /*
          * don't force setup of a queue from here, as a call to may_queue
@@ -1755,7 +1761,7 @@ static int cfq_may_queue(request_queue_t *q, int rw)
          * so just lookup a possibly existing queue, or return 'may queue'
          * if that fails
          */
-        cfqq = cfq_find_cfq_hash(cfqd, cfq_queue_pid(tsk, rw), tsk->ioprio);
+        cfqq = cfq_find_cfq_hash(cfqd, key, tsk->ioprio);
         if (cfqq) {
                 cfq_init_prio_data(cfqq);
                 cfq_prio_boost(cfqq);
@@ -1798,10 +1804,10 @@ cfq_set_request(request_queue_t *q, struct request *rq, gfp_t gfp_mask)
         struct task_struct *tsk = current;
         struct cfq_io_context *cic;
         const int rw = rq_data_dir(rq);
-        pid_t key = cfq_queue_pid(tsk, rw);
+        const int is_sync = rq_is_sync(rq);
+        pid_t key = cfq_queue_pid(tsk, rw, is_sync);
         struct cfq_queue *cfqq;
         unsigned long flags;
-        int is_sync = key != CFQ_KEY_ASYNC;
 
         might_sleep_if(gfp_mask & __GFP_WAIT);
 
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index a541b42c08e3..79807dbc306e 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -2058,15 +2058,16 @@ static void freed_request(request_queue_t *q, int rw, int priv)
  * Returns NULL on failure, with queue_lock held.
  * Returns !NULL on success, with queue_lock *not held*.
  */
-static struct request *get_request(request_queue_t *q, int rw, struct bio *bio,
-                                   gfp_t gfp_mask)
+static struct request *get_request(request_queue_t *q, int rw_flags,
+                                   struct bio *bio, gfp_t gfp_mask)
 {
         struct request *rq = NULL;
         struct request_list *rl = &q->rq;
         struct io_context *ioc = NULL;
+        const int rw = rw_flags & 0x01;
         int may_queue, priv;
 
-        may_queue = elv_may_queue(q, rw);
+        may_queue = elv_may_queue(q, rw_flags);
         if (may_queue == ELV_MQUEUE_NO)
                 goto rq_starved;
 
@@ -2114,7 +2115,7 @@ static struct request *get_request(request_queue_t *q, int rw, struct bio *bio,
 
         spin_unlock_irq(q->queue_lock);
 
-        rq = blk_alloc_request(q, rw, priv, gfp_mask);
+        rq = blk_alloc_request(q, rw_flags, priv, gfp_mask);
         if (unlikely(!rq)) {
                 /*
                  * Allocation failed presumably due to memory. Undo anything
@@ -2162,12 +2163,13 @@ out:
  *
  * Called with q->queue_lock held, and returns with it unlocked.
  */
-static struct request *get_request_wait(request_queue_t *q, int rw,
+static struct request *get_request_wait(request_queue_t *q, int rw_flags,
                                         struct bio *bio)
 {
+        const int rw = rw_flags & 0x01;
         struct request *rq;
 
-        rq = get_request(q, rw, bio, GFP_NOIO);
+        rq = get_request(q, rw_flags, bio, GFP_NOIO);
         while (!rq) {
                 DEFINE_WAIT(wait);
                 struct request_list *rl = &q->rq;
@@ -2175,7 +2177,7 @@ static struct request *get_request_wait(request_queue_t *q, int rw,
                 prepare_to_wait_exclusive(&rl->wait[rw], &wait,
                                 TASK_UNINTERRUPTIBLE);
 
-                rq = get_request(q, rw, bio, GFP_NOIO);
+                rq = get_request(q, rw_flags, bio, GFP_NOIO);
 
                 if (!rq) {
                         struct io_context *ioc;
@@ -2910,6 +2912,7 @@ static int __make_request(request_queue_t *q, struct bio *bio)
         int el_ret, nr_sectors, barrier, err;
         const unsigned short prio = bio_prio(bio);
         const int sync = bio_sync(bio);
+        int rw_flags;
 
         nr_sectors = bio_sectors(bio);
 
@@ -2984,10 +2987,19 @@ static int __make_request(request_queue_t *q, struct bio *bio)
 
 get_rq:
         /*
+         * This sync check and mask will be re-done in init_request_from_bio(),
+         * but we need to set it earlier to expose the sync flag to the
+         * rq allocator and io schedulers.
+         */
+        rw_flags = bio_data_dir(bio);
+        if (sync)
+                rw_flags |= REQ_RW_SYNC;
+
+        /*
          * Grab a free request. This is might sleep but can not fail.
          * Returns with the queue unlocked.
          */
-        req = get_request_wait(q, bio_data_dir(bio), bio);
+        req = get_request_wait(q, rw_flags, bio);
 
         /*
          * After dropping the lock and possibly sleeping here, our request
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 034c939bf91a..6e93004f2181 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -17,7 +17,6 @@
 #include <linux/crypto.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
-#include <linux/io.h>
 #include <linux/module.h>
 #include <linux/scatterlist.h>
 #include <linux/seq_file.h>
diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c
index 048542341204..674bf81c6e66 100644
--- a/drivers/acorn/block/fd1772.c
+++ b/drivers/acorn/block/fd1772.c
@@ -1549,12 +1549,12 @@ int fd1772_init(void)
 #ifdef TRACKBUFFER
         BufferDrive = BufferSide = BufferTrack = -1;
         /* Atari uses 512 - I want to eventually cope with 1K sectors */
-        DMABuffer = (char *)kmalloc((FD1772_MAX_SECTORS+1)*512,GFP_KERNEL);
+        DMABuffer = kmalloc((FD1772_MAX_SECTORS+1)*512,GFP_KERNEL);
         TrackBuffer = DMABuffer + 512;
 #else
         /* Allocate memory for the DMAbuffer - on the Atari this takes it
            out of some special memory... */
-        DMABuffer = (char *) kmalloc(2048);     /* Copes with pretty large sectors */
+        DMABuffer = kmalloc(2048);      /* Copes with pretty large sectors */
 #endif
         err = -ENOMEM;
         if (!DMAbuffer)
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 9021e34d2096..90786d7a20bb 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -551,7 +551,7 @@ static int adma_port_start(struct ata_port *ap)
                 return rc;
         adma_enter_reg_mode(ap);
         rc = -ENOMEM;
-        pp = kcalloc(1, sizeof(*pp), GFP_KERNEL);
+        pp = kzalloc(sizeof(*pp), GFP_KERNEL);
         if (!pp)
                 goto err_out;
         pp->pkt = dma_alloc_coherent(dev, ADMA_PKT_BYTES, &pp->pkt_dma,
@@ -672,7 +672,7 @@ static int adma_ata_init_one(struct pci_dev *pdev,
         if (rc)
                 goto err_out_iounmap;
 
-        probe_ent = kcalloc(1, sizeof(*probe_ent), GFP_KERNEL);
+        probe_ent = kzalloc(sizeof(*probe_ent), GFP_KERNEL);
         if (probe_ent == NULL) {
                 rc = -ENOMEM;
                 goto err_out_iounmap;
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index bc1b13c8f5d7..5aab7bd473ac 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -1832,7 +1832,7 @@ static int __devinit eni_start(struct atm_dev *dev)
         /* initialize memory management */
         buffer_mem = eni_dev->mem - (buf - eni_dev->ram);
         eni_dev->free_list_size = buffer_mem/MID_MIN_BUF_SIZE/2;
-        eni_dev->free_list = (struct eni_free *) kmalloc(
+        eni_dev->free_list = kmalloc(
             sizeof(struct eni_free)*(eni_dev->free_list_size+1),GFP_KERNEL);
         if (!eni_dev->free_list) {
                 printk(KERN_ERR DEV_LABEL "(itf %d): couldn't get free page\n",
@@ -2232,7 +2232,7 @@ static int __devinit eni_init_one(struct pci_dev *pci_dev,
                 goto out0;
         }
 
-        eni_dev = (struct eni_dev *) kmalloc(sizeof(struct eni_dev),GFP_KERNEL);
+        eni_dev = kmalloc(sizeof(struct eni_dev),GFP_KERNEL);
         if (!eni_dev) goto out0;
         if (!cpu_zeroes) {
                 cpu_zeroes = pci_alloc_consistent(pci_dev,ENI_ZEROES_SIZE,
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 7d9b4e52f0bf..db33f6f4dd2a 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -2351,7 +2351,7 @@ he_open(struct atm_vcc *vcc)
 
         cid = he_mkcid(he_dev, vpi, vci);
 
-        he_vcc = (struct he_vcc *) kmalloc(sizeof(struct he_vcc), GFP_ATOMIC);
+        he_vcc = kmalloc(sizeof(struct he_vcc), GFP_ATOMIC);
         if (he_vcc == NULL) {
                 hprintk("unable to allocate he_vcc during open\n");
                 return -ENOMEM;
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index 267825501dfe..09f477d4237a 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -2602,7 +2602,7 @@ static int __devinit lanai_init_one(struct pci_dev *pci,
         struct atm_dev *atmdev;
         int result;
 
-        lanai = (struct lanai_dev *) kmalloc(sizeof(*lanai), GFP_KERNEL);
+        lanai = kmalloc(sizeof(*lanai), GFP_KERNEL);
         if (lanai == NULL) {
                 printk(KERN_ERR DEV_LABEL
                        ": couldn't allocate dev_data structure!\n");
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index bd0904594805..aab9b3733d52 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -997,7 +997,7 @@ static scq_info *get_scq(int size, u32 scd)
    if (size != VBR_SCQSIZE && size != CBR_SCQSIZE)
       return NULL;
 
-   scq = (scq_info *) kmalloc(sizeof(scq_info), GFP_KERNEL);
+   scq = kmalloc(sizeof(scq_info), GFP_KERNEL);
    if (scq == NULL)
       return NULL;
    scq->org = kmalloc(2 * size, GFP_KERNEL);
@@ -1006,7 +1006,7 @@ static scq_info *get_scq(int size, u32 scd)
       kfree(scq);
       return NULL;
    }
-   scq->skb = (struct sk_buff **) kmalloc(sizeof(struct sk_buff *) *
+   scq->skb = kmalloc(sizeof(struct sk_buff *) *
                                           (size / NS_SCQE_SIZE), GFP_KERNEL);
    if (scq->skb == NULL)
    {
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 7df0f373188e..756d4f760da3 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -996,7 +996,7 @@ static int start_tx(struct atm_dev *dev)
 
         DPRINTK("start_tx\n");
         zatm_dev = ZATM_DEV(dev);
-        zatm_dev->tx_map = (struct atm_vcc **) kmalloc(sizeof(struct atm_vcc *)*
+        zatm_dev->tx_map = kmalloc(sizeof(struct atm_vcc *)*
             zatm_dev->chans,GFP_KERNEL);
         if (!zatm_dev->tx_map) return -ENOMEM;
         zatm_dev->tx_bw = ATM_OC3_PCR;
@@ -1591,7 +1591,7 @@ static int __devinit zatm_init_one(struct pci_dev *pci_dev,
         struct zatm_dev *zatm_dev;
         int ret = -ENOMEM;
 
-        zatm_dev = (struct zatm_dev *) kmalloc(sizeof(*zatm_dev), GFP_KERNEL);
+        zatm_dev = kmalloc(sizeof(*zatm_dev), GFP_KERNEL);
         if (!zatm_dev) {
                 printk(KERN_EMERG "%s: memory shortage\n", DEV_LABEL);
                 goto out;
diff --git a/drivers/base/class.c b/drivers/base/class.c
index f098881f45b2..8bf2ca2e56b5 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -163,6 +163,8 @@ int class_register(struct class * cls)
 void class_unregister(struct class * cls)
 {
         pr_debug("device class '%s': unregistering\n", cls->name);
+        if (cls->virtual_dir)
+                kobject_unregister(cls->virtual_dir);
         remove_class_attrs(cls);
         subsystem_unregister(&cls->subsys);
 }
diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c
index dbe0735f8c9e..f95d50277274 100644
--- a/drivers/base/dmapool.c
+++ b/drivers/base/dmapool.c
@@ -173,7 +173,7 @@ pool_alloc_page (struct dma_pool *pool, gfp_t mem_flags)
         mapsize = (mapsize + BITS_PER_LONG - 1) / BITS_PER_LONG;
         mapsize *= sizeof (long);
 
-        page = (struct dma_page *) kmalloc (mapsize + sizeof *page, mem_flags);
+        page = kmalloc(mapsize + sizeof *page, mem_flags);
         if (!page)
                 return NULL;
         page->vaddr = dma_alloc_coherent (pool->dev,
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index d1df4a087924..f9c903ba9fcd 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -212,7 +212,7 @@ EXPORT_SYMBOL_GPL(platform_device_add_resources);
  *      pointer.  The memory associated with the platform data will be freed
  *      when the platform device is released.
  */
-int platform_device_add_data(struct platform_device *pdev, void *data, size_t size)
+int platform_device_add_data(struct platform_device *pdev, const void *data, size_t size)
 {
         void *d;
 
@@ -473,7 +473,7 @@ EXPORT_SYMBOL_GPL(platform_driver_unregister);
  * Returns zero if the driver registered and bound to a device, else returns
  * a negative error code and with the driver not registered.
  */
-int platform_driver_probe(struct platform_driver *drv,
+int __init_or_module platform_driver_probe(struct platform_driver *drv,
                 int (*probe)(struct platform_device *))
 {
         int retval, code;
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index ce9cfcb6071c..58c1debf86f1 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -28,13 +28,6 @@ config ATARI_FLOPPY
         tristate "Atari floppy support"
         depends on ATARI
 
-config BLK_DEV_SWIM_IOP
-        bool "Macintosh IIfx/Quadra 900/Quadra 950 floppy support (EXPERIMENTAL)"
-        depends on MAC && EXPERIMENTAL && BROKEN
-        help
-          Say Y here to support the SWIM (Super Woz Integrated Machine) IOP
-          floppy controller on the Macintosh IIfx and Quadra 900/950.
-
 config MAC_FLOPPY
         tristate "Support for PowerMac floppy"
         depends on PPC_PMAC && !PPC_PMAC64
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 410f259a8031..dd88e33c1eb1 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -9,7 +9,6 @@ obj-$(CONFIG_MAC_FLOPPY)	+= swim3.o
 obj-$(CONFIG_BLK_DEV_FD)        += floppy.o
 obj-$(CONFIG_AMIGA_FLOPPY)      += amiflop.o
 obj-$(CONFIG_ATARI_FLOPPY)      += ataflop.o
-obj-$(CONFIG_BLK_DEV_SWIM_IOP)  += swim_iop.o
 obj-$(CONFIG_ATARI_ACSI)        += acsi.o
 obj-$(CONFIG_ATARI_SLM)         += acsi_slm.o
 obj-$(CONFIG_AMIGA_Z2RAM)       += z2ram.o
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index ee159edb6b88..d719a5d8f435 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1039,7 +1039,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
                                 status = -ENOMEM;
                                 goto cleanup1;
                         }
-                        buff_size = (int *)kmalloc(MAXSGENTRIES * sizeof(int),
+                        buff_size = kmalloc(MAXSGENTRIES * sizeof(int),
                                                    GFP_KERNEL);
                         if (!buff_size) {
                                 status = -ENOMEM;
@@ -2837,7 +2837,7 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
         if (err) {
                 printk(KERN_ERR "cciss: Cannot obtain PCI resources, "
                        "aborting\n");
-                goto err_out_disable_pdev;
+                return err;
         }
 
         subsystem_vendor_id = pdev->subsystem_vendor;
@@ -2865,7 +2865,7 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
 #ifdef CCISS_DEBUG
         printk("address 0 = %x\n", c->paddr);
 #endif                          /* CCISS_DEBUG */
-        c->vaddr = remap_pci_mem(c->paddr, 200);
+        c->vaddr = remap_pci_mem(c->paddr, 0x250);
 
         /* Wait for the board to become ready.  (PCI hotplug needs this.)
          * We poll for up to 120 secs, once per 100ms. */
@@ -3004,11 +3004,12 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
         }
         return 0;
 
-      err_out_free_res:
+err_out_free_res:
+        /*
+         * Deliberately omit pci_disable_device(): it does something nasty to
+         * Smart Array controllers that pci_enable_device does not undo
+         */
         pci_release_regions(pdev);
-
-      err_out_disable_pdev:
-        pci_disable_device(pdev);
         return err;
 }
 
@@ -3382,8 +3383,11 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
                 if (drv->queue)
                         blk_cleanup_queue(drv->queue);
         }
+        /*
+         * Deliberately omit pci_disable_device(): it does something nasty to
+         * Smart Array controllers that pci_enable_device does not undo
+         */
         pci_release_regions(pdev);
-        pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
         free_hba(i);
         return -1;
@@ -3452,8 +3456,11 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev)
 #ifdef CONFIG_CISS_SCSI_TAPE
         kfree(hba[i]->scsi_rejects.complete);
 #endif
+        /*
+         * Deliberately omit pci_disable_device(): it does something nasty to
+         * Smart Array controllers that pci_enable_device does not undo
+         */
         pci_release_regions(pdev);
-        pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
         free_hba(i);
 }
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index d5f519ebbc08..b94cd1c32131 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -1625,7 +1625,7 @@ static void start_fwbk(int ctlr)
                 " processing\n");
         /* Command does not return anything, but idasend command needs a 
                 buffer */
-        id_ctlr_buf = (id_ctlr_t *)kmalloc(sizeof(id_ctlr_t), GFP_KERNEL);
+        id_ctlr_buf = kmalloc(sizeof(id_ctlr_t), GFP_KERNEL);
         if(id_ctlr_buf==NULL)
         {
                 printk(KERN_WARNING "cpqarray: Out of memory. "
@@ -1660,14 +1660,14 @@ static void getgeometry(int ctlr)
 
         info_p->log_drv_map = 0;        
         
-        id_ldrive = (id_log_drv_t *)kmalloc(sizeof(id_log_drv_t), GFP_KERNEL);
+        id_ldrive = kmalloc(sizeof(id_log_drv_t), GFP_KERNEL);
         if(id_ldrive == NULL)
         {
                 printk( KERN_ERR "cpqarray:  out of memory.\n");
                 return;
         }
 
-        id_ctlr_buf = (id_ctlr_t *)kmalloc(sizeof(id_ctlr_t), GFP_KERNEL);
+        id_ctlr_buf = kmalloc(sizeof(id_ctlr_t), GFP_KERNEL);
         if(id_ctlr_buf == NULL)
         {
                 kfree(id_ldrive);
@@ -1675,7 +1675,7 @@ static void getgeometry(int ctlr)
                 return;
         }
 
-        id_lstatus_buf = (sense_log_drv_stat_t *)kmalloc(sizeof(sense_log_drv_stat_t), GFP_KERNEL);
+        id_lstatus_buf = kmalloc(sizeof(sense_log_drv_stat_t), GFP_KERNEL);
         if(id_lstatus_buf == NULL)
         {
                 kfree(id_ctlr_buf);
@@ -1684,7 +1684,7 @@ static void getgeometry(int ctlr)
                 return;
         }
 
-        sense_config_buf = (config_t *)kmalloc(sizeof(config_t), GFP_KERNEL);
+        sense_config_buf = kmalloc(sizeof(config_t), GFP_KERNEL);
         if(sense_config_buf == NULL)
         {
                 kfree(id_lstatus_buf);
diff --git a/drivers/block/swim_iop.c b/drivers/block/swim_iop.c
deleted file mode 100644
index ed7b06cf3e68..000000000000
--- a/drivers/block/swim_iop.c
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
- * Driver for the SWIM (Super Woz Integrated Machine) IOP
- * floppy controller on the Macintosh IIfx and Quadra 900/950
- *
- * Written by Joshua M. Thompson (funaho@jurai.org)
- * based on the SWIM3 driver (c) 1996 by Paul Mackerras.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
- * 1999-06-12 (jmt) - Initial implementation.
- */
-
-/*
- * -------------------
- * Theory of Operation
- * -------------------
- *
- * Since the SWIM IOP is message-driven we implement a simple request queue
- * system.  One outstanding request may be queued at any given time (this is
- * an IOP limitation); only when that request has completed can a new request
- * be sent.
- */
-
-#include <linux/stddef.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/delay.h>
-#include <linux/fd.h>
-#include <linux/ioctl.h>
-#include <linux/blkdev.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/mac_iop.h>
-#include <asm/swim_iop.h>
-
-#define DRIVER_VERSION "Version 0.1 (1999-06-12)"
-
-#define MAX_FLOPPIES    4
-
-enum swim_state {
-        idle,
-        available,
-        revalidating,
-        transferring,
-        ejecting
-};
-
-struct floppy_state {
-        enum swim_state state;
-        int     drive_num;      /* device number */
-        int     secpercyl;      /* disk geometry information */
-        int     secpertrack;
-        int     total_secs;
-        int     write_prot;     /* 1 if write-protected, 0 if not, -1 dunno */
-        int     ref_count;
-        struct timer_list timeout;
-        int     ejected;
-        struct wait_queue *wait;
-        int     wanted;
-        int     timeout_pending;
-};
-
-struct swim_iop_req {
-        int     sent;
-        int     complete;
-        __u8    command[32];
-        struct floppy_state *fs;
-        void    (*done)(struct swim_iop_req *);
-};
-
-static struct swim_iop_req *current_req;
-static int floppy_count;
-
-static struct floppy_state floppy_states[MAX_FLOPPIES];
-static DEFINE_SPINLOCK(swim_iop_lock);
-
-#define CURRENT elv_next_request(swim_queue)
-
-static char *drive_names[7] = {
-        "not installed",        /* DRV_NONE    */
-        "unknown (1)",          /* DRV_UNKNOWN */
-        "a 400K drive",         /* DRV_400K    */
-        "an 800K drive"         /* DRV_800K    */
-        "unknown (4)",          /* ????        */
-        "an FDHD",              /* DRV_FDHD    */
-        "unknown (6)",          /* ????        */
-        "an Apple HD20"         /* DRV_HD20    */
-};
-
-int swimiop_init(void);
-static void swimiop_init_request(struct swim_iop_req *);
-static int swimiop_send_request(struct swim_iop_req *);
-static void swimiop_receive(struct iop_msg *);
-static void swimiop_status_update(int, struct swim_drvstatus *);
-static int swimiop_eject(struct floppy_state *fs);
-
-static int floppy_ioctl(struct inode *inode, struct file *filp,
-                        unsigned int cmd, unsigned long param);
-static int floppy_open(struct inode *inode, struct file *filp);
-static int floppy_release(struct inode *inode, struct file *filp);
-static int floppy_check_change(struct gendisk *disk);
-static int floppy_revalidate(struct gendisk *disk);
-static int grab_drive(struct floppy_state *fs, enum swim_state state,
-                      int interruptible);
-static void release_drive(struct floppy_state *fs);
-static void set_timeout(struct floppy_state *fs, int nticks,
-                        void (*proc)(unsigned long));
-static void fd_request_timeout(unsigned long);
-static void do_fd_request(request_queue_t * q);
-static void start_request(struct floppy_state *fs);
-
-static struct block_device_operations floppy_fops = {
-        .open           = floppy_open,
-        .release        = floppy_release,
-        .ioctl          = floppy_ioctl,
-        .media_changed  = floppy_check_change,
-        .revalidate_disk= floppy_revalidate,
-};
-
-static struct request_queue *swim_queue;
-/*
- * SWIM IOP initialization
- */
-
-int swimiop_init(void)
-{
-        volatile struct swim_iop_req req;
-        struct swimcmd_status *cmd = (struct swimcmd_status *) &req.command[0];
-        struct swim_drvstatus *ds = &cmd->status;
-        struct floppy_state *fs;
-        int i;
-
-        current_req = NULL;
-        floppy_count = 0;
-
-        if (!iop_ism_present)
-                return -ENODEV;
-
-        if (register_blkdev(FLOPPY_MAJOR, "fd"))
-                return -EBUSY;
-
-        swim_queue = blk_init_queue(do_fd_request, &swim_iop_lock);
-        if (!swim_queue) {
-                unregister_blkdev(FLOPPY_MAJOR, "fd");
-                return -ENOMEM;
-        }
-
-        printk("SWIM-IOP: %s by Joshua M. Thompson (funaho@jurai.org)\n",
-                DRIVER_VERSION);
-
-        if (iop_listen(SWIM_IOP, SWIM_CHAN, swimiop_receive, "SWIM") != 0) {
-                printk(KERN_ERR "SWIM-IOP: IOP channel already in use; can't initialize.\n");
-                unregister_blkdev(FLOPPY_MAJOR, "fd");
-                blk_cleanup_queue(swim_queue);
-                return -EBUSY;
-        }
-
-        printk(KERN_ERR "SWIM_IOP: probing for installed drives.\n");
-
-        for (i = 0 ; i < MAX_FLOPPIES ; i++) {
-                memset(&floppy_states[i], 0, sizeof(struct floppy_state));
-                fs = &floppy_states[floppy_count];
-
-                swimiop_init_request(&req);
-                cmd->code = CMD_STATUS;
-                cmd->drive_num = i + 1;
-                if (swimiop_send_request(&req) != 0) continue;
-                while (!req.complete);
-                if (cmd->error != 0) {
-                        printk(KERN_ERR "SWIM-IOP: probe on drive %d returned error %d\n", i, (uint) cmd->error);
-                        continue;
-                }
-                if (ds->installed != 0x01) continue;
-                printk("SWIM-IOP: drive %d is %s (%s, %s, %s, %s)\n", i,
-                        drive_names[ds->info.type],
-                        ds->info.external? "ext" : "int",
-                        ds->info.scsi? "scsi" : "floppy",
-                        ds->info.fixed? "fixed" : "removable",
-                        ds->info.secondary? "secondary" : "primary");
-                swimiop_status_update(floppy_count, ds);
-                fs->state = idle;
-
-                init_timer(&fs->timeout);
-                floppy_count++;
-        }
-        printk("SWIM-IOP: detected %d installed drives.\n", floppy_count);
-
-        for (i = 0; i < floppy_count; i++) {
-                struct gendisk *disk = alloc_disk(1);
-                if (!disk)
-                        continue;
-                disk->major = FLOPPY_MAJOR;
-                disk->first_minor = i;
-                disk->fops = &floppy_fops;
-                sprintf(disk->disk_name, "fd%d", i);
-                disk->private_data = &floppy_states[i];
-                disk->queue = swim_queue;
-                set_capacity(disk, 2880 * 2);
-                add_disk(disk);
-        }
-
-        return 0;
-}
-
-static void swimiop_init_request(struct swim_iop_req *req)
-{
-        req->sent = 0;
-        req->complete = 0;
-        req->done = NULL;
-}
-
-static int swimiop_send_request(struct swim_iop_req *req)
-{
-        unsigned long flags;
-        int err;
-
-        /* It's doubtful an interrupt routine would try to send */
-        /* a SWIM request, but I'd rather play it safe here.    */
-
-        local_irq_save(flags);
-
-        if (current_req != NULL) {
-                local_irq_restore(flags);
-                return -ENOMEM;
-        }
-
-        current_req = req;
-
-        /* Interrupts should be back on for iop_send_message() */
-
-        local_irq_restore(flags);
-
-        err = iop_send_message(SWIM_IOP, SWIM_CHAN, (void *) req,
-                                sizeof(req->command), (__u8 *) &req->command[0],
-                                swimiop_receive);
-
-        /* No race condition here; we own current_req at this point */
-
-        if (err) {
-                current_req = NULL;
-        } else {
-                req->sent = 1;
-        }
-        return err;
-}
-
-/*
- * Receive a SWIM message from the IOP.
- *
- * This will be called in two cases:
- *
- * 1. A message has been successfully sent to the IOP.
- * 2. An unsolicited message was received from the IOP.
- */
-
-void swimiop_receive(struct iop_msg *msg)
-{
-        struct swim_iop_req *req;
-        struct swimmsg_status *sm;
-        struct swim_drvstatus *ds;
-
-        req = current_req;
-
-        switch(msg->status) {
-                case IOP_MSGSTATUS_COMPLETE:
-                        memcpy(&req->command[0], &msg->reply[0], sizeof(req->command));
-                        req->complete = 1;
-                        if (req->done) (*req->done)(req);
-                        current_req = NULL;
-                        break;
-                case IOP_MSGSTATUS_UNSOL:
-                        sm = (struct swimmsg_status *) &msg->message[0];
-                        ds = &sm->status;
-                        swimiop_status_update(sm->drive_num, ds);
-                        iop_complete_message(msg);
-                        break;
-        }
-}
-
-static void swimiop_status_update(int drive_num, struct swim_drvstatus *ds)
-{
-        struct floppy_state *fs = &floppy_states[drive_num];
-
-        fs->write_prot = (ds->write_prot == 0x80);
-        if ((ds->disk_in_drive != 0x01) && (ds->disk_in_drive != 0x02)) {
-                fs->ejected = 1;
-        } else {
-                fs->ejected = 0;
-        }
-        switch(ds->info.type) {
-                case DRV_400K:
-                        fs->secpercyl = 10;
-                        fs->secpertrack = 10;
-                        fs->total_secs = 800;
-                        break;
-                case DRV_800K:
-                        fs->secpercyl = 20;
-                        fs->secpertrack = 10;
-                        fs->total_secs = 1600;
-                        break;
-                case DRV_FDHD:
-                        fs->secpercyl = 36;
-                        fs->secpertrack = 18;
-                        fs->total_secs = 2880;
-                        break;
-                default:
-                        fs->secpercyl = 0;
-                        fs->secpertrack = 0;
-                        fs->total_secs = 0;
-                        break;
-        }
-}
-
-static int swimiop_eject(struct floppy_state *fs)
-{
-        int err, n;
-        struct swim_iop_req req;
-        struct swimcmd_eject *cmd = (struct swimcmd_eject *) &req.command[0];
-
-        err = grab_drive(fs, ejecting, 1);
-        if (err) return err;
-
-        swimiop_init_request(&req);
-        cmd->code = CMD_EJECT;
-        cmd->drive_num = fs->drive_num;
-        err = swimiop_send_request(&req);
-        if (err) {
-                release_drive(fs);
-                return err;
-        }
-        for (n = 2*HZ; n > 0; --n) {
-                if (req.complete) break;
-                if (signal_pending(current)) {
-                        err = -EINTR;
-                        break;
-                }
-                schedule_timeout_interruptible(1);
-        }
-        release_drive(fs);
-        return cmd->error;
-}
-
-static struct floppy_struct floppy_type =
-        { 2880,18,2,80,0,0x1B,0x00,0xCF,0x6C,NULL };    /*  7 1.44MB 3.5"   */
-
-static int floppy_ioctl(struct inode *inode, struct file *filp,
-                        unsigned int cmd, unsigned long param)
-{
-        struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
-        int err;
-
-        if ((cmd & 0x80) && !capable(CAP_SYS_ADMIN))
-                return -EPERM;
-
-        switch (cmd) {
-        case FDEJECT:
-                if (fs->ref_count != 1)
-                        return -EBUSY;
-                err = swimiop_eject(fs);
-                return err;
-        case FDGETPRM:
-                if (copy_to_user((void *) param, (void *) &floppy_type,
-                                 sizeof(struct floppy_struct)))
-                        return -EFAULT;
-                return 0;
-        }
-        return -ENOTTY;
-}
-
-static int floppy_open(struct inode *inode, struct file *filp)
-{
-        struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
-
-        if (fs->ref_count == -1 || filp->f_flags & O_EXCL)
-                return -EBUSY;
-
-        if ((filp->f_flags & O_NDELAY) == 0 && (filp->f_mode & 3)) {
-                check_disk_change(inode->i_bdev);
-                if (fs->ejected)
-                        return -ENXIO;
-        }
-
-        if ((filp->f_mode & 2) && fs->write_prot)
-                return -EROFS;
-
-        if (filp->f_flags & O_EXCL)
-                fs->ref_count = -1;
-        else
-                ++fs->ref_count;
-
-        return 0;
-}
-
-static int floppy_release(struct inode *inode, struct file *filp)
-{
-        struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
-        if (fs->ref_count > 0)
-                fs->ref_count--;
-        return 0;
-}
-
-static int floppy_check_change(struct gendisk *disk)
-{
-        struct floppy_state *fs = disk->private_data;
-        return fs->ejected;
-}
-
-static int floppy_revalidate(struct gendisk *disk)
-{
-        struct floppy_state *fs = disk->private_data;
-        grab_drive(fs, revalidating, 0);
-        /* yadda, yadda */
-        release_drive(fs);
-        return 0;
-}
-
-static void floppy_off(unsigned int nr)
-{
-}
-
-static int grab_drive(struct floppy_state *fs, enum swim_state state,
-                      int interruptible)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        if (fs->state != idle) {
-                ++fs->wanted;
-                while (fs->state != available) {
-                        if (interruptible && signal_pending(current)) {
-                                --fs->wanted;
-                                local_irq_restore(flags);
-                                return -EINTR;
-                        }
-                        interruptible_sleep_on(&fs->wait);
-                }
-                --fs->wanted;
-        }
-        fs->state = state;
-        local_irq_restore(flags);
-        return 0;
-}
-
-static void release_drive(struct floppy_state *fs)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        fs->state = idle;
-        start_request(fs);
-        local_irq_restore(flags);
-}
-
-static void set_timeout(struct floppy_state *fs, int nticks,
-                        void (*proc)(unsigned long))
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-        if (fs->timeout_pending)
-                del_timer(&fs->timeout);
-        init_timer(&fs->timeout);
-        fs->timeout.expires = jiffies + nticks;
-        fs->timeout.function = proc;
-        fs->timeout.data = (unsigned long) fs;
-        add_timer(&fs->timeout);
-        fs->timeout_pending = 1;
-        local_irq_restore(flags);
-}
-
-static void do_fd_request(request_queue_t * q)
-{
-        int i;
-
-        for (i = 0 ; i < floppy_count ; i++) {
-                start_request(&floppy_states[i]);
-        }
-}
-
-static void fd_request_complete(struct swim_iop_req *req)
-{
-        struct floppy_state *fs = req->fs;
-        struct swimcmd_rw *cmd = (struct swimcmd_rw *) &req->command[0];
-
-        del_timer(&fs->timeout);
-        fs->timeout_pending = 0;
-        fs->state = idle;
-        if (cmd->error) {
-                printk(KERN_ERR "SWIM-IOP: error %d on read/write request.\n", cmd->error);
-                end_request(CURRENT, 0);
-        } else {
-                CURRENT->sector += cmd->num_blocks;
-                CURRENT->current_nr_sectors -= cmd->num_blocks;
-                if (CURRENT->current_nr_sectors <= 0) {
-                        end_request(CURRENT, 1);
-                        return;
-                }
-        }
-        start_request(fs);
-}
-
-static void fd_request_timeout(unsigned long data)
-{
-        struct floppy_state *fs = (struct floppy_state *) data;
-
-        fs->timeout_pending = 0;
-        end_request(CURRENT, 0);
-        fs->state = idle;
-}
-
-static void start_request(struct floppy_state *fs)
-{
-        volatile struct swim_iop_req req;
-        struct swimcmd_rw *cmd = (struct swimcmd_rw *) &req.command[0];
-
-        if (fs->state == idle && fs->wanted) {
-                fs->state = available;
-                wake_up(&fs->wait);
-                return;
-        }
-        while (CURRENT && fs->state == idle) {
-                if (CURRENT->bh && !buffer_locked(CURRENT->bh))
-                        panic("floppy: block not locked");
-#if 0
-                printk("do_fd_req: dev=%s cmd=%d sec=%ld nr_sec=%ld buf=%p\n",
-                       CURRENT->rq_disk->disk_name, CURRENT->cmd,
-                       CURRENT->sector, CURRENT->nr_sectors, CURRENT->buffer);
-                printk("           errors=%d current_nr_sectors=%ld\n",
-                      CURRENT->errors, CURRENT->current_nr_sectors);
-#endif
-
-                if (CURRENT->sector < 0 || CURRENT->sector >= fs->total_secs) {
-                        end_request(CURRENT, 0);
-                        continue;
-                }
-                if (CURRENT->current_nr_sectors == 0) {
-                        end_request(CURRENT, 1);
-                        continue;
-                }
-                if (fs->ejected) {
-                        end_request(CURRENT, 0);
-                        continue;
-                }
-
-                swimiop_init_request(&req);
-                req.fs = fs;
-                req.done = fd_request_complete;
-
-                if (CURRENT->cmd == WRITE) {
-                        if (fs->write_prot) {
-                                end_request(CURRENT, 0);
-                                continue;
-                        }
-                        cmd->code = CMD_WRITE;
-                } else {
-                        cmd->code = CMD_READ;
-
-                }
-                cmd->drive_num = fs->drive_num;
-                cmd->buffer = CURRENT->buffer;
-                cmd->first_block = CURRENT->sector;
-                cmd->num_blocks = CURRENT->current_nr_sectors;
-
-                if (swimiop_send_request(&req)) {
-                        end_request(CURRENT, 0);
-                        continue;
-                }
-
-                set_timeout(fs, HZ*CURRENT->current_nr_sectors,
-                                fd_request_timeout);
-
-                fs->state = transferring;
-        }
-}
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 2df5cf4ec743..e4a2f8f3a1d7 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1810,7 +1810,7 @@ static int dvd_read_disckey(struct cdrom_device_info *cdi, dvd_struct *s)
 
         size = sizeof(s->disckey.value) + 4;
 
-        if ((buf = (u_char *) kmalloc(size, GFP_KERNEL)) == NULL)
+        if ((buf = kmalloc(size, GFP_KERNEL)) == NULL)
                 return -ENOMEM;
 
         init_cdrom_command(&cgc, buf, size, CGC_DATA_READ);
@@ -1861,7 +1861,7 @@ static int dvd_read_manufact(struct cdrom_device_info *cdi, dvd_struct *s)
 
         size = sizeof(s->manufact.value) + 4;
 
-        if ((buf = (u_char *) kmalloc(size, GFP_KERNEL)) == NULL)
+        if ((buf = kmalloc(size, GFP_KERNEL)) == NULL)
                 return -ENOMEM;
 
         init_cdrom_command(&cgc, buf, size, CGC_DATA_READ);
@@ -2849,7 +2849,7 @@ static int mmc_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
                 /* FIXME: we need upper bound checking, too!! */
                 if (lba < 0)
                         return -EINVAL;
-                cgc.buffer = (char *) kmalloc(blocksize, GFP_KERNEL);
+                cgc.buffer = kmalloc(blocksize, GFP_KERNEL);
                 if (cgc.buffer == NULL)
                         return -ENOMEM;
                 memset(&sense, 0, sizeof(sense));
@@ -3031,7 +3031,7 @@ static int mmc_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
                 int size = sizeof(dvd_struct);
                 if (!CDROM_CAN(CDC_DVD))
                         return -ENOSYS;
-                if ((s = (dvd_struct *) kmalloc(size, GFP_KERNEL)) == NULL)
+                if ((s = kmalloc(size, GFP_KERNEL)) == NULL)
                         return -ENOMEM;
                 cdinfo(CD_DO_IOCTL, "entering DVD_READ_STRUCT\n"); 
                 if (copy_from_user(s, (dvd_struct __user *)arg, size)) {
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index e6d8e9ededea..b6c61bbb20e1 100644
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -1420,7 +1420,7 @@ int __init cm206_init(void)
                 return -EIO;
         }
         printk(" adapter at 0x%x", cm206_base);
-        cd = (struct cm206_struct *) kmalloc(size, GFP_KERNEL);
+        cd = kmalloc(size, GFP_KERNEL);
         if (!cd)
                goto out_base;
         /* Now we have found the adaptor card, try to reset it. As we have
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index b10f4d8fdc7f..9e43e39dc35c 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -97,7 +97,7 @@ config SERIAL_NONSTANDARD
 
 config COMPUTONE
         tristate "Computone IntelliPort Plus serial support"
-        depends on SERIAL_NONSTANDARD
+        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
         ---help---
           This driver supports the entire family of Intelliport II/Plus
           controllers with the exception of the MicroChannel controllers and
@@ -203,7 +203,7 @@ config MOXA_SMARTIO
 
 config MOXA_SMARTIO_NEW
         tristate "Moxa SmartIO support v. 2.0 (EXPERIMENTAL)"
-        depends on SERIAL_NONSTANDARD
+        depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
         help
           Say Y here if you have a Moxa SmartIO multiport serial card and/or
           want to help develop a new version of this driver.
@@ -218,7 +218,7 @@ config MOXA_SMARTIO_NEW
 
 config ISI
         tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
-        depends on SERIAL_NONSTANDARD
+        depends on SERIAL_NONSTANDARD && PCI
         select FW_LOADER
         help
           This is a driver for the Multi-Tech cards which provide several
@@ -312,7 +312,7 @@ config SPECIALIX_RTSCTS
 
 config SX
         tristate "Specialix SX (and SI) card support"
-        depends on SERIAL_NONSTANDARD
+        depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
         help
           This is a driver for the SX and SI multiport serial cards.
           Please read the file <file:Documentation/sx.txt> for details.
@@ -867,7 +867,7 @@ config SONYPI
 
 config TANBAC_TB0219
         tristate "TANBAC TB0219 base board support"
-        depends TANBAC_TB022X
+        depends on TANBAC_TB022X
         select GPIO_VR41XX
 
 source "drivers/char/agp/Kconfig"
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index c603bf291580..a9f9c48c2424 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -86,7 +86,7 @@ config AGP_NVIDIA
 
 config AGP_SIS
         tristate "SiS chipset support"
-        depends on AGP
+        depends on AGP && X86
         help
           This option gives you AGP support for the GLX component of
           X on Silicon Integrated Systems [SiS] chipsets.
@@ -103,7 +103,7 @@ config AGP_SWORKS
 
 config AGP_VIA
         tristate "VIA chipset support"
-        depends on AGP
+        depends on AGP && X86
         help
           This option gives you AGP support for the GLX component of
           X on VIA MVP3/Apollo Pro chipsets.
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 5ff457b41efb..883a36a27833 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -419,6 +419,31 @@ static void agp_v2_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_
                 *requested_mode &= ~AGP2_RESERVED_MASK;
         }
 
+        /*
+         * Some dumb bridges are programmed to disobey the AGP2 spec.
+         * This is likely a BIOS misprogramming rather than poweron default, or
+         * it would be a lot more common.
+         * https://bugs.freedesktop.org/show_bug.cgi?id=8816
+         * AGPv2 spec 6.1.9 states:
+         *   The RATE field indicates the data transfer rates supported by this
+         *   device. A.G.P. devices must report all that apply.
+         * Fix them up as best we can.
+         */
+        switch (*bridge_agpstat & 7) {
+        case 4:
+                *bridge_agpstat |= (AGPSTAT2_2X | AGPSTAT2_1X);
+                printk(KERN_INFO PFX "BIOS bug. AGP bridge claims to only support x4 rate"
+                        "Fixing up support for x2 & x1\n");
+                break;
+        case 2:
+                *bridge_agpstat |= AGPSTAT2_1X;
+                printk(KERN_INFO PFX "BIOS bug. AGP bridge claims to only support x2 rate"
+                        "Fixing up support for x1\n");
+                break;
+        default:
+                break;
+        }
+
         /* Check the speed bits make sense. Only one should be set. */
         tmp = *requested_mode & 7;
         switch (tmp) {
diff --git a/drivers/char/consolemap.c b/drivers/char/consolemap.c
index 04a12027a740..b99b7561260d 100644
--- a/drivers/char/consolemap.c
+++ b/drivers/char/consolemap.c
@@ -443,7 +443,7 @@ int con_clear_unimap(struct vc_data *vc, struct unimapinit *ui)
         p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
         if (p && p->readonly) return -EIO;
         if (!p || --p->refcount) {
-                q = (struct uni_pagedir *)kmalloc(sizeof(*p), GFP_KERNEL);
+                q = kmalloc(sizeof(*p), GFP_KERNEL);
                 if (!q) {
                         if (p) p->refcount++;
                         return -ENOMEM;
diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index da601fd6c07a..d649abbf0857 100644
--- a/drivers/char/lcd.c
+++ b/drivers/char/lcd.c
@@ -459,7 +459,7 @@ static int lcd_ioctl(struct inode *inode, struct file *file,
                             (&display, (struct lcd_display *) arg,
                              sizeof(struct lcd_display)))
                                 return -EFAULT;
-                        rom = (unsigned char *) kmalloc((128), GFP_ATOMIC);
+                        rom = kmalloc((128), GFP_ATOMIC);
                         if (rom == NULL) {
                                 printk(KERN_ERR LCD "kmalloc() failed in %s\n",
                                                 __FUNCTION__);
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index b70b5388b5a8..b51d08be0bcf 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -525,7 +525,7 @@ static int lp_open(struct inode * inode, struct file * file)
                         return -EIO;
                 }
         }
-        lp_table[minor].lp_buffer = (char *) kmalloc(LP_BUFFER_SIZE, GFP_KERNEL);
+        lp_table[minor].lp_buffer = kmalloc(LP_BUFFER_SIZE, GFP_KERNEL);
         if (!lp_table[minor].lp_buffer) {
                 LP_F(minor) &= ~LP_BUSY;
                 return -ENOMEM;
diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c
index efa8076c33e0..cd989dce7c53 100644
--- a/drivers/char/mxser_new.c
+++ b/drivers/char/mxser_new.c
@@ -315,6 +315,7 @@ static struct mxser_mon_ext mon_data_ext;
 static int mxser_set_baud_method[MXSER_PORTS + 1];
 static spinlock_t gm_lock;
 
+#ifdef CONFIG_PCI
 static int CheckIsMoxaMust(int io)
 {
         u8 oldmcr, hwid;
@@ -337,6 +338,7 @@ static int CheckIsMoxaMust(int io)
         }
         return MOXA_OTHER_UART;
 }
+#endif
 
 static void process_txrx_fifo(struct mxser_port *info)
 {
@@ -2380,9 +2382,11 @@ static void mxser_release_res(struct mxser_board *brd, struct pci_dev *pdev,
         if (irq)
                 free_irq(brd->irq, brd);
         if (pdev != NULL) {     /* PCI */
+#ifdef CONFIG_PCI
                 pci_release_region(pdev, 2);
                 pci_release_region(pdev, 3);
                 pci_dev_put(pdev);
+#endif
         } else {
                 release_region(brd->ports[0].ioaddr, 8 * brd->info->nports);
                 release_region(brd->vector, 1);
@@ -2546,6 +2550,7 @@ static int __init mxser_get_ISA_conf(int cap, struct mxser_board *brd)
 static int __devinit mxser_probe(struct pci_dev *pdev,
                 const struct pci_device_id *ent)
 {
+#ifdef CONFIG_PCI
         struct mxser_board *brd;
         unsigned int i, j;
         unsigned long ioaddress;
@@ -2644,6 +2649,9 @@ err_relio:
         brd->info = NULL;
 err:
         return retval;
+#else
+        return -ENODEV;
+#endif
 }
 
 static void __devexit mxser_remove(struct pci_dev *pdev)
diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c
index 103d338f21e2..dc6d41841457 100644
--- a/drivers/char/n_r3964.c
+++ b/drivers/char/n_r3964.c
@@ -125,8 +125,8 @@ static void transmit_block(struct r3964_info *pInfo);
 static void receive_char(struct r3964_info *pInfo, const unsigned char c);
 static void receive_error(struct r3964_info *pInfo, const char flag);
 static void on_timeout(unsigned long priv);
-static int enable_signals(struct r3964_info *pInfo, pid_t pid, int arg);
-static int read_telegram(struct r3964_info *pInfo, pid_t pid, unsigned char __user *buf);
+static int enable_signals(struct r3964_info *pInfo, struct pid *pid, int arg);
+static int read_telegram(struct r3964_info *pInfo, struct pid *pid, unsigned char __user *buf);
 static void add_msg(struct r3964_client_info *pClient, int msg_id, int arg,
              int error_code, struct r3964_block_header *pBlock);
 static struct r3964_message* remove_msg(struct r3964_info *pInfo, 
@@ -829,7 +829,7 @@ static void on_timeout(unsigned long priv)
 }
 
 static struct r3964_client_info *findClient(
-  struct r3964_info *pInfo, pid_t pid)
+  struct r3964_info *pInfo, struct pid *pid)
 {
    struct r3964_client_info *pClient;
    
@@ -843,7 +843,7 @@ static struct r3964_client_info *findClient(
    return NULL;
 }
 
-static int enable_signals(struct r3964_info *pInfo, pid_t pid, int arg)
+static int enable_signals(struct r3964_info *pInfo, struct pid *pid, int arg)
 {
    struct r3964_client_info *pClient;
    struct r3964_client_info **ppClient;
@@ -858,7 +858,7 @@ static int enable_signals(struct r3964_info *pInfo, pid_t pid, int arg)
          
          if(pClient->pid == pid)
          {
-            TRACE_PS("removing client %d from client list", pid);
+            TRACE_PS("removing client %d from client list", pid_nr(pid));
             *ppClient = pClient->next;
             while(pClient->msg_count)
             {
@@ -869,6 +869,7 @@ static int enable_signals(struct r3964_info *pInfo, pid_t pid, int arg)
                   TRACE_M("enable_signals - msg kfree %p",pMsg);
                }
             }
+            put_pid(pClient->pid);
             kfree(pClient);
             TRACE_M("enable_signals - kfree %p",pClient);
             return 0;
@@ -892,10 +893,10 @@ static int enable_signals(struct r3964_info *pInfo, pid_t pid, int arg)
          if(pClient==NULL)
             return -ENOMEM;
 
-         TRACE_PS("add client %d to client list", pid);
+         TRACE_PS("add client %d to client list", pid_nr(pid));
          spin_lock_init(&pClient->lock);
          pClient->sig_flags=arg;
-         pClient->pid = pid;
+         pClient->pid = get_pid(pid);
          pClient->next=pInfo->firstClient;
          pClient->first_msg = NULL;
          pClient->last_msg = NULL;
@@ -908,7 +909,7 @@ static int enable_signals(struct r3964_info *pInfo, pid_t pid, int arg)
    return 0;
 }
 
-static int read_telegram(struct r3964_info *pInfo, pid_t pid, unsigned char __user *buf)
+static int read_telegram(struct r3964_info *pInfo, struct pid *pid, unsigned char __user *buf)
 {
     struct r3964_client_info *pClient;
     struct r3964_block_header *block;
@@ -1005,7 +1006,7 @@ queue_the_message:
    /* Send SIGIO signal to client process: */
    if(pClient->sig_flags & R3964_USE_SIGIO)
    {
-      kill_proc(pClient->pid, SIGIO, 1);
+      kill_pid(pClient->pid, SIGIO, 1);
    }
 }
 
@@ -1042,7 +1043,7 @@ static void remove_client_block(struct r3964_info *pInfo,
 {
     struct r3964_block_header *block;
 
-    TRACE_PS("remove_client_block PID %d", pClient->pid);
+    TRACE_PS("remove_client_block PID %d", pid_nr(pClient->pid));
 
     block=pClient->next_block_to_read;
     if(block)
@@ -1157,6 +1158,7 @@ static void r3964_close(struct tty_struct *tty)
              TRACE_M("r3964_close - msg kfree %p",pMsg);
           }
        }
+       put_pid(pClient->pid);
        kfree(pClient);
        TRACE_M("r3964_close - client kfree %p",pClient);
        pClient=pNext;
@@ -1193,12 +1195,11 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
    struct r3964_client_message theMsg;
    DECLARE_WAITQUEUE (wait, current);
    
-   int pid = current->pid;
    int count;
    
    TRACE_L("read()");
  
-   pClient=findClient(pInfo, pid);
+   pClient=findClient(pInfo, task_pid(current));
    if(pClient)
    {
       pMsg = remove_msg(pInfo, pClient);
@@ -1252,7 +1253,6 @@ static ssize_t r3964_write(struct tty_struct * tty, struct file * file,
    struct r3964_block_header *pHeader;
    struct r3964_client_info *pClient;
    unsigned char *new_data;
-   int pid;
    
    TRACE_L("write request, %d characters", count);
 /* 
@@ -1295,9 +1295,7 @@ static ssize_t r3964_write(struct tty_struct * tty, struct file * file,
    pHeader->locks = 0;
    pHeader->owner = NULL;
    
-   pid=current->pid;
-   
-   pClient=findClient(pInfo, pid);
+   pClient=findClient(pInfo, task_pid(current));
    if(pClient)
    {
       pHeader->owner = pClient;
@@ -1328,7 +1326,7 @@ static int r3964_ioctl(struct tty_struct * tty, struct file * file,
    switch(cmd)
    {
       case R3964_ENABLE_SIGNALS:
-         return enable_signals(pInfo, current->pid, arg);
+         return enable_signals(pInfo, task_pid(current), arg);
       case R3964_SETPRIORITY:
          if(arg<R3964_MASTER || arg>R3964_SLAVE)
             return -EINVAL;
@@ -1341,7 +1339,7 @@ static int r3964_ioctl(struct tty_struct * tty, struct file * file,
             pInfo->flags &= ~R3964_BCC;
          return 0;
       case R3964_READ_TELEGRAM:
-         return read_telegram(pInfo, current->pid, (unsigned char __user *)arg);
+         return read_telegram(pInfo, task_pid(current), (unsigned char __user *)arg);
       default:
          return -ENOIOCTLCMD;
    }
@@ -1357,7 +1355,6 @@ static unsigned int r3964_poll(struct tty_struct * tty, struct file * file,
                       struct poll_table_struct *wait)
 {
    struct r3964_info *pInfo=(struct r3964_info*)tty->disc_data;
-   int pid=current->pid;
    struct r3964_client_info *pClient;
    struct r3964_message *pMsg=NULL;
    unsigned long flags;
@@ -1365,7 +1362,7 @@ static unsigned int r3964_poll(struct tty_struct * tty, struct file * file,
 
    TRACE_L("POLL");
 
-   pClient=findClient(pInfo,pid);
+   pClient=findClient(pInfo, task_pid(current));
    if(pClient)
      {
        poll_wait(file, &pInfo->read_wait, wait);
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index e96a00fe1389..2bdb0144a22e 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -1151,7 +1151,6 @@ static int copy_from_read_buf(struct tty_struct *tty,
         n = min(*nr, n);
         spin_unlock_irqrestore(&tty->read_lock, flags);
         if (n) {
-                mb();
                 retval = copy_to_user(*b, &tty->read_buf[tty->read_tail], n);
                 n -= retval;
                 spin_lock_irqsave(&tty->read_lock, flags);
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 5152cedd8878..f108c136800a 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -541,7 +541,7 @@ static int mgslpc_probe(struct pcmcia_device *link)
     if (debug_level >= DEBUG_LEVEL_INFO)
             printk("mgslpc_attach\n");
 
-    info = (MGSLPC_INFO *)kmalloc(sizeof(MGSLPC_INFO), GFP_KERNEL);
+    info = kmalloc(sizeof(MGSLPC_INFO), GFP_KERNEL);
     if (!info) {
             printk("Error can't allocate device instance data\n");
             return -ENOMEM;
diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c
index 167ebc84e8d7..245f03195b7c 100644
--- a/drivers/char/rio/riocmd.c
+++ b/drivers/char/rio/riocmd.c
@@ -556,7 +556,7 @@ struct CmdBlk *RIOGetCmdBlk(void)
 {
         struct CmdBlk *CmdBlkP;
 
-        CmdBlkP = (struct CmdBlk *)kmalloc(sizeof(struct CmdBlk), GFP_ATOMIC);
+        CmdBlkP = kmalloc(sizeof(struct CmdBlk), GFP_ATOMIC);
         if (CmdBlkP)
                 memset(CmdBlkP, 0, sizeof(struct CmdBlk));
         return CmdBlkP;
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 66a7385bc34a..e1d70e8b6268 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -113,7 +113,7 @@ static int rtc_has_irq = 1;
 #define hpet_set_rtc_irq_bit(arg)               0
 #define hpet_rtc_timer_init()                   do { } while (0)
 #define hpet_rtc_dropped_irq()                  0
-static inline irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) {return 0;}
+static irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) {return 0;}
 #else
 extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
 #endif
@@ -165,7 +165,9 @@ static void mask_rtc_irq_bit(unsigned char bit)
 }
 #endif
 
+#ifdef CONFIG_PROC_FS
 static int rtc_proc_open(struct inode *inode, struct file *file);
+#endif
 
 /*
  *      Bits in rtc_status. (6 bits of room for future expansion)
@@ -906,6 +908,7 @@ static struct miscdevice rtc_dev = {
         .fops           = &rtc_fops,
 };
 
+#ifdef CONFIG_PROC_FS
 static const struct file_operations rtc_proc_fops = {
         .owner = THIS_MODULE,
         .open = rtc_proc_open,
@@ -913,14 +916,13 @@ static const struct file_operations rtc_proc_fops = {
         .llseek = seq_lseek,
         .release = single_release,
 };
-
-#if defined(RTC_IRQ) && !defined(__sparc__)
-static irq_handler_t rtc_int_handler_ptr;
 #endif
 
 static int __init rtc_init(void)
 {
+#ifdef CONFIG_PROC_FS
         struct proc_dir_entry *ent;
+#endif
 #if defined(__alpha__) || defined(__mips__)
         unsigned int year, ctrl;
         char *guess = NULL;
@@ -932,9 +934,11 @@ static int __init rtc_init(void)
         struct sparc_isa_bridge *isa_br;
         struct sparc_isa_device *isa_dev;
 #endif
-#endif
-#ifndef __sparc__
+#else
         void *r;
+#ifdef RTC_IRQ
+        irq_handler_t rtc_int_handler_ptr;
+#endif
 #endif
 
 #ifdef __sparc__
@@ -958,6 +962,7 @@ static int __init rtc_init(void)
                 }
         }
 #endif
+        rtc_has_irq = 0;
         printk(KERN_ERR "rtc_init: no PC rtc found\n");
         return -EIO;
 
@@ -972,6 +977,7 @@ found:
          * PCI Slot 2 INTA# (and some INTx# in Slot 1).
          */
         if (request_irq(rtc_irq, rtc_interrupt, IRQF_SHARED, "rtc", (void *)&rtc_port)) {
+                rtc_has_irq = 0;
                 printk(KERN_ERR "rtc: cannot register IRQ %d\n", rtc_irq);
                 return -EIO;
         }
@@ -982,6 +988,9 @@ no_irq:
         else
                 r = request_mem_region(RTC_PORT(0), RTC_IO_EXTENT, "rtc");
         if (!r) {
+#ifdef RTC_IRQ
+                rtc_has_irq = 0;
+#endif
                 printk(KERN_ERR "rtc: I/O resource %lx is not free.\n",
                        (long)(RTC_PORT(0)));
                 return -EIO;
@@ -996,6 +1005,7 @@ no_irq:
 
         if(request_irq(RTC_IRQ, rtc_int_handler_ptr, IRQF_DISABLED, "rtc", NULL)) {
                 /* Yeah right, seeing as irq 8 doesn't even hit the bus. */
+                rtc_has_irq = 0;
                 printk(KERN_ERR "rtc: IRQ %d is not free.\n", RTC_IRQ);
                 if (RTC_IOMAPPED)
                         release_region(RTC_PORT(0), RTC_IO_EXTENT);
@@ -1012,21 +1022,19 @@ no_irq:
         if (misc_register(&rtc_dev)) {
 #ifdef RTC_IRQ
                 free_irq(RTC_IRQ, NULL);
+                rtc_has_irq = 0;
 #endif
                 release_region(RTC_PORT(0), RTC_IO_EXTENT);
                 return -ENODEV;
         }
 
+#ifdef CONFIG_PROC_FS
         ent = create_proc_entry("driver/rtc", 0, NULL);
-        if (!ent) {
-#ifdef RTC_IRQ
-                free_irq(RTC_IRQ, NULL);
+        if (ent)
+                ent->proc_fops = &rtc_proc_fops;
+        else
+                printk(KERN_WARNING "rtc: Failed to register with procfs.\n");
 #endif
-                release_region(RTC_PORT(0), RTC_IO_EXTENT);
-                misc_deregister(&rtc_dev);
-                return -ENOMEM;
-        }
-        ent->proc_fops = &rtc_proc_fops;
 
 #if defined(__alpha__) || defined(__mips__)
         rtc_freq = HZ;
@@ -1159,6 +1167,7 @@ static void rtc_dropped_irq(unsigned long data)
 }
 #endif
 
+#ifdef CONFIG_PROC_FS
 /*
  *      Info exported via "/proc/driver/rtc".
  */
@@ -1243,6 +1252,7 @@ static int rtc_proc_open(struct inode *inode, struct file *file)
 {
         return single_open(file, rtc_proc_show, NULL);
 }
+#endif
 
 void rtc_get_rtc_time(struct rtc_time *rtc_tm)
 {
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index a3008ce13015..1da92a689ae4 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -2498,8 +2498,10 @@ static void __devexit sx_remove_card(struct sx_board *board,
                 /* It is safe/allowed to del_timer a non-active timer */
                 del_timer(&board->timer);
                 if (pdev) {
+#ifdef CONFIG_PCI
                         pci_iounmap(pdev, board->base);
                         pci_release_region(pdev, IS_CF_BOARD(board) ? 3 : 2);
+#endif
                 } else {
                         iounmap(board->base);
                         release_region(board->hw_base, board->hw_len);
@@ -2601,6 +2603,7 @@ static struct eisa_driver sx_eisadriver = {
 
 #endif
 
+#ifdef CONFIG_PCI
  /******************************************************** 
  * Setting bit 17 in the CNTRL register of the PLX 9050  * 
  * chip forces a retry on writes while a read is pending.*
@@ -2632,10 +2635,12 @@ static void __devinit fix_sx_pci(struct pci_dev *pdev, struct sx_board *board)
         }
         iounmap(rebase);
 }
+#endif
 
 static int __devinit sx_pci_probe(struct pci_dev *pdev,
                                   const struct pci_device_id *ent)
 {
+#ifdef CONFIG_PCI
         struct sx_board *board;
         unsigned int i, reg;
         int retval = -EIO;
@@ -2700,6 +2705,9 @@ err_flag:
         board->flags &= ~SX_BOARD_PRESENT;
 err:
         return retval;
+#else
+        return -ENODEV;
+#endif
 }
 
 static void __devexit sx_pci_remove(struct pci_dev *pdev)
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index acc6fab601cc..3fa625db9e4b 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -4332,7 +4332,7 @@ static struct mgsl_struct* mgsl_allocate_device(void)
 {
         struct mgsl_struct *info;
         
-        info = (struct mgsl_struct *)kmalloc(sizeof(struct mgsl_struct),
+        info = kmalloc(sizeof(struct mgsl_struct),
                  GFP_KERNEL);
                  
         if (!info) {
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index 53e8ccf94fe3..8f4d67afe5bf 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -2730,7 +2730,7 @@ static int startup(SLMP_INFO * info)
                 return 0;
 
         if (!info->tx_buf) {
-                info->tx_buf = (unsigned char *)kmalloc(info->max_frame_size, GFP_KERNEL);
+                info->tx_buf = kmalloc(info->max_frame_size, GFP_KERNEL);
                 if (!info->tx_buf) {
                         printk(KERN_ERR"%s(%d):%s can't allocate transmit buffer\n",
                                 __FILE__,__LINE__,info->device_name);
@@ -3798,7 +3798,7 @@ static SLMP_INFO *alloc_dev(int adapter_num, int port_num, struct pci_dev *pdev)
 {
         SLMP_INFO *info;
 
-        info = (SLMP_INFO *)kmalloc(sizeof(SLMP_INFO),
+        info = kmalloc(sizeof(SLMP_INFO),
                  GFP_KERNEL);
 
         if (!info) {
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 05810c8d20bc..13935235e066 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -41,7 +41,34 @@
 #include <asm/irq_regs.h>
 
 /* Whether we react on sysrq keys or just ignore them */
-int sysrq_enabled = 1;
+int __read_mostly __sysrq_enabled = 1;
+
+static int __read_mostly sysrq_always_enabled;
+
+int sysrq_on(void)
+{
+        return __sysrq_enabled || sysrq_always_enabled;
+}
+
+/*
+ * A value of 1 means 'all', other nonzero values are an op mask:
+ */
+static inline int sysrq_on_mask(int mask)
+{
+        return sysrq_always_enabled || __sysrq_enabled == 1 ||
+                                                (__sysrq_enabled & mask);
+}
+
+static int __init sysrq_always_enabled_setup(char *str)
+{
+        sysrq_always_enabled = 1;
+        printk(KERN_INFO "debug: sysrq always enabled.\n");
+
+        return 1;
+}
+
+__setup("sysrq_always_enabled", sysrq_always_enabled_setup);
+
 
 static void sysrq_handle_loglevel(int key, struct tty_struct *tty)
 {
@@ -379,8 +406,7 @@ void __handle_sysrq(int key, struct tty_struct *tty, int check_mask)
                  * Should we check for enabled operations (/proc/sysrq-trigger
                  * should not) and is the invoked operation enabled?
                  */
-                if (!check_mask || sysrq_enabled == 1 ||
-                    (sysrq_enabled & op_p->enable_mask)) {
+                if (!check_mask || sysrq_on_mask(op_p->enable_mask)) {
                         printk("%s\n", op_p->action_msg);
                         console_loglevel = orig_log_level;
                         op_p->handler(key, tty);
@@ -414,9 +440,8 @@ void __handle_sysrq(int key, struct tty_struct *tty, int check_mask)
  */
 void handle_sysrq(int key, struct tty_struct *tty)
 {
-        if (!sysrq_enabled)
-                return;
-        __handle_sysrq(key, tty, 1);
+        if (sysrq_on())
+                __handle_sysrq(key, tty, 1);
 }
 EXPORT_SYMBOL(handle_sysrq);
 
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 4044c864fdd4..47a6eacb10bc 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -3335,18 +3335,13 @@ static void __do_SAK(struct work_struct *work)
         int session;
         int             i;
         struct file     *filp;
-        struct tty_ldisc *disc;
         struct fdtable *fdt;
         
         if (!tty)
                 return;
         session = tty->session;
         
-        /* We don't want an ldisc switch during this */
-        disc = tty_ldisc_ref(tty);
-        if (disc && disc->flush_buffer)
-                disc->flush_buffer(tty);
-        tty_ldisc_deref(disc);
+        tty_ldisc_flush(tty);
 
         if (tty->driver->flush_buffer)
                 tty->driver->flush_buffer(tty);
@@ -3821,6 +3816,7 @@ struct tty_struct *get_current_tty(void)
         barrier();
         return tty;
 }
+EXPORT_SYMBOL_GPL(get_current_tty);
 
 /*
  * Initialize the console device. This is called *early*, so
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 6d2e314860df..0e0da443cbd5 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -61,10 +61,7 @@
 static DEFINE_SPINLOCK(consolelock);
 static DEFINE_SPINLOCK(consoleloglock);
 
-#ifdef CONFIG_MAGIC_SYSRQ
 static int vio_sysrq_pressed;
-extern int sysrq_enabled;
-#endif
 
 #define VIOCHAR_NUM_BUF         16
 
@@ -936,8 +933,10 @@ static void vioHandleData(struct HvLpEvent *event)
          */
         num_pushed = 0;
         for (index = 0; index < cevent->len; index++) {
-#ifdef CONFIG_MAGIC_SYSRQ
-                if (sysrq_enabled) {
+                /*
+                 * Will be optimized away if !CONFIG_MAGIC_SYSRQ:
+                 */
+                if (sysrq_on()) {
                         /* 0x0f is the ascii character for ^O */
                         if (cevent->data[index] == '\x0f') {
                                 vio_sysrq_pressed = 1;
@@ -956,7 +955,6 @@ static void vioHandleData(struct HvLpEvent *event)
                                 continue;
                         }
                 }
-#endif
                 /*
                  * The sysrq sequence isn't included in this check if
                  * sysrq is enabled and compiled into the kernel because
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index a8239dac994f..06c32a3e3ca4 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -784,7 +784,7 @@ int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)
         if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)
                 return 0;
 
-        newscreen = (unsigned short *) kmalloc(new_screen_size, GFP_USER);
+        newscreen = kmalloc(new_screen_size, GFP_USER);
         if (!newscreen)
                 return -ENOMEM;
 
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index ac5d60edbafa..dc8368ebb1ac 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -129,7 +129,7 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
                             !capable(CAP_SYS_RESOURCE))
                                 return -EPERM;
 
-                        key_map = (ushort *) kmalloc(sizeof(plain_map),
+                        key_map = kmalloc(sizeof(plain_map),
                                                      GFP_KERNEL);
                         if (!key_map)
                                 return -ENOMEM;
@@ -259,7 +259,7 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
                     sz = 256;
                     while (sz < funcbufsize - funcbufleft + delta)
                       sz <<= 1;
-                    fnw = (char *) kmalloc(sz, GFP_KERNEL);
+                    fnw = kmalloc(sz, GFP_KERNEL);
                     if(!fnw) {
                       ret = -ENOMEM;
                       goto reterr;
@@ -1087,7 +1087,7 @@ static void complete_change_console(struct vc_data *vc)
         switch_screen(vc);
 
         /*
-         * This can't appear below a successful kill_proc().  If it did,
+         * This can't appear below a successful kill_pid().  If it did,
          * then the *blank_screen operation could occur while X, having
          * received acqsig, is waking up on another processor.  This
          * condition can lead to overlapping accesses to the VGA range
@@ -1110,7 +1110,7 @@ static void complete_change_console(struct vc_data *vc)
          */
         if (vc->vt_mode.mode == VT_PROCESS) {
                 /*
-                 * Send the signal as privileged - kill_proc() will
+                 * Send the signal as privileged - kill_pid() will
                  * tell us if the process has gone or something else
                  * is awry
                  */
@@ -1170,7 +1170,7 @@ void change_console(struct vc_data *new_vc)
         vc = vc_cons[fg_console].d;
         if (vc->vt_mode.mode == VT_PROCESS) {
                 /*
-                 * Send the signal as privileged - kill_proc() will
+                 * Send the signal as privileged - kill_pid() will
                  * tell us if the process has gone or something else
                  * is awry
                  */
diff --git a/drivers/char/watchdog/at91rm9200_wdt.c b/drivers/char/watchdog/at91rm9200_wdt.c
index cb86967e2c5f..38bd37372599 100644
--- a/drivers/char/watchdog/at91rm9200_wdt.c
+++ b/drivers/char/watchdog/at91rm9200_wdt.c
@@ -203,9 +203,9 @@ static int __init at91wdt_probe(struct platform_device *pdev)
 {
         int res;
 
-        if (at91wdt_miscdev.dev)
+        if (at91wdt_miscdev.parent)
                 return -EBUSY;
-        at91wdt_miscdev.dev = &pdev->dev;
+        at91wdt_miscdev.parent = &pdev->dev;
 
         res = misc_register(&at91wdt_miscdev);
         if (res)
@@ -221,7 +221,7 @@ static int __exit at91wdt_remove(struct platform_device *pdev)
 
         res = misc_deregister(&at91wdt_miscdev);
         if (!res)
-                at91wdt_miscdev.dev = NULL;
+                at91wdt_miscdev.parent = NULL;
 
         return res;
 }
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c
index 3404a9c67f08..e88947f8fe53 100644
--- a/drivers/char/watchdog/mpcore_wdt.c
+++ b/drivers/char/watchdog/mpcore_wdt.c
@@ -347,7 +347,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev)
                 goto err_free;
         }
 
-        mpcore_wdt_miscdev.dev = &dev->dev;
+        mpcore_wdt_miscdev.parent = &dev->dev;
         ret = misc_register(&mpcore_wdt_miscdev);
         if (ret) {
                 dev_printk(KERN_ERR, _dev, "cannot register miscdev on minor=%d (err=%d)\n",
diff --git a/drivers/char/watchdog/omap_wdt.c b/drivers/char/watchdog/omap_wdt.c
index 5dbd7dc2936f..6c6f97332dbb 100644
--- a/drivers/char/watchdog/omap_wdt.c
+++ b/drivers/char/watchdog/omap_wdt.c
@@ -290,7 +290,7 @@ static int __init omap_wdt_probe(struct platform_device *pdev)
         omap_wdt_disable();
         omap_wdt_adjust_timeout(timer_margin);
 
-        omap_wdt_miscdev.dev = &pdev->dev;
+        omap_wdt_miscdev.parent = &pdev->dev;
         ret = misc_register(&omap_wdt_miscdev);
         if (ret)
                 goto fail;
diff --git a/drivers/char/watchdog/pcwd_usb.c b/drivers/char/watchdog/pcwd_usb.c
index 61138726b501..2da5ac99687c 100644
--- a/drivers/char/watchdog/pcwd_usb.c
+++ b/drivers/char/watchdog/pcwd_usb.c
@@ -42,6 +42,7 @@
 #include <asm/uaccess.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
+#include <linux/hid.h>          /* For HID_REQ_SET_REPORT & HID_DT_REPORT */
 
 
 #ifdef CONFIG_USB_DEBUG
@@ -109,10 +110,6 @@ MODULE_DEVICE_TABLE (usb, usb_pcwd_table);
 #define CMD_ENABLE_WATCHDOG             0x30    /* Enable / Disable Watchdog */
 #define CMD_DISABLE_WATCHDOG            CMD_ENABLE_WATCHDOG
 
-/* Some defines that I like to be somewhere else like include/linux/usb_hid.h */
-#define HID_REQ_SET_REPORT              0x09
-#define HID_DT_REPORT                   (USB_TYPE_CLASS | 0x02)
-
 /* We can only use 1 card due to the /dev/watchdog restriction */
 static int cards_found;
 
diff --git a/drivers/char/watchdog/rm9k_wdt.c b/drivers/char/watchdog/rm9k_wdt.c
index ec3909371c21..7576a13e86bc 100644
--- a/drivers/char/watchdog/rm9k_wdt.c
+++ b/drivers/char/watchdog/rm9k_wdt.c
@@ -47,7 +47,7 @@
 
 
 /* Function prototypes */
-static irqreturn_t wdt_gpi_irqhdl(int, void *, struct pt_regs *);
+static irqreturn_t wdt_gpi_irqhdl(int, void *);
 static void wdt_gpi_start(void);
 static void wdt_gpi_stop(void);
 static void wdt_gpi_set_timeout(unsigned int);
@@ -94,8 +94,28 @@ module_param(nowayout, bool, 0444);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be disabled once started");
 
 
+/* Kernel interfaces */
+static struct file_operations fops = {
+        .owner          = THIS_MODULE,
+        .open           = wdt_gpi_open,
+        .release        = wdt_gpi_release,
+        .write          = wdt_gpi_write,
+        .unlocked_ioctl = wdt_gpi_ioctl,
+};
+
+static struct miscdevice miscdev = {
+        .minor          = WATCHDOG_MINOR,
+        .name           = wdt_gpi_name,
+        .fops           = &fops,
+};
+
+static struct notifier_block wdt_gpi_shutdown = {
+        .notifier_call  = wdt_gpi_notify,
+};
+
+
 /* Interrupt handler */
-static irqreturn_t wdt_gpi_irqhdl(int irq, void *ctxt, struct pt_regs *regs)
+static irqreturn_t wdt_gpi_irqhdl(int irq, void *ctxt)
 {
         if (!unlikely(__raw_readl(wd_regs + 0x0008) & 0x1))
                 return IRQ_NONE;
@@ -312,26 +332,6 @@ wdt_gpi_notify(struct notifier_block *this, unsigned long code, void *unused)
 }
 
 
-/* Kernel interfaces */
-static struct file_operations fops = {
-        .owner          = THIS_MODULE,
-        .open           = wdt_gpi_open,
-        .release        = wdt_gpi_release,
-        .write          = wdt_gpi_write,
-        .unlocked_ioctl = wdt_gpi_ioctl,
-};
-
-static struct miscdevice miscdev = {
-        .minor          = WATCHDOG_MINOR,
-        .name           = wdt_gpi_name,
-        .fops           = &fops,
-};
-
-static struct notifier_block wdt_gpi_shutdown = {
-        .notifier_call  = wdt_gpi_notify,
-};
-
-
 /* Init & exit procedures */
 static const struct resource *
 wdt_gpi_get_resource(struct platform_device *pdv, const char *name,
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 47ab42db122a..9fb2edf36611 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -29,7 +29,8 @@
 #include <linux/completion.h>
 #include <linux/mutex.h>
 
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_CORE, "cpufreq-core", msg)
+#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_CORE, \
+                                                "cpufreq-core", msg)
 
 /**
  * The "cpufreq driver" - the arch- or hardware-dependent low
@@ -151,7 +152,8 @@ static void cpufreq_debug_disable_ratelimit(void)
         spin_unlock_irqrestore(&disable_ratelimit_lock, flags);
 }
 
-void cpufreq_debug_printk(unsigned int type, const char *prefix, const char *fmt, ...)
+void cpufreq_debug_printk(unsigned int type, const char *prefix,
+                                                        const char *fmt, ...)
 {
         char s[256];
         va_list args;
@@ -161,7 +163,8 @@ void cpufreq_debug_printk(unsigned int type, const char *prefix, const char *fmt
         WARN_ON(!prefix);
         if (type & debug) {
                 spin_lock_irqsave(&disable_ratelimit_lock, flags);
-                if (!disable_ratelimit && debug_ratelimit && !printk_ratelimit()) {
+                if (!disable_ratelimit && debug_ratelimit
+                                        && !printk_ratelimit()) {
                         spin_unlock_irqrestore(&disable_ratelimit_lock, flags);
                         return;
                 }
@@ -182,10 +185,12 @@ EXPORT_SYMBOL(cpufreq_debug_printk);
 
 
 module_param(debug, uint, 0644);
-MODULE_PARM_DESC(debug, "CPUfreq debugging: add 1 to debug core, 2 to debug drivers, and 4 to debug governors.");
+MODULE_PARM_DESC(debug, "CPUfreq debugging: add 1 to debug core,"
+                        " 2 to debug drivers, and 4 to debug governors.");
 
 module_param(debug_ratelimit, uint, 0644);
-MODULE_PARM_DESC(debug_ratelimit, "CPUfreq debugging: set to 0 to disable ratelimiting.");
+MODULE_PARM_DESC(debug_ratelimit, "CPUfreq debugging:"
+                                        " set to 0 to disable ratelimiting.");
 
 #else /* !CONFIG_CPU_FREQ_DEBUG */
 
@@ -219,17 +224,23 @@ static void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci)
         if (!l_p_j_ref_freq) {
                 l_p_j_ref = loops_per_jiffy;
                 l_p_j_ref_freq = ci->old;
-                dprintk("saving %lu as reference value for loops_per_jiffy; freq is %u kHz\n", l_p_j_ref, l_p_j_ref_freq);
+                dprintk("saving %lu as reference value for loops_per_jiffy;"
+                        "freq is %u kHz\n", l_p_j_ref, l_p_j_ref_freq);
         }
         if ((val == CPUFREQ_PRECHANGE  && ci->old < ci->new) ||
             (val == CPUFREQ_POSTCHANGE && ci->old > ci->new) ||
             (val == CPUFREQ_RESUMECHANGE || val == CPUFREQ_SUSPENDCHANGE)) {
-                loops_per_jiffy = cpufreq_scale(l_p_j_ref, l_p_j_ref_freq, ci->new);
-                dprintk("scaling loops_per_jiffy to %lu for frequency %u kHz\n", loops_per_jiffy, ci->new);
+                loops_per_jiffy = cpufreq_scale(l_p_j_ref, l_p_j_ref_freq,
+                                                                ci->new);
+                dprintk("scaling loops_per_jiffy to %lu"
+                        "for frequency %u kHz\n", loops_per_jiffy, ci->new);
         }
 }
 #else
-static inline void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci) { return; }
+static inline void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci)
+{
+        return;
+}
 #endif
 
 
@@ -316,7 +327,8 @@ static int cpufreq_parse_governor (char *str_governor, unsigned int *policy,
                 if (!strnicmp(str_governor, "performance", CPUFREQ_NAME_LEN)) {
                         *policy = CPUFREQ_POLICY_PERFORMANCE;
                         err = 0;
-                } else if (!strnicmp(str_governor, "powersave", CPUFREQ_NAME_LEN)) {
+                } else if (!strnicmp(str_governor, "powersave",
+                                                CPUFREQ_NAME_LEN)) {
                         *policy = CPUFREQ_POLICY_POWERSAVE;
                         err = 0;
                 }
@@ -328,7 +340,8 @@ static int cpufreq_parse_governor (char *str_governor, unsigned int *policy,
                 t = __find_governor(str_governor);
 
                 if (t == NULL) {
-                        char *name = kasprintf(GFP_KERNEL, "cpufreq_%s", str_governor);
+                        char *name = kasprintf(GFP_KERNEL, "cpufreq_%s",
+                                                                str_governor);
 
                         if (name) {
                                 int ret;
@@ -361,7 +374,8 @@ extern struct sysdev_class cpu_sysdev_class;
 
 
 /**
- * cpufreq_per_cpu_attr_read() / show_##file_name() - print out cpufreq information
+ * cpufreq_per_cpu_attr_read() / show_##file_name() -
+ * print out cpufreq information
  *
  * Write out information from cpufreq_driver->policy[cpu]; object must be
  * "unsigned int".
@@ -380,7 +394,8 @@ show_one(scaling_min_freq, min);
 show_one(scaling_max_freq, max);
 show_one(scaling_cur_freq, cur);
 
-static int __cpufreq_set_policy(struct cpufreq_policy *data, struct cpufreq_policy *policy);
+static int __cpufreq_set_policy(struct cpufreq_policy *data,
+                                struct cpufreq_policy *policy);
 
 /**
  * cpufreq_per_cpu_attr_write() / store_##file_name() - sysfs write access
@@ -416,7 +431,8 @@ store_one(scaling_max_freq,max);
 /**
  * show_cpuinfo_cur_freq - current CPU frequency as detected by hardware
  */
-static ssize_t show_cpuinfo_cur_freq (struct cpufreq_policy * policy, char *buf)
+static ssize_t show_cpuinfo_cur_freq (struct cpufreq_policy * policy,
+                                                        char *buf)
 {
         unsigned int cur_freq = cpufreq_get(policy->cpu);
         if (!cur_freq)
@@ -428,7 +444,8 @@ static ssize_t show_cpuinfo_cur_freq (struct cpufreq_policy * policy, char *buf)
 /**
  * show_scaling_governor - show the current policy for the specified CPU
  */
-static ssize_t show_scaling_governor (struct cpufreq_policy * policy, char *buf)
+static ssize_t show_scaling_governor (struct cpufreq_policy * policy,
+                                                        char *buf)
 {
         if(policy->policy == CPUFREQ_POLICY_POWERSAVE)
                 return sprintf(buf, "powersave\n");
@@ -458,7 +475,8 @@ static ssize_t store_scaling_governor (struct cpufreq_policy * policy,
         if (ret != 1)
                 return -EINVAL;
 
-        if (cpufreq_parse_governor(str_governor, &new_policy.policy, &new_policy.governor))
+        if (cpufreq_parse_governor(str_governor, &new_policy.policy,
+                                                &new_policy.governor))
                 return -EINVAL;
 
         lock_cpu_hotplug();
@@ -474,7 +492,10 @@ static ssize_t store_scaling_governor (struct cpufreq_policy * policy,
 
         unlock_cpu_hotplug();
 
-        return ret ? ret : count;
+        if (ret)
+                return ret;
+        else
+                return count;
 }
 
 /**
@@ -488,7 +509,7 @@ static ssize_t show_scaling_driver (struct cpufreq_policy * policy, char *buf)
 /**
  * show_scaling_available_governors - show the available CPUfreq governors
  */
-static ssize_t show_scaling_available_governors (struct cpufreq_policy * policy,
+static ssize_t show_scaling_available_governors (struct cpufreq_policy *policy,
                                 char *buf)
 {
         ssize_t i = 0;
@@ -574,7 +595,11 @@ static ssize_t show(struct kobject * kobj, struct attribute * attr ,char * buf)
         policy = cpufreq_cpu_get(policy->cpu);
         if (!policy)
                 return -EINVAL;
-        ret = fattr->show ? fattr->show(policy,buf) : -EIO;
+        if (fattr->show)
+                ret = fattr->show(policy, buf);
+        else
+                ret = -EIO;
+
         cpufreq_cpu_put(policy);
         return ret;
 }
@@ -588,7 +613,11 @@ static ssize_t store(struct kobject * kobj, struct attribute * attr,
         policy = cpufreq_cpu_get(policy->cpu);
         if (!policy)
                 return -EINVAL;
-        ret = fattr->store ? fattr->store(policy,buf,count) : -EIO;
+        if (fattr->store)
+                ret = fattr->store(policy, buf, count);
+        else
+                ret = -EIO;
+
         cpufreq_cpu_put(policy);
         return ret;
 }
@@ -913,7 +942,8 @@ static void handle_update(struct work_struct *work)
  *      We adjust to current frequency first, and need to clean up later. So either call
  *      to cpufreq_update_policy() or schedule handle_update()).
  */
-static void cpufreq_out_of_sync(unsigned int cpu, unsigned int old_freq, unsigned int new_freq)
+static void cpufreq_out_of_sync(unsigned int cpu, unsigned int old_freq,
+                                unsigned int new_freq)
 {
         struct cpufreq_freqs freqs;
 
@@ -938,16 +968,16 @@ static void cpufreq_out_of_sync(unsigned int cpu, unsigned int old_freq, unsigne
 unsigned int cpufreq_quick_get(unsigned int cpu)
 {
         struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
-        unsigned int ret = 0;
+        unsigned int ret_freq = 0;
 
         if (policy) {
                 mutex_lock(&policy->lock);
-                ret = policy->cur;
+                ret_freq = policy->cur;
                 mutex_unlock(&policy->lock);
                 cpufreq_cpu_put(policy);
         }
 
-        return (ret);
+        return (ret_freq);
 }
 EXPORT_SYMBOL(cpufreq_quick_get);
 
@@ -961,7 +991,7 @@ EXPORT_SYMBOL(cpufreq_quick_get);
 unsigned int cpufreq_get(unsigned int cpu)
 {
         struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
-        unsigned int ret = 0;
+        unsigned int ret_freq = 0;
 
         if (!policy)
                 return 0;
@@ -971,12 +1001,14 @@ unsigned int cpufreq_get(unsigned int cpu)
 
         mutex_lock(&policy->lock);
 
-        ret = cpufreq_driver->get(cpu);
+        ret_freq = cpufreq_driver->get(cpu);
 
-        if (ret && policy->cur && !(cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)) {
-                /* verify no discrepancy between actual and saved value exists */
-                if (unlikely(ret != policy->cur)) {
-                        cpufreq_out_of_sync(cpu, policy->cur, ret);
+        if (ret_freq && policy->cur &&
+                !(cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)) {
+                /* verify no discrepancy between actual and
+                                        saved value exists */
+                if (unlikely(ret_freq != policy->cur)) {
+                        cpufreq_out_of_sync(cpu, policy->cur, ret_freq);
                         schedule_work(&policy->update);
                 }
         }
@@ -986,7 +1018,7 @@ unsigned int cpufreq_get(unsigned int cpu)
 out:
         cpufreq_cpu_put(policy);
 
-        return (ret);
+        return (ret_freq);
 }
 EXPORT_SYMBOL(cpufreq_get);
 
@@ -998,7 +1030,7 @@ EXPORT_SYMBOL(cpufreq_get);
 static int cpufreq_suspend(struct sys_device * sysdev, pm_message_t pmsg)
 {
         int cpu = sysdev->id;
-        unsigned int ret = 0;
+        int ret = 0;
         unsigned int cur_freq = 0;
         struct cpufreq_policy *cpu_policy;
 
@@ -1080,7 +1112,7 @@ out:
 static int cpufreq_resume(struct sys_device * sysdev)
 {
         int cpu = sysdev->id;
-        unsigned int ret = 0;
+        int ret = 0;
         struct cpufreq_policy *cpu_policy;
 
         dprintk("resuming cpu %u\n", cpu);
@@ -1276,22 +1308,45 @@ int cpufreq_driver_target(struct cpufreq_policy *policy,
 }
 EXPORT_SYMBOL_GPL(cpufreq_driver_target);
 
+int cpufreq_driver_getavg(struct cpufreq_policy *policy)
+{
+        int ret = 0;
+
+        policy = cpufreq_cpu_get(policy->cpu);
+        if (!policy)
+                return -EINVAL;
+
+        mutex_lock(&policy->lock);
+
+        if (cpu_online(policy->cpu) && cpufreq_driver->getavg)
+                ret = cpufreq_driver->getavg(policy->cpu);
+
+        mutex_unlock(&policy->lock);
+
+        cpufreq_cpu_put(policy);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(cpufreq_driver_getavg);
+
 /*
  * Locking: Must be called with the lock_cpu_hotplug() lock held
  * when "event" is CPUFREQ_GOV_LIMITS
  */
 
-static int __cpufreq_governor(struct cpufreq_policy *policy, unsigned int event)
+static int __cpufreq_governor(struct cpufreq_policy *policy,
+                                        unsigned int event)
 {
         int ret;
 
         if (!try_module_get(policy->governor->owner))
                 return -EINVAL;
 
-        dprintk("__cpufreq_governor for CPU %u, event %u\n", policy->cpu, event);
+        dprintk("__cpufreq_governor for CPU %u, event %u\n",
+                                                policy->cpu, event);
         ret = policy->governor->governor(policy, event);
 
-        /* we keep one module reference alive for each CPU governed by this CPU */
+        /* we keep one module reference alive for
+                        each CPU governed by this CPU */
         if ((event != CPUFREQ_GOV_START) || ret)
                 module_put(policy->governor->owner);
         if ((event == CPUFREQ_GOV_STOP) && !ret)
@@ -1367,9 +1422,12 @@ EXPORT_SYMBOL(cpufreq_get_policy);
 
 
 /*
+ * data   : current policy.
+ * policy : policy to be set.
  * Locking: Must be called with the lock_cpu_hotplug() lock held
  */
-static int __cpufreq_set_policy(struct cpufreq_policy *data, struct cpufreq_policy *policy)
+static int __cpufreq_set_policy(struct cpufreq_policy *data,
+                                struct cpufreq_policy *policy)
 {
         int ret = 0;
 
@@ -1377,7 +1435,8 @@ static int __cpufreq_set_policy(struct cpufreq_policy *data, struct cpufreq_poli
         dprintk("setting new policy for CPU %u: %u - %u kHz\n", policy->cpu,
                 policy->min, policy->max);
 
-        memcpy(&policy->cpuinfo, &data->cpuinfo, sizeof(struct cpufreq_cpuinfo));
+        memcpy(&policy->cpuinfo, &data->cpuinfo,
+                                sizeof(struct cpufreq_cpuinfo));
 
         if (policy->min > data->min && policy->min > policy->max) {
                 ret = -EINVAL;
@@ -1410,7 +1469,8 @@ static int __cpufreq_set_policy(struct cpufreq_policy *data, struct cpufreq_poli
         data->min = policy->min;
         data->max = policy->max;
 
-        dprintk("new min and max freqs are %u - %u kHz\n", data->min, data->max);
+        dprintk("new min and max freqs are %u - %u kHz\n",
+                                        data->min, data->max);
 
         if (cpufreq_driver->setpolicy) {
                 data->policy = policy->policy;
@@ -1431,10 +1491,12 @@ static int __cpufreq_set_policy(struct cpufreq_policy *data, struct cpufreq_poli
                         data->governor = policy->governor;
                         if (__cpufreq_governor(data, CPUFREQ_GOV_START)) {
                                 /* new governor failed, so re-start old one */
-                                dprintk("starting governor %s failed\n", data->governor->name);
+                                dprintk("starting governor %s failed\n",
+                                                        data->governor->name);
                                 if (old_gov) {
                                         data->governor = old_gov;
-                                        __cpufreq_governor(data, CPUFREQ_GOV_START);
+                                        __cpufreq_governor(data,
+                                                           CPUFREQ_GOV_START);
                                 }
                                 ret = -EINVAL;
                                 goto error_out;
@@ -1524,7 +1586,8 @@ int cpufreq_update_policy(unsigned int cpu)
                         data->cur = policy.cur;
                 } else {
                         if (data->cur != policy.cur)
-                                cpufreq_out_of_sync(cpu, data->cur, policy.cur);
+                                cpufreq_out_of_sync(cpu, data->cur,
+                                                                policy.cur);
                 }
         }
 
@@ -1626,8 +1689,10 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
 
                 /* if all ->init() calls failed, unregister */
                 if (ret) {
-                        dprintk("no CPU initialized for driver %s\n", driver_data->name);
-                        sysdev_driver_unregister(&cpu_sysdev_class, &cpufreq_sysdev_driver);
+                        dprintk("no CPU initialized for driver %s\n",
+                                                        driver_data->name);
+                        sysdev_driver_unregister(&cpu_sysdev_class,
+                                                &cpufreq_sysdev_driver);
 
                         spin_lock_irqsave(&cpufreq_driver_lock, flags);
                         cpufreq_driver = NULL;
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 5ef5ede5b884..eef0270c6f3d 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -44,15 +44,17 @@
  * latency of the processor. The governor will work on any processor with 
  * transition latency <= 10mS, using appropriate sampling 
  * rate.
- * For CPUs with transition latency > 10mS (mostly drivers with CPUFREQ_ETERNAL)
- * this governor will not work.
+ * For CPUs with transition latency > 10mS (mostly drivers
+ * with CPUFREQ_ETERNAL), this governor will not work.
  * All times here are in uS.
  */
 static unsigned int                             def_sampling_rate;
 #define MIN_SAMPLING_RATE_RATIO                 (2)
 /* for correct statistics, we need at least 10 ticks between each measure */
-#define MIN_STAT_SAMPLING_RATE                  (MIN_SAMPLING_RATE_RATIO * jiffies_to_usecs(10))
-#define MIN_SAMPLING_RATE                       (def_sampling_rate / MIN_SAMPLING_RATE_RATIO)
+#define MIN_STAT_SAMPLING_RATE                  \
+                        (MIN_SAMPLING_RATE_RATIO * jiffies_to_usecs(10))
+#define MIN_SAMPLING_RATE                       \
+                        (def_sampling_rate / MIN_SAMPLING_RATE_RATIO)
 #define MAX_SAMPLING_RATE                       (500 * def_sampling_rate)
 #define DEF_SAMPLING_RATE_LATENCY_MULTIPLIER    (1000)
 #define DEF_SAMPLING_DOWN_FACTOR                (1)
@@ -103,11 +105,16 @@ static struct dbs_tuners dbs_tuners_ins = {
 
 static inline unsigned int get_cpu_idle_time(unsigned int cpu)
 {
-        return  kstat_cpu(cpu).cpustat.idle +
+        unsigned int add_nice = 0, ret;
+
+        if (dbs_tuners_ins.ignore_nice)
+                add_nice = kstat_cpu(cpu).cpustat.nice;
+
+        ret =   kstat_cpu(cpu).cpustat.idle +
                 kstat_cpu(cpu).cpustat.iowait +
-                ( dbs_tuners_ins.ignore_nice ?
-                  kstat_cpu(cpu).cpustat.nice :
-                  0);
+                add_nice;
+
+        return ret;
 }
 
 /************************** sysfs interface ************************/
@@ -452,6 +459,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
         unsigned int cpu = policy->cpu;
         struct cpu_dbs_info_s *this_dbs_info;
         unsigned int j;
+        int rc;
 
         this_dbs_info = &per_cpu(cpu_dbs_info, cpu);
 
@@ -468,6 +476,13 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                         break;
                  
                 mutex_lock(&dbs_mutex);
+
+                rc = sysfs_create_group(&policy->kobj, &dbs_attr_group);
+                if (rc) {
+                        mutex_unlock(&dbs_mutex);
+                        return rc;
+                }
+
                 for_each_cpu_mask(j, policy->cpus) {
                         struct cpu_dbs_info_s *j_dbs_info;
                         j_dbs_info = &per_cpu(cpu_dbs_info, j);
@@ -480,7 +495,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                 this_dbs_info->enable = 1;
                 this_dbs_info->down_skip = 0;
                 this_dbs_info->requested_freq = policy->cur;
-                sysfs_create_group(&policy->kobj, &dbs_attr_group);
+
                 dbs_enable++;
                 /*
                  * Start the timerschedule work, when this governor
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index e1cc5113c2ae..f697449327c6 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -41,8 +41,10 @@
 static unsigned int def_sampling_rate;
 #define MIN_SAMPLING_RATE_RATIO                 (2)
 /* for correct statistics, we need at least 10 ticks between each measure */
-#define MIN_STAT_SAMPLING_RATE                  (MIN_SAMPLING_RATE_RATIO * jiffies_to_usecs(10))
-#define MIN_SAMPLING_RATE                       (def_sampling_rate / MIN_SAMPLING_RATE_RATIO)
+#define MIN_STAT_SAMPLING_RATE                  \
+                        (MIN_SAMPLING_RATE_RATIO * jiffies_to_usecs(10))
+#define MIN_SAMPLING_RATE                       \
+                        (def_sampling_rate / MIN_SAMPLING_RATE_RATIO)
 #define MAX_SAMPLING_RATE                       (500 * def_sampling_rate)
 #define DEF_SAMPLING_RATE_LATENCY_MULTIPLIER    (1000)
 #define TRANSITION_LATENCY_LIMIT                (10 * 1000)
@@ -206,7 +208,8 @@ static ssize_t store_sampling_rate(struct cpufreq_policy *unused,
         ret = sscanf(buf, "%u", &input);
 
         mutex_lock(&dbs_mutex);
-        if (ret != 1 || input > MAX_SAMPLING_RATE || input < MIN_SAMPLING_RATE) {
+        if (ret != 1 || input > MAX_SAMPLING_RATE
+                     || input < MIN_SAMPLING_RATE) {
                 mutex_unlock(&dbs_mutex);
                 return -EINVAL;
         }
@@ -397,8 +400,15 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)
          * policy. To be safe, we focus 10 points under the threshold.
          */
         if (load < (dbs_tuners_ins.up_threshold - 10)) {
-                unsigned int freq_next = (policy->cur * load) /
+                unsigned int freq_next, freq_cur;
+
+                freq_cur = cpufreq_driver_getavg(policy);
+                if (!freq_cur)
+                        freq_cur = policy->cur;
+
+                freq_next = (freq_cur * load) /
                         (dbs_tuners_ins.up_threshold - 10);
+
                 if (!dbs_tuners_ins.powersave_bias) {
                         __cpufreq_driver_target(policy, freq_next,
                                         CPUFREQ_RELATION_L);
@@ -472,6 +482,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
         unsigned int cpu = policy->cpu;
         struct cpu_dbs_info_s *this_dbs_info;
         unsigned int j;
+        int rc;
 
         this_dbs_info = &per_cpu(cpu_dbs_info, cpu);
 
@@ -494,12 +505,23 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                 if (dbs_enable == 1) {
                         kondemand_wq = create_workqueue("kondemand");
                         if (!kondemand_wq) {
-                                printk(KERN_ERR "Creation of kondemand failed\n");
+                                printk(KERN_ERR
+                                         "Creation of kondemand failed\n");
                                 dbs_enable--;
                                 mutex_unlock(&dbs_mutex);
                                 return -ENOSPC;
                         }
                 }
+
+                rc = sysfs_create_group(&policy->kobj, &dbs_attr_group);
+                if (rc) {
+                        if (dbs_enable == 1)
+                                destroy_workqueue(kondemand_wq);
+                        dbs_enable--;
+                        mutex_unlock(&dbs_mutex);
+                        return rc;
+                }
+
                 for_each_cpu_mask(j, policy->cpus) {
                         struct cpu_dbs_info_s *j_dbs_info;
                         j_dbs_info = &per_cpu(cpu_dbs_info, j);
@@ -509,7 +531,6 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                         j_dbs_info->prev_cpu_wall = get_jiffies_64();
                 }
                 this_dbs_info->enable = 1;
-                sysfs_create_group(&policy->kobj, &dbs_attr_group);
                 /*
                  * Start the timerschedule work, when this governor
                  * is used for first time
diff --git a/drivers/cpufreq/cpufreq_performance.c b/drivers/cpufreq/cpufreq_performance.c
index de91e3371ef8..e8e1451ef1c1 100644
--- a/drivers/cpufreq/cpufreq_performance.c
+++ b/drivers/cpufreq/cpufreq_performance.c
@@ -15,7 +15,8 @@
 #include <linux/cpufreq.h>
 #include <linux/init.h>
 
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_GOVERNOR, "performance", msg)
+#define dprintk(msg...) \
+        cpufreq_debug_printk(CPUFREQ_DEBUG_GOVERNOR, "performance", msg)
 
 
 static int cpufreq_governor_performance(struct cpufreq_policy *policy,
@@ -24,8 +25,10 @@ static int cpufreq_governor_performance(struct cpufreq_policy *policy,
         switch (event) {
         case CPUFREQ_GOV_START:
         case CPUFREQ_GOV_LIMITS:
-                dprintk("setting to %u kHz because of event %u\n", policy->max, event);
-                __cpufreq_driver_target(policy, policy->max, CPUFREQ_RELATION_H);
+                dprintk("setting to %u kHz because of event %u\n",
+                                                policy->max, event);
+                __cpufreq_driver_target(policy, policy->max,
+                                                CPUFREQ_RELATION_H);
                 break;
         default:
                 break;
diff --git a/drivers/cpufreq/cpufreq_powersave.c b/drivers/cpufreq/cpufreq_powersave.c
index 0a2596044e65..13fe06b94b0a 100644
--- a/drivers/cpufreq/cpufreq_powersave.c
+++ b/drivers/cpufreq/cpufreq_powersave.c
@@ -15,7 +15,8 @@
 #include <linux/cpufreq.h>
 #include <linux/init.h>
 
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_GOVERNOR, "powersave", msg)
+#define dprintk(msg...) \
+        cpufreq_debug_printk(CPUFREQ_DEBUG_GOVERNOR, "powersave", msg)
 
 static int cpufreq_governor_powersave(struct cpufreq_policy *policy,
                                         unsigned int event)
@@ -23,8 +24,10 @@ static int cpufreq_governor_powersave(struct cpufreq_policy *policy,
         switch (event) {
         case CPUFREQ_GOV_START:
         case CPUFREQ_GOV_LIMITS:
-                dprintk("setting to %u kHz because of event %u\n", policy->min, event);
-                __cpufreq_driver_target(policy, policy->min, CPUFREQ_RELATION_L);
+                dprintk("setting to %u kHz because of event %u\n",
+                                                        policy->min, event);
+                __cpufreq_driver_target(policy, policy->min,
+                                                CPUFREQ_RELATION_L);
                 break;
         default:
                 break;
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index c2ecc599dc5f..6742b1adf2c8 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -351,8 +351,8 @@ __init cpufreq_stats_init(void)
 
         register_hotcpu_notifier(&cpufreq_stat_cpu_notifier);
         for_each_online_cpu(cpu) {
-                cpufreq_stat_cpu_callback(&cpufreq_stat_cpu_notifier, CPU_ONLINE,
-                        (void *)(long)cpu);
+                cpufreq_stat_cpu_callback(&cpufreq_stat_cpu_notifier,
+                                CPU_ONLINE, (void *)(long)cpu);
         }
         return 0;
 }
@@ -368,14 +368,15 @@ __exit cpufreq_stats_exit(void)
         unregister_hotcpu_notifier(&cpufreq_stat_cpu_notifier);
         lock_cpu_hotplug();
         for_each_online_cpu(cpu) {
-                cpufreq_stat_cpu_callback(&cpufreq_stat_cpu_notifier, CPU_DEAD,
-                        (void *)(long)cpu);
+                cpufreq_stat_cpu_callback(&cpufreq_stat_cpu_notifier,
+                                                CPU_DEAD, (void *)(long)cpu);
         }
         unlock_cpu_hotplug();
 }
 
 MODULE_AUTHOR ("Zou Nan hai <nanhai.zou@intel.com>");
-MODULE_DESCRIPTION ("'cpufreq_stats' - A driver to export cpufreq stats through sysfs filesystem");
+MODULE_DESCRIPTION ("'cpufreq_stats' - A driver to export cpufreq stats"
+                                "through sysfs filesystem");
 MODULE_LICENSE ("GPL");
 
 module_init(cpufreq_stats_init);
diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c
index a06c204589cd..2a4eb0bfaf30 100644
--- a/drivers/cpufreq/cpufreq_userspace.c
+++ b/drivers/cpufreq/cpufreq_userspace.c
@@ -131,19 +131,26 @@ static int cpufreq_governor_userspace(struct cpufreq_policy *policy,
                                    unsigned int event)
 {
         unsigned int cpu = policy->cpu;
+        int rc = 0;
+
         switch (event) {
         case CPUFREQ_GOV_START:
                 if (!cpu_online(cpu))
                         return -EINVAL;
                 BUG_ON(!policy->cur);
                 mutex_lock(&userspace_mutex);
+                rc = sysfs_create_file (&policy->kobj,
+                                        &freq_attr_scaling_setspeed.attr);
+                if (rc)
+                        goto start_out;
+
                 cpu_is_managed[cpu] = 1;
                 cpu_min_freq[cpu] = policy->min;
                 cpu_max_freq[cpu] = policy->max;
                 cpu_cur_freq[cpu] = policy->cur;
                 cpu_set_freq[cpu] = policy->cur;
-                sysfs_create_file (&policy->kobj, &freq_attr_scaling_setspeed.attr);
                 dprintk("managing cpu %u started (%u - %u kHz, currently %u kHz)\n", cpu, cpu_min_freq[cpu], cpu_max_freq[cpu], cpu_cur_freq[cpu]);
+start_out:
                 mutex_unlock(&userspace_mutex);
                 break;
         case CPUFREQ_GOV_STOP:
@@ -180,7 +187,7 @@ static int cpufreq_governor_userspace(struct cpufreq_policy *policy,
                 mutex_unlock(&userspace_mutex);
                 break;
         }
-        return 0;
+        return rc;
 }
 
 
diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
index 551f4ccf87fd..e7490925fdcf 100644
--- a/drivers/cpufreq/freq_table.c
+++ b/drivers/cpufreq/freq_table.c
@@ -9,7 +9,8 @@
 #include <linux/init.h>
 #include <linux/cpufreq.h>
 
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_CORE, "freq-table", msg)
+#define dprintk(msg...) \
+        cpufreq_debug_printk(CPUFREQ_DEBUG_CORE, "freq-table", msg)
 
 /*********************************************************************
  *                     FREQUENCY TABLE HELPERS                       *
@@ -29,7 +30,8 @@ int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
 
                         continue;
                 }
-                dprintk("table entry %u: %u kHz, %u index\n", i, freq, table[i].index);
+                dprintk("table entry %u: %u kHz, %u index\n",
+                                        i, freq, table[i].index);
                 if (freq < min_freq)
                         min_freq = freq;
                 if (freq > max_freq)
@@ -54,13 +56,14 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,
         unsigned int i;
         unsigned int count = 0;
 
-        dprintk("request for verification of policy (%u - %u kHz) for cpu %u\n", policy->min, policy->max, policy->cpu);
+        dprintk("request for verification of policy (%u - %u kHz) for cpu %u\n",
+                                        policy->min, policy->max, policy->cpu);
 
         if (!cpu_online(policy->cpu))
                 return -EINVAL;
 
-        cpufreq_verify_within_limits(policy,
-                                     policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);
+        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
+                                     policy->cpuinfo.max_freq);
 
         for (i=0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {
                 unsigned int freq = table[i].frequency;
@@ -75,10 +78,11 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,
         if (!count)
                 policy->max = next_larger;
 
-        cpufreq_verify_within_limits(policy,
-                                     policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);
+        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
+                                     policy->cpuinfo.max_freq);
 
-        dprintk("verification lead to (%u - %u kHz) for cpu %u\n", policy->min, policy->max, policy->cpu);
+        dprintk("verification lead to (%u - %u kHz) for cpu %u\n",
+                                policy->min, policy->max, policy->cpu);
 
         return 0;
 }
@@ -101,7 +105,8 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
         };
         unsigned int i;
 
-        dprintk("request for target %u kHz (relation: %u) for cpu %u\n", target_freq, relation, policy->cpu);
+        dprintk("request for target %u kHz (relation: %u) for cpu %u\n",
+                                        target_freq, relation, policy->cpu);
 
         switch (relation) {
         case CPUFREQ_RELATION_H:
@@ -192,7 +197,10 @@ static ssize_t show_available_freqs (struct cpufreq_policy *policy, char *buf)
 }
 
 struct freq_attr cpufreq_freq_attr_scaling_available_freqs = {
-        .attr = { .name = "scaling_available_frequencies", .mode = 0444, .owner=THIS_MODULE },
+        .attr = { .name = "scaling_available_frequencies",
+                  .mode = 0444,
+                  .owner=THIS_MODULE
+                },
         .show = show_available_freqs,
 };
 EXPORT_SYMBOL_GPL(cpufreq_freq_attr_scaling_available_freqs);
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index ca4e67a022d0..22b62b3cd14e 100644
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -266,7 +266,7 @@ static void fcp_report_map_done(fc_channel *fc, int i, int status)
                         printk ("FC: Bad magic from REPORT_AL_MAP on %s - %08x\n", fc->name, p->magic);
                         fc->state = FC_STATE_OFFLINE;
                 } else {
-                        fc->posmap = (fcp_posmap *)kzalloc(sizeof(fcp_posmap)+p->len, GFP_KERNEL);
+                        fc->posmap = kzalloc(sizeof(fcp_posmap)+p->len, GFP_KERNEL);
                         if (!fc->posmap) {
                                 printk("FC: Not enough memory, offlining channel\n");
                                 fc->state = FC_STATE_OFFLINE;
@@ -355,7 +355,7 @@ void fcp_register(fc_channel *fc, u8 type, int unregister)
                         for (i = fc->can_queue; i < fc->scsi_bitmap_end; i++)
                                 set_bit (i, fc->scsi_bitmap);
                         fc->scsi_free = fc->can_queue;
-                        fc->cmd_slots = (fcp_cmnd **)kzalloc(slots * sizeof(fcp_cmnd*), GFP_KERNEL);
+                        fc->cmd_slots = kzalloc(slots * sizeof(fcp_cmnd*), GFP_KERNEL);
                         fc->abort_count = 0;
                 } else {
                         fc->scsi_name[0] = 0;
@@ -933,7 +933,7 @@ int fcp_scsi_dev_reset(struct scsi_cmnd *SCpnt)
         DECLARE_MUTEX_LOCKED(sem);
 
         if (!fc->rst_pkt) {
-                fc->rst_pkt = (struct scsi_cmnd *) kmalloc(sizeof(SCpnt), GFP_KERNEL);
+                fc->rst_pkt = kmalloc(sizeof(SCpnt), GFP_KERNEL);
                 if (!fc->rst_pkt) return FAILED;
                 
                 fcmd = FCP_CMND(fc->rst_pkt);
@@ -1107,7 +1107,7 @@ int fc_do_plogi(fc_channel *fc, unsigned char alpa, fc_wwn *node, fc_wwn *nport)
         logi *l;
         int status;
 
-        l = (logi *)kzalloc(2 * sizeof(logi), GFP_KERNEL);
+        l = kzalloc(2 * sizeof(logi), GFP_KERNEL);
         if (!l) return -ENOMEM;
         l->code = LS_PLOGI;
         memcpy (&l->nport_wwn, &fc->wwn_nport, sizeof(fc_wwn));
@@ -1141,7 +1141,7 @@ int fc_do_prli(fc_channel *fc, unsigned char alpa)
         prli *p;
         int status;
 
-        p = (prli *)kzalloc(2 * sizeof(prli), GFP_KERNEL);
+        p = kzalloc(2 * sizeof(prli), GFP_KERNEL);
         if (!p) return -ENOMEM;
         p->code = LS_PRLI;
         p->params[0] = 0x08002000;
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index e76d91906c99..891ef6d0b1bf 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -106,6 +106,31 @@ config SENSORS_K8TEMP
           This driver can also be built as a module.  If so, the module
           will be called k8temp.
 
+config SENSORS_AMS
+        tristate "Apple Motion Sensor driver"
+        depends on HWMON && PPC_PMAC && !PPC64 && INPUT && ((ADB_PMU && I2C = y) || (ADB_PMU && !I2C) || I2C) && EXPERIMENTAL
+        help
+          Support for the motion sensor included in PowerBooks. Includes
+          implementations for PMU and I2C.
+
+          This driver can also be built as a module. If so, the module
+          will be called ams.
+
+config SENSORS_AMS_PMU
+        bool "PMU variant"
+        depends on SENSORS_AMS && ADB_PMU
+        default y
+        help
+          PMU variant of motion sensor, found in late 2005 PowerBooks.
+
+config SENSORS_AMS_I2C
+        bool "I2C variant"
+        depends on SENSORS_AMS && I2C
+        default y
+        help
+          I2C variant of motion sensor, found in early 2005 PowerBooks and
+          iBooks.
+
 config SENSORS_ASB100
         tristate "Asus ASB100 Bach"
         depends on HWMON && I2C && EXPERIMENTAL
@@ -142,11 +167,12 @@ config SENSORS_DS1621
           will be called ds1621.
 
 config SENSORS_F71805F
-        tristate "Fintek F71805F/FG"
+        tristate "Fintek F71805F/FG and F71872F/FG"
         depends on HWMON && EXPERIMENTAL
         help
           If you say yes here you get support for hardware monitoring
-          features of the Fintek F71805F/FG chips.
+          features of the Fintek F71805F/FG and F71872F/FG Super-I/O
+          chips.
 
           This driver can also be built as a module.  If so, the module
           will be called f71805f.
@@ -353,6 +379,19 @@ config SENSORS_PC87360
           This driver can also be built as a module.  If so, the module
           will be called pc87360.
 
+config SENSORS_PC87427
+        tristate "National Semiconductor PC87427"
+        depends on HWMON && EXPERIMENTAL
+        help
+          If you say yes here you get access to the hardware monitoring
+          functions of the National Semiconductor PC87427 Super-I/O chip.
+          The chip has two distinct logical devices, one for fan speed
+          monitoring and control, and one for voltage and temperature
+          monitoring. Only fan speed monitoring is supported right now.
+
+          This driver can also be built as a module.  If so, the module
+          will be called pc87427.
+
 config SENSORS_SIS5595
         tristate "Silicon Integrated Systems Corp. SiS5595"
         depends on HWMON && I2C && PCI && EXPERIMENTAL
@@ -474,6 +513,16 @@ config SENSORS_W83792D
           This driver can also be built as a module.  If so, the module
           will be called w83792d.
 
+config SENSORS_W83793
+        tristate "Winbond W83793"
+        depends on HWMON && I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for the Winbond W83793
+          hardware monitoring chip.
+
+          This driver can also be built as a module.  If so, the module
+          will be called w83793.
+
 config SENSORS_W83L785TS
         tristate "Winbond W83L785TS-S"
         depends on HWMON && I2C && EXPERIMENTAL
@@ -527,6 +576,9 @@ config SENSORS_HDAPS
           This driver also provides an absolute input class device, allowing
           the laptop to act as a pinball machine-esque joystick.
 
+          If your ThinkPad is not recognized by the driver, please update to latest
+          BIOS. This is especially the case for some R52 ThinkPads.
+
           Say Y here if you have an applicable laptop and want to experience
           the awesome power of hdaps.
 
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index af01cc64f7d2..31661124271e 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_HWMON_VID)		+= hwmon-vid.o
 obj-$(CONFIG_SENSORS_ASB100)    += asb100.o
 obj-$(CONFIG_SENSORS_W83627HF)  += w83627hf.o
 obj-$(CONFIG_SENSORS_W83792D)   += w83792d.o
+obj-$(CONFIG_SENSORS_W83793)    += w83793.o
 obj-$(CONFIG_SENSORS_W83781D)   += w83781d.o
 obj-$(CONFIG_SENSORS_W83791D)   += w83791d.o
 
@@ -18,6 +19,7 @@ obj-$(CONFIG_SENSORS_ADM1025)	+= adm1025.o
 obj-$(CONFIG_SENSORS_ADM1026)   += adm1026.o
 obj-$(CONFIG_SENSORS_ADM1031)   += adm1031.o
 obj-$(CONFIG_SENSORS_ADM9240)   += adm9240.o
+obj-$(CONFIG_SENSORS_AMS)       += ams/
 obj-$(CONFIG_SENSORS_ATXP1)     += atxp1.o
 obj-$(CONFIG_SENSORS_DS1621)    += ds1621.o
 obj-$(CONFIG_SENSORS_F71805F)   += f71805f.o
@@ -41,6 +43,7 @@ obj-$(CONFIG_SENSORS_LM90)	+= lm90.o
 obj-$(CONFIG_SENSORS_LM92)      += lm92.o
 obj-$(CONFIG_SENSORS_MAX1619)   += max1619.o
 obj-$(CONFIG_SENSORS_PC87360)   += pc87360.o
+obj-$(CONFIG_SENSORS_PC87427)   += pc87427.o
 obj-$(CONFIG_SENSORS_SIS5595)   += sis5595.o
 obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
 obj-$(CONFIG_SENSORS_SMSC47M1)  += smsc47m1.o
diff --git a/drivers/hwmon/ams/Makefile b/drivers/hwmon/ams/Makefile
new file mode 100644
index 000000000000..41c95b2089dc
--- /dev/null
+++ b/drivers/hwmon/ams/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for Apple Motion Sensor driver
+#
+
+ams-y                                   := ams-core.o ams-input.o
+ams-$(CONFIG_SENSORS_AMS_PMU)           += ams-pmu.o
+ams-$(CONFIG_SENSORS_AMS_I2C)           += ams-i2c.o
+obj-$(CONFIG_SENSORS_AMS)               += ams.o
diff --git a/drivers/hwmon/ams/ams-core.c b/drivers/hwmon/ams/ams-core.c
new file mode 100644
index 000000000000..f1f0f5d0442c
--- /dev/null
+++ b/drivers/hwmon/ams/ams-core.c
@@ -0,0 +1,265 @@
+/*
+ * Apple Motion Sensor driver
+ *
+ * Copyright (C) 2005 Stelian Pop (stelian@popies.net)
+ * Copyright (C) 2006 Michael Hanselmann (linux-kernel@hansmi.ch)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <asm/pmac_pfunc.h>
+#include <asm/of_platform.h>
+
+#include "ams.h"
+
+/* There is only one motion sensor per machine */
+struct ams ams_info;
+
+static unsigned int verbose;
+module_param(verbose, bool, 0644);
+MODULE_PARM_DESC(verbose, "Show free falls and shocks in kernel output");
+
+/* Call with ams_info.lock held! */
+void ams_sensors(s8 *x, s8 *y, s8 *z)
+{
+        u32 orient = ams_info.vflag? ams_info.orient1 : ams_info.orient2;
+
+        if (orient & 0x80)
+                /* X and Y swapped */
+                ams_info.get_xyz(y, x, z);
+        else
+                ams_info.get_xyz(x, y, z);
+
+        if (orient & 0x04)
+                *z = ~(*z);
+        if (orient & 0x02)
+                *y = ~(*y);
+        if (orient & 0x01)
+                *x = ~(*x);
+}
+
+static ssize_t ams_show_current(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        s8 x, y, z;
+
+        mutex_lock(&ams_info.lock);
+        ams_sensors(&x, &y, &z);
+        mutex_unlock(&ams_info.lock);
+
+        return snprintf(buf, PAGE_SIZE, "%d %d %d\n", x, y, z);
+}
+
+static DEVICE_ATTR(current, S_IRUGO, ams_show_current, NULL);
+
+static void ams_handle_irq(void *data)
+{
+        enum ams_irq irq = *((enum ams_irq *)data);
+
+        spin_lock(&ams_info.irq_lock);
+
+        ams_info.worker_irqs |= irq;
+        schedule_work(&ams_info.worker);
+
+        spin_unlock(&ams_info.irq_lock);
+}
+
+static enum ams_irq ams_freefall_irq_data = AMS_IRQ_FREEFALL;
+static struct pmf_irq_client ams_freefall_client = {
+        .owner = THIS_MODULE,
+        .handler = ams_handle_irq,
+        .data = &ams_freefall_irq_data,
+};
+
+static enum ams_irq ams_shock_irq_data = AMS_IRQ_SHOCK;
+static struct pmf_irq_client ams_shock_client = {
+        .owner = THIS_MODULE,
+        .handler = ams_handle_irq,
+        .data = &ams_shock_irq_data,
+};
+
+/* Once hard disk parking is implemented in the kernel, this function can
+ * trigger it.
+ */
+static void ams_worker(struct work_struct *work)
+{
+        mutex_lock(&ams_info.lock);
+
+        if (ams_info.has_device) {
+                unsigned long flags;
+
+                spin_lock_irqsave(&ams_info.irq_lock, flags);
+
+                if (ams_info.worker_irqs & AMS_IRQ_FREEFALL) {
+                        if (verbose)
+                                printk(KERN_INFO "ams: freefall detected!\n");
+
+                        ams_info.worker_irqs &= ~AMS_IRQ_FREEFALL;
+
+                        /* we must call this with interrupts enabled */
+                        spin_unlock_irqrestore(&ams_info.irq_lock, flags);
+                        ams_info.clear_irq(AMS_IRQ_FREEFALL);
+                        spin_lock_irqsave(&ams_info.irq_lock, flags);
+                }
+
+                if (ams_info.worker_irqs & AMS_IRQ_SHOCK) {
+                        if (verbose)
+                                printk(KERN_INFO "ams: shock detected!\n");
+
+                        ams_info.worker_irqs &= ~AMS_IRQ_SHOCK;
+
+                        /* we must call this with interrupts enabled */
+                        spin_unlock_irqrestore(&ams_info.irq_lock, flags);
+                        ams_info.clear_irq(AMS_IRQ_SHOCK);
+                        spin_lock_irqsave(&ams_info.irq_lock, flags);
+                }
+
+                spin_unlock_irqrestore(&ams_info.irq_lock, flags);
+        }
+
+        mutex_unlock(&ams_info.lock);
+}
+
+/* Call with ams_info.lock held! */
+int ams_sensor_attach(void)
+{
+        int result;
+        u32 *prop;
+
+        /* Get orientation */
+        prop = (u32*)get_property(ams_info.of_node, "orientation", NULL);
+        if (!prop)
+                return -ENODEV;
+        ams_info.orient1 = *prop;
+        ams_info.orient2 = *(prop + 1);
+
+        /* Register freefall interrupt handler */
+        result = pmf_register_irq_client(ams_info.of_node,
+                        "accel-int-1",
+                        &ams_freefall_client);
+        if (result < 0)
+                return -ENODEV;
+
+        /* Reset saved irqs */
+        ams_info.worker_irqs = 0;
+
+        /* Register shock interrupt handler */
+        result = pmf_register_irq_client(ams_info.of_node,
+                        "accel-int-2",
+                        &ams_shock_client);
+        if (result < 0)
+                goto release_freefall;
+
+        /* Create device */
+        ams_info.of_dev = of_platform_device_create(ams_info.of_node, "ams", NULL);
+        if (!ams_info.of_dev) {
+                result = -ENODEV;
+                goto release_shock;
+        }
+
+        /* Create attributes */
+        result = device_create_file(&ams_info.of_dev->dev, &dev_attr_current);
+        if (result)
+                goto release_of;
+
+        ams_info.vflag = !!(ams_info.get_vendor() & 0x10);
+
+        /* Init input device */
+        result = ams_input_init();
+        if (result)
+                goto release_device_file;
+
+        return result;
+release_device_file:
+        device_remove_file(&ams_info.of_dev->dev, &dev_attr_current);
+release_of:
+        of_device_unregister(ams_info.of_dev);
+release_shock:
+        pmf_unregister_irq_client(&ams_shock_client);
+release_freefall:
+        pmf_unregister_irq_client(&ams_freefall_client);
+        return result;
+}
+
+int __init ams_init(void)
+{
+        struct device_node *np;
+
+        spin_lock_init(&ams_info.irq_lock);
+        mutex_init(&ams_info.lock);
+        INIT_WORK(&ams_info.worker, ams_worker);
+
+#ifdef CONFIG_SENSORS_AMS_I2C
+        np = of_find_node_by_name(NULL, "accelerometer");
+        if (np && device_is_compatible(np, "AAPL,accelerometer_1"))
+                /* Found I2C motion sensor */
+                return ams_i2c_init(np);
+#endif
+
+#ifdef CONFIG_SENSORS_AMS_PMU
+        np = of_find_node_by_name(NULL, "sms");
+        if (np && device_is_compatible(np, "sms"))
+                /* Found PMU motion sensor */
+                return ams_pmu_init(np);
+#endif
+
+        printk(KERN_ERR "ams: No motion sensor found.\n");
+
+        return -ENODEV;
+}
+
+void ams_exit(void)
+{
+        mutex_lock(&ams_info.lock);
+
+        if (ams_info.has_device) {
+                /* Remove input device */
+                ams_input_exit();
+
+                /* Shut down implementation */
+                ams_info.exit();
+
+                /* Flush interrupt worker
+                 *
+                 * We do this after ams_info.exit(), because an interrupt might
+                 * have arrived before disabling them.
+                 */
+                flush_scheduled_work();
+
+                /* Remove attributes */
+                device_remove_file(&ams_info.of_dev->dev, &dev_attr_current);
+
+                /* Remove device */
+                of_device_unregister(ams_info.of_dev);
+
+                /* Remove handler */
+                pmf_unregister_irq_client(&ams_shock_client);
+                pmf_unregister_irq_client(&ams_freefall_client);
+        }
+
+        mutex_unlock(&ams_info.lock);
+}
+
+MODULE_AUTHOR("Stelian Pop, Michael Hanselmann");
+MODULE_DESCRIPTION("Apple Motion Sensor driver");
+MODULE_LICENSE("GPL");
+
+module_init(ams_init);
+module_exit(ams_exit);
diff --git a/drivers/hwmon/ams/ams-i2c.c b/drivers/hwmon/ams/ams-i2c.c
new file mode 100644
index 000000000000..0d24bdfea53e
--- /dev/null
+++ b/drivers/hwmon/ams/ams-i2c.c
@@ -0,0 +1,299 @@
+/*
+ * Apple Motion Sensor driver (I2C variant)
+ *
+ * Copyright (C) 2005 Stelian Pop (stelian@popies.net)
+ * Copyright (C) 2006 Michael Hanselmann (linux-kernel@hansmi.ch)
+ *
+ * Clean room implementation based on the reverse engineered Mac OS X driver by
+ * Johannes Berg <johannes@sipsolutions.net>, documentation available at
+ * http://johannes.sipsolutions.net/PowerBook/Apple_Motion_Sensor_Specification
+ *
+ * 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.
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+
+#include "ams.h"
+
+/* AMS registers */
+#define AMS_COMMAND     0x00    /* command register */
+#define AMS_STATUS      0x01    /* status register */
+#define AMS_CTRL1       0x02    /* read control 1 (number of values) */
+#define AMS_CTRL2       0x03    /* read control 2 (offset?) */
+#define AMS_CTRL3       0x04    /* read control 3 (size of each value?) */
+#define AMS_DATA1       0x05    /* read data 1 */
+#define AMS_DATA2       0x06    /* read data 2 */
+#define AMS_DATA3       0x07    /* read data 3 */
+#define AMS_DATA4       0x08    /* read data 4 */
+#define AMS_DATAX       0x20    /* data X */
+#define AMS_DATAY       0x21    /* data Y */
+#define AMS_DATAZ       0x22    /* data Z */
+#define AMS_FREEFALL    0x24    /* freefall int control */
+#define AMS_SHOCK       0x25    /* shock int control */
+#define AMS_SENSLOW     0x26    /* sensitivity low limit */
+#define AMS_SENSHIGH    0x27    /* sensitivity high limit */
+#define AMS_CTRLX       0x28    /* control X */
+#define AMS_CTRLY       0x29    /* control Y */
+#define AMS_CTRLZ       0x2A    /* control Z */
+#define AMS_UNKNOWN1    0x2B    /* unknown 1 */
+#define AMS_UNKNOWN2    0x2C    /* unknown 2 */
+#define AMS_UNKNOWN3    0x2D    /* unknown 3 */
+#define AMS_VENDOR      0x2E    /* vendor */
+
+/* AMS commands - use with the AMS_COMMAND register */
+enum ams_i2c_cmd {
+        AMS_CMD_NOOP = 0,
+        AMS_CMD_VERSION,
+        AMS_CMD_READMEM,
+        AMS_CMD_WRITEMEM,
+        AMS_CMD_ERASEMEM,
+        AMS_CMD_READEE,
+        AMS_CMD_WRITEEE,
+        AMS_CMD_RESET,
+        AMS_CMD_START,
+};
+
+static int ams_i2c_attach(struct i2c_adapter *adapter);
+static int ams_i2c_detach(struct i2c_adapter *adapter);
+
+static struct i2c_driver ams_i2c_driver = {
+        .driver = {
+                .name   = "ams",
+                .owner  = THIS_MODULE,
+        },
+        .attach_adapter = ams_i2c_attach,
+        .detach_adapter = ams_i2c_detach,
+};
+
+static s32 ams_i2c_read(u8 reg)
+{
+        return i2c_smbus_read_byte_data(&ams_info.i2c_client, reg);
+}
+
+static int ams_i2c_write(u8 reg, u8 value)
+{
+        return i2c_smbus_write_byte_data(&ams_info.i2c_client, reg, value);
+}
+
+static int ams_i2c_cmd(enum ams_i2c_cmd cmd)
+{
+        s32 result;
+        int remaining = HZ / 20;
+
+        ams_i2c_write(AMS_COMMAND, cmd);
+        mdelay(5);
+
+        while (remaining) {
+                result = ams_i2c_read(AMS_COMMAND);
+                if (result == 0 || result & 0x80)
+                        return 0;
+
+                remaining = schedule_timeout(remaining);
+        }
+
+        return -1;
+}
+
+static void ams_i2c_set_irq(enum ams_irq reg, char enable)
+{
+        if (reg & AMS_IRQ_FREEFALL) {
+                u8 val = ams_i2c_read(AMS_CTRLX);
+                if (enable)
+                        val |= 0x80;
+                else
+                        val &= ~0x80;
+                ams_i2c_write(AMS_CTRLX, val);
+        }
+
+        if (reg & AMS_IRQ_SHOCK) {
+                u8 val = ams_i2c_read(AMS_CTRLY);
+                if (enable)
+                        val |= 0x80;
+                else
+                        val &= ~0x80;
+                ams_i2c_write(AMS_CTRLY, val);
+        }
+
+        if (reg & AMS_IRQ_GLOBAL) {
+                u8 val = ams_i2c_read(AMS_CTRLZ);
+                if (enable)
+                        val |= 0x80;
+                else
+                        val &= ~0x80;
+                ams_i2c_write(AMS_CTRLZ, val);
+        }
+}
+
+static void ams_i2c_clear_irq(enum ams_irq reg)
+{
+        if (reg & AMS_IRQ_FREEFALL)
+                ams_i2c_write(AMS_FREEFALL, 0);
+
+        if (reg & AMS_IRQ_SHOCK)
+                ams_i2c_write(AMS_SHOCK, 0);
+}
+
+static u8 ams_i2c_get_vendor(void)
+{
+        return ams_i2c_read(AMS_VENDOR);
+}
+
+static void ams_i2c_get_xyz(s8 *x, s8 *y, s8 *z)
+{
+        *x = ams_i2c_read(AMS_DATAX);
+        *y = ams_i2c_read(AMS_DATAY);
+        *z = ams_i2c_read(AMS_DATAZ);
+}
+
+static int ams_i2c_attach(struct i2c_adapter *adapter)
+{
+        unsigned long bus;
+        int vmaj, vmin;
+        int result;
+
+        /* There can be only one */
+        if (unlikely(ams_info.has_device))
+                return -ENODEV;
+
+        if (strncmp(adapter->name, "uni-n", 5))
+                return -ENODEV;
+
+        bus = simple_strtoul(adapter->name + 6, NULL, 10);
+        if (bus != ams_info.i2c_bus)
+                return -ENODEV;
+
+        ams_info.i2c_client.addr = ams_info.i2c_address;
+        ams_info.i2c_client.adapter = adapter;
+        ams_info.i2c_client.driver = &ams_i2c_driver;
+        strcpy(ams_info.i2c_client.name, "Apple Motion Sensor");
+
+        if (ams_i2c_cmd(AMS_CMD_RESET)) {
+                printk(KERN_INFO "ams: Failed to reset the device\n");
+                return -ENODEV;
+        }
+
+        if (ams_i2c_cmd(AMS_CMD_START)) {
+                printk(KERN_INFO "ams: Failed to start the device\n");
+                return -ENODEV;
+        }
+
+        /* get version/vendor information */
+        ams_i2c_write(AMS_CTRL1, 0x02);
+        ams_i2c_write(AMS_CTRL2, 0x85);
+        ams_i2c_write(AMS_CTRL3, 0x01);
+
+        ams_i2c_cmd(AMS_CMD_READMEM);
+
+        vmaj = ams_i2c_read(AMS_DATA1);
+        vmin = ams_i2c_read(AMS_DATA2);
+        if (vmaj != 1 || vmin != 52) {
+                printk(KERN_INFO "ams: Incorrect device version (%d.%d)\n",
+                        vmaj, vmin);
+                return -ENODEV;
+        }
+
+        ams_i2c_cmd(AMS_CMD_VERSION);
+
+        vmaj = ams_i2c_read(AMS_DATA1);
+        vmin = ams_i2c_read(AMS_DATA2);
+        if (vmaj != 0 || vmin != 1) {
+                printk(KERN_INFO "ams: Incorrect firmware version (%d.%d)\n",
+                        vmaj, vmin);
+                return -ENODEV;
+        }
+
+        /* Disable interrupts */
+        ams_i2c_set_irq(AMS_IRQ_ALL, 0);
+
+        result = ams_sensor_attach();
+        if (result < 0)
+                return result;
+
+        /* Set default values */
+        ams_i2c_write(AMS_SENSLOW, 0x15);
+        ams_i2c_write(AMS_SENSHIGH, 0x60);
+        ams_i2c_write(AMS_CTRLX, 0x08);
+        ams_i2c_write(AMS_CTRLY, 0x0F);
+        ams_i2c_write(AMS_CTRLZ, 0x4F);
+        ams_i2c_write(AMS_UNKNOWN1, 0x14);
+
+        /* Clear interrupts */
+        ams_i2c_clear_irq(AMS_IRQ_ALL);
+
+        ams_info.has_device = 1;
+
+        /* Enable interrupts */
+        ams_i2c_set_irq(AMS_IRQ_ALL, 1);
+
+        printk(KERN_INFO "ams: Found I2C based motion sensor\n");
+
+        return 0;
+}
+
+static int ams_i2c_detach(struct i2c_adapter *adapter)
+{
+        if (ams_info.has_device) {
+                /* Disable interrupts */
+                ams_i2c_set_irq(AMS_IRQ_ALL, 0);
+
+                /* Clear interrupts */
+                ams_i2c_clear_irq(AMS_IRQ_ALL);
+
+                printk(KERN_INFO "ams: Unloading\n");
+
+                ams_info.has_device = 0;
+        }
+
+        return 0;
+}
+
+static void ams_i2c_exit(void)
+{
+        i2c_del_driver(&ams_i2c_driver);
+}
+
+int __init ams_i2c_init(struct device_node *np)
+{
+        char *tmp_bus;
+        int result;
+        u32 *prop;
+
+        mutex_lock(&ams_info.lock);
+
+        /* Set implementation stuff */
+        ams_info.of_node = np;
+        ams_info.exit = ams_i2c_exit;
+        ams_info.get_vendor = ams_i2c_get_vendor;
+        ams_info.get_xyz = ams_i2c_get_xyz;
+        ams_info.clear_irq = ams_i2c_clear_irq;
+        ams_info.bustype = BUS_I2C;
+
+        /* look for bus either using "reg" or by path */
+        prop = (u32*)get_property(ams_info.of_node, "reg", NULL);
+        if (!prop) {
+                result = -ENODEV;
+
+                goto exit;
+        }
+
+        tmp_bus = strstr(ams_info.of_node->full_name, "/i2c-bus@");
+        if (tmp_bus)
+                ams_info.i2c_bus = *(tmp_bus + 9) - '0';
+        else
+                ams_info.i2c_bus = ((*prop) >> 8) & 0x0f;
+        ams_info.i2c_address = ((*prop) & 0xff) >> 1;
+
+        result = i2c_add_driver(&ams_i2c_driver);
+
+exit:
+        mutex_unlock(&ams_info.lock);
+
+        return result;
+}
diff --git a/drivers/hwmon/ams/ams-input.c b/drivers/hwmon/ams/ams-input.c
new file mode 100644
index 000000000000..f126aa485134
--- /dev/null
+++ b/drivers/hwmon/ams/ams-input.c
@@ -0,0 +1,160 @@
+/*
+ * Apple Motion Sensor driver (joystick emulation)
+ *
+ * Copyright (C) 2005 Stelian Pop (stelian@popies.net)
+ * Copyright (C) 2006 Michael Hanselmann (linux-kernel@hansmi.ch)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/module.h>
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+
+#include "ams.h"
+
+static unsigned int joystick;
+module_param(joystick, bool, 0644);
+MODULE_PARM_DESC(joystick, "Enable the input class device on module load");
+
+static unsigned int invert;
+module_param(invert, bool, 0644);
+MODULE_PARM_DESC(invert, "Invert input data on X and Y axis");
+
+static int ams_input_kthread(void *data)
+{
+        s8 x, y, z;
+
+        while (!kthread_should_stop()) {
+                mutex_lock(&ams_info.lock);
+
+                ams_sensors(&x, &y, &z);
+
+                x -= ams_info.xcalib;
+                y -= ams_info.ycalib;
+                z -= ams_info.zcalib;
+
+                input_report_abs(ams_info.idev, ABS_X, invert ? -x : x);
+                input_report_abs(ams_info.idev, ABS_Y, invert ? -y : y);
+                input_report_abs(ams_info.idev, ABS_Z, z);
+
+                input_sync(ams_info.idev);
+
+                mutex_unlock(&ams_info.lock);
+
+                msleep(25);
+        }
+
+        return 0;
+}
+
+static int ams_input_open(struct input_dev *dev)
+{
+        ams_info.kthread = kthread_run(ams_input_kthread, NULL, "kams");
+        return IS_ERR(ams_info.kthread) ? PTR_ERR(ams_info.kthread) : 0;
+}
+
+static void ams_input_close(struct input_dev *dev)
+{
+        kthread_stop(ams_info.kthread);
+}
+
+/* Call with ams_info.lock held! */
+static void ams_input_enable(void)
+{
+        s8 x, y, z;
+
+        if (ams_info.idev)
+                return;
+
+        ams_sensors(&x, &y, &z);
+        ams_info.xcalib = x;
+        ams_info.ycalib = y;
+        ams_info.zcalib = z;
+
+        ams_info.idev = input_allocate_device();
+        if (!ams_info.idev)
+                return;
+
+        ams_info.idev->name = "Apple Motion Sensor";
+        ams_info.idev->id.bustype = ams_info.bustype;
+        ams_info.idev->id.vendor = 0;
+        ams_info.idev->open = ams_input_open;
+        ams_info.idev->close = ams_input_close;
+        ams_info.idev->cdev.dev = &ams_info.of_dev->dev;
+
+        input_set_abs_params(ams_info.idev, ABS_X, -50, 50, 3, 0);
+        input_set_abs_params(ams_info.idev, ABS_Y, -50, 50, 3, 0);
+        input_set_abs_params(ams_info.idev, ABS_Z, -50, 50, 3, 0);
+
+        set_bit(EV_ABS, ams_info.idev->evbit);
+        set_bit(EV_KEY, ams_info.idev->evbit);
+        set_bit(BTN_TOUCH, ams_info.idev->keybit);
+
+        if (input_register_device(ams_info.idev)) {
+                input_free_device(ams_info.idev);
+                ams_info.idev = NULL;
+                return;
+        }
+}
+
+/* Call with ams_info.lock held! */
+static void ams_input_disable(void)
+{
+        if (ams_info.idev) {
+                input_unregister_device(ams_info.idev);
+                ams_info.idev = NULL;
+        }
+}
+
+static ssize_t ams_input_show_joystick(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        return sprintf(buf, "%d\n", joystick);
+}
+
+static ssize_t ams_input_store_joystick(struct device *dev,
+        struct device_attribute *attr, const char *buf, size_t count)
+{
+        if (sscanf(buf, "%d\n", &joystick) != 1)
+                return -EINVAL;
+
+        mutex_lock(&ams_info.lock);
+
+        if (joystick)
+                ams_input_enable();
+        else
+                ams_input_disable();
+
+        mutex_unlock(&ams_info.lock);
+
+        return count;
+}
+
+static DEVICE_ATTR(joystick, S_IRUGO | S_IWUSR,
+        ams_input_show_joystick, ams_input_store_joystick);
+
+/* Call with ams_info.lock held! */
+int ams_input_init(void)
+{
+        int result;
+
+        result = device_create_file(&ams_info.of_dev->dev, &dev_attr_joystick);
+
+        if (!result && joystick)
+                ams_input_enable();
+        return result;
+}
+
+/* Call with ams_info.lock held! */
+void ams_input_exit()
+{
+        ams_input_disable();
+        device_remove_file(&ams_info.of_dev->dev, &dev_attr_joystick);
+}
diff --git a/drivers/hwmon/ams/ams-pmu.c b/drivers/hwmon/ams/ams-pmu.c
new file mode 100644
index 000000000000..4636ae031a53
--- /dev/null
+++ b/drivers/hwmon/ams/ams-pmu.c
@@ -0,0 +1,207 @@
+/*
+ * Apple Motion Sensor driver (PMU variant)
+ *
+ * Copyright (C) 2006 Michael Hanselmann (linux-kernel@hansmi.ch)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/adb.h>
+#include <linux/pmu.h>
+
+#include "ams.h"
+
+/* Attitude */
+#define AMS_X                   0x00
+#define AMS_Y                   0x01
+#define AMS_Z                   0x02
+
+/* Not exactly known, maybe chip vendor */
+#define AMS_VENDOR              0x03
+
+/* Freefall registers */
+#define AMS_FF_CLEAR            0x04
+#define AMS_FF_ENABLE           0x05
+#define AMS_FF_LOW_LIMIT        0x06
+#define AMS_FF_DEBOUNCE         0x07
+
+/* Shock registers */
+#define AMS_SHOCK_CLEAR         0x08
+#define AMS_SHOCK_ENABLE        0x09
+#define AMS_SHOCK_HIGH_LIMIT    0x0a
+#define AMS_SHOCK_DEBOUNCE      0x0b
+
+/* Global interrupt and power control register */
+#define AMS_CONTROL             0x0c
+
+static u8 ams_pmu_cmd;
+
+static void ams_pmu_req_complete(struct adb_request *req)
+{
+        complete((struct completion *)req->arg);
+}
+
+/* Only call this function from task context */
+static void ams_pmu_set_register(u8 reg, u8 value)
+{
+        static struct adb_request req;
+        DECLARE_COMPLETION(req_complete);
+
+        req.arg = &req_complete;
+        if (pmu_request(&req, ams_pmu_req_complete, 4, ams_pmu_cmd, 0x00, reg, value))
+                return;
+
+        wait_for_completion(&req_complete);
+}
+
+/* Only call this function from task context */
+static u8 ams_pmu_get_register(u8 reg)
+{
+        static struct adb_request req;
+        DECLARE_COMPLETION(req_complete);
+
+        req.arg = &req_complete;
+        if (pmu_request(&req, ams_pmu_req_complete, 3, ams_pmu_cmd, 0x01, reg))
+                return 0;
+
+        wait_for_completion(&req_complete);
+
+        if (req.reply_len > 0)
+                return req.reply[0];
+        else
+                return 0;
+}
+
+/* Enables or disables the specified interrupts */
+static void ams_pmu_set_irq(enum ams_irq reg, char enable)
+{
+        if (reg & AMS_IRQ_FREEFALL) {
+                u8 val = ams_pmu_get_register(AMS_FF_ENABLE);
+                if (enable)
+                        val |= 0x80;
+                else
+                        val &= ~0x80;
+                ams_pmu_set_register(AMS_FF_ENABLE, val);
+        }
+
+        if (reg & AMS_IRQ_SHOCK) {
+                u8 val = ams_pmu_get_register(AMS_SHOCK_ENABLE);
+                if (enable)
+                        val |= 0x80;
+                else
+                        val &= ~0x80;
+                ams_pmu_set_register(AMS_SHOCK_ENABLE, val);
+        }
+
+        if (reg & AMS_IRQ_GLOBAL) {
+                u8 val = ams_pmu_get_register(AMS_CONTROL);
+                if (enable)
+                        val |= 0x80;
+                else
+                        val &= ~0x80;
+                ams_pmu_set_register(AMS_CONTROL, val);
+        }
+}
+
+static void ams_pmu_clear_irq(enum ams_irq reg)
+{
+        if (reg & AMS_IRQ_FREEFALL)
+                ams_pmu_set_register(AMS_FF_CLEAR, 0x00);
+
+        if (reg & AMS_IRQ_SHOCK)
+                ams_pmu_set_register(AMS_SHOCK_CLEAR, 0x00);
+}
+
+static u8 ams_pmu_get_vendor(void)
+{
+        return ams_pmu_get_register(AMS_VENDOR);
+}
+
+static void ams_pmu_get_xyz(s8 *x, s8 *y, s8 *z)
+{
+        *x = ams_pmu_get_register(AMS_X);
+        *y = ams_pmu_get_register(AMS_Y);
+        *z = ams_pmu_get_register(AMS_Z);
+}
+
+static void ams_pmu_exit(void)
+{
+        /* Disable interrupts */
+        ams_pmu_set_irq(AMS_IRQ_ALL, 0);
+
+        /* Clear interrupts */
+        ams_pmu_clear_irq(AMS_IRQ_ALL);
+
+        ams_info.has_device = 0;
+
+        printk(KERN_INFO "ams: Unloading\n");
+}
+
+int __init ams_pmu_init(struct device_node *np)
+{
+        u32 *prop;
+        int result;
+
+        mutex_lock(&ams_info.lock);
+
+        /* Set implementation stuff */
+        ams_info.of_node = np;
+        ams_info.exit = ams_pmu_exit;
+        ams_info.get_vendor = ams_pmu_get_vendor;
+        ams_info.get_xyz = ams_pmu_get_xyz;
+        ams_info.clear_irq = ams_pmu_clear_irq;
+        ams_info.bustype = BUS_HOST;
+
+        /* Get PMU command, should be 0x4e, but we can never know */
+        prop = (u32*)get_property(ams_info.of_node, "reg", NULL);
+        if (!prop) {
+                result = -ENODEV;
+                goto exit;
+        }
+        ams_pmu_cmd = ((*prop) >> 8) & 0xff;
+
+        /* Disable interrupts */
+        ams_pmu_set_irq(AMS_IRQ_ALL, 0);
+
+        /* Clear interrupts */
+        ams_pmu_clear_irq(AMS_IRQ_ALL);
+
+        result = ams_sensor_attach();
+        if (result < 0)
+                goto exit;
+
+        /* Set default values */
+        ams_pmu_set_register(AMS_FF_LOW_LIMIT, 0x15);
+        ams_pmu_set_register(AMS_FF_ENABLE, 0x08);
+        ams_pmu_set_register(AMS_FF_DEBOUNCE, 0x14);
+
+        ams_pmu_set_register(AMS_SHOCK_HIGH_LIMIT, 0x60);
+        ams_pmu_set_register(AMS_SHOCK_ENABLE, 0x0f);
+        ams_pmu_set_register(AMS_SHOCK_DEBOUNCE, 0x14);
+
+        ams_pmu_set_register(AMS_CONTROL, 0x4f);
+
+        /* Clear interrupts */
+        ams_pmu_clear_irq(AMS_IRQ_ALL);
+
+        ams_info.has_device = 1;
+
+        /* Enable interrupts */
+        ams_pmu_set_irq(AMS_IRQ_ALL, 1);
+
+        printk(KERN_INFO "ams: Found PMU based motion sensor\n");
+
+        result = 0;
+
+exit:
+        mutex_unlock(&ams_info.lock);
+
+        return result;
+}
diff --git a/drivers/hwmon/ams/ams.h b/drivers/hwmon/ams/ams.h
new file mode 100644
index 000000000000..240730e6bcde
--- /dev/null
+++ b/drivers/hwmon/ams/ams.h
@@ -0,0 +1,72 @@
+#include <linux/i2c.h>
+#include <linux/input.h>
+#include <linux/kthread.h>
+#include <linux/mutex.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+#include <asm/of_device.h>
+
+enum ams_irq {
+        AMS_IRQ_FREEFALL = 0x01,
+        AMS_IRQ_SHOCK = 0x02,
+        AMS_IRQ_GLOBAL = 0x04,
+        AMS_IRQ_ALL =
+                AMS_IRQ_FREEFALL |
+                AMS_IRQ_SHOCK |
+                AMS_IRQ_GLOBAL,
+};
+
+struct ams {
+        /* Locks */
+        spinlock_t irq_lock;
+        struct mutex lock;
+
+        /* General properties */
+        struct device_node *of_node;
+        struct of_device *of_dev;
+        char has_device;
+        char vflag;
+        u32 orient1;
+        u32 orient2;
+
+        /* Interrupt worker */
+        struct work_struct worker;
+        u8 worker_irqs;
+
+        /* Implementation
+         *
+         * Only call these functions with the main lock held.
+         */
+        void (*exit)(void);
+
+        void (*get_xyz)(s8 *x, s8 *y, s8 *z);
+        u8 (*get_vendor)(void);
+
+        void (*clear_irq)(enum ams_irq reg);
+
+#ifdef CONFIG_SENSORS_AMS_I2C
+        /* I2C properties */
+        int i2c_bus;
+        int i2c_address;
+        struct i2c_client i2c_client;
+#endif
+
+        /* Joystick emulation */
+        struct task_struct *kthread;
+        struct input_dev *idev;
+        __u16 bustype;
+
+        /* calibrated null values */
+        int xcalib, ycalib, zcalib;
+};
+
+extern struct ams ams_info;
+
+extern void ams_sensors(s8 *x, s8 *y, s8 *z);
+extern int ams_sensor_attach(void);
+
+extern int ams_pmu_init(struct device_node *np);
+extern int ams_i2c_init(struct device_node *np);
+
+extern int ams_input_init(void);
+extern void ams_input_exit(void);
diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index de17a72149d9..a272cae8f60e 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -1,12 +1,15 @@
 /*
- * f71805f.c - driver for the Fintek F71805F/FG Super-I/O chip integrated
- *             hardware monitoring features
+ * f71805f.c - driver for the Fintek F71805F/FG and F71872F/FG Super-I/O
+ *             chips integrated hardware monitoring features
  * Copyright (C) 2005-2006  Jean Delvare <khali@linux-fr.org>
  *
  * The F71805F/FG is a LPC Super-I/O chip made by Fintek. It integrates
  * complete hardware monitoring features: voltage, fan and temperature
  * sensors, and manual and automatic fan speed control.
  *
+ * The F71872F/FG is almost the same, with two more voltages monitored,
+ * and 6 VID inputs.
+ *
  * 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
@@ -37,6 +40,7 @@
 static struct platform_device *pdev;
 
 #define DRVNAME "f71805f"
+enum kinds { f71805f, f71872f };
 
 /*
  * Super-I/O constants and functions
@@ -48,11 +52,13 @@ static struct platform_device *pdev;
 #define SIO_REG_DEVID           0x20    /* Device ID (2 bytes) */
 #define SIO_REG_DEVREV          0x22    /* Device revision */
 #define SIO_REG_MANID           0x23    /* Fintek ID (2 bytes) */
+#define SIO_REG_FNSEL1          0x29    /* Multi Function Select 1 (F71872F) */
 #define SIO_REG_ENABLE          0x30    /* Logical device enable */
 #define SIO_REG_ADDR            0x60    /* Logical device address (2 bytes) */
 
 #define SIO_FINTEK_ID           0x1934
 #define SIO_F71805F_ID          0x0406
+#define SIO_F71872F_ID          0x0341
 
 static inline int
 superio_inb(int base, int reg)
@@ -96,22 +102,25 @@ superio_exit(int base)
  * ISA constants
  */
 
-#define REGION_LENGTH           2
-#define ADDR_REG_OFFSET         0
-#define DATA_REG_OFFSET         1
+#define REGION_LENGTH           8
+#define ADDR_REG_OFFSET         5
+#define DATA_REG_OFFSET         6
 
 /*
  * Registers
  */
 
-/* in nr from 0 to 8 (8-bit values) */
+/* in nr from 0 to 10 (8-bit values) */
 #define F71805F_REG_IN(nr)              (0x10 + (nr))
-#define F71805F_REG_IN_HIGH(nr)         (0x40 + 2 * (nr))
-#define F71805F_REG_IN_LOW(nr)          (0x41 + 2 * (nr))
+#define F71805F_REG_IN_HIGH(nr)         ((nr) < 10 ? 0x40 + 2 * (nr) : 0x2E)
+#define F71805F_REG_IN_LOW(nr)          ((nr) < 10 ? 0x41 + 2 * (nr) : 0x2F)
 /* fan nr from 0 to 2 (12-bit values, two registers) */
 #define F71805F_REG_FAN(nr)             (0x20 + 2 * (nr))
 #define F71805F_REG_FAN_LOW(nr)         (0x28 + 2 * (nr))
+#define F71805F_REG_FAN_TARGET(nr)      (0x69 + 16 * (nr))
 #define F71805F_REG_FAN_CTRL(nr)        (0x60 + 16 * (nr))
+#define F71805F_REG_PWM_FREQ(nr)        (0x63 + 16 * (nr))
+#define F71805F_REG_PWM_DUTY(nr)        (0x6B + 16 * (nr))
 /* temp nr from 0 to 2 (8-bit values) */
 #define F71805F_REG_TEMP(nr)            (0x1B + (nr))
 #define F71805F_REG_TEMP_HIGH(nr)       (0x54 + 2 * (nr))
@@ -122,6 +131,14 @@ superio_exit(int base)
 /* status nr from 0 to 2 */
 #define F71805F_REG_STATUS(nr)          (0x36 + (nr))
 
+/* individual register bits */
+#define FAN_CTRL_DC_MODE                0x10
+#define FAN_CTRL_LATCH_FULL             0x08
+#define FAN_CTRL_MODE_MASK              0x03
+#define FAN_CTRL_MODE_SPEED             0x00
+#define FAN_CTRL_MODE_TEMPERATURE       0x01
+#define FAN_CTRL_MODE_MANUAL            0x02
+
 /*
  * Data structures and manipulation thereof
  */
@@ -138,12 +155,16 @@ struct f71805f_data {
         unsigned long last_limits;      /* In jiffies */
 
         /* Register values */
-        u8 in[9];
-        u8 in_high[9];
-        u8 in_low[9];
+        u8 in[11];
+        u8 in_high[11];
+        u8 in_low[11];
+        u16 has_in;
         u16 fan[3];
         u16 fan_low[3];
-        u8 fan_enabled;         /* Read once at init time */
+        u16 fan_target[3];
+        u8 fan_ctrl[3];
+        u8 pwm[3];
+        u8 pwm_freq[3];
         u8 temp[3];
         u8 temp_high[3];
         u8 temp_hyst[3];
@@ -151,6 +172,11 @@ struct f71805f_data {
         unsigned long alarms;
 };
 
+struct f71805f_sio_data {
+        enum kinds kind;
+        u8 fnsel1;
+};
+
 static inline long in_from_reg(u8 reg)
 {
         return (reg * 8);
@@ -200,6 +226,33 @@ static inline u16 fan_to_reg(long rpm)
         return (1500000 / rpm);
 }
 
+static inline unsigned long pwm_freq_from_reg(u8 reg)
+{
+        unsigned long clock = (reg & 0x80) ? 48000000UL : 1000000UL;
+
+        reg &= 0x7f;
+        if (reg == 0)
+                reg++;
+        return clock / (reg << 8);
+}
+
+static inline u8 pwm_freq_to_reg(unsigned long val)
+{
+        if (val >= 187500)      /* The highest we can do */
+                return 0x80;
+        if (val >= 1475)        /* Use 48 MHz clock */
+                return 0x80 | (48000000UL / (val << 8));
+        if (val < 31)           /* The lowest we can do */
+                return 0x7f;
+        else                    /* Use 1 MHz clock */
+                return 1000000UL / (val << 8);
+}
+
+static inline int pwm_mode_from_reg(u8 reg)
+{
+        return !(reg & FAN_CTRL_DC_MODE);
+}
+
 static inline long temp_from_reg(u8 reg)
 {
         return (reg * 1000);
@@ -274,16 +327,21 @@ static struct f71805f_data *f71805f_update_device(struct device *dev)
         /* Limit registers cache is refreshed after 60 seconds */
         if (time_after(jiffies, data->last_updated + 60 * HZ)
          || !data->valid) {
-                for (nr = 0; nr < 9; nr++) {
+                for (nr = 0; nr < 11; nr++) {
+                        if (!(data->has_in & (1 << nr)))
+                                continue;
                         data->in_high[nr] = f71805f_read8(data,
                                             F71805F_REG_IN_HIGH(nr));
                         data->in_low[nr] = f71805f_read8(data,
                                            F71805F_REG_IN_LOW(nr));
                 }
                 for (nr = 0; nr < 3; nr++) {
-                        if (data->fan_enabled & (1 << nr))
-                                data->fan_low[nr] = f71805f_read16(data,
-                                                    F71805F_REG_FAN_LOW(nr));
+                        data->fan_low[nr] = f71805f_read16(data,
+                                            F71805F_REG_FAN_LOW(nr));
+                        data->fan_target[nr] = f71805f_read16(data,
+                                               F71805F_REG_FAN_TARGET(nr));
+                        data->pwm_freq[nr] = f71805f_read8(data,
+                                             F71805F_REG_PWM_FREQ(nr));
                 }
                 for (nr = 0; nr < 3; nr++) {
                         data->temp_high[nr] = f71805f_read8(data,
@@ -299,14 +357,19 @@ static struct f71805f_data *f71805f_update_device(struct device *dev)
         /* Measurement registers cache is refreshed after 1 second */
         if (time_after(jiffies, data->last_updated + HZ)
          || !data->valid) {
-                for (nr = 0; nr < 9; nr++) {
+                for (nr = 0; nr < 11; nr++) {
+                        if (!(data->has_in & (1 << nr)))
+                                continue;
                         data->in[nr] = f71805f_read8(data,
                                        F71805F_REG_IN(nr));
                 }
                 for (nr = 0; nr < 3; nr++) {
-                        if (data->fan_enabled & (1 << nr))
-                                data->fan[nr] = f71805f_read16(data,
-                                                F71805F_REG_FAN(nr));
+                        data->fan[nr] = f71805f_read16(data,
+                                        F71805F_REG_FAN(nr));
+                        data->fan_ctrl[nr] = f71805f_read8(data,
+                                             F71805F_REG_FAN_CTRL(nr));
+                        data->pwm[nr] = f71805f_read8(data,
+                                        F71805F_REG_PWM_DUTY(nr));
                 }
                 for (nr = 0; nr < 3; nr++) {
                         data->temp[nr] = f71805f_read8(data,
@@ -333,35 +396,43 @@ static ssize_t show_in0(struct device *dev, struct device_attribute *devattr,
                         char *buf)
 {
         struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
 
-        return sprintf(buf, "%ld\n", in0_from_reg(data->in[0]));
+        return sprintf(buf, "%ld\n", in0_from_reg(data->in[nr]));
 }
 
 static ssize_t show_in0_max(struct device *dev, struct device_attribute
                             *devattr, char *buf)
 {
         struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
 
-        return sprintf(buf, "%ld\n", in0_from_reg(data->in_high[0]));
+        return sprintf(buf, "%ld\n", in0_from_reg(data->in_high[nr]));
 }
 
 static ssize_t show_in0_min(struct device *dev, struct device_attribute
                             *devattr, char *buf)
 {
         struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
 
-        return sprintf(buf, "%ld\n", in0_from_reg(data->in_low[0]));
+        return sprintf(buf, "%ld\n", in0_from_reg(data->in_low[nr]));
 }
 
 static ssize_t set_in0_max(struct device *dev, struct device_attribute
                            *devattr, const char *buf, size_t count)
 {
         struct f71805f_data *data = dev_get_drvdata(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
         long val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
-        data->in_high[0] = in0_to_reg(val);
-        f71805f_write8(data, F71805F_REG_IN_HIGH(0), data->in_high[0]);
+        data->in_high[nr] = in0_to_reg(val);
+        f71805f_write8(data, F71805F_REG_IN_HIGH(nr), data->in_high[nr]);
         mutex_unlock(&data->update_lock);
 
         return count;
@@ -371,11 +442,13 @@ static ssize_t set_in0_min(struct device *dev, struct device_attribute
                            *devattr, const char *buf, size_t count)
 {
         struct f71805f_data *data = dev_get_drvdata(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
         long val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
-        data->in_low[0] = in0_to_reg(val);
-        f71805f_write8(data, F71805F_REG_IN_LOW(0), data->in_low[0]);
+        data->in_low[nr] = in0_to_reg(val);
+        f71805f_write8(data, F71805F_REG_IN_LOW(nr), data->in_low[nr]);
         mutex_unlock(&data->update_lock);
 
         return count;
@@ -463,6 +536,16 @@ static ssize_t show_fan_min(struct device *dev, struct device_attribute
         return sprintf(buf, "%ld\n", fan_from_reg(data->fan_low[nr]));
 }
 
+static ssize_t show_fan_target(struct device *dev, struct device_attribute
+                               *devattr, char *buf)
+{
+        struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+
+        return sprintf(buf, "%ld\n", fan_from_reg(data->fan_target[nr]));
+}
+
 static ssize_t set_fan_min(struct device *dev, struct device_attribute
                            *devattr, const char *buf, size_t count)
 {
@@ -479,6 +562,157 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute
         return count;
 }
 
+static ssize_t set_fan_target(struct device *dev, struct device_attribute
+                              *devattr, const char *buf, size_t count)
+{
+        struct f71805f_data *data = dev_get_drvdata(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+        long val = simple_strtol(buf, NULL, 10);
+
+        mutex_lock(&data->update_lock);
+        data->fan_target[nr] = fan_to_reg(val);
+        f71805f_write16(data, F71805F_REG_FAN_TARGET(nr),
+                        data->fan_target[nr]);
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+        struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+
+        return sprintf(buf, "%d\n", (int)data->pwm[nr]);
+}
+
+static ssize_t show_pwm_enable(struct device *dev, struct device_attribute
+                               *devattr, char *buf)
+{
+        struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+        int mode;
+
+        switch (data->fan_ctrl[nr] & FAN_CTRL_MODE_MASK) {
+        case FAN_CTRL_MODE_SPEED:
+                mode = 3;
+                break;
+        case FAN_CTRL_MODE_TEMPERATURE:
+                mode = 2;
+                break;
+        default: /* MANUAL */
+                mode = 1;
+        }
+
+        return sprintf(buf, "%d\n", mode);
+}
+
+static ssize_t show_pwm_freq(struct device *dev, struct device_attribute
+                             *devattr, char *buf)
+{
+        struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+
+        return sprintf(buf, "%lu\n", pwm_freq_from_reg(data->pwm_freq[nr]));
+}
+
+static ssize_t show_pwm_mode(struct device *dev, struct device_attribute
+                             *devattr, char *buf)
+{
+        struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+
+        return sprintf(buf, "%d\n", pwm_mode_from_reg(data->fan_ctrl[nr]));
+}
+
+static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr,
+                       const char *buf, size_t count)
+{
+        struct f71805f_data *data = dev_get_drvdata(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+
+        if (val > 255)
+                return -EINVAL;
+
+        mutex_lock(&data->update_lock);
+        data->pwm[nr] = val;
+        f71805f_write8(data, F71805F_REG_PWM_DUTY(nr), data->pwm[nr]);
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+static struct attribute *f71805f_attr_pwm[];
+
+static ssize_t set_pwm_enable(struct device *dev, struct device_attribute
+                              *devattr, const char *buf, size_t count)
+{
+        struct f71805f_data *data = dev_get_drvdata(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+        u8 reg;
+
+        if (val < 1 || val > 3)
+                return -EINVAL;
+
+        if (val > 1) { /* Automatic mode, user can't set PWM value */
+                if (sysfs_chmod_file(&dev->kobj, f71805f_attr_pwm[nr],
+                                     S_IRUGO))
+                        dev_dbg(dev, "chmod -w pwm%d failed\n", nr + 1);
+        }
+
+        mutex_lock(&data->update_lock);
+        reg = f71805f_read8(data, F71805F_REG_FAN_CTRL(nr))
+            & ~FAN_CTRL_MODE_MASK;
+        switch (val) {
+        case 1:
+                reg |= FAN_CTRL_MODE_MANUAL;
+                break;
+        case 2:
+                reg |= FAN_CTRL_MODE_TEMPERATURE;
+                break;
+        case 3:
+                reg |= FAN_CTRL_MODE_SPEED;
+                break;
+        }
+        data->fan_ctrl[nr] = reg;
+        f71805f_write8(data, F71805F_REG_FAN_CTRL(nr), reg);
+        mutex_unlock(&data->update_lock);
+
+        if (val == 1) { /* Manual mode, user can set PWM value */
+                if (sysfs_chmod_file(&dev->kobj, f71805f_attr_pwm[nr],
+                                     S_IRUGO | S_IWUSR))
+                        dev_dbg(dev, "chmod +w pwm%d failed\n", nr + 1);
+        }
+
+        return count;
+}
+
+static ssize_t set_pwm_freq(struct device *dev, struct device_attribute
+                            *devattr, const char *buf, size_t count)
+{
+        struct f71805f_data *data = dev_get_drvdata(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+
+        mutex_lock(&data->update_lock);
+        data->pwm_freq[nr] = pwm_freq_to_reg(val);
+        f71805f_write8(data, F71805F_REG_PWM_FREQ(nr), data->pwm_freq[nr]);
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
 static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
                          char *buf)
 {
@@ -557,7 +791,7 @@ static ssize_t show_alarms_in(struct device *dev, struct device_attribute
 {
         struct f71805f_data *data = f71805f_update_device(dev);
 
-        return sprintf(buf, "%lu\n", data->alarms & 0x1ff);
+        return sprintf(buf, "%lu\n", data->alarms & 0x7ff);
 }
 
 static ssize_t show_alarms_fan(struct device *dev, struct device_attribute
@@ -594,9 +828,11 @@ static ssize_t show_name(struct device *dev, struct device_attribute
         return sprintf(buf, "%s\n", data->name);
 }
 
-static DEVICE_ATTR(in0_input, S_IRUGO, show_in0, NULL);
-static DEVICE_ATTR(in0_max, S_IRUGO| S_IWUSR, show_in0_max, set_in0_max);
-static DEVICE_ATTR(in0_min, S_IRUGO| S_IWUSR, show_in0_min, set_in0_min);
+static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_in0, NULL, 0);
+static SENSOR_DEVICE_ATTR(in0_max, S_IRUGO| S_IWUSR,
+                          show_in0_max, set_in0_max, 0);
+static SENSOR_DEVICE_ATTR(in0_min, S_IRUGO| S_IWUSR,
+                          show_in0_min, set_in0_min, 0);
 static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_in, NULL, 1);
 static SENSOR_DEVICE_ATTR(in1_max, S_IRUGO | S_IWUSR,
                           show_in_max, set_in_max, 1);
@@ -637,16 +873,32 @@ static SENSOR_DEVICE_ATTR(in8_max, S_IRUGO | S_IWUSR,
                           show_in_max, set_in_max, 8);
 static SENSOR_DEVICE_ATTR(in8_min, S_IRUGO | S_IWUSR,
                           show_in_min, set_in_min, 8);
+static SENSOR_DEVICE_ATTR(in9_input, S_IRUGO, show_in0, NULL, 9);
+static SENSOR_DEVICE_ATTR(in9_max, S_IRUGO | S_IWUSR,
+                          show_in0_max, set_in0_max, 9);
+static SENSOR_DEVICE_ATTR(in9_min, S_IRUGO | S_IWUSR,
+                          show_in0_min, set_in0_min, 9);
+static SENSOR_DEVICE_ATTR(in10_input, S_IRUGO, show_in0, NULL, 10);
+static SENSOR_DEVICE_ATTR(in10_max, S_IRUGO | S_IWUSR,
+                          show_in0_max, set_in0_max, 10);
+static SENSOR_DEVICE_ATTR(in10_min, S_IRUGO | S_IWUSR,
+                          show_in0_min, set_in0_min, 10);
 
 static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0);
 static SENSOR_DEVICE_ATTR(fan1_min, S_IRUGO | S_IWUSR,
                           show_fan_min, set_fan_min, 0);
+static SENSOR_DEVICE_ATTR(fan1_target, S_IRUGO | S_IWUSR,
+                          show_fan_target, set_fan_target, 0);
 static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1);
 static SENSOR_DEVICE_ATTR(fan2_min, S_IRUGO | S_IWUSR,
                           show_fan_min, set_fan_min, 1);
+static SENSOR_DEVICE_ATTR(fan2_target, S_IRUGO | S_IWUSR,
+                          show_fan_target, set_fan_target, 1);
 static SENSOR_DEVICE_ATTR(fan3_input, S_IRUGO, show_fan, NULL, 2);
 static SENSOR_DEVICE_ATTR(fan3_min, S_IRUGO | S_IWUSR,
                           show_fan_min, set_fan_min, 2);
+static SENSOR_DEVICE_ATTR(fan3_target, S_IRUGO | S_IWUSR,
+                          show_fan_target, set_fan_target, 2);
 
 static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
 static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO | S_IWUSR,
@@ -667,6 +919,27 @@ static SENSOR_DEVICE_ATTR(temp3_max_hyst, S_IRUGO | S_IWUSR,
                     show_temp_hyst, set_temp_hyst, 2);
 static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO, show_temp_type, NULL, 2);
 
+/* pwm (value) files are created read-only, write permission is
+   then added or removed dynamically as needed */
+static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO, show_pwm, set_pwm, 0);
+static SENSOR_DEVICE_ATTR(pwm1_enable, S_IRUGO | S_IWUSR,
+                          show_pwm_enable, set_pwm_enable, 0);
+static SENSOR_DEVICE_ATTR(pwm1_freq, S_IRUGO | S_IWUSR,
+                          show_pwm_freq, set_pwm_freq, 0);
+static SENSOR_DEVICE_ATTR(pwm1_mode, S_IRUGO, show_pwm_mode, NULL, 0);
+static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO, show_pwm, set_pwm, 1);
+static SENSOR_DEVICE_ATTR(pwm2_enable, S_IRUGO | S_IWUSR,
+                          show_pwm_enable, set_pwm_enable, 1);
+static SENSOR_DEVICE_ATTR(pwm2_freq, S_IRUGO | S_IWUSR,
+                          show_pwm_freq, set_pwm_freq, 1);
+static SENSOR_DEVICE_ATTR(pwm2_mode, S_IRUGO, show_pwm_mode, NULL, 1);
+static SENSOR_DEVICE_ATTR(pwm3, S_IRUGO, show_pwm, set_pwm, 2);
+static SENSOR_DEVICE_ATTR(pwm3_enable, S_IRUGO | S_IWUSR,
+                          show_pwm_enable, set_pwm_enable, 2);
+static SENSOR_DEVICE_ATTR(pwm3_freq, S_IRUGO | S_IWUSR,
+                          show_pwm_freq, set_pwm_freq, 2);
+static SENSOR_DEVICE_ATTR(pwm3_mode, S_IRUGO, show_pwm_mode, NULL, 2);
+
 static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);
 static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);
 static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2);
@@ -676,6 +949,8 @@ static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 5);
 static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 6);
 static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 7);
 static SENSOR_DEVICE_ATTR(in8_alarm, S_IRUGO, show_alarm, NULL, 8);
+static SENSOR_DEVICE_ATTR(in9_alarm, S_IRUGO, show_alarm, NULL, 9);
+static SENSOR_DEVICE_ATTR(in10_alarm, S_IRUGO, show_alarm, NULL, 10);
 static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 11);
 static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 12);
 static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 13);
@@ -689,9 +964,9 @@ static DEVICE_ATTR(alarms_temp, S_IRUGO, show_alarms_temp, NULL);
 static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
 
 static struct attribute *f71805f_attributes[] = {
-        &dev_attr_in0_input.attr,
-        &dev_attr_in0_max.attr,
-        &dev_attr_in0_min.attr,
+        &sensor_dev_attr_in0_input.dev_attr.attr,
+        &sensor_dev_attr_in0_max.dev_attr.attr,
+        &sensor_dev_attr_in0_min.dev_attr.attr,
         &sensor_dev_attr_in1_input.dev_attr.attr,
         &sensor_dev_attr_in1_max.dev_attr.attr,
         &sensor_dev_attr_in1_min.dev_attr.attr,
@@ -701,9 +976,6 @@ static struct attribute *f71805f_attributes[] = {
         &sensor_dev_attr_in3_input.dev_attr.attr,
         &sensor_dev_attr_in3_max.dev_attr.attr,
         &sensor_dev_attr_in3_min.dev_attr.attr,
-        &sensor_dev_attr_in4_input.dev_attr.attr,
-        &sensor_dev_attr_in4_max.dev_attr.attr,
-        &sensor_dev_attr_in4_min.dev_attr.attr,
         &sensor_dev_attr_in5_input.dev_attr.attr,
         &sensor_dev_attr_in5_max.dev_attr.attr,
         &sensor_dev_attr_in5_min.dev_attr.attr,
@@ -713,9 +985,29 @@ static struct attribute *f71805f_attributes[] = {
         &sensor_dev_attr_in7_input.dev_attr.attr,
         &sensor_dev_attr_in7_max.dev_attr.attr,
         &sensor_dev_attr_in7_min.dev_attr.attr,
-        &sensor_dev_attr_in8_input.dev_attr.attr,
-        &sensor_dev_attr_in8_max.dev_attr.attr,
-        &sensor_dev_attr_in8_min.dev_attr.attr,
+
+        &sensor_dev_attr_fan1_input.dev_attr.attr,
+        &sensor_dev_attr_fan1_min.dev_attr.attr,
+        &sensor_dev_attr_fan1_alarm.dev_attr.attr,
+        &sensor_dev_attr_fan1_target.dev_attr.attr,
+        &sensor_dev_attr_fan2_input.dev_attr.attr,
+        &sensor_dev_attr_fan2_min.dev_attr.attr,
+        &sensor_dev_attr_fan2_alarm.dev_attr.attr,
+        &sensor_dev_attr_fan2_target.dev_attr.attr,
+        &sensor_dev_attr_fan3_input.dev_attr.attr,
+        &sensor_dev_attr_fan3_min.dev_attr.attr,
+        &sensor_dev_attr_fan3_alarm.dev_attr.attr,
+        &sensor_dev_attr_fan3_target.dev_attr.attr,
+
+        &sensor_dev_attr_pwm1.dev_attr.attr,
+        &sensor_dev_attr_pwm1_enable.dev_attr.attr,
+        &sensor_dev_attr_pwm1_mode.dev_attr.attr,
+        &sensor_dev_attr_pwm2.dev_attr.attr,
+        &sensor_dev_attr_pwm2_enable.dev_attr.attr,
+        &sensor_dev_attr_pwm2_mode.dev_attr.attr,
+        &sensor_dev_attr_pwm3.dev_attr.attr,
+        &sensor_dev_attr_pwm3_enable.dev_attr.attr,
+        &sensor_dev_attr_pwm3_mode.dev_attr.attr,
 
         &sensor_dev_attr_temp1_input.dev_attr.attr,
         &sensor_dev_attr_temp1_max.dev_attr.attr,
@@ -734,11 +1026,9 @@ static struct attribute *f71805f_attributes[] = {
         &sensor_dev_attr_in1_alarm.dev_attr.attr,
         &sensor_dev_attr_in2_alarm.dev_attr.attr,
         &sensor_dev_attr_in3_alarm.dev_attr.attr,
-        &sensor_dev_attr_in4_alarm.dev_attr.attr,
         &sensor_dev_attr_in5_alarm.dev_attr.attr,
         &sensor_dev_attr_in6_alarm.dev_attr.attr,
         &sensor_dev_attr_in7_alarm.dev_attr.attr,
-        &sensor_dev_attr_in8_alarm.dev_attr.attr,
         &dev_attr_alarms_in.attr,
         &sensor_dev_attr_temp1_alarm.dev_attr.attr,
         &sensor_dev_attr_temp2_alarm.dev_attr.attr,
@@ -754,29 +1044,59 @@ static const struct attribute_group f71805f_group = {
         .attrs = f71805f_attributes,
 };
 
-static struct attribute *f71805f_attributes_fan[3][4] = {
+static struct attribute *f71805f_attributes_optin[4][5] = {
         {
-                &sensor_dev_attr_fan1_input.dev_attr.attr,
-                &sensor_dev_attr_fan1_min.dev_attr.attr,
-                &sensor_dev_attr_fan1_alarm.dev_attr.attr,
+                &sensor_dev_attr_in4_input.dev_attr.attr,
+                &sensor_dev_attr_in4_max.dev_attr.attr,
+                &sensor_dev_attr_in4_min.dev_attr.attr,
+                &sensor_dev_attr_in4_alarm.dev_attr.attr,
+                NULL
+        }, {
+                &sensor_dev_attr_in8_input.dev_attr.attr,
+                &sensor_dev_attr_in8_max.dev_attr.attr,
+                &sensor_dev_attr_in8_min.dev_attr.attr,
+                &sensor_dev_attr_in8_alarm.dev_attr.attr,
                 NULL
         }, {
-                &sensor_dev_attr_fan2_input.dev_attr.attr,
-                &sensor_dev_attr_fan2_min.dev_attr.attr,
-                &sensor_dev_attr_fan2_alarm.dev_attr.attr,
+                &sensor_dev_attr_in9_input.dev_attr.attr,
+                &sensor_dev_attr_in9_max.dev_attr.attr,
+                &sensor_dev_attr_in9_min.dev_attr.attr,
+                &sensor_dev_attr_in9_alarm.dev_attr.attr,
                 NULL
         }, {
-                &sensor_dev_attr_fan3_input.dev_attr.attr,
-                &sensor_dev_attr_fan3_min.dev_attr.attr,
-                &sensor_dev_attr_fan3_alarm.dev_attr.attr,
+                &sensor_dev_attr_in10_input.dev_attr.attr,
+                &sensor_dev_attr_in10_max.dev_attr.attr,
+                &sensor_dev_attr_in10_min.dev_attr.attr,
+                &sensor_dev_attr_in10_alarm.dev_attr.attr,
                 NULL
         }
 };
 
-static const struct attribute_group f71805f_group_fan[3] = {
-        { .attrs = f71805f_attributes_fan[0] },
-        { .attrs = f71805f_attributes_fan[1] },
-        { .attrs = f71805f_attributes_fan[2] },
+static const struct attribute_group f71805f_group_optin[4] = {
+        { .attrs = f71805f_attributes_optin[0] },
+        { .attrs = f71805f_attributes_optin[1] },
+        { .attrs = f71805f_attributes_optin[2] },
+        { .attrs = f71805f_attributes_optin[3] },
+};
+
+/* We don't include pwm_freq files in the arrays above, because they must be
+   created conditionally (only if pwm_mode is 1 == PWM) */
+static struct attribute *f71805f_attributes_pwm_freq[] = {
+        &sensor_dev_attr_pwm1_freq.dev_attr.attr,
+        &sensor_dev_attr_pwm2_freq.dev_attr.attr,
+        &sensor_dev_attr_pwm3_freq.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group f71805f_group_pwm_freq = {
+        .attrs = f71805f_attributes_pwm_freq,
+};
+
+/* We also need an indexed access to pwmN files to toggle writability */
+static struct attribute *f71805f_attr_pwm[] = {
+        &sensor_dev_attr_pwm1.dev_attr.attr,
+        &sensor_dev_attr_pwm2.dev_attr.attr,
+        &sensor_dev_attr_pwm3.dev_attr.attr,
 };
 
 /*
@@ -798,18 +1118,30 @@ static void __devinit f71805f_init_device(struct f71805f_data *data)
         /* Fan monitoring can be disabled. If it is, we won't be polling
            the register values, and won't create the related sysfs files. */
         for (i = 0; i < 3; i++) {
-                reg = f71805f_read8(data, F71805F_REG_FAN_CTRL(i));
-                if (!(reg & 0x80))
-                        data->fan_enabled |= (1 << i);
+                data->fan_ctrl[i] = f71805f_read8(data,
+                                                  F71805F_REG_FAN_CTRL(i));
+                /* Clear latch full bit, else "speed mode" fan speed control
+                   doesn't work */
+                if (data->fan_ctrl[i] & FAN_CTRL_LATCH_FULL) {
+                        data->fan_ctrl[i] &= ~FAN_CTRL_LATCH_FULL;
+                        f71805f_write8(data, F71805F_REG_FAN_CTRL(i),
+                                       data->fan_ctrl[i]);
+                }
         }
 }
 
 static int __devinit f71805f_probe(struct platform_device *pdev)
 {
+        struct f71805f_sio_data *sio_data = pdev->dev.platform_data;
         struct f71805f_data *data;
         struct resource *res;
         int i, err;
 
+        static const char *names[] = {
+                "f71805f",
+                "f71872f",
+        };
+
         if (!(data = kzalloc(sizeof(struct f71805f_data), GFP_KERNEL))) {
                 err = -ENOMEM;
                 printk(KERN_ERR DRVNAME ": Out of memory\n");
@@ -819,24 +1151,69 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);
         data->addr = res->start;
         mutex_init(&data->lock);
-        data->name = "f71805f";
+        data->name = names[sio_data->kind];
         mutex_init(&data->update_lock);
 
         platform_set_drvdata(pdev, data);
 
+        /* Some voltage inputs depend on chip model and configuration */
+        switch (sio_data->kind) {
+        case f71805f:
+                data->has_in = 0x1ff;
+                break;
+        case f71872f:
+                data->has_in = 0x6ef;
+                if (sio_data->fnsel1 & 0x01)
+                        data->has_in |= (1 << 4); /* in4 */
+                if (sio_data->fnsel1 & 0x02)
+                        data->has_in |= (1 << 8); /* in8 */
+                break;
+        }
+
         /* Initialize the F71805F chip */
         f71805f_init_device(data);
 
         /* Register sysfs interface files */
         if ((err = sysfs_create_group(&pdev->dev.kobj, &f71805f_group)))
                 goto exit_free;
-        for (i = 0; i < 3; i++) {
-                if (!(data->fan_enabled & (1 << i)))
-                        continue;
+        if (data->has_in & (1 << 4)) { /* in4 */
+                if ((err = sysfs_create_group(&pdev->dev.kobj,
+                                              &f71805f_group_optin[0])))
+                        goto exit_remove_files;
+        }
+        if (data->has_in & (1 << 8)) { /* in8 */
+                if ((err = sysfs_create_group(&pdev->dev.kobj,
+                                              &f71805f_group_optin[1])))
+                        goto exit_remove_files;
+        }
+        if (data->has_in & (1 << 9)) { /* in9 (F71872F/FG only) */
                 if ((err = sysfs_create_group(&pdev->dev.kobj,
-                                              &f71805f_group_fan[i])))
+                                              &f71805f_group_optin[2])))
                         goto exit_remove_files;
         }
+        if (data->has_in & (1 << 10)) { /* in9 (F71872F/FG only) */
+                if ((err = sysfs_create_group(&pdev->dev.kobj,
+                                              &f71805f_group_optin[3])))
+                        goto exit_remove_files;
+        }
+        for (i = 0; i < 3; i++) {
+                /* If control mode is PWM, create pwm_freq file */
+                if (!(data->fan_ctrl[i] & FAN_CTRL_DC_MODE)) {
+                        if ((err = sysfs_create_file(&pdev->dev.kobj,
+                                        f71805f_attributes_pwm_freq[i])))
+                                goto exit_remove_files;
+                }
+                /* If PWM is in manual mode, add write permission */
+                if (data->fan_ctrl[i] & FAN_CTRL_MODE_MANUAL) {
+                        if ((err = sysfs_chmod_file(&pdev->dev.kobj,
+                                                    f71805f_attr_pwm[i],
+                                                    S_IRUGO | S_IWUSR))) {
+                                dev_err(&pdev->dev, "chmod +w pwm%d failed\n",
+                                        i + 1);
+                                goto exit_remove_files;
+                        }
+                }
+        }
 
         data->class_dev = hwmon_device_register(&pdev->dev);
         if (IS_ERR(data->class_dev)) {
@@ -849,8 +1226,9 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
 
 exit_remove_files:
         sysfs_remove_group(&pdev->dev.kobj, &f71805f_group);
-        for (i = 0; i < 3; i++)
-                sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_fan[i]);
+        for (i = 0; i < 4; i++)
+                sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_optin[i]);
+        sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_pwm_freq);
 exit_free:
         platform_set_drvdata(pdev, NULL);
         kfree(data);
@@ -866,8 +1244,9 @@ static int __devexit f71805f_remove(struct platform_device *pdev)
         platform_set_drvdata(pdev, NULL);
         hwmon_device_unregister(data->class_dev);
         sysfs_remove_group(&pdev->dev.kobj, &f71805f_group);
-        for (i = 0; i < 3; i++)
-                sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_fan[i]);
+        for (i = 0; i < 4; i++)
+                sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_optin[i]);
+        sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_pwm_freq);
         kfree(data);
 
         return 0;
@@ -882,7 +1261,8 @@ static struct platform_driver f71805f_driver = {
         .remove         = __devexit_p(f71805f_remove),
 };
 
-static int __init f71805f_device_add(unsigned short address)
+static int __init f71805f_device_add(unsigned short address,
+                                     const struct f71805f_sio_data *sio_data)
 {
         struct resource res = {
                 .start  = address,
@@ -906,26 +1286,45 @@ static int __init f71805f_device_add(unsigned short address)
                 goto exit_device_put;
         }
 
+        pdev->dev.platform_data = kmalloc(sizeof(struct f71805f_sio_data),
+                                          GFP_KERNEL);
+        if (!pdev->dev.platform_data) {
+                err = -ENOMEM;
+                printk(KERN_ERR DRVNAME ": Platform data allocation failed\n");
+                goto exit_device_put;
+        }
+        memcpy(pdev->dev.platform_data, sio_data,
+               sizeof(struct f71805f_sio_data));
+
         err = platform_device_add(pdev);
         if (err) {
                 printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
                        err);
-                goto exit_device_put;
+                goto exit_kfree_data;
         }
 
         return 0;
 
+exit_kfree_data:
+        kfree(pdev->dev.platform_data);
+        pdev->dev.platform_data = NULL;
 exit_device_put:
         platform_device_put(pdev);
 exit:
         return err;
 }
 
-static int __init f71805f_find(int sioaddr, unsigned short *address)
+static int __init f71805f_find(int sioaddr, unsigned short *address,
+                               struct f71805f_sio_data *sio_data)
 {
         int err = -ENODEV;
         u16 devid;
 
+        static const char *names[] = {
+                "F71805F/FG",
+                "F71872F/FG",
+        };
+
         superio_enter(sioaddr);
 
         devid = superio_inw(sioaddr, SIO_REG_MANID);
@@ -933,7 +1332,15 @@ static int __init f71805f_find(int sioaddr, unsigned short *address)
                 goto exit;
 
         devid = superio_inw(sioaddr, SIO_REG_DEVID);
-        if (devid != SIO_F71805F_ID) {
+        switch (devid) {
+        case SIO_F71805F_ID:
+                sio_data->kind = f71805f;
+                break;
+        case SIO_F71872F_ID:
+                sio_data->kind = f71872f;
+                sio_data->fnsel1 = superio_inb(sioaddr, SIO_REG_FNSEL1);
+                break;
+        default:
                 printk(KERN_INFO DRVNAME ": Unsupported Fintek device, "
                        "skipping\n");
                 goto exit;
@@ -952,10 +1359,12 @@ static int __init f71805f_find(int sioaddr, unsigned short *address)
                        "skipping\n");
                 goto exit;
         }
+        *address &= ~(REGION_LENGTH - 1);       /* Ignore 3 LSB */
 
         err = 0;
-        printk(KERN_INFO DRVNAME ": Found F71805F chip at %#x, revision %u\n",
-               *address, superio_inb(sioaddr, SIO_REG_DEVREV));
+        printk(KERN_INFO DRVNAME ": Found %s chip at %#x, revision %u\n",
+               names[sio_data->kind], *address,
+               superio_inb(sioaddr, SIO_REG_DEVREV));
 
 exit:
         superio_exit(sioaddr);
@@ -966,9 +1375,10 @@ static int __init f71805f_init(void)
 {
         int err;
         unsigned short address;
+        struct f71805f_sio_data sio_data;
 
-        if (f71805f_find(0x2e, &address)
-         && f71805f_find(0x4e, &address))
+        if (f71805f_find(0x2e, &address, &sio_data)
+         && f71805f_find(0x4e, &address, &sio_data))
                 return -ENODEV;
 
         err = platform_driver_register(&f71805f_driver);
@@ -976,7 +1386,7 @@ static int __init f71805f_init(void)
                 goto exit;
 
         /* Sets global pdev as a side effect */
-        err = f71805f_device_add(address);
+        err = f71805f_device_add(address, &sio_data);
         if (err)
                 goto exit_driver;
 
@@ -990,13 +1400,16 @@ exit:
 
 static void __exit f71805f_exit(void)
 {
+        kfree(pdev->dev.platform_data);
+        pdev->dev.platform_data = NULL;
         platform_device_unregister(pdev);
+
         platform_driver_unregister(&f71805f_driver);
 }
 
 MODULE_AUTHOR("Jean Delvare <khali@linux-fr>");
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("F71805F hardware monitoring driver");
+MODULE_DESCRIPTION("F71805F/F71872F hardware monitoring driver");
 
 module_init(f71805f_init);
 module_exit(f71805f_exit);
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index e8ef62b83d6b..bf759ea545ac 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -478,74 +478,64 @@ static struct attribute_group hdaps_attribute_group = {
 /* Module stuff */
 
 /* hdaps_dmi_match - found a match.  return one, short-circuiting the hunt. */
-static int hdaps_dmi_match(struct dmi_system_id *id)
+static int __init hdaps_dmi_match(struct dmi_system_id *id)
 {
         printk(KERN_INFO "hdaps: %s detected.\n", id->ident);
         return 1;
 }
 
 /* hdaps_dmi_match_invert - found an inverted match. */
-static int hdaps_dmi_match_invert(struct dmi_system_id *id)
+static int __init hdaps_dmi_match_invert(struct dmi_system_id *id)
 {
         hdaps_invert = 1;
         printk(KERN_INFO "hdaps: inverting axis readings.\n");
         return hdaps_dmi_match(id);
 }
 
-#define HDAPS_DMI_MATCH_NORMAL(model)   {               \
-        .ident = "IBM " model,                          \
+#define HDAPS_DMI_MATCH_NORMAL(vendor, model) {         \
+        .ident = vendor " " model,                      \
         .callback = hdaps_dmi_match,                    \
         .matches = {                                    \
-                DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),     \
+                DMI_MATCH(DMI_BOARD_VENDOR, vendor),    \
                 DMI_MATCH(DMI_PRODUCT_VERSION, model)   \
         }                                               \
 }
 
-#define HDAPS_DMI_MATCH_INVERT(model)   {               \
-        .ident = "IBM " model,                          \
+#define HDAPS_DMI_MATCH_INVERT(vendor, model) {         \
+        .ident = vendor " " model,                      \
         .callback = hdaps_dmi_match_invert,             \
         .matches = {                                    \
-                DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),     \
+                DMI_MATCH(DMI_BOARD_VENDOR, vendor),    \
                 DMI_MATCH(DMI_PRODUCT_VERSION, model)   \
         }                                               \
 }
 
-#define HDAPS_DMI_MATCH_LENOVO(model)   {               \
-        .ident = "Lenovo " model,                       \
-        .callback = hdaps_dmi_match_invert,             \
-        .matches = {                                    \
-                DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),  \
-                DMI_MATCH(DMI_PRODUCT_VERSION, model)   \
-        }                                               \
-}
+/* Note that HDAPS_DMI_MATCH_NORMAL("ThinkPad T42") would match
+   "ThinkPad T42p", so the order of the entries matters.
+   If your ThinkPad is not recognized, please update to latest
+   BIOS. This is especially the case for some R52 ThinkPads. */
+static struct dmi_system_id __initdata hdaps_whitelist[] = {
+        HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p"),
+        HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
+        HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
+        HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"),
+        HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"),
+        HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"),
+        HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T42p"),
+        HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T42"),
+        HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"),
+        HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X40"),
+        HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X41"),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X60"),
+        HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad Z60m"),
+        { .ident = NULL }
+};
 
 static int __init hdaps_init(void)
 {
         int ret;
 
-        /* Note that HDAPS_DMI_MATCH_NORMAL("ThinkPad T42") would match
-          "ThinkPad T42p", so the order of the entries matters */
-        struct dmi_system_id hdaps_whitelist[] = {
-                HDAPS_DMI_MATCH_NORMAL("ThinkPad H"),
-                HDAPS_DMI_MATCH_INVERT("ThinkPad R50p"),
-                HDAPS_DMI_MATCH_NORMAL("ThinkPad R50"),
-                HDAPS_DMI_MATCH_NORMAL("ThinkPad R51"),
-                HDAPS_DMI_MATCH_NORMAL("ThinkPad R52"),
-                HDAPS_DMI_MATCH_NORMAL("ThinkPad H"),    /* R52 (1846AQG) */
-                HDAPS_DMI_MATCH_INVERT("ThinkPad T41p"),
-                HDAPS_DMI_MATCH_NORMAL("ThinkPad T41"),
-                HDAPS_DMI_MATCH_INVERT("ThinkPad T42p"),
-                HDAPS_DMI_MATCH_NORMAL("ThinkPad T42"),
-                HDAPS_DMI_MATCH_NORMAL("ThinkPad T43"),
-                HDAPS_DMI_MATCH_LENOVO("ThinkPad T60p"),
-                HDAPS_DMI_MATCH_LENOVO("ThinkPad T60"),
-                HDAPS_DMI_MATCH_NORMAL("ThinkPad X40"),
-                HDAPS_DMI_MATCH_NORMAL("ThinkPad X41"),
-                HDAPS_DMI_MATCH_LENOVO("ThinkPad X60"),
-                HDAPS_DMI_MATCH_NORMAL("ThinkPad Z60m"),
-                { .ident = NULL }
-        };
-
         if (!dmi_check_system(hdaps_whitelist)) {
                 printk(KERN_WARNING "hdaps: supported laptop not found!\n");
                 ret = -ENODEV;
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c
index 9d67320e6840..31c42002708f 100644
--- a/drivers/hwmon/hwmon-vid.c
+++ b/drivers/hwmon/hwmon-vid.c
@@ -1,7 +1,7 @@
 /*
     hwmon-vid.c - VID/VRM/VRD voltage conversions
 
-    Copyright (c) 2004 Rudolf Marek <r.marek@sh.cvut.cz>
+    Copyright (c) 2004 Rudolf Marek <r.marek@assembler.cz>
 
     Partly imported from i2c-vid.h of the lm_sensors project
     Copyright (c) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
@@ -232,7 +232,7 @@ u8 vid_which_vrm(void)
 EXPORT_SYMBOL(vid_from_reg);
 EXPORT_SYMBOL(vid_which_vrm);
 
-MODULE_AUTHOR("Rudolf Marek <r.marek@sh.cvut.cz>");
+MODULE_AUTHOR("Rudolf Marek <r.marek@assembler.cz>");
 
 MODULE_DESCRIPTION("hwmon-vid driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 323ef06719c1..1ed8b7e2c35d 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -3,7 +3,7 @@
              monitoring.
 
     Supports: IT8705F  Super I/O chip w/LPC interface
-              IT8712F  Super I/O chip w/LPC interface & SMBus
+              IT8712F  Super I/O chip w/LPC interface
               IT8716F  Super I/O chip w/LPC interface
               IT8718F  Super I/O chip w/LPC interface
               Sis950   A clone of the IT8705F
@@ -41,12 +41,8 @@
 #include <asm/io.h>
 
 
-/* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END };
 static unsigned short isa_address;
-
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_4(it87, it8712, it8716, it8718);
+enum chips { it87, it8712, it8716, it8718 };
 
 #define REG     0x2e    /* The register to read/write */
 #define DEV     0x07    /* Register: Logical device select */
@@ -162,8 +158,6 @@ static u8 vid_value;
 #define IT87_REG_TEMP_HIGH(nr) (0x40 + (nr) * 2)
 #define IT87_REG_TEMP_LOW(nr)  (0x41 + (nr) * 2)
 
-#define IT87_REG_I2C_ADDR      0x48
-
 #define IT87_REG_VIN_ENABLE    0x50
 #define IT87_REG_TEMP_ENABLE   0x51
 
@@ -242,33 +236,22 @@ struct it87_data {
 };
 
 
-static int it87_attach_adapter(struct i2c_adapter *adapter);
-static int it87_isa_attach_adapter(struct i2c_adapter *adapter);
-static int it87_detect(struct i2c_adapter *adapter, int address, int kind);
+static int it87_detect(struct i2c_adapter *adapter);
 static int it87_detach_client(struct i2c_client *client);
 
 static int it87_read_value(struct i2c_client *client, u8 reg);
-static int it87_write_value(struct i2c_client *client, u8 reg, u8 value);
+static void it87_write_value(struct i2c_client *client, u8 reg, u8 value);
 static struct it87_data *it87_update_device(struct device *dev);
 static int it87_check_pwm(struct i2c_client *client);
 static void it87_init_client(struct i2c_client *client, struct it87_data *data);
 
 
-static struct i2c_driver it87_driver = {
-        .driver = {
-                .name   = "it87",
-        },
-        .id             = I2C_DRIVERID_IT87,
-        .attach_adapter = it87_attach_adapter,
-        .detach_client  = it87_detach_client,
-};
-
 static struct i2c_driver it87_isa_driver = {
         .driver = {
                 .owner  = THIS_MODULE,
                 .name   = "it87-isa",
         },
-        .attach_adapter = it87_isa_attach_adapter,
+        .attach_adapter = it87_detect,
         .detach_client  = it87_detach_client,
 };
 
@@ -850,22 +833,6 @@ static const struct attribute_group it87_group_opt = {
         .attrs = it87_attributes_opt,
 };
 
-/* This function is called when:
-     * it87_driver is inserted (when this module is loaded), for each
-       available adapter
-     * when a new adapter is inserted (and it87_driver is still present) */
-static int it87_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_probe(adapter, &addr_data, it87_detect);
-}
-
-static int it87_isa_attach_adapter(struct i2c_adapter *adapter)
-{
-        return it87_detect(adapter, isa_address, -1);
-}
-
 /* SuperIO detection - will change isa_address if a chip is found */
 static int __init it87_find(unsigned short *address)
 {
@@ -916,29 +883,20 @@ exit:
 }
 
 /* This function is called by i2c_probe */
-static int it87_detect(struct i2c_adapter *adapter, int address, int kind)
+static int it87_detect(struct i2c_adapter *adapter)
 {
-        int i;
         struct i2c_client *new_client;
         struct it87_data *data;
         int err = 0;
-        const char *name = "";
-        int is_isa = i2c_is_isa_adapter(adapter);
+        const char *name;
         int enable_pwm_interface;
 
-        if (!is_isa && 
-            !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-                goto ERROR0;
-
         /* Reserve the ISA region */
-        if (is_isa)
-                if (!request_region(address, IT87_EXTENT,
-                                    it87_isa_driver.driver.name))
-                        goto ERROR0;
-
-        /* For now, we presume we have a valid client. We create the
-           client structure, even though we cannot fill it completely yet.
-           But it allows us to access it87_{read,write}_value. */
+        if (!request_region(isa_address, IT87_EXTENT,
+                            it87_isa_driver.driver.name)){
+                err = -EBUSY;
+                goto ERROR0;
+        }
 
         if (!(data = kzalloc(sizeof(struct it87_data), GFP_KERNEL))) {
                 err = -ENOMEM;
@@ -946,80 +904,46 @@ static int it87_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         new_client = &data->client;
-        if (is_isa)
-                mutex_init(&data->lock);
+        mutex_init(&data->lock);
         i2c_set_clientdata(new_client, data);
-        new_client->addr = address;
+        new_client->addr = isa_address;
         new_client->adapter = adapter;
-        new_client->driver = is_isa ? &it87_isa_driver : &it87_driver;
-        new_client->flags = 0;
+        new_client->driver = &it87_isa_driver;
 
         /* Now, we do the remaining detection. */
-
-        if (kind < 0) {
-                if ((it87_read_value(new_client, IT87_REG_CONFIG) & 0x80)
-                  || (!is_isa
-                   && it87_read_value(new_client, IT87_REG_I2C_ADDR) != address)) {
-                        err = -ENODEV;
-                        goto ERROR2;
-                }
+        if ((it87_read_value(new_client, IT87_REG_CONFIG) & 0x80)
+         || it87_read_value(new_client, IT87_REG_CHIPID) != 0x90) {
+                err = -ENODEV;
+                goto ERROR2;
         }
 
         /* Determine the chip type. */
-        if (kind <= 0) {
-                i = it87_read_value(new_client, IT87_REG_CHIPID);
-                if (i == 0x90) {
-                        kind = it87;
-                        if (is_isa) {
-                                switch (chip_type) {
-                                case IT8712F_DEVID:
-                                        kind = it8712;
-                                        break;
-                                case IT8716F_DEVID:
-                                        kind = it8716;
-                                        break;
-                                case IT8718F_DEVID:
-                                        kind = it8718;
-                                        break;
-                                }
-                        }
-                }
-                else {
-                        if (kind == 0)
-                                dev_info(&adapter->dev, 
-                                        "Ignoring 'force' parameter for unknown chip at "
-                                        "adapter %d, address 0x%02x\n",
-                                        i2c_adapter_id(adapter), address);
-                        err = -ENODEV;
-                        goto ERROR2;
-                }
-        }
-
-        if (kind == it87) {
-                name = "it87";
-        } else if (kind == it8712) {
+        switch (chip_type) {
+        case IT8712F_DEVID:
+                data->type = it8712;
                 name = "it8712";
-        } else if (kind == it8716) {
+                break;
+        case IT8716F_DEVID:
+                data->type = it8716;
                 name = "it8716";
-        } else if (kind == it8718) {
+                break;
+        case IT8718F_DEVID:
+                data->type = it8718;
                 name = "it8718";
+                break;
+        default:
+                data->type = it87;
+                name = "it87";
         }
 
         /* Fill in the remaining client fields and put it into the global list */
         strlcpy(new_client->name, name, I2C_NAME_SIZE);
-        data->type = kind;
-        data->valid = 0;
         mutex_init(&data->update_lock);
 
         /* Tell the I2C layer a new client has arrived */
         if ((err = i2c_attach_client(new_client)))
                 goto ERROR2;
 
-        if (!is_isa)
-                dev_info(&new_client->dev, "The I2C interface to IT87xxF "
-                         "hardware monitoring chips is deprecated. Please "
-                         "report if you still rely on it.\n");
-
         /* Check PWM configuration */
         enable_pwm_interface = it87_check_pwm(new_client);
 
@@ -1129,8 +1053,7 @@ ERROR3:
 ERROR2:
         kfree(data);
 ERROR1:
-        if (is_isa)
-                release_region(address, IT87_EXTENT);
+        release_region(isa_address, IT87_EXTENT);
 ERROR0:
         return err;
 }
@@ -1147,50 +1070,39 @@ static int it87_detach_client(struct i2c_client *client)
         if ((err = i2c_detach_client(client)))
                 return err;
 
-        if(i2c_is_isa_client(client))
-                release_region(client->addr, IT87_EXTENT);
+        release_region(client->addr, IT87_EXTENT);
         kfree(data);
 
         return 0;
 }
 
-/* The SMBus locks itself, but ISA access must be locked explicitly! 
-   We don't want to lock the whole ISA bus, so we lock each client
-   separately.
+/* ISA access must be locked explicitly!
    We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks,
    would slow down the IT87 access and should not be necessary. */
 static int it87_read_value(struct i2c_client *client, u8 reg)
 {
         struct it87_data *data = i2c_get_clientdata(client);
-
         int res;
-        if (i2c_is_isa_client(client)) {
-                mutex_lock(&data->lock);
-                outb_p(reg, client->addr + IT87_ADDR_REG_OFFSET);
-                res = inb_p(client->addr + IT87_DATA_REG_OFFSET);
-                mutex_unlock(&data->lock);
-                return res;
-        } else
-                return i2c_smbus_read_byte_data(client, reg);
+
+        mutex_lock(&data->lock);
+        outb_p(reg, client->addr + IT87_ADDR_REG_OFFSET);
+        res = inb_p(client->addr + IT87_DATA_REG_OFFSET);
+        mutex_unlock(&data->lock);
+
+        return res;
 }
 
-/* The SMBus locks itself, but ISA access muse be locked explicitly! 
-   We don't want to lock the whole ISA bus, so we lock each client
-   separately.
+/* ISA access must be locked explicitly!
    We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks,
    would slow down the IT87 access and should not be necessary. */
-static int it87_write_value(struct i2c_client *client, u8 reg, u8 value)
+static void it87_write_value(struct i2c_client *client, u8 reg, u8 value)
 {
         struct it87_data *data = i2c_get_clientdata(client);
 
-        if (i2c_is_isa_client(client)) {
-                mutex_lock(&data->lock);
-                outb_p(reg, client->addr + IT87_ADDR_REG_OFFSET);
-                outb_p(value, client->addr + IT87_DATA_REG_OFFSET);
-                mutex_unlock(&data->lock);
-                return 0;
-        } else
-                return i2c_smbus_write_byte_data(client, reg, value);
+        mutex_lock(&data->lock);
+        outb_p(reg, client->addr + IT87_ADDR_REG_OFFSET);
+        outb_p(value, client->addr + IT87_DATA_REG_OFFSET);
+        mutex_unlock(&data->lock);
 }
 
 /* Return 1 if and only if the PWM interface is safe to use */
@@ -1426,26 +1338,14 @@ static int __init sm_it87_init(void)
 {
         int res;
 
-        res = i2c_add_driver(&it87_driver);
-        if (res)
+        if ((res = it87_find(&isa_address)))
                 return res;
-
-        if (!it87_find(&isa_address)) {
-                res = i2c_isa_add_driver(&it87_isa_driver);
-                if (res) {
-                        i2c_del_driver(&it87_driver);
-                        return res;
-                }
-        }
-
-        return 0;
+        return i2c_isa_add_driver(&it87_isa_driver);
 }
 
 static void __exit sm_it87_exit(void)
 {
-        if (isa_address)
-                i2c_isa_del_driver(&it87_isa_driver);
-        i2c_del_driver(&it87_driver);
+        i2c_isa_del_driver(&it87_isa_driver);
 }
 
 
diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
index f58b64ed09e3..5d8d0ca08fa9 100644
--- a/drivers/hwmon/k8temp.c
+++ b/drivers/hwmon/k8temp.c
@@ -1,7 +1,7 @@
 /*
  * k8temp.c - Linux kernel module for hardware monitoring
  *
- * Copyright (C) 2006 Rudolf Marek <r.marek@sh.cvut.cz>
+ * Copyright (C) 2006 Rudolf Marek <r.marek@assembler.cz>
  *
  * Inspired from the w83785 and amd756 drivers.
  *
@@ -286,7 +286,7 @@ static void __exit k8temp_exit(void)
         pci_unregister_driver(&k8temp_driver);
 }
 
-MODULE_AUTHOR("Rudolf Marek <r.marek@sh.cvut.cz>");
+MODULE_AUTHOR("Rudolf Marek <r.marek@assembler.cz>");
 MODULE_DESCRIPTION("AMD K8 core temperature monitor");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index 3b8b81984ad4..c8a21be09d87 100644
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -1000,7 +1000,7 @@ static int pc87360_detect(struct i2c_adapter *adapter)
                         (i&0x02) ? "external" : "internal");
 
                 data->vid_conf = confreg[3];
-                data->vrm = 90;
+                data->vrm = vid_which_vrm();
         }
 
         /* Fan clock dividers may be needed before any data is read */
diff --git a/drivers/hwmon/pc87427.c b/drivers/hwmon/pc87427.c
new file mode 100644
index 000000000000..affa21a5ccfd
--- /dev/null
+++ b/drivers/hwmon/pc87427.c
@@ -0,0 +1,627 @@
+/*
+ *  pc87427.c - hardware monitoring driver for the
+ *              National Semiconductor PC87427 Super-I/O chip
+ *  Copyright (C) 2006 Jean Delvare <khali@linux-fr.org>
+ *
+ *  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.
+ *
+ *  Supports the following chips:
+ *
+ *  Chip        #vin    #fan    #pwm    #temp   devid
+ *  PC87427     -       8       -       -       0xF2
+ *
+ *  This driver assumes that no more than one chip is present.
+ *  Only fan inputs are supported so far, although the chip can do much more.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/jiffies.h>
+#include <linux/platform_device.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/sysfs.h>
+#include <asm/io.h>
+
+static struct platform_device *pdev;
+
+#define DRVNAME "pc87427"
+
+/* The lock mutex protects both the I/O accesses (needed because the
+   device is using banked registers) and the register cache (needed to keep
+   the data in the registers and the cache in sync at any time). */
+struct pc87427_data {
+        struct class_device *class_dev;
+        struct mutex lock;
+        int address[2];
+        const char *name;
+
+        unsigned long last_updated;     /* in jiffies */
+        u8 fan_enabled;                 /* bit vector */
+        u16 fan[8];                     /* register values */
+        u16 fan_min[8];                 /* register values */
+        u8 fan_status[8];               /* register values */
+};
+
+/*
+ * Super-I/O registers and operations
+ */
+
+#define SIOREG_LDSEL    0x07    /* Logical device select */
+#define SIOREG_DEVID    0x20    /* Device ID */
+#define SIOREG_ACT      0x30    /* Device activation */
+#define SIOREG_MAP      0x50    /* I/O or memory mapping */
+#define SIOREG_IOBASE   0x60    /* I/O base address */
+
+static const u8 logdev[2] = { 0x09, 0x14 };
+static const char *logdev_str[2] = { DRVNAME " FMC", DRVNAME " HMC" };
+#define LD_FAN          0
+#define LD_IN           1
+#define LD_TEMP         1
+
+static inline void superio_outb(int sioaddr, int reg, int val)
+{
+        outb(reg, sioaddr);
+        outb(val, sioaddr + 1);
+}
+
+static inline int superio_inb(int sioaddr, int reg)
+{
+        outb(reg, sioaddr);
+        return inb(sioaddr + 1);
+}
+
+static inline void superio_exit(int sioaddr)
+{
+        outb(0x02, sioaddr);
+        outb(0x02, sioaddr + 1);
+}
+
+/*
+ * Logical devices
+ */
+
+#define REGION_LENGTH           32
+#define PC87427_REG_BANK        0x0f
+#define BANK_FM(nr)             (nr)
+#define BANK_FT(nr)             (0x08 + (nr))
+#define BANK_FC(nr)             (0x10 + (nr) * 2)
+
+/*
+ * I/O access functions
+ */
+
+/* ldi is the logical device index */
+static inline int pc87427_read8(struct pc87427_data *data, u8 ldi, u8 reg)
+{
+        return inb(data->address[ldi] + reg);
+}
+
+/* Must be called with data->lock held, except during init */
+static inline int pc87427_read8_bank(struct pc87427_data *data, u8 ldi,
+                                     u8 bank, u8 reg)
+{
+        outb(bank, data->address[ldi] + PC87427_REG_BANK);
+        return inb(data->address[ldi] + reg);
+}
+
+/* Must be called with data->lock held, except during init */
+static inline void pc87427_write8_bank(struct pc87427_data *data, u8 ldi,
+                                       u8 bank, u8 reg, u8 value)
+{
+        outb(bank, data->address[ldi] + PC87427_REG_BANK);
+        outb(value, data->address[ldi] + reg);
+}
+
+/*
+ * Fan registers and conversions
+ */
+
+/* fan data registers are 16-bit wide */
+#define PC87427_REG_FAN                 0x12
+#define PC87427_REG_FAN_MIN             0x14
+#define PC87427_REG_FAN_STATUS          0x10
+
+#define FAN_STATUS_STALL                (1 << 3)
+#define FAN_STATUS_LOSPD                (1 << 1)
+#define FAN_STATUS_MONEN                (1 << 0)
+
+/* Dedicated function to read all registers related to a given fan input.
+   This saves us quite a few locks and bank selections.
+   Must be called with data->lock held.
+   nr is from 0 to 7 */
+static void pc87427_readall_fan(struct pc87427_data *data, u8 nr)
+{
+        int iobase = data->address[LD_FAN];
+
+        outb(BANK_FM(nr), iobase + PC87427_REG_BANK);
+        data->fan[nr] = inw(iobase + PC87427_REG_FAN);
+        data->fan_min[nr] = inw(iobase + PC87427_REG_FAN_MIN);
+        data->fan_status[nr] = inb(iobase + PC87427_REG_FAN_STATUS);
+        /* Clear fan alarm bits */
+        outb(data->fan_status[nr], iobase + PC87427_REG_FAN_STATUS);
+}
+
+/* The 2 LSB of fan speed registers are used for something different.
+   The actual 2 LSB of the measurements are not available. */
+static inline unsigned long fan_from_reg(u16 reg)
+{
+        reg &= 0xfffc;
+        if (reg == 0x0000 || reg == 0xfffc)
+                return 0;
+        return 5400000UL / reg;
+}
+
+/* The 2 LSB of the fan speed limit registers are not significant. */
+static inline u16 fan_to_reg(unsigned long val)
+{
+        if (val < 83UL)
+                return 0xffff;
+        if (val >= 1350000UL)
+                return 0x0004;
+        return ((1350000UL + val / 2) / val) << 2;
+}
+
+/*
+ * Data interface
+ */
+
+static struct pc87427_data *pc87427_update_device(struct device *dev)
+{
+        struct pc87427_data *data = dev_get_drvdata(dev);
+        int i;
+
+        mutex_lock(&data->lock);
+        if (!time_after(jiffies, data->last_updated + HZ)
+         && data->last_updated)
+                goto done;
+
+        /* Fans */
+        for (i = 0; i < 8; i++) {
+                if (!(data->fan_enabled & (1 << i)))
+                        continue;
+                pc87427_readall_fan(data, i);
+        }
+        data->last_updated = jiffies;
+
+done:
+        mutex_unlock(&data->lock);
+        return data;
+}
+
+static ssize_t show_fan_input(struct device *dev, struct device_attribute
+                              *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87427_data *data = pc87427_update_device(dev);
+        int nr = attr->index;
+
+        return sprintf(buf, "%lu\n", fan_from_reg(data->fan[nr]));
+}
+
+static ssize_t show_fan_min(struct device *dev, struct device_attribute
+                            *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87427_data *data = pc87427_update_device(dev);
+        int nr = attr->index;
+
+        return sprintf(buf, "%lu\n", fan_from_reg(data->fan_min[nr]));
+}
+
+static ssize_t show_fan_alarm(struct device *dev, struct device_attribute
+                              *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87427_data *data = pc87427_update_device(dev);
+        int nr = attr->index;
+
+        return sprintf(buf, "%d\n", !!(data->fan_status[nr]
+                                       & FAN_STATUS_LOSPD));
+}
+
+static ssize_t show_fan_fault(struct device *dev, struct device_attribute
+                              *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87427_data *data = pc87427_update_device(dev);
+        int nr = attr->index;
+
+        return sprintf(buf, "%d\n", !!(data->fan_status[nr]
+                                       & FAN_STATUS_STALL));
+}
+
+static ssize_t set_fan_min(struct device *dev, struct device_attribute
+                           *devattr, const char *buf, size_t count)
+{
+        struct pc87427_data *data = dev_get_drvdata(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+        int iobase = data->address[LD_FAN];
+
+        mutex_lock(&data->lock);
+        outb(BANK_FM(nr), iobase + PC87427_REG_BANK);
+        /* The low speed limit registers are read-only while monitoring
+           is enabled, so we have to disable monitoring, then change the
+           limit, and finally enable monitoring again. */
+        outb(0, iobase + PC87427_REG_FAN_STATUS);
+        data->fan_min[nr] = fan_to_reg(val);
+        outw(data->fan_min[nr], iobase + PC87427_REG_FAN_MIN);
+        outb(FAN_STATUS_MONEN, iobase + PC87427_REG_FAN_STATUS);
+        mutex_unlock(&data->lock);
+
+        return count;
+}
+
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan_input, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan_input, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan3_input, S_IRUGO, show_fan_input, NULL, 2);
+static SENSOR_DEVICE_ATTR(fan4_input, S_IRUGO, show_fan_input, NULL, 3);
+static SENSOR_DEVICE_ATTR(fan5_input, S_IRUGO, show_fan_input, NULL, 4);
+static SENSOR_DEVICE_ATTR(fan6_input, S_IRUGO, show_fan_input, NULL, 5);
+static SENSOR_DEVICE_ATTR(fan7_input, S_IRUGO, show_fan_input, NULL, 6);
+static SENSOR_DEVICE_ATTR(fan8_input, S_IRUGO, show_fan_input, NULL, 7);
+
+static SENSOR_DEVICE_ATTR(fan1_min, S_IWUSR | S_IRUGO,
+                          show_fan_min, set_fan_min, 0);
+static SENSOR_DEVICE_ATTR(fan2_min, S_IWUSR | S_IRUGO,
+                          show_fan_min, set_fan_min, 1);
+static SENSOR_DEVICE_ATTR(fan3_min, S_IWUSR | S_IRUGO,
+                          show_fan_min, set_fan_min, 2);
+static SENSOR_DEVICE_ATTR(fan4_min, S_IWUSR | S_IRUGO,
+                          show_fan_min, set_fan_min, 3);
+static SENSOR_DEVICE_ATTR(fan5_min, S_IWUSR | S_IRUGO,
+                          show_fan_min, set_fan_min, 4);
+static SENSOR_DEVICE_ATTR(fan6_min, S_IWUSR | S_IRUGO,
+                          show_fan_min, set_fan_min, 5);
+static SENSOR_DEVICE_ATTR(fan7_min, S_IWUSR | S_IRUGO,
+                          show_fan_min, set_fan_min, 6);
+static SENSOR_DEVICE_ATTR(fan8_min, S_IWUSR | S_IRUGO,
+                          show_fan_min, set_fan_min, 7);
+
+static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_fan_alarm, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_fan_alarm, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan3_alarm, S_IRUGO, show_fan_alarm, NULL, 2);
+static SENSOR_DEVICE_ATTR(fan4_alarm, S_IRUGO, show_fan_alarm, NULL, 3);
+static SENSOR_DEVICE_ATTR(fan5_alarm, S_IRUGO, show_fan_alarm, NULL, 4);
+static SENSOR_DEVICE_ATTR(fan6_alarm, S_IRUGO, show_fan_alarm, NULL, 5);
+static SENSOR_DEVICE_ATTR(fan7_alarm, S_IRUGO, show_fan_alarm, NULL, 6);
+static SENSOR_DEVICE_ATTR(fan8_alarm, S_IRUGO, show_fan_alarm, NULL, 7);
+
+static SENSOR_DEVICE_ATTR(fan1_fault, S_IRUGO, show_fan_fault, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan2_fault, S_IRUGO, show_fan_fault, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan3_fault, S_IRUGO, show_fan_fault, NULL, 2);
+static SENSOR_DEVICE_ATTR(fan4_fault, S_IRUGO, show_fan_fault, NULL, 3);
+static SENSOR_DEVICE_ATTR(fan5_fault, S_IRUGO, show_fan_fault, NULL, 4);
+static SENSOR_DEVICE_ATTR(fan6_fault, S_IRUGO, show_fan_fault, NULL, 5);
+static SENSOR_DEVICE_ATTR(fan7_fault, S_IRUGO, show_fan_fault, NULL, 6);
+static SENSOR_DEVICE_ATTR(fan8_fault, S_IRUGO, show_fan_fault, NULL, 7);
+
+static struct attribute *pc87427_attributes_fan[8][5] = {
+        {
+                &sensor_dev_attr_fan1_input.dev_attr.attr,
+                &sensor_dev_attr_fan1_min.dev_attr.attr,
+                &sensor_dev_attr_fan1_alarm.dev_attr.attr,
+                &sensor_dev_attr_fan1_fault.dev_attr.attr,
+                NULL
+        }, {
+                &sensor_dev_attr_fan2_input.dev_attr.attr,
+                &sensor_dev_attr_fan2_min.dev_attr.attr,
+                &sensor_dev_attr_fan2_alarm.dev_attr.attr,
+                &sensor_dev_attr_fan2_fault.dev_attr.attr,
+                NULL
+        }, {
+                &sensor_dev_attr_fan3_input.dev_attr.attr,
+                &sensor_dev_attr_fan3_min.dev_attr.attr,
+                &sensor_dev_attr_fan3_alarm.dev_attr.attr,
+                &sensor_dev_attr_fan3_fault.dev_attr.attr,
+                NULL
+        }, {
+                &sensor_dev_attr_fan4_input.dev_attr.attr,
+                &sensor_dev_attr_fan4_min.dev_attr.attr,
+                &sensor_dev_attr_fan4_alarm.dev_attr.attr,
+                &sensor_dev_attr_fan4_fault.dev_attr.attr,
+                NULL
+        }, {
+                &sensor_dev_attr_fan5_input.dev_attr.attr,
+                &sensor_dev_attr_fan5_min.dev_attr.attr,
+                &sensor_dev_attr_fan5_alarm.dev_attr.attr,
+                &sensor_dev_attr_fan5_fault.dev_attr.attr,
+                NULL
+        }, {
+                &sensor_dev_attr_fan6_input.dev_attr.attr,
+                &sensor_dev_attr_fan6_min.dev_attr.attr,
+                &sensor_dev_attr_fan6_alarm.dev_attr.attr,
+                &sensor_dev_attr_fan6_fault.dev_attr.attr,
+                NULL
+        }, {
+                &sensor_dev_attr_fan7_input.dev_attr.attr,
+                &sensor_dev_attr_fan7_min.dev_attr.attr,
+                &sensor_dev_attr_fan7_alarm.dev_attr.attr,
+                &sensor_dev_attr_fan7_fault.dev_attr.attr,
+                NULL
+        }, {
+                &sensor_dev_attr_fan8_input.dev_attr.attr,
+                &sensor_dev_attr_fan8_min.dev_attr.attr,
+                &sensor_dev_attr_fan8_alarm.dev_attr.attr,
+                &sensor_dev_attr_fan8_fault.dev_attr.attr,
+                NULL
+        }
+};
+
+static const struct attribute_group pc87427_group_fan[8] = {
+        { .attrs = pc87427_attributes_fan[0] },
+        { .attrs = pc87427_attributes_fan[1] },
+        { .attrs = pc87427_attributes_fan[2] },
+        { .attrs = pc87427_attributes_fan[3] },
+        { .attrs = pc87427_attributes_fan[4] },
+        { .attrs = pc87427_attributes_fan[5] },
+        { .attrs = pc87427_attributes_fan[6] },
+        { .attrs = pc87427_attributes_fan[7] },
+};
+
+static ssize_t show_name(struct device *dev, struct device_attribute
+                         *devattr, char *buf)
+{
+        struct pc87427_data *data = dev_get_drvdata(dev);
+
+        return sprintf(buf, "%s\n", data->name);
+}
+static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
+
+
+/*
+ * Device detection, attach and detach
+ */
+
+static void __devinit pc87427_init_device(struct device *dev)
+{
+        struct pc87427_data *data = dev_get_drvdata(dev);
+        int i;
+        u8 reg;
+
+        /* The FMC module should be ready */
+        reg = pc87427_read8(data, LD_FAN, PC87427_REG_BANK);
+        if (!(reg & 0x80))
+                dev_warn(dev, "FMC module not ready!\n");
+
+        /* Check which fans are enabled */
+        for (i = 0; i < 8; i++) {
+                reg = pc87427_read8_bank(data, LD_FAN, BANK_FM(i),
+                                         PC87427_REG_FAN_STATUS);
+                if (reg & FAN_STATUS_MONEN)
+                        data->fan_enabled |= (1 << i);
+        }
+
+        if (!data->fan_enabled) {
+                dev_dbg(dev, "Enabling all fan inputs\n");
+                for (i = 0; i < 8; i++)
+                        pc87427_write8_bank(data, LD_FAN, BANK_FM(i),
+                                            PC87427_REG_FAN_STATUS,
+                                            FAN_STATUS_MONEN);
+                data->fan_enabled = 0xff;
+        }
+}
+
+static int __devinit pc87427_probe(struct platform_device *pdev)
+{
+        struct pc87427_data *data;
+        struct resource *res;
+        int i, err;
+
+        if (!(data = kzalloc(sizeof(struct pc87427_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                printk(KERN_ERR DRVNAME ": Out of memory\n");
+                goto exit;
+        }
+
+        /* This will need to be revisited when we add support for
+           temperature and voltage monitoring. */
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        data->address[0] = res->start;
+
+        mutex_init(&data->lock);
+        data->name = "pc87427";
+        platform_set_drvdata(pdev, data);
+        pc87427_init_device(&pdev->dev);
+
+        /* Register sysfs hooks */
+        if ((err = device_create_file(&pdev->dev, &dev_attr_name)))
+                goto exit_kfree;
+        for (i = 0; i < 8; i++) {
+                if (!(data->fan_enabled & (1 << i)))
+                        continue;
+                if ((err = sysfs_create_group(&pdev->dev.kobj,
+                                              &pc87427_group_fan[i])))
+                        goto exit_remove_files;
+        }
+
+        data->class_dev = hwmon_device_register(&pdev->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                dev_err(&pdev->dev, "Class registration failed (%d)\n", err);
+                goto exit_remove_files;
+        }
+
+        return 0;
+
+exit_remove_files:
+        for (i = 0; i < 8; i++) {
+                if (!(data->fan_enabled & (1 << i)))
+                        continue;
+                sysfs_remove_group(&pdev->dev.kobj, &pc87427_group_fan[i]);
+        }
+exit_kfree:
+        platform_set_drvdata(pdev, NULL);
+        kfree(data);
+exit:
+        return err;
+}
+
+static int __devexit pc87427_remove(struct platform_device *pdev)
+{
+        struct pc87427_data *data = platform_get_drvdata(pdev);
+        int i;
+
+        platform_set_drvdata(pdev, NULL);
+        hwmon_device_unregister(data->class_dev);
+        device_remove_file(&pdev->dev, &dev_attr_name);
+        for (i = 0; i < 8; i++) {
+                if (!(data->fan_enabled & (1 << i)))
+                        continue;
+                sysfs_remove_group(&pdev->dev.kobj, &pc87427_group_fan[i]);
+        }
+        kfree(data);
+
+        return 0;
+}
+
+
+static struct platform_driver pc87427_driver = {
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = DRVNAME,
+        },
+        .probe          = pc87427_probe,
+        .remove         = __devexit_p(pc87427_remove),
+};
+
+static int __init pc87427_device_add(unsigned short address)
+{
+        struct resource res = {
+                .start  = address,
+                .end    = address + REGION_LENGTH - 1,
+                .name   = logdev_str[0],
+                .flags  = IORESOURCE_IO,
+        };
+        int err;
+
+        pdev = platform_device_alloc(DRVNAME, address);
+        if (!pdev) {
+                err = -ENOMEM;
+                printk(KERN_ERR DRVNAME ": Device allocation failed\n");
+                goto exit;
+        }
+
+        err = platform_device_add_resources(pdev, &res, 1);
+        if (err) {
+                printk(KERN_ERR DRVNAME ": Device resource addition failed "
+                       "(%d)\n", err);
+                goto exit_device_put;
+        }
+
+        err = platform_device_add(pdev);
+        if (err) {
+                printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
+                       err);
+                goto exit_device_put;
+        }
+
+        return 0;
+
+exit_device_put:
+        platform_device_put(pdev);
+exit:
+        return err;
+}
+
+static int __init pc87427_find(int sioaddr, unsigned short *address)
+{
+        u16 val;
+        int i, err = 0;
+
+        /* Identify device */
+        val = superio_inb(sioaddr, SIOREG_DEVID);
+        if (val != 0xf2) {      /* PC87427 */
+                err = -ENODEV;
+                goto exit;
+        }
+
+        for (i = 0; i < 2; i++) {
+                address[i] = 0;
+                /* Select logical device */
+                superio_outb(sioaddr, SIOREG_LDSEL, logdev[i]);
+
+                val = superio_inb(sioaddr, SIOREG_ACT);
+                if (!(val & 0x01)) {
+                        printk(KERN_INFO DRVNAME ": Logical device 0x%02x "
+                               "not activated\n", logdev[i]);
+                        continue;
+                }
+
+                val = superio_inb(sioaddr, SIOREG_MAP);
+                if (val & 0x01) {
+                        printk(KERN_WARNING DRVNAME ": Logical device 0x%02x "
+                               "is memory-mapped, can't use\n", logdev[i]);
+                        continue;
+                }
+
+                val = (superio_inb(sioaddr, SIOREG_IOBASE) << 8)
+                    | superio_inb(sioaddr, SIOREG_IOBASE + 1);
+                if (!val) {
+                        printk(KERN_INFO DRVNAME ": I/O base address not set "
+                               "for logical device 0x%02x\n", logdev[i]);
+                        continue;
+                }
+                address[i] = val;
+        }
+
+exit:
+        superio_exit(sioaddr);
+        return err;
+}
+
+static int __init pc87427_init(void)
+{
+        int err;
+        unsigned short address[2];
+
+        if (pc87427_find(0x2e, address)
+         && pc87427_find(0x4e, address))
+                return -ENODEV;
+
+        /* For now the driver only handles fans so we only care about the
+           first address. */
+        if (!address[0])
+                return -ENODEV;
+
+        err = platform_driver_register(&pc87427_driver);
+        if (err)
+                goto exit;
+
+        /* Sets global pdev as a side effect */
+        err = pc87427_device_add(address[0]);
+        if (err)
+                goto exit_driver;
+
+        return 0;
+
+exit_driver:
+        platform_driver_unregister(&pc87427_driver);
+exit:
+        return err;
+}
+
+static void __exit pc87427_exit(void)
+{
+        platform_device_unregister(pdev);
+        platform_driver_unregister(&pc87427_driver);
+}
+
+MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");
+MODULE_DESCRIPTION("PC87427 hardware monitoring driver");
+MODULE_LICENSE("GPL");
+
+module_init(pc87427_init);
+module_exit(pc87427_exit);
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 2257806d0102..212a1558c63b 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -3,7 +3,7 @@
                 the Winbond W83627EHF Super-I/O chip
     Copyright (C) 2005  Jean Delvare <khali@linux-fr.org>
     Copyright (C) 2006  Yuan Mu (Winbond),
-                        Rudolf Marek <r.marek@sh.cvut.cz>
+                        Rudolf Marek <r.marek@assembler.cz>
                         David Hubbard <david.c.hubbard@gmail.com>
 
     Shamelessly ripped from the w83627hf driver
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index 4e108262576f..b0fa296740d1 100644
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -3,7 +3,7 @@
                 monitoring
     Copyright (C) 2004, 2005 Winbond Electronics Corp.
                         Chunhao Huang <DZShen@Winbond.com.tw>,
-                        Rudolf Marek <r.marek@sh.cvut.cz>
+                        Rudolf Marek <r.marek@assembler.cz>
 
     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
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
new file mode 100644
index 000000000000..c12ac5abc2bb
--- /dev/null
+++ b/drivers/hwmon/w83793.c
@@ -0,0 +1,1609 @@
+/*
+    w83793.c - Linux kernel driver for hardware monitoring
+    Copyright (C) 2006 Winbond Electronics Corp.
+                  Yuan Mu
+                  Rudolf Marek <r.marek@assembler.cz>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation - version 2.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301 USA.
+*/
+
+/*
+    Supports following chips:
+
+    Chip        #vin    #fanin  #pwm    #temp   wchipid vendid  i2c     ISA
+    w83793      10      12      8       6       0x7b    0x5ca3  yes     no
+*/
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
+
+/* Insmod parameters */
+I2C_CLIENT_INSMOD_1(w83793);
+I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
+                       "{bus, clientaddr, subclientaddr1, subclientaddr2}");
+
+static int reset;
+module_param(reset, bool, 0);
+MODULE_PARM_DESC(reset, "Set to 1 to reset chip, not recommended");
+
+/*
+   Address 0x00, 0x0d, 0x0e, 0x0f in all three banks are reserved
+   as ID, Bank Select registers
+*/
+#define W83793_REG_BANKSEL              0x00
+#define W83793_REG_VENDORID             0x0d
+#define W83793_REG_CHIPID               0x0e
+#define W83793_REG_DEVICEID             0x0f
+
+#define W83793_REG_CONFIG               0x40
+#define W83793_REG_MFC                  0x58
+#define W83793_REG_FANIN_CTRL           0x5c
+#define W83793_REG_FANIN_SEL            0x5d
+#define W83793_REG_I2C_ADDR             0x0b
+#define W83793_REG_I2C_SUBADDR          0x0c
+#define W83793_REG_VID_INA              0x05
+#define W83793_REG_VID_INB              0x06
+#define W83793_REG_VID_LATCHA           0x07
+#define W83793_REG_VID_LATCHB           0x08
+#define W83793_REG_VID_CTRL             0x59
+
+static u16 W83793_REG_TEMP_MODE[2] = { 0x5e, 0x5f };
+
+#define TEMP_READ       0
+#define TEMP_CRIT       1
+#define TEMP_CRIT_HYST  2
+#define TEMP_WARN       3
+#define TEMP_WARN_HYST  4
+/* only crit and crit_hyst affect real-time alarm status
+   current crit crit_hyst warn warn_hyst */
+static u16 W83793_REG_TEMP[][5] = {
+        {0x1c, 0x78, 0x79, 0x7a, 0x7b},
+        {0x1d, 0x7c, 0x7d, 0x7e, 0x7f},
+        {0x1e, 0x80, 0x81, 0x82, 0x83},
+        {0x1f, 0x84, 0x85, 0x86, 0x87},
+        {0x20, 0x88, 0x89, 0x8a, 0x8b},
+        {0x21, 0x8c, 0x8d, 0x8e, 0x8f},
+};
+
+#define W83793_REG_TEMP_LOW_BITS        0x22
+
+#define W83793_REG_BEEP(index)          (0x53 + (index))
+#define W83793_REG_ALARM(index)         (0x4b + (index))
+
+#define W83793_REG_CLR_CHASSIS          0x4a    /* SMI MASK4 */
+#define W83793_REG_IRQ_CTRL             0x50
+#define W83793_REG_OVT_CTRL             0x51
+#define W83793_REG_OVT_BEEP             0x52
+
+#define IN_READ                         0
+#define IN_MAX                          1
+#define IN_LOW                          2
+static const u16 W83793_REG_IN[][3] = {
+        /* Current, High, Low */
+        {0x10, 0x60, 0x61},     /* Vcore A      */
+        {0x11, 0x62, 0x63},     /* Vcore B      */
+        {0x12, 0x64, 0x65},     /* Vtt          */
+        {0x14, 0x6a, 0x6b},     /* VSEN1        */
+        {0x15, 0x6c, 0x6d},     /* VSEN2        */
+        {0x16, 0x6e, 0x6f},     /* +3VSEN       */
+        {0x17, 0x70, 0x71},     /* +12VSEN      */
+        {0x18, 0x72, 0x73},     /* 5VDD         */
+        {0x19, 0x74, 0x75},     /* 5VSB         */
+        {0x1a, 0x76, 0x77},     /* VBAT         */
+};
+
+/* Low Bits of Vcore A/B Vtt Read/High/Low */
+static const u16 W83793_REG_IN_LOW_BITS[] = { 0x1b, 0x68, 0x69 };
+static u8 scale_in[] = { 2, 2, 2, 16, 16, 16, 8, 24, 24, 16 };
+
+#define W83793_REG_FAN(index)           (0x23 + 2 * (index))    /* High byte */
+#define W83793_REG_FAN_MIN(index)       (0x90 + 2 * (index))    /* High byte */
+
+#define W83793_REG_PWM_DEFAULT          0xb2
+#define W83793_REG_PWM_ENABLE           0x207
+#define W83793_REG_PWM_UPTIME           0xc3    /* Unit in 0.1 second */
+#define W83793_REG_PWM_DOWNTIME         0xc4    /* Unit in 0.1 second */
+#define W83793_REG_TEMP_CRITICAL        0xc5
+
+#define PWM_DUTY                        0
+#define PWM_START                       1
+#define PWM_NONSTOP                     2
+#define W83793_REG_PWM(index, nr)       (((nr) == 0 ? 0xb3 : \
+                                         (nr) == 1 ? 0x220 : 0x218) + (index))
+
+/* bit field, fan1 is bit0, fan2 is bit1 ... */
+#define W83793_REG_TEMP_FAN_MAP(index)  (0x201 + (index))
+#define W83793_REG_TEMP_TOL(index)      (0x208 + (index))
+#define W83793_REG_TEMP_CRUISE(index)   (0x210 + (index))
+#define W83793_REG_PWM_STOP_TIME(index) (0x228 + (index))
+#define W83793_REG_SF2_TEMP(index, nr)  (0x230 + ((index) << 4) + (nr))
+#define W83793_REG_SF2_PWM(index, nr)   (0x238 + ((index) << 4) + (nr))
+
+static inline unsigned long FAN_FROM_REG(u16 val)
+{
+        if ((val >= 0xfff) || (val == 0))
+                return  0;
+        return (1350000UL / val);
+}
+
+static inline u16 FAN_TO_REG(long rpm)
+{
+        if (rpm <= 0)
+                return 0x0fff;
+        return SENSORS_LIMIT((1350000 + (rpm >> 1)) / rpm, 1, 0xffe);
+}
+
+static inline unsigned long TIME_FROM_REG(u8 reg)
+{
+        return (reg * 100);
+}
+
+static inline u8 TIME_TO_REG(unsigned long val)
+{
+        return SENSORS_LIMIT((val + 50) / 100, 0, 0xff);
+}
+
+static inline long TEMP_FROM_REG(s8 reg)
+{
+        return (reg * 1000);
+}
+
+static inline s8 TEMP_TO_REG(long val, s8 min, s8 max)
+{
+        return SENSORS_LIMIT((val + (val < 0 ? -500 : 500)) / 1000, min, max);
+}
+
+struct w83793_data {
+        struct i2c_client client;
+        struct i2c_client *lm75[2];
+        struct class_device *class_dev;
+        struct mutex update_lock;
+        char valid;                     /* !=0 if following fields are valid */
+        unsigned long last_updated;     /* In jiffies */
+        unsigned long last_nonvolatile; /* In jiffies, last time we update the
+                                           nonvolatile registers */
+
+        u8 bank;
+        u8 vrm;
+        u8 vid[2];
+        u8 in[10][3];           /* Register value, read/high/low */
+        u8 in_low_bits[3];      /* Additional resolution for VCore A/B Vtt */
+
+        u16 has_fan;            /* Only fan1- fan5 has own pins */
+        u16 fan[12];            /* Register value combine */
+        u16 fan_min[12];        /* Register value combine */
+
+        s8 temp[6][5];          /* current, crit, crit_hyst,warn, warn_hyst */
+        u8 temp_low_bits;       /* Additional resolution TD1-TD4 */
+        u8 temp_mode[2];        /* byte 0: Temp D1-D4 mode each has 2 bits
+                                   byte 1: Temp R1,R2 mode, each has 1 bit */
+        u8 temp_critical;       /* If reached all fan will be at full speed */
+        u8 temp_fan_map[6];     /* Temp controls which pwm fan, bit field */
+
+        u8 has_pwm;
+        u8 pwm_enable;          /* Register value, each Temp has 1 bit */
+        u8 pwm_uptime;          /* Register value */
+        u8 pwm_downtime;        /* Register value */
+        u8 pwm_default;         /* All fan default pwm, next poweron valid */
+        u8 pwm[8][3];           /* Register value */
+        u8 pwm_stop_time[8];
+        u8 temp_cruise[6];
+
+        u8 alarms[5];           /* realtime status registers */
+        u8 beeps[5];
+        u8 beep_enable;
+        u8 tolerance[3];        /* Temp tolerance(Smart Fan I/II) */
+        u8 sf2_pwm[6][7];       /* Smart FanII: Fan duty cycle */
+        u8 sf2_temp[6][7];      /* Smart FanII: Temp level point */
+};
+
+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_attach_adapter(struct i2c_adapter *adapter);
+static int w83793_detect(struct i2c_adapter *adapter, int address, int kind);
+static int w83793_detach_client(struct i2c_client *client);
+static void w83793_init_client(struct i2c_client *client);
+static void w83793_update_nonvolatile(struct device *dev);
+static struct w83793_data *w83793_update_device(struct device *dev);
+
+static struct i2c_driver w83793_driver = {
+        .driver = {
+                   .name = "w83793",
+        },
+        .attach_adapter = w83793_attach_adapter,
+        .detach_client = w83793_detach_client,
+};
+
+static ssize_t
+show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+
+        return sprintf(buf, "%d\n", data->vrm);
+}
+
+static ssize_t
+show_vid(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct w83793_data *data = w83793_update_device(dev);
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int index = sensor_attr->index;
+
+        return sprintf(buf, "%d\n", vid_from_reg(data->vid[index], data->vrm));
+}
+
+static ssize_t
+store_vrm(struct device *dev, struct device_attribute *attr,
+          const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+
+        data->vrm = simple_strtoul(buf, NULL, 10);
+        return count;
+}
+
+#define ALARM_STATUS                    0
+#define BEEP_ENABLE                     1
+static ssize_t
+show_alarm_beep(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct w83793_data *data = w83793_update_device(dev);
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index >> 3;
+        int bit = sensor_attr->index & 0x07;
+        u8 val;
+
+        if (ALARM_STATUS == nr) {
+                val = (data->alarms[index] >> (bit)) & 1;
+        } else {                /* BEEP_ENABLE */
+                val = (data->beeps[index] >> (bit)) & 1;
+        }
+
+        return sprintf(buf, "%u\n", val);
+}
+
+static ssize_t
+store_beep(struct device *dev, struct device_attribute *attr,
+           const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int index = sensor_attr->index >> 3;
+        int shift = sensor_attr->index & 0x07;
+        u8 beep_bit = 1 << shift;
+        u8 val;
+
+        val = simple_strtoul(buf, NULL, 10);
+        if (val != 0 && val != 1)
+                return -EINVAL;
+
+        mutex_lock(&data->update_lock);
+        data->beeps[index] = w83793_read_value(client, W83793_REG_BEEP(index));
+        data->beeps[index] &= ~beep_bit;
+        data->beeps[index] |= val << shift;
+        w83793_write_value(client, W83793_REG_BEEP(index), data->beeps[index]);
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+static ssize_t
+show_beep_enable(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct w83793_data *data = w83793_update_device(dev);
+        return sprintf(buf, "%u\n", (data->beep_enable >> 1) & 0x01);
+}
+
+static ssize_t
+store_beep_enable(struct device *dev, struct device_attribute *attr,
+                  const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+        u8 val = simple_strtoul(buf, NULL, 10);
+
+        if (val != 0 && val != 1)
+                return -EINVAL;
+
+        mutex_lock(&data->update_lock);
+        data->beep_enable = w83793_read_value(client, W83793_REG_OVT_BEEP)
+                            & 0xfd;
+        data->beep_enable |= val << 1;
+        w83793_write_value(client, W83793_REG_OVT_BEEP, data->beep_enable);
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+/* Write any value to clear chassis alarm */
+static ssize_t
+store_chassis_clear(struct device *dev,
+                    struct device_attribute *attr, const char *buf,
+                    size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+        u8 val;
+
+        mutex_lock(&data->update_lock);
+        val = w83793_read_value(client, W83793_REG_CLR_CHASSIS);
+        val |= 0x80;
+        w83793_write_value(client, W83793_REG_CLR_CHASSIS, val);
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+#define FAN_INPUT                       0
+#define FAN_MIN                         1
+static ssize_t
+show_fan(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83793_data *data = w83793_update_device(dev);
+        u16 val;
+
+        if (FAN_INPUT == nr) {
+                val = data->fan[index] & 0x0fff;
+        } else {
+                val = data->fan_min[index] & 0x0fff;
+        }
+
+        return sprintf(buf, "%lu\n", FAN_FROM_REG(val));
+}
+
+static ssize_t
+store_fan_min(struct device *dev, struct device_attribute *attr,
+              const char *buf, size_t count)
+{
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int index = sensor_attr->index;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+        u16 val = FAN_TO_REG(simple_strtoul(buf, NULL, 10));
+
+        mutex_lock(&data->update_lock);
+        data->fan_min[index] = val;
+        w83793_write_value(client, W83793_REG_FAN_MIN(index),
+                           (val >> 8) & 0xff);
+        w83793_write_value(client, W83793_REG_FAN_MIN(index) + 1, val & 0xff);
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+#define PWM_DUTY                        0
+#define PWM_START                       1
+#define PWM_NONSTOP                     2
+#define PWM_STOP_TIME                   3
+static ssize_t
+show_pwm(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        struct w83793_data *data = w83793_update_device(dev);
+        u16 val;
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+
+        if (PWM_STOP_TIME == nr)
+                val = TIME_FROM_REG(data->pwm_stop_time[index]);
+        else
+                val = (data->pwm[index][nr] & 0x3f) << 2;
+
+        return sprintf(buf, "%d\n", val);
+}
+
+static ssize_t
+store_pwm(struct device *dev, struct device_attribute *attr,
+          const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        u8 val;
+
+        mutex_lock(&data->update_lock);
+        if (PWM_STOP_TIME == nr) {
+                val = TIME_TO_REG(simple_strtoul(buf, NULL, 10));
+                data->pwm_stop_time[index] = val;
+                w83793_write_value(client, W83793_REG_PWM_STOP_TIME(index),
+                                   val);
+        } else {
+                val = SENSORS_LIMIT(simple_strtoul(buf, NULL, 10), 0, 0xff)
+                      >> 2;
+                data->pwm[index][nr] =
+                    w83793_read_value(client, W83793_REG_PWM(index, nr)) & 0xc0;
+                data->pwm[index][nr] |= val;
+                w83793_write_value(client, W83793_REG_PWM(index, nr),
+                                                        data->pwm[index][nr]);
+        }
+
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+static ssize_t
+show_temp(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83793_data *data = w83793_update_device(dev);
+        long temp = TEMP_FROM_REG(data->temp[index][nr]);
+
+        if (TEMP_READ == nr && index < 4) {     /* Only TD1-TD4 have low bits */
+                int low = ((data->temp_low_bits >> (index * 2)) & 0x03) * 250;
+                temp += temp > 0 ? low : -low;
+        }
+        return sprintf(buf, "%ld\n", temp);
+}
+
+static ssize_t
+store_temp(struct device *dev, struct device_attribute *attr,
+           const char *buf, size_t count)
+{
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+        long tmp = simple_strtol(buf, NULL, 10);
+
+        mutex_lock(&data->update_lock);
+        data->temp[index][nr] = TEMP_TO_REG(tmp, -128, 127);
+        w83793_write_value(client, W83793_REG_TEMP[index][nr],
+                           data->temp[index][nr]);
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+/*
+        TD1-TD4
+        each has 4 mode:(2 bits)
+        0:      Stop monitor
+        1:      Use internal temp sensor(default)
+        2:      Use sensor in AMD CPU and get result by AMDSI
+        3:      Use sensor in Intel CPU and get result by PECI
+
+        TR1-TR2
+        each has 2 mode:(1 bit)
+        0:      Disable temp sensor monitor
+        1:      To enable temp sensors monitor
+*/
+
+/* 0 disable, 5 AMDSI, 6 PECI */
+static u8 TO_TEMP_MODE[] = { 0, 0, 5, 6 };
+
+static ssize_t
+show_temp_mode(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct w83793_data *data = w83793_update_device(dev);
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int index = sensor_attr->index;
+        u8 mask = (index < 4) ? 0x03 : 0x01;
+        u8 shift = (index < 4) ? (2 * index) : (index - 4);
+        u8 tmp;
+        index = (index < 4) ? 0 : 1;
+
+        tmp = (data->temp_mode[index] >> shift) & mask;
+
+        /* for the internal sensor, found out if diode or thermistor */
+        if (tmp == 1) {
+                tmp = index == 0 ? 3 : 4;
+        } else {
+                tmp = TO_TEMP_MODE[tmp];
+        }
+
+        return sprintf(buf, "%d\n", tmp);
+}
+
+static ssize_t
+store_temp_mode(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int index = sensor_attr->index;
+        u8 mask = (index < 4) ? 0x03 : 0x01;
+        u8 shift = (index < 4) ? (2 * index) : (index - 4);
+        u8 val = simple_strtoul(buf, NULL, 10);
+
+        /* transform the sysfs interface values into table above */
+        if ((val == 5 || val == 6) && (index < 4)) {
+                val -= 3;
+        } else if ((val == 3 && index < 4)
+                || (val == 4 && index >= 4)
+                || val == 0) {
+                /* transform diode or thermistor into internal enable */
+                val = !!val;
+        } else {
+                return -EINVAL;
+        }
+
+        index = (index < 4) ? 0 : 1;
+        mutex_lock(&data->update_lock);
+        data->temp_mode[index] =
+            w83793_read_value(client, W83793_REG_TEMP_MODE[index]);
+        data->temp_mode[index] &= ~(mask << shift);
+        data->temp_mode[index] |= val << shift;
+        w83793_write_value(client, W83793_REG_TEMP_MODE[index],
+                                                        data->temp_mode[index]);
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+#define SETUP_PWM_DEFAULT               0
+#define SETUP_PWM_UPTIME                1       /* Unit in 0.1s */
+#define SETUP_PWM_DOWNTIME              2       /* Unit in 0.1s */
+#define SETUP_TEMP_CRITICAL             3
+static ssize_t
+show_sf_setup(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        struct w83793_data *data = w83793_update_device(dev);
+        u32 val = 0;
+
+        if (SETUP_PWM_DEFAULT == nr) {
+                val = (data->pwm_default & 0x3f) << 2;
+        } else if (SETUP_PWM_UPTIME == nr) {
+                val = TIME_FROM_REG(data->pwm_uptime);
+        } else if (SETUP_PWM_DOWNTIME == nr) {
+                val = TIME_FROM_REG(data->pwm_downtime);
+        } else if (SETUP_TEMP_CRITICAL == nr) {
+                val = TEMP_FROM_REG(data->temp_critical & 0x7f);
+        }
+
+        return sprintf(buf, "%d\n", val);
+}
+
+static ssize_t
+store_sf_setup(struct device *dev, struct device_attribute *attr,
+               const char *buf, size_t count)
+{
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+
+        mutex_lock(&data->update_lock);
+        if (SETUP_PWM_DEFAULT == nr) {
+                data->pwm_default =
+                    w83793_read_value(client, W83793_REG_PWM_DEFAULT) & 0xc0;
+                data->pwm_default |= SENSORS_LIMIT(simple_strtoul(buf, NULL,
+                                                                  10),
+                                                   0, 0xff) >> 2;
+                w83793_write_value(client, W83793_REG_PWM_DEFAULT,
+                                                        data->pwm_default);
+        } else if (SETUP_PWM_UPTIME == nr) {
+                data->pwm_uptime = TIME_TO_REG(simple_strtoul(buf, NULL, 10));
+                data->pwm_uptime += data->pwm_uptime == 0 ? 1 : 0;
+                w83793_write_value(client, W83793_REG_PWM_UPTIME,
+                                                        data->pwm_uptime);
+        } else if (SETUP_PWM_DOWNTIME == nr) {
+                data->pwm_downtime = TIME_TO_REG(simple_strtoul(buf, NULL, 10));
+                data->pwm_downtime += data->pwm_downtime == 0 ? 1 : 0;
+                w83793_write_value(client, W83793_REG_PWM_DOWNTIME,
+                                                        data->pwm_downtime);
+        } else {                /* SETUP_TEMP_CRITICAL */
+                data->temp_critical =
+                    w83793_read_value(client, W83793_REG_TEMP_CRITICAL) & 0x80;
+                data->temp_critical |= TEMP_TO_REG(simple_strtol(buf, NULL, 10),
+                                                   0, 0x7f);
+                w83793_write_value(client, W83793_REG_TEMP_CRITICAL,
+                                                        data->temp_critical);
+        }
+
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+/*
+        Temp SmartFan control
+        TEMP_FAN_MAP
+        Temp channel control which pwm fan, bitfield, bit 0 indicate pwm1...
+        It's possible two or more temp channels control the same fan, w83793
+        always prefers to pick the most critical request and applies it to
+        the related Fan.
+        It's possible one fan is not in any mapping of 6 temp channels, this
+        means the fan is manual mode
+
+        TEMP_PWM_ENABLE
+        Each temp channel has its own SmartFan mode, and temp channel
+        control fans that are set by TEMP_FAN_MAP
+        0:      SmartFanII mode
+        1:      Thermal Cruise Mode
+
+        TEMP_CRUISE
+        Target temperature in thermal cruise mode, w83793 will try to turn
+        fan speed to keep the temperature of target device around this
+        temperature.
+
+        TEMP_TOLERANCE
+        If Temp higher or lower than target with this tolerance, w83793
+        will take actions to speed up or slow down the fan to keep the
+        temperature within the tolerance range.
+*/
+
+#define TEMP_FAN_MAP                    0
+#define TEMP_PWM_ENABLE                 1
+#define TEMP_CRUISE                     2
+#define TEMP_TOLERANCE                  3
+static ssize_t
+show_sf_ctrl(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83793_data *data = w83793_update_device(dev);
+        u32 val;
+
+        if (TEMP_FAN_MAP == nr) {
+                val = data->temp_fan_map[index];
+        } else if (TEMP_PWM_ENABLE == nr) {
+                /* +2 to transfrom into 2 and 3 to conform with sysfs intf */
+                val = ((data->pwm_enable >> index) & 0x01) + 2;
+        } else if (TEMP_CRUISE == nr) {
+                val = TEMP_FROM_REG(data->temp_cruise[index] & 0x7f);
+        } else {                /* TEMP_TOLERANCE */
+                val = data->tolerance[index >> 1] >> ((index & 0x01) ? 4 : 0);
+                val = TEMP_FROM_REG(val & 0x0f);
+        }
+        return sprintf(buf, "%d\n", val);
+}
+
+static ssize_t
+store_sf_ctrl(struct device *dev, struct device_attribute *attr,
+              const char *buf, size_t count)
+{
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+        u32 val;
+
+        mutex_lock(&data->update_lock);
+        if (TEMP_FAN_MAP == nr) {
+                val = simple_strtoul(buf, NULL, 10) & 0xff;
+                w83793_write_value(client, W83793_REG_TEMP_FAN_MAP(index), val);
+                data->temp_fan_map[index] = val;
+        } else if (TEMP_PWM_ENABLE == nr) {
+                val = simple_strtoul(buf, NULL, 10);
+                if (2 == val || 3 == val) {
+                        data->pwm_enable =
+                            w83793_read_value(client, W83793_REG_PWM_ENABLE);
+                        if (val - 2)
+                                data->pwm_enable |= 1 << index;
+                        else
+                                data->pwm_enable &= ~(1 << index);
+                        w83793_write_value(client, W83793_REG_PWM_ENABLE,
+                                                        data->pwm_enable);
+                } else {
+                        mutex_unlock(&data->update_lock);
+                        return -EINVAL;
+                }
+        } else if (TEMP_CRUISE == nr) {
+                data->temp_cruise[index] =
+                    w83793_read_value(client, W83793_REG_TEMP_CRUISE(index));
+                val = TEMP_TO_REG(simple_strtol(buf, NULL, 10), 0, 0x7f);
+                data->temp_cruise[index] &= 0x80;
+                data->temp_cruise[index] |= val;
+
+                w83793_write_value(client, W83793_REG_TEMP_CRUISE(index),
+                                                data->temp_cruise[index]);
+        } else {                /* TEMP_TOLERANCE */
+                int i = index >> 1;
+                u8 shift = (index & 0x01) ? 4 : 0;
+                data->tolerance[i] =
+                    w83793_read_value(client, W83793_REG_TEMP_TOL(i));
+
+                val = TEMP_TO_REG(simple_strtol(buf, NULL, 10), 0, 0x0f);
+                data->tolerance[i] &= ~(0x0f << shift);
+                data->tolerance[i] |= val << shift;
+                w83793_write_value(client, W83793_REG_TEMP_TOL(i),
+                                                        data->tolerance[i]);
+        }
+
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+static ssize_t
+show_sf2_pwm(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83793_data *data = w83793_update_device(dev);
+
+        return sprintf(buf, "%d\n", (data->sf2_pwm[index][nr] & 0x3f) << 2);
+}
+
+static ssize_t
+store_sf2_pwm(struct device *dev, struct device_attribute *attr,
+              const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        u8 val = SENSORS_LIMIT(simple_strtoul(buf, NULL, 10), 0, 0xff) >> 2;
+
+        mutex_lock(&data->update_lock);
+        data->sf2_pwm[index][nr] =
+            w83793_read_value(client, W83793_REG_SF2_PWM(index, nr)) & 0xc0;
+        data->sf2_pwm[index][nr] |= val;
+        w83793_write_value(client, W83793_REG_SF2_PWM(index, nr),
+                                                data->sf2_pwm[index][nr]);
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+static ssize_t
+show_sf2_temp(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83793_data *data = w83793_update_device(dev);
+
+        return sprintf(buf, "%ld\n",
+                       TEMP_FROM_REG(data->sf2_temp[index][nr] & 0x7f));
+}
+
+static ssize_t
+store_sf2_temp(struct device *dev, struct device_attribute *attr,
+               const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        u8 val = TEMP_TO_REG(simple_strtol(buf, NULL, 10), 0, 0x7f);
+
+        mutex_lock(&data->update_lock);
+        data->sf2_temp[index][nr] =
+            w83793_read_value(client, W83793_REG_SF2_TEMP(index, nr)) & 0x80;
+        data->sf2_temp[index][nr] |= val;
+        w83793_write_value(client, W83793_REG_SF2_TEMP(index, nr),
+                                             data->sf2_temp[index][nr]);
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+/* only Vcore A/B and Vtt have additional 2 bits precision */
+static ssize_t
+show_in(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83793_data *data = w83793_update_device(dev);
+        u16 val = data->in[index][nr];
+
+        if (index < 3) {
+                val <<= 2;
+                val += (data->in_low_bits[nr] >> (index * 2)) & 0x3;
+        }
+        return sprintf(buf, "%d\n", val * scale_in[index]);
+}
+
+static ssize_t
+store_in(struct device *dev, struct device_attribute *attr,
+         const char *buf, size_t count)
+{
+        struct sensor_device_attribute_2 *sensor_attr =
+            to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+        u32 val;
+
+        val =
+            (simple_strtoul(buf, NULL, 10) +
+             scale_in[index] / 2) / scale_in[index];
+        mutex_lock(&data->update_lock);
+        if (index > 2) {
+                val = SENSORS_LIMIT(val, 0, 255);
+        } else {
+                val = SENSORS_LIMIT(val, 0, 0x3FF);
+                data->in_low_bits[nr] =
+                    w83793_read_value(client, W83793_REG_IN_LOW_BITS[nr]);
+                data->in_low_bits[nr] &= ~(0x03 << (2 * index));
+                data->in_low_bits[nr] |= (val & 0x03) << (2 * index);
+                w83793_write_value(client, W83793_REG_IN_LOW_BITS[nr],
+                                                     data->in_low_bits[nr]);
+                val >>= 2;
+        }
+        data->in[index][nr] = val;
+        w83793_write_value(client, W83793_REG_IN[index][nr],
+                                                        data->in[index][nr]);
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+#define NOT_USED                        -1
+
+#define SENSOR_ATTR_IN(index)                                           \
+        SENSOR_ATTR_2(in##index##_input, S_IRUGO, show_in, NULL,        \
+                IN_READ, index),                                        \
+        SENSOR_ATTR_2(in##index##_max, S_IRUGO | S_IWUSR, show_in,      \
+                store_in, IN_MAX, index),                               \
+        SENSOR_ATTR_2(in##index##_min, S_IRUGO | S_IWUSR, show_in,      \
+                store_in, IN_LOW, index),                               \
+        SENSOR_ATTR_2(in##index##_alarm, S_IRUGO, show_alarm_beep,      \
+                NULL, ALARM_STATUS, index + ((index > 2) ? 1 : 0)),     \
+        SENSOR_ATTR_2(in##index##_beep, S_IWUSR | S_IRUGO,              \
+                show_alarm_beep, store_beep, BEEP_ENABLE,               \
+                index + ((index > 2) ? 1 : 0))
+
+#define SENSOR_ATTR_FAN(index)                                          \
+        SENSOR_ATTR_2(fan##index##_alarm, S_IRUGO, show_alarm_beep,     \
+                NULL, ALARM_STATUS, index + 17),                        \
+        SENSOR_ATTR_2(fan##index##_beep, S_IWUSR | S_IRUGO,             \
+                show_alarm_beep, store_beep, BEEP_ENABLE, index + 17),  \
+        SENSOR_ATTR_2(fan##index##_input, S_IRUGO, show_fan,            \
+                NULL, FAN_INPUT, index - 1),                            \
+        SENSOR_ATTR_2(fan##index##_min, S_IWUSR | S_IRUGO,              \
+                show_fan, store_fan_min, FAN_MIN, index - 1)
+
+#define SENSOR_ATTR_PWM(index)                                          \
+        SENSOR_ATTR_2(pwm##index, S_IWUSR | S_IRUGO, show_pwm,          \
+                store_pwm, PWM_DUTY, index - 1),                        \
+        SENSOR_ATTR_2(pwm##index##_nonstop, S_IWUSR | S_IRUGO,          \
+                show_pwm, store_pwm, PWM_NONSTOP, index - 1),           \
+        SENSOR_ATTR_2(pwm##index##_start, S_IWUSR | S_IRUGO,            \
+                show_pwm, store_pwm, PWM_START, index - 1),             \
+        SENSOR_ATTR_2(pwm##index##_stop_time, S_IWUSR | S_IRUGO,        \
+                show_pwm, store_pwm, PWM_STOP_TIME, index - 1)
+
+#define SENSOR_ATTR_TEMP(index)                                         \
+        SENSOR_ATTR_2(temp##index##_type, S_IRUGO | S_IWUSR,            \
+                show_temp_mode, store_temp_mode, NOT_USED, index - 1),  \
+        SENSOR_ATTR_2(temp##index##_input, S_IRUGO, show_temp,          \
+                NULL, TEMP_READ, index - 1),                            \
+        SENSOR_ATTR_2(temp##index##_max, S_IRUGO | S_IWUSR, show_temp,  \
+                store_temp, TEMP_CRIT, index - 1),                      \
+        SENSOR_ATTR_2(temp##index##_max_hyst, S_IRUGO | S_IWUSR,        \
+                show_temp, store_temp, TEMP_CRIT_HYST, index - 1),      \
+        SENSOR_ATTR_2(temp##index##_warn, S_IRUGO | S_IWUSR, show_temp, \
+                store_temp, TEMP_WARN, index - 1),                      \
+        SENSOR_ATTR_2(temp##index##_warn_hyst, S_IRUGO | S_IWUSR,       \
+                show_temp, store_temp, TEMP_WARN_HYST, index - 1),      \
+        SENSOR_ATTR_2(temp##index##_alarm, S_IRUGO,                     \
+                show_alarm_beep, NULL, ALARM_STATUS, index + 11),       \
+        SENSOR_ATTR_2(temp##index##_beep, S_IWUSR | S_IRUGO,            \
+                show_alarm_beep, store_beep, BEEP_ENABLE, index + 11),  \
+        SENSOR_ATTR_2(temp##index##_auto_channels_pwm,                  \
+                S_IRUGO | S_IWUSR, show_sf_ctrl, store_sf_ctrl,         \
+                TEMP_FAN_MAP, index - 1),                               \
+        SENSOR_ATTR_2(temp##index##_pwm_enable, S_IWUSR | S_IRUGO,      \
+                show_sf_ctrl, store_sf_ctrl, TEMP_PWM_ENABLE,           \
+                index - 1),                                             \
+        SENSOR_ATTR_2(thermal_cruise##index, S_IRUGO | S_IWUSR,         \
+                show_sf_ctrl, store_sf_ctrl, TEMP_CRUISE, index - 1),   \
+        SENSOR_ATTR_2(tolerance##index, S_IRUGO | S_IWUSR, show_sf_ctrl,\
+                store_sf_ctrl, TEMP_TOLERANCE, index - 1),              \
+        SENSOR_ATTR_2(temp##index##_auto_point1_pwm, S_IRUGO | S_IWUSR, \
+                show_sf2_pwm, store_sf2_pwm, 0, index - 1),             \
+        SENSOR_ATTR_2(temp##index##_auto_point2_pwm, S_IRUGO | S_IWUSR, \
+                show_sf2_pwm, store_sf2_pwm, 1, index - 1),             \
+        SENSOR_ATTR_2(temp##index##_auto_point3_pwm, S_IRUGO | S_IWUSR, \
+                show_sf2_pwm, store_sf2_pwm, 2, index - 1),             \
+        SENSOR_ATTR_2(temp##index##_auto_point4_pwm, S_IRUGO | S_IWUSR, \
+                show_sf2_pwm, store_sf2_pwm, 3, index - 1),             \
+        SENSOR_ATTR_2(temp##index##_auto_point5_pwm, S_IRUGO | S_IWUSR, \
+                show_sf2_pwm, store_sf2_pwm, 4, index - 1),             \
+        SENSOR_ATTR_2(temp##index##_auto_point6_pwm, S_IRUGO | S_IWUSR, \
+                show_sf2_pwm, store_sf2_pwm, 5, index - 1),             \
+        SENSOR_ATTR_2(temp##index##_auto_point7_pwm, S_IRUGO | S_IWUSR, \
+                show_sf2_pwm, store_sf2_pwm, 6, index - 1),             \
+        SENSOR_ATTR_2(temp##index##_auto_point1_temp, S_IRUGO | S_IWUSR,\
+                show_sf2_temp, store_sf2_temp, 0, index - 1),           \
+        SENSOR_ATTR_2(temp##index##_auto_point2_temp, S_IRUGO | S_IWUSR,\
+                show_sf2_temp, store_sf2_temp, 1, index - 1),           \
+        SENSOR_ATTR_2(temp##index##_auto_point3_temp, S_IRUGO | S_IWUSR,\
+                show_sf2_temp, store_sf2_temp, 2, index - 1),           \
+        SENSOR_ATTR_2(temp##index##_auto_point4_temp, S_IRUGO | S_IWUSR,\
+                show_sf2_temp, store_sf2_temp, 3, index - 1),           \
+        SENSOR_ATTR_2(temp##index##_auto_point5_temp, S_IRUGO | S_IWUSR,\
+                show_sf2_temp, store_sf2_temp, 4, index - 1),           \
+        SENSOR_ATTR_2(temp##index##_auto_point6_temp, S_IRUGO | S_IWUSR,\
+                show_sf2_temp, store_sf2_temp, 5, index - 1),           \
+        SENSOR_ATTR_2(temp##index##_auto_point7_temp, S_IRUGO | S_IWUSR,\
+                show_sf2_temp, store_sf2_temp, 6, index - 1)
+
+static struct sensor_device_attribute_2 w83793_sensor_attr_2[] = {
+        SENSOR_ATTR_IN(0),
+        SENSOR_ATTR_IN(1),
+        SENSOR_ATTR_IN(2),
+        SENSOR_ATTR_IN(3),
+        SENSOR_ATTR_IN(4),
+        SENSOR_ATTR_IN(5),
+        SENSOR_ATTR_IN(6),
+        SENSOR_ATTR_IN(7),
+        SENSOR_ATTR_IN(8),
+        SENSOR_ATTR_IN(9),
+        SENSOR_ATTR_TEMP(1),
+        SENSOR_ATTR_TEMP(2),
+        SENSOR_ATTR_TEMP(3),
+        SENSOR_ATTR_TEMP(4),
+        SENSOR_ATTR_TEMP(5),
+        SENSOR_ATTR_TEMP(6),
+        SENSOR_ATTR_FAN(1),
+        SENSOR_ATTR_FAN(2),
+        SENSOR_ATTR_FAN(3),
+        SENSOR_ATTR_FAN(4),
+        SENSOR_ATTR_FAN(5),
+        SENSOR_ATTR_PWM(1),
+        SENSOR_ATTR_PWM(2),
+        SENSOR_ATTR_PWM(3),
+};
+
+/* Fan6-Fan12 */
+static struct sensor_device_attribute_2 w83793_left_fan[] = {
+        SENSOR_ATTR_FAN(6),
+        SENSOR_ATTR_FAN(7),
+        SENSOR_ATTR_FAN(8),
+        SENSOR_ATTR_FAN(9),
+        SENSOR_ATTR_FAN(10),
+        SENSOR_ATTR_FAN(11),
+        SENSOR_ATTR_FAN(12),
+};
+
+/* Pwm4-Pwm8 */
+static struct sensor_device_attribute_2 w83793_left_pwm[] = {
+        SENSOR_ATTR_PWM(4),
+        SENSOR_ATTR_PWM(5),
+        SENSOR_ATTR_PWM(6),
+        SENSOR_ATTR_PWM(7),
+        SENSOR_ATTR_PWM(8),
+};
+
+static struct sensor_device_attribute_2 sda_single_files[] = {
+        SENSOR_ATTR_2(cpu0_vid, S_IRUGO, show_vid, NULL, NOT_USED, 0),
+        SENSOR_ATTR_2(cpu1_vid, S_IRUGO, show_vid, NULL, NOT_USED, 1),
+        SENSOR_ATTR_2(vrm, S_IWUSR | S_IRUGO, show_vrm, store_vrm,
+                      NOT_USED, NOT_USED),
+        SENSOR_ATTR_2(chassis, S_IWUSR | S_IRUGO, show_alarm_beep,
+                      store_chassis_clear, ALARM_STATUS, 30),
+        SENSOR_ATTR_2(beep_enable, S_IWUSR | S_IRUGO, show_beep_enable,
+                      store_beep_enable, NOT_USED, NOT_USED),
+        SENSOR_ATTR_2(pwm_default, S_IWUSR | S_IRUGO, show_sf_setup,
+                      store_sf_setup, SETUP_PWM_DEFAULT, NOT_USED),
+        SENSOR_ATTR_2(pwm_uptime, S_IWUSR | S_IRUGO, show_sf_setup,
+                      store_sf_setup, SETUP_PWM_UPTIME, NOT_USED),
+        SENSOR_ATTR_2(pwm_downtime, S_IWUSR | S_IRUGO, show_sf_setup,
+                      store_sf_setup, SETUP_PWM_DOWNTIME, NOT_USED),
+        SENSOR_ATTR_2(temp_critical, S_IWUSR | S_IRUGO, show_sf_setup,
+                      store_sf_setup, SETUP_TEMP_CRITICAL, NOT_USED),
+};
+
+static void w83793_init_client(struct i2c_client *client)
+{
+        if (reset) {
+                w83793_write_value(client, W83793_REG_CONFIG, 0x80);
+        }
+
+        /* Start monitoring */
+        w83793_write_value(client, W83793_REG_CONFIG,
+                           w83793_read_value(client, W83793_REG_CONFIG) | 0x01);
+
+}
+
+static int w83793_attach_adapter(struct i2c_adapter *adapter)
+{
+        if (!(adapter->class & I2C_CLASS_HWMON))
+                return 0;
+        return i2c_probe(adapter, &addr_data, w83793_detect);
+}
+
+static int w83793_detach_client(struct i2c_client *client)
+{
+        struct w83793_data *data = i2c_get_clientdata(client);
+        struct device *dev = &client->dev;
+        int err, i;
+
+        /* main client */
+        if (data) {
+                hwmon_device_unregister(data->class_dev);
+
+                for (i = 0; i < ARRAY_SIZE(w83793_sensor_attr_2); i++)
+                        device_remove_file(dev,
+                                           &w83793_sensor_attr_2[i].dev_attr);
+
+                for (i = 0; i < ARRAY_SIZE(sda_single_files); i++)
+                        device_remove_file(dev, &sda_single_files[i].dev_attr);
+
+                for (i = 0; i < ARRAY_SIZE(w83793_left_fan); i++)
+                        device_remove_file(dev, &w83793_left_fan[i].dev_attr);
+
+                for (i = 0; i < ARRAY_SIZE(w83793_left_pwm); i++)
+                        device_remove_file(dev, &w83793_left_pwm[i].dev_attr);
+        }
+
+        if ((err = i2c_detach_client(client)))
+                return err;
+
+        /* main client */
+        if (data)
+                kfree(data);
+        /* subclient */
+        else
+                kfree(client);
+
+        return 0;
+}
+
+static int
+w83793_create_subclient(struct i2c_adapter *adapter,
+                        struct i2c_client *client, int addr,
+                        struct i2c_client **sub_cli)
+{
+        int err = 0;
+        struct i2c_client *sub_client;
+
+        (*sub_cli) = sub_client =
+            kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (!(sub_client)) {
+                return -ENOMEM;
+        }
+        sub_client->addr = 0x48 + addr;
+        i2c_set_clientdata(sub_client, NULL);
+        sub_client->adapter = adapter;
+        sub_client->driver = &w83793_driver;
+        strlcpy(sub_client->name, "w83793 subclient", I2C_NAME_SIZE);
+        if ((err = i2c_attach_client(sub_client))) {
+                dev_err(&client->dev, "subclient registration "
+                        "at address 0x%x failed\n", sub_client->addr);
+                kfree(sub_client);
+        }
+        return err;
+}
+
+static int
+w83793_detect_subclients(struct i2c_adapter *adapter, int address,
+                         int kind, struct i2c_client *client)
+{
+        int i, id, err;
+        u8 tmp;
+        struct w83793_data *data = i2c_get_clientdata(client);
+
+        id = i2c_adapter_id(adapter);
+        if (force_subclients[0] == id && force_subclients[1] == address) {
+                for (i = 2; i <= 3; i++) {
+                        if (force_subclients[i] < 0x48
+                            || force_subclients[i] > 0x4f) {
+                                dev_err(&client->dev,
+                                        "invalid subclient "
+                                        "address %d; must be 0x48-0x4f\n",
+                                        force_subclients[i]);
+                                err = -EINVAL;
+                                goto ERROR_SC_0;
+                        }
+                }
+                w83793_write_value(client, W83793_REG_I2C_SUBADDR,
+                                   (force_subclients[2] & 0x07) |
+                                   ((force_subclients[3] & 0x07) << 4));
+        }
+
+        tmp = w83793_read_value(client, W83793_REG_I2C_SUBADDR);
+        if (!(tmp & 0x08)) {
+                err =
+                    w83793_create_subclient(adapter, client, tmp & 0x7,
+                                            &data->lm75[0]);
+                if (err < 0)
+                        goto ERROR_SC_0;
+        }
+        if (!(tmp & 0x80)) {
+                if ((data->lm75[0] != NULL)
+                    && ((tmp & 0x7) == ((tmp >> 4) & 0x7))) {
+                        dev_err(&client->dev,
+                                "duplicate addresses 0x%x, "
+                                "use force_subclients\n", data->lm75[0]->addr);
+                        err = -ENODEV;
+                        goto ERROR_SC_1;
+                }
+                err = w83793_create_subclient(adapter, client,
+                                              (tmp >> 4) & 0x7, &data->lm75[1]);
+                if (err < 0)
+                        goto ERROR_SC_1;
+        }
+
+        return 0;
+
+        /* Undo inits in case of errors */
+
+ERROR_SC_1:
+        if (data->lm75[0] != NULL) {
+                i2c_detach_client(data->lm75[0]);
+                kfree(data->lm75[0]);
+        }
+ERROR_SC_0:
+        return err;
+}
+
+static int w83793_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        int i;
+        u8 tmp, val;
+        struct i2c_client *client;
+        struct device *dev;
+        struct w83793_data *data;
+        int files_fan = ARRAY_SIZE(w83793_left_fan) / 7;
+        int files_pwm = ARRAY_SIZE(w83793_left_pwm) / 5;
+        int err = 0;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+                goto exit;
+        }
+
+        /* OK. For now, we presume we have a valid client. We now create the
+           client structure, even though we cannot fill it completely yet.
+           But it allows us to access w83793_{read,write}_value. */
+
+        if (!(data = kzalloc(sizeof(struct w83793_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        client = &data->client;
+        dev = &client->dev;
+        i2c_set_clientdata(client, data);
+        client->addr = address;
+        client->adapter = adapter;
+        client->driver = &w83793_driver;
+
+        data->bank = i2c_smbus_read_byte_data(client, W83793_REG_BANKSEL);
+
+        /* Now, we do the remaining detection. */
+        if (kind < 0) {
+                tmp = data->bank & 0x80 ? 0x5c : 0xa3;
+                /* Check Winbond vendor ID */
+                if (tmp != i2c_smbus_read_byte_data(client,
+                                                        W83793_REG_VENDORID)) {
+                        pr_debug("w83793: Detection failed at check "
+                                 "vendor id\n");
+                        err = -ENODEV;
+                        goto free_mem;
+                }
+
+                /* If Winbond chip, address of chip and W83793_REG_I2C_ADDR
+                   should match */
+                if ((data->bank & 0x07) == 0
+                 && i2c_smbus_read_byte_data(client, W83793_REG_I2C_ADDR) !=
+                    (address << 1)) {
+                        pr_debug("w83793: Detection failed at check "
+                                 "i2c addr\n");
+                        err = -ENODEV;
+                        goto free_mem;
+                }
+
+        }
+
+        /* We have either had a force parameter, or we have already detected the
+           Winbond. Determine the chip type now */
+
+        if (kind <= 0) {
+                if (0x7b == w83793_read_value(client, W83793_REG_CHIPID)) {
+                        kind = w83793;
+                } else {
+                        if (kind == 0)
+                                dev_warn(&adapter->dev, "w83793: Ignoring "
+                                         "'force' parameter for unknown chip "
+                                         "at address 0x%02x\n", address);
+                        err = -ENODEV;
+                        goto free_mem;
+                }
+        }
+
+        /* Fill in the remaining client fields and put into the global list */
+        strlcpy(client->name, "w83793", I2C_NAME_SIZE);
+
+        mutex_init(&data->update_lock);
+
+        /* Tell the I2C layer a new client has arrived */
+        if ((err = i2c_attach_client(client)))
+                goto free_mem;
+
+        if ((err = w83793_detect_subclients(adapter, address, kind, client)))
+                goto detach_client;
+
+        /* Initialize the chip */
+        w83793_init_client(client);
+
+        data->vrm = vid_which_vrm();
+        /*
+           Only fan 1-5 has their own input pins,
+           Pwm 1-3 has their own pins
+         */
+        data->has_fan = 0x1f;
+        data->has_pwm = 0x07;
+        tmp = w83793_read_value(client, W83793_REG_MFC);
+        val = w83793_read_value(client, W83793_REG_FANIN_CTRL);
+
+        /* check the function of pins 49-56 */
+        if (!(tmp & 0x80)) {
+                data->has_pwm |= 0x18;  /* pwm 4,5 */
+                if (val & 0x01) {       /* fan 6 */
+                        data->has_fan |= 0x20;
+                        data->has_pwm |= 0x20;
+                }
+                if (val & 0x02) {       /* fan 7 */
+                        data->has_fan |= 0x40;
+                        data->has_pwm |= 0x40;
+                }
+                if (!(tmp & 0x40) && (val & 0x04)) {    /* fan 8 */
+                        data->has_fan |= 0x80;
+                        data->has_pwm |= 0x80;
+                }
+        }
+
+        if (0x08 == (tmp & 0x0c)) {
+                if (val & 0x08) /* fan 9 */
+                        data->has_fan |= 0x100;
+                if (val & 0x10) /* fan 10 */
+                        data->has_fan |= 0x200;
+        }
+
+        if (0x20 == (tmp & 0x30)) {
+                if (val & 0x20) /* fan 11 */
+                        data->has_fan |= 0x400;
+                if (val & 0x40) /* fan 12 */
+                        data->has_fan |= 0x800;
+        }
+
+        if ((tmp & 0x01) && (val & 0x04)) {     /* fan 8, second location */
+                data->has_fan |= 0x80;
+                data->has_pwm |= 0x80;
+        }
+
+        /* Register sysfs hooks */
+        for (i = 0; i < ARRAY_SIZE(w83793_sensor_attr_2); i++) {
+                err = device_create_file(dev,
+                                         &w83793_sensor_attr_2[i].dev_attr);
+                if (err)
+                        goto exit_remove;
+        }
+
+        for (i = 0; i < ARRAY_SIZE(sda_single_files); i++) {
+                err = device_create_file(dev, &sda_single_files[i].dev_attr);
+                if (err)
+                        goto exit_remove;
+
+        }
+
+        for (i = 5; i < 12; i++) {
+                int j;
+                if (!(data->has_fan & (1 << i)))
+                        continue;
+                for (j = 0; j < files_fan; j++) {
+                        err = device_create_file(dev,
+                                           &w83793_left_fan[(i - 5) * files_fan
+                                                                + j].dev_attr);
+                        if (err)
+                                goto exit_remove;
+                }
+        }
+
+        for (i = 3; i < 8; i++) {
+                int j;
+                if (!(data->has_pwm & (1 << i)))
+                        continue;
+                for (j = 0; j < files_pwm; j++) {
+                        err = device_create_file(dev,
+                                           &w83793_left_pwm[(i - 3) * files_pwm
+                                                                + j].dev_attr);
+                        if (err)
+                                goto exit_remove;
+                }
+        }
+
+        data->class_dev = hwmon_device_register(dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_remove;
+        }
+
+        return 0;
+
+        /* Unregister sysfs hooks */
+
+exit_remove:
+        for (i = 0; i < ARRAY_SIZE(w83793_sensor_attr_2); i++)
+                device_remove_file(dev, &w83793_sensor_attr_2[i].dev_attr);
+
+        for (i = 0; i < ARRAY_SIZE(sda_single_files); i++)
+                device_remove_file(dev, &sda_single_files[i].dev_attr);
+
+        for (i = 0; i < ARRAY_SIZE(w83793_left_fan); i++)
+                device_remove_file(dev, &w83793_left_fan[i].dev_attr);
+
+        for (i = 0; i < ARRAY_SIZE(w83793_left_pwm); i++)
+                device_remove_file(dev, &w83793_left_pwm[i].dev_attr);
+
+        if (data->lm75[0] != NULL) {
+                i2c_detach_client(data->lm75[0]);
+                kfree(data->lm75[0]);
+        }
+        if (data->lm75[1] != NULL) {
+                i2c_detach_client(data->lm75[1]);
+                kfree(data->lm75[1]);
+        }
+detach_client:
+        i2c_detach_client(client);
+free_mem:
+        kfree(data);
+exit:
+        return err;
+}
+
+static void w83793_update_nonvolatile(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+        int i, j;
+        /*
+           They are somewhat "stable" registers, and to update them everytime
+           takes so much time, it's just not worthy. Update them in a long
+           interval to avoid exception.
+         */
+        if (!(time_after(jiffies, data->last_nonvolatile + HZ * 300)
+              || !data->valid))
+                return;
+        /* update voltage limits */
+        for (i = 1; i < 3; i++) {
+                for (j = 0; j < ARRAY_SIZE(data->in); j++) {
+                        data->in[j][i] =
+                            w83793_read_value(client, W83793_REG_IN[j][i]);
+                }
+                data->in_low_bits[i] =
+                    w83793_read_value(client, W83793_REG_IN_LOW_BITS[i]);
+        }
+
+        for (i = 0; i < ARRAY_SIZE(data->fan_min); i++) {
+                /* Update the Fan measured value and limits */
+                if (!(data->has_fan & (1 << i))) {
+                        continue;
+                }
+                data->fan_min[i] =
+                    w83793_read_value(client, W83793_REG_FAN_MIN(i)) << 8;
+                data->fan_min[i] |=
+                    w83793_read_value(client, W83793_REG_FAN_MIN(i) + 1);
+        }
+
+        for (i = 0; i < ARRAY_SIZE(data->temp_fan_map); i++) {
+                data->temp_fan_map[i] =
+                    w83793_read_value(client, W83793_REG_TEMP_FAN_MAP(i));
+                for (j = 1; j < 5; j++) {
+                        data->temp[i][j] =
+                            w83793_read_value(client, W83793_REG_TEMP[i][j]);
+                }
+                data->temp_cruise[i] =
+                    w83793_read_value(client, W83793_REG_TEMP_CRUISE(i));
+                for (j = 0; j < 7; j++) {
+                        data->sf2_pwm[i][j] =
+                            w83793_read_value(client, W83793_REG_SF2_PWM(i, j));
+                        data->sf2_temp[i][j] =
+                            w83793_read_value(client,
+                                              W83793_REG_SF2_TEMP(i, j));
+                }
+        }
+
+        for (i = 0; i < ARRAY_SIZE(data->temp_mode); i++)
+                data->temp_mode[i] =
+                    w83793_read_value(client, W83793_REG_TEMP_MODE[i]);
+
+        for (i = 0; i < ARRAY_SIZE(data->tolerance); i++) {
+                data->tolerance[i] =
+                    w83793_read_value(client, W83793_REG_TEMP_TOL(i));
+        }
+
+        for (i = 0; i < ARRAY_SIZE(data->pwm); i++) {
+                if (!(data->has_pwm & (1 << i)))
+                        continue;
+                data->pwm[i][PWM_NONSTOP] =
+                    w83793_read_value(client, W83793_REG_PWM(i, PWM_NONSTOP));
+                data->pwm[i][PWM_START] =
+                    w83793_read_value(client, W83793_REG_PWM(i, PWM_START));
+                data->pwm_stop_time[i] =
+                    w83793_read_value(client, W83793_REG_PWM_STOP_TIME(i));
+        }
+
+        data->pwm_default = w83793_read_value(client, W83793_REG_PWM_DEFAULT);
+        data->pwm_enable = w83793_read_value(client, W83793_REG_PWM_ENABLE);
+        data->pwm_uptime = w83793_read_value(client, W83793_REG_PWM_UPTIME);
+        data->pwm_downtime = w83793_read_value(client, W83793_REG_PWM_DOWNTIME);
+        data->temp_critical =
+            w83793_read_value(client, W83793_REG_TEMP_CRITICAL);
+        data->beep_enable = w83793_read_value(client, W83793_REG_OVT_BEEP);
+
+        for (i = 0; i < ARRAY_SIZE(data->beeps); i++) {
+                data->beeps[i] = w83793_read_value(client, W83793_REG_BEEP(i));
+        }
+
+        data->last_nonvolatile = jiffies;
+}
+
+static struct w83793_data *w83793_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83793_data *data = i2c_get_clientdata(client);
+        int i;
+
+        mutex_lock(&data->update_lock);
+
+        if (!(time_after(jiffies, data->last_updated + HZ * 2)
+              || !data->valid))
+                goto END;
+
+        /* Update the voltages measured value and limits */
+        for (i = 0; i < ARRAY_SIZE(data->in); i++)
+                data->in[i][IN_READ] =
+                    w83793_read_value(client, W83793_REG_IN[i][IN_READ]);
+
+        data->in_low_bits[IN_READ] =
+            w83793_read_value(client, W83793_REG_IN_LOW_BITS[IN_READ]);
+
+        for (i = 0; i < ARRAY_SIZE(data->fan); i++) {
+                if (!(data->has_fan & (1 << i))) {
+                        continue;
+                }
+                data->fan[i] =
+                    w83793_read_value(client, W83793_REG_FAN(i)) << 8;
+                data->fan[i] |=
+                    w83793_read_value(client, W83793_REG_FAN(i) + 1);
+        }
+
+        for (i = 0; i < ARRAY_SIZE(data->temp); i++)
+                data->temp[i][TEMP_READ] =
+                    w83793_read_value(client, W83793_REG_TEMP[i][TEMP_READ]);
+
+        data->temp_low_bits =
+            w83793_read_value(client, W83793_REG_TEMP_LOW_BITS);
+
+        for (i = 0; i < ARRAY_SIZE(data->pwm); i++) {
+                if (data->has_pwm & (1 << i))
+                        data->pwm[i][PWM_DUTY] =
+                            w83793_read_value(client,
+                                              W83793_REG_PWM(i, PWM_DUTY));
+        }
+
+        for (i = 0; i < ARRAY_SIZE(data->alarms); i++)
+                data->alarms[i] =
+                    w83793_read_value(client, W83793_REG_ALARM(i));
+        data->vid[0] = w83793_read_value(client, W83793_REG_VID_INA);
+        data->vid[1] = w83793_read_value(client, W83793_REG_VID_INB);
+        w83793_update_nonvolatile(dev);
+        data->last_updated = jiffies;
+        data->valid = 1;
+
+END:
+        mutex_unlock(&data->update_lock);
+        return data;
+}
+
+/* Ignore the possibility that somebody change bank outside the driver
+   Must be called with data->update_lock held, except during initialization */
+static u8 w83793_read_value(struct i2c_client *client, u16 reg)
+{
+        struct w83793_data *data = i2c_get_clientdata(client);
+        u8 res = 0xff;
+        u8 new_bank = reg >> 8;
+
+        new_bank |= data->bank & 0xfc;
+        if (data->bank != new_bank) {
+                if (i2c_smbus_write_byte_data
+                    (client, W83793_REG_BANKSEL, new_bank) >= 0)
+                        data->bank = new_bank;
+                else {
+                        dev_err(&client->dev,
+                                "set bank to %d failed, fall back "
+                                "to bank %d, read reg 0x%x error\n",
+                                new_bank, data->bank, reg);
+                        res = 0x0;      /* read 0x0 from the chip */
+                        goto END;
+                }
+        }
+        res = i2c_smbus_read_byte_data(client, reg & 0xff);
+END:
+        return res;
+}
+
+/* Must be called with data->update_lock held, except during initialization */
+static int w83793_write_value(struct i2c_client *client, u16 reg, u8 value)
+{
+        struct w83793_data *data = i2c_get_clientdata(client);
+        int res;
+        u8 new_bank = reg >> 8;
+
+        new_bank |= data->bank & 0xfc;
+        if (data->bank != new_bank) {
+                if ((res = i2c_smbus_write_byte_data
+                    (client, W83793_REG_BANKSEL, new_bank)) >= 0)
+                        data->bank = new_bank;
+                else {
+                        dev_err(&client->dev,
+                                "set bank to %d failed, fall back "
+                                "to bank %d, write reg 0x%x error\n",
+                                new_bank, data->bank, reg);
+                        goto END;
+                }
+        }
+
+        res = i2c_smbus_write_byte_data(client, reg & 0xff, value);
+END:
+        return res;
+}
+
+static int __init sensors_w83793_init(void)
+{
+        return i2c_add_driver(&w83793_driver);
+}
+
+static void __exit sensors_w83793_exit(void)
+{
+        i2c_del_driver(&w83793_driver);
+}
+
+MODULE_AUTHOR("Yuan Mu");
+MODULE_DESCRIPTION("w83793 driver");
+MODULE_LICENSE("GPL");
+
+module_init(sensors_w83793_init);
+module_exit(sensors_w83793_exit);
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index 33fbb47100a3..8e1e3f8e40a4 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -2,7 +2,7 @@
  *      i2c-ali1563.c - i2c driver for the ALi 1563 Southbridge
  *
  *      Copyright (C) 2004 Patrick Mochel
- *                    2005 Rudolf Marek <r.marek@sh.cvut.cz>
+ *                    2005 Rudolf Marek <r.marek@assembler.cz>
  *
  *      The 1563 southbridge is deceptively similar to the 1533, with a
  *      few notable exceptions. One of those happens to be the fact they
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index 60bef94cd25f..4ee56def61f2 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -82,7 +82,7 @@ struct tps65010 {
         struct i2c_client       client;
         struct mutex            lock;
         int                     irq;
-        struct work_struct      work;
+        struct delayed_work     work;
         struct dentry           *file;
         unsigned                charging:1;
         unsigned                por:1;
@@ -328,7 +328,7 @@ static void tps65010_interrupt(struct tps65010 *tps)
 {
         u8 tmp = 0, mask, poll;
 
-        /* IRQs won't trigger irqs for certain events, but we can get
+        /* IRQs won't trigger for certain events, but we can get
          * others by polling (normally, with external power applied).
          */
         poll = 0;
@@ -411,10 +411,11 @@ static void tps65010_interrupt(struct tps65010 *tps)
 }
 
 /* handle IRQs and polling using keventd for now */
-static void tps65010_work(void *_tps)
+static void tps65010_work(struct work_struct *work)
 {
-        struct tps65010         *tps = _tps;
+        struct tps65010         *tps;
 
+        tps = container_of(work, struct tps65010, work.work);
         mutex_lock(&tps->lock);
 
         tps65010_interrupt(tps);
@@ -452,7 +453,7 @@ static irqreturn_t tps65010_irq(int irq, void *_tps)
 
         disable_irq_nosync(irq);
         set_bit(FLAG_IRQ_ENABLE, &tps->flags);
-        (void) schedule_work(&tps->work);
+        (void) schedule_work(&tps->work.work);
         return IRQ_HANDLED;
 }
 
@@ -465,13 +466,15 @@ static int __exit tps65010_detach_client(struct i2c_client *client)
         struct tps65010         *tps;
 
         tps = container_of(client, struct tps65010, client);
+        free_irq(tps->irq, tps);
 #ifdef  CONFIG_ARM
         if (machine_is_omap_h2())
                 omap_free_gpio(58);
         if (machine_is_omap_osk())
                 omap_free_gpio(OMAP_MPUIO(1));
 #endif
-        free_irq(tps->irq, tps);
+        cancel_delayed_work(&tps->work);
+        flush_scheduled_work();
         debugfs_remove(tps->file);
         if (i2c_detach_client(client) == 0)
                 kfree(tps);
@@ -505,7 +508,7 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind)
                 return 0;
 
         mutex_init(&tps->lock);
-        INIT_WORK(&tps->work, tps65010_work, tps);
+        INIT_DELAYED_WORK(&tps->work, tps65010_work);
         tps->irq = -1;
         tps->client.addr = address;
         tps->client.adapter = bus;
@@ -620,7 +623,7 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind)
         (void) i2c_smbus_write_byte_data(&tps->client, TPS_MASK3, 0x0f
                 | i2c_smbus_read_byte_data(&tps->client, TPS_MASK3));
 
-        tps65010_work(tps);
+        tps65010_work(&tps->work.work);
 
         tps->file = debugfs_create_file(DRIVER_NAME, S_IRUGO, NULL,
                                 tps, DEBUG_FOPS);
@@ -672,7 +675,7 @@ int tps65010_set_vbus_draw(unsigned mA)
                         && test_and_set_bit(
                                 FLAG_VBUS_CHANGED, &the_tps->flags)) {
                 /* gadget drivers call this in_irq() */
-                (void) schedule_work(&the_tps->work);
+                (void) schedule_work(&the_tps->work.work);
         }
         local_irq_restore(flags);
 
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index e23bc0d62159..3f828052f8d2 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -796,7 +796,7 @@ endchoice
 config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
        int "Maximum transfer size (KB) per request (up to 128)"
        default "128"
-       depends BLK_DEV_IDE_AU1XXX
+       depends on BLK_DEV_IDE_AU1XXX
 
 config IDE_ARM
         def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index e3a267622bb6..d33717c8afd4 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -2147,7 +2147,7 @@ static int ide_floppy_probe(ide_drive_t *drive)
                 printk("ide-floppy: passing drive %s to ide-scsi emulation.\n", drive->name);
                 goto failed;
         }
-        if ((floppy = (idefloppy_floppy_t *) kzalloc (sizeof (idefloppy_floppy_t), GFP_KERNEL)) == NULL) {
+        if ((floppy = kzalloc(sizeof (idefloppy_floppy_t), GFP_KERNEL)) == NULL) {
                 printk (KERN_ERR "ide-floppy: %s: Can't allocate a floppy structure\n", drive->name);
                 goto failed;
         }
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index e2f4bb549063..b3bcd1d7315e 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -2573,11 +2573,11 @@ static idetape_stage_t *__idetape_kmalloc_stage (idetape_tape_t *tape, int full,
         int pages = tape->pages_per_stage;
         char *b_data = NULL;
 
-        if ((stage = (idetape_stage_t *) kmalloc (sizeof (idetape_stage_t),GFP_KERNEL)) == NULL)
+        if ((stage = kmalloc(sizeof (idetape_stage_t),GFP_KERNEL)) == NULL)
                 return NULL;
         stage->next = NULL;
 
-        bh = stage->bh = (struct idetape_bh *)kmalloc(sizeof(struct idetape_bh), GFP_KERNEL);
+        bh = stage->bh = kmalloc(sizeof(struct idetape_bh), GFP_KERNEL);
         if (bh == NULL)
                 goto abort;
         bh->b_reqnext = NULL;
@@ -2607,7 +2607,7 @@ static idetape_stage_t *__idetape_kmalloc_stage (idetape_tape_t *tape, int full,
                         continue;
                 }
                 prev_bh = bh;
-                if ((bh = (struct idetape_bh *)kmalloc(sizeof(struct idetape_bh), GFP_KERNEL)) == NULL) {
+                if ((bh = kmalloc(sizeof(struct idetape_bh), GFP_KERNEL)) == NULL) {
                         free_page((unsigned long) b_data);
                         goto abort;
                 }
@@ -4860,7 +4860,7 @@ static int ide_tape_probe(ide_drive_t *drive)
                 printk(KERN_WARNING "ide-tape: Use drive %s with ide-scsi emulation and osst.\n", drive->name);
                 printk(KERN_WARNING "ide-tape: OnStream support will be removed soon from ide-tape!\n");
         }
-        tape = (idetape_tape_t *) kzalloc (sizeof (idetape_tape_t), GFP_KERNEL);
+        tape = kzalloc(sizeof (idetape_tape_t), GFP_KERNEL);
         if (tape == NULL) {
                 printk(KERN_ERR "ide-tape: %s: Can't allocate a tape structure\n", drive->name);
                 goto failed;
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index e993a51f250e..08119da06d54 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -4,6 +4,7 @@
  * Copyright (C) 1999-2003              Andre Hedrick <andre@linux-ide.org>
  * Portions Copyright (C) 2001          Sun Microsystems, Inc.
  * Portions Copyright (C) 2003          Red Hat Inc
+ * Portions Copyright (C) 2005-2006     MontaVista Software, Inc.
  *
  * Thanks to HighPoint Technologies for their assistance, and hardware.
  * Special Thanks to Jon Burchmore in SanDiego for the deep pockets, his
@@ -11,9 +12,11 @@
  * development and support.
  *
  *
- * Highpoint have their own driver (source except for the raid part)
- * available from http://www.highpoint-tech.com/hpt3xx-opensource-v131.tgz
- * This may be useful to anyone wanting to work on the mainstream hpt IDE.
+ * HighPoint has its own drivers (open source except for the RAID part)
+ * available from http://www.highpoint-tech.com/BIOS%20+%20Driver/.
+ * This may be useful to anyone wanting to work on this driver, however  do not
+ * trust  them too much since the code tends to become less and less meaningful
+ * as the time passes... :-/
  *
  * Note that final HPT370 support was done by force extraction of GPL.
  *
@@ -52,6 +55,29 @@
  * keeping me sane. 
  *              Alan Cox <alan@redhat.com>
  *
+ * - fix the clock turnaround code: it was writing to the wrong ports when
+ *   called for the secondary channel, caching the current clock mode per-
+ *   channel caused the cached register value to get out of sync with the
+ *   actual one, the channels weren't serialized, the turnaround shouldn't
+ *   be done on 66 MHz PCI bus
+ * - avoid calibrating PLL twice as the second time results in a wrong PCI
+ *   frequency and thus in the wrong timings for the secondary channel
+ * - disable UltraATA/133 for HPT372 by default (50 MHz DPLL clock do not
+ *   allow for this speed anyway)
+ * - add support for HPT302N and HPT371N clocking (the same as for HPT372N)
+ * - HPT371/N are single channel chips, so avoid touching the primary channel
+ *   which exists only virtually (there's no pins for it)
+ * - fix/remove bad/unused timing tables and use one set of tables for the whole
+ *   HPT37x chip family; save space by introducing the separate transfer mode
+ *   table in which the mode lookup is done
+ * - use f_CNT value saved by  the HighPoint BIOS as reading it directly gives
+ *   the wrong PCI frequency since DPLL has already been calibrated by BIOS
+ * - fix the hotswap code:  it caused RESET- to glitch when tristating the bus,
+ *   and for HPT36x the obsolete HDIO_TRISTATE_HWIF handler was called instead
+ * - pass to init_chipset() handlers a copy of the IDE PCI device structure as
+ *   they tamper with its fields
+ *              <source@mvista.com>
+ *
  */
 
 
@@ -76,8 +102,8 @@
 
 /* various tuning parameters */
 #define HPT_RESET_STATE_ENGINE
-#undef HPT_DELAY_INTERRUPT
-#undef HPT_SERIALIZE_IO
+#undef  HPT_DELAY_INTERRUPT
+#define HPT_SERIALIZE_IO        0
 
 static const char *quirk_drives[] = {
         "QUANTUM FIREBALLlct08 08",
@@ -141,305 +167,175 @@ static const char *bad_ata33[] = {
         NULL
 };
 
-struct chipset_bus_clock_list_entry {
-        u8              xfer_speed;
-        unsigned int    chipset_settings;
+static u8 xfer_speeds[] = {
+        XFER_UDMA_6,
+        XFER_UDMA_5,
+        XFER_UDMA_4,
+        XFER_UDMA_3,
+        XFER_UDMA_2,
+        XFER_UDMA_1,
+        XFER_UDMA_0,
+
+        XFER_MW_DMA_2,
+        XFER_MW_DMA_1,
+        XFER_MW_DMA_0,
+
+        XFER_PIO_4,
+        XFER_PIO_3,
+        XFER_PIO_2,
+        XFER_PIO_1,
+        XFER_PIO_0
 };
 
-/* key for bus clock timings
- * bit
- * 0:3    data_high_time. inactive time of DIOW_/DIOR_ for PIO and MW
- *        DMA. cycles = value + 1
- * 4:8    data_low_time. active time of DIOW_/DIOR_ for PIO and MW
- *        DMA. cycles = value + 1
- * 9:12   cmd_high_time. inactive time of DIOW_/DIOR_ during task file
- *        register access.
- * 13:17  cmd_low_time. active time of DIOW_/DIOR_ during task file
- *        register access.
- * 18:21  udma_cycle_time. clock freq and clock cycles for UDMA xfer.
- *        during task file register access.
- * 22:24  pre_high_time. time to initialize 1st cycle for PIO and MW DMA
- *        xfer.
- * 25:27  cmd_pre_high_time. time to initialize 1st PIO cycle for task
- *        register access.
- * 28     UDMA enable
- * 29     DMA enable
- * 30     PIO_MST enable. if set, the chip is in bus master mode during
- *        PIO.
- * 31     FIFO enable.
+/* Key for bus clock timings
+ * 36x   37x
+ * bits  bits
+ * 0:3   0:3    data_high_time. Inactive time of DIOW_/DIOR_ for PIO and MW DMA.
+ *              cycles = value + 1
+ * 4:7   4:8    data_low_time. Active time of DIOW_/DIOR_ for PIO and MW DMA.
+ *              cycles = value + 1
+ * 8:11  9:12   cmd_high_time. Inactive time of DIOW_/DIOR_ during task file
+ *              register access.
+ * 12:15 13:17  cmd_low_time. Active time of DIOW_/DIOR_ during task file
+ *              register access.
+ * 16:18 18:20  udma_cycle_time. Clock cycles for UDMA xfer.
+ * -     21     CLK frequency: 0=ATA clock, 1=dual ATA clock.
+ * 19:21 22:24  pre_high_time. Time to initialize the 1st cycle for PIO and
+ *              MW DMA xfer.
+ * 22:24 25:27  cmd_pre_high_time. Time to initialize the 1st PIO cycle for
+ *              task file register access.
+ * 28    28     UDMA enable.
+ * 29    29     DMA  enable.
+ * 30    30     PIO MST enable. If set, the chip is in bus master mode during
+ *              PIO xfer.
+ * 31    31     FIFO enable.
  */
-static struct chipset_bus_clock_list_entry forty_base_hpt366[] = {
-        {       XFER_UDMA_4,    0x900fd943      },
-        {       XFER_UDMA_3,    0x900ad943      },
-        {       XFER_UDMA_2,    0x900bd943      },
-        {       XFER_UDMA_1,    0x9008d943      },
-        {       XFER_UDMA_0,    0x9008d943      },
-
-        {       XFER_MW_DMA_2,  0xa008d943      },
-        {       XFER_MW_DMA_1,  0xa010d955      },
-        {       XFER_MW_DMA_0,  0xa010d9fc      },
-
-        {       XFER_PIO_4,     0xc008d963      },
-        {       XFER_PIO_3,     0xc010d974      },
-        {       XFER_PIO_2,     0xc010d997      },
-        {       XFER_PIO_1,     0xc010d9c7      },
-        {       XFER_PIO_0,     0xc018d9d9      },
-        {       0,              0x0120d9d9      }
-};
-
-static struct chipset_bus_clock_list_entry thirty_three_base_hpt366[] = {
-        {       XFER_UDMA_4,    0x90c9a731      },
-        {       XFER_UDMA_3,    0x90cfa731      },
-        {       XFER_UDMA_2,    0x90caa731      },
-        {       XFER_UDMA_1,    0x90cba731      },
-        {       XFER_UDMA_0,    0x90c8a731      },
-
-        {       XFER_MW_DMA_2,  0xa0c8a731      },
-        {       XFER_MW_DMA_1,  0xa0c8a732      },      /* 0xa0c8a733 */
-        {       XFER_MW_DMA_0,  0xa0c8a797      },
-
-        {       XFER_PIO_4,     0xc0c8a731      },
-        {       XFER_PIO_3,     0xc0c8a742      },
-        {       XFER_PIO_2,     0xc0d0a753      },
-        {       XFER_PIO_1,     0xc0d0a7a3      },      /* 0xc0d0a793 */
-        {       XFER_PIO_0,     0xc0d0a7aa      },      /* 0xc0d0a7a7 */
-        {       0,              0x0120a7a7      }
-};
-
-static struct chipset_bus_clock_list_entry twenty_five_base_hpt366[] = {
-        {       XFER_UDMA_4,    0x90c98521      },
-        {       XFER_UDMA_3,    0x90cf8521      },
-        {       XFER_UDMA_2,    0x90cf8521      },
-        {       XFER_UDMA_1,    0x90cb8521      },
-        {       XFER_UDMA_0,    0x90cb8521      },
-
-        {       XFER_MW_DMA_2,  0xa0ca8521      },
-        {       XFER_MW_DMA_1,  0xa0ca8532      },
-        {       XFER_MW_DMA_0,  0xa0ca8575      },
-
-        {       XFER_PIO_4,     0xc0ca8521      },
-        {       XFER_PIO_3,     0xc0ca8532      },
-        {       XFER_PIO_2,     0xc0ca8542      },
-        {       XFER_PIO_1,     0xc0d08572      },
-        {       XFER_PIO_0,     0xc0d08585      },
-        {       0,              0x01208585      }
-};
-
-/* from highpoint documentation. these are old values */
-static struct chipset_bus_clock_list_entry thirty_three_base_hpt370[] = {
-/*      {       XFER_UDMA_5,    0x1A85F442,     0x16454e31      }, */
-        {       XFER_UDMA_5,    0x16454e31      },
-        {       XFER_UDMA_4,    0x16454e31      },
-        {       XFER_UDMA_3,    0x166d4e31      },
-        {       XFER_UDMA_2,    0x16494e31      },
-        {       XFER_UDMA_1,    0x164d4e31      },
-        {       XFER_UDMA_0,    0x16514e31      },
-
-        {       XFER_MW_DMA_2,  0x26514e21      },
-        {       XFER_MW_DMA_1,  0x26514e33      },
-        {       XFER_MW_DMA_0,  0x26514e97      },
-
-        {       XFER_PIO_4,     0x06514e21      },
-        {       XFER_PIO_3,     0x06514e22      },
-        {       XFER_PIO_2,     0x06514e33      },
-        {       XFER_PIO_1,     0x06914e43      },
-        {       XFER_PIO_0,     0x06914e57      },
-        {       0,              0x06514e57      }
-};
-
-static struct chipset_bus_clock_list_entry sixty_six_base_hpt370[] = {
-        {       XFER_UDMA_5,    0x14846231      },
-        {       XFER_UDMA_4,    0x14886231      },
-        {       XFER_UDMA_3,    0x148c6231      },
-        {       XFER_UDMA_2,    0x148c6231      },
-        {       XFER_UDMA_1,    0x14906231      },
-        {       XFER_UDMA_0,    0x14986231      },
-
-        {       XFER_MW_DMA_2,  0x26514e21      },
-        {       XFER_MW_DMA_1,  0x26514e33      },
-        {       XFER_MW_DMA_0,  0x26514e97      },
-
-        {       XFER_PIO_4,     0x06514e21      },
-        {       XFER_PIO_3,     0x06514e22      },
-        {       XFER_PIO_2,     0x06514e33      },
-        {       XFER_PIO_1,     0x06914e43      },
-        {       XFER_PIO_0,     0x06914e57      },
-        {       0,              0x06514e57      }
-};
-
-/* these are the current (4 sep 2001) timings from highpoint */
-static struct chipset_bus_clock_list_entry thirty_three_base_hpt370a[] = {
-        {       XFER_UDMA_5,    0x12446231      },
-        {       XFER_UDMA_4,    0x12446231      },
-        {       XFER_UDMA_3,    0x126c6231      },
-        {       XFER_UDMA_2,    0x12486231      },
-        {       XFER_UDMA_1,    0x124c6233      },
-        {       XFER_UDMA_0,    0x12506297      },
-
-        {       XFER_MW_DMA_2,  0x22406c31      },
-        {       XFER_MW_DMA_1,  0x22406c33      },
-        {       XFER_MW_DMA_0,  0x22406c97      },
-
-        {       XFER_PIO_4,     0x06414e31      },
-        {       XFER_PIO_3,     0x06414e42      },
-        {       XFER_PIO_2,     0x06414e53      },
-        {       XFER_PIO_1,     0x06814e93      },
-        {       XFER_PIO_0,     0x06814ea7      },
-        {       0,              0x06814ea7      }
-};
-
-/* 2x 33MHz timings */
-static struct chipset_bus_clock_list_entry sixty_six_base_hpt370a[] = {
-        {       XFER_UDMA_5,    0x1488e673      },
-        {       XFER_UDMA_4,    0x1488e673      },
-        {       XFER_UDMA_3,    0x1498e673      },
-        {       XFER_UDMA_2,    0x1490e673      },
-        {       XFER_UDMA_1,    0x1498e677      },
-        {       XFER_UDMA_0,    0x14a0e73f      },
-
-        {       XFER_MW_DMA_2,  0x2480fa73      },
-        {       XFER_MW_DMA_1,  0x2480fa77      }, 
-        {       XFER_MW_DMA_0,  0x2480fb3f      },
-
-        {       XFER_PIO_4,     0x0c82be73      },
-        {       XFER_PIO_3,     0x0c82be95      },
-        {       XFER_PIO_2,     0x0c82beb7      },
-        {       XFER_PIO_1,     0x0d02bf37      },
-        {       XFER_PIO_0,     0x0d02bf5f      },
-        {       0,              0x0d02bf5f      }
-};
 
-static struct chipset_bus_clock_list_entry fifty_base_hpt370a[] = {
-        {       XFER_UDMA_5,    0x12848242      },
-        {       XFER_UDMA_4,    0x12ac8242      },
-        {       XFER_UDMA_3,    0x128c8242      },
-        {       XFER_UDMA_2,    0x120c8242      },
-        {       XFER_UDMA_1,    0x12148254      },
-        {       XFER_UDMA_0,    0x121882ea      },
-
-        {       XFER_MW_DMA_2,  0x22808242      },
-        {       XFER_MW_DMA_1,  0x22808254      },
-        {       XFER_MW_DMA_0,  0x228082ea      },
-
-        {       XFER_PIO_4,     0x0a81f442      },
-        {       XFER_PIO_3,     0x0a81f443      },
-        {       XFER_PIO_2,     0x0a81f454      },
-        {       XFER_PIO_1,     0x0ac1f465      },
-        {       XFER_PIO_0,     0x0ac1f48a      },
-        {       0,              0x0ac1f48a      }
+static u32 forty_base_hpt36x[] = {
+        /* XFER_UDMA_6 */       0x900fd943,
+        /* XFER_UDMA_5 */       0x900fd943,
+        /* XFER_UDMA_4 */       0x900fd943,
+        /* XFER_UDMA_3 */       0x900ad943,
+        /* XFER_UDMA_2 */       0x900bd943,
+        /* XFER_UDMA_1 */       0x9008d943,
+        /* XFER_UDMA_0 */       0x9008d943,
+
+        /* XFER_MW_DMA_2 */     0xa008d943,
+        /* XFER_MW_DMA_1 */     0xa010d955,
+        /* XFER_MW_DMA_0 */     0xa010d9fc,
+
+        /* XFER_PIO_4 */        0xc008d963,
+        /* XFER_PIO_3 */        0xc010d974,
+        /* XFER_PIO_2 */        0xc010d997,
+        /* XFER_PIO_1 */        0xc010d9c7,
+        /* XFER_PIO_0 */        0xc018d9d9
 };
 
-static struct chipset_bus_clock_list_entry thirty_three_base_hpt372[] = {
-        {       XFER_UDMA_6,    0x1c81dc62      },
-        {       XFER_UDMA_5,    0x1c6ddc62      },
-        {       XFER_UDMA_4,    0x1c8ddc62      },
-        {       XFER_UDMA_3,    0x1c8edc62      },      /* checkme */
-        {       XFER_UDMA_2,    0x1c91dc62      },
-        {       XFER_UDMA_1,    0x1c9adc62      },      /* checkme */
-        {       XFER_UDMA_0,    0x1c82dc62      },      /* checkme */
-
-        {       XFER_MW_DMA_2,  0x2c829262      },
-        {       XFER_MW_DMA_1,  0x2c829266      },      /* checkme */
-        {       XFER_MW_DMA_0,  0x2c82922e      },      /* checkme */
-
-        {       XFER_PIO_4,     0x0c829c62      },
-        {       XFER_PIO_3,     0x0c829c84      },
-        {       XFER_PIO_2,     0x0c829ca6      },
-        {       XFER_PIO_1,     0x0d029d26      },
-        {       XFER_PIO_0,     0x0d029d5e      },
-        {       0,              0x0d029d5e      }
+static u32 thirty_three_base_hpt36x[] = {
+        /* XFER_UDMA_6 */       0x90c9a731,
+        /* XFER_UDMA_5 */       0x90c9a731,
+        /* XFER_UDMA_4 */       0x90c9a731,
+        /* XFER_UDMA_3 */       0x90cfa731,
+        /* XFER_UDMA_2 */       0x90caa731,
+        /* XFER_UDMA_1 */       0x90cba731,
+        /* XFER_UDMA_0 */       0x90c8a731,
+
+        /* XFER_MW_DMA_2 */     0xa0c8a731,
+        /* XFER_MW_DMA_1 */     0xa0c8a732,     /* 0xa0c8a733 */
+        /* XFER_MW_DMA_0 */     0xa0c8a797,
+
+        /* XFER_PIO_4 */        0xc0c8a731,
+        /* XFER_PIO_3 */        0xc0c8a742,
+        /* XFER_PIO_2 */        0xc0d0a753,
+        /* XFER_PIO_1 */        0xc0d0a7a3,     /* 0xc0d0a793 */
+        /* XFER_PIO_0 */        0xc0d0a7aa      /* 0xc0d0a7a7 */
 };
 
-static struct chipset_bus_clock_list_entry fifty_base_hpt372[] = {
-        {       XFER_UDMA_5,    0x12848242      },
-        {       XFER_UDMA_4,    0x12ac8242      },
-        {       XFER_UDMA_3,    0x128c8242      },
-        {       XFER_UDMA_2,    0x120c8242      },
-        {       XFER_UDMA_1,    0x12148254      },
-        {       XFER_UDMA_0,    0x121882ea      },
-
-        {       XFER_MW_DMA_2,  0x22808242      },
-        {       XFER_MW_DMA_1,  0x22808254      },
-        {       XFER_MW_DMA_0,  0x228082ea      },
-
-        {       XFER_PIO_4,     0x0a81f442      },
-        {       XFER_PIO_3,     0x0a81f443      },
-        {       XFER_PIO_2,     0x0a81f454      },
-        {       XFER_PIO_1,     0x0ac1f465      },
-        {       XFER_PIO_0,     0x0ac1f48a      },
-        {       0,              0x0a81f443      }
+static u32 twenty_five_base_hpt36x[] = {
+        /* XFER_UDMA_6 */       0x90c98521,
+        /* XFER_UDMA_5 */       0x90c98521,
+        /* XFER_UDMA_4 */       0x90c98521,
+        /* XFER_UDMA_3 */       0x90cf8521,
+        /* XFER_UDMA_2 */       0x90cf8521,
+        /* XFER_UDMA_1 */       0x90cb8521,
+        /* XFER_UDMA_0 */       0x90cb8521,
+
+        /* XFER_MW_DMA_2 */     0xa0ca8521,
+        /* XFER_MW_DMA_1 */     0xa0ca8532,
+        /* XFER_MW_DMA_0 */     0xa0ca8575,
+
+        /* XFER_PIO_4 */        0xc0ca8521,
+        /* XFER_PIO_3 */        0xc0ca8532,
+        /* XFER_PIO_2 */        0xc0ca8542,
+        /* XFER_PIO_1 */        0xc0d08572,
+        /* XFER_PIO_0 */        0xc0d08585
 };
 
-static struct chipset_bus_clock_list_entry sixty_six_base_hpt372[] = {
-        {       XFER_UDMA_6,    0x1c869c62      },
-        {       XFER_UDMA_5,    0x1cae9c62      },
-        {       XFER_UDMA_4,    0x1c8a9c62      },
-        {       XFER_UDMA_3,    0x1c8e9c62      },
-        {       XFER_UDMA_2,    0x1c929c62      },
-        {       XFER_UDMA_1,    0x1c9a9c62      },
-        {       XFER_UDMA_0,    0x1c829c62      },
-
-        {       XFER_MW_DMA_2,  0x2c829c62      },
-        {       XFER_MW_DMA_1,  0x2c829c66      },
-        {       XFER_MW_DMA_0,  0x2c829d2e      },
-
-        {       XFER_PIO_4,     0x0c829c62      },
-        {       XFER_PIO_3,     0x0c829c84      },
-        {       XFER_PIO_2,     0x0c829ca6      },
-        {       XFER_PIO_1,     0x0d029d26      },
-        {       XFER_PIO_0,     0x0d029d5e      },
-        {       0,              0x0d029d26      }
+static u32 thirty_three_base_hpt37x[] = {
+        /* XFER_UDMA_6 */       0x12446231,     /* 0x12646231 ?? */
+        /* XFER_UDMA_5 */       0x12446231,
+        /* XFER_UDMA_4 */       0x12446231,
+        /* XFER_UDMA_3 */       0x126c6231,
+        /* XFER_UDMA_2 */       0x12486231,
+        /* XFER_UDMA_1 */       0x124c6233,
+        /* XFER_UDMA_0 */       0x12506297,
+
+        /* XFER_MW_DMA_2 */     0x22406c31,
+        /* XFER_MW_DMA_1 */     0x22406c33,
+        /* XFER_MW_DMA_0 */     0x22406c97,
+
+        /* XFER_PIO_4 */        0x06414e31,
+        /* XFER_PIO_3 */        0x06414e42,
+        /* XFER_PIO_2 */        0x06414e53,
+        /* XFER_PIO_1 */        0x06814e93,
+        /* XFER_PIO_0 */        0x06814ea7
 };
 
-static struct chipset_bus_clock_list_entry thirty_three_base_hpt374[] = {
-        {       XFER_UDMA_6,    0x12808242      },
-        {       XFER_UDMA_5,    0x12848242      },
-        {       XFER_UDMA_4,    0x12ac8242      },
-        {       XFER_UDMA_3,    0x128c8242      },
-        {       XFER_UDMA_2,    0x120c8242      },
-        {       XFER_UDMA_1,    0x12148254      },
-        {       XFER_UDMA_0,    0x121882ea      },
-
-        {       XFER_MW_DMA_2,  0x22808242      },
-        {       XFER_MW_DMA_1,  0x22808254      },
-        {       XFER_MW_DMA_0,  0x228082ea      },
-
-        {       XFER_PIO_4,     0x0a81f442      },
-        {       XFER_PIO_3,     0x0a81f443      },
-        {       XFER_PIO_2,     0x0a81f454      },
-        {       XFER_PIO_1,     0x0ac1f465      },
-        {       XFER_PIO_0,     0x0ac1f48a      },
-        {       0,              0x06814e93      }
+static u32 fifty_base_hpt37x[] = {
+        /* XFER_UDMA_6 */       0x12848242,
+        /* XFER_UDMA_5 */       0x12848242,
+        /* XFER_UDMA_4 */       0x12ac8242,
+        /* XFER_UDMA_3 */       0x128c8242,
+        /* XFER_UDMA_2 */       0x120c8242,
+        /* XFER_UDMA_1 */       0x12148254,
+        /* XFER_UDMA_0 */       0x121882ea,
+
+        /* XFER_MW_DMA_2 */     0x22808242,
+        /* XFER_MW_DMA_1 */     0x22808254,
+        /* XFER_MW_DMA_0 */     0x228082ea,
+
+        /* XFER_PIO_4 */        0x0a81f442,
+        /* XFER_PIO_3 */        0x0a81f443,
+        /* XFER_PIO_2 */        0x0a81f454,
+        /* XFER_PIO_1 */        0x0ac1f465,
+        /* XFER_PIO_0 */        0x0ac1f48a
 };
 
-/* FIXME: 50MHz timings for HPT374 */
-
-#if 0
-static struct chipset_bus_clock_list_entry sixty_six_base_hpt374[] = {
-        {       XFER_UDMA_6,    0x12406231      },      /* checkme */
-        {       XFER_UDMA_5,    0x12446231      },      /* 0x14846231 */
-        {       XFER_UDMA_4,    0x16814ea7      },      /* 0x14886231 */
-        {       XFER_UDMA_3,    0x16814ea7      },      /* 0x148c6231 */
-        {       XFER_UDMA_2,    0x16814ea7      },      /* 0x148c6231 */
-        {       XFER_UDMA_1,    0x16814ea7      },      /* 0x14906231 */
-        {       XFER_UDMA_0,    0x16814ea7      },      /* 0x14986231 */
-        {       XFER_MW_DMA_2,  0x16814ea7      },      /* 0x26514e21 */
-        {       XFER_MW_DMA_1,  0x16814ea7      },      /* 0x26514e97 */
-        {       XFER_MW_DMA_0,  0x16814ea7      },      /* 0x26514e97 */
-        {       XFER_PIO_4,     0x06814ea7      },      /* 0x06514e21 */
-        {       XFER_PIO_3,     0x06814ea7      },      /* 0x06514e22 */
-        {       XFER_PIO_2,     0x06814ea7      },      /* 0x06514e33 */
-        {       XFER_PIO_1,     0x06814ea7      },      /* 0x06914e43 */
-        {       XFER_PIO_0,     0x06814ea7      },      /* 0x06914e57 */
-        {       0,              0x06814ea7      }
+static u32 sixty_six_base_hpt37x[] = {
+        /* XFER_UDMA_6 */       0x1c869c62,
+        /* XFER_UDMA_5 */       0x1cae9c62,     /* 0x1c8a9c62 */
+        /* XFER_UDMA_4 */       0x1c8a9c62,
+        /* XFER_UDMA_3 */       0x1c8e9c62,
+        /* XFER_UDMA_2 */       0x1c929c62,
+        /* XFER_UDMA_1 */       0x1c9a9c62,
+        /* XFER_UDMA_0 */       0x1c829c62,
+
+        /* XFER_MW_DMA_2 */     0x2c829c62,
+        /* XFER_MW_DMA_1 */     0x2c829c66,
+        /* XFER_MW_DMA_0 */     0x2c829d2e,
+
+        /* XFER_PIO_4 */        0x0c829c62,
+        /* XFER_PIO_3 */        0x0c829c84,
+        /* XFER_PIO_2 */        0x0c829ca6,
+        /* XFER_PIO_1 */        0x0d029d26,
+        /* XFER_PIO_0 */        0x0d029d5e
 };
-#endif
 
 #define HPT366_DEBUG_DRIVE_INFO         0
 #define HPT374_ALLOW_ATA133_6           0
 #define HPT371_ALLOW_ATA133_6           0
 #define HPT302_ALLOW_ATA133_6           0
-#define HPT372_ALLOW_ATA133_6           1
+#define HPT372_ALLOW_ATA133_6           0
 #define HPT370_ALLOW_ATA100_5           1
 #define HPT366_ALLOW_ATA66_4            1
 #define HPT366_ALLOW_ATA66_3            1
@@ -461,9 +357,10 @@ struct hpt_info
         int revision;           /* Chipset revision */
         int flags;              /* Chipset properties */
 #define PLL_MODE        1
-#define IS_372N         2
+#define IS_3xxN         2
+#define PCI_66MHZ       4
                                 /* Speed table */
-        struct chipset_bus_clock_list_entry *speed;
+        u32 *speed;
 };
 
 /*
@@ -600,12 +497,20 @@ static int check_in_drive_lists (ide_drive_t *drive, const char **list)
         return 0;
 }
 
-static unsigned int pci_bus_clock_list (u8 speed, struct chipset_bus_clock_list_entry * chipset_table)
+static u32 pci_bus_clock_list(u8 speed, u32 *chipset_table)
 {
-        for ( ; chipset_table->xfer_speed ; chipset_table++)
-                if (chipset_table->xfer_speed == speed)
-                        return chipset_table->chipset_settings;
-        return chipset_table->chipset_settings;
+        int i;
+
+        /*
+         * Lookup the transfer mode table to get the index into
+         * the timing table.
+         *
+         * NOTE: For XFER_PIO_SLOW, PIO mode 0 timings will be used.
+         */
+        for (i = 0; i < ARRAY_SIZE(xfer_speeds) - 1; i++)
+                if (xfer_speeds[i] == speed)
+                        break;
+        return chipset_table[i];
 }
 
 static int hpt36x_tune_chipset(ide_drive_t *drive, u8 xferspeed)
@@ -956,156 +861,127 @@ static int hpt374_ide_dma_end (ide_drive_t *drive)
 }
 
 /**
- *      hpt372n_set_clock       -       perform clock switching dance
- *      @drive: Drive to switch
- *      @mode: Switching mode (0x21 for write, 0x23 otherwise)
+ *      hpt3xxn_set_clock       -       perform clock switching dance
+ *      @hwif: hwif to switch
+ *      @mode: clocking mode (0x21 for write, 0x23 otherwise)
  *
- *      Switch the DPLL clock on the HPT372N devices. This is a
- *      right mess.
+ *      Switch the DPLL clock on the HPT3xxN devices. This is a right mess.
+ *      NOTE: avoid touching the disabled primary channel on HPT371N -- it
+ *      doesn't physically exist anyway...
  */
- 
-static void hpt372n_set_clock(ide_drive_t *drive, int mode)
+
+static void hpt3xxn_set_clock(ide_hwif_t *hwif, u8 mode)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-        
-        /* FIXME: should we check for DMA active and BUG() */
+        u8 mcr1, scr2 = hwif->INB(hwif->dma_master + 0x7b);
+
+        if ((scr2 & 0x7f) == mode)
+                return;
+
+        /* MISC. control register 1 has the channel enable bit... */
+        mcr1 = hwif->INB(hwif->dma_master + 0x70);
+
         /* Tristate the bus */
-        outb(0x80, hwif->dma_base+0x73);
-        outb(0x80, hwif->dma_base+0x77);
-        
+        if (mcr1 & 0x04)
+                hwif->OUTB(0x80, hwif->dma_master + 0x73);
+        hwif->OUTB(0x80, hwif->dma_master + 0x77);
+
         /* Switch clock and reset channels */
-        outb(mode, hwif->dma_base+0x7B);
-        outb(0xC0, hwif->dma_base+0x79);
-        
+        hwif->OUTB(mode, hwif->dma_master + 0x7b);
+        hwif->OUTB(0xc0, hwif->dma_master + 0x79);
+
         /* Reset state machines */
-        outb(0x37, hwif->dma_base+0x70);
-        outb(0x37, hwif->dma_base+0x74);
-        
+        if (mcr1 & 0x04)
+                hwif->OUTB(0x37, hwif->dma_master + 0x70);
+        hwif->OUTB(0x37, hwif->dma_master + 0x74);
+
         /* Complete reset */
-        outb(0x00, hwif->dma_base+0x79);
-        
+        hwif->OUTB(0x00, hwif->dma_master + 0x79);
+
         /* Reconnect channels to bus */
-        outb(0x00, hwif->dma_base+0x73);
-        outb(0x00, hwif->dma_base+0x77);
+        if (mcr1 & 0x04)
+                hwif->OUTB(0x00, hwif->dma_master + 0x73);
+        hwif->OUTB(0x00, hwif->dma_master + 0x77);
 }
 
 /**
- *      hpt372n_rw_disk         -       prepare for I/O
+ *      hpt3xxn_rw_disk         -       prepare for I/O
  *      @drive: drive for command
  *      @rq: block request structure
  *
- *      This is called when a disk I/O is issued to the 372N.
+ *      This is called when a disk I/O is issued to HPT3xxN.
  *      We need it because of the clock switching.
  */
 
-static void hpt372n_rw_disk(ide_drive_t *drive, struct request *rq)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        int wantclock;
-
-        wantclock = rq_data_dir(rq) ? 0x23 : 0x21;
-
-        if (hwif->config_data != wantclock) {
-                hpt372n_set_clock(drive, wantclock);
-                hwif->config_data = wantclock;
-        }
-}
-
-/*
- * Since SUN Cobalt is attempting to do this operation, I should disclose
- * this has been a long time ago Thu Jul 27 16:40:57 2000 was the patch date
- * HOTSWAP ATA Infrastructure.
- */
-
-static void hpt3xx_reset (ide_drive_t *drive)
-{
-}
-
-static int hpt3xx_tristate (ide_drive_t * drive, int state)
+static void hpt3xxn_rw_disk(ide_drive_t *drive, struct request *rq)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
-        u8 reg59h = 0, reset    = (hwif->channel) ? 0x80 : 0x40;
-        u8 regXXh = 0, state_reg= (hwif->channel) ? 0x57 : 0x53;
-
-        pci_read_config_byte(dev, 0x59, &reg59h);
-        pci_read_config_byte(dev, state_reg, &regXXh);
+        u8 wantclock            = rq_data_dir(rq) ? 0x23 : 0x21;
 
-        if (state) {
-                (void) ide_do_reset(drive);
-                pci_write_config_byte(dev, state_reg, regXXh|0x80);
-                pci_write_config_byte(dev, 0x59, reg59h|reset);
-        } else {
-                pci_write_config_byte(dev, 0x59, reg59h & ~(reset));
-                pci_write_config_byte(dev, state_reg, regXXh & ~(0x80));
-                (void) ide_do_reset(drive);
-        }
-        return 0;
+        hpt3xxn_set_clock(hwif, wantclock);
 }
 
 /* 
- * set/get power state for a drive.
- * turning the power off does the following things:
- *   1) soft-reset the drive
- *   2) tri-states the ide bus
+ * Set/get power state for a drive.
  *
- * when we turn things back on, we need to re-initialize things.
+ * When we turn the power back on, we need to re-initialize things.
  */
 #define TRISTATE_BIT  0x8000
-static int hpt370_busproc(ide_drive_t * drive, int state)
+
+static int hpt3xx_busproc(ide_drive_t *drive, int state)
 {
         ide_hwif_t *hwif        = drive->hwif;
         struct pci_dev *dev     = hwif->pci_dev;
-        u8 tristate = 0, resetmask = 0, bus_reg = 0;
-        u16 tri_reg;
+        u8  tristate, resetmask, bus_reg = 0;
+        u16 tri_reg = 0;
 
         hwif->bus_state = state;
 
         if (hwif->channel) { 
                 /* secondary channel */
-                tristate = 0x56;
-                resetmask = 0x80; 
+                tristate  = 0x56;
+                resetmask = 0x80;
         } else { 
                 /* primary channel */
-                tristate = 0x52;
+                tristate  = 0x52;
                 resetmask = 0x40;
         }
 
-        /* grab status */
+        /* Grab the status. */
         pci_read_config_word(dev, tristate, &tri_reg);
         pci_read_config_byte(dev, 0x59, &bus_reg);
 
-        /* set the state. we don't set it if we don't need to do so.
-         * make sure that the drive knows that it has failed if it's off */
+        /*
+         * Set the state. We don't set it if we don't need to do so.
+         * Make sure that the drive knows that it has failed if it's off.
+         */
         switch (state) {
         case BUSSTATE_ON:
-                hwif->drives[0].failures = 0;
-                hwif->drives[1].failures = 0;
-                if ((bus_reg & resetmask) == 0)
+                if (!(bus_reg & resetmask))
                         return 0;
-                tri_reg &= ~TRISTATE_BIT;
-                bus_reg &= ~resetmask;
-                break;
+                hwif->drives[0].failures = hwif->drives[1].failures = 0;
+
+                pci_write_config_byte(dev, 0x59, bus_reg & ~resetmask);
+                pci_write_config_word(dev, tristate, tri_reg & ~TRISTATE_BIT);
+                return 0;
         case BUSSTATE_OFF:
-                hwif->drives[0].failures = hwif->drives[0].max_failures + 1;
-                hwif->drives[1].failures = hwif->drives[1].max_failures + 1;
-                if ((tri_reg & TRISTATE_BIT) == 0 && (bus_reg & resetmask))
+                if ((bus_reg & resetmask) && !(tri_reg & TRISTATE_BIT))
                         return 0;
                 tri_reg &= ~TRISTATE_BIT;
-                bus_reg |= resetmask;
                 break;
         case BUSSTATE_TRISTATE:
-                hwif->drives[0].failures = hwif->drives[0].max_failures + 1;
-                hwif->drives[1].failures = hwif->drives[1].max_failures + 1;
-                if ((tri_reg & TRISTATE_BIT) && (bus_reg & resetmask))
+                if ((bus_reg & resetmask) &&  (tri_reg & TRISTATE_BIT))
                         return 0;
                 tri_reg |= TRISTATE_BIT;
-                bus_reg |= resetmask;
                 break;
+        default:
+                return -EINVAL;
         }
-        pci_write_config_byte(dev, 0x59, bus_reg);
-        pci_write_config_word(dev, tristate, tri_reg);
 
+        hwif->drives[0].failures = hwif->drives[0].max_failures + 1;
+        hwif->drives[1].failures = hwif->drives[1].max_failures + 1;
+
+        pci_write_config_word(dev, tristate, tri_reg);
+        pci_write_config_byte(dev, 0x59, bus_reg | resetmask);
         return 0;
 }
 
@@ -1119,14 +995,14 @@ static void __devinit hpt366_clocking(ide_hwif_t *hwif)
         /* detect bus speed by looking at control reg timing: */
         switch((reg1 >> 8) & 7) {
                 case 5:
-                        info->speed = forty_base_hpt366;
+                        info->speed = forty_base_hpt36x;
                         break;
                 case 9:
-                        info->speed = twenty_five_base_hpt366;
+                        info->speed = twenty_five_base_hpt36x;
                         break;
                 case 7:
                 default:
-                        info->speed = thirty_three_base_hpt366;
+                        info->speed = thirty_three_base_hpt36x;
                         break;
         }
 }
@@ -1136,9 +1012,9 @@ static void __devinit hpt37x_clocking(ide_hwif_t *hwif)
         struct hpt_info *info = ide_get_hwifdata(hwif);
         struct pci_dev *dev = hwif->pci_dev;
         int adjust, i;
-        u16 freq;
-        u32 pll;
-        u8 reg5bh;
+        u16 freq = 0;
+        u32 pll, temp = 0;
+        u8 reg5bh = 0, mcr1 = 0;
         
         /*
          * default to pci clock. make sure MA15/16 are set to output
@@ -1151,27 +1027,40 @@ static void __devinit hpt37x_clocking(ide_hwif_t *hwif)
         pci_write_config_byte(dev, 0x5b, 0x23);
 
         /*
-         * set up the PLL. we need to adjust it so that it's stable. 
-         * freq = Tpll * 192 / Tpci
+         * We'll have to read f_CNT value in order to determine
+         * the PCI clock frequency according to the following ratio:
+         *
+         * f_CNT = Fpci * 192 / Fdpll
+         *
+         * First try reading the register in which the HighPoint BIOS
+         * saves f_CNT value before  reprogramming the DPLL from its
+         * default setting (which differs for the various chips).
+         * NOTE: This register is only accessible via I/O space.
          *
-         * Todo. For non x86 should probably check the dword is
-         * set to 0xABCDExxx indicating the BIOS saved f_CNT
+         * In case the signature check fails, we'll have to resort to
+         * reading the f_CNT register itself in hopes that nobody has
+         * touched the DPLL yet...
          */
-        pci_read_config_word(dev, 0x78, &freq);
-        freq &= 0x1FF;
-        
+        temp = inl(pci_resource_start(dev, 4) + 0x90);
+        if ((temp & 0xFFFFF000) != 0xABCDE000) {
+                printk(KERN_WARNING "HPT37X: no clock data saved by BIOS\n");
+
+                /* Calculate the average value of f_CNT */
+                for (temp = i = 0; i < 128; i++) {
+                        pci_read_config_word(dev, 0x78, &freq);
+                        temp += freq & 0x1ff;
+                        mdelay(1);
+                }
+                freq = temp / 128;
+        } else
+                freq = temp & 0x1ff;
+
         /*
-         * The 372N uses different PCI clock information and has
-         * some other complications
-         *      On PCI33 timing we must clock switch
-         *      On PCI66 timing we must NOT use the PCI clock
-         *
-         * Currently we always set up the PLL for the 372N
+         * HPT3xxN chips use different PCI clock information.
+         * Currently we always set up the PLL for them.
          */
-         
-        if(info->flags & IS_372N)
-        {
-                printk(KERN_INFO "hpt: HPT372N detected, using 372N timing.\n");
+
+        if (info->flags & IS_3xxN) {
                 if(freq < 0x55)
                         pll = F_LOW_PCI_33;
                 else if(freq < 0x70)
@@ -1180,10 +1069,8 @@ static void __devinit hpt37x_clocking(ide_hwif_t *hwif)
                         pll = F_LOW_PCI_50;
                 else
                         pll = F_LOW_PCI_66;
-                        
-                printk(KERN_INFO "FREQ: %d PLL: %d\n", freq, pll);
-                        
-                /* We always use the pll not the PCI clock on 372N */
+
+                printk(KERN_INFO "HPT3xxN detected, FREQ: %d, PLL: %d\n", freq, pll);
         }
         else
         {
@@ -1197,41 +1084,22 @@ static void __devinit hpt37x_clocking(ide_hwif_t *hwif)
                         pll = F_LOW_PCI_66;
         
                 if (pll == F_LOW_PCI_33) {
-                        if (info->revision >= 8)
-                                info->speed = thirty_three_base_hpt374;
-                        else if (info->revision >= 5)
-                                info->speed = thirty_three_base_hpt372;
-                        else if (info->revision >= 4)
-                                info->speed = thirty_three_base_hpt370a;
-                        else
-                                info->speed = thirty_three_base_hpt370;
+                        info->speed = thirty_three_base_hpt37x;
                         printk(KERN_DEBUG "HPT37X: using 33MHz PCI clock\n");
                 } else if (pll == F_LOW_PCI_40) {
                         /* Unsupported */
                 } else if (pll == F_LOW_PCI_50) {
-                        if (info->revision >= 8)
-                                info->speed = fifty_base_hpt370a;
-                        else if (info->revision >= 5)
-                                info->speed = fifty_base_hpt372;
-                        else if (info->revision >= 4)
-                                info->speed = fifty_base_hpt370a;
-                        else
-                                info->speed = fifty_base_hpt370a;
+                        info->speed = fifty_base_hpt37x;
                         printk(KERN_DEBUG "HPT37X: using 50MHz PCI clock\n");
                 } else {
-                        if (info->revision >= 8) {
-                                printk(KERN_ERR "HPT37x: 66MHz timings are not supported.\n");
-                        }
-                        else if (info->revision >= 5)
-                                info->speed = sixty_six_base_hpt372;
-                        else if (info->revision >= 4)
-                                info->speed = sixty_six_base_hpt370a;
-                        else
-                                info->speed = sixty_six_base_hpt370;
+                        info->speed = sixty_six_base_hpt37x;
                         printk(KERN_DEBUG "HPT37X: using 66MHz PCI clock\n");
                 }
         }
-        
+
+        if (pll == F_LOW_PCI_66)
+                info->flags |= PCI_66MHZ;
+
         /*
          * only try the pll if we don't have a table for the clock
          * speed that we're running at. NOTE: the internal PLL will
@@ -1248,11 +1116,8 @@ static void __devinit hpt37x_clocking(ide_hwif_t *hwif)
         info->flags |= PLL_MODE;
         
         /*
-         * FIXME: make this work correctly, esp with 372N as per
-         * reference driver code.
-         *
-         * adjust PLL based upon PCI clock, enable it, and wait for
-         * stabilization.
+         * Adjust the PLL based upon the PCI clock, enable it, and
+         * wait for stabilization...
          */
         adjust = 0;
         freq = (pll < F_LOW_PCI_50) ? 2 : 4;
@@ -1275,22 +1140,12 @@ static void __devinit hpt37x_clocking(ide_hwif_t *hwif)
                                 pci_write_config_dword(dev, 0x5c, 
                                                        pll & ~0x100);
                                 pci_write_config_byte(dev, 0x5b, 0x21);
-                                if (info->revision >= 8)
-                                        info->speed = fifty_base_hpt370a;
-                                else if (info->revision >= 5)
-                                        info->speed = fifty_base_hpt372;
-                                else if (info->revision >= 4)
-                                        info->speed = fifty_base_hpt370a;
-                                else
-                                        info->speed = fifty_base_hpt370a;
+
+                                info->speed = fifty_base_hpt37x;
                                 printk("HPT37X: using 50MHz internal PLL\n");
                                 goto init_hpt37X_done;
                         }
                 }
-                if (!pci_get_drvdata(dev)) {
-                        printk("No Clock Stabilization!!!\n");
-                        return;
-                }
 pll_recal:
                 if (adjust & 1)
                         pll -= (adjust >> 1);
@@ -1300,11 +1155,16 @@ pll_recal:
 
 init_hpt37X_done:
         if (!info->speed)
-                printk(KERN_ERR "HPT37X%s: unknown bus timing [%d %d].\n",
-                        (info->flags & IS_372N)?"N":"", pll, freq);
-        /* reset state engine */
-        pci_write_config_byte(dev, 0x50, 0x37); 
-        pci_write_config_byte(dev, 0x54, 0x37); 
+                printk(KERN_ERR "HPT37x%s: unknown bus timing [%d %d].\n",
+                       (info->flags & IS_3xxN) ? "N" : "", pll, freq);
+        /*
+         * Reset the state engines.
+         * NOTE: avoid accidentally enabling the primary channel on HPT371N.
+         */
+        pci_read_config_byte(dev, 0x50, &mcr1);
+        if (mcr1 & 0x04)
+                pci_write_config_byte(dev, 0x50, 0x37);
+        pci_write_config_byte(dev, 0x54, 0x37);
         udelay(100);
 }
 
@@ -1367,6 +1227,7 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
         struct pci_dev *dev             = hwif->pci_dev;
         struct hpt_info *info           = ide_get_hwifdata(hwif);
         u8 ata66 = 0, regmask           = (hwif->channel) ? 0x01 : 0x02;
+        int serialize                   = HPT_SERIALIZE_IO;
         
         hwif->tuneproc                  = &hpt3xx_tune_drive;
         hwif->speedproc                 = &hpt3xx_tune_chipset;
@@ -1374,8 +1235,20 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
         hwif->intrproc                  = &hpt3xx_intrproc;
         hwif->maskproc                  = &hpt3xx_maskproc;
         
-        if(info->flags & IS_372N)
-                hwif->rw_disk = &hpt372n_rw_disk;
+        /*
+         * HPT3xxN chips have some complications:
+         *
+         * - on 33 MHz PCI we must clock switch
+         * - on 66 MHz PCI we must NOT use the PCI clock
+         */
+        if ((info->flags & (IS_3xxN | PCI_66MHZ)) == IS_3xxN) {
+                /*
+                 * Clock is shared between the channels,
+                 * so we'll have to serialize them... :-(
+                 */
+                serialize = 1;
+                hwif->rw_disk = &hpt3xxn_rw_disk;
+        }
 
         /*
          * The HPT37x uses the CBLID pins as outputs for MA15/MA16
@@ -1418,29 +1291,15 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
                 PCI_FUNC(hwif->pci_dev->devfn));
 #endif /* DEBUG */
 
-#ifdef HPT_SERIALIZE_IO
-        /* serialize access to this device */
-        if (hwif->mate)
+        /* Serialize access to this device */
+        if (serialize && hwif->mate)
                 hwif->serialized = hwif->mate->serialized = 1;
-#endif
 
-        if (info->revision >= 3) {
-                u8 reg5ah = 0;
-                        pci_write_config_byte(dev, 0x5a, reg5ah & ~0x10);
-                /*
-                 * set up ioctl for power status.
-                 * note: power affects both
-                 * drives on each channel
-                 */
-                hwif->resetproc = &hpt3xx_reset;
-                hwif->busproc   = &hpt370_busproc;
-        } else if (info->revision >= 2) {
-                hwif->resetproc = &hpt3xx_reset;
-                hwif->busproc   = &hpt3xx_tristate;
-        } else {
-                hwif->resetproc = &hpt3xx_reset;
-                hwif->busproc   = &hpt3xx_tristate;
-        }
+        /*
+         * Set up ioctl for power status.
+         * NOTE:  power affects both drives on each channel.
+         */
+        hwif->busproc = &hpt3xx_busproc;
 
         if (!hwif->dma_base) {
                 hwif->drives[0].autotune = 1;
@@ -1490,7 +1349,7 @@ static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase)
                 return;
                 
         if(info->speed == NULL) {
-                printk(KERN_WARNING "hpt: no known IDE timings, disabling DMA.\n");
+                printk(KERN_WARNING "hpt366: no known IDE timings, disabling DMA.\n");
                 return;
         }
 
@@ -1519,9 +1378,10 @@ static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase)
 
 static void __devinit init_iops_hpt366(ide_hwif_t *hwif)
 {
-        struct hpt_info *info = kzalloc(sizeof(struct hpt_info), GFP_KERNEL);
-        unsigned long dmabase = pci_resource_start(hwif->pci_dev, 4);
-        u8 did, rid;
+        struct hpt_info *info   = kzalloc(sizeof(struct hpt_info), GFP_KERNEL);
+        struct pci_dev  *dev    = hwif->pci_dev;
+        u16 did                 = dev->device;
+        u8  rid                 = 0;
 
         if(info == NULL) {
                 printk(KERN_WARNING "hpt366: out of memory.\n");
@@ -1529,15 +1389,22 @@ static void __devinit init_iops_hpt366(ide_hwif_t *hwif)
         }
         ide_set_hwifdata(hwif, info);
 
-        if(dmabase) {
-                did = inb(dmabase + 0x22);
-                rid = inb(dmabase + 0x28);
-
-                if((did == 4 && rid == 6) || (did == 5 && rid > 1))
-                        info->flags |= IS_372N;
+        /* Avoid doing the same thing twice. */
+        if (hwif->channel && hwif->mate) {
+                memcpy(info, ide_get_hwifdata(hwif->mate), sizeof(struct hpt_info));
+                return;
         }
 
-        info->revision = hpt_revision(hwif->pci_dev);
+        pci_read_config_byte(dev, PCI_CLASS_REVISION, &rid);
+
+        if (( did == PCI_DEVICE_ID_TTI_HPT366  && rid == 6) ||
+            ((did == PCI_DEVICE_ID_TTI_HPT372  ||
+              did == PCI_DEVICE_ID_TTI_HPT302  ||
+              did == PCI_DEVICE_ID_TTI_HPT371) && rid > 1) ||
+              did == PCI_DEVICE_ID_TTI_HPT372N)
+                info->flags |= IS_3xxN;
+
+        info->revision = hpt_revision(dev);
 
         if (info->revision >= 3)
                 hpt37x_clocking(hwif);
@@ -1574,6 +1441,23 @@ static int __devinit init_setup_hpt37x(struct pci_dev *dev, ide_pci_device_t *d)
         return ide_setup_pci_device(dev, d);
 }
 
+static int __devinit init_setup_hpt371(struct pci_dev *dev, ide_pci_device_t *d)
+{
+        u8 mcr1 = 0;
+
+        /*
+         * HPT371 chips physically have only one channel, the secondary one,
+         * but the primary channel registers do exist!  Go figure...
+         * So,  we manually disable the non-existing channel here
+         * (if the BIOS hasn't done this already).
+         */
+        pci_read_config_byte(dev, 0x50, &mcr1);
+        if (mcr1 & 0x04)
+                pci_write_config_byte(dev, 0x50, (mcr1 & ~0x04));
+
+        return ide_setup_pci_device(dev, d);
+}
+
 static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d)
 {
         struct pci_dev *findev = NULL;
@@ -1661,13 +1545,14 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .bootable       = OFF_BOARD,
         },{     /* 3 */
                 .name           = "HPT371",
-                .init_setup     = init_setup_hpt37x,
+                .init_setup     = init_setup_hpt371,
                 .init_chipset   = init_chipset_hpt366,
                 .init_iops      = init_iops_hpt366,
                 .init_hwif      = init_hwif_hpt366,
                 .init_dma       = init_dma_hpt366,
                 .channels       = 2,
                 .autodma        = AUTODMA,
+                .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
                 .bootable       = OFF_BOARD,
         },{     /* 4 */
                 .name           = "HPT374",
@@ -1699,13 +1584,16 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
  *
  *      Called when the PCI registration layer (or the IDE initialization)
  *      finds a device matching our IDE device tables.
+ *
+ *      NOTE: since we'll have to modify some fields of the ide_pci_device_t
+ *      structure depending on the chip's revision, we'd better pass a local
+ *      copy down the call chain...
  */
- 
 static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d = &hpt366_chipsets[id->driver_data];
+        ide_pci_device_t d = hpt366_chipsets[id->driver_data];
 
-        return d->init_setup(dev, d);
+        return d.init_setup(dev, &d);
 }
 
 static struct pci_device_id hpt366_pci_tbl[] = {
diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile
index 163d991eb8c9..50fb1cd447b7 100644
--- a/drivers/infiniband/core/Makefile
+++ b/drivers/infiniband/core/Makefile
@@ -1,9 +1,11 @@
 infiniband-$(CONFIG_INFINIBAND_ADDR_TRANS)      := ib_addr.o rdma_cm.o
+user_access-$(CONFIG_INFINIBAND_ADDR_TRANS)     := rdma_ucm.o
 
 obj-$(CONFIG_INFINIBAND) +=             ib_core.o ib_mad.o ib_sa.o \
                                         ib_cm.o iw_cm.o $(infiniband-y)
 obj-$(CONFIG_INFINIBAND_USER_MAD) +=    ib_umad.o
-obj-$(CONFIG_INFINIBAND_USER_ACCESS) += ib_uverbs.o ib_ucm.o
+obj-$(CONFIG_INFINIBAND_USER_ACCESS) += ib_uverbs.o ib_ucm.o \
+                                        $(user_access-y)
 
 ib_core-y :=                    packer.o ud_header.o verbs.o sysfs.o \
                                 device.o fmr_pool.o cache.o
@@ -18,6 +20,8 @@ iw_cm-y :=			iwcm.o
 
 rdma_cm-y :=                    cma.o
 
+rdma_ucm-y :=                   ucma.o
+
 ib_addr-y :=                    addr.o
 
 ib_umad-y :=                    user_mad.o
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 79c937bf6962..d446998b12a4 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -3289,6 +3289,10 @@ static int cm_init_qp_rts_attr(struct cm_id_private *cm_id_priv,
 
         spin_lock_irqsave(&cm_id_priv->lock, flags);
         switch (cm_id_priv->id.state) {
+        /* Allow transition to RTS before sending REP */
+        case IB_CM_REQ_RCVD:
+        case IB_CM_MRA_REQ_SENT:
+
         case IB_CM_REP_RCVD:
         case IB_CM_MRA_REP_SENT:
         case IB_CM_REP_SENT:
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 985a6b564d8f..533193d4e5df 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -70,6 +70,7 @@ static DEFINE_MUTEX(lock);
 static struct workqueue_struct *cma_wq;
 static DEFINE_IDR(sdp_ps);
 static DEFINE_IDR(tcp_ps);
+static DEFINE_IDR(udp_ps);
 
 struct cma_device {
         struct list_head        list;
@@ -133,7 +134,6 @@ struct rdma_id_private {
 
         u32                     seq_num;
         u32                     qp_num;
-        enum ib_qp_type         qp_type;
         u8                      srq;
 };
 
@@ -392,7 +392,6 @@ int rdma_create_qp(struct rdma_cm_id *id, struct ib_pd *pd,
 
         id->qp = qp;
         id_priv->qp_num = qp->qp_num;
-        id_priv->qp_type = qp->qp_type;
         id_priv->srq = (qp->srq != NULL);
         return 0;
 err:
@@ -510,9 +509,17 @@ static inline int cma_any_addr(struct sockaddr *addr)
         return cma_zero_addr(addr) || cma_loopback_addr(addr);
 }
 
+static inline __be16 cma_port(struct sockaddr *addr)
+{
+        if (addr->sa_family == AF_INET)
+                return ((struct sockaddr_in *) addr)->sin_port;
+        else
+                return ((struct sockaddr_in6 *) addr)->sin6_port;
+}
+
 static inline int cma_any_port(struct sockaddr *addr)
 {
-        return !((struct sockaddr_in *) addr)->sin_port;
+        return !cma_port(addr);
 }
 
 static int cma_get_net_info(void *hdr, enum rdma_port_space ps,
@@ -594,20 +601,6 @@ static inline int cma_user_data_offset(enum rdma_port_space ps)
         }
 }
 
-static int cma_notify_user(struct rdma_id_private *id_priv,
-                           enum rdma_cm_event_type type, int status,
-                           void *data, u8 data_len)
-{
-        struct rdma_cm_event event;
-
-        event.event = type;
-        event.status = status;
-        event.private_data = data;
-        event.private_data_len = data_len;
-
-        return id_priv->id.event_handler(&id_priv->id, &event);
-}
-
 static void cma_cancel_route(struct rdma_id_private *id_priv)
 {
         switch (rdma_node_get_transport(id_priv->id.device->node_type)) {
@@ -776,63 +769,61 @@ static int cma_verify_rep(struct rdma_id_private *id_priv, void *data)
         return 0;
 }
 
-static int cma_rtu_recv(struct rdma_id_private *id_priv)
+static void cma_set_rep_event_data(struct rdma_cm_event *event,
+                                   struct ib_cm_rep_event_param *rep_data,
+                                   void *private_data)
 {
-        int ret;
-
-        ret = cma_modify_qp_rts(&id_priv->id);
-        if (ret)
-                goto reject;
-
-        return 0;
-reject:
-        cma_modify_qp_err(&id_priv->id);
-        ib_send_cm_rej(id_priv->cm_id.ib, IB_CM_REJ_CONSUMER_DEFINED,
-                       NULL, 0, NULL, 0);
-        return ret;
+        event->param.conn.private_data = private_data;
+        event->param.conn.private_data_len = IB_CM_REP_PRIVATE_DATA_SIZE;
+        event->param.conn.responder_resources = rep_data->responder_resources;
+        event->param.conn.initiator_depth = rep_data->initiator_depth;
+        event->param.conn.flow_control = rep_data->flow_control;
+        event->param.conn.rnr_retry_count = rep_data->rnr_retry_count;
+        event->param.conn.srq = rep_data->srq;
+        event->param.conn.qp_num = rep_data->remote_qpn;
 }
 
 static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
 {
         struct rdma_id_private *id_priv = cm_id->context;
-        enum rdma_cm_event_type event;
-        u8 private_data_len = 0;
-        int ret = 0, status = 0;
+        struct rdma_cm_event event;
+        int ret = 0;
 
         atomic_inc(&id_priv->dev_remove);
         if (!cma_comp(id_priv, CMA_CONNECT))
                 goto out;
 
+        memset(&event, 0, sizeof event);
         switch (ib_event->event) {
         case IB_CM_REQ_ERROR:
         case IB_CM_REP_ERROR:
-                event = RDMA_CM_EVENT_UNREACHABLE;
-                status = -ETIMEDOUT;
+                event.event = RDMA_CM_EVENT_UNREACHABLE;
+                event.status = -ETIMEDOUT;
                 break;
         case IB_CM_REP_RECEIVED:
-                status = cma_verify_rep(id_priv, ib_event->private_data);
-                if (status)
-                        event = RDMA_CM_EVENT_CONNECT_ERROR;
+                event.status = cma_verify_rep(id_priv, ib_event->private_data);
+                if (event.status)
+                        event.event = RDMA_CM_EVENT_CONNECT_ERROR;
                 else if (id_priv->id.qp && id_priv->id.ps != RDMA_PS_SDP) {
-                        status = cma_rep_recv(id_priv);
-                        event = status ? RDMA_CM_EVENT_CONNECT_ERROR :
-                                         RDMA_CM_EVENT_ESTABLISHED;
+                        event.status = cma_rep_recv(id_priv);
+                        event.event = event.status ? RDMA_CM_EVENT_CONNECT_ERROR :
+                                                     RDMA_CM_EVENT_ESTABLISHED;
                 } else
-                        event = RDMA_CM_EVENT_CONNECT_RESPONSE;
-                private_data_len = IB_CM_REP_PRIVATE_DATA_SIZE;
+                        event.event = RDMA_CM_EVENT_CONNECT_RESPONSE;
+                cma_set_rep_event_data(&event, &ib_event->param.rep_rcvd,
+                                       ib_event->private_data);
                 break;
         case IB_CM_RTU_RECEIVED:
-                status = cma_rtu_recv(id_priv);
-                event = status ? RDMA_CM_EVENT_CONNECT_ERROR :
-                                 RDMA_CM_EVENT_ESTABLISHED;
+        case IB_CM_USER_ESTABLISHED:
+                event.event = RDMA_CM_EVENT_ESTABLISHED;
                 break;
         case IB_CM_DREQ_ERROR:
-                status = -ETIMEDOUT; /* fall through */
+                event.status = -ETIMEDOUT; /* fall through */
         case IB_CM_DREQ_RECEIVED:
         case IB_CM_DREP_RECEIVED:
                 if (!cma_comp_exch(id_priv, CMA_CONNECT, CMA_DISCONNECT))
                         goto out;
-                event = RDMA_CM_EVENT_DISCONNECTED;
+                event.event = RDMA_CM_EVENT_DISCONNECTED;
                 break;
         case IB_CM_TIMEWAIT_EXIT:
         case IB_CM_MRA_RECEIVED:
@@ -840,9 +831,10 @@ static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
                 goto out;
         case IB_CM_REJ_RECEIVED:
                 cma_modify_qp_err(&id_priv->id);
-                status = ib_event->param.rej_rcvd.reason;
-                event = RDMA_CM_EVENT_REJECTED;
-                private_data_len = IB_CM_REJ_PRIVATE_DATA_SIZE;
+                event.status = ib_event->param.rej_rcvd.reason;
+                event.event = RDMA_CM_EVENT_REJECTED;
+                event.param.conn.private_data = ib_event->private_data;
+                event.param.conn.private_data_len = IB_CM_REJ_PRIVATE_DATA_SIZE;
                 break;
         default:
                 printk(KERN_ERR "RDMA CMA: unexpected IB CM event: %d",
@@ -850,8 +842,7 @@ static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
                 goto out;
         }
 
-        ret = cma_notify_user(id_priv, event, status, ib_event->private_data,
-                              private_data_len);
+        ret = id_priv->id.event_handler(&id_priv->id, &event);
         if (ret) {
                 /* Destroy the CM ID by returning a non-zero value. */
                 id_priv->cm_id.ib = NULL;
@@ -865,8 +856,8 @@ out:
         return ret;
 }
 
-static struct rdma_id_private *cma_new_id(struct rdma_cm_id *listen_id,
-                                          struct ib_cm_event *ib_event)
+static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id,
+                                               struct ib_cm_event *ib_event)
 {
         struct rdma_id_private *id_priv;
         struct rdma_cm_id *id;
@@ -913,9 +904,61 @@ err:
         return NULL;
 }
 
+static struct rdma_id_private *cma_new_udp_id(struct rdma_cm_id *listen_id,
+                                              struct ib_cm_event *ib_event)
+{
+        struct rdma_id_private *id_priv;
+        struct rdma_cm_id *id;
+        union cma_ip_addr *src, *dst;
+        __u16 port;
+        u8 ip_ver;
+        int ret;
+
+        id = rdma_create_id(listen_id->event_handler, listen_id->context,
+                            listen_id->ps);
+        if (IS_ERR(id))
+                return NULL;
+
+
+        if (cma_get_net_info(ib_event->private_data, listen_id->ps,
+                             &ip_ver, &port, &src, &dst))
+                goto err;
+
+        cma_save_net_info(&id->route.addr, &listen_id->route.addr,
+                          ip_ver, port, src, dst);
+
+        ret = rdma_translate_ip(&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;
+        return id_priv;
+err:
+        rdma_destroy_id(id);
+        return NULL;
+}
+
+static void cma_set_req_event_data(struct rdma_cm_event *event,
+                                   struct ib_cm_req_event_param *req_data,
+                                   void *private_data, int offset)
+{
+        event->param.conn.private_data = private_data + offset;
+        event->param.conn.private_data_len = IB_CM_REQ_PRIVATE_DATA_SIZE - offset;
+        event->param.conn.responder_resources = req_data->responder_resources;
+        event->param.conn.initiator_depth = req_data->initiator_depth;
+        event->param.conn.flow_control = req_data->flow_control;
+        event->param.conn.retry_count = req_data->retry_count;
+        event->param.conn.rnr_retry_count = req_data->rnr_retry_count;
+        event->param.conn.srq = req_data->srq;
+        event->param.conn.qp_num = req_data->remote_qpn;
+}
+
 static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
 {
         struct rdma_id_private *listen_id, *conn_id;
+        struct rdma_cm_event event;
         int offset, ret;
 
         listen_id = cm_id->context;
@@ -925,7 +968,19 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
                 goto out;
         }
 
-        conn_id = cma_new_id(&listen_id->id, ib_event);
+        memset(&event, 0, sizeof event);
+        offset = cma_user_data_offset(listen_id->id.ps);
+        event.event = RDMA_CM_EVENT_CONNECT_REQUEST;
+        if (listen_id->id.ps == RDMA_PS_UDP) {
+                conn_id = cma_new_udp_id(&listen_id->id, ib_event);
+                event.param.ud.private_data = ib_event->private_data + offset;
+                event.param.ud.private_data_len =
+                                IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE - offset;
+        } else {
+                conn_id = cma_new_conn_id(&listen_id->id, ib_event);
+                cma_set_req_event_data(&event, &ib_event->param.req_rcvd,
+                                       ib_event->private_data, offset);
+        }
         if (!conn_id) {
                 ret = -ENOMEM;
                 goto out;
@@ -942,10 +997,7 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
         cm_id->context = conn_id;
         cm_id->cm_handler = cma_ib_handler;
 
-        offset = cma_user_data_offset(listen_id->id.ps);
-        ret = cma_notify_user(conn_id, RDMA_CM_EVENT_CONNECT_REQUEST, 0,
-                              ib_event->private_data + offset,
-                              IB_CM_REQ_PRIVATE_DATA_SIZE - offset);
+        ret = conn_id->id.event_handler(&conn_id->id, &event);
         if (!ret)
                 goto out;
 
@@ -964,8 +1016,7 @@ out:
 
 static __be64 cma_get_service_id(enum rdma_port_space ps, struct sockaddr *addr)
 {
-        return cpu_to_be64(((u64)ps << 16) +
-               be16_to_cpu(((struct sockaddr_in *) addr)->sin_port));
+        return cpu_to_be64(((u64)ps << 16) + be16_to_cpu(cma_port(addr)));
 }
 
 static void cma_set_compare_data(enum rdma_port_space ps, struct sockaddr *addr,
@@ -1021,15 +1072,16 @@ static void cma_set_compare_data(enum rdma_port_space ps, struct sockaddr *addr,
 static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event)
 {
         struct rdma_id_private *id_priv = iw_id->context;
-        enum rdma_cm_event_type event = 0;
+        struct rdma_cm_event event;
         struct sockaddr_in *sin;
         int ret = 0;
 
+        memset(&event, 0, sizeof event);
         atomic_inc(&id_priv->dev_remove);
 
         switch (iw_event->event) {
         case IW_CM_EVENT_CLOSE:
-                event = RDMA_CM_EVENT_DISCONNECTED;
+                event.event = RDMA_CM_EVENT_DISCONNECTED;
                 break;
         case IW_CM_EVENT_CONNECT_REPLY:
                 sin = (struct sockaddr_in *) &id_priv->id.route.addr.src_addr;
@@ -1037,20 +1089,21 @@ static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event)
                 sin = (struct sockaddr_in *) &id_priv->id.route.addr.dst_addr;
                 *sin = iw_event->remote_addr;
                 if (iw_event->status)
-                        event = RDMA_CM_EVENT_REJECTED;
+                        event.event = RDMA_CM_EVENT_REJECTED;
                 else
-                        event = RDMA_CM_EVENT_ESTABLISHED;
+                        event.event = RDMA_CM_EVENT_ESTABLISHED;
                 break;
         case IW_CM_EVENT_ESTABLISHED:
-                event = RDMA_CM_EVENT_ESTABLISHED;
+                event.event = RDMA_CM_EVENT_ESTABLISHED;
                 break;
         default:
                 BUG_ON(1);
         }
 
-        ret = cma_notify_user(id_priv, event, iw_event->status,
-                              iw_event->private_data,
-                              iw_event->private_data_len);
+        event.status = iw_event->status;
+        event.param.conn.private_data = iw_event->private_data;
+        event.param.conn.private_data_len = iw_event->private_data_len;
+        ret = id_priv->id.event_handler(&id_priv->id, &event);
         if (ret) {
                 /* Destroy the CM ID by returning a non-zero value. */
                 id_priv->cm_id.iw = NULL;
@@ -1071,6 +1124,7 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
         struct rdma_id_private *listen_id, *conn_id;
         struct sockaddr_in *sin;
         struct net_device *dev = NULL;
+        struct rdma_cm_event event;
         int ret;
 
         listen_id = cm_id->context;
@@ -1124,9 +1178,11 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
         sin = (struct sockaddr_in *) &new_cm_id->route.addr.dst_addr;
         *sin = iw_event->remote_addr;
 
-        ret = cma_notify_user(conn_id, RDMA_CM_EVENT_CONNECT_REQUEST, 0,
-                              iw_event->private_data,
-                              iw_event->private_data_len);
+        memset(&event, 0, sizeof event);
+        event.event = RDMA_CM_EVENT_CONNECT_REQUEST;
+        event.param.conn.private_data = iw_event->private_data;
+        event.param.conn.private_data_len = iw_event->private_data_len;
+        ret = conn_id->id.event_handler(&conn_id->id, &event);
         if (ret) {
                 /* User wants to destroy the CM ID */
                 conn_id->cm_id.iw = NULL;
@@ -1515,8 +1571,9 @@ static void addr_handler(int status, struct sockaddr *src_addr,
                          struct rdma_dev_addr *dev_addr, void *context)
 {
         struct rdma_id_private *id_priv = context;
-        enum rdma_cm_event_type event;
+        struct rdma_cm_event event;
 
+        memset(&event, 0, sizeof event);
         atomic_inc(&id_priv->dev_remove);
 
         /*
@@ -1536,14 +1593,15 @@ static void addr_handler(int status, struct sockaddr *src_addr,
         if (status) {
                 if (!cma_comp_exch(id_priv, CMA_ADDR_RESOLVED, CMA_ADDR_BOUND))
                         goto out;
-                event = RDMA_CM_EVENT_ADDR_ERROR;
+                event.event = RDMA_CM_EVENT_ADDR_ERROR;
+                event.status = status;
         } else {
                 memcpy(&id_priv->id.route.addr.src_addr, src_addr,
                        ip_addr_size(src_addr));
-                event = RDMA_CM_EVENT_ADDR_RESOLVED;
+                event.event = RDMA_CM_EVENT_ADDR_RESOLVED;
         }
 
-        if (cma_notify_user(id_priv, event, status, NULL, 0)) {
+        if (id_priv->id.event_handler(&id_priv->id, &event)) {
                 cma_exch(id_priv, CMA_DESTROYING);
                 cma_release_remove(id_priv);
                 cma_deref_id(id_priv);
@@ -1733,6 +1791,9 @@ static int cma_get_port(struct rdma_id_private *id_priv)
         case RDMA_PS_TCP:
                 ps = &tcp_ps;
                 break;
+        case RDMA_PS_UDP:
+                ps = &udp_ps;
+                break;
         default:
                 return -EPROTONOSUPPORT;
         }
@@ -1821,6 +1882,110 @@ static int cma_format_hdr(void *hdr, enum rdma_port_space ps,
         return 0;
 }
 
+static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
+                                struct ib_cm_event *ib_event)
+{
+        struct rdma_id_private *id_priv = cm_id->context;
+        struct rdma_cm_event event;
+        struct ib_cm_sidr_rep_event_param *rep = &ib_event->param.sidr_rep_rcvd;
+        int ret = 0;
+
+        memset(&event, 0, sizeof event);
+        atomic_inc(&id_priv->dev_remove);
+        if (!cma_comp(id_priv, CMA_CONNECT))
+                goto out;
+
+        switch (ib_event->event) {
+        case IB_CM_SIDR_REQ_ERROR:
+                event.event = RDMA_CM_EVENT_UNREACHABLE;
+                event.status = -ETIMEDOUT;
+                break;
+        case IB_CM_SIDR_REP_RECEIVED:
+                event.param.ud.private_data = ib_event->private_data;
+                event.param.ud.private_data_len = IB_CM_SIDR_REP_PRIVATE_DATA_SIZE;
+                if (rep->status != IB_SIDR_SUCCESS) {
+                        event.event = RDMA_CM_EVENT_UNREACHABLE;
+                        event.status = ib_event->param.sidr_rep_rcvd.status;
+                        break;
+                }
+                if (rep->qkey != RDMA_UD_QKEY) {
+                        event.event = RDMA_CM_EVENT_UNREACHABLE;
+                        event.status = -EINVAL;
+                        break;
+                }
+                ib_init_ah_from_path(id_priv->id.device, id_priv->id.port_num,
+                                     id_priv->id.route.path_rec,
+                                     &event.param.ud.ah_attr);
+                event.param.ud.qp_num = rep->qpn;
+                event.param.ud.qkey = rep->qkey;
+                event.event = RDMA_CM_EVENT_ESTABLISHED;
+                event.status = 0;
+                break;
+        default:
+                printk(KERN_ERR "RDMA CMA: unexpected IB CM event: %d",
+                       ib_event->event);
+                goto out;
+        }
+
+        ret = id_priv->id.event_handler(&id_priv->id, &event);
+        if (ret) {
+                /* Destroy the CM ID by returning a non-zero value. */
+                id_priv->cm_id.ib = NULL;
+                cma_exch(id_priv, CMA_DESTROYING);
+                cma_release_remove(id_priv);
+                rdma_destroy_id(&id_priv->id);
+                return ret;
+        }
+out:
+        cma_release_remove(id_priv);
+        return ret;
+}
+
+static int cma_resolve_ib_udp(struct rdma_id_private *id_priv,
+                              struct rdma_conn_param *conn_param)
+{
+        struct ib_cm_sidr_req_param req;
+        struct rdma_route *route;
+        int ret;
+
+        req.private_data_len = sizeof(struct cma_hdr) +
+                               conn_param->private_data_len;
+        req.private_data = kzalloc(req.private_data_len, GFP_ATOMIC);
+        if (!req.private_data)
+                return -ENOMEM;
+
+        if (conn_param->private_data && conn_param->private_data_len)
+                memcpy((void *) req.private_data + sizeof(struct cma_hdr),
+                       conn_param->private_data, conn_param->private_data_len);
+
+        route = &id_priv->id.route;
+        ret = cma_format_hdr((void *) req.private_data, id_priv->id.ps, route);
+        if (ret)
+                goto out;
+
+        id_priv->cm_id.ib = ib_create_cm_id(id_priv->id.device,
+                                            cma_sidr_rep_handler, id_priv);
+        if (IS_ERR(id_priv->cm_id.ib)) {
+                ret = PTR_ERR(id_priv->cm_id.ib);
+                goto out;
+        }
+
+        req.path = route->path_rec;
+        req.service_id = cma_get_service_id(id_priv->id.ps,
+                                            &route->addr.dst_addr);
+        req.timeout_ms = 1 << (CMA_CM_RESPONSE_TIMEOUT - 8);
+        req.max_cm_retries = CMA_MAX_CM_RETRIES;
+
+        ret = ib_send_cm_sidr_req(id_priv->cm_id.ib, &req);
+        if (ret) {
+                ib_destroy_cm_id(id_priv->cm_id.ib);
+                id_priv->cm_id.ib = NULL;
+        }
+out:
+        kfree(req.private_data);
+        return ret;
+}
+
 static int cma_connect_ib(struct rdma_id_private *id_priv,
                           struct rdma_conn_param *conn_param)
 {
@@ -1860,7 +2025,7 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
         req.service_id = cma_get_service_id(id_priv->id.ps,
                                             &route->addr.dst_addr);
         req.qp_num = id_priv->qp_num;
-        req.qp_type = id_priv->qp_type;
+        req.qp_type = IB_QPT_RC;
         req.starting_psn = id_priv->seq_num;
         req.responder_resources = conn_param->responder_resources;
         req.initiator_depth = conn_param->initiator_depth;
@@ -1937,13 +2102,15 @@ int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
 
         if (!id->qp) {
                 id_priv->qp_num = conn_param->qp_num;
-                id_priv->qp_type = conn_param->qp_type;
                 id_priv->srq = conn_param->srq;
         }
 
         switch (rdma_node_get_transport(id->device->node_type)) {
         case RDMA_TRANSPORT_IB:
-                ret = cma_connect_ib(id_priv, conn_param);
+                if (id->ps == RDMA_PS_UDP)
+                        ret = cma_resolve_ib_udp(id_priv, conn_param);
+                else
+                        ret = cma_connect_ib(id_priv, conn_param);
                 break;
         case RDMA_TRANSPORT_IWARP:
                 ret = cma_connect_iw(id_priv, conn_param);
@@ -1966,11 +2133,25 @@ static int cma_accept_ib(struct rdma_id_private *id_priv,
                          struct rdma_conn_param *conn_param)
 {
         struct ib_cm_rep_param rep;
-        int ret;
+        struct ib_qp_attr qp_attr;
+        int qp_attr_mask, ret;
 
-        ret = cma_modify_qp_rtr(&id_priv->id);
-        if (ret)
-                return ret;
+        if (id_priv->id.qp) {
+                ret = cma_modify_qp_rtr(&id_priv->id);
+                if (ret)
+                        goto out;
+
+                qp_attr.qp_state = IB_QPS_RTS;
+                ret = ib_cm_init_qp_attr(id_priv->cm_id.ib, &qp_attr,
+                                         &qp_attr_mask);
+                if (ret)
+                        goto out;
+
+                qp_attr.max_rd_atomic = conn_param->initiator_depth;
+                ret = ib_modify_qp(id_priv->id.qp, &qp_attr, qp_attr_mask);
+                if (ret)
+                        goto out;
+        }
 
         memset(&rep, 0, sizeof rep);
         rep.qp_num = id_priv->qp_num;
@@ -1985,7 +2166,9 @@ static int cma_accept_ib(struct rdma_id_private *id_priv,
         rep.rnr_retry_count = conn_param->rnr_retry_count;
         rep.srq = id_priv->srq ? 1 : 0;
 
-        return ib_send_cm_rep(id_priv->cm_id.ib, &rep);
+        ret = ib_send_cm_rep(id_priv->cm_id.ib, &rep);
+out:
+        return ret;
 }
 
 static int cma_accept_iw(struct rdma_id_private *id_priv,
@@ -2010,6 +2193,24 @@ static int cma_accept_iw(struct rdma_id_private *id_priv,
         return iw_cm_accept(id_priv->cm_id.iw, &iw_param);
 }
 
+static int cma_send_sidr_rep(struct rdma_id_private *id_priv,
+                             enum ib_cm_sidr_status status,
+                             const void *private_data, int private_data_len)
+{
+        struct ib_cm_sidr_rep_param rep;
+
+        memset(&rep, 0, sizeof rep);
+        rep.status = status;
+        if (status == IB_SIDR_SUCCESS) {
+                rep.qp_num = id_priv->qp_num;
+                rep.qkey = RDMA_UD_QKEY;
+        }
+        rep.private_data = private_data;
+        rep.private_data_len = private_data_len;
+
+        return ib_send_cm_sidr_rep(id_priv->cm_id.ib, &rep);
+}
+
 int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
 {
         struct rdma_id_private *id_priv;
@@ -2021,13 +2222,16 @@ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
 
         if (!id->qp && conn_param) {
                 id_priv->qp_num = conn_param->qp_num;
-                id_priv->qp_type = conn_param->qp_type;
                 id_priv->srq = conn_param->srq;
         }
 
         switch (rdma_node_get_transport(id->device->node_type)) {
         case RDMA_TRANSPORT_IB:
-                if (conn_param)
+                if (id->ps == RDMA_PS_UDP)
+                        ret = cma_send_sidr_rep(id_priv, IB_SIDR_SUCCESS,
+                                                conn_param->private_data,
+                                                conn_param->private_data_len);
+                else if (conn_param)
                         ret = cma_accept_ib(id_priv, conn_param);
                 else
                         ret = cma_rep_recv(id_priv);
@@ -2051,6 +2255,27 @@ reject:
 }
 EXPORT_SYMBOL(rdma_accept);
 
+int rdma_notify(struct rdma_cm_id *id, enum ib_event_type event)
+{
+        struct rdma_id_private *id_priv;
+        int ret;
+
+        id_priv = container_of(id, struct rdma_id_private, id);
+        if (!cma_comp(id_priv, CMA_CONNECT))
+                return -EINVAL;
+
+        switch (id->device->node_type) {
+        case RDMA_NODE_IB_CA:
+                ret = ib_cm_notify(id_priv->cm_id.ib, event);
+                break;
+        default:
+                ret = 0;
+                break;
+        }
+        return ret;
+}
+EXPORT_SYMBOL(rdma_notify);
+
 int rdma_reject(struct rdma_cm_id *id, const void *private_data,
                 u8 private_data_len)
 {
@@ -2063,9 +2288,13 @@ int rdma_reject(struct rdma_cm_id *id, const void *private_data,
 
         switch (rdma_node_get_transport(id->device->node_type)) {
         case RDMA_TRANSPORT_IB:
-                ret = ib_send_cm_rej(id_priv->cm_id.ib,
-                                     IB_CM_REJ_CONSUMER_DEFINED, NULL, 0,
-                                     private_data, private_data_len);
+                if (id->ps == RDMA_PS_UDP)
+                        ret = cma_send_sidr_rep(id_priv, IB_SIDR_REJECT,
+                                                private_data, private_data_len);
+                else
+                        ret = ib_send_cm_rej(id_priv->cm_id.ib,
+                                             IB_CM_REJ_CONSUMER_DEFINED, NULL,
+                                             0, private_data, private_data_len);
                 break;
         case RDMA_TRANSPORT_IWARP:
                 ret = iw_cm_reject(id_priv->cm_id.iw,
@@ -2136,6 +2365,7 @@ static void cma_add_one(struct ib_device *device)
 
 static int cma_remove_id_dev(struct rdma_id_private *id_priv)
 {
+        struct rdma_cm_event event;
         enum cma_state state;
 
         /* Record that we want to remove the device */
@@ -2150,8 +2380,9 @@ static int cma_remove_id_dev(struct rdma_id_private *id_priv)
         if (!cma_comp(id_priv, CMA_DEVICE_REMOVAL))
                 return 0;
 
-        return cma_notify_user(id_priv, RDMA_CM_EVENT_DEVICE_REMOVAL,
-                               0, NULL, 0);
+        memset(&event, 0, sizeof event);
+        event.event = RDMA_CM_EVENT_DEVICE_REMOVAL;
+        return id_priv->id.event_handler(&id_priv->id, &event);
 }
 
 static void cma_process_remove(struct cma_device *cma_dev)
@@ -2233,6 +2464,7 @@ static void cma_cleanup(void)
         destroy_workqueue(cma_wq);
         idr_destroy(&sdp_ps);
         idr_destroy(&tcp_ps);
+        idr_destroy(&udp_ps);
 }
 
 module_init(cma_init);
diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
index 86a3b2d401db..8926a2bd4a87 100644
--- a/drivers/infiniband/core/fmr_pool.c
+++ b/drivers/infiniband/core/fmr_pool.c
@@ -394,20 +394,12 @@ EXPORT_SYMBOL(ib_destroy_fmr_pool);
  */
 int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
 {
-        int serial;
-
-        atomic_inc(&pool->req_ser);
-        /*
-         * It's OK if someone else bumps req_ser again here -- we'll
-         * just wait a little longer.
-         */
-        serial = atomic_read(&pool->req_ser);
+        int serial = atomic_inc_return(&pool->req_ser);
 
         wake_up_process(pool->thread);
 
         if (wait_event_interruptible(pool->force_wait,
-                                     atomic_read(&pool->flush_ser) -
-                                     atomic_read(&pool->req_ser) >= 0))
+                                     atomic_read(&pool->flush_ser) - serial >= 0))
                 return -EINTR;
 
         return 0;
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 15f38d94b3a8..5ed141ebd1c8 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -998,17 +998,17 @@ int ib_send_mad(struct ib_mad_send_wr_private *mad_send_wr)
 
         mad_agent = mad_send_wr->send_buf.mad_agent;
         sge = mad_send_wr->sg_list;
-        sge[0].addr = dma_map_single(mad_agent->device->dma_device,
-                                     mad_send_wr->send_buf.mad,
-                                     sge[0].length,
-                                     DMA_TO_DEVICE);
-        pci_unmap_addr_set(mad_send_wr, header_mapping, sge[0].addr);
-
-        sge[1].addr = dma_map_single(mad_agent->device->dma_device,
-                                     ib_get_payload(mad_send_wr),
-                                     sge[1].length,
-                                     DMA_TO_DEVICE);
-        pci_unmap_addr_set(mad_send_wr, payload_mapping, sge[1].addr);
+        sge[0].addr = ib_dma_map_single(mad_agent->device,
+                                        mad_send_wr->send_buf.mad,
+                                        sge[0].length,
+                                        DMA_TO_DEVICE);
+        mad_send_wr->header_mapping = sge[0].addr;
+
+        sge[1].addr = ib_dma_map_single(mad_agent->device,
+                                        ib_get_payload(mad_send_wr),
+                                        sge[1].length,
+                                        DMA_TO_DEVICE);
+        mad_send_wr->payload_mapping = sge[1].addr;
 
         spin_lock_irqsave(&qp_info->send_queue.lock, flags);
         if (qp_info->send_queue.count < qp_info->send_queue.max_active) {
@@ -1026,12 +1026,12 @@ int ib_send_mad(struct ib_mad_send_wr_private *mad_send_wr)
         }
         spin_unlock_irqrestore(&qp_info->send_queue.lock, flags);
         if (ret) {
-                dma_unmap_single(mad_agent->device->dma_device,
-                                 pci_unmap_addr(mad_send_wr, header_mapping),
-                                 sge[0].length, DMA_TO_DEVICE);
-                dma_unmap_single(mad_agent->device->dma_device,
-                                 pci_unmap_addr(mad_send_wr, payload_mapping),
-                                 sge[1].length, DMA_TO_DEVICE);
+                ib_dma_unmap_single(mad_agent->device,
+                                    mad_send_wr->header_mapping,
+                                    sge[0].length, DMA_TO_DEVICE);
+                ib_dma_unmap_single(mad_agent->device,
+                                    mad_send_wr->payload_mapping,
+                                    sge[1].length, DMA_TO_DEVICE);
         }
         return ret;
 }
@@ -1850,11 +1850,11 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv,
         mad_priv_hdr = container_of(mad_list, struct ib_mad_private_header,
                                     mad_list);
         recv = container_of(mad_priv_hdr, struct ib_mad_private, header);
-        dma_unmap_single(port_priv->device->dma_device,
-                         pci_unmap_addr(&recv->header, mapping),
-                         sizeof(struct ib_mad_private) -
-                         sizeof(struct ib_mad_private_header),
-                         DMA_FROM_DEVICE);
+        ib_dma_unmap_single(port_priv->device,
+                            recv->header.mapping,
+                            sizeof(struct ib_mad_private) -
+                              sizeof(struct ib_mad_private_header),
+                            DMA_FROM_DEVICE);
 
         /* Setup MAD receive work completion from "normal" work completion */
         recv->header.wc = *wc;
@@ -2080,12 +2080,12 @@ static void ib_mad_send_done_handler(struct ib_mad_port_private *port_priv,
         qp_info = send_queue->qp_info;
 
 retry:
-        dma_unmap_single(mad_send_wr->send_buf.mad_agent->device->dma_device,
-                         pci_unmap_addr(mad_send_wr, header_mapping),
-                         mad_send_wr->sg_list[0].length, DMA_TO_DEVICE);
-        dma_unmap_single(mad_send_wr->send_buf.mad_agent->device->dma_device,
-                         pci_unmap_addr(mad_send_wr, payload_mapping),
-                         mad_send_wr->sg_list[1].length, DMA_TO_DEVICE);
+        ib_dma_unmap_single(mad_send_wr->send_buf.mad_agent->device,
+                            mad_send_wr->header_mapping,
+                            mad_send_wr->sg_list[0].length, DMA_TO_DEVICE);
+        ib_dma_unmap_single(mad_send_wr->send_buf.mad_agent->device,
+                            mad_send_wr->payload_mapping,
+                            mad_send_wr->sg_list[1].length, DMA_TO_DEVICE);
         queued_send_wr = NULL;
         spin_lock_irqsave(&send_queue->lock, flags);
         list_del(&mad_list->list);
@@ -2528,13 +2528,12 @@ static int ib_mad_post_receive_mads(struct ib_mad_qp_info *qp_info,
                                 break;
                         }
                 }
-                sg_list.addr = dma_map_single(qp_info->port_priv->
-                                                device->dma_device,
-                                              &mad_priv->grh,
-                                              sizeof *mad_priv -
-                                                sizeof mad_priv->header,
-                                              DMA_FROM_DEVICE);
-                pci_unmap_addr_set(&mad_priv->header, mapping, sg_list.addr);
+                sg_list.addr = ib_dma_map_single(qp_info->port_priv->device,
+                                                 &mad_priv->grh,
+                                                 sizeof *mad_priv -
+                                                   sizeof mad_priv->header,
+                                                 DMA_FROM_DEVICE);
+                mad_priv->header.mapping = sg_list.addr;
                 recv_wr.wr_id = (unsigned long)&mad_priv->header.mad_list;
                 mad_priv->header.mad_list.mad_queue = recv_queue;
 
@@ -2549,12 +2548,11 @@ static int ib_mad_post_receive_mads(struct ib_mad_qp_info *qp_info,
                         list_del(&mad_priv->header.mad_list.list);
                         recv_queue->count--;
                         spin_unlock_irqrestore(&recv_queue->lock, flags);
-                        dma_unmap_single(qp_info->port_priv->device->dma_device,
-                                         pci_unmap_addr(&mad_priv->header,
-                                                        mapping),
-                                         sizeof *mad_priv -
-                                           sizeof mad_priv->header,
-                                         DMA_FROM_DEVICE);
+                        ib_dma_unmap_single(qp_info->port_priv->device,
+                                            mad_priv->header.mapping,
+                                            sizeof *mad_priv -
+                                              sizeof mad_priv->header,
+                                            DMA_FROM_DEVICE);
                         kmem_cache_free(ib_mad_cache, mad_priv);
                         printk(KERN_ERR PFX "ib_post_recv failed: %d\n", ret);
                         break;
@@ -2586,11 +2584,11 @@ static void cleanup_recv_queue(struct ib_mad_qp_info *qp_info)
                 /* Remove from posted receive MAD list */
                 list_del(&mad_list->list);
 
-                dma_unmap_single(qp_info->port_priv->device->dma_device,
-                                 pci_unmap_addr(&recv->header, mapping),
-                                 sizeof(struct ib_mad_private) -
-                                 sizeof(struct ib_mad_private_header),
-                                 DMA_FROM_DEVICE);
+                ib_dma_unmap_single(qp_info->port_priv->device,
+                                    recv->header.mapping,
+                                    sizeof(struct ib_mad_private) -
+                                      sizeof(struct ib_mad_private_header),
+                                    DMA_FROM_DEVICE);
                 kmem_cache_free(ib_mad_cache, recv);
         }
 
diff --git a/drivers/infiniband/core/mad_priv.h b/drivers/infiniband/core/mad_priv.h
index d5548e73e068..de89717f49fe 100644
--- a/drivers/infiniband/core/mad_priv.h
+++ b/drivers/infiniband/core/mad_priv.h
@@ -73,7 +73,7 @@ struct ib_mad_private_header {
         struct ib_mad_list_head mad_list;
         struct ib_mad_recv_wc recv_wc;
         struct ib_wc wc;
-        DECLARE_PCI_UNMAP_ADDR(mapping)
+        u64 mapping;
 } __attribute__ ((packed));
 
 struct ib_mad_private {
@@ -126,8 +126,8 @@ struct ib_mad_send_wr_private {
         struct list_head agent_list;
         struct ib_mad_agent_private *mad_agent_priv;
         struct ib_mad_send_buf send_buf;
-        DECLARE_PCI_UNMAP_ADDR(header_mapping)
-        DECLARE_PCI_UNMAP_ADDR(payload_mapping)
+        u64 header_mapping;
+        u64 payload_mapping;
         struct ib_send_wr send_wr;
         struct ib_sge sg_list[IB_MAD_SEND_REQ_MAX_SG];
         __be64 tid;
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
new file mode 100644
index 000000000000..81a5cdc5733a
--- /dev/null
+++ b/drivers/infiniband/core/ucma.c
@@ -0,0 +1,874 @@
+/*
+ * Copyright (c) 2005-2006 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
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials
+ *      provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/completion.h>
+#include <linux/mutex.h>
+#include <linux/poll.h>
+#include <linux/idr.h>
+#include <linux/in.h>
+#include <linux/in6.h>
+#include <linux/miscdevice.h>
+
+#include <rdma/rdma_user_cm.h>
+#include <rdma/ib_marshall.h>
+#include <rdma/rdma_cm.h>
+
+MODULE_AUTHOR("Sean Hefty");
+MODULE_DESCRIPTION("RDMA Userspace Connection Manager Access");
+MODULE_LICENSE("Dual BSD/GPL");
+
+enum {
+        UCMA_MAX_BACKLOG        = 128
+};
+
+struct ucma_file {
+        struct mutex            mut;
+        struct file             *filp;
+        struct list_head        ctx_list;
+        struct list_head        event_list;
+        wait_queue_head_t       poll_wait;
+};
+
+struct ucma_context {
+        int                     id;
+        struct completion       comp;
+        atomic_t                ref;
+        int                     events_reported;
+        int                     backlog;
+
+        struct ucma_file        *file;
+        struct rdma_cm_id       *cm_id;
+        u64                     uid;
+
+        struct list_head        list;
+};
+
+struct ucma_event {
+        struct ucma_context     *ctx;
+        struct list_head        list;
+        struct rdma_cm_id       *cm_id;
+        struct rdma_ucm_event_resp resp;
+};
+
+static DEFINE_MUTEX(mut);
+static DEFINE_IDR(ctx_idr);
+
+static inline struct ucma_context *_ucma_find_context(int id,
+                                                      struct ucma_file *file)
+{
+        struct ucma_context *ctx;
+
+        ctx = idr_find(&ctx_idr, id);
+        if (!ctx)
+                ctx = ERR_PTR(-ENOENT);
+        else if (ctx->file != file)
+                ctx = ERR_PTR(-EINVAL);
+        return ctx;
+}
+
+static struct ucma_context *ucma_get_ctx(struct ucma_file *file, int id)
+{
+        struct ucma_context *ctx;
+
+        mutex_lock(&mut);
+        ctx = _ucma_find_context(id, file);
+        if (!IS_ERR(ctx))
+                atomic_inc(&ctx->ref);
+        mutex_unlock(&mut);
+        return ctx;
+}
+
+static void ucma_put_ctx(struct ucma_context *ctx)
+{
+        if (atomic_dec_and_test(&ctx->ref))
+                complete(&ctx->comp);
+}
+
+static struct ucma_context *ucma_alloc_ctx(struct ucma_file *file)
+{
+        struct ucma_context *ctx;
+        int ret;
+
+        ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+        if (!ctx)
+                return NULL;
+
+        atomic_set(&ctx->ref, 1);
+        init_completion(&ctx->comp);
+        ctx->file = file;
+
+        do {
+                ret = idr_pre_get(&ctx_idr, GFP_KERNEL);
+                if (!ret)
+                        goto error;
+
+                mutex_lock(&mut);
+                ret = idr_get_new(&ctx_idr, ctx, &ctx->id);
+                mutex_unlock(&mut);
+        } while (ret == -EAGAIN);
+
+        if (ret)
+                goto error;
+
+        list_add_tail(&ctx->list, &file->ctx_list);
+        return ctx;
+
+error:
+        kfree(ctx);
+        return NULL;
+}
+
+static void ucma_copy_conn_event(struct rdma_ucm_conn_param *dst,
+                                 struct rdma_conn_param *src)
+{
+        if (src->private_data_len)
+                memcpy(dst->private_data, src->private_data,
+                       src->private_data_len);
+        dst->private_data_len = src->private_data_len;
+        dst->responder_resources =src->responder_resources;
+        dst->initiator_depth = src->initiator_depth;
+        dst->flow_control = src->flow_control;
+        dst->retry_count = src->retry_count;
+        dst->rnr_retry_count = src->rnr_retry_count;
+        dst->srq = src->srq;
+        dst->qp_num = src->qp_num;
+}
+
+static void ucma_copy_ud_event(struct rdma_ucm_ud_param *dst,
+                               struct rdma_ud_param *src)
+{
+        if (src->private_data_len)
+                memcpy(dst->private_data, src->private_data,
+                       src->private_data_len);
+        dst->private_data_len = src->private_data_len;
+        ib_copy_ah_attr_to_user(&dst->ah_attr, &src->ah_attr);
+        dst->qp_num = src->qp_num;
+        dst->qkey = src->qkey;
+}
+
+static void ucma_set_event_context(struct ucma_context *ctx,
+                                   struct rdma_cm_event *event,
+                                   struct ucma_event *uevent)
+{
+        uevent->ctx = ctx;
+        uevent->resp.uid = ctx->uid;
+        uevent->resp.id = ctx->id;
+}
+
+static int ucma_event_handler(struct rdma_cm_id *cm_id,
+                              struct rdma_cm_event *event)
+{
+        struct ucma_event *uevent;
+        struct ucma_context *ctx = cm_id->context;
+        int ret = 0;
+
+        uevent = kzalloc(sizeof(*uevent), GFP_KERNEL);
+        if (!uevent)
+                return event->event == RDMA_CM_EVENT_CONNECT_REQUEST;
+
+        uevent->cm_id = cm_id;
+        ucma_set_event_context(ctx, event, uevent);
+        uevent->resp.event = event->event;
+        uevent->resp.status = event->status;
+        if (cm_id->ps == RDMA_PS_UDP)
+                ucma_copy_ud_event(&uevent->resp.param.ud, &event->param.ud);
+        else
+                ucma_copy_conn_event(&uevent->resp.param.conn,
+                                     &event->param.conn);
+
+        mutex_lock(&ctx->file->mut);
+        if (event->event == RDMA_CM_EVENT_CONNECT_REQUEST) {
+                if (!ctx->backlog) {
+                        ret = -EDQUOT;
+                        goto out;
+                }
+                ctx->backlog--;
+        }
+        list_add_tail(&uevent->list, &ctx->file->event_list);
+        wake_up_interruptible(&ctx->file->poll_wait);
+out:
+        mutex_unlock(&ctx->file->mut);
+        return ret;
+}
+
+static ssize_t ucma_get_event(struct ucma_file *file, const char __user *inbuf,
+                              int in_len, int out_len)
+{
+        struct ucma_context *ctx;
+        struct rdma_ucm_get_event cmd;
+        struct ucma_event *uevent;
+        int ret = 0;
+        DEFINE_WAIT(wait);
+
+        if (out_len < sizeof uevent->resp)
+                return -ENOSPC;
+
+        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+                return -EFAULT;
+
+        mutex_lock(&file->mut);
+        while (list_empty(&file->event_list)) {
+                if (file->filp->f_flags & O_NONBLOCK) {
+                        ret = -EAGAIN;
+                        break;
+                }
+
+                if (signal_pending(current)) {
+                        ret = -ERESTARTSYS;
+                        break;
+                }
+
+                prepare_to_wait(&file->poll_wait, &wait, TASK_INTERRUPTIBLE);
+                mutex_unlock(&file->mut);
+                schedule();
+                mutex_lock(&file->mut);
+                finish_wait(&file->poll_wait, &wait);
+        }
+
+        if (ret)
+                goto done;
+
+        uevent = list_entry(file->event_list.next, struct ucma_event, list);
+
+        if (uevent->resp.event == RDMA_CM_EVENT_CONNECT_REQUEST) {
+                ctx = ucma_alloc_ctx(file);
+                if (!ctx) {
+                        ret = -ENOMEM;
+                        goto done;
+                }
+                uevent->ctx->backlog++;
+                ctx->cm_id = uevent->cm_id;
+                ctx->cm_id->context = ctx;
+                uevent->resp.id = ctx->id;
+        }
+
+        if (copy_to_user((void __user *)(unsigned long)cmd.response,
+                         &uevent->resp, sizeof uevent->resp)) {
+                ret = -EFAULT;
+                goto done;
+        }
+
+        list_del(&uevent->list);
+        uevent->ctx->events_reported++;
+        kfree(uevent);
+done:
+        mutex_unlock(&file->mut);
+        return ret;
+}
+
+static ssize_t ucma_create_id(struct ucma_file *file,
+                                const char __user *inbuf,
+                                int in_len, int out_len)
+{
+        struct rdma_ucm_create_id cmd;
+        struct rdma_ucm_create_id_resp resp;
+        struct ucma_context *ctx;
+        int ret;
+
+        if (out_len < sizeof(resp))
+                return -ENOSPC;
+
+        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+                return -EFAULT;
+
+        mutex_lock(&file->mut);
+        ctx = ucma_alloc_ctx(file);
+        mutex_unlock(&file->mut);
+        if (!ctx)
+                return -ENOMEM;
+
+        ctx->uid = cmd.uid;
+        ctx->cm_id = rdma_create_id(ucma_event_handler, ctx, cmd.ps);
+        if (IS_ERR(ctx->cm_id)) {
+                ret = PTR_ERR(ctx->cm_id);
+                goto err1;
+        }
+
+        resp.id = ctx->id;
+        if (copy_to_user((void __user *)(unsigned long)cmd.response,
+                         &resp, sizeof(resp))) {
+                ret = -EFAULT;
+                goto err2;
+        }
+        return 0;
+
+err2:
+        rdma_destroy_id(ctx->cm_id);
+err1:
+        mutex_lock(&mut);
+        idr_remove(&ctx_idr, ctx->id);
+        mutex_unlock(&mut);
+        kfree(ctx);
+        return ret;
+}
+
+static void ucma_cleanup_events(struct ucma_context *ctx)
+{
+        struct ucma_event *uevent, *tmp;
+
+        list_for_each_entry_safe(uevent, tmp, &ctx->file->event_list, list) {
+                if (uevent->ctx != ctx)
+                        continue;
+
+                list_del(&uevent->list);
+
+                /* clear incoming connections. */
+                if (uevent->resp.event == RDMA_CM_EVENT_CONNECT_REQUEST)
+                        rdma_destroy_id(uevent->cm_id);
+
+                kfree(uevent);
+        }
+}
+
+static int ucma_free_ctx(struct ucma_context *ctx)
+{
+        int events_reported;
+
+        /* No new events will be generated after destroying the id. */
+        rdma_destroy_id(ctx->cm_id);
+
+        /* Cleanup events not yet reported to the user. */
+        mutex_lock(&ctx->file->mut);
+        ucma_cleanup_events(ctx);
+        list_del(&ctx->list);
+        mutex_unlock(&ctx->file->mut);
+
+        events_reported = ctx->events_reported;
+        kfree(ctx);
+        return events_reported;
+}
+
+static ssize_t ucma_destroy_id(struct ucma_file *file, const char __user *inbuf,
+                               int in_len, int out_len)
+{
+        struct rdma_ucm_destroy_id cmd;
+        struct rdma_ucm_destroy_id_resp resp;
+        struct ucma_context *ctx;
+        int ret = 0;
+
+        if (out_len < sizeof(resp))
+                return -ENOSPC;
+
+        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+                return -EFAULT;
+
+        mutex_lock(&mut);
+        ctx = _ucma_find_context(cmd.id, file);
+        if (!IS_ERR(ctx))
+                idr_remove(&ctx_idr, ctx->id);
+        mutex_unlock(&mut);
+
+        if (IS_ERR(ctx))
+                return PTR_ERR(ctx);
+
+        ucma_put_ctx(ctx);
+        wait_for_completion(&ctx->comp);
+        resp.events_reported = ucma_free_ctx(ctx);
+
+        if (copy_to_user((void __user *)(unsigned long)cmd.response,
+                         &resp, sizeof(resp)))
+                ret = -EFAULT;
+
+        return ret;
+}
+
+static ssize_t ucma_bind_addr(struct ucma_file *file, const char __user *inbuf,
+                              int in_len, int out_len)
+{
+        struct rdma_ucm_bind_addr cmd;
+        struct ucma_context *ctx;
+        int ret;
+
+        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+                return -EFAULT;
+
+        ctx = ucma_get_ctx(file, cmd.id);
+        if (IS_ERR(ctx))
+                return PTR_ERR(ctx);
+
+        ret = rdma_bind_addr(ctx->cm_id, (struct sockaddr *) &cmd.addr);
+        ucma_put_ctx(ctx);
+        return ret;
+}
+
+static ssize_t ucma_resolve_addr(struct ucma_file *file,
+                                 const char __user *inbuf,
+                                 int in_len, int out_len)
+{
+        struct rdma_ucm_resolve_addr cmd;
+        struct ucma_context *ctx;
+        int ret;
+
+        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+                return -EFAULT;
+
+        ctx = ucma_get_ctx(file, cmd.id);
+        if (IS_ERR(ctx))
+                return PTR_ERR(ctx);
+
+        ret = rdma_resolve_addr(ctx->cm_id, (struct sockaddr *) &cmd.src_addr,
+                                (struct sockaddr *) &cmd.dst_addr,
+                                cmd.timeout_ms);
+        ucma_put_ctx(ctx);
+        return ret;
+}
+
+static ssize_t ucma_resolve_route(struct ucma_file *file,
+                                  const char __user *inbuf,
+                                  int in_len, int out_len)
+{
+        struct rdma_ucm_resolve_route cmd;
+        struct ucma_context *ctx;
+        int ret;
+
+        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+                return -EFAULT;
+
+        ctx = ucma_get_ctx(file, cmd.id);
+        if (IS_ERR(ctx))
+                return PTR_ERR(ctx);
+
+        ret = rdma_resolve_route(ctx->cm_id, cmd.timeout_ms);
+        ucma_put_ctx(ctx);
+        return ret;
+}
+
+static void ucma_copy_ib_route(struct rdma_ucm_query_route_resp *resp,
+                               struct rdma_route *route)
+{
+        struct rdma_dev_addr *dev_addr;
+
+        resp->num_paths = route->num_paths;
+        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);
+                resp->ib_route[0].pkey = cpu_to_be16(ib_addr_get_pkey(dev_addr));
+                break;
+        case 2:
+                ib_copy_path_rec_to_user(&resp->ib_route[1],
+                                         &route->path_rec[1]);
+                /* fall through */
+        case 1:
+                ib_copy_path_rec_to_user(&resp->ib_route[0],
+                                         &route->path_rec[0]);
+                break;
+        default:
+                break;
+        }
+}
+
+static ssize_t ucma_query_route(struct ucma_file *file,
+                                const char __user *inbuf,
+                                int in_len, int out_len)
+{
+        struct rdma_ucm_query_route cmd;
+        struct rdma_ucm_query_route_resp resp;
+        struct ucma_context *ctx;
+        struct sockaddr *addr;
+        int ret = 0;
+
+        if (out_len < sizeof(resp))
+                return -ENOSPC;
+
+        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+                return -EFAULT;
+
+        ctx = ucma_get_ctx(file, cmd.id);
+        if (IS_ERR(ctx))
+                return PTR_ERR(ctx);
+
+        memset(&resp, 0, sizeof resp);
+        addr = &ctx->cm_id->route.addr.src_addr;
+        memcpy(&resp.src_addr, addr, addr->sa_family == AF_INET ?
+                                     sizeof(struct sockaddr_in) :
+                                     sizeof(struct sockaddr_in6));
+        addr = &ctx->cm_id->route.addr.dst_addr;
+        memcpy(&resp.dst_addr, addr, addr->sa_family == AF_INET ?
+                                     sizeof(struct sockaddr_in) :
+                                     sizeof(struct sockaddr_in6));
+        if (!ctx->cm_id->device)
+                goto out;
+
+        resp.node_guid = ctx->cm_id->device->node_guid;
+        resp.port_num = ctx->cm_id->port_num;
+        switch (rdma_node_get_transport(ctx->cm_id->device->node_type)) {
+        case RDMA_TRANSPORT_IB:
+                ucma_copy_ib_route(&resp, &ctx->cm_id->route);
+                break;
+        default:
+                break;
+        }
+
+out:
+        if (copy_to_user((void __user *)(unsigned long)cmd.response,
+                         &resp, sizeof(resp)))
+                ret = -EFAULT;
+
+        ucma_put_ctx(ctx);
+        return ret;
+}
+
+static void ucma_copy_conn_param(struct rdma_conn_param *dst,
+                                 struct rdma_ucm_conn_param *src)
+{
+        dst->private_data = src->private_data;
+        dst->private_data_len = src->private_data_len;
+        dst->responder_resources =src->responder_resources;
+        dst->initiator_depth = src->initiator_depth;
+        dst->flow_control = src->flow_control;
+        dst->retry_count = src->retry_count;
+        dst->rnr_retry_count = src->rnr_retry_count;
+        dst->srq = src->srq;
+        dst->qp_num = src->qp_num;
+}
+
+static ssize_t ucma_connect(struct ucma_file *file, const char __user *inbuf,
+                            int in_len, int out_len)
+{
+        struct rdma_ucm_connect cmd;
+        struct rdma_conn_param conn_param;
+        struct ucma_context *ctx;
+        int ret;
+
+        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+                return -EFAULT;
+
+        if (!cmd.conn_param.valid)
+                return -EINVAL;
+
+        ctx = ucma_get_ctx(file, cmd.id);
+        if (IS_ERR(ctx))
+                return PTR_ERR(ctx);
+
+        ucma_copy_conn_param(&conn_param, &cmd.conn_param);
+        ret = rdma_connect(ctx->cm_id, &conn_param);
+        ucma_put_ctx(ctx);
+        return ret;
+}
+
+static ssize_t ucma_listen(struct ucma_file *file, const char __user *inbuf,
+                           int in_len, int out_len)
+{
+        struct rdma_ucm_listen cmd;
+        struct ucma_context *ctx;
+        int ret;
+
+        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+                return -EFAULT;
+
+        ctx = ucma_get_ctx(file, cmd.id);
+        if (IS_ERR(ctx))
+                return PTR_ERR(ctx);
+
+        ctx->backlog = cmd.backlog > 0 && cmd.backlog < UCMA_MAX_BACKLOG ?
+                       cmd.backlog : UCMA_MAX_BACKLOG;
+        ret = rdma_listen(ctx->cm_id, ctx->backlog);
+        ucma_put_ctx(ctx);
+        return ret;
+}
+
+static ssize_t ucma_accept(struct ucma_file *file, const char __user *inbuf,
+                           int in_len, int out_len)
+{
+        struct rdma_ucm_accept cmd;
+        struct rdma_conn_param conn_param;
+        struct ucma_context *ctx;
+        int ret;
+
+        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+                return -EFAULT;
+
+        ctx = ucma_get_ctx(file, cmd.id);
+        if (IS_ERR(ctx))
+                return PTR_ERR(ctx);
+
+        if (cmd.conn_param.valid) {
+                ctx->uid = cmd.uid;
+                ucma_copy_conn_param(&conn_param, &cmd.conn_param);
+                ret = rdma_accept(ctx->cm_id, &conn_param);
+        } else
+                ret = rdma_accept(ctx->cm_id, NULL);
+
+        ucma_put_ctx(ctx);
+        return ret;
+}
+
+static ssize_t ucma_reject(struct ucma_file *file, const char __user *inbuf,
+                           int in_len, int out_len)
+{
+        struct rdma_ucm_reject cmd;
+        struct ucma_context *ctx;
+        int ret;
+
+        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+                return -EFAULT;
+
+        ctx = ucma_get_ctx(file, cmd.id);
+        if (IS_ERR(ctx))
+                return PTR_ERR(ctx);
+
+        ret = rdma_reject(ctx->cm_id, cmd.private_data, cmd.private_data_len);
+        ucma_put_ctx(ctx);
+        return ret;
+}
+
+static ssize_t ucma_disconnect(struct ucma_file *file, const char __user *inbuf,
+                               int in_len, int out_len)
+{
+        struct rdma_ucm_disconnect cmd;
+        struct ucma_context *ctx;
+        int ret;
+
+        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+                return -EFAULT;
+
+        ctx = ucma_get_ctx(file, cmd.id);
+        if (IS_ERR(ctx))
+                return PTR_ERR(ctx);
+
+        ret = rdma_disconnect(ctx->cm_id);
+        ucma_put_ctx(ctx);
+        return ret;
+}
+
+static ssize_t ucma_init_qp_attr(struct ucma_file *file,
+                                 const char __user *inbuf,
+                                 int in_len, int out_len)
+{
+        struct rdma_ucm_init_qp_attr cmd;
+        struct ib_uverbs_qp_attr resp;
+        struct ucma_context *ctx;
+        struct ib_qp_attr qp_attr;
+        int ret;
+
+        if (out_len < sizeof(resp))
+                return -ENOSPC;
+
+        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+                return -EFAULT;
+
+        ctx = ucma_get_ctx(file, cmd.id);
+        if (IS_ERR(ctx))
+                return PTR_ERR(ctx);
+
+        resp.qp_attr_mask = 0;
+        memset(&qp_attr, 0, sizeof qp_attr);
+        qp_attr.qp_state = cmd.qp_state;
+        ret = rdma_init_qp_attr(ctx->cm_id, &qp_attr, &resp.qp_attr_mask);
+        if (ret)
+                goto out;
+
+        ib_copy_qp_attr_to_user(&resp, &qp_attr);
+        if (copy_to_user((void __user *)(unsigned long)cmd.response,
+                         &resp, sizeof(resp)))
+                ret = -EFAULT;
+
+out:
+        ucma_put_ctx(ctx);
+        return ret;
+}
+
+static ssize_t ucma_notify(struct ucma_file *file, const char __user *inbuf,
+                           int in_len, int out_len)
+{
+        struct rdma_ucm_notify cmd;
+        struct ucma_context *ctx;
+        int ret;
+
+        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+                return -EFAULT;
+
+        ctx = ucma_get_ctx(file, cmd.id);
+        if (IS_ERR(ctx))
+                return PTR_ERR(ctx);
+
+        ret = rdma_notify(ctx->cm_id, (enum ib_event_type) cmd.event);
+        ucma_put_ctx(ctx);
+        return ret;
+}
+
+static ssize_t (*ucma_cmd_table[])(struct ucma_file *file,
+                                   const char __user *inbuf,
+                                   int in_len, int out_len) = {
+        [RDMA_USER_CM_CMD_CREATE_ID]    = ucma_create_id,
+        [RDMA_USER_CM_CMD_DESTROY_ID]   = ucma_destroy_id,
+        [RDMA_USER_CM_CMD_BIND_ADDR]    = ucma_bind_addr,
+        [RDMA_USER_CM_CMD_RESOLVE_ADDR] = ucma_resolve_addr,
+        [RDMA_USER_CM_CMD_RESOLVE_ROUTE]= ucma_resolve_route,
+        [RDMA_USER_CM_CMD_QUERY_ROUTE]  = ucma_query_route,
+        [RDMA_USER_CM_CMD_CONNECT]      = ucma_connect,
+        [RDMA_USER_CM_CMD_LISTEN]       = ucma_listen,
+        [RDMA_USER_CM_CMD_ACCEPT]       = ucma_accept,
+        [RDMA_USER_CM_CMD_REJECT]       = ucma_reject,
+        [RDMA_USER_CM_CMD_DISCONNECT]   = ucma_disconnect,
+        [RDMA_USER_CM_CMD_INIT_QP_ATTR] = ucma_init_qp_attr,
+        [RDMA_USER_CM_CMD_GET_EVENT]    = ucma_get_event,
+        [RDMA_USER_CM_CMD_GET_OPTION]   = NULL,
+        [RDMA_USER_CM_CMD_SET_OPTION]   = NULL,
+        [RDMA_USER_CM_CMD_NOTIFY]       = ucma_notify,
+};
+
+static ssize_t ucma_write(struct file *filp, const char __user *buf,
+                          size_t len, loff_t *pos)
+{
+        struct ucma_file *file = filp->private_data;
+        struct rdma_ucm_cmd_hdr hdr;
+        ssize_t ret;
+
+        if (len < sizeof(hdr))
+                return -EINVAL;
+
+        if (copy_from_user(&hdr, buf, sizeof(hdr)))
+                return -EFAULT;
+
+        if (hdr.cmd < 0 || hdr.cmd >= ARRAY_SIZE(ucma_cmd_table))
+                return -EINVAL;
+
+        if (hdr.in + sizeof(hdr) > len)
+                return -EINVAL;
+
+        if (!ucma_cmd_table[hdr.cmd])
+                return -ENOSYS;
+
+        ret = ucma_cmd_table[hdr.cmd](file, buf + sizeof(hdr), hdr.in, hdr.out);
+        if (!ret)
+                ret = len;
+
+        return ret;
+}
+
+static unsigned int ucma_poll(struct file *filp, struct poll_table_struct *wait)
+{
+        struct ucma_file *file = filp->private_data;
+        unsigned int mask = 0;
+
+        poll_wait(filp, &file->poll_wait, wait);
+
+        if (!list_empty(&file->event_list))
+                mask = POLLIN | POLLRDNORM;
+
+        return mask;
+}
+
+static int ucma_open(struct inode *inode, struct file *filp)
+{
+        struct ucma_file *file;
+
+        file = kmalloc(sizeof *file, GFP_KERNEL);
+        if (!file)
+                return -ENOMEM;
+
+        INIT_LIST_HEAD(&file->event_list);
+        INIT_LIST_HEAD(&file->ctx_list);
+        init_waitqueue_head(&file->poll_wait);
+        mutex_init(&file->mut);
+
+        filp->private_data = file;
+        file->filp = filp;
+        return 0;
+}
+
+static int ucma_close(struct inode *inode, struct file *filp)
+{
+        struct ucma_file *file = filp->private_data;
+        struct ucma_context *ctx, *tmp;
+
+        mutex_lock(&file->mut);
+        list_for_each_entry_safe(ctx, tmp, &file->ctx_list, list) {
+                mutex_unlock(&file->mut);
+
+                mutex_lock(&mut);
+                idr_remove(&ctx_idr, ctx->id);
+                mutex_unlock(&mut);
+
+                ucma_free_ctx(ctx);
+                mutex_lock(&file->mut);
+        }
+        mutex_unlock(&file->mut);
+        kfree(file);
+        return 0;
+}
+
+static struct file_operations ucma_fops = {
+        .owner   = THIS_MODULE,
+        .open    = ucma_open,
+        .release = ucma_close,
+        .write   = ucma_write,
+        .poll    = ucma_poll,
+};
+
+static struct miscdevice ucma_misc = {
+        .minor  = MISC_DYNAMIC_MINOR,
+        .name   = "rdma_cm",
+        .fops   = &ucma_fops,
+};
+
+static ssize_t show_abi_version(struct device *dev,
+                                struct device_attribute *attr,
+                                char *buf)
+{
+        return sprintf(buf, "%d\n", RDMA_USER_CM_ABI_VERSION);
+}
+static DEVICE_ATTR(abi_version, S_IRUGO, show_abi_version, NULL);
+
+static int __init ucma_init(void)
+{
+        int ret;
+
+        ret = misc_register(&ucma_misc);
+        if (ret)
+                return ret;
+
+        ret = device_create_file(ucma_misc.this_device, &dev_attr_abi_version);
+        if (ret) {
+                printk(KERN_ERR "rdma_ucm: couldn't create abi_version attr\n");
+                goto err;
+        }
+        return 0;
+err:
+        misc_deregister(&ucma_misc);
+        return ret;
+}
+
+static void __exit ucma_cleanup(void)
+{
+        device_remove_file(ucma_misc.this_device, &dev_attr_abi_version);
+        misc_deregister(&ucma_misc);
+        idr_destroy(&ctx_idr);
+}
+
+module_init(ucma_init);
+module_exit(ucma_cleanup);
diff --git a/drivers/infiniband/core/uverbs_marshall.c b/drivers/infiniband/core/uverbs_marshall.c
index ce46b13ae02b..5440da0e59b4 100644
--- a/drivers/infiniband/core/uverbs_marshall.c
+++ b/drivers/infiniband/core/uverbs_marshall.c
@@ -32,8 +32,8 @@
 
 #include <rdma/ib_marshall.h>
 
-static void ib_copy_ah_attr_to_user(struct ib_uverbs_ah_attr *dst,
-                                    struct ib_ah_attr *src)
+void ib_copy_ah_attr_to_user(struct ib_uverbs_ah_attr *dst,
+                             struct ib_ah_attr *src)
 {
         memcpy(dst->grh.dgid, src->grh.dgid.raw, sizeof src->grh.dgid);
         dst->grh.flow_label        = src->grh.flow_label;
@@ -47,6 +47,7 @@ static void ib_copy_ah_attr_to_user(struct ib_uverbs_ah_attr *dst,
         dst->is_global             = src->ah_flags & IB_AH_GRH ? 1 : 0;
         dst->port_num              = src->port_num;
 }
+EXPORT_SYMBOL(ib_copy_ah_attr_to_user);
 
 void ib_copy_qp_attr_to_user(struct ib_uverbs_qp_attr *dst,
                              struct ib_qp_attr *src)
diff --git a/drivers/infiniband/core/uverbs_mem.c b/drivers/infiniband/core/uverbs_mem.c
index db12cc0841df..c95fe952abd5 100644
--- a/drivers/infiniband/core/uverbs_mem.c
+++ b/drivers/infiniband/core/uverbs_mem.c
@@ -52,8 +52,8 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int d
         int i;
 
         list_for_each_entry_safe(chunk, tmp, &umem->chunk_list, list) {
-                dma_unmap_sg(dev->dma_device, chunk->page_list,
-                             chunk->nents, DMA_BIDIRECTIONAL);
+                ib_dma_unmap_sg(dev, chunk->page_list,
+                                chunk->nents, DMA_BIDIRECTIONAL);
                 for (i = 0; i < chunk->nents; ++i) {
                         if (umem->writable && dirty)
                                 set_page_dirty_lock(chunk->page_list[i].page);
@@ -136,10 +136,10 @@ int ib_umem_get(struct ib_device *dev, struct ib_umem *mem,
                                 chunk->page_list[i].length = PAGE_SIZE;
                         }
 
-                        chunk->nmap = dma_map_sg(dev->dma_device,
-                                                 &chunk->page_list[0],
-                                                 chunk->nents,
-                                                 DMA_BIDIRECTIONAL);
+                        chunk->nmap = ib_dma_map_sg(dev,
+                                                    &chunk->page_list[0],
+                                                    chunk->nents,
+                                                    DMA_BIDIRECTIONAL);
                         if (chunk->nmap <= 0) {
                                 for (i = 0; i < chunk->nents; ++i)
                                         put_page(chunk->page_list[i].page);
diff --git a/drivers/infiniband/hw/amso1100/c2_qp.c b/drivers/infiniband/hw/amso1100/c2_qp.c
index 179d005ed4a5..420c1380f5c3 100644
--- a/drivers/infiniband/hw/amso1100/c2_qp.c
+++ b/drivers/infiniband/hw/amso1100/c2_qp.c
@@ -161,8 +161,10 @@ int c2_qp_modify(struct c2_dev *c2dev, struct c2_qp *qp,
 
         if (attr_mask & IB_QP_STATE) {
                 /* Ensure the state is valid */
-                if (attr->qp_state < 0 || attr->qp_state > IB_QPS_ERR)
-                        return -EINVAL;
+                if (attr->qp_state < 0 || attr->qp_state > IB_QPS_ERR) {
+                        err = -EINVAL;
+                        goto bail0;
+                }
 
                 wr.next_qp_state = cpu_to_be32(to_c2_state(attr->qp_state));
 
@@ -184,9 +186,10 @@ int c2_qp_modify(struct c2_dev *c2dev, struct c2_qp *qp,
                 if (attr->cur_qp_state != IB_QPS_RTR &&
                     attr->cur_qp_state != IB_QPS_RTS &&
                     attr->cur_qp_state != IB_QPS_SQD &&
-                    attr->cur_qp_state != IB_QPS_SQE)
-                        return -EINVAL;
-                else
+                    attr->cur_qp_state != IB_QPS_SQE) {
+                        err = -EINVAL;
+                        goto bail0;
+                } else
                         wr.next_qp_state =
                             cpu_to_be32(to_c2_state(attr->cur_qp_state));
 
diff --git a/drivers/infiniband/hw/ipath/Makefile b/drivers/infiniband/hw/ipath/Makefile
index 7dc10551cf18..ec2e603ea241 100644
--- a/drivers/infiniband/hw/ipath/Makefile
+++ b/drivers/infiniband/hw/ipath/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_INFINIBAND_IPATH) += ib_ipath.o
 ib_ipath-y := \
         ipath_cq.o \
         ipath_diag.o \
+        ipath_dma.o \
         ipath_driver.o \
         ipath_eeprom.o \
         ipath_file_ops.o \
diff --git a/drivers/infiniband/hw/ipath/ipath_dma.c b/drivers/infiniband/hw/ipath/ipath_dma.c
new file mode 100644
index 000000000000..6e0f2b8918ce
--- /dev/null
+++ b/drivers/infiniband/hw/ipath/ipath_dma.c
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2006 QLogic, 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
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <rdma/ib_verbs.h>
+
+#include "ipath_verbs.h"
+
+#define BAD_DMA_ADDRESS ((u64) 0)
+
+/*
+ * The following functions implement driver specific replacements
+ * for the ib_dma_*() functions.
+ *
+ * These functions return kernel virtual addresses instead of
+ * device bus addresses since the driver uses the CPU to copy
+ * data instead of using hardware DMA.
+ */
+
+static int ipath_mapping_error(struct ib_device *dev, u64 dma_addr)
+{
+        return dma_addr == BAD_DMA_ADDRESS;
+}
+
+static u64 ipath_dma_map_single(struct ib_device *dev,
+                                void *cpu_addr, size_t size,
+                                enum dma_data_direction direction)
+{
+        BUG_ON(!valid_dma_direction(direction));
+        return (u64) cpu_addr;
+}
+
+static void ipath_dma_unmap_single(struct ib_device *dev,
+                                   u64 addr, size_t size,
+                                   enum dma_data_direction direction)
+{
+        BUG_ON(!valid_dma_direction(direction));
+}
+
+static u64 ipath_dma_map_page(struct ib_device *dev,
+                              struct page *page,
+                              unsigned long offset,
+                              size_t size,
+                              enum dma_data_direction direction)
+{
+        u64 addr;
+
+        BUG_ON(!valid_dma_direction(direction));
+
+        if (offset + size > PAGE_SIZE) {
+                addr = BAD_DMA_ADDRESS;
+                goto done;
+        }
+
+        addr = (u64) page_address(page);
+        if (addr)
+                addr += offset;
+        /* TODO: handle highmem pages */
+
+done:
+        return addr;
+}
+
+static void ipath_dma_unmap_page(struct ib_device *dev,
+                                 u64 addr, size_t size,
+                                 enum dma_data_direction direction)
+{
+        BUG_ON(!valid_dma_direction(direction));
+}
+
+int ipath_map_sg(struct ib_device *dev, struct scatterlist *sg, int nents,
+                 enum dma_data_direction direction)
+{
+        u64 addr;
+        int i;
+        int ret = nents;
+
+        BUG_ON(!valid_dma_direction(direction));
+
+        for (i = 0; i < nents; i++) {
+                addr = (u64) page_address(sg[i].page);
+                /* TODO: handle highmem pages */
+                if (!addr) {
+                        ret = 0;
+                        break;
+                }
+        }
+        return ret;
+}
+
+static void ipath_unmap_sg(struct ib_device *dev,
+                           struct scatterlist *sg, int nents,
+                           enum dma_data_direction direction)
+{
+        BUG_ON(!valid_dma_direction(direction));
+}
+
+static u64 ipath_sg_dma_address(struct ib_device *dev, struct scatterlist *sg)
+{
+        u64 addr = (u64) page_address(sg->page);
+
+        if (addr)
+                addr += sg->offset;
+        return addr;
+}
+
+static unsigned int ipath_sg_dma_len(struct ib_device *dev,
+                                     struct scatterlist *sg)
+{
+        return sg->length;
+}
+
+static void ipath_sync_single_for_cpu(struct ib_device *dev,
+                                      u64 addr,
+                                      size_t size,
+                                      enum dma_data_direction dir)
+{
+}
+
+static void ipath_sync_single_for_device(struct ib_device *dev,
+                                         u64 addr,
+                                         size_t size,
+                                         enum dma_data_direction dir)
+{
+}
+
+static void *ipath_dma_alloc_coherent(struct ib_device *dev, size_t size,
+                                      u64 *dma_handle, gfp_t flag)
+{
+        struct page *p;
+        void *addr = NULL;
+
+        p = alloc_pages(flag, get_order(size));
+        if (p)
+                addr = page_address(p);
+        if (dma_handle)
+                *dma_handle = (u64) addr;
+        return addr;
+}
+
+static void ipath_dma_free_coherent(struct ib_device *dev, size_t size,
+                                    void *cpu_addr, dma_addr_t dma_handle)
+{
+        free_pages((unsigned long) cpu_addr, get_order(size));
+}
+
+struct ib_dma_mapping_ops ipath_dma_mapping_ops = {
+        ipath_mapping_error,
+        ipath_dma_map_single,
+        ipath_dma_unmap_single,
+        ipath_dma_map_page,
+        ipath_dma_unmap_page,
+        ipath_map_sg,
+        ipath_unmap_sg,
+        ipath_sg_dma_address,
+        ipath_sg_dma_len,
+        ipath_sync_single_for_cpu,
+        ipath_sync_single_for_device,
+        ipath_dma_alloc_coherent,
+        ipath_dma_free_coherent
+};
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index 1aeddb48e355..ae7f21a0cdc0 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -1825,8 +1825,6 @@ void ipath_write_kreg_port(const struct ipath_devdata *dd, ipath_kreg regno,
  */
 void ipath_shutdown_device(struct ipath_devdata *dd)
 {
-        u64 val;
-
         ipath_dbg("Shutting down the device\n");
 
         dd->ipath_flags |= IPATH_LINKUNK;
@@ -1849,7 +1847,7 @@ void ipath_shutdown_device(struct ipath_devdata *dd)
          */
         ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl, 0ULL);
         /* flush it */
-        val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch);
+        ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch);
         /*
          * enough for anything that's going to trickle out to have actually
          * done so.
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 340f27e3ebff..b932bcb67a5e 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -699,7 +699,6 @@ static int ipath_manage_rcvq(struct ipath_portdata *pd, unsigned subport,
                              int start_stop)
 {
         struct ipath_devdata *dd = pd->port_dd;
-        u64 tval;
 
         ipath_cdbg(PROC, "%sabling rcv for unit %u port %u:%u\n",
                    start_stop ? "en" : "dis", dd->ipath_unit,
@@ -729,7 +728,7 @@ static int ipath_manage_rcvq(struct ipath_portdata *pd, unsigned subport,
         ipath_write_kreg(dd, dd->ipath_kregs->kr_rcvctrl,
                          dd->ipath_rcvctrl);
         /* now be sure chip saw it before we return */
-        tval = ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch);
+        ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch);
         if (start_stop) {
                 /*
                  * And try to be sure that tail reg update has happened too.
@@ -738,7 +737,7 @@ static int ipath_manage_rcvq(struct ipath_portdata *pd, unsigned subport,
                  * in memory copy, since we could overwrite an update by the
                  * chip if we did.
                  */
-                tval = ipath_read_ureg32(dd, ur_rcvhdrtail, pd->port_port);
+                ipath_read_ureg32(dd, ur_rcvhdrtail, pd->port_port);
         }
         /* always; new head should be equal to new tail; see above */
 bail:
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c
index e57c7a351cb5..7468477ba837 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6110.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c
@@ -1447,7 +1447,7 @@ static void ipath_ht_tidtemplate(struct ipath_devdata *dd)
 static int ipath_ht_early_init(struct ipath_devdata *dd)
 {
         u32 __iomem *piobuf;
-        u32 pioincr, val32, egrsize;
+        u32 pioincr, val32;
         int i;
 
         /*
@@ -1467,7 +1467,6 @@ static int ipath_ht_early_init(struct ipath_devdata *dd)
          * errors interrupts if we ever see one).
          */
         dd->ipath_rcvegrbufsize = dd->ipath_piosize2k;
-        egrsize = dd->ipath_rcvegrbufsize;
 
         /*
          * the min() check here is currently a nop, but it may not
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c
index 6af89683f710..ae8bf9950c6d 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6120.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c
@@ -602,7 +602,7 @@ static void ipath_pe_init_hwerrors(struct ipath_devdata *dd)
  */
 static int ipath_pe_bringup_serdes(struct ipath_devdata *dd)
 {
-        u64 val, tmp, config1, prev_val;
+        u64 val, config1, prev_val;
         int ret = 0;
 
         ipath_dbg("Trying to bringup serdes\n");
@@ -633,7 +633,7 @@ static int ipath_pe_bringup_serdes(struct ipath_devdata *dd)
                 | INFINIPATH_SERDC0_L1PWR_DN;
         ipath_write_kreg(dd, dd->ipath_kregs->kr_serdesconfig0, val);
         /* be sure chip saw it */
-        tmp = ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch);
+        ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch);
         udelay(5);              /* need pll reset set at least for a bit */
         /*
          * after PLL is reset, set the per-lane Resets and TxIdle and
@@ -647,7 +647,7 @@ static int ipath_pe_bringup_serdes(struct ipath_devdata *dd)
                    "and txidle (%llx)\n", (unsigned long long) val);
         ipath_write_kreg(dd, dd->ipath_kregs->kr_serdesconfig0, val);
         /* be sure chip saw it */
-        tmp = ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch);
+        ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch);
         /* need PLL reset clear for at least 11 usec before lane
          * resets cleared; give it a few more to be sure */
         udelay(15);
@@ -851,12 +851,12 @@ static int ipath_setup_pe_config(struct ipath_devdata *dd,
         int pos, ret;
 
         dd->ipath_msi_lo = 0;   /* used as a flag during reset processing */
-        dd->ipath_irq = pdev->irq;
         ret = pci_enable_msi(dd->pcidev);
         if (ret)
                 ipath_dev_err(dd, "pci_enable_msi failed: %d, "
                               "interrupts may not work\n", ret);
         /* continue even if it fails, we may still be OK... */
+        dd->ipath_irq = pdev->irq;
 
         if ((pos = pci_find_capability(dd->pcidev, PCI_CAP_ID_MSI))) {
                 u16 control;
diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c
index d819cca524cd..d4f6b5239ef8 100644
--- a/drivers/infiniband/hw/ipath/ipath_init_chip.c
+++ b/drivers/infiniband/hw/ipath/ipath_init_chip.c
@@ -347,10 +347,9 @@ done:
 static int init_chip_reset(struct ipath_devdata *dd,
                            struct ipath_portdata **pdp)
 {
-        struct ipath_portdata *pd;
         u32 rtmp;
 
-        *pdp = pd = dd->ipath_pd[0];
+        *pdp = dd->ipath_pd[0];
         /* ensure chip does no sends or receives while we re-initialize */
         dd->ipath_control = dd->ipath_sendctrl = dd->ipath_rcvctrl = 0U;
         ipath_write_kreg(dd, dd->ipath_kregs->kr_rcvctrl, 0);
diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c
index 5652a550d442..72b9e279d19d 100644
--- a/drivers/infiniband/hw/ipath/ipath_intr.c
+++ b/drivers/infiniband/hw/ipath/ipath_intr.c
@@ -598,10 +598,9 @@ static int handle_errors(struct ipath_devdata *dd, ipath_err_t errs)
          * on close
          */
         if (errs & INFINIPATH_E_RRCVHDRFULL) {
-                int any;
                 u32 hd, tl;
                 ipath_stats.sps_hdrqfull++;
-                for (any = i = 0; i < dd->ipath_cfgports; i++) {
+                for (i = 0; i < dd->ipath_cfgports; i++) {
                         struct ipath_portdata *pd = dd->ipath_pd[i];
                         if (i == 0) {
                                 hd = dd->ipath_port0head;
diff --git a/drivers/infiniband/hw/ipath/ipath_keys.c b/drivers/infiniband/hw/ipath/ipath_keys.c
index 9a6cbd05adcd..851763d7d2db 100644
--- a/drivers/infiniband/hw/ipath/ipath_keys.c
+++ b/drivers/infiniband/hw/ipath/ipath_keys.c
@@ -134,7 +134,7 @@ int ipath_lkey_ok(struct ipath_qp *qp, struct ipath_sge *isge,
          */
         if (sge->lkey == 0) {
                 isge->mr = NULL;
-                isge->vaddr = bus_to_virt(sge->addr);
+                isge->vaddr = (void *) sge->addr;
                 isge->length = sge->length;
                 isge->sge_length = sge->length;
                 ret = 1;
@@ -202,12 +202,12 @@ int ipath_rkey_ok(struct ipath_qp *qp, struct ipath_sge_state *ss,
         int ret;
 
         /*
-         * We use RKEY == zero for physical addresses
-         * (see ipath_get_dma_mr).
+         * We use RKEY == zero for kernel virtual addresses
+         * (see ipath_get_dma_mr and ipath_dma.c).
          */
         if (rkey == 0) {
                 sge->mr = NULL;
-                sge->vaddr = phys_to_virt(vaddr);
+                sge->vaddr = (void *) vaddr;
                 sge->length = len;
                 sge->sge_length = len;
                 ss->sg_list = NULL;
diff --git a/drivers/infiniband/hw/ipath/ipath_mr.c b/drivers/infiniband/hw/ipath/ipath_mr.c
index a0673c1eef71..8cc8598d6c69 100644
--- a/drivers/infiniband/hw/ipath/ipath_mr.c
+++ b/drivers/infiniband/hw/ipath/ipath_mr.c
@@ -54,6 +54,8 @@ static inline struct ipath_fmr *to_ifmr(struct ib_fmr *ibfmr)
  * @acc: access flags
  *
  * Returns the memory region on success, otherwise returns an errno.
+ * Note that all DMA addresses should be created via the
+ * struct ib_dma_mapping_ops functions (see ipath_dma.c).
  */
 struct ib_mr *ipath_get_dma_mr(struct ib_pd *pd, int acc)
 {
@@ -149,8 +151,7 @@ struct ib_mr *ipath_reg_phys_mr(struct ib_pd *pd,
         m = 0;
         n = 0;
         for (i = 0; i < num_phys_buf; i++) {
-                mr->mr.map[m]->segs[n].vaddr =
-                        phys_to_virt(buffer_list[i].addr);
+                mr->mr.map[m]->segs[n].vaddr = (void *) buffer_list[i].addr;
                 mr->mr.map[m]->segs[n].length = buffer_list[i].size;
                 mr->mr.length += buffer_list[i].size;
                 n++;
@@ -347,7 +348,7 @@ int ipath_map_phys_fmr(struct ib_fmr *ibfmr, u64 * page_list,
         n = 0;
         ps = 1 << fmr->page_shift;
         for (i = 0; i < list_len; i++) {
-                fmr->mr.map[m]->segs[n].vaddr = phys_to_virt(page_list[i]);
+                fmr->mr.map[m]->segs[n].vaddr = (void *) page_list[i];
                 fmr->mr.map[m]->segs[n].length = ps;
                 if (++n == IPATH_SEGSZ) {
                         m++;
diff --git a/drivers/infiniband/hw/ipath/ipath_sysfs.c b/drivers/infiniband/hw/ipath/ipath_sysfs.c
index 182de34f9f47..ffa6318ad0cc 100644
--- a/drivers/infiniband/hw/ipath/ipath_sysfs.c
+++ b/drivers/infiniband/hw/ipath/ipath_sysfs.c
@@ -215,7 +215,6 @@ static ssize_t store_mlid(struct device *dev,
                           size_t count)
 {
         struct ipath_devdata *dd = dev_get_drvdata(dev);
-        int unit;
         u16 mlid;
         int ret;
 
@@ -223,8 +222,6 @@ static ssize_t store_mlid(struct device *dev,
         if (ret < 0 || mlid < IPATH_MULTICAST_LID_BASE)
                 goto invalid;
 
-        unit = dd->ipath_unit;
-
         dd->ipath_mlid = mlid;
 
         goto bail;
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index acdee33ee1f8..2aaacdb7e52a 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -1599,6 +1599,7 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
         dev->detach_mcast = ipath_multicast_detach;
         dev->process_mad = ipath_process_mad;
         dev->mmap = ipath_mmap;
+        dev->dma_ops = &ipath_dma_mapping_ops;
 
         snprintf(dev->node_desc, sizeof(dev->node_desc),
                  IPATH_IDSTR " %s", init_utsname()->nodename);
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.h b/drivers/infiniband/hw/ipath/ipath_verbs.h
index 8039f6e5f0c8..c0c8d5b24a7d 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.h
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.h
@@ -812,4 +812,6 @@ extern unsigned int ib_ipath_max_srq_wrs;
 
 extern const u32 ib_ipath_rnr_table[];
 
+extern struct ib_dma_mapping_ops ipath_dma_mapping_ops;
+
 #endif                          /* IPATH_VERBS_H */
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index 99547996aba2..07deee8f81ce 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -105,12 +105,12 @@ struct ipoib_mcast;
 
 struct ipoib_rx_buf {
         struct sk_buff *skb;
-        dma_addr_t      mapping;
+        u64             mapping;
 };
 
 struct ipoib_tx_buf {
         struct sk_buff *skb;
-        DECLARE_PCI_UNMAP_ADDR(mapping)
+        u64             mapping;
 };
 
 /*
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index f10fba5d3265..59d9594ed6d9 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -109,9 +109,8 @@ static int ipoib_ib_post_receive(struct net_device *dev, int id)
         ret = ib_post_recv(priv->qp, &param, &bad_wr);
         if (unlikely(ret)) {
                 ipoib_warn(priv, "receive failed for buf %d (%d)\n", id, ret);
-                dma_unmap_single(priv->ca->dma_device,
-                                 priv->rx_ring[id].mapping,
-                                 IPOIB_BUF_SIZE, DMA_FROM_DEVICE);
+                ib_dma_unmap_single(priv->ca, priv->rx_ring[id].mapping,
+                                    IPOIB_BUF_SIZE, DMA_FROM_DEVICE);
                 dev_kfree_skb_any(priv->rx_ring[id].skb);
                 priv->rx_ring[id].skb = NULL;
         }
@@ -123,7 +122,7 @@ static int ipoib_alloc_rx_skb(struct net_device *dev, int id)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct sk_buff *skb;
-        dma_addr_t addr;
+        u64 addr;
 
         skb = dev_alloc_skb(IPOIB_BUF_SIZE + 4);
         if (!skb)
@@ -136,10 +135,9 @@ static int ipoib_alloc_rx_skb(struct net_device *dev, int id)
          */
         skb_reserve(skb, 4);
 
-        addr = dma_map_single(priv->ca->dma_device,
-                              skb->data, IPOIB_BUF_SIZE,
-                              DMA_FROM_DEVICE);
-        if (unlikely(dma_mapping_error(addr))) {
+        addr = ib_dma_map_single(priv->ca, skb->data, IPOIB_BUF_SIZE,
+                                 DMA_FROM_DEVICE);
+        if (unlikely(ib_dma_mapping_error(priv->ca, addr))) {
                 dev_kfree_skb_any(skb);
                 return -EIO;
         }
@@ -174,7 +172,7 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         unsigned int wr_id = wc->wr_id & ~IPOIB_OP_RECV;
         struct sk_buff *skb;
-        dma_addr_t addr;
+        u64 addr;
 
         ipoib_dbg_data(priv, "recv completion: id %d, op %d, status: %d\n",
                        wr_id, wc->opcode, wc->status);
@@ -193,8 +191,8 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
                         ipoib_warn(priv, "failed recv event "
                                    "(status=%d, wrid=%d vend_err %x)\n",
                                    wc->status, wr_id, wc->vendor_err);
-                dma_unmap_single(priv->ca->dma_device, addr,
-                                 IPOIB_BUF_SIZE, DMA_FROM_DEVICE);
+                ib_dma_unmap_single(priv->ca, addr,
+                                    IPOIB_BUF_SIZE, DMA_FROM_DEVICE);
                 dev_kfree_skb_any(skb);
                 priv->rx_ring[wr_id].skb = NULL;
                 return;
@@ -212,8 +210,7 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
         ipoib_dbg_data(priv, "received %d bytes, SLID 0x%04x\n",
                        wc->byte_len, wc->slid);
 
-        dma_unmap_single(priv->ca->dma_device, addr,
-                         IPOIB_BUF_SIZE, DMA_FROM_DEVICE);
+        ib_dma_unmap_single(priv->ca, addr, IPOIB_BUF_SIZE, DMA_FROM_DEVICE);
 
         skb_put(skb, wc->byte_len);
         skb_pull(skb, IB_GRH_BYTES);
@@ -261,10 +258,8 @@ static void ipoib_ib_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)
 
         tx_req = &priv->tx_ring[wr_id];
 
-        dma_unmap_single(priv->ca->dma_device,
-                         pci_unmap_addr(tx_req, mapping),
-                         tx_req->skb->len,
-                         DMA_TO_DEVICE);
+        ib_dma_unmap_single(priv->ca, tx_req->mapping,
+                            tx_req->skb->len, DMA_TO_DEVICE);
 
         ++priv->stats.tx_packets;
         priv->stats.tx_bytes += tx_req->skb->len;
@@ -311,7 +306,7 @@ void ipoib_ib_completion(struct ib_cq *cq, void *dev_ptr)
 static inline int post_send(struct ipoib_dev_priv *priv,
                             unsigned int wr_id,
                             struct ib_ah *address, u32 qpn,
-                            dma_addr_t addr, int len)
+                            u64 addr, int len)
 {
         struct ib_send_wr *bad_wr;
 
@@ -330,7 +325,7 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb,
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ipoib_tx_buf *tx_req;
-        dma_addr_t addr;
+        u64 addr;
 
         if (unlikely(skb->len > dev->mtu + INFINIBAND_ALEN)) {
                 ipoib_warn(priv, "packet len %d (> %d) too long to send, dropping\n",
@@ -353,21 +348,20 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb,
          */
         tx_req = &priv->tx_ring[priv->tx_head & (ipoib_sendq_size - 1)];
         tx_req->skb = skb;
-        addr = dma_map_single(priv->ca->dma_device, skb->data, skb->len,
-                              DMA_TO_DEVICE);
-        if (unlikely(dma_mapping_error(addr))) {
+        addr = ib_dma_map_single(priv->ca, skb->data, skb->len,
+                                 DMA_TO_DEVICE);
+        if (unlikely(ib_dma_mapping_error(priv->ca, addr))) {
                 ++priv->stats.tx_errors;
                 dev_kfree_skb_any(skb);
                 return;
         }
-        pci_unmap_addr_set(tx_req, mapping, addr);
+        tx_req->mapping = addr;
 
         if (unlikely(post_send(priv, priv->tx_head & (ipoib_sendq_size - 1),
                                address->ah, qpn, addr, skb->len))) {
                 ipoib_warn(priv, "post_send failed\n");
                 ++priv->stats.tx_errors;
-                dma_unmap_single(priv->ca->dma_device, addr, skb->len,
-                                 DMA_TO_DEVICE);
+                ib_dma_unmap_single(priv->ca, addr, skb->len, DMA_TO_DEVICE);
                 dev_kfree_skb_any(skb);
         } else {
                 dev->trans_start = jiffies;
@@ -538,24 +532,27 @@ int ipoib_ib_dev_stop(struct net_device *dev)
                         while ((int) priv->tx_tail - (int) priv->tx_head < 0) {
                                 tx_req = &priv->tx_ring[priv->tx_tail &
                                                         (ipoib_sendq_size - 1)];
-                                dma_unmap_single(priv->ca->dma_device,
-                                                 pci_unmap_addr(tx_req, mapping),
-                                                 tx_req->skb->len,
-                                                 DMA_TO_DEVICE);
+                                ib_dma_unmap_single(priv->ca,
+                                                    tx_req->mapping,
+                                                    tx_req->skb->len,
+                                                    DMA_TO_DEVICE);
                                 dev_kfree_skb_any(tx_req->skb);
                                 ++priv->tx_tail;
                         }
 
-                        for (i = 0; i < ipoib_recvq_size; ++i)
-                                if (priv->rx_ring[i].skb) {
-                                        dma_unmap_single(priv->ca->dma_device,
-                                                         pci_unmap_addr(&priv->rx_ring[i],
-                                                                        mapping),
-                                                         IPOIB_BUF_SIZE,
-                                                         DMA_FROM_DEVICE);
-                                        dev_kfree_skb_any(priv->rx_ring[i].skb);
-                                        priv->rx_ring[i].skb = NULL;
-                                }
+                        for (i = 0; i < ipoib_recvq_size; ++i) {
+                                struct ipoib_rx_buf *rx_req;
+
+                                rx_req = &priv->rx_ring[i];
+                                if (!rx_req->skb)
+                                        continue;
+                                ib_dma_unmap_single(priv->ca,
+                                                    rx_req->mapping,
+                                                    IPOIB_BUF_SIZE,
+                                                    DMA_FROM_DEVICE);
+                                dev_kfree_skb_any(rx_req->skb);
+                                rx_req->skb = NULL;
+                        }
 
                         goto timeout;
                 }
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index c09280243726..705eb1d0e554 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -497,8 +497,6 @@ static void neigh_add_path(struct sk_buff *skb, struct net_device *dev)
                 return;
         }
 
-        skb_queue_head_init(&neigh->queue);
-
         /*
          * We can only be called from ipoib_start_xmit, so we're
          * inside tx_lock -- no need to save/restore flags.
@@ -806,6 +804,7 @@ struct ipoib_neigh *ipoib_neigh_alloc(struct neighbour *neighbour)
 
         neigh->neighbour = neighbour;
         *to_ipoib_neigh(neighbour) = neigh;
+        skb_queue_head_init(&neigh->queue);
 
         return neigh;
 }
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index 234e5b061a75..cae8c96a55f8 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -182,7 +182,7 @@ struct iser_regd_buf {
         struct iser_mem_reg     reg;        /* memory registration info        */
         void                    *virt_addr;
         struct iser_device      *device;    /* device->device for dma_unmap    */
-        dma_addr_t              dma_addr;   /* if non zero, addr for dma_unmap */
+        u64                     dma_addr;   /* if non zero, addr for dma_unmap */
         enum dma_data_direction direction;  /* direction for dma_unmap         */
         unsigned int            data_size;
         atomic_t                ref_count;  /* refcount, freed when dec to 0   */
diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c
index 9b3d79c796c8..e73c87b9be43 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -487,10 +487,8 @@ int iser_send_control(struct iscsi_conn *conn,
         struct iscsi_iser_conn *iser_conn = conn->dd_data;
         struct iser_desc *mdesc = mtask->dd_data;
         struct iser_dto *send_dto = NULL;
-        unsigned int itt;
         unsigned long data_seg_len;
         int err = 0;
-        unsigned char opcode;
         struct iser_regd_buf *regd_buf;
         struct iser_device *device;
 
@@ -512,8 +510,6 @@ int iser_send_control(struct iscsi_conn *conn,
 
         iser_reg_single(device, send_dto->regd[0], DMA_TO_DEVICE);
 
-        itt = ntohl(mtask->hdr->itt);
-        opcode = mtask->hdr->opcode & ISCSI_OPCODE_MASK;
         data_seg_len = ntoh24(mtask->hdr->dlength);
 
         if (data_seg_len > 0) {
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index 3aedd59b8a84..fc9f1fd0ae54 100644
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -52,7 +52,7 @@
  */
 int iser_regd_buff_release(struct iser_regd_buf *regd_buf)
 {
-        struct device *dma_device;
+        struct ib_device *dev;
 
         if ((atomic_read(&regd_buf->ref_count) == 0) ||
             atomic_dec_and_test(&regd_buf->ref_count)) {
@@ -61,8 +61,8 @@ int iser_regd_buff_release(struct iser_regd_buf *regd_buf)
                         iser_unreg_mem(&regd_buf->reg);
 
                 if (regd_buf->dma_addr) {
-                        dma_device = regd_buf->device->ib_device->dma_device;
-                        dma_unmap_single(dma_device,
+                        dev = regd_buf->device->ib_device;
+                        ib_dma_unmap_single(dev,
                                          regd_buf->dma_addr,
                                          regd_buf->data_size,
                                          regd_buf->direction);
@@ -84,12 +84,12 @@ void iser_reg_single(struct iser_device *device,
                      struct iser_regd_buf *regd_buf,
                      enum dma_data_direction direction)
 {
-        dma_addr_t dma_addr;
+        u64 dma_addr;
 
-        dma_addr  = dma_map_single(device->ib_device->dma_device,
-                                   regd_buf->virt_addr,
-                                   regd_buf->data_size, direction);
-        BUG_ON(dma_mapping_error(dma_addr));
+        dma_addr = ib_dma_map_single(device->ib_device,
+                                     regd_buf->virt_addr,
+                                     regd_buf->data_size, direction);
+        BUG_ON(ib_dma_mapping_error(device->ib_device, dma_addr));
 
         regd_buf->reg.lkey = device->mr->lkey;
         regd_buf->reg.len  = regd_buf->data_size;
@@ -107,7 +107,7 @@ int iser_start_rdma_unaligned_sg(struct iscsi_iser_cmd_task  *iser_ctask,
                                  enum iser_data_dir cmd_dir)
 {
         int dma_nents;
-        struct device *dma_device;
+        struct ib_device *dev;
         char *mem = NULL;
         struct iser_data_buf *data = &iser_ctask->data[cmd_dir];
         unsigned long  cmd_data_len = data->data_len;
@@ -147,17 +147,12 @@ int iser_start_rdma_unaligned_sg(struct iscsi_iser_cmd_task  *iser_ctask,
 
         iser_ctask->data_copy[cmd_dir].copy_buf  = mem;
 
-        dma_device = iser_ctask->iser_conn->ib_conn->device->ib_device->dma_device;
-
-        if (cmd_dir == ISER_DIR_OUT)
-                dma_nents = dma_map_sg(dma_device,
-                                       &iser_ctask->data_copy[cmd_dir].sg_single,
-                                       1, DMA_TO_DEVICE);
-        else
-                dma_nents = dma_map_sg(dma_device,
-                                       &iser_ctask->data_copy[cmd_dir].sg_single,
-                                       1, DMA_FROM_DEVICE);
-
+        dev = iser_ctask->iser_conn->ib_conn->device->ib_device;
+        dma_nents = ib_dma_map_sg(dev,
+                                  &iser_ctask->data_copy[cmd_dir].sg_single,
+                                  1,
+                                  (cmd_dir == ISER_DIR_OUT) ?
+                                  DMA_TO_DEVICE : DMA_FROM_DEVICE);
         BUG_ON(dma_nents == 0);
 
         iser_ctask->data_copy[cmd_dir].dma_nents = dma_nents;
@@ -170,19 +165,16 @@ int iser_start_rdma_unaligned_sg(struct iscsi_iser_cmd_task  *iser_ctask,
 void iser_finalize_rdma_unaligned_sg(struct iscsi_iser_cmd_task *iser_ctask,
                                      enum iser_data_dir         cmd_dir)
 {
-        struct device *dma_device;
+        struct ib_device *dev;
         struct iser_data_buf *mem_copy;
         unsigned long  cmd_data_len;
 
-        dma_device = iser_ctask->iser_conn->ib_conn->device->ib_device->dma_device;
-        mem_copy   = &iser_ctask->data_copy[cmd_dir];
+        dev = iser_ctask->iser_conn->ib_conn->device->ib_device;
+        mem_copy = &iser_ctask->data_copy[cmd_dir];
 
-        if (cmd_dir == ISER_DIR_OUT)
-                dma_unmap_sg(dma_device, &mem_copy->sg_single, 1,
-                             DMA_TO_DEVICE);
-        else
-                dma_unmap_sg(dma_device, &mem_copy->sg_single, 1,
-                             DMA_FROM_DEVICE);
+        ib_dma_unmap_sg(dev, &mem_copy->sg_single, 1,
+                        (cmd_dir == ISER_DIR_OUT) ?
+                        DMA_TO_DEVICE : DMA_FROM_DEVICE);
 
         if (cmd_dir == ISER_DIR_IN) {
                 char *mem;
@@ -231,11 +223,12 @@ void iser_finalize_rdma_unaligned_sg(struct iscsi_iser_cmd_task *iser_ctask,
  * 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 iser_page_vec *page_vec,
+                               struct ib_device *ibdev)
 {
         struct scatterlist *sg = (struct scatterlist *)data->buf;
-        dma_addr_t first_addr, last_addr, page;
-        int start_aligned, end_aligned;
+        u64 first_addr, last_addr, page;
+        int end_aligned;
         unsigned int cur_page = 0;
         unsigned long total_sz = 0;
         int i;
@@ -244,19 +237,21 @@ static int iser_sg_to_page_vec(struct iser_data_buf *data,
         page_vec->offset = (u64) sg[0].offset & ~MASK_4K;
 
         for (i = 0; i < data->dma_nents; i++) {
-                total_sz += sg_dma_len(&sg[i]);
+                unsigned int dma_len = ib_sg_dma_len(ibdev, &sg[i]);
+
+                total_sz += dma_len;
 
-                first_addr = sg_dma_address(&sg[i]);
-                last_addr  = first_addr + sg_dma_len(&sg[i]);
+                first_addr = ib_sg_dma_address(ibdev, &sg[i]);
+                last_addr  = first_addr + dma_len;
 
-                start_aligned = !(first_addr & ~MASK_4K);
                 end_aligned   = !(last_addr  & ~MASK_4K);
 
                 /* continue to collect page fragments till aligned or SG ends */
                 while (!end_aligned && (i + 1 < data->dma_nents)) {
                         i++;
-                        total_sz += sg_dma_len(&sg[i]);
-                        last_addr = sg_dma_address(&sg[i]) + sg_dma_len(&sg[i]);
+                        dma_len = ib_sg_dma_len(ibdev, &sg[i]);
+                        total_sz += dma_len;
+                        last_addr = ib_sg_dma_address(ibdev, &sg[i]) + dma_len;
                         end_aligned = !(last_addr  & ~MASK_4K);
                 }
 
@@ -288,10 +283,11 @@ 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)
+static unsigned int iser_data_buf_aligned_len(struct iser_data_buf *data,
+                                              struct ib_device *ibdev)
 {
         struct scatterlist *sg;
-        dma_addr_t end_addr, next_addr;
+        u64 end_addr, next_addr;
         int i, cnt;
         unsigned int ret_len = 0;
 
@@ -303,12 +299,12 @@ static unsigned int iser_data_buf_aligned_len(struct iser_data_buf *data)
                    (unsigned long)page_to_phys(sg[i].page),
                    (unsigned long)sg[i].offset,
                    (unsigned long)sg[i].length); */
-                end_addr = sg_dma_address(&sg[i]) +
-                           sg_dma_len(&sg[i]);
+                end_addr = ib_sg_dma_address(ibdev, &sg[i]) +
+                           ib_sg_dma_len(ibdev, &sg[i]);
                 /* iser_dbg("Checking sg iobuf end address "
                        "0x%08lX\n", end_addr); */
                 if (i + 1 < data->dma_nents) {
-                        next_addr = sg_dma_address(&sg[i+1]);
+                        next_addr = ib_sg_dma_address(ibdev, &sg[i+1]);
                         /* are i, i+1 fragments of the same page? */
                         if (end_addr == next_addr)
                                 continue;
@@ -325,7 +321,8 @@ static unsigned int iser_data_buf_aligned_len(struct iser_data_buf *data)
         return ret_len;
 }
 
-static void iser_data_buf_dump(struct iser_data_buf *data)
+static void iser_data_buf_dump(struct iser_data_buf *data,
+                               struct ib_device *ibdev)
 {
         struct scatterlist *sg = (struct scatterlist *)data->buf;
         int i;
@@ -333,9 +330,9 @@ static void iser_data_buf_dump(struct iser_data_buf *data)
         for (i = 0; i < data->dma_nents; i++)
                 iser_err("sg[%d] dma_addr:0x%lX page:0x%p "
                          "off:0x%x sz:0x%x dma_len:0x%x\n",
-                         i, (unsigned long)sg_dma_address(&sg[i]),
+                         i, (unsigned long)ib_sg_dma_address(ibdev, &sg[i]),
                          sg[i].page, sg[i].offset,
-                         sg[i].length,sg_dma_len(&sg[i]));
+                         sg[i].length, ib_sg_dma_len(ibdev, &sg[i]));
 }
 
 static void iser_dump_page_vec(struct iser_page_vec *page_vec)
@@ -349,7 +346,8 @@ static void iser_dump_page_vec(struct iser_page_vec *page_vec)
 }
 
 static void iser_page_vec_build(struct iser_data_buf *data,
-                                struct iser_page_vec *page_vec)
+                                struct iser_page_vec *page_vec,
+                                struct ib_device *ibdev)
 {
         int page_vec_len = 0;
 
@@ -357,14 +355,14 @@ static void iser_page_vec_build(struct iser_data_buf *data,
         page_vec->offset = 0;
 
         iser_dbg("Translating sg sz: %d\n", data->dma_nents);
-        page_vec_len = iser_sg_to_page_vec(data,page_vec);
+        page_vec_len = iser_sg_to_page_vec(data, page_vec, ibdev);
         iser_dbg("sg len %d page_vec_len %d\n", data->dma_nents,page_vec_len);
 
         page_vec->length = page_vec_len;
 
         if (page_vec_len * SIZE_4K < page_vec->data_size) {
                 iser_err("page_vec too short to hold this SG\n");
-                iser_data_buf_dump(data);
+                iser_data_buf_dump(data, ibdev);
                 iser_dump_page_vec(page_vec);
                 BUG();
         }
@@ -375,13 +373,12 @@ int iser_dma_map_task_data(struct iscsi_iser_cmd_task *iser_ctask,
                             enum   iser_data_dir       iser_dir,
                             enum   dma_data_direction  dma_dir)
 {
-        struct device *dma_device;
+        struct ib_device *dev;
 
         iser_ctask->dir[iser_dir] = 1;
-        dma_device =
-                iser_ctask->iser_conn->ib_conn->device->ib_device->dma_device;
+        dev = iser_ctask->iser_conn->ib_conn->device->ib_device;
 
-        data->dma_nents = dma_map_sg(dma_device, data->buf, data->size, dma_dir);
+        data->dma_nents = ib_dma_map_sg(dev, data->buf, data->size, dma_dir);
         if (data->dma_nents == 0) {
                 iser_err("dma_map_sg failed!!!\n");
                 return -EINVAL;
@@ -391,20 +388,19 @@ int iser_dma_map_task_data(struct iscsi_iser_cmd_task *iser_ctask,
 
 void iser_dma_unmap_task_data(struct iscsi_iser_cmd_task *iser_ctask)
 {
-        struct device  *dma_device;
+        struct ib_device *dev;
         struct iser_data_buf *data;
 
-        dma_device =
-                iser_ctask->iser_conn->ib_conn->device->ib_device->dma_device;
+        dev = iser_ctask->iser_conn->ib_conn->device->ib_device;
 
         if (iser_ctask->dir[ISER_DIR_IN]) {
                 data = &iser_ctask->data[ISER_DIR_IN];
-                dma_unmap_sg(dma_device, data->buf, data->size, DMA_FROM_DEVICE);
+                ib_dma_unmap_sg(dev, data->buf, data->size, DMA_FROM_DEVICE);
         }
 
         if (iser_ctask->dir[ISER_DIR_OUT]) {
                 data = &iser_ctask->data[ISER_DIR_OUT];
-                dma_unmap_sg(dma_device, data->buf, data->size, DMA_TO_DEVICE);
+                ib_dma_unmap_sg(dev, data->buf, data->size, DMA_TO_DEVICE);
         }
 }
 
@@ -419,6 +415,7 @@ int iser_reg_rdma_mem(struct iscsi_iser_cmd_task *iser_ctask,
 {
         struct iser_conn     *ib_conn = iser_ctask->iser_conn->ib_conn;
         struct iser_device   *device = ib_conn->device;
+        struct ib_device     *ibdev = device->ib_device;
         struct iser_data_buf *mem = &iser_ctask->data[cmd_dir];
         struct iser_regd_buf *regd_buf;
         int aligned_len;
@@ -428,11 +425,11 @@ int iser_reg_rdma_mem(struct iscsi_iser_cmd_task *iser_ctask,
 
         regd_buf = &iser_ctask->rdma_regd[cmd_dir];
 
-        aligned_len = iser_data_buf_aligned_len(mem);
+        aligned_len = iser_data_buf_aligned_len(mem, ibdev);
         if (aligned_len != mem->dma_nents) {
                 iser_err("rdma alignment violation %d/%d aligned\n",
                          aligned_len, mem->size);
-                iser_data_buf_dump(mem);
+                iser_data_buf_dump(mem, ibdev);
 
                 /* unmap the command data before accessing it */
                 iser_dma_unmap_task_data(iser_ctask);
@@ -450,8 +447,8 @@ int iser_reg_rdma_mem(struct iscsi_iser_cmd_task *iser_ctask,
 
                 regd_buf->reg.lkey = device->mr->lkey;
                 regd_buf->reg.rkey = device->mr->rkey;
-                regd_buf->reg.len  = sg_dma_len(&sg[0]);
-                regd_buf->reg.va   = sg_dma_address(&sg[0]);
+                regd_buf->reg.len  = ib_sg_dma_len(ibdev, &sg[0]);
+                regd_buf->reg.va   = ib_sg_dma_address(ibdev, &sg[0]);
                 regd_buf->reg.is_fmr = 0;
 
                 iser_dbg("PHYSICAL Mem.register: lkey: 0x%08X rkey: 0x%08X  "
@@ -461,10 +458,10 @@ int iser_reg_rdma_mem(struct iscsi_iser_cmd_task *iser_ctask,
                          (unsigned long)regd_buf->reg.va,
                          (unsigned long)regd_buf->reg.len);
         } else { /* use FMR for multiple dma entries */
-                iser_page_vec_build(mem, ib_conn->page_vec);
+                iser_page_vec_build(mem, ib_conn->page_vec, ibdev);
                 err = iser_reg_page_vec(ib_conn, ib_conn->page_vec, &regd_buf->reg);
                 if (err) {
-                        iser_data_buf_dump(mem);
+                        iser_data_buf_dump(mem, ibdev);
                         iser_err("mem->dma_nents = %d (dlength = 0x%x)\n", mem->dma_nents,
                                  ntoh24(iser_ctask->desc.iscsi_header.dlength));
                         iser_err("page_vec: data_size = 0x%x, length = %d, offset = 0x%x\n",
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index a6289595557b..e9b6a6f07dd7 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -122,9 +122,8 @@ static struct srp_iu *srp_alloc_iu(struct srp_host *host, size_t size,
         if (!iu->buf)
                 goto out_free_iu;
 
-        iu->dma = dma_map_single(host->dev->dev->dma_device,
-                                 iu->buf, size, direction);
-        if (dma_mapping_error(iu->dma))
+        iu->dma = ib_dma_map_single(host->dev->dev, iu->buf, size, direction);
+        if (ib_dma_mapping_error(host->dev->dev, iu->dma))
                 goto out_free_buf;
 
         iu->size      = size;
@@ -145,8 +144,7 @@ static void srp_free_iu(struct srp_host *host, struct srp_iu *iu)
         if (!iu)
                 return;
 
-        dma_unmap_single(host->dev->dev->dma_device,
-                         iu->dma, iu->size, iu->direction);
+        ib_dma_unmap_single(host->dev->dev, iu->dma, iu->size, iu->direction);
         kfree(iu->buf);
         kfree(iu);
 }
@@ -482,8 +480,8 @@ static void srp_unmap_data(struct scsi_cmnd *scmnd,
                 scat  = &req->fake_sg;
         }
 
-        dma_unmap_sg(target->srp_host->dev->dev->dma_device, scat, nents,
-                     scmnd->sc_data_direction);
+        ib_dma_unmap_sg(target->srp_host->dev->dev, scat, nents,
+                        scmnd->sc_data_direction);
 }
 
 static void srp_remove_req(struct srp_target_port *target, struct srp_request *req)
@@ -595,23 +593,26 @@ static int srp_map_fmr(struct srp_target_port *target, struct scatterlist *scat,
         int i, j;
         int ret;
         struct srp_device *dev = target->srp_host->dev;
+        struct ib_device *ibdev = dev->dev;
 
         if (!dev->fmr_pool)
                 return -ENODEV;
 
-        if ((sg_dma_address(&scat[0]) & ~dev->fmr_page_mask) &&
+        if ((ib_sg_dma_address(ibdev, &scat[0]) & ~dev->fmr_page_mask) &&
             mellanox_workarounds && !memcmp(&target->ioc_guid, mellanox_oui, 3))
                 return -EINVAL;
 
         len = page_cnt = 0;
         for (i = 0; i < sg_cnt; ++i) {
-                if (sg_dma_address(&scat[i]) & ~dev->fmr_page_mask) {
+                unsigned int dma_len = ib_sg_dma_len(ibdev, &scat[i]);
+
+                if (ib_sg_dma_address(ibdev, &scat[i]) & ~dev->fmr_page_mask) {
                         if (i > 0)
                                 return -EINVAL;
                         else
                                 ++page_cnt;
                 }
-                if ((sg_dma_address(&scat[i]) + sg_dma_len(&scat[i])) &
+                if ((ib_sg_dma_address(ibdev, &scat[i]) + dma_len) &
                     ~dev->fmr_page_mask) {
                         if (i < sg_cnt - 1)
                                 return -EINVAL;
@@ -619,7 +620,7 @@ static int srp_map_fmr(struct srp_target_port *target, struct scatterlist *scat,
                                 ++page_cnt;
                 }
 
-                len += sg_dma_len(&scat[i]);
+                len += dma_len;
         }
 
         page_cnt += len >> dev->fmr_page_shift;
@@ -631,10 +632,14 @@ static int srp_map_fmr(struct srp_target_port *target, struct scatterlist *scat,
                 return -ENOMEM;
 
         page_cnt = 0;
-        for (i = 0; i < sg_cnt; ++i)
-                for (j = 0; j < sg_dma_len(&scat[i]); j += dev->fmr_page_size)
+        for (i = 0; i < sg_cnt; ++i) {
+                unsigned int dma_len = ib_sg_dma_len(ibdev, &scat[i]);
+
+                for (j = 0; j < dma_len; j += dev->fmr_page_size)
                         dma_pages[page_cnt++] =
-                                (sg_dma_address(&scat[i]) & dev->fmr_page_mask) + j;
+                                (ib_sg_dma_address(ibdev, &scat[i]) &
+                                 dev->fmr_page_mask) + j;
+        }
 
         req->fmr = ib_fmr_pool_map_phys(dev->fmr_pool,
                                         dma_pages, page_cnt, io_addr);
@@ -644,7 +649,8 @@ static int srp_map_fmr(struct srp_target_port *target, struct scatterlist *scat,
                 goto out;
         }
 
-        buf->va  = cpu_to_be64(sg_dma_address(&scat[0]) & ~dev->fmr_page_mask);
+        buf->va  = cpu_to_be64(ib_sg_dma_address(ibdev, &scat[0]) &
+                               ~dev->fmr_page_mask);
         buf->key = cpu_to_be32(req->fmr->fmr->rkey);
         buf->len = cpu_to_be32(len);
 
@@ -663,6 +669,8 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,
         struct srp_cmd *cmd = req->cmd->buf;
         int len, nents, count;
         u8 fmt = SRP_DATA_DESC_DIRECT;
+        struct srp_device *dev;
+        struct ib_device *ibdev;
 
         if (!scmnd->request_buffer || scmnd->sc_data_direction == DMA_NONE)
                 return sizeof (struct srp_cmd);
@@ -687,8 +695,10 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,
                 sg_init_one(scat, scmnd->request_buffer, scmnd->request_bufflen);
         }
 
-        count = dma_map_sg(target->srp_host->dev->dev->dma_device,
-                           scat, nents, scmnd->sc_data_direction);
+        dev = target->srp_host->dev;
+        ibdev = dev->dev;
+
+        count = ib_dma_map_sg(ibdev, scat, nents, scmnd->sc_data_direction);
 
         fmt = SRP_DATA_DESC_DIRECT;
         len = sizeof (struct srp_cmd) + sizeof (struct srp_direct_buf);
@@ -702,9 +712,9 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,
                  */
                 struct srp_direct_buf *buf = (void *) cmd->add_data;
 
-                buf->va  = cpu_to_be64(sg_dma_address(scat));
-                buf->key = cpu_to_be32(target->srp_host->dev->mr->rkey);
-                buf->len = cpu_to_be32(sg_dma_len(scat));
+                buf->va  = cpu_to_be64(ib_sg_dma_address(ibdev, scat));
+                buf->key = cpu_to_be32(dev->mr->rkey);
+                buf->len = cpu_to_be32(ib_sg_dma_len(ibdev, scat));
         } else if (srp_map_fmr(target, scat, count, req,
                                (void *) cmd->add_data)) {
                 /*
@@ -722,13 +732,14 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,
                         count * sizeof (struct srp_direct_buf);
 
                 for (i = 0; i < count; ++i) {
+                        unsigned int dma_len = ib_sg_dma_len(ibdev, &scat[i]);
+
                         buf->desc_list[i].va  =
-                                cpu_to_be64(sg_dma_address(&scat[i]));
+                                cpu_to_be64(ib_sg_dma_address(ibdev, &scat[i]));
                         buf->desc_list[i].key =
-                                cpu_to_be32(target->srp_host->dev->mr->rkey);
-                        buf->desc_list[i].len =
-                                cpu_to_be32(sg_dma_len(&scat[i]));
-                        datalen += sg_dma_len(&scat[i]);
+                                cpu_to_be32(dev->mr->rkey);
+                        buf->desc_list[i].len = cpu_to_be32(dma_len);
+                        datalen += dma_len;
                 }
 
                 if (scmnd->sc_data_direction == DMA_TO_DEVICE)
@@ -808,13 +819,15 @@ static void srp_process_rsp(struct srp_target_port *target, struct srp_rsp *rsp)
 
 static void srp_handle_recv(struct srp_target_port *target, struct ib_wc *wc)
 {
+        struct ib_device *dev;
         struct srp_iu *iu;
         u8 opcode;
 
         iu = target->rx_ring[wc->wr_id & ~SRP_OP_RECV];
 
-        dma_sync_single_for_cpu(target->srp_host->dev->dev->dma_device, iu->dma,
-                                target->max_ti_iu_len, DMA_FROM_DEVICE);
+        dev = target->srp_host->dev->dev;
+        ib_dma_sync_single_for_cpu(dev, iu->dma, target->max_ti_iu_len,
+                                   DMA_FROM_DEVICE);
 
         opcode = *(u8 *) iu->buf;
 
@@ -850,8 +863,8 @@ static void srp_handle_recv(struct srp_target_port *target, struct ib_wc *wc)
                 break;
         }
 
-        dma_sync_single_for_device(target->srp_host->dev->dev->dma_device, iu->dma,
-                                   target->max_ti_iu_len, DMA_FROM_DEVICE);
+        ib_dma_sync_single_for_device(dev, iu->dma, target->max_ti_iu_len,
+                                      DMA_FROM_DEVICE);
 }
 
 static void srp_completion(struct ib_cq *cq, void *target_ptr)
@@ -969,6 +982,7 @@ static int srp_queuecommand(struct scsi_cmnd *scmnd,
         struct srp_request *req;
         struct srp_iu *iu;
         struct srp_cmd *cmd;
+        struct ib_device *dev;
         int len;
 
         if (target->state == SRP_TARGET_CONNECTING)
@@ -985,8 +999,9 @@ static int srp_queuecommand(struct scsi_cmnd *scmnd,
         if (!iu)
                 goto err;
 
-        dma_sync_single_for_cpu(target->srp_host->dev->dev->dma_device, iu->dma,
-                                srp_max_iu_len, DMA_TO_DEVICE);
+        dev = target->srp_host->dev->dev;
+        ib_dma_sync_single_for_cpu(dev, iu->dma, srp_max_iu_len,
+                                   DMA_TO_DEVICE);
 
         req = list_entry(target->free_reqs.next, struct srp_request, list);
 
@@ -1018,8 +1033,8 @@ static int srp_queuecommand(struct scsi_cmnd *scmnd,
                 goto err_unmap;
         }
 
-        dma_sync_single_for_device(target->srp_host->dev->dev->dma_device, iu->dma,
-                                   srp_max_iu_len, DMA_TO_DEVICE);
+        ib_dma_sync_single_for_device(dev, iu->dma, srp_max_iu_len,
+                                      DMA_TO_DEVICE);
 
         if (__srp_post_send(target, iu, len)) {
                 printk(KERN_ERR PFX "Send failed\n");
diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h
index d4e35ef51374..868a540ef7cd 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.h
+++ b/drivers/infiniband/ulp/srp/ib_srp.h
@@ -161,7 +161,7 @@ struct srp_target_port {
 };
 
 struct srp_iu {
-        dma_addr_t              dma;
+        u64                     dma;
         void                   *buf;
         size_t                  size;
         enum dma_data_direction direction;
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c
index 54bc569db4b0..35461eab2faf 100644
--- a/drivers/input/keyboard/hilkbd.c
+++ b/drivers/input/keyboard/hilkbd.c
@@ -23,7 +23,12 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/hil.h>
+#include <linux/io.h>
 #include <linux/spinlock.h>
+#include <asm/irq.h>
+#ifdef CONFIG_HP300
+#include <asm/hwtest.h>
+#endif
 
 
 MODULE_AUTHOR("Philip Blundell, Matthew Wilcox, Helge Deller");
diff --git a/drivers/isdn/act2000/act2000_isa.c b/drivers/isdn/act2000/act2000_isa.c
index 3cac23739344..09ea50dd3459 100644
--- a/drivers/isdn/act2000/act2000_isa.c
+++ b/drivers/isdn/act2000/act2000_isa.c
@@ -408,7 +408,7 @@ act2000_isa_download(act2000_card * card, act2000_ddef __user * cb)
         p = cblock.buffer;
         if (!access_ok(VERIFY_READ, p, length))
                 return -EFAULT;
-        buf = (u_char *) kmalloc(1024, GFP_KERNEL);
+        buf = kmalloc(1024, GFP_KERNEL);
         if (!buf)
                 return -ENOMEM;
         timeout = 0;
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index 097bfa7bc323..c4d438c17dab 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -2013,7 +2013,7 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
         strcpy(card->name, id);
         card->contrnr = contr;
         card->nbchan = profp->nbchannel;
-        card->bchans = (capidrv_bchan *) kmalloc(sizeof(capidrv_bchan) * card->nbchan, GFP_ATOMIC);
+        card->bchans = kmalloc(sizeof(capidrv_bchan) * card->nbchan, GFP_ATOMIC);
         if (!card->bchans) {
                 printk(KERN_WARNING
                 "capidrv: (%s) Could not allocate bchan-structs.\n", id);
diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c
index 399b316111f7..06967da7c4a8 100644
--- a/drivers/isdn/divert/divert_procfs.c
+++ b/drivers/isdn/divert/divert_procfs.c
@@ -45,7 +45,7 @@ put_info_buffer(char *cp)
                 return;
         if (!*cp)
                 return;
-        if (!(ib = (struct divert_info *) kmalloc(sizeof(struct divert_info) + strlen(cp), GFP_ATOMIC)))
+        if (!(ib = kmalloc(sizeof(struct divert_info) + strlen(cp), GFP_ATOMIC)))
                  return;        /* no memory */
         strcpy(ib->info_start, cp);     /* set output string */
         ib->next = NULL;
diff --git a/drivers/isdn/divert/isdn_divert.c b/drivers/isdn/divert/isdn_divert.c
index 03319ea5aa0c..7d97d54588d9 100644
--- a/drivers/isdn/divert/isdn_divert.c
+++ b/drivers/isdn/divert/isdn_divert.c
@@ -153,7 +153,7 @@ int cf_command(int drvid, int mode,
   *ielenp = p - ielenp - 1; /* set total IE length */ 
 
   /* allocate mem for information struct */  
-  if (!(cs = (struct call_struc *) kmalloc(sizeof(struct call_struc), GFP_ATOMIC))) 
+  if (!(cs = kmalloc(sizeof(struct call_struc), GFP_ATOMIC)))
              return(-ENOMEM); /* no memory */
   init_timer(&cs->timer);
   cs->info[0] = '\0';
@@ -276,7 +276,7 @@ int insertrule(int idx, divert_rule *newrule)
 { struct deflect_struc *ds,*ds1=NULL;
   unsigned long flags;
 
-  if (!(ds = (struct deflect_struc *) kmalloc(sizeof(struct deflect_struc), 
+  if (!(ds = kmalloc(sizeof(struct deflect_struc),
                                               GFP_KERNEL))) 
     return(-ENOMEM); /* no memory */
 
@@ -451,7 +451,7 @@ static int isdn_divert_icall(isdn_ctrl *ic)
            if (dv->rule.action == DEFLECT_PROCEED)
             if ((!if_used) || ((!extern_wait_max) && (!dv->rule.waittime))) 
               return(0); /* no external deflection needed */  
-           if (!(cs = (struct call_struc *) kmalloc(sizeof(struct call_struc), GFP_ATOMIC))) 
+           if (!(cs = kmalloc(sizeof(struct call_struc), GFP_ATOMIC)))
              return(0); /* no memory */
            init_timer(&cs->timer);
            cs->info[0] = '\0';
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 63b629b1cdb2..b5e7f9c7d74e 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -1853,20 +1853,24 @@ static int gigaset_write_cmd(struct cardstate *cs,
 {
         struct cmdbuf_t *cb;
         unsigned long flags;
-        int status;
+        int rc;
 
         gigaset_dbg_buffer(atomic_read(&cs->mstate) != MS_LOCKED ?
                              DEBUG_TRANSCMD : DEBUG_LOCKCMD,
                            "CMD Transmit", len, buf);
 
-        if (len <= 0)
-                return 0;                       /* nothing to do */
+        if (len <= 0) {
+                /* nothing to do */
+                rc = 0;
+                goto notqueued;
+        }
 
         if (len > IF_WRITEBUF)
                 len = IF_WRITEBUF;
         if (!(cb = kmalloc(sizeof(struct cmdbuf_t) + len, GFP_ATOMIC))) {
                 dev_err(cs->dev, "%s: out of memory\n", __func__);
-                return -ENOMEM;
+                rc = -ENOMEM;
+                goto notqueued;
         }
 
         memcpy(cb->buf, buf, len);
@@ -1891,11 +1895,21 @@ static int gigaset_write_cmd(struct cardstate *cs,
         if (unlikely(!cs->connected)) {
                 spin_unlock_irqrestore(&cs->lock, flags);
                 gig_dbg(DEBUG_USBREQ, "%s: not connected", __func__);
+                /* flush command queue */
+                spin_lock_irqsave(&cs->cmdlock, flags);
+                while (cs->cmdbuf != NULL)
+                        complete_cb(cs);
+                spin_unlock_irqrestore(&cs->cmdlock, flags);
                 return -ENODEV;
         }
-        status = start_cbsend(cs);
+        rc = start_cbsend(cs);
         spin_unlock_irqrestore(&cs->lock, flags);
-        return status < 0 ? status : len;
+        return rc < 0 ? rc : len;
+
+notqueued:                      /* request handled without queuing */
+        if (wake_tasklet)
+                tasklet_schedule(wake_tasklet);
+        return rc;
 }
 
 /* gigaset_write_room
@@ -1964,20 +1978,15 @@ static int gigaset_freebcshw(struct bc_state *bcs)
 
         /* kill URBs and tasklets before freeing - better safe than sorry */
         atomic_set(&ubc->running, 0);
-        for (i = 0; i < BAS_OUTURBS; ++i)
-                if (ubc->isoouturbs[i].urb) {
-                        gig_dbg(DEBUG_INIT, "%s: killing iso out URB %d",
-                                __func__, i);
-                        usb_kill_urb(ubc->isoouturbs[i].urb);
-                        usb_free_urb(ubc->isoouturbs[i].urb);
-                }
-        for (i = 0; i < BAS_INURBS; ++i)
-                if (ubc->isoinurbs[i]) {
-                        gig_dbg(DEBUG_INIT, "%s: killing iso in URB %d",
-                                __func__, i);
-                        usb_kill_urb(ubc->isoinurbs[i]);
-                        usb_free_urb(ubc->isoinurbs[i]);
-                }
+        gig_dbg(DEBUG_INIT, "%s: killing iso URBs", __func__);
+        for (i = 0; i < BAS_OUTURBS; ++i) {
+                usb_kill_urb(ubc->isoouturbs[i].urb);
+                usb_free_urb(ubc->isoouturbs[i].urb);
+        }
+        for (i = 0; i < BAS_INURBS; ++i) {
+                usb_kill_urb(ubc->isoinurbs[i]);
+                usb_free_urb(ubc->isoinurbs[i]);
+        }
         tasklet_kill(&ubc->sent_tasklet);
         tasklet_kill(&ubc->rcvd_tasklet);
         kfree(ubc->isooutbuf);
@@ -2099,55 +2108,32 @@ static void freeurbs(struct cardstate *cs)
         struct bas_bc_state *ubc;
         int i, j;
 
+        gig_dbg(DEBUG_INIT, "%s: killing URBs", __func__);
         for (j = 0; j < 2; ++j) {
                 ubc = cs->bcs[j].hw.bas;
-                for (i = 0; i < BAS_OUTURBS; ++i)
-                        if (ubc->isoouturbs[i].urb) {
-                                usb_kill_urb(ubc->isoouturbs[i].urb);
-                                gig_dbg(DEBUG_INIT,
-                                        "%s: isoc output URB %d/%d unlinked",
-                                        __func__, j, i);
-                                usb_free_urb(ubc->isoouturbs[i].urb);
-                                ubc->isoouturbs[i].urb = NULL;
-                        }
-                for (i = 0; i < BAS_INURBS; ++i)
-                        if (ubc->isoinurbs[i]) {
-                                usb_kill_urb(ubc->isoinurbs[i]);
-                                gig_dbg(DEBUG_INIT,
-                                        "%s: isoc input URB %d/%d unlinked",
-                                        __func__, j, i);
-                                usb_free_urb(ubc->isoinurbs[i]);
-                                ubc->isoinurbs[i] = NULL;
-                        }
-        }
-        if (ucs->urb_int_in) {
-                usb_kill_urb(ucs->urb_int_in);
-                gig_dbg(DEBUG_INIT, "%s: interrupt input URB unlinked",
-                        __func__);
-                usb_free_urb(ucs->urb_int_in);
-                ucs->urb_int_in = NULL;
-        }
-        if (ucs->urb_cmd_out) {
-                usb_kill_urb(ucs->urb_cmd_out);
-                gig_dbg(DEBUG_INIT, "%s: command output URB unlinked",
-                        __func__);
-                usb_free_urb(ucs->urb_cmd_out);
-                ucs->urb_cmd_out = NULL;
-        }
-        if (ucs->urb_cmd_in) {
-                usb_kill_urb(ucs->urb_cmd_in);
-                gig_dbg(DEBUG_INIT, "%s: command input URB unlinked",
-                        __func__);
-                usb_free_urb(ucs->urb_cmd_in);
-                ucs->urb_cmd_in = NULL;
-        }
-        if (ucs->urb_ctrl) {
-                usb_kill_urb(ucs->urb_ctrl);
-                gig_dbg(DEBUG_INIT, "%s: control output URB unlinked",
-                        __func__);
-                usb_free_urb(ucs->urb_ctrl);
-                ucs->urb_ctrl = NULL;
+                for (i = 0; i < BAS_OUTURBS; ++i) {
+                        usb_kill_urb(ubc->isoouturbs[i].urb);
+                        usb_free_urb(ubc->isoouturbs[i].urb);
+                        ubc->isoouturbs[i].urb = NULL;
+                }
+                for (i = 0; i < BAS_INURBS; ++i) {
+                        usb_kill_urb(ubc->isoinurbs[i]);
+                        usb_free_urb(ubc->isoinurbs[i]);
+                        ubc->isoinurbs[i] = NULL;
+                }
         }
+        usb_kill_urb(ucs->urb_int_in);
+        usb_free_urb(ucs->urb_int_in);
+        ucs->urb_int_in = NULL;
+        usb_kill_urb(ucs->urb_cmd_out);
+        usb_free_urb(ucs->urb_cmd_out);
+        ucs->urb_cmd_out = NULL;
+        usb_kill_urb(ucs->urb_cmd_in);
+        usb_free_urb(ucs->urb_cmd_in);
+        ucs->urb_cmd_in = NULL;
+        usb_kill_urb(ucs->urb_ctrl);
+        usb_free_urb(ucs->urb_ctrl);
+        ucs->urb_ctrl = NULL;
 }
 
 /* gigaset_probe
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c
index 8e2b03889f3c..94a935089119 100644
--- a/drivers/isdn/hysdn/hysdn_procconf.c
+++ b/drivers/isdn/hysdn/hysdn_procconf.c
@@ -275,7 +275,7 @@ hysdn_conf_open(struct inode *ino, struct file *filep)
         } else if ((filep->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ) {
                 /* read access -> output card info data */
 
-                if (!(tmp = (char *) kmalloc(INFO_OUT_LEN * 2 + 2, GFP_KERNEL))) {
+                if (!(tmp = kmalloc(INFO_OUT_LEN * 2 + 2, GFP_KERNEL))) {
                         unlock_kernel();
                         return (-EFAULT);       /* out of memory */
                 }
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index f241f5e551cb..375d956884d7 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -111,7 +111,7 @@ put_log_buffer(hysdn_card * card, char *cp)
         if (pd->if_used <= 0)
                 return;         /* no open file for read */
 
-        if (!(ib = (struct log_data *) kmalloc(sizeof(struct log_data) + strlen(cp), GFP_ATOMIC)))
+        if (!(ib = kmalloc(sizeof(struct log_data) + strlen(cp), GFP_ATOMIC)))
                  return;        /* no memory */
         strcpy(ib->log_start, cp);      /* set output string */
         ib->next = NULL;
diff --git a/drivers/isdn/i4l/isdn_audio.c b/drivers/isdn/i4l/isdn_audio.c
index 2cc56d6a9fae..fb350c567c6b 100644
--- a/drivers/isdn/i4l/isdn_audio.c
+++ b/drivers/isdn/i4l/isdn_audio.c
@@ -328,7 +328,7 @@ adpcm_state *
 isdn_audio_adpcm_init(adpcm_state * s, int nbits)
 {
         if (!s)
-                s = (adpcm_state *) kmalloc(sizeof(adpcm_state), GFP_ATOMIC);
+                s = kmalloc(sizeof(adpcm_state), GFP_ATOMIC);
         if (s) {
                 s->a = 0;
                 s->d = 5;
@@ -343,7 +343,7 @@ dtmf_state *
 isdn_audio_dtmf_init(dtmf_state * s)
 {
         if (!s)
-                s = (dtmf_state *) kmalloc(sizeof(dtmf_state), GFP_ATOMIC);
+                s = kmalloc(sizeof(dtmf_state), GFP_ATOMIC);
         if (s) {
                 s->idx = 0;
                 s->last = ' ';
@@ -621,7 +621,7 @@ silence_state *
 isdn_audio_silence_init(silence_state * s)
 {
         if (!s)
-                s = (silence_state *) kmalloc(sizeof(silence_state), GFP_ATOMIC);
+                s = kmalloc(sizeof(silence_state), GFP_ATOMIC);
         if (s) {
                 s->idx = 0;
                 s->state = 0;
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index c36c817578cb..838b3734e2b6 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -2948,7 +2948,7 @@ isdn_net_addphone(isdn_net_ioctl_phone * phone)
         isdn_net_phone *n;
 
         if (p) {
-                if (!(n = (isdn_net_phone *) kmalloc(sizeof(isdn_net_phone), GFP_KERNEL)))
+                if (!(n = kmalloc(sizeof(isdn_net_phone), GFP_KERNEL)))
                         return -ENOMEM;
                 strcpy(n->num, phone->phone);
                 n->next = p->local->phone[phone->outgoing & 1];
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 43811795b46b..1726131b20be 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -717,7 +717,7 @@ isdn_ppp_fill_rq(unsigned char *buf, int len, int proto, int slot)
                 printk(KERN_DEBUG "ippp: device not activated.\n");
                 return 0;
         }
-        nbuf = (unsigned char *) kmalloc(len + 4, GFP_ATOMIC);
+        nbuf = kmalloc(len + 4, GFP_ATOMIC);
         if (!nbuf) {
                 printk(KERN_WARNING "ippp: Can't alloc buf\n");
                 return 0;
diff --git a/drivers/isdn/pcbit/layer2.c b/drivers/isdn/pcbit/layer2.c
index 6ff85574e941..eafcce5e656a 100644
--- a/drivers/isdn/pcbit/layer2.c
+++ b/drivers/isdn/pcbit/layer2.c
@@ -100,7 +100,7 @@ pcbit_l2_write(struct pcbit_dev *dev, ulong msg, ushort refnum,
                 dev_kfree_skb(skb);
                 return -1;
         }
-        if ((frame = (struct frame_buf *) kmalloc(sizeof(struct frame_buf),
+        if ((frame = kmalloc(sizeof(struct frame_buf),
                                                   GFP_ATOMIC)) == NULL) {
                 printk(KERN_WARNING "pcbit_2_write: kmalloc failed\n");
                 dev_kfree_skb(skb);
diff --git a/drivers/kvm/Kconfig b/drivers/kvm/Kconfig
index 36412e90f09b..703cc88d1ef9 100644
--- a/drivers/kvm/Kconfig
+++ b/drivers/kvm/Kconfig
@@ -1,6 +1,8 @@
 #
 # KVM configuration
 #
+menu "Virtualization"
+
 config KVM
         tristate "Kernel-based Virtual Machine (KVM) support"
         depends on X86 && EXPERIMENTAL
@@ -31,3 +33,5 @@ config KVM_AMD
         ---help---
           Provides support for KVM on AMD processors equipped with the AMD-V
           (SVM) extensions.
+
+endmenu
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
index 5785d0870ab6..930e04ce1af6 100644
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -140,7 +140,7 @@ enum {
         VCPU_REGS_RBP = 5,
         VCPU_REGS_RSI = 6,
         VCPU_REGS_RDI = 7,
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         VCPU_REGS_R8 = 8,
         VCPU_REGS_R9 = 9,
         VCPU_REGS_R10 = 10,
@@ -375,7 +375,7 @@ void set_cr4(struct kvm_vcpu *vcpu, unsigned long cr0);
 void set_cr8(struct kvm_vcpu *vcpu, unsigned long cr0);
 void lmsw(struct kvm_vcpu *vcpu, unsigned long msw);
 
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
 void set_efer(struct kvm_vcpu *vcpu, u64 efer);
 #endif
 
@@ -485,7 +485,7 @@ static inline unsigned long read_tr_base(void)
         return segment_base(tr);
 }
 
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
 static inline unsigned long read_msr(unsigned long msr)
 {
         u64 value;
@@ -533,7 +533,7 @@ static inline u32 get_rdx_init_val(void)
 #define TSS_REDIRECTION_SIZE (256 / 8)
 #define RMODE_TSS_SIZE (TSS_BASE_SIZE + TSS_REDIRECTION_SIZE + TSS_IOPB_SIZE + 1)
 
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
 
 /*
  * When emulating 32-bit mode, cr3 is only 32 bits even on x86_64.  Therefore
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index b6b8a41b5ec8..fd1bb870545c 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -72,18 +72,7 @@ static struct dentry *debugfs_dir;
 #define CR8_RESEVED_BITS (~0x0fULL)
 #define EFER_RESERVED_BITS 0xfffffffffffff2fe
 
-struct vmx_msr_entry *find_msr_entry(struct kvm_vcpu *vcpu, u32 msr)
-{
-        int i;
-
-        for (i = 0; i < vcpu->nmsrs; ++i)
-                if (vcpu->guest_msrs[i].index == msr)
-                        return &vcpu->guest_msrs[i];
-        return 0;
-}
-EXPORT_SYMBOL_GPL(find_msr_entry);
-
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
 // LDT or TSS descriptor in the GDT. 16 bytes.
 struct segment_descriptor_64 {
         struct segment_descriptor s;
@@ -115,7 +104,7 @@ unsigned long segment_base(u16 selector)
         }
         d = (struct segment_descriptor *)(table_base + (selector & ~7));
         v = d->base_low | ((ul)d->base_mid << 16) | ((ul)d->base_high << 24);
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         if (d->system == 0
             && (d->type == 2 || d->type == 9 || d->type == 11))
                 v |= ((ul)((struct segment_descriptor_64 *)d)->base_higher) << 32;
@@ -216,7 +205,6 @@ static struct kvm_vcpu *vcpu_load(struct kvm *kvm, int vcpu_slot)
 static void vcpu_put(struct kvm_vcpu *vcpu)
 {
         kvm_arch_ops->vcpu_put(vcpu);
-        put_cpu();
         mutex_unlock(&vcpu->mutex);
 }
 
@@ -351,7 +339,7 @@ void set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
         }
 
         if (!is_paging(vcpu) && (cr0 & CR0_PG_MASK)) {
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
                 if ((vcpu->shadow_efer & EFER_LME)) {
                         int cs_db, cs_l;
 
@@ -1120,12 +1108,10 @@ static int get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)
         return kvm_arch_ops->get_msr(vcpu, msr_index, pdata);
 }
 
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
 
 void set_efer(struct kvm_vcpu *vcpu, u64 efer)
 {
-        struct vmx_msr_entry *msr;
-
         if (efer & EFER_RESERVED_BITS) {
                 printk(KERN_DEBUG "set_efer: 0x%llx #GP, reserved bits\n",
                        efer);
@@ -1140,16 +1126,12 @@ void set_efer(struct kvm_vcpu *vcpu, u64 efer)
                 return;
         }
 
+        kvm_arch_ops->set_efer(vcpu, efer);
+
         efer &= ~EFER_LMA;
         efer |= vcpu->shadow_efer & EFER_LMA;
 
         vcpu->shadow_efer = efer;
-
-        msr = find_msr_entry(vcpu, MSR_EFER);
-
-        if (!(efer & EFER_LMA))
-            efer &= ~EFER_LME;
-        msr->data = efer;
 }
 EXPORT_SYMBOL_GPL(set_efer);
 
@@ -1243,7 +1225,7 @@ static int kvm_dev_ioctl_get_regs(struct kvm *kvm, struct kvm_regs *regs)
         regs->rdi = vcpu->regs[VCPU_REGS_RDI];
         regs->rsp = vcpu->regs[VCPU_REGS_RSP];
         regs->rbp = vcpu->regs[VCPU_REGS_RBP];
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         regs->r8 = vcpu->regs[VCPU_REGS_R8];
         regs->r9 = vcpu->regs[VCPU_REGS_R9];
         regs->r10 = vcpu->regs[VCPU_REGS_R10];
@@ -1287,7 +1269,7 @@ static int kvm_dev_ioctl_set_regs(struct kvm *kvm, struct kvm_regs *regs)
         vcpu->regs[VCPU_REGS_RDI] = regs->rdi;
         vcpu->regs[VCPU_REGS_RSP] = regs->rsp;
         vcpu->regs[VCPU_REGS_RBP] = regs->rbp;
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         vcpu->regs[VCPU_REGS_R8] = regs->r8;
         vcpu->regs[VCPU_REGS_R9] = regs->r9;
         vcpu->regs[VCPU_REGS_R10] = regs->r10;
@@ -1401,7 +1383,7 @@ static int kvm_dev_ioctl_set_sregs(struct kvm *kvm, struct kvm_sregs *sregs)
         vcpu->cr8 = sregs->cr8;
 
         mmu_reset_needed |= vcpu->shadow_efer != sregs->efer;
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         kvm_arch_ops->set_efer(vcpu, sregs->efer);
 #endif
         vcpu->apic_base = sregs->apic_base;
@@ -1434,7 +1416,7 @@ static int kvm_dev_ioctl_set_sregs(struct kvm *kvm, struct kvm_sregs *sregs)
 static u32 msrs_to_save[] = {
         MSR_IA32_SYSENTER_CS, MSR_IA32_SYSENTER_ESP, MSR_IA32_SYSENTER_EIP,
         MSR_K6_STAR,
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         MSR_CSTAR, MSR_KERNEL_GS_BASE, MSR_SYSCALL_MASK, MSR_LSTAR,
 #endif
         MSR_IA32_TIME_STAMP_COUNTER,
diff --git a/drivers/kvm/kvm_svm.h b/drivers/kvm/kvm_svm.h
index 7d7f2aa10960..74cc862f4935 100644
--- a/drivers/kvm/kvm_svm.h
+++ b/drivers/kvm/kvm_svm.h
@@ -9,7 +9,7 @@
 #include "kvm.h"
 
 static const u32 host_save_msrs[] = {
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         MSR_STAR, MSR_LSTAR, MSR_CSTAR, MSR_SYSCALL_MASK, MSR_KERNEL_GS_BASE,
         MSR_FS_BASE, MSR_GS_BASE,
 #endif
diff --git a/drivers/kvm/kvm_vmx.h b/drivers/kvm/kvm_vmx.h
index 87e12d2bfa16..d139f73fb6e1 100644
--- a/drivers/kvm/kvm_vmx.h
+++ b/drivers/kvm/kvm_vmx.h
@@ -1,7 +1,7 @@
 #ifndef __KVM_VMX_H
 #define __KVM_VMX_H
 
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
 /*
  * avoid save/load MSR_SYSCALL_MASK and MSR_LSTAR by std vt
  * mechanism (cpu bug AA24)
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
index 4e29d9b7211c..3d367cbfe1f9 100644
--- a/drivers/kvm/mmu.c
+++ b/drivers/kvm/mmu.c
@@ -61,22 +61,9 @@
 
 
 #define PT32_PTE_COPY_MASK \
-        (PT_PRESENT_MASK | PT_PWT_MASK | PT_PCD_MASK | \
-        PT_ACCESSED_MASK | PT_DIRTY_MASK | PT_PAT_MASK | \
-        PT_GLOBAL_MASK )
-
-#define PT32_NON_PTE_COPY_MASK \
-        (PT_PRESENT_MASK | PT_PWT_MASK | PT_PCD_MASK | \
-        PT_ACCESSED_MASK | PT_DIRTY_MASK)
-
-
-#define PT64_PTE_COPY_MASK \
-        (PT64_NX_MASK | PT32_PTE_COPY_MASK)
-
-#define PT64_NON_PTE_COPY_MASK \
-        (PT64_NX_MASK | PT32_NON_PTE_COPY_MASK)
-
+        (PT_PRESENT_MASK | PT_ACCESSED_MASK | PT_DIRTY_MASK | PT_GLOBAL_MASK)
 
+#define PT64_PTE_COPY_MASK (PT64_NX_MASK | PT32_PTE_COPY_MASK)
 
 #define PT_FIRST_AVAIL_BITS_SHIFT 9
 #define PT64_SECOND_AVAIL_BITS_SHIFT 52
diff --git a/drivers/kvm/paging_tmpl.h b/drivers/kvm/paging_tmpl.h
index 765c2e1a048e..a9771b4c5bb8 100644
--- a/drivers/kvm/paging_tmpl.h
+++ b/drivers/kvm/paging_tmpl.h
@@ -32,7 +32,6 @@
         #define SHADOW_PT_INDEX(addr, level) PT64_INDEX(addr, level)
         #define PT_LEVEL_MASK(level) PT64_LEVEL_MASK(level)
         #define PT_PTE_COPY_MASK PT64_PTE_COPY_MASK
-        #define PT_NON_PTE_COPY_MASK PT64_NON_PTE_COPY_MASK
 #elif PTTYPE == 32
         #define pt_element_t u32
         #define guest_walker guest_walker32
@@ -43,7 +42,6 @@
         #define SHADOW_PT_INDEX(addr, level) PT64_INDEX(addr, level)
         #define PT_LEVEL_MASK(level) PT32_LEVEL_MASK(level)
         #define PT_PTE_COPY_MASK PT32_PTE_COPY_MASK
-        #define PT_NON_PTE_COPY_MASK PT32_NON_PTE_COPY_MASK
 #else
         #error Invalid PTTYPE value
 #endif
@@ -105,9 +103,7 @@ static void FNAME(set_pde)(struct kvm_vcpu *vcpu, u64 guest_pde,
         if (PTTYPE == 32 && is_cpuid_PSE36())
                 gaddr |= (guest_pde & PT32_DIR_PSE36_MASK) <<
                         (32 - PT32_DIR_PSE36_SHIFT);
-        *shadow_pte = (guest_pde & (PT_NON_PTE_COPY_MASK | PT_GLOBAL_MASK)) |
-                          ((guest_pde & PT_DIR_PAT_MASK) >>
-                                    (PT_DIR_PAT_SHIFT - PT_PAT_SHIFT));
+        *shadow_pte = guest_pde & PT_PTE_COPY_MASK;
         set_pte_common(vcpu, shadow_pte, gaddr,
                        guest_pde & PT_DIRTY_MASK, access_bits);
 }
@@ -162,6 +158,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
                 u32 index = SHADOW_PT_INDEX(addr, level);
                 u64 *shadow_ent = ((u64 *)__va(shadow_addr)) + index;
                 pt_element_t *guest_ent;
+                u64 shadow_pte;
 
                 if (is_present_pte(*shadow_ent) || is_io_pte(*shadow_ent)) {
                         if (level == PT_PAGE_TABLE_LEVEL)
@@ -204,14 +201,11 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
                 shadow_addr = kvm_mmu_alloc_page(vcpu, shadow_ent);
                 if (!VALID_PAGE(shadow_addr))
                         return ERR_PTR(-ENOMEM);
-                if (!kvm_arch_ops->is_long_mode(vcpu) && level == 3)
-                        *shadow_ent = shadow_addr |
-                                (*guest_ent & (PT_PRESENT_MASK | PT_PWT_MASK | PT_PCD_MASK));
-                else {
-                        *shadow_ent = shadow_addr |
-                                (*guest_ent & PT_NON_PTE_COPY_MASK);
-                        *shadow_ent |= (PT_WRITABLE_MASK | PT_USER_MASK);
-                }
+                shadow_pte = shadow_addr | PT_PRESENT_MASK;
+                if (vcpu->mmu.root_level > 3 || level != 3)
+                        shadow_pte |= PT_ACCESSED_MASK
+                                | PT_WRITABLE_MASK | PT_USER_MASK;
+                *shadow_ent = shadow_pte;
                 prev_shadow_ent = shadow_ent;
         }
 }
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c
index a33a89c68138..0e6bc8c649ce 100644
--- a/drivers/kvm/svm.c
+++ b/drivers/kvm/svm.c
@@ -287,7 +287,7 @@ static void svm_hardware_enable(void *garbage)
 
         struct svm_cpu_data *svm_data;
         uint64_t efer;
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         struct desc_ptr gdt_descr;
 #else
         struct Xgt_desc_struct gdt_descr;
@@ -377,6 +377,7 @@ static __init int svm_hardware_setup(void)
         void *msrpm_va;
         int r;
 
+        kvm_emulator_want_group7_invlpg();
 
         iopm_pages = alloc_pages(GFP_KERNEL, IOPM_ALLOC_ORDER);
 
@@ -397,7 +398,7 @@ static __init int svm_hardware_setup(void)
         memset(msrpm_va, 0xff, PAGE_SIZE * (1 << MSRPM_ALLOC_ORDER));
         msrpm_base = page_to_pfn(msrpm_pages) << PAGE_SHIFT;
 
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         set_msr_interception(msrpm_va, MSR_GS_BASE, 1, 1);
         set_msr_interception(msrpm_va, MSR_FS_BASE, 1, 1);
         set_msr_interception(msrpm_va, MSR_KERNEL_GS_BASE, 1, 1);
@@ -704,7 +705,7 @@ static void svm_set_gdt(struct kvm_vcpu *vcpu, struct descriptor_table *dt)
 
 static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
 {
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         if (vcpu->shadow_efer & KVM_EFER_LME) {
                 if (!is_paging(vcpu) && (cr0 & CR0_PG_MASK)) {
                         vcpu->shadow_efer |= KVM_EFER_LMA;
@@ -1097,7 +1098,7 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data)
         case MSR_IA32_APICBASE:
                 *data = vcpu->apic_base;
                 break;
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         case MSR_STAR:
                 *data = vcpu->svm->vmcb->save.star;
                 break;
@@ -1149,7 +1150,7 @@ static int rdmsr_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data)
 {
         switch (ecx) {
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         case MSR_EFER:
                 set_efer(vcpu, data);
                 break;
@@ -1172,7 +1173,7 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data)
         case MSR_IA32_APICBASE:
                 vcpu->apic_base = data;
                 break;
-#ifdef __x86_64___
+#ifdef CONFIG_X86_64_
         case MSR_STAR:
                 vcpu->svm->vmcb->save.star = data;
                 break;
@@ -1345,53 +1346,18 @@ static void kvm_reput_irq(struct kvm_vcpu *vcpu)
 
 static void save_db_regs(unsigned long *db_regs)
 {
-#ifdef __x86_64__
-        asm ("mov %%dr0, %%rax \n\t"
-             "mov %%rax, %[dr0] \n\t"
-             "mov %%dr1, %%rax \n\t"
-             "mov %%rax, %[dr1] \n\t"
-             "mov %%dr2, %%rax \n\t"
-             "mov %%rax, %[dr2] \n\t"
-             "mov %%dr3, %%rax \n\t"
-             "mov %%rax, %[dr3] \n\t"
-             : [dr0] "=m"(db_regs[0]),
-               [dr1] "=m"(db_regs[1]),
-               [dr2] "=m"(db_regs[2]),
-               [dr3] "=m"(db_regs[3])
-             : : "rax");
-#else
-        asm ("mov %%dr0, %%eax \n\t"
-             "mov %%eax, %[dr0] \n\t"
-             "mov %%dr1, %%eax \n\t"
-             "mov %%eax, %[dr1] \n\t"
-             "mov %%dr2, %%eax \n\t"
-             "mov %%eax, %[dr2] \n\t"
-             "mov %%dr3, %%eax \n\t"
-             "mov %%eax, %[dr3] \n\t"
-             : [dr0] "=m"(db_regs[0]),
-               [dr1] "=m"(db_regs[1]),
-               [dr2] "=m"(db_regs[2]),
-               [dr3] "=m"(db_regs[3])
-             : : "eax");
-#endif
+        asm volatile ("mov %%dr0, %0" : "=r"(db_regs[0]));
+        asm volatile ("mov %%dr1, %0" : "=r"(db_regs[1]));
+        asm volatile ("mov %%dr2, %0" : "=r"(db_regs[2]));
+        asm volatile ("mov %%dr3, %0" : "=r"(db_regs[3]));
 }
 
 static void load_db_regs(unsigned long *db_regs)
 {
-        asm volatile ("mov %[dr0], %%dr0 \n\t"
-             "mov %[dr1], %%dr1 \n\t"
-             "mov %[dr2], %%dr2 \n\t"
-             "mov %[dr3], %%dr3 \n\t"
-             :
-             : [dr0] "r"(db_regs[0]),
-               [dr1] "r"(db_regs[1]),
-               [dr2] "r"(db_regs[2]),
-               [dr3] "r"(db_regs[3])
-#ifdef __x86_64__
-             : "rax");
-#else
-             : "eax");
-#endif
+        asm volatile ("mov %0, %%dr0" : : "r"(db_regs[0]));
+        asm volatile ("mov %0, %%dr1" : : "r"(db_regs[1]));
+        asm volatile ("mov %0, %%dr2" : : "r"(db_regs[2]));
+        asm volatile ("mov %0, %%dr3" : : "r"(db_regs[3]));
 }
 
 static int svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
@@ -1422,7 +1388,7 @@ again:
                 load_db_regs(vcpu->svm->db_regs);
         }
         asm volatile (
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
                 "push %%rbx; push %%rcx; push %%rdx;"
                 "push %%rsi; push %%rdi; push %%rbp;"
                 "push %%r8;  push %%r9;  push %%r10; push %%r11;"
@@ -1432,7 +1398,7 @@ again:
                 "push %%esi; push %%edi; push %%ebp;"
 #endif
 
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
                 "mov %c[rbx](%[vcpu]), %%rbx \n\t"
                 "mov %c[rcx](%[vcpu]), %%rcx \n\t"
                 "mov %c[rdx](%[vcpu]), %%rdx \n\t"
@@ -1456,7 +1422,7 @@ again:
                 "mov %c[rbp](%[vcpu]), %%ebp \n\t"
 #endif
 
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
                 /* Enter guest mode */
                 "push %%rax \n\t"
                 "mov %c[svm](%[vcpu]), %%rax \n\t"
@@ -1477,7 +1443,7 @@ again:
 #endif
 
                 /* Save guest registers, load host registers */
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
                 "mov %%rbx, %c[rbx](%[vcpu]) \n\t"
                 "mov %%rcx, %c[rcx](%[vcpu]) \n\t"
                 "mov %%rdx, %c[rdx](%[vcpu]) \n\t"
@@ -1518,7 +1484,7 @@ again:
                   [rsi]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_RSI])),
                   [rdi]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_RDI])),
                   [rbp]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_RBP]))
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
                   ,[r8 ]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_R8 ])),
                   [r9 ]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_R9 ])),
                   [r10]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_R10])),
@@ -1663,9 +1629,7 @@ static struct kvm_arch_ops svm_arch_ops = {
 
 static int __init svm_init(void)
 {
-        kvm_emulator_want_group7_invlpg();
-        kvm_init_arch(&svm_arch_ops, THIS_MODULE);
-        return 0;
+        return kvm_init_arch(&svm_arch_ops, THIS_MODULE);
 }
 
 static void __exit svm_exit(void)
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index bda7a7ae2167..f0f0b1a781f8 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -22,6 +22,7 @@
 #include <linux/mm.h>
 #include <linux/highmem.h>
 #include <asm/io.h>
+#include <asm/desc.h>
 
 #include "segment_descriptor.h"
 
@@ -33,7 +34,7 @@ MODULE_LICENSE("GPL");
 static DEFINE_PER_CPU(struct vmcs *, vmxarea);
 static DEFINE_PER_CPU(struct vmcs *, current_vmcs);
 
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
 #define HOST_IS_64 1
 #else
 #define HOST_IS_64 0
@@ -70,15 +71,13 @@ static struct kvm_vmx_segment_field {
 };
 
 static const u32 vmx_msr_index[] = {
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         MSR_SYSCALL_MASK, MSR_LSTAR, MSR_CSTAR, MSR_KERNEL_GS_BASE,
 #endif
         MSR_EFER, MSR_K6_STAR,
 };
 #define NR_VMX_MSR (sizeof(vmx_msr_index) / sizeof(*vmx_msr_index))
 
-struct vmx_msr_entry *find_msr_entry(struct kvm_vcpu *vcpu, u32 msr);
-
 static inline int is_page_fault(u32 intr_info)
 {
         return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VECTOR_MASK |
@@ -92,6 +91,16 @@ static inline int is_external_interrupt(u32 intr_info)
                 == (INTR_TYPE_EXT_INTR | INTR_INFO_VALID_MASK);
 }
 
+static struct vmx_msr_entry *find_msr_entry(struct kvm_vcpu *vcpu, u32 msr)
+{
+        int i;
+
+        for (i = 0; i < vcpu->nmsrs; ++i)
+                if (vcpu->guest_msrs[i].index == msr)
+                        return &vcpu->guest_msrs[i];
+        return 0;
+}
+
 static void vmcs_clear(struct vmcs *vmcs)
 {
         u64 phys_addr = __pa(vmcs);
@@ -137,7 +146,7 @@ static u32 vmcs_read32(unsigned long field)
 
 static u64 vmcs_read64(unsigned long field)
 {
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         return vmcs_readl(field);
 #else
         return vmcs_readl(field) | ((u64)vmcs_readl(field+1) << 32);
@@ -167,7 +176,7 @@ static void vmcs_write32(unsigned long field, u32 value)
 
 static void vmcs_write64(unsigned long field, u64 value)
 {
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         vmcs_writel(field, value);
 #else
         vmcs_writel(field, value);
@@ -296,7 +305,7 @@ static void guest_write_tsc(u64 guest_tsc)
 
 static void reload_tss(void)
 {
-#ifndef __x86_64__
+#ifndef CONFIG_X86_64
 
         /*
          * VT restores TR but not its size.  Useless.
@@ -327,7 +336,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)
         }
 
         switch (msr_index) {
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         case MSR_FS_BASE:
                 data = vmcs_readl(GUEST_FS_BASE);
                 break;
@@ -390,7 +399,7 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)
 {
         struct vmx_msr_entry *msr;
         switch (msr_index) {
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         case MSR_FS_BASE:
                 vmcs_writel(GUEST_FS_BASE, data);
                 break;
@@ -525,7 +534,7 @@ static __init void hardware_enable(void *garbage)
         u64 old;
 
         rdmsrl(MSR_IA32_FEATURE_CONTROL, old);
-        if ((old & 5) == 0)
+        if ((old & 5) != 5)
                 /* enable and lock */
                 wrmsrl(MSR_IA32_FEATURE_CONTROL, old | 5);
         write_cr4(read_cr4() | CR4_VMXE); /* FIXME: not cpu hotplug safe */
@@ -725,7 +734,7 @@ static void enter_rmode(struct kvm_vcpu *vcpu)
         fix_rmode_seg(VCPU_SREG_FS, &vcpu->rmode.fs);
 }
 
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
 
 static void enter_lmode(struct kvm_vcpu *vcpu)
 {
@@ -767,7 +776,7 @@ static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
         if (!vcpu->rmode.active && !(cr0 & CR0_PE_MASK))
                 enter_rmode(vcpu);
 
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         if (vcpu->shadow_efer & EFER_LME) {
                 if (!is_paging(vcpu) && (cr0 & CR0_PG_MASK))
                         enter_lmode(vcpu);
@@ -808,7 +817,7 @@ static void vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
         vcpu->cr4 = cr4;
 }
 
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
 
 static void vmx_set_efer(struct kvm_vcpu *vcpu, u64 efer)
 {
@@ -883,6 +892,8 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu,
                 ar |= (var->db & 1) << 14;
                 ar |= (var->g & 1) << 15;
         }
+        if (ar == 0) /* a 0 value means unusable */
+                ar = AR_UNUSABLE_MASK;
         vmcs_write32(sf->ar_bytes, ar);
 }
 
@@ -1095,7 +1106,7 @@ static int vmx_vcpu_setup(struct kvm_vcpu *vcpu)
         vmcs_write16(HOST_FS_SELECTOR, read_fs());    /* 22.2.4 */
         vmcs_write16(HOST_GS_SELECTOR, read_gs());    /* 22.2.4 */
         vmcs_write16(HOST_SS_SELECTOR, __KERNEL_DS);  /* 22.2.4 */
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         rdmsrl(MSR_FS_BASE, a);
         vmcs_writel(HOST_FS_BASE, a); /* 22.2.4 */
         rdmsrl(MSR_GS_BASE, a);
@@ -1164,8 +1175,10 @@ static int vmx_vcpu_setup(struct kvm_vcpu *vcpu)
                                VM_ENTRY_CONTROLS, 0);
         vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, 0);  /* 22.2.1 */
 
+#ifdef CONFIG_X86_64
         vmcs_writel(VIRTUAL_APIC_PAGE_ADDR, 0);
         vmcs_writel(TPR_THRESHOLD, 0);
+#endif
 
         vmcs_writel(CR0_GUEST_HOST_MASK, KVM_GUEST_CR0_MASK);
         vmcs_writel(CR4_GUEST_HOST_MASK, KVM_GUEST_CR4_MASK);
@@ -1173,7 +1186,7 @@ static int vmx_vcpu_setup(struct kvm_vcpu *vcpu)
         vcpu->cr0 = 0x60000010;
         vmx_set_cr0(vcpu, vcpu->cr0); // enter rmode
         vmx_set_cr4(vcpu, 0);
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         vmx_set_efer(vcpu, 0);
 #endif
 
@@ -1689,7 +1702,7 @@ again:
                 vmcs_write16(HOST_GS_SELECTOR, 0);
         }
 
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         vmcs_writel(HOST_FS_BASE, read_msr(MSR_FS_BASE));
         vmcs_writel(HOST_GS_BASE, read_msr(MSR_GS_BASE));
 #else
@@ -1713,7 +1726,7 @@ again:
         asm (
                 /* Store host registers */
                 "pushf \n\t"
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
                 "push %%rax; push %%rbx; push %%rdx;"
                 "push %%rsi; push %%rdi; push %%rbp;"
                 "push %%r8;  push %%r9;  push %%r10; push %%r11;"
@@ -1727,7 +1740,7 @@ again:
                 /* Check if vmlaunch of vmresume is needed */
                 "cmp $0, %1 \n\t"
                 /* Load guest registers.  Don't clobber flags. */
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
                 "mov %c[cr2](%3), %%rax \n\t"
                 "mov %%rax, %%cr2 \n\t"
                 "mov %c[rax](%3), %%rax \n\t"
@@ -1764,7 +1777,7 @@ again:
                 ".globl kvm_vmx_return \n\t"
                 "kvm_vmx_return: "
                 /* Save guest registers, load host registers, keep flags */
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
                 "xchg %3,     0(%%rsp) \n\t"
                 "mov %%rax, %c[rax](%3) \n\t"
                 "mov %%rbx, %c[rbx](%3) \n\t"
@@ -1816,7 +1829,7 @@ again:
                 [rsi]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_RSI])),
                 [rdi]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_RDI])),
                 [rbp]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_RBP])),
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
                 [r8 ]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_R8 ])),
                 [r9 ]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_R9 ])),
                 [r10]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_R10])),
@@ -1837,7 +1850,7 @@ again:
         fx_save(vcpu->guest_fx_image);
         fx_restore(vcpu->host_fx_image);
 
-#ifndef __x86_64__
+#ifndef CONFIG_X86_64
         asm ("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
 #endif
 
@@ -1855,7 +1868,7 @@ again:
                          */
                         local_irq_disable();
                         load_gs(gs_sel);
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
                         wrmsrl(MSR_GS_BASE, vmcs_readl(HOST_GS_BASE));
 #endif
                         local_irq_enable();
@@ -1965,7 +1978,7 @@ static struct kvm_arch_ops vmx_arch_ops = {
         .set_cr0_no_modeswitch = vmx_set_cr0_no_modeswitch,
         .set_cr3 = vmx_set_cr3,
         .set_cr4 = vmx_set_cr4,
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         .set_efer = vmx_set_efer,
 #endif
         .get_idt = vmx_get_idt,
@@ -1989,8 +2002,7 @@ static struct kvm_arch_ops vmx_arch_ops = {
 
 static int __init vmx_init(void)
 {
-        kvm_init_arch(&vmx_arch_ops, THIS_MODULE);
-        return 0;
+        return kvm_init_arch(&vmx_arch_ops, THIS_MODULE);
 }
 
 static void __exit vmx_exit(void)
diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c
index 7e838bf0592d..1bff3e925fda 100644
--- a/drivers/kvm/x86_emulate.c
+++ b/drivers/kvm/x86_emulate.c
@@ -238,7 +238,7 @@ struct operand {
  * any modified flags.
  */
 
-#if defined(__x86_64__)
+#if defined(CONFIG_X86_64)
 #define _LO32 "k"               /* force 32-bit operand */
 #define _STK  "%%rsp"           /* stack pointer */
 #elif defined(__i386__)
@@ -385,7 +385,7 @@ struct operand {
         } while (0)
 
 /* Emulate an instruction with quadword operands (x86/64 only). */
-#if defined(__x86_64__)
+#if defined(CONFIG_X86_64)
 #define __emulate_2op_8byte(_op, _src, _dst, _eflags, _qx, _qy)           \
         do {                                                              \
                 __asm__ __volatile__ (                                    \
@@ -495,7 +495,7 @@ x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
         case X86EMUL_MODE_PROT32:
                 op_bytes = ad_bytes = 4;
                 break;
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
         case X86EMUL_MODE_PROT64:
                 op_bytes = 4;
                 ad_bytes = 8;
@@ -1341,7 +1341,7 @@ twobyte_special_insn:
                         }
                         break;
                 }
-#elif defined(__x86_64__)
+#elif defined(CONFIG_X86_64)
                 {
                         unsigned long old, new;
                         if ((rc = ops->read_emulated(cr2, &old, 8, ctxt)) != 0)
diff --git a/drivers/kvm/x86_emulate.h b/drivers/kvm/x86_emulate.h
index 658b58de30fc..5d41bd55125e 100644
--- a/drivers/kvm/x86_emulate.h
+++ b/drivers/kvm/x86_emulate.h
@@ -162,7 +162,7 @@ struct x86_emulate_ctxt {
 /* Host execution mode. */
 #if defined(__i386__)
 #define X86EMUL_MODE_HOST X86EMUL_MODE_PROT32
-#elif defined(__x86_64__)
+#elif defined(CONFIG_X86_64)
 #define X86EMUL_MODE_HOST X86EMUL_MODE_PROT64
 #endif
 
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 176142c61492..7399ba791116 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -12,7 +12,7 @@ config NEW_LEDS
 
 config LEDS_CLASS
         tristate "LED Class Support"
-        depends NEW_LEDS
+        depends on NEW_LEDS
         help
           This option enables the led sysfs class in /sys/class/leds.  You'll
           need this to do anything useful with LEDs.  If unsure, say N.
@@ -21,28 +21,28 @@ comment "LED drivers"
 
 config LEDS_CORGI
         tristate "LED Support for the Sharp SL-C7x0 series"
-        depends LEDS_CLASS && PXA_SHARP_C7xx
+        depends on LEDS_CLASS && PXA_SHARP_C7xx
         help
           This option enables support for the LEDs on Sharp Zaurus
           SL-C7x0 series (C700, C750, C760, C860).
 
 config LEDS_LOCOMO
         tristate "LED Support for Locomo device"
-        depends LEDS_CLASS && SHARP_LOCOMO
+        depends on LEDS_CLASS && SHARP_LOCOMO
         help
           This option enables support for the LEDs on Sharp Locomo.
           Zaurus models SL-5500 and SL-5600.
 
 config LEDS_SPITZ
         tristate "LED Support for the Sharp SL-Cxx00 series"
-        depends LEDS_CLASS && PXA_SHARP_Cxx00
+        depends on LEDS_CLASS && PXA_SHARP_Cxx00
         help
           This option enables support for the LEDs on Sharp Zaurus
           SL-Cxx00 series (C1000, C3000, C3100).
 
 config LEDS_IXP4XX
         tristate "LED Support for GPIO connected LEDs on IXP4XX processors"
-        depends LEDS_CLASS && ARCH_IXP4XX
+        depends on LEDS_CLASS && ARCH_IXP4XX
         help
           This option enables support for the LEDs connected to GPIO
           outputs of the Intel IXP4XX processors.  To be useful the
@@ -51,7 +51,7 @@ config LEDS_IXP4XX
 
 config LEDS_TOSA
         tristate "LED Support for the Sharp SL-6000 series"
-        depends LEDS_CLASS && PXA_SHARPSL
+        depends on LEDS_CLASS && PXA_SHARPSL
         help
           This option enables support for the LEDs on Sharp Zaurus
           SL-6000 series.
@@ -65,7 +65,7 @@ config LEDS_S3C24XX
 
 config LEDS_AMS_DELTA
         tristate "LED Support for the Amstrad Delta (E3)"
-        depends LEDS_CLASS && MACH_AMS_DELTA
+        depends on LEDS_CLASS && MACH_AMS_DELTA
         help
           This option enables support for the LEDs on Amstrad Delta (E3).
 
@@ -86,7 +86,7 @@ comment "LED Triggers"
 
 config LEDS_TRIGGERS
         bool "LED Trigger support"
-        depends NEW_LEDS
+        depends on NEW_LEDS
         help
           This option enables trigger support for the leds class.
           These triggers allow kernel events to drive the LEDs and can
@@ -94,21 +94,21 @@ config LEDS_TRIGGERS
 
 config LEDS_TRIGGER_TIMER
         tristate "LED Timer Trigger"
-        depends LEDS_TRIGGERS
+        depends on LEDS_TRIGGERS
         help
           This allows LEDs to be controlled by a programmable timer
           via sysfs. If unsure, say Y.
 
 config LEDS_TRIGGER_IDE_DISK
         bool "LED IDE Disk Trigger"
-        depends LEDS_TRIGGERS && BLK_DEV_IDEDISK
+        depends on LEDS_TRIGGERS && BLK_DEV_IDEDISK
         help
           This allows LEDs to be controlled by IDE disk activity.
           If unsure, say Y.
 
 config LEDS_TRIGGER_HEARTBEAT
         tristate "LED Heartbeat Trigger"
-        depends LEDS_TRIGGERS
+        depends on LEDS_TRIGGERS
         help
           This allows LEDs to be controlled by a CPU load average.
           The flash frequency is a hyperbolic function of the 1-minute
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index d43ea81d6df9..7cec6de5e2b0 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -828,7 +828,7 @@ static ssize_t adb_write(struct file *file, const char __user *buf,
         if (!access_ok(VERIFY_READ, buf, count))
                 return -EFAULT;
 
-        req = (struct adb_request *) kmalloc(sizeof(struct adb_request),
+        req = kmalloc(sizeof(struct adb_request),
                                              GFP_KERNEL);
         if (req == NULL)
                 return -ENOMEM;
diff --git a/drivers/macintosh/apm_emu.c b/drivers/macintosh/apm_emu.c
index 8862a83b8d84..4300c628f8af 100644
--- a/drivers/macintosh/apm_emu.c
+++ b/drivers/macintosh/apm_emu.c
@@ -321,7 +321,7 @@ static int do_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *       as;
 
-        as = (struct apm_user *)kmalloc(sizeof(*as), GFP_KERNEL);
+        as = kmalloc(sizeof(*as), GFP_KERNEL);
         if (as == NULL) {
                 printk(KERN_ERR "apm: cannot allocate struct of size %d bytes\n",
                        sizeof(*as));
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 6dde27ab79a8..6f30459b9385 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -945,7 +945,7 @@ static struct smu_sdbp_header *smu_create_sdb_partition(int id)
          */
         tlen = sizeof(struct property) + len + 18;
 
-        prop = kcalloc(tlen, 1, GFP_KERNEL);
+        prop = kzalloc(tlen, GFP_KERNEL);
         if (prop == NULL)
                 return NULL;
         hdr = (struct smu_sdbp_header *)(prop + 1);
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index d9986f3a3fbf..93e6ef9233f9 100644
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -847,7 +847,7 @@ pbook_pci_save(void)
         n_pbook_pci_saves = npci;
         if (npci == 0)
                 return;
-        ps = (struct pci_save *) kmalloc(npci * sizeof(*ps), GFP_KERNEL);
+        ps = kmalloc(npci * sizeof(*ps), GFP_KERNEL);
         pbook_pci_saves = ps;
         if (ps == NULL)
                 return;
diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c
index a7a5ab554338..4ebd0f2a75ec 100644
--- a/drivers/md/faulty.c
+++ b/drivers/md/faulty.c
@@ -173,7 +173,7 @@ static int make_request(request_queue_t *q, struct bio *bio)
         conf_t *conf = (conf_t*)mddev->private;
         int failit = 0;
 
-        if (bio->bi_rw & 1) {
+        if (bio_data_dir(bio) == WRITE) {
                 /* write request */
                 if (atomic_read(&conf->counters[WriteAll])) {
                         /* special case - don't decrement, don't generic_make_request,
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index b3c5e12f081d..b30f74be3982 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1736,7 +1736,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
                 /* take from bio_init */
                 bio->bi_next = NULL;
                 bio->bi_flags |= 1 << BIO_UPTODATE;
-                bio->bi_rw = 0;
+                bio->bi_rw = READ;
                 bio->bi_vcnt = 0;
                 bio->bi_idx = 0;
                 bio->bi_phys_segments = 0;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 7492d6033ac6..f0141910bb8d 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1785,7 +1785,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
                                                 biolist = bio;
                                                 bio->bi_private = r10_bio;
                                                 bio->bi_end_io = end_sync_read;
-                                                bio->bi_rw = 0;
+                                                bio->bi_rw = READ;
                                                 bio->bi_sector = r10_bio->devs[j].addr +
                                                         conf->mirrors[d].rdev->data_offset;
                                                 bio->bi_bdev = conf->mirrors[d].rdev->bdev;
@@ -1801,7 +1801,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
                                                 biolist = bio;
                                                 bio->bi_private = r10_bio;
                                                 bio->bi_end_io = end_sync_write;
-                                                bio->bi_rw = 1;
+                                                bio->bi_rw = WRITE;
                                                 bio->bi_sector = r10_bio->devs[k].addr +
                                                         conf->mirrors[i].rdev->data_offset;
                                                 bio->bi_bdev = conf->mirrors[i].rdev->bdev;
@@ -1870,7 +1870,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
                         biolist = bio;
                         bio->bi_private = r10_bio;
                         bio->bi_end_io = end_sync_read;
-                        bio->bi_rw = 0;
+                        bio->bi_rw = READ;
                         bio->bi_sector = r10_bio->devs[i].addr +
                                 conf->mirrors[d].rdev->data_offset;
                         bio->bi_bdev = conf->mirrors[d].rdev->bdev;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 377f8bc9b78b..be008f034ada 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1827,16 +1827,16 @@ static void handle_stripe5(struct stripe_head *sh)
                 struct bio *bi;
                 mdk_rdev_t *rdev;
                 if (test_and_clear_bit(R5_Wantwrite, &sh->dev[i].flags))
-                        rw = 1;
+                        rw = WRITE;
                 else if (test_and_clear_bit(R5_Wantread, &sh->dev[i].flags))
-                        rw = 0;
+                        rw = READ;
                 else
                         continue;
  
                 bi = &sh->dev[i].req;
  
                 bi->bi_rw = rw;
-                if (rw)
+                if (rw == WRITE)
                         bi->bi_end_io = raid5_end_write_request;
                 else
                         bi->bi_end_io = raid5_end_read_request;
@@ -1872,7 +1872,7 @@ static void handle_stripe5(struct stripe_head *sh)
                                 atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
                         generic_make_request(bi);
                 } else {
-                        if (rw == 1)
+                        if (rw == WRITE)
                                 set_bit(STRIPE_DEGRADED, &sh->state);
                         PRINTK("skip op %ld on disc %d for sector %llu\n",
                                 bi->bi_rw, i, (unsigned long long)sh->sector);
@@ -2370,16 +2370,16 @@ static void handle_stripe6(struct stripe_head *sh, struct page *tmp_page)
                 struct bio *bi;
                 mdk_rdev_t *rdev;
                 if (test_and_clear_bit(R5_Wantwrite, &sh->dev[i].flags))
-                        rw = 1;
+                        rw = WRITE;
                 else if (test_and_clear_bit(R5_Wantread, &sh->dev[i].flags))
-                        rw = 0;
+                        rw = READ;
                 else
                         continue;
 
                 bi = &sh->dev[i].req;
 
                 bi->bi_rw = rw;
-                if (rw)
+                if (rw == WRITE)
                         bi->bi_end_io = raid5_end_write_request;
                 else
                         bi->bi_end_io = raid5_end_read_request;
@@ -2415,7 +2415,7 @@ static void handle_stripe6(struct stripe_head *sh, struct page *tmp_page)
                                 atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
                         generic_make_request(bi);
                 } else {
-                        if (rw == 1)
+                        if (rw == WRITE)
                                 set_bit(STRIPE_DEGRADED, &sh->state);
                         PRINTK("skip op %ld on disc %d for sector %llu\n",
                                 bi->bi_rw, i, (unsigned long long)sh->sector);
@@ -2567,7 +2567,7 @@ static int raid5_mergeable_bvec(request_queue_t *q, struct bio *bio, struct bio_
         unsigned int chunk_sectors = mddev->chunk_size >> 9;
         unsigned int bio_sectors = bio->bi_size >> 9;
 
-        if (bio_data_dir(bio))
+        if (bio_data_dir(bio) == WRITE)
                 return biovec->bv_len; /* always allow writes to be mergeable */
 
         max =  (chunk_sectors - ((sector & (chunk_sectors - 1)) + bio_sectors)) << 9;
@@ -2751,7 +2751,7 @@ static int make_request(request_queue_t *q, struct bio * bi)
         disk_stat_inc(mddev->gendisk, ios[rw]);
         disk_stat_add(mddev->gendisk, sectors[rw], bio_sectors(bi));
 
-        if (bio_data_dir(bi) == READ &&
+        if (rw == READ &&
              mddev->reshape_position == MaxSector &&
              chunk_aligned_read(q,bi))
                 return 0;
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index 240ad084fa78..50bc32a8bd55 100644
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -480,7 +480,7 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message,
         struct ca_msg *hw_buffer;
         int result = 0;
 
-        if ((hw_buffer = (struct ca_msg *) kmalloc(sizeof (struct ca_msg), GFP_KERNEL)) == NULL) {
+        if ((hw_buffer = kmalloc(sizeof (struct ca_msg), GFP_KERNEL)) == NULL) {
                 dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");
                 return -ENOMEM;
         }
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 80a85cb4975f..3e35931af35d 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -657,7 +657,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
 
         case BTTV_BOARD_TWINHAN_DST:
                 /*      DST is not a frontend driver !!!                */
-                state = (struct dst_state *) kmalloc(sizeof (struct dst_state), GFP_KERNEL);
+                state = kmalloc(sizeof (struct dst_state), GFP_KERNEL);
                 if (!state) {
                         printk("dvb_bt8xx: No memory\n");
                         break;
diff --git a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
index 42f39a89bc4d..a6fb1d6a7b5d 100644
--- a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
+++ b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
@@ -195,7 +195,7 @@ struct dvb_frontend* ttusbdecfe_dvbt_attach(const struct ttusbdecfe_config* conf
         struct ttusbdecfe_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct ttusbdecfe_state*) kmalloc(sizeof(struct ttusbdecfe_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct ttusbdecfe_state), GFP_KERNEL);
         if (state == NULL)
                 return NULL;
 
@@ -215,7 +215,7 @@ struct dvb_frontend* ttusbdecfe_dvbs_attach(const struct ttusbdecfe_config* conf
         struct ttusbdecfe_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct ttusbdecfe_state*) kmalloc(sizeof(struct ttusbdecfe_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct ttusbdecfe_state), GFP_KERNEL);
         if (state == NULL)
                 return NULL;
 
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c
index b1012e92ee04..917021fc2993 100644
--- a/drivers/media/video/dabusb.c
+++ b/drivers/media/video/dabusb.c
@@ -218,7 +218,7 @@ static int dabusb_alloc_buffers (pdabusb_t s)
                  pipesize, packets, transfer_buffer_length);
 
         while (buffers < (s->total_buffer_size << 10)) {
-                b = (pbuff_t) kzalloc (sizeof (buff_t), GFP_KERNEL);
+                b = kzalloc(sizeof (buff_t), GFP_KERNEL);
                 if (!b) {
                         err("kzalloc(sizeof(buff_t))==NULL");
                         goto err;
@@ -659,7 +659,7 @@ static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cm
         switch (cmd) {
 
         case IOCTL_DAB_BULK:
-                pbulk = (pbulk_transfer_t) kmalloc (sizeof (bulk_transfer_t), GFP_KERNEL);
+                pbulk = kmalloc(sizeof (bulk_transfer_t), GFP_KERNEL);
 
                 if (!pbulk) {
                         ret = -ENOMEM;
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index 89dd18c3c5cc..5ed0adc4ca26 100644
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -18,7 +18,7 @@
 #include <linux/i2c.h>
 
 
-MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net.");
+MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net>");
 MODULE_DESCRIPTION("A low-level driver for OmniVision ov7670 sensors");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c
index 368d6e219fa4..86d2884e16c6 100644
--- a/drivers/media/video/planb.c
+++ b/drivers/media/video/planb.c
@@ -138,7 +138,7 @@ static int grabbuf_alloc(struct planb *pb)
                 + MAX_LNUM
 #endif /* PLANB_GSCANLINE */
                 );
-        if ((pb->rawbuf = (unsigned char**) kmalloc (npage
+        if ((pb->rawbuf = kmalloc(npage
                                 * sizeof(unsigned long), GFP_KERNEL)) == 0)
                 return -ENOMEM;
         for (i = 0; i < npage; i++) {
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index d8b88024bc2f..b560c9d7c516 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -690,7 +690,7 @@ int usbvideo_register(
         }
 
         base_size = num_cams * sizeof(struct uvd) + sizeof(struct usbvideo);
-        cams = (struct usbvideo *) kzalloc(base_size, GFP_KERNEL);
+        cams = kzalloc(base_size, GFP_KERNEL);
         if (cams == NULL) {
                 err("Failed to allocate %d. bytes for usbvideo struct", base_size);
                 return -ENOMEM;
diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/videocodec.c
index 2ae3fb250630..290e64135650 100644
--- a/drivers/media/video/videocodec.c
+++ b/drivers/media/video/videocodec.c
@@ -346,7 +346,7 @@ videocodec_build_table (void)
                 size);
 
         kfree(videocodec_buf);
-        videocodec_buf = (char *) kmalloc(size, GFP_KERNEL);
+        videocodec_buf = kmalloc(size, GFP_KERNEL);
 
         i = 0;
         i += scnprintf(videocodec_buf + i, size - 1,
diff --git a/drivers/message/i2o/core.h b/drivers/message/i2o/core.h
index dc388a3ff5e0..cbe384fb848c 100644
--- a/drivers/message/i2o/core.h
+++ b/drivers/message/i2o/core.h
@@ -18,7 +18,7 @@ extern struct i2o_driver i2o_exec_driver;
 extern int i2o_exec_lct_get(struct i2o_controller *);
 
 extern int __init i2o_exec_init(void);
-extern void __exit i2o_exec_exit(void);
+extern void i2o_exec_exit(void);
 
 /* driver */
 extern struct bus_type i2o_bus_type;
@@ -26,7 +26,7 @@ extern struct bus_type i2o_bus_type;
 extern int i2o_driver_dispatch(struct i2o_controller *, u32);
 
 extern int __init i2o_driver_init(void);
-extern void __exit i2o_driver_exit(void);
+extern void i2o_driver_exit(void);
 
 /* PCI */
 extern int __init i2o_pci_init(void);
diff --git a/drivers/message/i2o/driver.c b/drivers/message/i2o/driver.c
index 9104b65ff70f..d3235f213c89 100644
--- a/drivers/message/i2o/driver.c
+++ b/drivers/message/i2o/driver.c
@@ -362,7 +362,7 @@ int __init i2o_driver_init(void)
  *
  *      Unregisters the I2O bus and frees driver array.
  */
-void __exit i2o_driver_exit(void)
+void i2o_driver_exit(void)
 {
         bus_unregister(&i2o_bus_type);
         kfree(i2o_drivers);
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c
index 902753b2c661..a539d3b61e76 100644
--- a/drivers/message/i2o/exec-osm.c
+++ b/drivers/message/i2o/exec-osm.c
@@ -595,7 +595,7 @@ int __init i2o_exec_init(void)
  *
  *      Unregisters the Exec OSM from the I2O core.
  */
-void __exit i2o_exec_exit(void)
+void i2o_exec_exit(void)
 {
         i2o_driver_unregister(&i2o_exec_driver);
 };
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 1de30d711671..e33d446e7493 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -186,7 +186,7 @@ static int i2o_cfg_parms(unsigned long arg, unsigned int type)
         if (!dev)
                 return -ENXIO;
 
-        ops = (u8 *) kmalloc(kcmd.oplen, GFP_KERNEL);
+        ops = kmalloc(kcmd.oplen, GFP_KERNEL);
         if (!ops)
                 return -ENOMEM;
 
@@ -199,7 +199,7 @@ static int i2o_cfg_parms(unsigned long arg, unsigned int type)
          * It's possible to have a _very_ large table
          * and that the user asks for all of it at once...
          */
-        res = (u8 *) kmalloc(65536, GFP_KERNEL);
+        res = kmalloc(65536, GFP_KERNEL);
         if (!res) {
                 kfree(ops);
                 return -ENOMEM;
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 5db716045927..0a7e86859bf1 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -459,7 +459,7 @@ add_dataflash(struct spi_device *spi, char *name,
         struct mtd_info                 *device;
         struct flash_platform_data      *pdata = spi->dev.platform_data;
 
-        priv = (struct dataflash *) kzalloc(sizeof *priv, GFP_KERNEL);
+        priv = kzalloc(sizeof *priv, GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
 
diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c
index fa4362fb4dd8..0f3baa5d9c2a 100644
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
@@ -768,7 +768,7 @@ static void rfd_ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
         if (mtd->type != MTD_NORFLASH)
                 return;
 
-        part = kcalloc(1, sizeof(struct partition), GFP_KERNEL);
+        part = kzalloc(sizeof(struct partition), GFP_KERNEL);
         if (!part)
                 return;
 
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index b98592a8bac8..f22e46dfd770 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -186,7 +186,7 @@ static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev)
  */
 static int ipddp_create(struct ipddp_route *new_rt)
 {
-        struct ipddp_route *rt =(struct ipddp_route*) kmalloc(sizeof(*rt), GFP_KERNEL);
+        struct ipddp_route *rt = kmalloc(sizeof(*rt), GFP_KERNEL);
 
         if (rt == NULL)
                 return -ENOMEM;
diff --git a/drivers/net/bsd_comp.c b/drivers/net/bsd_comp.c
index bae1de1e7802..7845eaf6f29f 100644
--- a/drivers/net/bsd_comp.c
+++ b/drivers/net/bsd_comp.c
@@ -395,7 +395,7 @@ static void *bsd_alloc (unsigned char *options, int opt_len, int decomp)
  * Allocate the main control structure for this instance.
  */
     maxmaxcode = MAXCODE(bits);
-    db         = (struct bsd_db *) kmalloc (sizeof (struct bsd_db),
+    db         = kmalloc(sizeof (struct bsd_db),
                                             GFP_KERNEL);
     if (!db)
       {
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 03bf164f9e8d..c2ae2a24629b 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1930,9 +1930,8 @@ static int e100_rx_alloc_list(struct nic *nic)
         nic->rx_to_use = nic->rx_to_clean = NULL;
         nic->ru_running = RU_UNINITIALIZED;
 
-        if(!(nic->rxs = kmalloc(sizeof(struct rx) * count, GFP_ATOMIC)))
+        if(!(nic->rxs = kcalloc(count, sizeof(struct rx), GFP_ATOMIC)))
                 return -ENOMEM;
-        memset(nic->rxs, 0, sizeof(struct rx) * count);
 
         for(rx = nic->rxs, i = 0; i < count; rx++, i++) {
                 rx->next = (i + 1 < count) ? rx + 1 : nic->rxs;
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 16620bd97fbf..11af0ae7510e 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -1603,7 +1603,7 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
   irda_qos_bits_to_value (&self->qos);
 
   /* Allocate twice the size to guarantee alignment */
-  self->ringbuf = (void *) kmalloc (OBOE_RING_LEN << 1, GFP_KERNEL);
+  self->ringbuf = kmalloc(OBOE_RING_LEN << 1, GFP_KERNEL);
   if (!self->ringbuf)
     {
       printk (KERN_ERR DRIVER_NAME ": can't allocate DMA buffers\n");
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 6e95645e7245..3ca1082ec776 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1747,7 +1747,7 @@ static int irda_usb_probe(struct usb_interface *intf,
         /* Don't change this buffer size and allocation without doing
          * some heavy and complete testing. Don't ask why :-(
          * Jean II */
-        self->speed_buff = (char *) kmalloc(IRDA_USB_SPEED_MTU, GFP_KERNEL);
+        self->speed_buff = kmalloc(IRDA_USB_SPEED_MTU, GFP_KERNEL);
         if (self->speed_buff == NULL) 
                 goto err_out_3;
 
diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c
index 654a68b490ae..3098960dc2a1 100644
--- a/drivers/net/irda/irport.c
+++ b/drivers/net/irda/irport.c
@@ -164,7 +164,7 @@ irport_open(int i, unsigned int iobase, unsigned int irq)
         
         /* Allocate memory if needed */
         if (self->tx_buff.truesize > 0) {
-                self->tx_buff.head = (__u8 *) kmalloc(self->tx_buff.truesize, 
+                self->tx_buff.head = kmalloc(self->tx_buff.truesize,
                                                       GFP_KERNEL);
                 if (self->tx_buff.head == NULL) {
                         IRDA_ERROR("%s(), can't allocate memory for "
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index b833016f1825..177c502f7385 100644
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -884,7 +884,7 @@ static int i596_start_xmit (struct sk_buff *skb, struct net_device *dev) {
 
         dev->trans_start = jiffies;
 
-        tx_cmd = (struct tx_cmd *) kmalloc ((sizeof (struct tx_cmd) + sizeof (struct i596_tbd)), GFP_ATOMIC);
+        tx_cmd = kmalloc((sizeof (struct tx_cmd) + sizeof (struct i596_tbd)), GFP_ATOMIC);
         if (tx_cmd == NULL) {
                 printk(KERN_WARNING "%s: i596_xmit Memory squeeze, dropping packet.\n", dev->name);
                 lp->stats.tx_dropped++;
@@ -1266,7 +1266,7 @@ static void set_multicast_list(struct net_device *dev) {
         if (dev->mc_count > 0) {
                 struct dev_mc_list *dmi;
                 char *cp;
-                cmd = (struct i596_cmd *)kmalloc(sizeof(struct i596_cmd)+2+dev->mc_count*6, GFP_ATOMIC);
+                cmd = kmalloc(sizeof(struct i596_cmd)+2+dev->mc_count*6, GFP_ATOMIC);
                 if (cmd == NULL) {
                         printk (KERN_ERR "%s: set_multicast Memory squeeze.\n", dev->name);
                         return;
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index b01fc70a57db..a4d7529ef415 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -50,7 +50,7 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
         struct phy_device *dev;
         /* We allocate the device, and initialize the
          * default values */
-        dev = kcalloc(1, sizeof(*dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
 
         if (NULL == dev)
                 return (struct phy_device*) PTR_ERR((void*)-ENOMEM);
diff --git a/drivers/net/ppp_deflate.c b/drivers/net/ppp_deflate.c
index f54c55242f4a..72c8d6628f58 100644
--- a/drivers/net/ppp_deflate.c
+++ b/drivers/net/ppp_deflate.c
@@ -121,7 +121,7 @@ static void *z_comp_alloc(unsigned char *options, int opt_len)
         if (w_size < DEFLATE_MIN_SIZE || w_size > DEFLATE_MAX_SIZE)
                 return NULL;
 
-        state = (struct ppp_deflate_state *) kmalloc(sizeof(*state),
+        state = kmalloc(sizeof(*state),
                                                      GFP_KERNEL);
         if (state == NULL)
                 return NULL;
@@ -341,7 +341,7 @@ static void *z_decomp_alloc(unsigned char *options, int opt_len)
         if (w_size < DEFLATE_MIN_SIZE || w_size > DEFLATE_MAX_SIZE)
                 return NULL;
 
-        state = (struct ppp_deflate_state *) kmalloc(sizeof(*state), GFP_KERNEL);
+        state = kmalloc(sizeof(*state), GFP_KERNEL);
         if (state == NULL)
                 return NULL;
 
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c
index f3655fd772f5..d5bdd2574659 100644
--- a/drivers/net/ppp_mppe.c
+++ b/drivers/net/ppp_mppe.c
@@ -200,7 +200,7 @@ static void *mppe_alloc(unsigned char *options, int optlen)
             || options[0] != CI_MPPE || options[1] != CILEN_MPPE)
                 goto out;
 
-        state = (struct ppp_mppe_state *) kmalloc(sizeof(*state), GFP_KERNEL);
+        state = kmalloc(sizeof(*state), GFP_KERNEL);
         if (state == NULL)
                 goto out;
 
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index b60f0451f6cd..8a39376f87dc 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -749,7 +749,7 @@ static int skge_ring_alloc(struct skge_ring *ring, void *vaddr, u32 base)
         struct skge_element *e;
         int i;
 
-        ring->start = kcalloc(sizeof(*e), ring->count, GFP_KERNEL);
+        ring->start = kcalloc(ring->count, sizeof(*e), GFP_KERNEL);
         if (!ring->start)
                 return -ENOMEM;
 
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 39c2152a07f4..a0806d262fc6 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -229,10 +229,10 @@ static int sl_realloc_bufs(struct slip *sl, int mtu)
         if (len < 576 * 2)
                 len = 576 * 2;
 
-        xbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
-        rbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
+        xbuff = kmalloc(len + 4, GFP_ATOMIC);
+        rbuff = kmalloc(len + 4, GFP_ATOMIC);
 #ifdef SL_INCLUDE_CSLIP
-        cbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
+        cbuff = kmalloc(len + 4, GFP_ATOMIC);
 #endif
 
 
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index a4f735723c41..a02c5fb40567 100644
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -231,7 +231,7 @@ static struct sv11_device *sv11_init(int iobase, int irq)
                 return NULL;
         }
         
-        sv=(struct sv11_device *)kmalloc(sizeof(struct sv11_device), GFP_KERNEL);
+        sv = kmalloc(sizeof(struct sv11_device), GFP_KERNEL);
         if(!sv)
                 goto fail3;
                         
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index 36d1c3ff7078..62184dee377c 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -3455,7 +3455,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         if ((err = pci_enable_device(pdev)) < 0)
                 return err;
 
-        card = (pc300_t *) kmalloc(sizeof(pc300_t), GFP_KERNEL);
+        card = kmalloc(sizeof(pc300_t), GFP_KERNEL);
         if (card == NULL) {
                 printk("PC300 found at RAM 0x%016llx, "
                        "but could not allocate card structure.\n",
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index b2a23aed4428..5873c346e7e9 100644
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -784,7 +784,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
                         continue;
                 } 
                 
-                new = (st_cpc_rx_buf *)kmalloc(rx_len + sizeof(st_cpc_rx_buf), GFP_ATOMIC);
+                new = kmalloc(rx_len + sizeof(st_cpc_rx_buf), GFP_ATOMIC);
                 if (new == 0) {
                         cpc_tty_rx_disc_frame(pc300chan);
                         continue;
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 9c3ccc669143..1c9edd97accd 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -123,8 +123,8 @@ static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
         unsigned char *xbuff, *rbuff;
         int len = 2* newmtu;
 
-        xbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
-        rbuff = (unsigned char *) kmalloc (len + 4, GFP_ATOMIC);
+        xbuff = kmalloc(len + 4, GFP_ATOMIC);
+        rbuff = kmalloc(len + 4, GFP_ATOMIC);
 
         if (xbuff == NULL || rbuff == NULL)  
         {
@@ -465,11 +465,11 @@ static int x25_asy_open(struct net_device *dev)
 
         len = dev->mtu * 2;
 
-        sl->rbuff = (unsigned char *) kmalloc(len + 4, GFP_KERNEL);
+        sl->rbuff = kmalloc(len + 4, GFP_KERNEL);
         if (sl->rbuff == NULL)   {
                 goto norbuff;
         }
-        sl->xbuff = (unsigned char *) kmalloc(len + 4, GFP_KERNEL);
+        sl->xbuff = kmalloc(len + 4, GFP_KERNEL);
         if (sl->xbuff == NULL)   {
                 goto noxbuff;
         }
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 974a8e5bec8b..efb8cf3bd8ad 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -1253,7 +1253,7 @@ static char * ap_auth_make_challenge(struct ap_data *ap)
                         return NULL;
         }
 
-        tmpbuf = (char *) kmalloc(WLAN_AUTH_CHALLENGE_LEN, GFP_ATOMIC);
+        tmpbuf = kmalloc(WLAN_AUTH_CHALLENGE_LEN, GFP_ATOMIC);
         if (tmpbuf == NULL) {
                 PDEBUG(DEBUG_AP, "AP: kmalloc failed for challenge\n");
                 return NULL;
diff --git a/drivers/net/wireless/hostap/hostap_download.c b/drivers/net/wireless/hostap/hostap_download.c
index 24fc387bba67..c7678e67697d 100644
--- a/drivers/net/wireless/hostap/hostap_download.c
+++ b/drivers/net/wireless/hostap/hostap_download.c
@@ -201,7 +201,7 @@ static u8 * prism2_read_pda(struct net_device *dev)
                 0x7f0002 /* Intel PRO/Wireless 2011B (PCI) */,
         };
 
-        buf = (u8 *) kmalloc(PRISM2_PDA_SIZE, GFP_KERNEL);
+        buf = kmalloc(PRISM2_PDA_SIZE, GFP_KERNEL);
         if (buf == NULL)
                 return NULL;
 
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index a394a23b9a20..3079378fb8cd 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -2252,7 +2252,7 @@ static int hostap_tx_compl_read(local_info_t *local, int error,
         if (txdesc->sw_support) {
                 len = le16_to_cpu(txdesc->data_len);
                 if (len < PRISM2_DATA_MAXLEN) {
-                        *payload = (char *) kmalloc(len, GFP_ATOMIC);
+                        *payload = kmalloc(len, GFP_ATOMIC);
                         if (*payload == NULL ||
                             hfa384x_from_bap(dev, BAP0, *payload, len)) {
                                 PDEBUG(DEBUG_EXTRA, "%s: could not read TX "
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 3b7b8063ff1c..cb08bc5db2bd 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -3829,7 +3829,7 @@ static int prism2_ioctl_priv_hostapd(local_info_t *local, struct iw_point *p)
             p->length > PRISM2_HOSTAPD_MAX_BUF_SIZE || !p->pointer)
                 return -EINVAL;
 
-        param = (struct prism2_hostapd_param *) kmalloc(p->length, GFP_KERNEL);
+        param = kmalloc(p->length, GFP_KERNEL);
         if (param == NULL)
                 return -ENOMEM;
 
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 0796be9d9e77..04c19cefa1da 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -250,7 +250,7 @@ u16 hostap_tx_callback_register(local_info_t *local,
         unsigned long flags;
         struct hostap_tx_callback_info *entry;
 
-        entry = (struct hostap_tx_callback_info *) kmalloc(sizeof(*entry),
+        entry = kmalloc(sizeof(*entry),
                                                            GFP_ATOMIC);
         if (entry == NULL)
                 return 0;
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index dd9ba4aad7bb..0e94fbbf7a94 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -2246,7 +2246,7 @@ static int ipw2100_snapshot_alloc(struct ipw2100_priv *priv)
         if (priv->snapshot[0])
                 return 1;
         for (i = 0; i < 0x30; i++) {
-                priv->snapshot[i] = (u8 *) kmalloc(0x1000, GFP_ATOMIC);
+                priv->snapshot[i] = kmalloc(0x1000, GFP_ATOMIC);
                 if (!priv->snapshot[i]) {
                         IPW_DEBUG_INFO("%s: Error allocating snapshot "
                                        "buffer %d\n", priv->net_dev->name, i);
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 96606ed10076..838d510213c6 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -2775,7 +2775,7 @@ prism54_hostapd(struct net_device *ndev, struct iw_point *p)
            p->length > PRISM2_HOSTAPD_MAX_BUF_SIZE || !p->pointer)
                return -EINVAL;
 
-       param = (struct prism2_hostapd_param *) kmalloc(p->length, GFP_KERNEL);
+       param = kmalloc(p->length, GFP_KERNEL);
        if (param == NULL)
                return -ENOMEM;
 
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 233d906c08f0..5eb81638e846 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -603,7 +603,7 @@ static wavepoint_history *wl_new_wavepoint(unsigned short nwid, unsigned char se
   if(lp->wavepoint_table.num_wavepoints==MAX_WAVEPOINTS)
     return NULL;
   
-  new_wavepoint=(wavepoint_history *) kmalloc(sizeof(wavepoint_history),GFP_ATOMIC);
+  new_wavepoint = kmalloc(sizeof(wavepoint_history),GFP_ATOMIC);
   if(new_wavepoint==NULL)
     return NULL;
   
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 77e11ddad836..78ea72fb8f0c 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -101,7 +101,7 @@ int zd_ioread32v_locked(struct zd_chip *chip, u32 *values, const zd_addr_t *addr
 
         /* Allocate a single memory block for values and addresses. */
         count16 = 2*count;
-        a16 = (zd_addr_t *)kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)),
+        a16 = kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)),
                                    GFP_NOFS);
         if (!a16) {
                 dev_dbg_f(zd_chip_dev(chip),
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 12bab64a62a1..6fb3f7979f21 100644
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -874,7 +874,7 @@ void *iosapic_register(unsigned long hpa)
                 return NULL;
         }
 
-        isi = (struct iosapic_info *)kzalloc(sizeof(struct iosapic_info), GFP_KERNEL);
+        isi = kzalloc(sizeof(struct iosapic_info), GFP_KERNEL);
         if (!isi) {
                 BUG();
                 return NULL;
diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
index 298a6cfd8406..ae5e974c45a7 100644
--- a/drivers/pci/hotplug/cpqphp_nvram.c
+++ b/drivers/pci/hotplug/cpqphp_nvram.c
@@ -520,7 +520,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
                         return 2;
 
                 while (nummem--) {
-                        mem_node = (struct pci_resource*) kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+                        mem_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
 
                         if (!mem_node)
                                 break;
@@ -548,7 +548,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
                 }
 
                 while (numpmem--) {
-                        p_mem_node = (struct pci_resource*) kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+                        p_mem_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
 
                         if (!p_mem_node)
                                 break;
@@ -576,7 +576,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
                 }
 
                 while (numio--) {
-                        io_node = (struct pci_resource*) kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+                        io_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
 
                         if (!io_node)
                                 break;
@@ -604,7 +604,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
                 }
 
                 while (numbus--) {
-                        bus_node = (struct pci_resource*) kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+                        bus_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
 
                         if (!bus_node)
                                 break;
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 6d3f580f2666..25d3aadfddbf 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -1320,7 +1320,7 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)
         DBG_ENTER_ROUTINE
         
         spin_lock_init(&list_lock);     
-        php_ctlr = (struct php_ctlr_state_s *) kmalloc(sizeof(struct php_ctlr_state_s), GFP_KERNEL);
+        php_ctlr = kmalloc(sizeof(struct php_ctlr_state_s), GFP_KERNEL);
 
         if (!php_ctlr) {        /* allocate controller state data */
                 err("%s: HPC controller memory allocation error!\n", __FUNCTION__);
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c
index 55866b6b26fa..6f5fabbd14e5 100644
--- a/drivers/pci/pcie/aer/aerdrv.c
+++ b/drivers/pci/pcie/aer/aerdrv.c
@@ -148,7 +148,7 @@ static struct aer_rpc* aer_alloc_rpc(struct pcie_device *dev)
 {
         struct aer_rpc *rpc;
 
-        if (!(rpc = (struct aer_rpc *)kmalloc(sizeof(struct aer_rpc),
+        if (!(rpc = kmalloc(sizeof(struct aer_rpc),
                 GFP_KERNEL)))
                 return NULL;
 
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index 52d4a38b3667..3334f22a86c0 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -230,7 +230,7 @@ static int __init at91_cf_probe(struct platform_device *pdev)
         if (!io)
                 return -ENODEV;
 
-        cf = kcalloc(1, sizeof *cf, GFP_KERNEL);
+        cf = kzalloc(sizeof *cf, GFP_KERNEL);
         if (!cf)
                 return -ENOMEM;
 
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index 06bf7f48836e..e65a6b8188f6 100644
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -220,7 +220,7 @@ static int __devinit omap_cf_probe(struct device *dev)
         if (irq < 0)
                 return -EINVAL;
 
-        cf = kcalloc(1, sizeof *cf, GFP_KERNEL);
+        cf = kzalloc(sizeof *cf, GFP_KERNEL);
         if (!cf)
                 return -ENOMEM;
         init_timer(&cf->timer);
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 3ac5b123215a..a0b158704ca1 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -395,7 +395,7 @@ static void isapnp_parse_id(struct pnp_dev * dev, unsigned short vendor, unsigne
         struct pnp_id * id;
         if (!dev)
                 return;
-        id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
+        id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
         if (!id)
                 return;
         sprintf(id->id, "%c%c%c%x%x%x%x",
@@ -419,7 +419,7 @@ static struct pnp_dev * __init isapnp_parse_device(struct pnp_card *card, int si
         struct pnp_dev *dev;
 
         isapnp_peek(tmp, size);
-        dev = kcalloc(1, sizeof(struct pnp_dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL);
         if (!dev)
                 return NULL;
         dev->number = number;
@@ -450,7 +450,7 @@ static void __init isapnp_parse_irq_resource(struct pnp_option *option,
         unsigned long bits;
 
         isapnp_peek(tmp, size);
-        irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
+        irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
         bits = (tmp[1] << 8) | tmp[0];
@@ -474,7 +474,7 @@ static void __init isapnp_parse_dma_resource(struct pnp_option *option,
         struct pnp_dma *dma;
 
         isapnp_peek(tmp, size);
-        dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
+        dma = kzalloc(sizeof(struct pnp_dma), GFP_KERNEL);
         if (!dma)
                 return;
         dma->map = tmp[0];
@@ -494,7 +494,7 @@ static void __init isapnp_parse_port_resource(struct pnp_option *option,
         struct pnp_port *port;
 
         isapnp_peek(tmp, size);
-        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
+        port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = (tmp[2] << 8) | tmp[1];
@@ -517,7 +517,7 @@ static void __init isapnp_parse_fixed_port_resource(struct pnp_option *option,
         struct pnp_port *port;
 
         isapnp_peek(tmp, size);
-        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
+        port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = port->max = (tmp[1] << 8) | tmp[0];
@@ -539,7 +539,7 @@ static void __init isapnp_parse_mem_resource(struct pnp_option *option,
         struct pnp_mem *mem;
 
         isapnp_peek(tmp, size);
-        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = ((tmp[2] << 8) | tmp[1]) << 8;
@@ -562,7 +562,7 @@ static void __init isapnp_parse_mem32_resource(struct pnp_option *option,
         struct pnp_mem *mem;
 
         isapnp_peek(tmp, size);
-        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
@@ -584,7 +584,7 @@ static void __init isapnp_parse_fixed_mem32_resource(struct pnp_option *option,
         struct pnp_mem *mem;
 
         isapnp_peek(tmp, size);
-        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = mem->max = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
@@ -829,7 +829,7 @@ static unsigned char __init isapnp_checksum(unsigned char *data)
 
 static void isapnp_parse_card_id(struct pnp_card * card, unsigned short vendor, unsigned short device)
 {
-        struct pnp_id * id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
+        struct pnp_id * id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
         if (!id)
                 return;
         sprintf(id->id, "%c%c%c%x%x%x%x",
@@ -865,7 +865,7 @@ static int __init isapnp_build_device_list(void)
                         header[4], header[5], header[6], header[7], header[8]);
                 printk(KERN_DEBUG "checksum = 0x%x\n", checksum);
 #endif
-                if ((card = kcalloc(1, sizeof(struct pnp_card), GFP_KERNEL)) == NULL)
+                if ((card = kzalloc(sizeof(struct pnp_card), GFP_KERNEL)) == NULL)
                         continue;
 
                 card->number = csn;
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 6cf34a63c790..62eda5d59024 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -139,7 +139,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
                 return 0;
 
         pnp_dbg("ACPI device : hid %s", acpi_device_hid(device));
-        dev =  kcalloc(1, sizeof(struct pnp_dev), GFP_KERNEL);
+        dev =  kzalloc(sizeof(struct pnp_dev), GFP_KERNEL);
         if (!dev) {
                 pnp_err("Out of memory");
                 return -ENOMEM;
@@ -169,7 +169,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
         dev->number = num;
         
         /* set the initial values for the PnP device */
-        dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
+        dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
         if (!dev_id)
                 goto err;
         pnpidacpi_to_pnpid(acpi_device_hid(device), dev_id->id);
@@ -201,7 +201,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
                 for (i = 0; i < cid_list->count; i++) {
                         if (!ispnpidacpi(cid_list->id[i].value))
                                 continue;
-                        dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
+                        dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
                         if (!dev_id)
                                 continue;
 
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 379048fdf05d..7a535542fe92 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -298,7 +298,7 @@ static void pnpacpi_parse_dma_option(struct pnp_option *option, struct acpi_reso
 
         if (p->channel_count == 0)
                 return;
-        dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
+        dma = kzalloc(sizeof(struct pnp_dma), GFP_KERNEL);
         if (!dma)
                 return;
 
@@ -354,7 +354,7 @@ static void pnpacpi_parse_irq_option(struct pnp_option *option,
 
         if (p->interrupt_count == 0)
                 return;
-        irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
+        irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
 
@@ -375,7 +375,7 @@ static void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
 
         if (p->interrupt_count == 0)
                 return;
-        irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
+        irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
 
@@ -396,7 +396,7 @@ pnpacpi_parse_port_option(struct pnp_option *option,
 
         if (io->address_length == 0)
                 return;
-        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
+        port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = io->minimum;
@@ -417,7 +417,7 @@ pnpacpi_parse_fixed_port_option(struct pnp_option *option,
 
         if (io->address_length == 0)
                 return;
-        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
+        port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = port->max = io->address;
@@ -436,7 +436,7 @@ pnpacpi_parse_mem24_option(struct pnp_option *option,
 
         if (p->address_length == 0)
                 return;
-        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = p->minimum;
@@ -459,7 +459,7 @@ pnpacpi_parse_mem32_option(struct pnp_option *option,
 
         if (p->address_length == 0)
                 return;
-        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = p->minimum;
@@ -482,7 +482,7 @@ pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
 
         if (p->address_length == 0)
                 return;
-        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = mem->max = p->address;
@@ -514,7 +514,7 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)
                 return;
 
         if (p->resource_type == ACPI_MEMORY_RANGE) {
-                mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
+                mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
                 if (!mem)
                         return;
                 mem->min = mem->max = p->minimum;
@@ -524,7 +524,7 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)
                     ACPI_READ_WRITE_MEMORY) ? IORESOURCE_MEM_WRITEABLE : 0;
                 pnp_register_mem_resource(option, mem);
         } else if (p->resource_type == ACPI_IO_RANGE) {
-                port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
+                port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
                 if (!port)
                         return;
                 port->min = port->max = p->minimum;
@@ -721,7 +721,7 @@ int pnpacpi_build_resource_template(acpi_handle handle,
         if (!res_cnt)
                 return -EINVAL;
         buffer->length = sizeof(struct acpi_resource) * (res_cnt + 1) + 1;
-        buffer->pointer = kcalloc(1, buffer->length - 1, GFP_KERNEL);
+        buffer->pointer = kzalloc(buffer->length - 1, GFP_KERNEL);
         if (!buffer->pointer)
                 return -ENOMEM;
         pnp_dbg("Res cnt %d", res_cnt);
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 33adeba1a31f..95738dbd5d45 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -109,10 +109,10 @@ static int pnp_dock_event(int dock, struct pnp_docking_station_info *info)
         if (!current->fs->root) {
                 return -EAGAIN;
         }
-        if (!(envp = (char **) kcalloc (20, sizeof (char *), GFP_KERNEL))) {
+        if (!(envp = kcalloc(20, sizeof (char *), GFP_KERNEL))) {
                 return -ENOMEM;
         }
-        if (!(buf = kcalloc (1, 256, GFP_KERNEL))) {
+        if (!(buf = kzalloc(256, GFP_KERNEL))) {
                 kfree (envp);
                 return -ENOMEM;
         }
@@ -220,7 +220,7 @@ static int pnpbios_get_resources(struct pnp_dev * dev, struct pnp_resource_table
         if(!pnpbios_is_dynamic(dev))
                 return -EPERM;
 
-        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
+        node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -1;
         if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) {
@@ -243,7 +243,7 @@ static int pnpbios_set_resources(struct pnp_dev * dev, struct pnp_resource_table
         if (!pnpbios_is_dynamic(dev))
                 return -EPERM;
 
-        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
+        node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -1;
         if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) {
@@ -294,7 +294,7 @@ static int pnpbios_disable_resources(struct pnp_dev *dev)
         if(dev->flags & PNPBIOS_NO_DISABLE || !pnpbios_is_dynamic(dev))
                 return -EPERM;
 
-        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
+        node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -ENOMEM;
 
@@ -336,7 +336,7 @@ static int insert_device(struct pnp_dev *dev, struct pnp_bios_node * node)
         }
 
         /* set the initial values for the PnP device */
-        dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
+        dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
         if (!dev_id)
                 return -1;
         pnpid32_to_pnpid(node->eisa_id,id);
@@ -374,7 +374,7 @@ static void __init build_devlist(void)
         struct pnp_bios_node *node;
         struct pnp_dev *dev;
 
-        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
+        node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return;
 
@@ -391,7 +391,7 @@ static void __init build_devlist(void)
                                 break;
                 }
                 nodes_got++;
-                dev =  kcalloc(1, sizeof (struct pnp_dev), GFP_KERNEL);
+                dev =  kzalloc(sizeof (struct pnp_dev), GFP_KERNEL);
                 if (!dev)
                         break;
                 if(insert_device(dev,node)<0)
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index 5a3dfc97f5e9..8027073f7919 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -87,7 +87,7 @@ static int proc_read_escd(char *buf, char **start, off_t pos,
                 return -EFBIG;
         }
 
-        tmpbuf = kcalloc(1, escd.escd_size, GFP_KERNEL);
+        tmpbuf = kzalloc(escd.escd_size, GFP_KERNEL);
         if (!tmpbuf) return -ENOMEM;
 
         if (pnp_bios_read_escd(tmpbuf, escd.nv_storage_base)) {
@@ -133,7 +133,7 @@ static int proc_read_devices(char *buf, char **start, off_t pos,
         if (pos >= 0xff)
                 return 0;
 
-        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
+        node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node) return -ENOMEM;
 
         for (nodenum=pos; nodenum<0xff; ) {
@@ -168,7 +168,7 @@ static int proc_read_node(char *buf, char **start, off_t pos,
         u8 nodenum = (long)data;
         int len;
 
-        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
+        node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node) return -ENOMEM;
         if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
                 kfree(node);
@@ -188,7 +188,7 @@ static int proc_write_node(struct file *file, const char __user *buf,
         u8 nodenum = (long)data;
         int ret = count;
 
-        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
+        node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -ENOMEM;
         if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index ef508a4de557..95b79685a9d1 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -248,7 +248,7 @@ static void
 pnpbios_parse_mem_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_mem * mem;
-        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = ((p[5] << 8) | p[4]) << 8;
@@ -264,7 +264,7 @@ static void
 pnpbios_parse_mem32_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_mem * mem;
-        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4];
@@ -280,7 +280,7 @@ static void
 pnpbios_parse_fixed_mem32_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_mem * mem;
-        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = mem->max = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4];
@@ -297,7 +297,7 @@ pnpbios_parse_irq_option(unsigned char *p, int size, struct pnp_option *option)
         struct pnp_irq * irq;
         unsigned long bits;
 
-        irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
+        irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
         bits = (p[2] << 8) | p[1];
@@ -314,7 +314,7 @@ static void
 pnpbios_parse_dma_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_dma * dma;
-        dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
+        dma = kzalloc(sizeof(struct pnp_dma), GFP_KERNEL);
         if (!dma)
                 return;
         dma->map = p[1];
@@ -327,7 +327,7 @@ static void
 pnpbios_parse_port_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_port * port;
-        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
+        port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = (p[3] << 8) | p[2];
@@ -343,7 +343,7 @@ static void
 pnpbios_parse_fixed_port_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_port * port;
-        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
+        port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = port->max = (p[2] << 8) | p[1];
@@ -527,7 +527,7 @@ pnpbios_parse_compatible_ids(unsigned char *p, unsigned char *end, struct pnp_de
                 case SMALL_TAG_COMPATDEVID: /* compatible ID */
                         if (len != 4)
                                 goto len_err;
-                        dev_id =  kcalloc(1, sizeof (struct pnp_id), GFP_KERNEL);
+                        dev_id =  kzalloc(sizeof (struct pnp_id), GFP_KERNEL);
                         if (!dev_id)
                                 return NULL;
                         memset(dev_id, 0, sizeof(struct pnp_id));
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index 5c8addcaf1fb..4f654c901c64 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -137,6 +137,9 @@ static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)
         tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year);
         tm->tm_year = at91_alarm_year - 1900;
 
+        alrm->enabled = (at91_sys_read(AT91_RTC_IMR) & AT91_RTC_ALARM)
+                        ? 1 : 0;
+
         pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,
                 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
                 tm->tm_hour, tm->tm_min, tm->tm_sec);
@@ -223,8 +226,6 @@ static int at91_rtc_proc(struct device *dev, struct seq_file *seq)
 {
         unsigned long imr = at91_sys_read(AT91_RTC_IMR);
 
-        seq_printf(seq, "alarm_IRQ\t: %s\n",
-                        (imr & AT91_RTC_ALARM) ? "yes" : "no");
         seq_printf(seq, "update_IRQ\t: %s\n",
                         (imr & AT91_RTC_ACKUPD) ? "yes" : "no");
         seq_printf(seq, "periodic_IRQ\t: %s\n",
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 828b329e08e0..94d3df62a5fa 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -435,7 +435,7 @@ static int rtc_dev_add_device(struct class_device *class_dev,
                 goto err_cdev_del;
         }
 
-        dev_info(class_dev->dev, "rtc intf: dev (%d:%d)\n",
+        dev_dbg(class_dev->dev, "rtc intf: dev (%d:%d)\n",
                 MAJOR(rtc->rtc_dev->devt),
                 MINOR(rtc->rtc_dev->devt));
 
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index eac5fb1fc02f..d59880d44fba 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -279,9 +279,8 @@ static int omap_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
         local_irq_enable();
 
         bcd2tm(&alm->time);
-        alm->pending = !!(rtc_read(OMAP_RTC_INTERRUPTS_REG)
+        alm->enabled = !!(rtc_read(OMAP_RTC_INTERRUPTS_REG)
                         & OMAP_RTC_INTERRUPTS_IT_ALARM);
-        alm->enabled = alm->pending && device_may_wakeup(dev);
 
         return 0;
 }
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index d51d8f20e634..c272afd62173 100644
--- a/drivers/rtc/rtc-proc.c
+++ b/drivers/rtc/rtc-proc.c
@@ -65,7 +65,7 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
                         seq_printf(seq, "%02d\n", alrm.time.tm_mday);
                 else
                         seq_printf(seq, "**\n");
-                seq_printf(seq, "alrm_wakeup\t: %s\n",
+                seq_printf(seq, "alarm_IRQ\t: %s\n",
                                 alrm.enabled ? "yes" : "no");
                 seq_printf(seq, "alrm_pending\t: %s\n",
                                 alrm.pending ? "yes" : "no");
@@ -120,7 +120,7 @@ static int rtc_proc_add_device(struct class_device *class_dev,
                         ent->owner = rtc->owner;
                         ent->data = class_dev;
 
-                        dev_info(class_dev->dev, "rtc intf: proc\n");
+                        dev_dbg(class_dev->dev, "rtc intf: proc\n");
                 }
                 else
                         rtc_dev = NULL;
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index e301dea57bb3..f406a2b55aea 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -191,6 +191,8 @@ static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
 
         alm_en = readb(base + S3C2410_RTCALM);
 
+        alrm->enabled = (alm_en & S3C2410_RTCALM_ALMEN) ? 1 : 0;
+
         pr_debug("read alarm %02x %02x.%02x.%02x %02x/%02x/%02x\n",
                  alm_en,
                  alm_tm->tm_year, alm_tm->tm_mon, alm_tm->tm_mday,
@@ -331,12 +333,8 @@ static int s3c_rtc_ioctl(struct device *dev,
 
 static int s3c_rtc_proc(struct device *dev, struct seq_file *seq)
 {
-        unsigned int rtcalm = readb(s3c_rtc_base + S3C2410_RTCALM);
         unsigned int ticnt = readb(s3c_rtc_base + S3C2410_TICNT);
 
-        seq_printf(seq, "alarm_IRQ\t: %s\n",
-                   (rtcalm & S3C2410_RTCALM_ALMEN) ? "yes" : "no" );
-
         seq_printf(seq, "periodic_IRQ\t: %s\n",
                      (ticnt & S3C2410_TICNT_ENABLE) ? "yes" : "no" );
 
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index bd4d7d174ef4..9c8ead43a59c 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -289,9 +289,7 @@ static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 
 static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq)
 {
-        seq_printf(seq, "trim/divider\t: 0x%08lx\n", RTTR);
-        seq_printf(seq, "alarm_IRQ\t: %s\n",
-                        (RTSR & RTSR_ALE) ? "yes" : "no" );
+        seq_printf(seq, "trim/divider\t: 0x%08x\n", (u32) RTTR);
         seq_printf(seq, "update_IRQ\t: %s\n",
                         (RTSR & RTSR_HZE) ? "yes" : "no");
         seq_printf(seq, "periodic_IRQ\t: %s\n",
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index 625637b84d33..9418a59fb368 100644
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -83,7 +83,7 @@ static int __devinit rtc_sysfs_add_device(struct class_device *class_dev,
 {
         int err;
 
-        dev_info(class_dev->dev, "rtc intf: sysfs\n");
+        dev_dbg(class_dev->dev, "rtc intf: sysfs\n");
 
         err = sysfs_create_group(&class_dev->kobj, &rtc_attr_group);
         if (err)
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index c9321b920e90..25b5d7a66417 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -688,7 +688,7 @@ raw3215_probe (struct ccw_device *cdev)
         raw->cdev = cdev;
         raw->inbuf = (char *) raw + sizeof(struct raw3215_info);
         memset(raw, 0, sizeof(struct raw3215_info));
-        raw->buffer = (char *) kmalloc(RAW3215_BUFFER_SIZE,
+        raw->buffer = kmalloc(RAW3215_BUFFER_SIZE,
                                        GFP_KERNEL|GFP_DMA);
         if (raw->buffer == NULL) {
                 spin_lock(&raw3215_device_lock);
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index e3491a5f5219..3e86fd1756e5 100644
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -377,7 +377,7 @@ do_kdsk_ioctl(struct kbd_data *kbd, struct kbentry __user *user_kbe,
                 if (!(key_map = kbd->key_maps[tmp.kb_table])) {
                         int j;
 
-                        key_map = (ushort *) kmalloc(sizeof(plain_map),
+                        key_map = kmalloc(sizeof(plain_map),
                                                      GFP_KERNEL);
                         if (!key_map)
                                 return -ENOMEM;
diff --git a/drivers/s390/char/sclp_cpi.c b/drivers/s390/char/sclp_cpi.c
index 732dfbdb85c4..f7c10d954ec6 100644
--- a/drivers/s390/char/sclp_cpi.c
+++ b/drivers/s390/char/sclp_cpi.c
@@ -127,7 +127,7 @@ cpi_prepare_req(void)
         struct cpi_sccb *sccb;
         struct cpi_evbuf *evb;
 
-        req = (struct sclp_req *) kmalloc(sizeof(struct sclp_req), GFP_KERNEL);
+        req = kmalloc(sizeof(struct sclp_req), GFP_KERNEL);
         if (req == NULL)
                 return ERR_PTR(-ENOMEM);
         sccb = (struct cpi_sccb *) __get_free_page(GFP_KERNEL | GFP_DMA);
diff --git a/drivers/s390/crypto/zcrypt_cex2a.c b/drivers/s390/crypto/zcrypt_cex2a.c
index a62b00083d0c..5bb13a9d0898 100644
--- a/drivers/s390/crypto/zcrypt_cex2a.c
+++ b/drivers/s390/crypto/zcrypt_cex2a.c
@@ -295,7 +295,7 @@ static long zcrypt_cex2a_modexpo(struct zcrypt_device *zdev,
         struct completion work;
         int rc;
 
-        ap_msg.message = (void *) kmalloc(CEX2A_MAX_MESSAGE_SIZE, GFP_KERNEL);
+        ap_msg.message = kmalloc(CEX2A_MAX_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
@@ -337,7 +337,7 @@ static long zcrypt_cex2a_modexpo_crt(struct zcrypt_device *zdev,
         struct completion work;
         int rc;
 
-        ap_msg.message = (void *) kmalloc(CEX2A_MAX_MESSAGE_SIZE, GFP_KERNEL);
+        ap_msg.message = kmalloc(CEX2A_MAX_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
diff --git a/drivers/s390/crypto/zcrypt_pcica.c b/drivers/s390/crypto/zcrypt_pcica.c
index b6a4ecdc8025..32e37014345c 100644
--- a/drivers/s390/crypto/zcrypt_pcica.c
+++ b/drivers/s390/crypto/zcrypt_pcica.c
@@ -279,7 +279,7 @@ static long zcrypt_pcica_modexpo(struct zcrypt_device *zdev,
         struct completion work;
         int rc;
 
-        ap_msg.message = (void *) kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
+        ap_msg.message = kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
@@ -321,7 +321,7 @@ static long zcrypt_pcica_modexpo_crt(struct zcrypt_device *zdev,
         struct completion work;
         int rc;
 
-        ap_msg.message = (void *) kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
+        ap_msg.message = kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c
index 2da8b9381407..b7153c1e15cd 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.c
+++ b/drivers/s390/crypto/zcrypt_pcixcc.c
@@ -717,7 +717,7 @@ long zcrypt_pcixcc_send_cprb(struct zcrypt_device *zdev, struct ica_xcRB *xcRB)
         };
         int rc;
 
-        ap_msg.message = (void *) kmalloc(PCIXCC_MAX_XCRB_MESSAGE_SIZE, GFP_KERNEL);
+        ap_msg.message = kmalloc(PCIXCC_MAX_XCRB_MESSAGE_SIZE, GFP_KERNEL);
         if (!ap_msg.message)
                 return -ENOMEM;
         ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c
index 3257c22dd79c..03cc263fe0da 100644
--- a/drivers/s390/net/ctcmain.c
+++ b/drivers/s390/net/ctcmain.c
@@ -1646,7 +1646,7 @@ add_channel(struct ccw_device *cdev, enum channel_types type)
                 return -1;
         }
         memset(ch, 0, sizeof (struct channel));
-        if ((ch->ccw = (struct ccw1 *) kmalloc(8*sizeof(struct ccw1),
+        if ((ch->ccw = kmalloc(8*sizeof(struct ccw1),
                                                GFP_KERNEL | GFP_DMA)) == NULL) {
                 kfree(ch);
                 ctc_pr_warn("ctc: Out of memory in add_channel\n");
@@ -1693,7 +1693,7 @@ add_channel(struct ccw_device *cdev, enum channel_types type)
                 return -1;
         }
         fsm_newstate(ch->fsm, CH_STATE_IDLE);
-        if ((ch->irb = (struct irb *) kmalloc(sizeof (struct irb),
+        if ((ch->irb = kmalloc(sizeof (struct irb),
                                               GFP_KERNEL)) == NULL) {
                 ctc_pr_warn("ctc: Out of memory in add_channel\n");
                 kfree_fsm(ch->fsm);
@@ -2535,7 +2535,7 @@ ctc_print_statistics(struct ctc_priv *priv)
         DBF_TEXT(trace, 4, __FUNCTION__);
         if (!priv)
                 return;
-        sbuf = (char *)kmalloc(2048, GFP_KERNEL);
+        sbuf = kmalloc(2048, GFP_KERNEL);
         if (sbuf == NULL)
                 return;
         p = sbuf;
diff --git a/drivers/s390/net/iucv.c b/drivers/s390/net/iucv.c
index 1476ce2b437c..229aeb5fc399 100644
--- a/drivers/s390/net/iucv.c
+++ b/drivers/s390/net/iucv.c
@@ -772,7 +772,7 @@ iucv_register_program (__u8 pgmname[16],
         }
 
         /* Allocate handler entry */
-        new_handler = (handler *)kmalloc(sizeof(handler), GFP_ATOMIC);
+        new_handler = kmalloc(sizeof(handler), GFP_ATOMIC);
         if (new_handler == NULL) {
                 printk(KERN_WARNING "%s: storage allocation for new handler "
                        "failed.\n", __FUNCTION__);
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 5d39b2df0cc4..85093b71f9fa 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -237,7 +237,7 @@ zfcp_device_setup(char *devstr)
                 return 0;
 
         len = strlen(devstr) + 1;
-        str = (char *) kmalloc(len, GFP_KERNEL);
+        str = kmalloc(len, GFP_KERNEL);
         if (!str)
                 goto err_out;
         memcpy(str, devstr, len);
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index 2722af5d3404..386e7de0b7e3 100644
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -659,7 +659,7 @@ static int vfc_probe(void)
         if (!cards)
                 return -ENODEV;
 
-        vfc_dev_lst = (struct vfc_dev **)kmalloc(sizeof(struct vfc_dev *) *
+        vfc_dev_lst = kmalloc(sizeof(struct vfc_dev *) *
                                                  (cards+1),
                                                  GFP_KERNEL);
         if (vfc_dev_lst == NULL)
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index ac108f9e2674..426cd6f49f5d 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -288,7 +288,7 @@ int aac_get_containers(struct aac_dev *dev)
 
         if (maximum_num_containers < MAXIMUM_NUM_CONTAINERS)
                 maximum_num_containers = MAXIMUM_NUM_CONTAINERS;
-        fsa_dev_ptr = (struct fsa_dev_info *) kmalloc(
+        fsa_dev_ptr = kmalloc(
           sizeof(*fsa_dev_ptr) * maximum_num_containers, GFP_KERNEL);
         if (!fsa_dev_ptr) {
                 aac_fib_free(fibptr);
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index d5cf8b91a0e7..6d305b2f854e 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -386,7 +386,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
          *      Ok now init the communication subsystem
          */
 
-        dev->queues = (struct aac_queue_block *) kmalloc(sizeof(struct aac_queue_block), GFP_KERNEL);
+        dev->queues = kmalloc(sizeof(struct aac_queue_block), GFP_KERNEL);
         if (dev->queues == NULL) {
                 printk(KERN_ERR "Error could not allocate comm region.\n");
                 return NULL;
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index d7a61a6bdaae..1d239f6c0103 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -699,7 +699,7 @@ static int aha1542_queuecommand(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))
 #endif
                 int i;
                 ccb[mbo].op = 2;        /* SCSI Initiator Command  w/scatter-gather */
-                SCpnt->host_scribble = (unsigned char *) kmalloc(512, GFP_KERNEL | GFP_DMA);
+                SCpnt->host_scribble = kmalloc(512, GFP_KERNEL | GFP_DMA);
                 sgpnt = (struct scatterlist *) SCpnt->request_buffer;
                 cptr = (struct chain *) SCpnt->host_scribble;
                 if (cptr == NULL) {
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
index 46eed10b25d9..7d1fec620948 100644
--- a/drivers/scsi/aic7xxx_old.c
+++ b/drivers/scsi/aic7xxx_old.c
@@ -2565,7 +2565,7 @@ aic7xxx_allocate_scb(struct aic7xxx_host *p)
       }
     }
     scb_count = min( (i-1), p->scb_data->maxscbs - p->scb_data->numscbs);
-    scb_ap = (struct aic7xxx_scb *)kmalloc(sizeof (struct aic7xxx_scb) * scb_count
+    scb_ap = kmalloc(sizeof (struct aic7xxx_scb) * scb_count
                                            + sizeof(struct aic7xxx_scb_dma), GFP_ATOMIC);
     if (scb_ap == NULL)
       return(0);
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index e95b367d09ed..a965ed3548d5 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -4319,7 +4319,7 @@ static int __devinit adapter_sg_tables_alloc(struct AdapterCtlBlk *acb)
 
         dprintkdbg(DBG_1, "Allocate %i pages for SG tables\n", pages);
         while (pages--) {
-                ptr = (struct SGentry *)kmalloc(PAGE_SIZE, GFP_KERNEL);
+                ptr = kmalloc(PAGE_SIZE, GFP_KERNEL);
                 if (!ptr) {
                         adapter_sg_tables_free(acb);
                         return 1;
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 60b1b434eba7..365db537a28d 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -297,7 +297,7 @@ static void adpt_inquiry(adpt_hba* pHba)
         s32 rcode;
 
         memset(msg, 0, sizeof(msg));
-        buf = (u8*)kmalloc(80,GFP_KERNEL|ADDR32);
+        buf = kmalloc(80,GFP_KERNEL|ADDR32);
         if(!buf){
                 printk(KERN_ERR"%s: Could not allocate buffer\n",pHba->name);
                 return;
@@ -1311,7 +1311,7 @@ static s32 adpt_i2o_reset_hba(adpt_hba* pHba)
                 schedule_timeout_uninterruptible(1);
         } while (m == EMPTY_QUEUE);
 
-        status = (u8*)kmalloc(4, GFP_KERNEL|ADDR32);
+        status = kmalloc(4, GFP_KERNEL|ADDR32);
         if(status == NULL) {
                 adpt_send_nop(pHba, m);
                 printk(KERN_ERR"IOP reset failed - no free memory.\n");
@@ -1444,7 +1444,7 @@ static int adpt_i2o_parse_lct(adpt_hba* pHba)
                         }
                         continue;
                 }
-                d = (struct i2o_device *)kmalloc(sizeof(struct i2o_device), GFP_KERNEL);
+                d = kmalloc(sizeof(struct i2o_device), GFP_KERNEL);
                 if(d==NULL)
                 {
                         printk(KERN_CRIT"%s: Out of memory for I2O device data.\n",pHba->name);
@@ -2425,7 +2425,7 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
                                 pDev = pDev->next_lun;
                         }
                         if(!pDev ) { // Something new add it
-                                d = (struct i2o_device *)kmalloc(sizeof(struct i2o_device), GFP_KERNEL);
+                                d = kmalloc(sizeof(struct i2o_device), GFP_KERNEL);
                                 if(d==NULL)
                                 {
                                         printk(KERN_CRIT "Out of memory for I2O device data.\n");
@@ -2728,7 +2728,7 @@ static s32 adpt_i2o_init_outbound_q(adpt_hba* pHba)
 
         kfree(pHba->reply_pool);
 
-        pHba->reply_pool = (u32*)kmalloc(pHba->reply_fifo_size * REPLY_FRAME_SIZE * 4, GFP_KERNEL|ADDR32);
+        pHba->reply_pool = kmalloc(pHba->reply_fifo_size * REPLY_FRAME_SIZE * 4, GFP_KERNEL|ADDR32);
         if(!pHba->reply_pool){
                 printk(KERN_ERR"%s: Could not allocate reply pool\n",pHba->name);
                 return -1;
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index f160357e37a6..d561663fb4e4 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -2828,7 +2828,7 @@ static int i91u_detect(struct scsi_host_template * tpnt)
 
         for (; tul_num_scb >= MAX_TARGETS + 3; tul_num_scb--) {
                 i = tul_num_ch * tul_num_scb * sizeof(SCB);
-                if ((tul_scb = (SCB *) kmalloc(i, GFP_ATOMIC | GFP_DMA)) != NULL)
+                if ((tul_scb = kmalloc(i, GFP_ATOMIC | GFP_DMA)) != NULL)
                         break;
         }
         if (tul_scb == NULL) {
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 824fe080d1dc..7d2311067903 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -5777,7 +5777,7 @@ static int osst_probe(struct device *dev)
         dev_num = i;
 
         /* allocate a struct osst_tape for this device */
-        tpnt = (struct osst_tape *)kmalloc(sizeof(struct osst_tape), GFP_ATOMIC);
+        tpnt = kmalloc(sizeof(struct osst_tape), GFP_ATOMIC);
         if (tpnt == NULL) {
                 write_unlock(&os_scsi_tapes_lock);
                 printk(KERN_ERR "osst :E: Can't allocate device descriptor, device not attached.\n");
diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c
index aa60a5f1fbc3..3b2e1a53e6e2 100644
--- a/drivers/scsi/pluto.c
+++ b/drivers/scsi/pluto.c
@@ -117,7 +117,7 @@ int __init pluto_detect(struct scsi_host_template *tpnt)
 #endif
                         return 0;
         }
-        fcs = (struct ctrl_inquiry *) kmalloc (sizeof (struct ctrl_inquiry) * fcscount, GFP_DMA);
+        fcs = kmalloc(sizeof (struct ctrl_inquiry) * fcscount, GFP_DMA);
         if (!fcs) {
                 printk ("PLUTO: Not enough memory to probe\n");
                 return 0;
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index d1268cb46837..0578ba42718b 100644
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -546,7 +546,7 @@ int sr_is_xa(Scsi_CD *cd)
         if (!xa_test)
                 return 0;
 
-        raw_sector = (unsigned char *) kmalloc(2048, GFP_KERNEL | SR_GFP_DMA(cd));
+        raw_sector = kmalloc(2048, GFP_KERNEL | SR_GFP_DMA(cd));
         if (!raw_sector)
                 return -ENOMEM;
         if (0 == sr_read_sector(cd, cd->ms_offset + 16,
diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c
index a3e9d0f2eb5b..4eb3da996b36 100644
--- a/drivers/scsi/sr_vendor.c
+++ b/drivers/scsi/sr_vendor.c
@@ -117,7 +117,7 @@ int sr_set_blocklength(Scsi_CD *cd, int blocklength)
                 density = (blocklength > 2048) ? 0x81 : 0x83;
 #endif
 
-        buffer = (unsigned char *) kmalloc(512, GFP_KERNEL | GFP_DMA);
+        buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
         if (!buffer)
                 return -ENOMEM;
 
@@ -164,7 +164,7 @@ int sr_cd_check(struct cdrom_device_info *cdi)
         if (cd->cdi.mask & CDC_MULTI_SESSION)
                 return 0;
 
-        buffer = (unsigned char *) kmalloc(512, GFP_KERNEL | GFP_DMA);
+        buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
         if (!buffer)
                 return -ENOMEM;
 
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index 940fa1e6f994..21cd4c7f5289 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -5545,7 +5545,7 @@ int sym_hcb_attach(struct Scsi_Host *shost, struct sym_fw *fw, struct sym_nvram
         /*
          *  Allocate the array of lists of CCBs hashed by DSA.
          */
-        np->ccbh = kcalloc(sizeof(struct sym_ccb **), CCB_HASH_SIZE, GFP_KERNEL);
+        np->ccbh = kcalloc(CCB_HASH_SIZE, sizeof(struct sym_ccb **), GFP_KERNEL);
         if (!np->ccbh)
                 goto attach_failed;
 
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 4d0ff8f4a01b..52e2e64c6649 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -2239,6 +2239,30 @@ static struct pci_device_id serial_pci_tbl[] = {
                 pbn_b0_bt_1_460800 },
 
         /*
+         * Korenix Jetcard F0/F1 cards (JC1204, JC1208, JC1404, JC1408).
+         * Cards are identified by their subsystem vendor IDs, which
+         * (in hex) match the model number.
+         *
+         * Note that JC140x are RS422/485 cards which require ox950
+         * ACR = 0x10, and as such are not currently fully supported.
+         */
+        {       PCI_VENDOR_ID_KORENIX, PCI_DEVICE_ID_KORENIX_JETCARDF0,
+                0x1204, 0x0004, 0, 0,
+                pbn_b0_4_921600 },
+        {       PCI_VENDOR_ID_KORENIX, PCI_DEVICE_ID_KORENIX_JETCARDF0,
+                0x1208, 0x0004, 0, 0,
+                pbn_b0_4_921600 },
+/*      {       PCI_VENDOR_ID_KORENIX, PCI_DEVICE_ID_KORENIX_JETCARDF0,
+                0x1402, 0x0002, 0, 0,
+                pbn_b0_2_921600 }, */
+/*      {       PCI_VENDOR_ID_KORENIX, PCI_DEVICE_ID_KORENIX_JETCARDF0,
+                0x1404, 0x0004, 0, 0,
+                pbn_b0_4_921600 }, */
+        {       PCI_VENDOR_ID_KORENIX, PCI_DEVICE_ID_KORENIX_JETCARDF1,
+                0x1208, 0x0004, 0, 0,
+                pbn_b0_4_921600 },
+
+        /*
          * Dell Remote Access Card 4 - Tim_T_Murphy@Dell.com
          */
         {       PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_RAC4,
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 0b36dd5cdac2..2978c09860ee 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -663,7 +663,7 @@ config V850E_UART
 
 config V850E_UARTB
         bool
-        depends V850E_UART && V850E_ME2
+        depends on V850E_UART && V850E_ME2
         default y
 
 config V850E_UART_CONSOLE
@@ -909,7 +909,7 @@ config SERIAL_M32R_PLDSIO
 
 config SERIAL_TXX9
         bool "TMPTX39XX/49XX SIO support"
-        depends HAS_TXX9_SERIAL
+        depends on HAS_TXX9_SERIAL
         select SERIAL_CORE
         default y
 
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index 7d623003e65e..71e6a24d8c28 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -1510,7 +1510,7 @@ static int __devinit icom_probe(struct pci_dev *dev,
         }
 
         if ( (retval = pci_request_regions(dev, "icom"))) {
-                 dev_err(&dev->dev, "pci_request_region FAILED\n");
+                 dev_err(&dev->dev, "pci_request_regions FAILED\n");
                  pci_disable_device(dev);
                  return retval;
          }
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 72f3db99ff94..3e0abbb49fe1 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -598,7 +598,7 @@ at91_ep_alloc_request(struct usb_ep *_ep, unsigned int gfp_flags)
 {
         struct at91_request *req;
 
-        req = kcalloc(1, sizeof (struct at91_request), gfp_flags);
+        req = kzalloc(sizeof (struct at91_request), gfp_flags);
         if (!req)
                 return NULL;
 
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 5516c59ed5ec..2d12bf9f19d6 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -2195,7 +2195,7 @@ static struct gs_buf *gs_buf_alloc(unsigned int size, gfp_t kmalloc_flags)
         if (size == 0)
                 return NULL;
 
-        gb = (struct gs_buf *)kmalloc(sizeof(struct gs_buf), kmalloc_flags);
+        gb = kmalloc(sizeof(struct gs_buf), kmalloc_flags);
         if (gb == NULL)
                 return NULL;
 
diff --git a/drivers/usb/host/hc_crisv10.c b/drivers/usb/host/hc_crisv10.c
index 9325e46a68c0..282d82efc0b0 100644
--- a/drivers/usb/host/hc_crisv10.c
+++ b/drivers/usb/host/hc_crisv10.c
@@ -365,7 +365,7 @@ static inline struct urb *urb_list_first(int epid)
 /* Adds an urb_entry last in the list for this epid. */
 static inline void urb_list_add(struct urb *urb, int epid)
 {
-        urb_entry_t *urb_entry = (urb_entry_t *)kmalloc(sizeof(urb_entry_t), KMALLOC_FLAG);
+        urb_entry_t *urb_entry = kmalloc(sizeof(urb_entry_t), KMALLOC_FLAG);
         assert(urb_entry);
 
         urb_entry->urb = urb;
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index c703f73e1655..6c7f3efb1d40 100644
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -766,7 +766,7 @@ static int auerbuf_setup (pauerbufctl_t bcp, unsigned int numElements, unsigned
                 bep->bufp = kmalloc (bufsize, GFP_KERNEL);
                 if (!bep->bufp)
                         goto bl_fail;
-                bep->dr = (struct usb_ctrlrequest *) kmalloc (sizeof (struct usb_ctrlrequest), GFP_KERNEL);
+                bep->dr = kmalloc(sizeof (struct usb_ctrlrequest), GFP_KERNEL);
                 if (!bep->dr)
                         goto bl_fail;
                 bep->urbp = usb_alloc_urb (0, GFP_KERNEL);
@@ -1969,7 +1969,7 @@ static int auerswald_probe (struct usb_interface *intf,
         info("device is a %s", cp->dev_desc);
 
         /* get the maximum allowed control transfer length */
-        pbuf = (__le16 *) kmalloc (2, GFP_KERNEL);    /* use an allocated buffer because of urb target */
+        pbuf = kmalloc(2, GFP_KERNEL);    /* use an allocated buffer because of urb target */
         if (!pbuf) {
                 err( "out of memory");
                 goto pfail;
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 7e8a0acd52ee..70250252ae2a 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -705,7 +705,7 @@ static int uss720_probe(struct usb_interface *intf,
         /*
          * Allocate parport interface 
          */
-        if (!(priv = kcalloc(sizeof(struct parport_uss720_private), 1, GFP_KERNEL))) {
+        if (!(priv = kzalloc(sizeof(struct parport_uss720_private), GFP_KERNEL))) {
                 usb_put_dev(usbdev);
                 return -ENOMEM;
         }
diff --git a/drivers/usb/net/rndis_host.c b/drivers/usb/net/rndis_host.c
index 99f26b3e502f..ea5f44de3de2 100644
--- a/drivers/usb/net/rndis_host.c
+++ b/drivers/usb/net/rndis_host.c
@@ -469,7 +469,7 @@ static void rndis_unbind(struct usbnet *dev, struct usb_interface *intf)
         struct rndis_halt       *halt;
 
         /* try to clear any rndis state/activity (no i/o from stack!) */
-        halt = kcalloc(1, sizeof *halt, GFP_KERNEL);
+        halt = kzalloc(sizeof *halt, GFP_KERNEL);
         if (halt) {
                 halt->msg_type = RNDIS_MSG_HALT;
                 halt->msg_len = ccpu2(sizeof *halt);
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index a1fdb85b8c0a..45cdf9bc43b2 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -1493,7 +1493,7 @@ static struct cypress_buf *cypress_buf_alloc(unsigned int size)
         if (size == 0)
                 return NULL;
 
-        cb = (struct cypress_buf *)kmalloc(sizeof(struct cypress_buf), GFP_KERNEL);
+        cb = kmalloc(sizeof(struct cypress_buf), GFP_KERNEL);
         if (cb == NULL)
                 return NULL;
 
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 9d9ea874639c..efd9ce3f931f 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -1681,7 +1681,7 @@ dbg( "digi_startup: TOP" );
         for( i=0; i<serial->type->num_ports+1; i++ ) {
 
                 /* allocate port private structure */
-                priv = (struct digi_port *)kmalloc( sizeof(struct digi_port),
+                priv = kmalloc( sizeof(struct digi_port),
                         GFP_KERNEL );
                 if( priv == (struct digi_port *)0 ) {
                         while( --i >= 0 )
@@ -1714,7 +1714,7 @@ dbg( "digi_startup: TOP" );
         }
 
         /* allocate serial private structure */
-        serial_priv = (struct digi_serial *)kmalloc( sizeof(struct digi_serial),
+        serial_priv = kmalloc( sizeof(struct digi_serial),
                 GFP_KERNEL );
         if( serial_priv == (struct digi_serial *)0 ) {
                 for( i=0; i<serial->type->num_ports+1; i++ )
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 2da2684e0809..980285c0233a 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2811,7 +2811,7 @@ static struct edge_buf *edge_buf_alloc(unsigned int size)
         if (size == 0)
                 return NULL;
 
-        eb = (struct edge_buf *)kmalloc(sizeof(struct edge_buf), GFP_KERNEL);
+        eb = kmalloc(sizeof(struct edge_buf), GFP_KERNEL);
         if (eb == NULL)
                 return NULL;
 
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index d72cf8bc7f76..42f757a5b876 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -595,7 +595,7 @@ static int ipaq_open(struct usb_serial_port *port, struct file *filp)
 
         bytes_in = 0;
         bytes_out = 0;
-        priv = (struct ipaq_private *)kmalloc(sizeof(struct ipaq_private), GFP_KERNEL);
+        priv = kmalloc(sizeof(struct ipaq_private), GFP_KERNEL);
         if (priv == NULL) {
                 err("%s - Out of memory", __FUNCTION__);
                 return -ENOMEM;
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index e284d6c0fd35..62bea0c923bd 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -269,7 +269,7 @@ static int kobil_open (struct usb_serial_port *port, struct file *filp)
         }
 
         // allocate memory for write_urb transfer buffer
-        port->write_urb->transfer_buffer = (unsigned char *) kmalloc(write_urb_transfer_buffer_length, GFP_KERNEL);
+        port->write_urb->transfer_buffer = kmalloc(write_urb_transfer_buffer_length, GFP_KERNEL);
         if (! port->write_urb->transfer_buffer) {
                 kfree(transfer_buffer);
                 usb_free_urb(port->write_urb);
@@ -696,7 +696,7 @@ static int  kobil_ioctl(struct usb_serial_port *port, struct file *file,
                 return 0;
 
         case TCFLSH:   // 0x540B
-                transfer_buffer = (unsigned char *) kmalloc(transfer_buffer_length, GFP_KERNEL);
+                transfer_buffer = kmalloc(transfer_buffer_length, GFP_KERNEL);
                 if (! transfer_buffer) {
                         return -ENOBUFS;
                 }
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index d124d780e42e..5dc2ac9afa90 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -159,7 +159,7 @@ static struct pl2303_buf *pl2303_buf_alloc(unsigned int size)
         if (size == 0)
                 return NULL;
 
-        pb = (struct pl2303_buf *)kmalloc(sizeof(struct pl2303_buf), GFP_KERNEL);
+        pb = kmalloc(sizeof(struct pl2303_buf), GFP_KERNEL);
         if (pb == NULL)
                 return NULL;
 
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index f42eb9ea6405..83189005c6fb 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -1710,7 +1710,7 @@ static struct circ_buf *ti_buf_alloc(void)
 {
         struct circ_buf *cb;
 
-        cb = (struct circ_buf *)kmalloc(sizeof(struct circ_buf), GFP_KERNEL);
+        cb = kmalloc(sizeof(struct circ_buf), GFP_KERNEL);
         if (cb == NULL)
                 return NULL;
 
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index dc45e58e2b8c..5483d8564c1b 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -416,7 +416,7 @@ static int whiteheat_attach (struct usb_serial *serial)
         for (i = 0; i < serial->num_ports; i++) {
                 port = serial->port[i];
 
-                info = (struct whiteheat_private *)kmalloc(sizeof(struct whiteheat_private), GFP_KERNEL);
+                info = kmalloc(sizeof(struct whiteheat_private), GFP_KERNEL);
                 if (info == NULL) {
                         err("%s: Out of memory for port structures\n", serial->type->description);
                         goto no_private;
@@ -487,7 +487,7 @@ static int whiteheat_attach (struct usb_serial *serial)
                 usb_set_serial_port_data(port, info);
         }
 
-        command_info = (struct whiteheat_command_private *)kmalloc(sizeof(struct whiteheat_command_private), GFP_KERNEL);
+        command_info = kmalloc(sizeof(struct whiteheat_command_private), GFP_KERNEL);
         if (command_info == NULL) {
                 err("%s: Out of memory for port structures\n", serial->type->description);
                 goto no_command_private;
diff --git a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c
index fb8bacaae27c..e3528eca29a5 100644
--- a/drivers/usb/storage/sddr09.c
+++ b/drivers/usb/storage/sddr09.c
@@ -646,7 +646,7 @@ sddr09_read_sg_test_only(struct us_data *us) {
                 return result;
         }
 
-        buf = (unsigned char *) kmalloc(bulklen, GFP_NOIO);
+        buf = kmalloc(bulklen, GFP_NOIO);
         if (!buf)
                 return -ENOMEM;
 
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index 6761b68c35e9..6c9dc2e69c82 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -447,7 +447,7 @@ static int clcdfb_probe(struct amba_device *dev, void *id)
                 goto out;
         }
 
-        fb = (struct clcd_fb *) kmalloc(sizeof(struct clcd_fb), GFP_KERNEL);
+        fb = kmalloc(sizeof(struct clcd_fb), GFP_KERNEL);
         if (!fb) {
                 printk(KERN_INFO "CLCD: could not allocate new clcd_fb struct\n");
                 ret = -ENOMEM;
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 88a47845c4f7..1a849b870bcc 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2906,14 +2906,6 @@ static int ami_decode_var(struct fb_var_screeninfo *var,
         par->crsr.spot_x = par->crsr.spot_y = 0;
         par->crsr.height = par->crsr.width = 0;
 
-#if 0   /* fbmon not done.  uncomment for 2.5.x -brad */
-        if (!fbmon_valid_timings(pixclock[clk_shift], htotal, vtotal,
-                                 &fb_info)) {
-                DPRINTK("mode doesn't fit for monitor\n");
-                return -EINVAL;
-        }
-#endif
-
         return 0;
 }
 
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 176f9b85cdbe..09684d7a7ce9 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -1488,10 +1488,6 @@ static int atyfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
         else
                 info->var.accel_flags = 0;
 
-#if 0 /* fbmon is not done. uncomment for 2.5.x -brad */
-        if (!fbmon_valid_timings(pixclock, htotal, vtotal, info))
-                return -EINVAL;
-#endif
         aty_crtc_to_var(&crtc, var);
         var->pixclock = par->pll_ops->pll_to_var(info, &pll);
         return 0;
diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c
index 797b42305b0f..fe28848e7b52 100644
--- a/drivers/video/matrox/i2c-matroxfb.c
+++ b/drivers/video/matrox/i2c-matroxfb.c
@@ -146,7 +146,7 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) {
         unsigned long flags;
         struct matroxfb_dh_maven_info* m2info;
 
-        m2info = (struct matroxfb_dh_maven_info*)kmalloc(sizeof(*m2info), GFP_KERNEL);
+        m2info = kmalloc(sizeof(*m2info), GFP_KERNEL);
         if (!m2info)
                 return NULL;
 
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index e9b4115fcad0..cb2aa402ddfd 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -2028,7 +2028,7 @@ static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dumm
         }
 
 #ifdef CONFIG_FB_MATROX_MULTIHEAD
-        minfo = (struct matrox_fb_info*)kmalloc(sizeof(*minfo), GFP_KERNEL);
+        minfo = kmalloc(sizeof(*minfo), GFP_KERNEL);
         if (!minfo)
                 return -1;
 #else
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index 27eb4bb4f89f..2c9801090fae 100644
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -694,7 +694,7 @@ static void* matroxfb_crtc2_probe(struct matrox_fb_info* minfo) {
         /* hardware is CRTC2 incapable... */
         if (!ACCESS_FBINFO(devflags.crtc2))
                 return NULL;
-        m2info = (struct matroxfb_dh_fb_info*)kmalloc(sizeof(*m2info), GFP_KERNEL);
+        m2info = kmalloc(sizeof(*m2info), GFP_KERNEL);
         if (!m2info) {
                 printk(KERN_ERR "matroxfb_crtc2: Not enough memory for CRTC2 control structs\n");
                 return NULL;
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 711cb11d6eb3..59cd1e750f30 100644
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -21,6 +21,11 @@
  *      Remove never finished and bogus 24/32bit support
  *      Clean up macro abuse
  *      Minor tidying for format.
+ * 12/2006 Helge Deller    <deller@gmx.de>
+ *      add /sys/class/graphics/fbX/vgapass sysfs-interface
+ *      add module option "mode_option" to set initial screen mode
+ *      use fbdev default videomode database
+ *      remove debug functions from ioctl
  */
 
 /*
@@ -65,19 +70,10 @@
  *
  * sstfb specific ioctls:
  *              toggle vga (0x46db) : toggle vga_pass_through
- *              fill fb    (0x46dc) : fills fb
- *              test disp  (0x46de) : draws a test image
  */
 
 #undef SST_DEBUG
 
-/*
-  Default video mode .
-  0 800x600@60  took from glide
-  1 640x480@75  took from glide
-  2 1024x768@76 std fb.mode
-  3 640x480@60  glide default */
-#define DEFAULT_MODE 3 
 
 /*
  * Includes
@@ -92,20 +88,24 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <asm/io.h>
-#include <asm/ioctl.h>
 #include <asm/uaccess.h>
 #include <video/sstfb.h>
 
 
 /* initialized by setup */
 
-static int vgapass;             /* enable Vga passthrough cable */
+static int vgapass;             /* enable VGA passthrough cable */
 static int mem;                 /* mem size in MB, 0 = autodetect */
 static int clipping = 1;        /* use clipping (slower, safer) */
 static int gfxclk;              /* force FBI freq in Mhz . Dangerous */
 static int slowpci;             /* slow PCI settings */
 
-static char *mode_option __devinitdata;
+/*
+  Possible default video modes: 800x600@60, 640x480@75, 1024x768@76, 640x480@60
+*/
+#define DEFAULT_VIDEO_MODE "640x480@60"
+
+static char *mode_option __devinitdata = DEFAULT_VIDEO_MODE;
 
 enum {
         ID_VOODOO1 = 0,
@@ -119,48 +119,11 @@ static struct sst_spec voodoo_spec[] __devinitdata = {
  { .name = "Voodoo2",         .default_gfx_clock = 75000, .max_gfxclk = 85 },
 };
 
-static struct fb_var_screeninfo sstfb_default =
-#if ( DEFAULT_MODE == 0 )
-    { /* 800x600@60, 16 bpp .borowed from glide/sst1/include/sst1init.h */
-    800, 600, 800, 600, 0, 0, 16, 0,
-    {11, 5, 0}, {5, 6, 0}, {0, 5, 0}, {0, 0, 0},
-    0, 0, -1, -1, 0,
-    25000, 86, 41, 23, 1, 127, 4,
-    0, FB_VMODE_NONINTERLACED };
-#elif ( DEFAULT_MODE == 1 )
-    {/* 640x480@75, 16 bpp .borowed from glide/sst1/include/sst1init.h */
-    640, 480, 640, 480, 0, 0, 16, 0,
-    {11, 5, 0}, {5, 6, 0}, {0, 5, 0}, {0, 0, 0},
-    0, 0, -1, -1, 0,
-    31746, 118, 17, 16, 1, 63, 3,
-    0, FB_VMODE_NONINTERLACED };
-#elif ( DEFAULT_MODE == 2 )
-    { /* 1024x768@76 took from my /etc/fb.modes */
-    1024, 768, 1024, 768,0, 0, 16,0,
-    {11, 5, 0}, {5, 6, 0}, {0, 5, 0}, {0, 0, 0},
-    0, 0, -1, -1, 0,
-    11764, 208, 8, 36, 16, 120, 3 ,
-    0, FB_VMODE_NONINTERLACED };
-#elif ( DEFAULT_MODE == 3 )
-    { /* 640x480@60 , 16bpp glide default ?*/
-    640, 480, 640, 480, 0, 0, 16, 0,
-    {11, 5, 0}, {5, 6, 0}, {0, 5, 0}, {0, 0, 0},
-    0, 0, -1, -1, 0,
-    39721 ,  38, 26 ,  25 ,18  , 96 ,2,
-    0, FB_VMODE_NONINTERLACED };
-#elif
-    #error "Invalid DEFAULT_MODE value !"
-#endif
-
 
 /*
  * debug functions
  */
 
-static void sstfb_drawdebugimage(struct fb_info *info);
-static int sstfb_dump_regs(struct fb_info *info);
-
-
 #if (SST_DEBUG_REG > 0)
 static void sst_dbg_print_read_reg(u32 reg, u32 val) {
         const char *regname;
@@ -726,51 +689,77 @@ static int sstfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
         return 0;
 }
 
-static int sstfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
+static void sstfb_setvgapass( struct fb_info *info, int enable )
 {
         struct sstfb_par *par = info->par;
         struct pci_dev *sst_dev = par->dev;
-        u32 fbiinit0, tmp, val;
-        u_long p;
+        u32 fbiinit0, tmp;
+
+        enable = enable ? 1:0;
+        if (par->vgapass == enable)
+                return;
+        par->vgapass = enable;
+
+        pci_read_config_dword(sst_dev, PCI_INIT_ENABLE, &tmp);
+        pci_write_config_dword(sst_dev, PCI_INIT_ENABLE,
+                               tmp | PCI_EN_INIT_WR );
+        fbiinit0 = sst_read (FBIINIT0);
+        if (par->vgapass) {
+                sst_write(FBIINIT0, fbiinit0 & ~DIS_VGA_PASSTHROUGH);
+                printk(KERN_INFO "fb%d: Enabling VGA pass-through\n", info->node );
+        } else {
+                sst_write(FBIINIT0, fbiinit0 | DIS_VGA_PASSTHROUGH);
+                printk(KERN_INFO "fb%d: Disabling VGA pass-through\n", info->node );
+        }
+        pci_write_config_dword(sst_dev, PCI_INIT_ENABLE, tmp);
+}
+
+static ssize_t store_vgapass(struct device *device, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct fb_info *info = dev_get_drvdata(device);
+        char ** last = NULL;
+        int val;
+
+        val = simple_strtoul(buf, last, 0);
+        sstfb_setvgapass(info, val);
+
+        return count;
+}
+
+static ssize_t show_vgapass(struct device *device, struct device_attribute *attr,
+                        char *buf)
+{
+        struct fb_info *info = dev_get_drvdata(device);
+        struct sstfb_par *par = info->par;
+        return snprintf(buf, PAGE_SIZE, "%d\n", par->vgapass);
+}
+
+static struct device_attribute device_attrs[] = {
+        __ATTR(vgapass, S_IRUGO|S_IWUSR, show_vgapass, store_vgapass)
+        };
+
+static int sstfb_ioctl(struct fb_info *info, unsigned int cmd,
+                        unsigned long arg)
+{
+        struct sstfb_par *par;
+        u32 val;
 
         switch (cmd) {
-                
-        /* dump current FBIINIT values to system log */
-        case _IO('F', 0xdb):            /* 0x46db */
-                return sstfb_dump_regs(info);
-                
-        /* fills lfb with #arg pixels */
-        case _IOW('F', 0xdc, u32):      /* 0x46dc */
+        /* set/get VGA pass_through mode */
+        case SSTFB_SET_VGAPASS:
                 if (copy_from_user(&val, (void __user *)arg, sizeof(val)))
                         return -EFAULT;
-                if (val > info->fix.smem_len)
-                        val = info->fix.smem_len;
-                for (p = 0 ; p < val; p += 2)
-                        writew(p >> 6, info->screen_base + p);
+                sstfb_setvgapass(info, val);
                 return 0;
-                
-        /* change VGA pass_through mode */
-        case _IOW('F', 0xdd, u32):      /* 0x46dd */
-                if (copy_from_user(&val, (void __user *)arg, sizeof(val)))
+        case SSTFB_GET_VGAPASS:
+                par = info->par;
+                val = par->vgapass;
+                if (copy_to_user((void __user *)arg, &val, sizeof(val)))
                         return -EFAULT;
-                pci_read_config_dword(sst_dev, PCI_INIT_ENABLE, &tmp);
-                pci_write_config_dword(sst_dev, PCI_INIT_ENABLE,
-                                       tmp | PCI_EN_INIT_WR );
-                fbiinit0 = sst_read (FBIINIT0);
-                if (val)
-                        sst_write(FBIINIT0, fbiinit0 & ~EN_VGA_PASSTHROUGH);
-                else
-                        sst_write(FBIINIT0, fbiinit0 | EN_VGA_PASSTHROUGH);
-                pci_write_config_dword(sst_dev, PCI_INIT_ENABLE, tmp);
-                return 0;
-                
-        /* draw test image  */
-        case _IO('F', 0xde):            /* 0x46de */
-                f_dprintk("test color display at %d bpp\n",
-                                        info->var.bits_per_pixel);
-                sstfb_drawdebugimage(info);
                 return 0;
         }
+
         return -EINVAL;
 }
 
@@ -804,6 +793,7 @@ static void sstfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
 /*
  * FillRect 2D command (solidfill or invert (via ROP_XOR)) - Voodoo2 only
  */
+#if 0
 static void sstfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) 
 {
         struct sstfb_par *par = info->par;
@@ -825,6 +815,7 @@ static void sstfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
                  | (BLT_16BPP_FMT << 3) /* | BIT(14) */ | BIT(15) | BIT(16) );
         sst_wait_idle();
 }
+#endif
 
 
 
@@ -1156,6 +1147,7 @@ static int __devinit sst_init(struct fb_info *info, struct sstfb_par *par)
         struct pll_timing gfx_timings;
         struct sst_spec *spec;
         int Fout;
+        int gfx_clock;
 
         spec = &voodoo_spec[par->type];
         f_ddprintk(" fbiinit0   fbiinit1   fbiinit2   fbiinit3   fbiinit4  "
@@ -1196,15 +1188,15 @@ static int __devinit sst_init(struct fb_info *info, struct sstfb_par *par)
         }
 
         /* set graphic clock */
-        par->gfx_clock = spec->default_gfx_clock;
+        gfx_clock = spec->default_gfx_clock;
         if ((gfxclk >10 ) && (gfxclk < spec->max_gfxclk)) {
                 printk(KERN_INFO "sstfb: Using supplied graphic freq : %dMHz\n", gfxclk);
-                 par->gfx_clock = gfxclk *1000;
+                 gfx_clock = gfxclk *1000;
         } else if (gfxclk) {
                 printk(KERN_WARNING "sstfb: %dMhz is way out of spec! Using default\n", gfxclk);
         }
 
-        sst_calc_pll(par->gfx_clock, &Fout, &gfx_timings);
+        sst_calc_pll(gfx_clock, &Fout, &gfx_timings);
         par->dac_sw.set_pll(info, &gfx_timings, GFX_CLOCK);
 
         /* disable fbiinit remap */
@@ -1215,10 +1207,11 @@ static int __devinit sst_init(struct fb_info *info, struct sstfb_par *par)
         fbiinit0 = FBIINIT0_DEFAULT;
         fbiinit1 = FBIINIT1_DEFAULT;
         fbiinit4 = FBIINIT4_DEFAULT;
-        if (vgapass)
-                fbiinit0 &= ~EN_VGA_PASSTHROUGH;
+        par->vgapass = vgapass;
+        if (par->vgapass)
+                fbiinit0 &= ~DIS_VGA_PASSTHROUGH;
         else
-                fbiinit0 |= EN_VGA_PASSTHROUGH;
+                fbiinit0 |= DIS_VGA_PASSTHROUGH;
         if (slowpci) {
                 fbiinit1 |= SLOW_PCI_WRITES;
                 fbiinit4 |= SLOW_PCI_READS;
@@ -1267,7 +1260,7 @@ static void  __devexit sst_shutdown(struct fb_info *info)
         /* TODO maybe shutdown the dac, vrefresh and so on... */
         pci_write_config_dword(dev, PCI_INIT_ENABLE,
                                PCI_EN_INIT_WR);
-        sst_unset_bits(FBIINIT0, FBI_RESET | FIFO_RESET | EN_VGA_PASSTHROUGH);
+        sst_unset_bits(FBIINIT0, FBI_RESET | FIFO_RESET | DIS_VGA_PASSTHROUGH);
         pci_write_config_dword(dev, PCI_VCLK_DISABLE,0);
         /* maybe keep fbiinit* and PCI_INIT_enable in the fb_info struct
          * from start ? */
@@ -1278,8 +1271,7 @@ static void  __devexit sst_shutdown(struct fb_info *info)
 /*
  * Interface to the world
  */
-#ifndef MODULE
-static int  __init sstfb_setup(char *options)
+static int  __devinit sstfb_setup(char *options)
 {
         char *this_opt;
 
@@ -1312,7 +1304,7 @@ static int  __init sstfb_setup(char *options)
         }
         return 0;
 }
-#endif
+
 
 static struct fb_ops sstfb_ops = {
         .owner          = THIS_MODULE,
@@ -1416,15 +1408,10 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
          */
         fix->line_length = 2048; /* default value, for 24 or 32bit: 4096 */
         
-        if ( mode_option &&
-             fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 16)) {
-                printk(KERN_ERR "sstfb: can't set supplied video mode. Using default\n");
-                info->var = sstfb_default;
-        } else
-                info->var = sstfb_default;
+        fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 16);
 
         if (sstfb_check_var(&info->var, info)) {
-                printk(KERN_ERR "sstfb: invalid default video mode.\n");
+                printk(KERN_ERR "sstfb: invalid video mode.\n");
                 goto fail;
         }
 
@@ -1442,10 +1429,11 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
                 goto fail;
         }
 
-        if (1) /* set to 0 to see an initial bitmap instead */
-                sstfb_clear_screen(info);
-        else
-                sstfb_drawdebugimage(info);
+        sstfb_clear_screen(info);
+
+        if (device_create_file(info->dev, &device_attrs[0]))
+                printk(KERN_WARNING "sstfb: can't create sysfs entry.\n");
+
 
         printk(KERN_INFO "fb%d: %s frame buffer device at 0x%p\n",
                info->node, fix->id, info->screen_base);
@@ -1453,6 +1441,7 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
         return 0;
 
 fail:
+        fb_dealloc_cmap(&info->cmap);
         iounmap(info->screen_base);
 fail_fb_remap:
         iounmap(par->mmio_vbase);
@@ -1473,21 +1462,23 @@ static void __devexit sstfb_remove(struct pci_dev *pdev)
         info = pci_get_drvdata(pdev);
         par = info->par;
         
+        device_remove_file(info->dev, &device_attrs[0]);
         sst_shutdown(info);
-        unregister_framebuffer(info);
         iounmap(info->screen_base);
         iounmap(par->mmio_vbase);
         release_mem_region(info->fix.smem_start, 0x400000);
         release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
+        fb_dealloc_cmap(&info->cmap);
+        unregister_framebuffer(info);
         framebuffer_release(info);
 }
 
 
-static struct pci_device_id sstfb_id_tbl[] = {
-        { PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, ID_VOODOO1 },
-        { PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO2,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, ID_VOODOO2 },
+static const struct pci_device_id sstfb_id_tbl[] = {
+        { PCI_DEVICE(PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO ),
+                .driver_data = ID_VOODOO1, },
+        { PCI_DEVICE(PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO2),
+                .driver_data = ID_VOODOO2, },
         { 0 },
 };
 
@@ -1501,142 +1492,23 @@ static struct pci_driver sstfb_driver = {
 
 static int __devinit sstfb_init(void)
 {
-#ifndef MODULE
         char *option = NULL;
 
         if (fb_get_options("sstfb", &option))
                 return -ENODEV;
         sstfb_setup(option);
-#endif
+
         return pci_register_driver(&sstfb_driver);
 }
 
-#ifdef MODULE
 static void __devexit sstfb_exit(void)
 {
         pci_unregister_driver(&sstfb_driver);
 }
-#endif
 
 
-/*
- * testing and debugging functions
- */
-
-static int sstfb_dump_regs(struct fb_info *info)
-{
-#ifdef SST_DEBUG
-        static struct { u32 reg ; const char *reg_name;}  pci_regs[] = {
-                { PCI_INIT_ENABLE, "initenable"},
-                { PCI_VCLK_ENABLE, "enable vclk"},
-                { PCI_VCLK_DISABLE, "disable vclk"},
-        };
-
-        static struct { u32 reg ; const char *reg_name;}  sst_regs[] = {
-                {FBIINIT0,"fbiinit0"},
-                {FBIINIT1,"fbiinit1"},
-                {FBIINIT2,"fbiinit2"},
-                {FBIINIT3,"fbiinit3"},
-                {FBIINIT4,"fbiinit4"},
-                {FBIINIT5,"fbiinit5"},
-                {FBIINIT6,"fbiinit6"},
-                {FBIINIT7,"fbiinit7"},
-                {LFBMODE,"lfbmode"},
-                {FBZMODE,"fbzmode"},
-        };
-
-        const int pci_s = ARRAY_SIZE(pci_regs);
-        const int sst_s = ARRAY_SIZE(sst_regs);
-        struct sstfb_par *par = info->par;
-        struct pci_dev *dev = par->dev;
-        u32 pci_res[pci_s];
-        u32 sst_res[sst_s];
-        int i;
-
-        for (i=0; i<pci_s; i++) {
-                pci_read_config_dword(dev, pci_regs[i].reg, &pci_res[i]);
-        }
-        for (i=0; i<sst_s; i++) {
-                sst_res[i] = sst_read(sst_regs[i].reg);
-        }
-
-        dprintk("hardware register dump:\n");
-        for (i=0; i<pci_s; i++) {
-                dprintk("%s %0#10x\n", pci_regs[i].reg_name, pci_res[i]);
-        }
-        for (i=0; i<sst_s; i++) {
-                dprintk("%s %0#10x\n", sst_regs[i].reg_name, sst_res[i]);
-        }
-        return 0;
-#else
-        return -EINVAL;
-#endif
-}
-
-static void sstfb_fillrect_softw( struct fb_info *info, const struct fb_fillrect *rect)
-{
-        u8 __iomem *fbbase_virt = info->screen_base;
-        int x, y, w = info->var.bits_per_pixel == 16 ? 2 : 4;
-        u32 color = rect->color, height = rect->height;
-        u8 __iomem *p;
-        
-        if (w==2) color |= color<<16;
-        for (y=rect->dy; height; y++, height--) {
-                p = fbbase_virt + y*info->fix.line_length + rect->dx*w;
-                x = rect->width;
-                if (w==2) x>>=1;
-                while (x) {
-                        writel(color, p);
-                        p += 4;
-                        x--;
-                }
-        }
-}
-
-static void sstfb_drawrect_XY( struct fb_info *info, int x, int y,
-                int w, int h, int color, int hwfunc)
-{
-        struct fb_fillrect rect;
-        rect.dx = x;
-        rect.dy = y;
-        rect.height = h;
-        rect.width = w;
-        rect.color = color;
-        rect.rop = ROP_COPY;
-        if (hwfunc)
-                sstfb_fillrect(info, &rect);
-        else
-                sstfb_fillrect_softw(info, &rect);
-}
-
-/* print some squares on the fb */
-static void sstfb_drawdebugimage(struct fb_info *info)
-{
-        static int idx;
-
-        /* clear screen */
-        sstfb_clear_screen(info);
-        
-        idx = (idx+1) & 1;
-
-        /* white rect */
-        sstfb_drawrect_XY(info, 0, 0, 50, 50, 0xffff, idx);
-        
-        /* blue rect */
-        sstfb_drawrect_XY(info, 50, 50, 50, 50, 0x001f, idx);
-
-        /* green rect */
-        sstfb_drawrect_XY(info, 100, 100, 80, 80, 0x07e0, idx);
-        
-        /* red rect */
-        sstfb_drawrect_XY(info, 250, 250, 120, 100, 0xf800, idx);
-}
-
 module_init(sstfb_init);
-
-#ifdef MODULE
 module_exit(sstfb_exit);
-#endif
 
 MODULE_AUTHOR("(c) 2000,2002 Ghozlane Toumi <gtoumi@laposte.net>");
 MODULE_DESCRIPTION("FBDev driver for 3dfx Voodoo Graphics and Voodoo2 based video boards");
@@ -1652,3 +1524,6 @@ module_param(gfxclk, int, 0);
 MODULE_PARM_DESC(gfxclk, "Force graphic chip frequency in MHz. DANGEROUS. (default=auto)");
 module_param(slowpci, bool, 0);
 MODULE_PARM_DESC(slowpci, "Uses slow PCI settings (0 or 1) (default=0)");
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Initial video mode (default=" DEFAULT_VIDEO_MODE ")");
+
diff --git a/drivers/w1/slaves/Kconfig b/drivers/w1/slaves/Kconfig
index d18d6424cd21..904e5aeb696c 100644
--- a/drivers/w1/slaves/Kconfig
+++ b/drivers/w1/slaves/Kconfig
@@ -9,7 +9,7 @@ config W1_SLAVE_THERM
         tristate "Thermal family implementation"
         depends on W1
         help
-          Say Y here if you want to connect 1-wire thermal sensors to you
+          Say Y here if you want to connect 1-wire thermal sensors to your
           wire.
 
 config W1_SLAVE_SMEM
@@ -17,7 +17,7 @@ config W1_SLAVE_SMEM
         depends on W1
         help
           Say Y here if you want to connect 1-wire
-          simple 64bit memory rom(ds2401/ds2411/ds1990*) to you wire.
+          simple 64bit memory rom(ds2401/ds2411/ds1990*) to your wire.
 
 config W1_SLAVE_DS2433
         tristate "4kb EEPROM family support (DS2433)"
diff --git a/fs/Kconfig b/fs/Kconfig
index b3b5aa0edff9..276ff3baaafe 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -12,9 +12,7 @@ config EXT2_FS
           Ext2 is a standard Linux file system for hard disks.
 
           To compile this file system support as a module, choose M here: the
-          module will be called ext2.  Be aware however that the file system
-          of your root partition (the one containing the directory /) cannot
-          be compiled as a module, and so this could be dangerous.
+          module will be called ext2.
 
           If unsure, say Y.
 
@@ -98,9 +96,7 @@ config EXT3_FS
           (available at <http://sourceforge.net/projects/e2fsprogs/>).
 
           To compile this file system support as a module, choose M here: the
-          module will be called ext3.  Be aware however that the file system
-          of your root partition (the one containing the directory /) cannot
-          be compiled as a module, and so this may be dangerous.
+          module will be called ext3.
 
 config EXT3_FS_XATTR
         bool "Ext3 extended attributes"
@@ -163,9 +159,7 @@ config EXT4DEV_FS
           features will be added to ext4dev gradually.
 
           To compile this file system support as a module, choose M here. The
-          module will be called ext4dev.  Be aware, however, that the filesystem
-          of your root partition (the one containing the directory /) cannot
-          be compiled as a module, and so this could be dangerous.
+          module will be called ext4dev.
 
           If unsure, say N.
 
@@ -1008,7 +1002,7 @@ config TMPFS_POSIX_ACL
 
 config HUGETLBFS
         bool "HugeTLB file system support"
-        depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
+        depends on X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
         help
           hugetlbfs is a filesystem backing for HugeTLB pages, based on
           ramfs. For architectures that support it, say Y here and read
diff --git a/fs/aio.c b/fs/aio.c
index d3a6ec2c9627..5f577a63bdf0 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -586,7 +586,7 @@ static void use_mm(struct mm_struct *mm)
          * Note that on UML this *requires* PF_BORROWED_MM to be set, otherwise
          * it won't work. Update it accordingly if you change it here
          */
-        activate_mm(active_mm, mm);
+        switch_mm(active_mm, mm, tsk);
         task_unlock(tsk);
 
         mmdrop(active_mm);
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 9c48250fd726..e8f6c5ad3e90 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -313,7 +313,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
         struct autofs_sb_info *sbi;
         struct autofs_info *ino;
 
-        sbi = (struct autofs_sb_info *) kmalloc(sizeof(*sbi), GFP_KERNEL);
+        sbi = kmalloc(sizeof(*sbi), GFP_KERNEL);
         if ( !sbi )
                 goto fail_unlock;
         DPRINTK("starting up, sbi = %p",sbi);
diff --git a/fs/befs/btree.c b/fs/befs/btree.c
index 81b042ee24e6..af5bb93276f8 100644
--- a/fs/befs/btree.c
+++ b/fs/befs/btree.c
@@ -260,7 +260,7 @@ befs_btree_find(struct super_block *sb, befs_data_stream * ds,
                 goto error;
         }
 
-        this_node = (befs_btree_node *) kmalloc(sizeof (befs_btree_node),
+        this_node = kmalloc(sizeof (befs_btree_node),
                                                 GFP_NOFS);
         if (!this_node) {
                 befs_error(sb, "befs_btree_find() failed to allocate %u "
diff --git a/fs/befs/debug.c b/fs/befs/debug.c
index e831a8f30849..b8e304a0661e 100644
--- a/fs/befs/debug.c
+++ b/fs/befs/debug.c
@@ -28,7 +28,7 @@ void
 befs_error(const struct super_block *sb, const char *fmt, ...)
 {
         va_list args;
-        char *err_buf = (char *) kmalloc(ERRBUFSIZE, GFP_KERNEL);
+        char *err_buf = kmalloc(ERRBUFSIZE, GFP_KERNEL);
         if (err_buf == NULL) {
                 printk(KERN_ERR "could not allocate %d bytes\n", ERRBUFSIZE);
                 return;
@@ -46,7 +46,7 @@ void
 befs_warning(const struct super_block *sb, const char *fmt, ...)
 {
         va_list args;
-        char *err_buf = (char *) kmalloc(ERRBUFSIZE, GFP_KERNEL);
+        char *err_buf = kmalloc(ERRBUFSIZE, GFP_KERNEL);
         if (err_buf == NULL) {
                 printk(KERN_ERR "could not allocate %d bytes\n", ERRBUFSIZE);
                 return;
@@ -70,7 +70,7 @@ befs_debug(const struct super_block *sb, const char *fmt, ...)
         char *err_buf = NULL;
 
         if (BEFS_SB(sb)->mount_opts.debug) {
-                err_buf = (char *) kmalloc(ERRBUFSIZE, GFP_KERNEL);
+                err_buf = kmalloc(ERRBUFSIZE, GFP_KERNEL);
                 if (err_buf == NULL) {
                         printk(KERN_ERR "could not allocate %d bytes\n",
                                 ERRBUFSIZE);
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
index eac175ed9f44..134c99941a63 100644
--- a/fs/bfs/inode.c
+++ b/fs/bfs/inode.c
@@ -1,7 +1,7 @@
 /*
  *      fs/bfs/inode.c
  *      BFS superblock and inode operations.
- *      Copyright (C) 1999,2000 Tigran Aivazian <tigran@veritas.com>
+ *      Copyright (C) 1999-2006 Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
  *      From fs/minix, Copyright (C) 1991, 1992 Linus Torvalds.
  *
  *      Made endianness-clean by Andrew Stribblehill <ads@wompom.org>, 2005.
@@ -18,7 +18,7 @@
 #include <asm/uaccess.h>
 #include "bfs.h"
 
-MODULE_AUTHOR("Tigran A. Aivazian <tigran@veritas.com>");
+MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");
 MODULE_DESCRIPTION("SCO UnixWare BFS filesystem for Linux");
 MODULE_LICENSE("GPL");
 
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 76f06f6bc2f6..6e6d4568d548 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -706,12 +706,11 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,
                 return -ELIBBAD;
 
         size = sizeof(*loadmap) + nloads * sizeof(*seg);
-        loadmap = kmalloc(size, GFP_KERNEL);
+        loadmap = kzalloc(size, GFP_KERNEL);
         if (!loadmap)
                 return -ENOMEM;
 
         params->loadmap = loadmap;
-        memset(loadmap, 0, size);
 
         loadmap->version = ELF32_FDPIC_LOADMAP_VERSION;
         loadmap->nsegs = nloads;
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 00687ea62738..c2e08252af35 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -311,7 +311,7 @@ static Node *create_entry(const char __user *buffer, size_t count)
 
         err = -ENOMEM;
         memsize = sizeof(Node) + count + 8;
-        e = (Node *) kmalloc(memsize, GFP_USER);
+        e = kmalloc(memsize, GFP_USER);
         if (!e)
                 goto out;
 
diff --git a/fs/bio.c b/fs/bio.c
index 7ec737eda72b..7618bcb18368 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -916,7 +916,7 @@ void bio_set_pages_dirty(struct bio *bio)
         }
 }
 
-static void bio_release_pages(struct bio *bio)
+void bio_release_pages(struct bio *bio)
 {
         struct bio_vec *bvec = bio->bi_io_vec;
         int i;
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 197f93921847..1715d6b5f411 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -129,43 +129,191 @@ blkdev_get_block(struct inode *inode, sector_t iblock,
         return 0;
 }
 
-static int
-blkdev_get_blocks(struct inode *inode, sector_t iblock,
-                struct buffer_head *bh, int create)
+static int blk_end_aio(struct bio *bio, unsigned int bytes_done, int error)
 {
-        sector_t end_block = max_block(I_BDEV(inode));
-        unsigned long max_blocks = bh->b_size >> inode->i_blkbits;
+        struct kiocb *iocb = bio->bi_private;
+        atomic_t *bio_count = &iocb->ki_bio_count;
 
-        if ((iblock + max_blocks) > end_block) {
-                max_blocks = end_block - iblock;
-                if ((long)max_blocks <= 0) {
-                        if (create)
-                                return -EIO;    /* write fully beyond EOF */
-                        /*
-                         * It is a read which is fully beyond EOF.  We return
-                         * a !buffer_mapped buffer
-                         */
-                        max_blocks = 0;
-                }
+        if (bio_data_dir(bio) == READ)
+                bio_check_pages_dirty(bio);
+        else {
+                bio_release_pages(bio);
+                bio_put(bio);
+        }
+
+        /* iocb->ki_nbytes stores error code from LLDD */
+        if (error)
+                iocb->ki_nbytes = -EIO;
+
+        if (atomic_dec_and_test(bio_count)) {
+                if (iocb->ki_nbytes < 0)
+                        aio_complete(iocb, iocb->ki_nbytes, 0);
+                else
+                        aio_complete(iocb, iocb->ki_left, 0);
         }
 
-        bh->b_bdev = I_BDEV(inode);
-        bh->b_blocknr = iblock;
-        bh->b_size = max_blocks << inode->i_blkbits;
-        if (max_blocks)
-                set_buffer_mapped(bh);
         return 0;
 }
 
+#define VEC_SIZE        16
+struct pvec {
+        unsigned short nr;
+        unsigned short idx;
+        struct page *page[VEC_SIZE];
+};
+
+#define PAGES_SPANNED(addr, len)        \
+        (DIV_ROUND_UP((addr) + (len), PAGE_SIZE) - (addr) / PAGE_SIZE);
+
+/*
+ * get page pointer for user addr, we internally cache struct page array for
+ * (addr, count) range in pvec to avoid frequent call to get_user_pages.  If
+ * internal page list is exhausted, a batch count of up to VEC_SIZE is used
+ * to get next set of page struct.
+ */
+static struct page *blk_get_page(unsigned long addr, size_t count, int rw,
+                                 struct pvec *pvec)
+{
+        int ret, nr_pages;
+        if (pvec->idx == pvec->nr) {
+                nr_pages = PAGES_SPANNED(addr, count);
+                nr_pages = min(nr_pages, VEC_SIZE);
+                down_read(&current->mm->mmap_sem);
+                ret = get_user_pages(current, current->mm, addr, nr_pages,
+                                     rw == READ, 0, pvec->page, NULL);
+                up_read(&current->mm->mmap_sem);
+                if (ret < 0)
+                        return ERR_PTR(ret);
+                pvec->nr = ret;
+                pvec->idx = 0;
+        }
+        return pvec->page[pvec->idx++];
+}
+
 static ssize_t
 blkdev_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
-                        loff_t offset, unsigned long nr_segs)
-{
-        struct file *file = iocb->ki_filp;
-        struct inode *inode = file->f_mapping->host;
+                 loff_t pos, unsigned long nr_segs)
+{
+        struct inode *inode = iocb->ki_filp->f_mapping->host;
+        unsigned blkbits = blksize_bits(bdev_hardsect_size(I_BDEV(inode)));
+        unsigned blocksize_mask = (1 << blkbits) - 1;
+        unsigned long seg = 0;  /* iov segment iterator */
+        unsigned long nvec;     /* number of bio vec needed */
+        unsigned long cur_off;  /* offset into current page */
+        unsigned long cur_len;  /* I/O len of current page, up to PAGE_SIZE */
+
+        unsigned long addr;     /* user iovec address */
+        size_t count;           /* user iovec len */
+        size_t nbytes = iocb->ki_nbytes = iocb->ki_left; /* total xfer size */
+        loff_t size;            /* size of block device */
+        struct bio *bio;
+        atomic_t *bio_count = &iocb->ki_bio_count;
+        struct page *page;
+        struct pvec pvec;
+
+        pvec.nr = 0;
+        pvec.idx = 0;
+
+        if (pos & blocksize_mask)
+                return -EINVAL;
+
+        size = i_size_read(inode);
+        if (pos + nbytes > size) {
+                nbytes = size - pos;
+                iocb->ki_left = nbytes;
+        }
+
+        /*
+         * check first non-zero iov alignment, the remaining
+         * iov alignment is checked inside bio loop below.
+         */
+        do {
+                addr = (unsigned long) iov[seg].iov_base;
+                count = min(iov[seg].iov_len, nbytes);
+                if (addr & blocksize_mask || count & blocksize_mask)
+                        return -EINVAL;
+        } while (!count && ++seg < nr_segs);
+        atomic_set(bio_count, 1);
+
+        while (nbytes) {
+                /* roughly estimate number of bio vec needed */
+                nvec = (nbytes + PAGE_SIZE - 1) / PAGE_SIZE;
+                nvec = max(nvec, nr_segs - seg);
+                nvec = min(nvec, (unsigned long) BIO_MAX_PAGES);
+
+                /* bio_alloc should not fail with GFP_KERNEL flag */
+                bio = bio_alloc(GFP_KERNEL, nvec);
+                bio->bi_bdev = I_BDEV(inode);
+                bio->bi_end_io = blk_end_aio;
+                bio->bi_private = iocb;
+                bio->bi_sector = pos >> blkbits;
+same_bio:
+                cur_off = addr & ~PAGE_MASK;
+                cur_len = PAGE_SIZE - cur_off;
+                if (count < cur_len)
+                        cur_len = count;
+
+                page = blk_get_page(addr, count, rw, &pvec);
+                if (unlikely(IS_ERR(page)))
+                        goto backout;
+
+                if (bio_add_page(bio, page, cur_len, cur_off)) {
+                        pos += cur_len;
+                        addr += cur_len;
+                        count -= cur_len;
+                        nbytes -= cur_len;
+
+                        if (count)
+                                goto same_bio;
+                        while (++seg < nr_segs) {
+                                addr = (unsigned long) iov[seg].iov_base;
+                                count = iov[seg].iov_len;
+                                if (!count)
+                                        continue;
+                                if (unlikely(addr & blocksize_mask ||
+                                             count & blocksize_mask)) {
+                                        page = ERR_PTR(-EINVAL);
+                                        goto backout;
+                                }
+                                count = min(count, nbytes);
+                                goto same_bio;
+                        }
+                }
 
-        return blockdev_direct_IO_no_locking(rw, iocb, inode, I_BDEV(inode),
-                                iov, offset, nr_segs, blkdev_get_blocks, NULL);
+                /* bio is ready, submit it */
+                if (rw == READ)
+                        bio_set_pages_dirty(bio);
+                atomic_inc(bio_count);
+                submit_bio(rw, bio);
+        }
+
+completion:
+        iocb->ki_left -= nbytes;
+        nbytes = iocb->ki_left;
+        iocb->ki_pos += nbytes;
+
+        blk_run_address_space(inode->i_mapping);
+        if (atomic_dec_and_test(bio_count))
+                aio_complete(iocb, nbytes, 0);
+
+        return -EIOCBQUEUED;
+
+backout:
+        /*
+         * back out nbytes count constructed so far for this bio,
+         * we will throw away current bio.
+         */
+        nbytes += bio->bi_size;
+        bio_release_pages(bio);
+        bio_put(bio);
+
+        /*
+         * if no bio was submmitted, return the error code.
+         * otherwise, proceed with pending I/O completion.
+         */
+        if (atomic_read(bio_count) == 1)
+                return PTR_ERR(page);
+        goto completion;
 }
 
 static int blkdev_writepage(struct page *page, struct writeback_control *wbc)
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 098790eb2aa1..472e33e0f3cf 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -4876,7 +4876,7 @@ int CIFSSMBNotify(const int xid, struct cifsTconInfo *tcon,
         } else {
                 /* Add file to outstanding requests */
                 /* BB change to kmem cache alloc */     
-                dnotify_req = (struct dir_notify_req *) kmalloc(
+                dnotify_req = kmalloc(
                                                 sizeof(struct dir_notify_req),
                                                  GFP_KERNEL);
                 if(dnotify_req) {
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index 137d76c3f90a..c692487346ea 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -24,6 +24,7 @@
 #include <linux/kobject.h>
 #include <linux/namei.h>
 #include <linux/debugfs.h>
+#include <linux/fsnotify.h>
 
 #define DEBUGFS_MAGIC   0x64626720
 
@@ -54,7 +55,8 @@ static struct inode *debugfs_get_inode(struct super_block *sb, int mode, dev_t d
                         inode->i_op = &simple_dir_inode_operations;
                         inode->i_fop = &simple_dir_operations;
 
-                        /* directory inodes start off with i_nlink == 2 (for "." entry) */
+                        /* directory inodes start off with i_nlink == 2
+                         * (for "." entry) */
                         inc_nlink(inode);
                         break;
                 }
@@ -87,15 +89,22 @@ static int debugfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 
         mode = (mode & (S_IRWXUGO | S_ISVTX)) | S_IFDIR;
         res = debugfs_mknod(dir, dentry, mode, 0);
-        if (!res)
+        if (!res) {
                 inc_nlink(dir);
+                fsnotify_mkdir(dir, dentry);
+        }
         return res;
 }
 
 static int debugfs_create(struct inode *dir, struct dentry *dentry, int mode)
 {
+        int res;
+
         mode = (mode & S_IALLUGO) | S_IFREG;
-        return debugfs_mknod(dir, dentry, mode, 0);
+        res = debugfs_mknod(dir, dentry, mode, 0);
+        if (!res)
+                fsnotify_create(dir, dentry);
+        return res;
 }
 
 static inline int debugfs_positive(struct dentry *dentry)
@@ -135,7 +144,7 @@ static int debugfs_create_by_name(const char *name, mode_t mode,
          * block. A pointer to that is in the struct vfsmount that we
          * have around.
          */
-        if (!parent ) {
+        if (!parent) {
                 if (debugfs_mount && debugfs_mount->mnt_sb) {
                         parent = debugfs_mount->mnt_sb->s_root;
                 }
@@ -153,6 +162,7 @@ static int debugfs_create_by_name(const char *name, mode_t mode,
                         error = debugfs_mkdir(parent->d_inode, *dentry, mode);
                 else 
                         error = debugfs_create(parent->d_inode, *dentry, mode);
+                dput(*dentry);
         } else
                 error = PTR_ERR(*dentry);
         mutex_unlock(&parent->d_inode->i_mutex);
@@ -197,13 +207,15 @@ struct dentry *debugfs_create_file(const char *name, mode_t mode,
 
         pr_debug("debugfs: creating file '%s'\n",name);
 
-        error = simple_pin_fs(&debug_fs_type, &debugfs_mount, &debugfs_mount_count);
+        error = simple_pin_fs(&debug_fs_type, &debugfs_mount,
+                              &debugfs_mount_count);
         if (error)
                 goto exit;
 
         error = debugfs_create_by_name(name, mode, parent, &dentry);
         if (error) {
                 dentry = NULL;
+                simple_release_fs(&debugfs_mount, &debugfs_mount_count);
                 goto exit;
         }
 
@@ -262,6 +274,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_dir);
 void debugfs_remove(struct dentry *dentry)
 {
         struct dentry *parent;
+        int ret = 0;
         
         if (!dentry)
                 return;
@@ -273,11 +286,19 @@ void debugfs_remove(struct dentry *dentry)
         mutex_lock(&parent->d_inode->i_mutex);
         if (debugfs_positive(dentry)) {
                 if (dentry->d_inode) {
-                        if (S_ISDIR(dentry->d_inode->i_mode))
-                                simple_rmdir(parent->d_inode, dentry);
-                        else
+                        dget(dentry);
+                        if (S_ISDIR(dentry->d_inode->i_mode)) {
+                                ret = simple_rmdir(parent->d_inode, dentry);
+                                if (ret)
+                                        printk(KERN_ERR
+                                                "DebugFS rmdir on %s failed : "
+                                                "directory not empty.\n",
+                                                dentry->d_name.name);
+                        } else
                                 simple_unlink(parent->d_inode, dentry);
-                dput(dentry);
+                        if (!ret)
+                                d_delete(dentry);
+                        dput(dentry);
                 }
         }
         mutex_unlock(&parent->d_inode->i_mutex);
diff --git a/fs/inode.c b/fs/inode.c
index d00de182ecb9..bf21dc6d0dbd 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1144,7 +1144,6 @@ sector_t bmap(struct inode * inode, sector_t block)
                 res = inode->i_mapping->a_ops->bmap(inode->i_mapping, block);
         return res;
 }
-
 EXPORT_SYMBOL(bmap);
 
 /**
@@ -1163,27 +1162,43 @@ void touch_atime(struct vfsmount *mnt, struct dentry *dentry)
 
         if (IS_RDONLY(inode))
                 return;
-
-        if ((inode->i_flags & S_NOATIME) ||
-            (inode->i_sb->s_flags & MS_NOATIME) ||
-            ((inode->i_sb->s_flags & MS_NODIRATIME) && S_ISDIR(inode->i_mode)))
+        if (inode->i_flags & S_NOATIME)
+                return;
+        if (inode->i_sb->s_flags & MS_NOATIME)
+                return;
+        if ((inode->i_sb->s_flags & MS_NODIRATIME) && S_ISDIR(inode->i_mode))
                 return;
 
         /*
          * We may have a NULL vfsmount when coming from NFSD
          */
-        if (mnt &&
-            ((mnt->mnt_flags & MNT_NOATIME) ||
-             ((mnt->mnt_flags & MNT_NODIRATIME) && S_ISDIR(inode->i_mode))))
-                return;
+        if (mnt) {
+                if (mnt->mnt_flags & MNT_NOATIME)
+                        return;
+                if ((mnt->mnt_flags & MNT_NODIRATIME) && S_ISDIR(inode->i_mode))
+                        return;
 
-        now = current_fs_time(inode->i_sb);
-        if (!timespec_equal(&inode->i_atime, &now)) {
-                inode->i_atime = now;
-                mark_inode_dirty_sync(inode);
+                if (mnt->mnt_flags & MNT_RELATIME) {
+                        /*
+                         * With relative atime, only update atime if the
+                         * previous atime is earlier than either the ctime or
+                         * mtime.
+                         */
+                        if (timespec_compare(&inode->i_mtime,
+                                                &inode->i_atime) < 0 &&
+                            timespec_compare(&inode->i_ctime,
+                                                &inode->i_atime) < 0)
+                                return;
+                }
         }
-}
 
+        now = current_fs_time(inode->i_sb);
+        if (timespec_equal(&inode->i_atime, &now))
+                return;
+
+        inode->i_atime = now;
+        mark_inode_dirty_sync(inode);
+}
 EXPORT_SYMBOL(touch_atime);
 
 /**
diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c
index 7b40c69f44eb..43baa1afa021 100644
--- a/fs/jffs/inode-v23.c
+++ b/fs/jffs/inode-v23.c
@@ -818,7 +818,7 @@ jffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 
         D1({
                 int len = dentry->d_name.len;
-                char *_name = (char *) kmalloc(len + 1, GFP_KERNEL);
+                char *_name = kmalloc(len + 1, GFP_KERNEL);
                 memcpy(_name, dentry->d_name.name, len);
                 _name[len] = '\0';
                 printk("***jffs_mkdir(): dir = 0x%p, name = \"%s\", "
@@ -964,7 +964,7 @@ jffs_remove(struct inode *dir, struct dentry *dentry, int type)
         D1({
                 int len = dentry->d_name.len;
                 const char *name = dentry->d_name.name;
-                char *_name = (char *) kmalloc(len + 1, GFP_KERNEL);
+                char *_name = kmalloc(len + 1, GFP_KERNEL);
                 memcpy(_name, name, len);
                 _name[len] = '\0';
                 printk("***jffs_remove(): file = \"%s\", ino = %ld\n", _name, dentry->d_inode->i_ino);
diff --git a/fs/jffs/intrep.c b/fs/jffs/intrep.c
index d0e783f199ea..6dd18911b44c 100644
--- a/fs/jffs/intrep.c
+++ b/fs/jffs/intrep.c
@@ -436,7 +436,7 @@ jffs_checksum_flash(struct mtd_info *mtd, loff_t start, int size, __u32 *result)
         int i, length;
 
         /* Allocate read buffer */
-        read_buf = (__u8 *) kmalloc (sizeof(__u8) * 4096, GFP_KERNEL);
+        read_buf = kmalloc(sizeof(__u8) * 4096, GFP_KERNEL);
         if (!read_buf) {
                 printk(KERN_NOTICE "kmalloc failed in jffs_checksum_flash()\n");
                 return -ENOMEM;
@@ -744,11 +744,11 @@ static int check_partly_erased_sectors(struct jffs_fmcontrol *fmc){
 
 
         /* Allocate read buffers */
-        read_buf1 = (__u8 *) kmalloc (sizeof(__u8) * READ_AHEAD_BYTES, GFP_KERNEL);
+        read_buf1 = kmalloc(sizeof(__u8) * READ_AHEAD_BYTES, GFP_KERNEL);
         if (!read_buf1)
                 return -ENOMEM;
 
-        read_buf2 = (__u8 *) kmalloc (sizeof(__u8) * READ_AHEAD_BYTES, GFP_KERNEL);
+        read_buf2 = kmalloc(sizeof(__u8) * READ_AHEAD_BYTES, GFP_KERNEL);
         if (!read_buf2) {
                 kfree(read_buf1);
                 return -ENOMEM;
@@ -876,7 +876,7 @@ jffs_scan_flash(struct jffs_control *c)
         }
 
         /* Allocate read buffer */
-        read_buf = (__u8 *) kmalloc (sizeof(__u8) * 4096, GFP_KERNEL);
+        read_buf = kmalloc(sizeof(__u8) * 4096, GFP_KERNEL);
         if (!read_buf) {
                 flash_safe_release(fmc->mtd);
                 return -ENOMEM;
@@ -1463,7 +1463,7 @@ jffs_insert_node(struct jffs_control *c, struct jffs_file *f,
                         kfree(f->name);
                         DJM(no_name--);
                 }
-                if (!(f->name = (char *) kmalloc(raw_inode->nsize + 1,
+                if (!(f->name = kmalloc(raw_inode->nsize + 1,
                                                  GFP_KERNEL))) {
                         return -ENOMEM;
                 }
@@ -1737,7 +1737,7 @@ jffs_find_child(struct jffs_file *dir, const char *name, int len)
                 printk("jffs_find_child(): Found \"%s\".\n", f->name);
         }
         else {
-                char *copy = (char *) kmalloc(len + 1, GFP_KERNEL);
+                char *copy = kmalloc(len + 1, GFP_KERNEL);
                 if (copy) {
                         memcpy(copy, name, len);
                         copy[len] = '\0';
@@ -2627,7 +2627,7 @@ jffs_print_tree(struct jffs_file *first_file, int indent)
                 return;
         }
 
-        if (!(space = (char *) kmalloc(indent + 1, GFP_KERNEL))) {
+        if (!(space = kmalloc(indent + 1, GFP_KERNEL))) {
                 printk("jffs_print_tree(): Out of memory!\n");
                 return;
         }
diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
index 47bc0b5d1324..6d62f3222892 100644
--- a/fs/jfs/jfs_dtree.c
+++ b/fs/jfs/jfs_dtree.c
@@ -3777,12 +3777,12 @@ static int ciGetLeafPrefixKey(dtpage_t * lp, int li, dtpage_t * rp,
         struct component_name lkey;
         struct component_name rkey;
 
-        lkey.name = (wchar_t *) kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t),
+        lkey.name = kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t),
                                         GFP_KERNEL);
         if (lkey.name == NULL)
                 return -ENOMEM;
 
-        rkey.name = (wchar_t *) kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t),
+        rkey.name = kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t),
                                         GFP_KERNEL);
         if (rkey.name == NULL) {
                 kfree(lkey.name);
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index ee9b473b7b80..53f63b47a6d3 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -120,7 +120,7 @@ int diMount(struct inode *ipimap)
          * allocate/initialize the in-memory inode map control structure
          */
         /* allocate the in-memory inode map control structure. */
-        imap = (struct inomap *) kmalloc(sizeof(struct inomap), GFP_KERNEL);
+        imap = kmalloc(sizeof(struct inomap), GFP_KERNEL);
         if (imap == NULL) {
                 jfs_err("diMount: kmalloc returned NULL!");
                 return -ENOMEM;
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index 92681c9e9b20..062707745162 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -36,7 +36,7 @@ struct nlm_wait {
         struct nlm_host *       b_host;
         struct file_lock *      b_lock;         /* local file lock */
         unsigned short          b_reclaim;      /* got to reclaim lock */
-        u32                     b_status;       /* grant callback status */
+        __be32                  b_status;       /* grant callback status */
 };
 
 static LIST_HEAD(nlm_blocked);
@@ -53,7 +53,7 @@ struct nlm_wait *nlmclnt_prepare_block(struct nlm_host *host, struct file_lock *
                 block->b_host = host;
                 block->b_lock = fl;
                 init_waitqueue_head(&block->b_wait);
-                block->b_status = NLM_LCK_BLOCKED;
+                block->b_status = nlm_lck_blocked;
                 list_add(&block->b_list, &nlm_blocked);
         }
         return block;
@@ -89,7 +89,7 @@ int nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout)
          * nlmclnt_lock for an explanation.
          */
         ret = wait_event_interruptible_timeout(block->b_wait,
-                        block->b_status != NLM_LCK_BLOCKED,
+                        block->b_status != nlm_lck_blocked,
                         timeout);
         if (ret < 0)
                 return -ERESTARTSYS;
@@ -131,7 +131,7 @@ __be32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *lock
                 /* Alright, we found a lock. Set the return status
                  * and wake up the caller
                  */
-                block->b_status = NLM_LCK_GRANTED;
+                block->b_status = nlm_granted;
                 wake_up(&block->b_wait);
                 res = nlm_granted;
         }
@@ -211,7 +211,7 @@ restart:
         /* Now, wake up all processes that sleep on a blocked lock */
         list_for_each_entry(block, &nlm_blocked, b_list) {
                 if (block->b_host == host) {
-                        block->b_status = NLM_LCK_DENIED_GRACE_PERIOD;
+                        block->b_status = nlm_lck_denied_grace_period;
                         wake_up(&block->b_wait);
                 }
         }
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index 80a1a6dccc8f..0b4acc1c5e7d 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -27,7 +27,7 @@
 static int      nlmclnt_test(struct nlm_rqst *, struct file_lock *);
 static int      nlmclnt_lock(struct nlm_rqst *, struct file_lock *);
 static int      nlmclnt_unlock(struct nlm_rqst *, struct file_lock *);
-static int      nlm_stat_to_errno(u32 stat);
+static int      nlm_stat_to_errno(__be32 stat);
 static void     nlmclnt_locks_init_private(struct file_lock *fl, struct nlm_host *host);
 static int      nlmclnt_cancel(struct nlm_host *, int , struct file_lock *);
 
@@ -325,7 +325,7 @@ nlmclnt_call(struct nlm_rqst *req, u32 proc)
                         }
                         break;
                 } else
-                if (resp->status == NLM_LCK_DENIED_GRACE_PERIOD) {
+                if (resp->status == nlm_lck_denied_grace_period) {
                         dprintk("lockd: server in grace period\n");
                         if (argp->reclaim) {
                                 printk(KERN_WARNING
@@ -411,10 +411,10 @@ nlmclnt_test(struct nlm_rqst *req, struct file_lock *fl)
                 goto out;
 
         switch (req->a_res.status) {
-                case NLM_LCK_GRANTED:
+                case nlm_granted:
                         fl->fl_type = F_UNLCK;
                         break;
-                case NLM_LCK_DENIED:
+                case nlm_lck_denied:
                         /*
                          * Report the conflicting lock back to the application.
                          */
@@ -524,9 +524,9 @@ again:
                 if (!req->a_args.block)
                         break;
                 /* Did a reclaimer thread notify us of a server reboot? */
-                if (resp->status ==  NLM_LCK_DENIED_GRACE_PERIOD)
+                if (resp->status ==  nlm_lck_denied_grace_period)
                         continue;
-                if (resp->status != NLM_LCK_BLOCKED)
+                if (resp->status != nlm_lck_blocked)
                         break;
                 /* Wait on an NLM blocking lock */
                 status = nlmclnt_block(block, req, NLMCLNT_POLL_TIMEOUT);
@@ -535,11 +535,11 @@ again:
                  */
                 if (status < 0)
                         goto out_unblock;
-                if (resp->status != NLM_LCK_BLOCKED)
+                if (resp->status != nlm_lck_blocked)
                         break;
         }
 
-        if (resp->status == NLM_LCK_GRANTED) {
+        if (resp->status == nlm_granted) {
                 down_read(&host->h_rwsem);
                 /* Check whether or not the server has rebooted */
                 if (fl->fl_u.nfs_fl.state != host->h_state) {
@@ -556,7 +556,7 @@ again:
 out_unblock:
         nlmclnt_finish_block(block);
         /* Cancel the blocked request if it is still pending */
-        if (resp->status == NLM_LCK_BLOCKED)
+        if (resp->status == nlm_lck_blocked)
                 nlmclnt_cancel(host, req->a_args.block, fl);
 out:
         nlm_release_call(req);
@@ -585,12 +585,12 @@ nlmclnt_reclaim(struct nlm_host *host, struct file_lock *fl)
         req->a_args.reclaim = 1;
 
         if ((status = nlmclnt_call(req, NLMPROC_LOCK)) >= 0
-         && req->a_res.status == NLM_LCK_GRANTED)
+         && req->a_res.status == nlm_granted)
                 return 0;
 
         printk(KERN_WARNING "lockd: failed to reclaim lock for pid %d "
                                 "(errno %d, status %d)\n", fl->fl_pid,
-                                status, req->a_res.status);
+                                status, ntohl(req->a_res.status));
 
         /*
          * FIXME: This is a serious failure. We can
@@ -637,10 +637,10 @@ nlmclnt_unlock(struct nlm_rqst *req, struct file_lock *fl)
         if (status < 0)
                 goto out;
 
-        if (resp->status == NLM_LCK_GRANTED)
+        if (resp->status == nlm_granted)
                 goto out;
 
-        if (resp->status != NLM_LCK_DENIED_NOLOCKS)
+        if (resp->status != nlm_lck_denied_nolocks)
                 printk("lockd: unexpected unlock status: %d\n", resp->status);
         /* What to do now? I'm out of my depth... */
         status = -ENOLCK;
@@ -652,7 +652,7 @@ out:
 static void nlmclnt_unlock_callback(struct rpc_task *task, void *data)
 {
         struct nlm_rqst *req = data;
-        int             status = req->a_res.status;
+        u32 status = ntohl(req->a_res.status);
 
         if (RPC_ASSASSINATED(task))
                 goto die;
@@ -720,6 +720,7 @@ static int nlmclnt_cancel(struct nlm_host *host, int block, struct file_lock *fl
 static void nlmclnt_cancel_callback(struct rpc_task *task, void *data)
 {
         struct nlm_rqst *req = data;
+        u32 status = ntohl(req->a_res.status);
 
         if (RPC_ASSASSINATED(task))
                 goto die;
@@ -731,9 +732,9 @@ static void nlmclnt_cancel_callback(struct rpc_task *task, void *data)
         }
 
         dprintk("lockd: cancel status %u (task %u)\n",
-                        req->a_res.status, task->tk_pid);
+                        status, task->tk_pid);
 
-        switch (req->a_res.status) {
+        switch (status) {
         case NLM_LCK_GRANTED:
         case NLM_LCK_DENIED_GRACE_PERIOD:
         case NLM_LCK_DENIED:
@@ -744,7 +745,7 @@ static void nlmclnt_cancel_callback(struct rpc_task *task, void *data)
                 goto retry_cancel;
         default:
                 printk(KERN_NOTICE "lockd: weird return %d for CANCEL call\n",
-                        req->a_res.status);
+                        status);
         }
 
 die:
@@ -768,9 +769,9 @@ static const struct rpc_call_ops nlmclnt_cancel_ops = {
  * Convert an NLM status code to a generic kernel errno
  */
 static int
-nlm_stat_to_errno(u32 status)
+nlm_stat_to_errno(__be32 status)
 {
-        switch(status) {
+        switch(ntohl(status)) {
         case NLM_LCK_GRANTED:
                 return 0;
         case NLM_LCK_DENIED:
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index 5c054b20fd5e..c7db0a5bccdc 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -645,7 +645,7 @@ static const struct rpc_call_ops nlmsvc_grant_ops = {
  * block.
  */
 void
-nlmsvc_grant_reply(struct nlm_cookie *cookie, u32 status)
+nlmsvc_grant_reply(struct nlm_cookie *cookie, __be32 status)
 {
         struct nlm_block        *block;
 
@@ -655,7 +655,7 @@ nlmsvc_grant_reply(struct nlm_cookie *cookie, u32 status)
                 return;
 
         if (block) {
-                if (status == NLM_LCK_DENIED_GRACE_PERIOD) {
+                if (status == nlm_lck_denied_grace_period) {
                         /* Try again in a couple of seconds */
                         nlmsvc_insert_block(block, 10 * HZ);
                 } else {
diff --git a/fs/lockd/svcshare.c b/fs/lockd/svcshare.c
index 6220dc2a3f2c..068886de4dda 100644
--- a/fs/lockd/svcshare.c
+++ b/fs/lockd/svcshare.c
@@ -39,7 +39,7 @@ nlmsvc_share_file(struct nlm_host *host, struct nlm_file *file,
                         return nlm_lck_denied;
         }
 
-        share = (struct nlm_share *) kmalloc(sizeof(*share) + oh->len,
+        share = kmalloc(sizeof(*share) + oh->len,
                                                 GFP_KERNEL);
         if (share == NULL)
                 return nlm_lck_denied_nolocks;
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
index b7c949256e5a..34dae5d70738 100644
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -361,7 +361,7 @@ nlmsvc_decode_res(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp)
 {
         if (!(p = nlm_decode_cookie(p, &resp->cookie)))
                 return 0;
-        resp->status = ntohl(*p++);
+        resp->status = *p++;
         return xdr_argsize_check(rqstp, p);
 }
 
@@ -407,8 +407,8 @@ nlmclt_decode_testres(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp)
 {
         if (!(p = nlm_decode_cookie(p, &resp->cookie)))
                 return -EIO;
-        resp->status = ntohl(*p++);
-        if (resp->status == NLM_LCK_DENIED) {
+        resp->status = *p++;
+        if (resp->status == nlm_lck_denied) {
                 struct file_lock        *fl = &resp->lock.fl;
                 u32                     excl;
                 s32                     start, len, end;
@@ -506,7 +506,7 @@ nlmclt_decode_res(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp)
 {
         if (!(p = nlm_decode_cookie(p, &resp->cookie)))
                 return -EIO;
-        resp->status = ntohl(*p++);
+        resp->status = *p++;
         return 0;
 }
 
diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c
index f4c0b2b9f75a..a78240551219 100644
--- a/fs/lockd/xdr4.c
+++ b/fs/lockd/xdr4.c
@@ -367,7 +367,7 @@ nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp)
 {
         if (!(p = nlm4_decode_cookie(p, &resp->cookie)))
                 return 0;
-        resp->status = ntohl(*p++);
+        resp->status = *p++;
         return xdr_argsize_check(rqstp, p);
 }
 
@@ -413,8 +413,8 @@ nlm4clt_decode_testres(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp)
 {
         if (!(p = nlm4_decode_cookie(p, &resp->cookie)))
                 return -EIO;
-        resp->status = ntohl(*p++);
-        if (resp->status == NLM_LCK_DENIED) {
+        resp->status = *p++;
+        if (resp->status == nlm_lck_denied) {
                 struct file_lock        *fl = &resp->lock.fl;
                 u32                     excl;
                 s64                     start, end, len;
@@ -512,7 +512,7 @@ nlm4clt_decode_res(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp)
 {
         if (!(p = nlm4_decode_cookie(p, &resp->cookie)))
                 return -EIO;
-        resp->status = ntohl(*p++);
+        resp->status = *p++;
         return 0;
 }
 
diff --git a/fs/namespace.c b/fs/namespace.c
index fde8553faa76..5ef336c1103c 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -368,6 +368,7 @@ static int show_vfsmnt(struct seq_file *m, void *v)
                 { MNT_NOEXEC, ",noexec" },
                 { MNT_NOATIME, ",noatime" },
                 { MNT_NODIRATIME, ",nodiratime" },
+                { MNT_RELATIME, ",relatime" },
                 { 0, NULL }
         };
         struct proc_fs_info *fs_infop;
@@ -1405,9 +1406,11 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
                 mnt_flags |= MNT_NOATIME;
         if (flags & MS_NODIRATIME)
                 mnt_flags |= MNT_NODIRATIME;
+        if (flags & MS_RELATIME)
+                mnt_flags |= MNT_RELATIME;
 
         flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE |
-                   MS_NOATIME | MS_NODIRATIME);
+                   MS_NOATIME | MS_NODIRATIME | MS_RELATIME);
 
         /* ... and get the mountpoint */
         retval = path_lookup(dir_name, LOOKUP_FOLLOW, &nd);
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index 47462ac94474..67a90bf795d5 100644
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -327,11 +327,12 @@ static int ncp_parse_options(struct ncp_mount_data_kernel *data, char *options)
         char *optarg;
         unsigned long optint;
         int version = 0;
+        int ret;
 
         data->flags = 0;
         data->int_flags = 0;
         data->mounted_uid = 0;
-        data->wdog_pid = -1;
+        data->wdog_pid = NULL;
         data->ncp_fd = ~0;
         data->time_out = 10;
         data->retry_count = 20;
@@ -343,8 +344,9 @@ static int ncp_parse_options(struct ncp_mount_data_kernel *data, char *options)
         data->mounted_vol[0] = 0;
         
         while ((optval = ncp_getopt("ncpfs", &options, ncp_opts, NULL, &optarg, &optint)) != 0) {
-                if (optval < 0)
-                        return optval;
+                ret = optval;
+                if (ret < 0)
+                        goto err;
                 switch (optval) {
                         case 'u':
                                 data->uid = optint;
@@ -371,7 +373,7 @@ static int ncp_parse_options(struct ncp_mount_data_kernel *data, char *options)
                                 data->flags = optint;
                                 break;
                         case 'w':
-                                data->wdog_pid = optint;
+                                data->wdog_pid = find_get_pid(optint);
                                 break;
                         case 'n':
                                 data->ncp_fd = optint;
@@ -380,18 +382,21 @@ static int ncp_parse_options(struct ncp_mount_data_kernel *data, char *options)
                                 data->info_fd = optint;
                                 break;
                         case 'v':
-                                if (optint < NCP_MOUNT_VERSION_V4) {
-                                        return -ECHRNG;
-                                }
-                                if (optint > NCP_MOUNT_VERSION_V5) {
-                                        return -ECHRNG;
-                                }
+                                ret = -ECHRNG;
+                                if (optint < NCP_MOUNT_VERSION_V4)
+                                        goto err;
+                                if (optint > NCP_MOUNT_VERSION_V5)
+                                        goto err;
                                 version = optint;
                                 break;
                         
                 }
         }
         return 0;
+err:
+        put_pid(data->wdog_pid);
+        data->wdog_pid = NULL;
+        return ret;
 }
 
 static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
@@ -409,6 +414,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
 #endif
         struct ncp_entry_info finfo;
 
+        data.wdog_pid = NULL;
         server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
         if (!server)
                 return -ENOMEM;
@@ -425,7 +431,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
                                 data.flags = md->flags;
                                 data.int_flags = NCP_IMOUNT_LOGGEDIN_POSSIBLE;
                                 data.mounted_uid = md->mounted_uid;
-                                data.wdog_pid = md->wdog_pid;
+                                data.wdog_pid = find_get_pid(md->wdog_pid);
                                 data.ncp_fd = md->ncp_fd;
                                 data.time_out = md->time_out;
                                 data.retry_count = md->retry_count;
@@ -445,7 +451,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
                                 data.flags = md->flags;
                                 data.int_flags = 0;
                                 data.mounted_uid = md->mounted_uid;
-                                data.wdog_pid = md->wdog_pid;
+                                data.wdog_pid = find_get_pid(md->wdog_pid);
                                 data.ncp_fd = md->ncp_fd;
                                 data.time_out = md->time_out;
                                 data.retry_count = md->retry_count;
@@ -679,6 +685,7 @@ out_fput:
          */
         fput(ncp_filp);
 out:
+        put_pid(data.wdog_pid);
         sb->s_fs_info = NULL;
         kfree(server);
         return error;
@@ -711,7 +718,8 @@ static void ncp_put_super(struct super_block *sb)
         if (server->info_filp)
                 fput(server->info_filp);
         fput(server->ncp_filp);
-        kill_proc(server->m.wdog_pid, SIGTERM, 1);
+        kill_pid(server->m.wdog_pid, SIGTERM, 1);
+        put_pid(server->m.wdog_pid);
 
         kfree(server->priv.data);
         kfree(server->auth.object_name);
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ee458aeab24a..b3fd29baadc3 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1877,7 +1877,7 @@ static int nfs4_proc_unlink_setup(struct rpc_message *msg, struct dentry *dir,
         struct nfs_server *server = NFS_SERVER(dir->d_inode);
         struct unlink_desc *up;
 
-        up = (struct unlink_desc *) kmalloc(sizeof(*up), GFP_KERNEL);
+        up = kmalloc(sizeof(*up), GFP_KERNEL);
         if (!up)
                 return -ENOMEM;
         
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index f37df46d2eaa..248dd92e6a56 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -787,15 +787,20 @@ exp_get_by_name(svc_client *clp, struct vfsmount *mnt, struct dentry *dentry,
         key.ex_dentry = dentry;
 
         exp = svc_export_lookup(&key);
-        if (exp != NULL) 
-                switch (cache_check(&svc_export_cache, &exp->h, reqp)) {
+        if (exp != NULL)  {
+                int err;
+
+                err = cache_check(&svc_export_cache, &exp->h, reqp);
+                switch (err) {
                 case 0: break;
                 case -EAGAIN:
-                        exp = ERR_PTR(-EAGAIN);
+                case -ETIMEDOUT:
+                        exp = ERR_PTR(err);
                         break;
                 default:
                         exp = NULL;
                 }
+        }
 
         return exp;
 }
@@ -950,6 +955,8 @@ exp_export(struct nfsctl_export *nxp)
 
         exp = exp_get_by_name(clp, nd.mnt, nd.dentry, NULL);
 
+        memset(&new, 0, sizeof(new));
+
         /* must make sure there won't be an ex_fsid clash */
         if ((nxp->ex_flags & NFSEXP_FSID) &&
             (fsid_key = exp_get_fsid_key(clp, nxp->ex_dev)) &&
@@ -980,6 +987,9 @@ exp_export(struct nfsctl_export *nxp)
 
         new.h.expiry_time = NEVER;
         new.h.flags = 0;
+        new.ex_path = kstrdup(nxp->ex_path, GFP_KERNEL);
+        if (!new.ex_path)
+                goto finish;
         new.ex_client = clp;
         new.ex_mnt = nd.mnt;
         new.ex_dentry = nd.dentry;
@@ -1000,10 +1010,11 @@ exp_export(struct nfsctl_export *nxp)
                 /* failed to create at least one index */
                 exp_do_unexport(exp);
                 cache_flush();
-                err = -ENOMEM;
-        }
-
+        } else
+                err = 0;
 finish:
+        if (new.ex_path)
+                kfree(new.ex_path);
         if (exp)
                 exp_put(exp);
         if (fsid_key && !IS_ERR(fsid_key))
@@ -1104,6 +1115,10 @@ exp_rootfh(svc_client *clp, char *path, struct knfsd_fh *f, int maxsize)
                  path, nd.dentry, clp->name,
                  inode->i_sb->s_id, inode->i_ino);
         exp = exp_parent(clp, nd.mnt, nd.dentry, NULL);
+        if (IS_ERR(exp)) {
+                err = PTR_ERR(exp);
+                goto out;
+        }
         if (!exp) {
                 dprintk("nfsd: exp_rootfh export not found.\n");
                 goto out;
@@ -1159,12 +1174,10 @@ exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp,
         mk_fsid_v1(fsidv, 0);
 
         exp = exp_find(clp, 1, fsidv, creq);
-        if (IS_ERR(exp) && PTR_ERR(exp) == -EAGAIN)
-                return nfserr_dropit;
+        if (IS_ERR(exp))
+                return nfserrno(PTR_ERR(exp));
         if (exp == NULL)
                 return nfserr_perm;
-        else if (IS_ERR(exp))
-                return nfserrno(PTR_ERR(exp));
         rv = fh_compose(fhp, exp, exp->ex_dentry, NULL);
         exp_put(exp);
         return rv;
diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
index 11fdaf7721b4..221acd1f11f6 100644
--- a/fs/nfsd/lockd.c
+++ b/fs/nfsd/lockd.c
@@ -22,7 +22,7 @@
 /*
  * Note: we hold the dentry use count while the file is open.
  */
-static u32
+static __be32
 nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp)
 {
         __be32          nfserr;
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 50bc94243ca1..8522729830db 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -33,13 +33,6 @@
  *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Note: some routines in this file are just trivial wrappers
- * (e.g. nfsd4_lookup()) defined solely for the sake of consistent
- * naming.  Since all such routines have been declared "inline",
- * there shouldn't be any associated overhead.  At some point in
- * the future, I might inline these "by hand" to clean up a
- * little.
  */
 
 #include <linux/param.h>
@@ -161,8 +154,9 @@ do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_
 }
 
 
-static inline __be32
-nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open, struct nfs4_stateowner **replay_owner)
+static __be32
+nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+           struct nfsd4_open *open)
 {
         __be32 status;
         dprintk("NFSD: nfsd4_open filename %.*s op_stateowner %p\n",
@@ -179,11 +173,11 @@ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open
         status = nfsd4_process_open1(open);
         if (status == nfserr_replay_me) {
                 struct nfs4_replay *rp = &open->op_stateowner->so_replay;
-                fh_put(current_fh);
-                current_fh->fh_handle.fh_size = rp->rp_openfh_len;
-                memcpy(&current_fh->fh_handle.fh_base, rp->rp_openfh,
+                fh_put(&cstate->current_fh);
+                cstate->current_fh.fh_handle.fh_size = rp->rp_openfh_len;
+                memcpy(&cstate->current_fh.fh_handle.fh_base, rp->rp_openfh,
                                 rp->rp_openfh_len);
-                status = fh_verify(rqstp, current_fh, 0, MAY_NOP);
+                status = fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP);
                 if (status)
                         dprintk("nfsd4_open: replay failed"
                                 " restoring previous filehandle\n");
@@ -215,7 +209,8 @@ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open
                          * (3) set open->op_truncate if the file is to be
                          * truncated after opening, (4) do permission checking.
                          */
-                        status = do_open_lookup(rqstp, current_fh, open);
+                        status = do_open_lookup(rqstp, &cstate->current_fh,
+                                                open);
                         if (status)
                                 goto out;
                         break;
@@ -227,7 +222,8 @@ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open
                          * open->op_truncate if the file is to be truncated
                          * after opening, (3) do permission checking.
                         */
-                        status = do_open_fhandle(rqstp, current_fh, open);
+                        status = do_open_fhandle(rqstp, &cstate->current_fh,
+                                                 open);
                         if (status)
                                 goto out;
                         break;
@@ -248,11 +244,11 @@ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open
          * successful, it (1) truncates the file if open->op_truncate was
          * set, (2) sets open->op_stateid, (3) sets open->op_delegation.
          */
-        status = nfsd4_process_open2(rqstp, current_fh, open);
+        status = nfsd4_process_open2(rqstp, &cstate->current_fh, open);
 out:
         if (open->op_stateowner) {
                 nfs4_get_stateowner(open->op_stateowner);
-                *replay_owner = open->op_stateowner;
+                cstate->replay_owner = open->op_stateowner;
         }
         nfs4_unlock_state();
         return status;
@@ -261,71 +257,80 @@ out:
 /*
  * filehandle-manipulating ops.
  */
-static inline __be32
-nfsd4_getfh(struct svc_fh *current_fh, struct svc_fh **getfh)
+static __be32
+nfsd4_getfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+            struct svc_fh **getfh)
 {
-        if (!current_fh->fh_dentry)
+        if (!cstate->current_fh.fh_dentry)
                 return nfserr_nofilehandle;
 
-        *getfh = current_fh;
+        *getfh = &cstate->current_fh;
         return nfs_ok;
 }
 
-static inline __be32
-nfsd4_putfh(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_putfh *putfh)
+static __be32
+nfsd4_putfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+            struct nfsd4_putfh *putfh)
 {
-        fh_put(current_fh);
-        current_fh->fh_handle.fh_size = putfh->pf_fhlen;
-        memcpy(&current_fh->fh_handle.fh_base, putfh->pf_fhval, putfh->pf_fhlen);
-        return fh_verify(rqstp, current_fh, 0, MAY_NOP);
+        fh_put(&cstate->current_fh);
+        cstate->current_fh.fh_handle.fh_size = putfh->pf_fhlen;
+        memcpy(&cstate->current_fh.fh_handle.fh_base, putfh->pf_fhval,
+               putfh->pf_fhlen);
+        return fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP);
 }
 
-static inline __be32
-nfsd4_putrootfh(struct svc_rqst *rqstp, struct svc_fh *current_fh)
+static __be32
+nfsd4_putrootfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+                void *arg)
 {
         __be32 status;
 
-        fh_put(current_fh);
-        status = exp_pseudoroot(rqstp->rq_client, current_fh,
+        fh_put(&cstate->current_fh);
+        status = exp_pseudoroot(rqstp->rq_client, &cstate->current_fh,
                               &rqstp->rq_chandle);
         return status;
 }
 
-static inline __be32
-nfsd4_restorefh(struct svc_fh *current_fh, struct svc_fh *save_fh)
+static __be32
+nfsd4_restorefh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+                void *arg)
 {
-        if (!save_fh->fh_dentry)
+        if (!cstate->save_fh.fh_dentry)
                 return nfserr_restorefh;
 
-        fh_dup2(current_fh, save_fh);
+        fh_dup2(&cstate->current_fh, &cstate->save_fh);
         return nfs_ok;
 }
 
-static inline __be32
-nfsd4_savefh(struct svc_fh *current_fh, struct svc_fh *save_fh)
+static __be32
+nfsd4_savefh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+             void *arg)
 {
-        if (!current_fh->fh_dentry)
+        if (!cstate->current_fh.fh_dentry)
                 return nfserr_nofilehandle;
 
-        fh_dup2(save_fh, current_fh);
+        fh_dup2(&cstate->save_fh, &cstate->current_fh);
         return nfs_ok;
 }
 
 /*
  * misc nfsv4 ops
  */
-static inline __be32
-nfsd4_access(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_access *access)
+static __be32
+nfsd4_access(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+             struct nfsd4_access *access)
 {
         if (access->ac_req_access & ~NFS3_ACCESS_FULL)
                 return nfserr_inval;
 
         access->ac_resp_access = access->ac_req_access;
-        return nfsd_access(rqstp, current_fh, &access->ac_resp_access, &access->ac_supported);
+        return nfsd_access(rqstp, &cstate->current_fh, &access->ac_resp_access,
+                           &access->ac_supported);
 }
 
-static inline __be32
-nfsd4_commit(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_commit *commit)
+static __be32
+nfsd4_commit(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+             struct nfsd4_commit *commit)
 {
         __be32 status;
 
@@ -333,14 +338,16 @@ nfsd4_commit(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_com
         *p++ = nfssvc_boot.tv_sec;
         *p++ = nfssvc_boot.tv_usec;
 
-        status = nfsd_commit(rqstp, current_fh, commit->co_offset, commit->co_count);
+        status = nfsd_commit(rqstp, &cstate->current_fh, commit->co_offset,
+                             commit->co_count);
         if (status == nfserr_symlink)
                 status = nfserr_inval;
         return status;
 }
 
 static __be32
-nfsd4_create(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_create *create)
+nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+             struct nfsd4_create *create)
 {
         struct svc_fh resfh;
         __be32 status;
@@ -348,7 +355,7 @@ nfsd4_create(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_cre
 
         fh_init(&resfh, NFS4_FHSIZE);
 
-        status = fh_verify(rqstp, current_fh, S_IFDIR, MAY_CREATE);
+        status = fh_verify(rqstp, &cstate->current_fh, S_IFDIR, MAY_CREATE);
         if (status == nfserr_symlink)
                 status = nfserr_notdir;
         if (status)
@@ -365,9 +372,10 @@ nfsd4_create(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_cre
                  */
                 create->cr_linkname[create->cr_linklen] = 0;
 
-                status = nfsd_symlink(rqstp, current_fh, create->cr_name,
-                                      create->cr_namelen, create->cr_linkname,
-                                      create->cr_linklen, &resfh, &create->cr_iattr);
+                status = nfsd_symlink(rqstp, &cstate->current_fh,
+                                      create->cr_name, create->cr_namelen,
+                                      create->cr_linkname, create->cr_linklen,
+                                      &resfh, &create->cr_iattr);
                 break;
 
         case NF4BLK:
@@ -375,9 +383,9 @@ nfsd4_create(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_cre
                 if (MAJOR(rdev) != create->cr_specdata1 ||
                     MINOR(rdev) != create->cr_specdata2)
                         return nfserr_inval;
-                status = nfsd_create(rqstp, current_fh, create->cr_name,
-                                     create->cr_namelen, &create->cr_iattr,
-                                     S_IFBLK, rdev, &resfh);
+                status = nfsd_create(rqstp, &cstate->current_fh,
+                                     create->cr_name, create->cr_namelen,
+                                     &create->cr_iattr, S_IFBLK, rdev, &resfh);
                 break;
 
         case NF4CHR:
@@ -385,28 +393,28 @@ nfsd4_create(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_cre
                 if (MAJOR(rdev) != create->cr_specdata1 ||
                     MINOR(rdev) != create->cr_specdata2)
                         return nfserr_inval;
-                status = nfsd_create(rqstp, current_fh, create->cr_name,
-                                     create->cr_namelen, &create->cr_iattr,
-                                     S_IFCHR, rdev, &resfh);
+                status = nfsd_create(rqstp, &cstate->current_fh,
+                                     create->cr_name, create->cr_namelen,
+                                     &create->cr_iattr,S_IFCHR, rdev, &resfh);
                 break;
 
         case NF4SOCK:
-                status = nfsd_create(rqstp, current_fh, create->cr_name,
-                                     create->cr_namelen, &create->cr_iattr,
-                                     S_IFSOCK, 0, &resfh);
+                status = nfsd_create(rqstp, &cstate->current_fh,
+                                     create->cr_name, create->cr_namelen,
+                                     &create->cr_iattr, S_IFSOCK, 0, &resfh);
                 break;
 
         case NF4FIFO:
-                status = nfsd_create(rqstp, current_fh, create->cr_name,
-                                     create->cr_namelen, &create->cr_iattr,
-                                     S_IFIFO, 0, &resfh);
+                status = nfsd_create(rqstp, &cstate->current_fh,
+                                     create->cr_name, create->cr_namelen,
+                                     &create->cr_iattr, S_IFIFO, 0, &resfh);
                 break;
 
         case NF4DIR:
                 create->cr_iattr.ia_valid &= ~ATTR_SIZE;
-                status = nfsd_create(rqstp, current_fh, create->cr_name,
-                                     create->cr_namelen, &create->cr_iattr,
-                                     S_IFDIR, 0, &resfh);
+                status = nfsd_create(rqstp, &cstate->current_fh,
+                                     create->cr_name, create->cr_namelen,
+                                     &create->cr_iattr, S_IFDIR, 0, &resfh);
                 break;
 
         default:
@@ -414,21 +422,22 @@ nfsd4_create(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_cre
         }
 
         if (!status) {
-                fh_unlock(current_fh);
-                set_change_info(&create->cr_cinfo, current_fh);
-                fh_dup2(current_fh, &resfh);
+                fh_unlock(&cstate->current_fh);
+                set_change_info(&create->cr_cinfo, &cstate->current_fh);
+                fh_dup2(&cstate->current_fh, &resfh);
         }
 
         fh_put(&resfh);
         return status;
 }
 
-static inline __be32
-nfsd4_getattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_getattr *getattr)
+static __be32
+nfsd4_getattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+              struct nfsd4_getattr *getattr)
 {
         __be32 status;
 
-        status = fh_verify(rqstp, current_fh, 0, MAY_NOP);
+        status = fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP);
         if (status)
                 return status;
 
@@ -438,26 +447,28 @@ nfsd4_getattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_ge
         getattr->ga_bmval[0] &= NFSD_SUPPORTED_ATTRS_WORD0;
         getattr->ga_bmval[1] &= NFSD_SUPPORTED_ATTRS_WORD1;
 
-        getattr->ga_fhp = current_fh;
+        getattr->ga_fhp = &cstate->current_fh;
         return nfs_ok;
 }
 
-static inline __be32
-nfsd4_link(struct svc_rqst *rqstp, struct svc_fh *current_fh,
-           struct svc_fh *save_fh, struct nfsd4_link *link)
+static __be32
+nfsd4_link(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+           struct nfsd4_link *link)
 {
         __be32 status = nfserr_nofilehandle;
 
-        if (!save_fh->fh_dentry)
+        if (!cstate->save_fh.fh_dentry)
                 return status;
-        status = nfsd_link(rqstp, current_fh, link->li_name, link->li_namelen, save_fh);
+        status = nfsd_link(rqstp, &cstate->current_fh,
+                           link->li_name, link->li_namelen, &cstate->save_fh);
         if (!status)
-                set_change_info(&link->li_cinfo, current_fh);
+                set_change_info(&link->li_cinfo, &cstate->current_fh);
         return status;
 }
 
 static __be32
-nfsd4_lookupp(struct svc_rqst *rqstp, struct svc_fh *current_fh)
+nfsd4_lookupp(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+              void *arg)
 {
         struct svc_fh tmp_fh;
         __be32 ret;
@@ -466,22 +477,27 @@ nfsd4_lookupp(struct svc_rqst *rqstp, struct svc_fh *current_fh)
         if((ret = exp_pseudoroot(rqstp->rq_client, &tmp_fh,
                               &rqstp->rq_chandle)) != 0)
                 return ret;
-        if (tmp_fh.fh_dentry == current_fh->fh_dentry) {
+        if (tmp_fh.fh_dentry == cstate->current_fh.fh_dentry) {
                 fh_put(&tmp_fh);
                 return nfserr_noent;
         }
         fh_put(&tmp_fh);
-        return nfsd_lookup(rqstp, current_fh, "..", 2, current_fh);
+        return nfsd_lookup(rqstp, &cstate->current_fh,
+                           "..", 2, &cstate->current_fh);
 }
 
-static inline __be32
-nfsd4_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lookup *lookup)
+static __be32
+nfsd4_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+             struct nfsd4_lookup *lookup)
 {
-        return nfsd_lookup(rqstp, current_fh, lookup->lo_name, lookup->lo_len, current_fh);
+        return nfsd_lookup(rqstp, &cstate->current_fh,
+                           lookup->lo_name, lookup->lo_len,
+                           &cstate->current_fh);
 }
 
-static inline __be32
-nfsd4_read(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_read *read)
+static __be32
+nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+           struct nfsd4_read *read)
 {
         __be32 status;
 
@@ -493,7 +509,8 @@ nfsd4_read(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_read
 
         nfs4_lock_state();
         /* check stateid */
-        if ((status = nfs4_preprocess_stateid_op(current_fh, &read->rd_stateid,
+        if ((status = nfs4_preprocess_stateid_op(&cstate->current_fh,
+                                &read->rd_stateid,
                                 CHECK_FH | RD_STATE, &read->rd_filp))) {
                 dprintk("NFSD: nfsd4_read: couldn't process stateid!\n");
                 goto out;
@@ -504,12 +521,13 @@ nfsd4_read(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_read
 out:
         nfs4_unlock_state();
         read->rd_rqstp = rqstp;
-        read->rd_fhp = current_fh;
+        read->rd_fhp = &cstate->current_fh;
         return status;
 }
 
-static inline __be32
-nfsd4_readdir(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_readdir *readdir)
+static __be32
+nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+              struct nfsd4_readdir *readdir)
 {
         u64 cookie = readdir->rd_cookie;
         static const nfs4_verifier zeroverf;
@@ -527,48 +545,51 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_re
                 return nfserr_bad_cookie;
 
         readdir->rd_rqstp = rqstp;
-        readdir->rd_fhp = current_fh;
+        readdir->rd_fhp = &cstate->current_fh;
         return nfs_ok;
 }
 
-static inline __be32
-nfsd4_readlink(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_readlink *readlink)
+static __be32
+nfsd4_readlink(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+               struct nfsd4_readlink *readlink)
 {
         readlink->rl_rqstp = rqstp;
-        readlink->rl_fhp = current_fh;
+        readlink->rl_fhp = &cstate->current_fh;
         return nfs_ok;
 }
 
-static inline __be32
-nfsd4_remove(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_remove *remove)
+static __be32
+nfsd4_remove(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+             struct nfsd4_remove *remove)
 {
         __be32 status;
 
         if (nfs4_in_grace())
                 return nfserr_grace;
-        status = nfsd_unlink(rqstp, current_fh, 0, remove->rm_name, remove->rm_namelen);
+        status = nfsd_unlink(rqstp, &cstate->current_fh, 0,
+                             remove->rm_name, remove->rm_namelen);
         if (status == nfserr_symlink)
                 return nfserr_notdir;
         if (!status) {
-                fh_unlock(current_fh);
-                set_change_info(&remove->rm_cinfo, current_fh);
+                fh_unlock(&cstate->current_fh);
+                set_change_info(&remove->rm_cinfo, &cstate->current_fh);
         }
         return status;
 }
 
-static inline __be32
-nfsd4_rename(struct svc_rqst *rqstp, struct svc_fh *current_fh,
-             struct svc_fh *save_fh, struct nfsd4_rename *rename)
+static __be32
+nfsd4_rename(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+             struct nfsd4_rename *rename)
 {
         __be32 status = nfserr_nofilehandle;
 
-        if (!save_fh->fh_dentry)
+        if (!cstate->save_fh.fh_dentry)
                 return status;
-        if (nfs4_in_grace() && !(save_fh->fh_export->ex_flags
+        if (nfs4_in_grace() && !(cstate->save_fh.fh_export->ex_flags
                                         & NFSEXP_NOSUBTREECHECK))
                 return nfserr_grace;
-        status = nfsd_rename(rqstp, save_fh, rename->rn_sname,
-                             rename->rn_snamelen, current_fh,
+        status = nfsd_rename(rqstp, &cstate->save_fh, rename->rn_sname,
+                             rename->rn_snamelen, &cstate->current_fh,
                              rename->rn_tname, rename->rn_tnamelen);
 
         /* the underlying filesystem returns different error's than required
@@ -576,27 +597,28 @@ nfsd4_rename(struct svc_rqst *rqstp, struct svc_fh *current_fh,
         if (status == nfserr_isdir)
                 status = nfserr_exist;
         else if ((status == nfserr_notdir) &&
-                  (S_ISDIR(save_fh->fh_dentry->d_inode->i_mode) &&
-                   S_ISDIR(current_fh->fh_dentry->d_inode->i_mode)))
+                  (S_ISDIR(cstate->save_fh.fh_dentry->d_inode->i_mode) &&
+                   S_ISDIR(cstate->current_fh.fh_dentry->d_inode->i_mode)))
                 status = nfserr_exist;
         else if (status == nfserr_symlink)
                 status = nfserr_notdir;
 
         if (!status) {
-                set_change_info(&rename->rn_sinfo, current_fh);
-                set_change_info(&rename->rn_tinfo, save_fh);
+                set_change_info(&rename->rn_sinfo, &cstate->current_fh);
+                set_change_info(&rename->rn_tinfo, &cstate->save_fh);
         }
         return status;
 }
 
-static inline __be32
-nfsd4_setattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_setattr *setattr)
+static __be32
+nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+              struct nfsd4_setattr *setattr)
 {
         __be32 status = nfs_ok;
 
         if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {
                 nfs4_lock_state();
-                status = nfs4_preprocess_stateid_op(current_fh,
+                status = nfs4_preprocess_stateid_op(&cstate->current_fh,
                         &setattr->sa_stateid, CHECK_FH | WR_STATE, NULL);
                 nfs4_unlock_state();
                 if (status) {
@@ -606,16 +628,18 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_se
         }
         status = nfs_ok;
         if (setattr->sa_acl != NULL)
-                status = nfsd4_set_nfs4_acl(rqstp, current_fh, setattr->sa_acl);
+                status = nfsd4_set_nfs4_acl(rqstp, &cstate->current_fh,
+                                            setattr->sa_acl);
         if (status)
                 return status;
-        status = nfsd_setattr(rqstp, current_fh, &setattr->sa_iattr,
+        status = nfsd_setattr(rqstp, &cstate->current_fh, &setattr->sa_iattr,
                                 0, (time_t)0);
         return status;
 }
 
-static inline __be32
-nfsd4_write(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_write *write)
+static __be32
+nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+            struct nfsd4_write *write)
 {
         stateid_t *stateid = &write->wr_stateid;
         struct file *filp = NULL;
@@ -628,7 +652,7 @@ nfsd4_write(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_writ
                 return nfserr_inval;
 
         nfs4_lock_state();
-        status = nfs4_preprocess_stateid_op(current_fh, stateid,
+        status = nfs4_preprocess_stateid_op(&cstate->current_fh, stateid,
                                         CHECK_FH | WR_STATE, &filp);
         if (filp)
                 get_file(filp);
@@ -645,9 +669,9 @@ nfsd4_write(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_writ
         *p++ = nfssvc_boot.tv_sec;
         *p++ = nfssvc_boot.tv_usec;
 
-        status =  nfsd_write(rqstp, current_fh, filp, write->wr_offset,
-                        rqstp->rq_vec, write->wr_vlen, write->wr_buflen,
-                        &write->wr_how_written);
+        status =  nfsd_write(rqstp, &cstate->current_fh, filp,
+                             write->wr_offset, rqstp->rq_vec, write->wr_vlen,
+                             write->wr_buflen, &write->wr_how_written);
         if (filp)
                 fput(filp);
 
@@ -662,13 +686,14 @@ nfsd4_write(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_writ
  * to NFS_OK after the call; NVERIFY by mapping NFSERR_NOT_SAME to NFS_OK.
  */
 static __be32
-nfsd4_verify(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_verify *verify)
+_nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+             struct nfsd4_verify *verify)
 {
         __be32 *buf, *p;
         int count;
         __be32 status;
 
-        status = fh_verify(rqstp, current_fh, 0, MAY_NOP);
+        status = fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP);
         if (status)
                 return status;
 
@@ -689,8 +714,9 @@ nfsd4_verify(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_ver
         if (!buf)
                 return nfserr_resource;
 
-        status = nfsd4_encode_fattr(current_fh, current_fh->fh_export,
-                                    current_fh->fh_dentry, buf,
+        status = nfsd4_encode_fattr(&cstate->current_fh,
+                                    cstate->current_fh.fh_export,
+                                    cstate->current_fh.fh_dentry, buf,
                                     &count, verify->ve_bmval,
                                     rqstp);
 
@@ -712,6 +738,26 @@ out_kfree:
         return status;
 }
 
+static __be32
+nfsd4_nverify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+              struct nfsd4_verify *verify)
+{
+        __be32 status;
+
+        status = _nfsd4_verify(rqstp, cstate, verify);
+        return status == nfserr_not_same ? nfs_ok : status;
+}
+
+static __be32
+nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+             struct nfsd4_verify *verify)
+{
+        __be32 status;
+
+        status = _nfsd4_verify(rqstp, cstate, verify);
+        return status == nfserr_same ? nfs_ok : status;
+}
+
 /*
  * NULL call.
  */
@@ -727,6 +773,42 @@ static inline void nfsd4_increment_op_stats(u32 opnum)
                 nfsdstats.nfs4_opcount[opnum]++;
 }
 
+static void cstate_free(struct nfsd4_compound_state *cstate)
+{
+        if (cstate == NULL)
+                return;
+        fh_put(&cstate->current_fh);
+        fh_put(&cstate->save_fh);
+        BUG_ON(cstate->replay_owner);
+        kfree(cstate);
+}
+
+static struct nfsd4_compound_state *cstate_alloc(void)
+{
+        struct nfsd4_compound_state *cstate;
+
+        cstate = kmalloc(sizeof(struct nfsd4_compound_state), GFP_KERNEL);
+        if (cstate == NULL)
+                return NULL;
+        fh_init(&cstate->current_fh, NFS4_FHSIZE);
+        fh_init(&cstate->save_fh, NFS4_FHSIZE);
+        cstate->replay_owner = NULL;
+        return cstate;
+}
+
+typedef __be32(*nfsd4op_func)(struct svc_rqst *, struct nfsd4_compound_state *,
+                              void *);
+
+struct nfsd4_operation {
+        nfsd4op_func op_func;
+        u32 op_flags;
+/* Most ops require a valid current filehandle; a few don't: */
+#define ALLOWED_WITHOUT_FH 1
+/* GETATTR and ops not listed as returning NFS4ERR_MOVED: */
+#define ALLOWED_ON_ABSENT_FS 2
+};
+
+static struct nfsd4_operation nfsd4_ops[];
 
 /*
  * COMPOUND call.
@@ -737,21 +819,15 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
                     struct nfsd4_compoundres *resp)
 {
         struct nfsd4_op *op;
-        struct svc_fh   *current_fh = NULL;
-        struct svc_fh   *save_fh = NULL;
-        struct nfs4_stateowner *replay_owner = NULL;
-        int             slack_space;    /* in words, not bytes! */
+        struct nfsd4_operation *opdesc;
+        struct nfsd4_compound_state *cstate = NULL;
+        int             slack_bytes;
         __be32          status;
 
         status = nfserr_resource;
-        current_fh = kmalloc(sizeof(*current_fh), GFP_KERNEL);
-        if (current_fh == NULL)
-                goto out;
-        fh_init(current_fh, NFS4_FHSIZE);
-        save_fh = kmalloc(sizeof(*save_fh), GFP_KERNEL);
-        if (save_fh == NULL)
+        cstate = cstate_alloc();
+        if (cstate == NULL)
                 goto out;
-        fh_init(save_fh, NFS4_FHSIZE);
 
         resp->xbuf = &rqstp->rq_res;
         resp->p = rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len;
@@ -790,164 +866,44 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
                  * failed response to the next operation.  If we don't
                  * have enough room, fail with ERR_RESOURCE.
                  */
-/* FIXME - is slack_space *really* words, or bytes??? - neilb */
-                slack_space = (char *)resp->end - (char *)resp->p;
-                if (slack_space < COMPOUND_SLACK_SPACE + COMPOUND_ERR_SLACK_SPACE) {
-                        BUG_ON(slack_space < COMPOUND_ERR_SLACK_SPACE);
+                slack_bytes = (char *)resp->end - (char *)resp->p;
+                if (slack_bytes < COMPOUND_SLACK_SPACE
+                                + COMPOUND_ERR_SLACK_SPACE) {
+                        BUG_ON(slack_bytes < COMPOUND_ERR_SLACK_SPACE);
                         op->status = nfserr_resource;
                         goto encode_op;
                 }
 
-                /* All operations except RENEW, SETCLIENTID, RESTOREFH
-                * SETCLIENTID_CONFIRM, PUTFH and PUTROOTFH
-                * require a valid current filehandle
-                */
-                if (!current_fh->fh_dentry) {
-                        if (!((op->opnum == OP_PUTFH) ||
-                              (op->opnum == OP_PUTROOTFH) ||
-                              (op->opnum == OP_SETCLIENTID) ||
-                              (op->opnum == OP_SETCLIENTID_CONFIRM) ||
-                              (op->opnum == OP_RENEW) ||
-                              (op->opnum == OP_RESTOREFH) ||
-                              (op->opnum == OP_RELEASE_LOCKOWNER))) {
+                opdesc = &nfsd4_ops[op->opnum];
+
+                if (!cstate->current_fh.fh_dentry) {
+                        if (!(opdesc->op_flags & ALLOWED_WITHOUT_FH)) {
                                 op->status = nfserr_nofilehandle;
                                 goto encode_op;
                         }
-                }
-                /* Check must be done at start of each operation, except
-                 * for GETATTR and ops not listed as returning NFS4ERR_MOVED
-                 */
-                else if (current_fh->fh_export->ex_fslocs.migrated &&
-                         !((op->opnum == OP_GETATTR) ||
-                           (op->opnum == OP_PUTROOTFH) ||
-                           (op->opnum == OP_PUTPUBFH) ||
-                           (op->opnum == OP_RENEW) ||
-                           (op->opnum == OP_SETCLIENTID) ||
-                           (op->opnum == OP_RELEASE_LOCKOWNER))) {
+                } else if (cstate->current_fh.fh_export->ex_fslocs.migrated &&
+                          !(opdesc->op_flags & ALLOWED_ON_ABSENT_FS)) {
                         op->status = nfserr_moved;
                         goto encode_op;
                 }
-                switch (op->opnum) {
-                case OP_ACCESS:
-                        op->status = nfsd4_access(rqstp, current_fh, &op->u.access);
-                        break;
-                case OP_CLOSE:
-                        op->status = nfsd4_close(rqstp, current_fh, &op->u.close, &replay_owner);
-                        break;
-                case OP_COMMIT:
-                        op->status = nfsd4_commit(rqstp, current_fh, &op->u.commit);
-                        break;
-                case OP_CREATE:
-                        op->status = nfsd4_create(rqstp, current_fh, &op->u.create);
-                        break;
-                case OP_DELEGRETURN:
-                        op->status = nfsd4_delegreturn(rqstp, current_fh, &op->u.delegreturn);
-                        break;
-                case OP_GETATTR:
-                        op->status = nfsd4_getattr(rqstp, current_fh, &op->u.getattr);
-                        break;
-                case OP_GETFH:
-                        op->status = nfsd4_getfh(current_fh, &op->u.getfh);
-                        break;
-                case OP_LINK:
-                        op->status = nfsd4_link(rqstp, current_fh, save_fh, &op->u.link);
-                        break;
-                case OP_LOCK:
-                        op->status = nfsd4_lock(rqstp, current_fh, &op->u.lock, &replay_owner);
-                        break;
-                case OP_LOCKT:
-                        op->status = nfsd4_lockt(rqstp, current_fh, &op->u.lockt);
-                        break;
-                case OP_LOCKU:
-                        op->status = nfsd4_locku(rqstp, current_fh, &op->u.locku, &replay_owner);
-                        break;
-                case OP_LOOKUP:
-                        op->status = nfsd4_lookup(rqstp, current_fh, &op->u.lookup);
-                        break;
-                case OP_LOOKUPP:
-                        op->status = nfsd4_lookupp(rqstp, current_fh);
-                        break;
-                case OP_NVERIFY:
-                        op->status = nfsd4_verify(rqstp, current_fh, &op->u.nverify);
-                        if (op->status == nfserr_not_same)
-                                op->status = nfs_ok;
-                        break;
-                case OP_OPEN:
-                        op->status = nfsd4_open(rqstp, current_fh, &op->u.open, &replay_owner);
-                        break;
-                case OP_OPEN_CONFIRM:
-                        op->status = nfsd4_open_confirm(rqstp, current_fh, &op->u.open_confirm, &replay_owner);
-                        break;
-                case OP_OPEN_DOWNGRADE:
-                        op->status = nfsd4_open_downgrade(rqstp, current_fh, &op->u.open_downgrade, &replay_owner);
-                        break;
-                case OP_PUTFH:
-                        op->status = nfsd4_putfh(rqstp, current_fh, &op->u.putfh);
-                        break;
-                case OP_PUTROOTFH:
-                        op->status = nfsd4_putrootfh(rqstp, current_fh);
-                        break;
-                case OP_READ:
-                        op->status = nfsd4_read(rqstp, current_fh, &op->u.read);
-                        break;
-                case OP_READDIR:
-                        op->status = nfsd4_readdir(rqstp, current_fh, &op->u.readdir);
-                        break;
-                case OP_READLINK:
-                        op->status = nfsd4_readlink(rqstp, current_fh, &op->u.readlink);
-                        break;
-                case OP_REMOVE:
-                        op->status = nfsd4_remove(rqstp, current_fh, &op->u.remove);
-                        break;
-                case OP_RENAME:
-                        op->status = nfsd4_rename(rqstp, current_fh, save_fh, &op->u.rename);
-                        break;
-                case OP_RENEW:
-                        op->status = nfsd4_renew(&op->u.renew);
-                        break;
-                case OP_RESTOREFH:
-                        op->status = nfsd4_restorefh(current_fh, save_fh);
-                        break;
-                case OP_SAVEFH:
-                        op->status = nfsd4_savefh(current_fh, save_fh);
-                        break;
-                case OP_SETATTR:
-                        op->status = nfsd4_setattr(rqstp, current_fh, &op->u.setattr);
-                        break;
-                case OP_SETCLIENTID:
-                        op->status = nfsd4_setclientid(rqstp, &op->u.setclientid);
-                        break;
-                case OP_SETCLIENTID_CONFIRM:
-                        op->status = nfsd4_setclientid_confirm(rqstp, &op->u.setclientid_confirm);
-                        break;
-                case OP_VERIFY:
-                        op->status = nfsd4_verify(rqstp, current_fh, &op->u.verify);
-                        if (op->status == nfserr_same)
-                                op->status = nfs_ok;
-                        break;
-                case OP_WRITE:
-                        op->status = nfsd4_write(rqstp, current_fh, &op->u.write);
-                        break;
-                case OP_RELEASE_LOCKOWNER:
-                        op->status = nfsd4_release_lockowner(rqstp, &op->u.release_lockowner);
-                        break;
-                default:
+
+                if (opdesc->op_func)
+                        op->status = opdesc->op_func(rqstp, cstate, &op->u);
+                else
                         BUG_ON(op->status == nfs_ok);
-                        break;
-                }
 
 encode_op:
                 if (op->status == nfserr_replay_me) {
-                        op->replay = &replay_owner->so_replay;
+                        op->replay = &cstate->replay_owner->so_replay;
                         nfsd4_encode_replay(resp, op);
                         status = op->status = op->replay->rp_status;
                 } else {
                         nfsd4_encode_operation(resp, op);
                         status = op->status;
                 }
-                if (replay_owner && (replay_owner != (void *)(-1))) {
-                        nfs4_put_stateowner(replay_owner);
-                        replay_owner = NULL;
+                if (cstate->replay_owner) {
+                        nfs4_put_stateowner(cstate->replay_owner);
+                        cstate->replay_owner = NULL;
                 }
                 /* XXX Ugh, we need to get rid of this kind of special case: */
                 if (op->opnum == OP_READ && op->u.read.rd_filp)
@@ -958,15 +914,124 @@ encode_op:
 
 out:
         nfsd4_release_compoundargs(args);
-        if (current_fh)
-                fh_put(current_fh);
-        kfree(current_fh);
-        if (save_fh)
-                fh_put(save_fh);
-        kfree(save_fh);
+        cstate_free(cstate);
         return status;
 }
 
+static struct nfsd4_operation nfsd4_ops[OP_RELEASE_LOCKOWNER+1] = {
+        [OP_ACCESS] = {
+                .op_func = (nfsd4op_func)nfsd4_access,
+        },
+        [OP_CLOSE] = {
+                .op_func = (nfsd4op_func)nfsd4_close,
+        },
+        [OP_COMMIT] = {
+                .op_func = (nfsd4op_func)nfsd4_commit,
+        },
+        [OP_CREATE] = {
+                .op_func = (nfsd4op_func)nfsd4_create,
+        },
+        [OP_DELEGRETURN] = {
+                .op_func = (nfsd4op_func)nfsd4_delegreturn,
+        },
+        [OP_GETATTR] = {
+                .op_func = (nfsd4op_func)nfsd4_getattr,
+                .op_flags = ALLOWED_ON_ABSENT_FS,
+        },
+        [OP_GETFH] = {
+                .op_func = (nfsd4op_func)nfsd4_getfh,
+        },
+        [OP_LINK] = {
+                .op_func = (nfsd4op_func)nfsd4_link,
+        },
+        [OP_LOCK] = {
+                .op_func = (nfsd4op_func)nfsd4_lock,
+        },
+        [OP_LOCKT] = {
+                .op_func = (nfsd4op_func)nfsd4_lockt,
+        },
+        [OP_LOCKU] = {
+                .op_func = (nfsd4op_func)nfsd4_locku,
+        },
+        [OP_LOOKUP] = {
+                .op_func = (nfsd4op_func)nfsd4_lookup,
+        },
+        [OP_LOOKUPP] = {
+                .op_func = (nfsd4op_func)nfsd4_lookupp,
+        },
+        [OP_NVERIFY] = {
+                .op_func = (nfsd4op_func)nfsd4_nverify,
+        },
+        [OP_OPEN] = {
+                .op_func = (nfsd4op_func)nfsd4_open,
+        },
+        [OP_OPEN_CONFIRM] = {
+                .op_func = (nfsd4op_func)nfsd4_open_confirm,
+        },
+        [OP_OPEN_DOWNGRADE] = {
+                .op_func = (nfsd4op_func)nfsd4_open_downgrade,
+        },
+        [OP_PUTFH] = {
+                .op_func = (nfsd4op_func)nfsd4_putfh,
+                .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+        },
+        [OP_PUTPUBFH] = {
+                /* unsupported; just for future reference: */
+                .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+        },
+        [OP_PUTROOTFH] = {
+                .op_func = (nfsd4op_func)nfsd4_putrootfh,
+                .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+        },
+        [OP_READ] = {
+                .op_func = (nfsd4op_func)nfsd4_read,
+        },
+        [OP_READDIR] = {
+                .op_func = (nfsd4op_func)nfsd4_readdir,
+        },
+        [OP_READLINK] = {
+                .op_func = (nfsd4op_func)nfsd4_readlink,
+        },
+        [OP_REMOVE] = {
+                .op_func = (nfsd4op_func)nfsd4_remove,
+        },
+        [OP_RENAME] = {
+                .op_func = (nfsd4op_func)nfsd4_rename,
+        },
+        [OP_RENEW] = {
+                .op_func = (nfsd4op_func)nfsd4_renew,
+                .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+        },
+        [OP_RESTOREFH] = {
+                .op_func = (nfsd4op_func)nfsd4_restorefh,
+                .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+        },
+        [OP_SAVEFH] = {
+                .op_func = (nfsd4op_func)nfsd4_savefh,
+        },
+        [OP_SETATTR] = {
+                .op_func = (nfsd4op_func)nfsd4_setattr,
+        },
+        [OP_SETCLIENTID] = {
+                .op_func = (nfsd4op_func)nfsd4_setclientid,
+                .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+        },
+        [OP_SETCLIENTID_CONFIRM] = {
+                .op_func = (nfsd4op_func)nfsd4_setclientid_confirm,
+                .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+        },
+        [OP_VERIFY] = {
+                .op_func = (nfsd4op_func)nfsd4_verify,
+        },
+        [OP_WRITE] = {
+                .op_func = (nfsd4op_func)nfsd4_write,
+        },
+        [OP_RELEASE_LOCKOWNER] = {
+                .op_func = (nfsd4op_func)nfsd4_release_lockowner,
+                .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+        },
+};
+
 #define nfs4svc_decode_voidargs         NULL
 #define nfs4svc_release_void            NULL
 #define nfsd4_voidres                   nfsd4_voidargs
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index b7179bd45a1e..9de89df961f4 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -711,7 +711,8 @@ out_err:
  *
  */
 __be32
-nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid)
+nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+                  struct nfsd4_setclientid *setclid)
 {
         __be32                  ip_addr = rqstp->rq_addr.sin_addr.s_addr;
         struct xdr_netobj       clname = { 
@@ -876,7 +877,9 @@ out:
  * NOTE: callback information will be processed here in a future patch
  */
 __be32
-nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_setclientid_confirm *setclientid_confirm)
+nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
+                         struct nfsd4_compound_state *cstate,
+                         struct nfsd4_setclientid_confirm *setclientid_confirm)
 {
         __be32 ip_addr = rqstp->rq_addr.sin_addr.s_addr;
         struct nfs4_client *conf, *unconf;
@@ -1833,7 +1836,8 @@ static void laundromat_main(struct work_struct *);
 static DECLARE_DELAYED_WORK(laundromat_work, laundromat_main);
 
 __be32
-nfsd4_renew(clientid_t *clid)
+nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+            clientid_t *clid)
 {
         struct nfs4_client *clp;
         __be32 status;
@@ -2241,24 +2245,25 @@ check_replay:
 }
 
 __be32
-nfsd4_open_confirm(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open_confirm *oc, struct nfs4_stateowner **replay_owner)
+nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+                   struct nfsd4_open_confirm *oc)
 {
         __be32 status;
         struct nfs4_stateowner *sop;
         struct nfs4_stateid *stp;
 
         dprintk("NFSD: nfsd4_open_confirm on file %.*s\n",
-                        (int)current_fh->fh_dentry->d_name.len,
-                        current_fh->fh_dentry->d_name.name);
+                        (int)cstate->current_fh.fh_dentry->d_name.len,
+                        cstate->current_fh.fh_dentry->d_name.name);
 
-        status = fh_verify(rqstp, current_fh, S_IFREG, 0);
+        status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0);
         if (status)
                 return status;
 
         nfs4_lock_state();
 
-        if ((status = nfs4_preprocess_seqid_op(current_fh, oc->oc_seqid,
-                                        &oc->oc_req_stateid,
+        if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh,
+                                        oc->oc_seqid, &oc->oc_req_stateid,
                                         CHECK_FH | CONFIRM | OPEN_STATE,
                                         &oc->oc_stateowner, &stp, NULL)))
                 goto out; 
@@ -2278,7 +2283,7 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfs
 out:
         if (oc->oc_stateowner) {
                 nfs4_get_stateowner(oc->oc_stateowner);
-                *replay_owner = oc->oc_stateowner;
+                cstate->replay_owner = oc->oc_stateowner;
         }
         nfs4_unlock_state();
         return status;
@@ -2310,22 +2315,25 @@ reset_union_bmap_deny(unsigned long deny, unsigned long *bmap)
 }
 
 __be32
-nfsd4_open_downgrade(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open_downgrade *od, struct nfs4_stateowner **replay_owner)
+nfsd4_open_downgrade(struct svc_rqst *rqstp,
+                     struct nfsd4_compound_state *cstate,
+                     struct nfsd4_open_downgrade *od)
 {
         __be32 status;
         struct nfs4_stateid *stp;
         unsigned int share_access;
 
         dprintk("NFSD: nfsd4_open_downgrade on file %.*s\n", 
-                        (int)current_fh->fh_dentry->d_name.len,
-                        current_fh->fh_dentry->d_name.name);
+                        (int)cstate->current_fh.fh_dentry->d_name.len,
+                        cstate->current_fh.fh_dentry->d_name.name);
 
         if (!access_valid(od->od_share_access)
                         || !deny_valid(od->od_share_deny))
                 return nfserr_inval;
 
         nfs4_lock_state();
-        if ((status = nfs4_preprocess_seqid_op(current_fh, od->od_seqid, 
+        if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh,
+                                        od->od_seqid,
                                         &od->od_stateid, 
                                         CHECK_FH | OPEN_STATE, 
                                         &od->od_stateowner, &stp, NULL)))
@@ -2355,7 +2363,7 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct n
 out:
         if (od->od_stateowner) {
                 nfs4_get_stateowner(od->od_stateowner);
-                *replay_owner = od->od_stateowner;
+                cstate->replay_owner = od->od_stateowner;
         }
         nfs4_unlock_state();
         return status;
@@ -2365,18 +2373,20 @@ out:
  * nfs4_unlock_state() called after encode
  */
 __be32
-nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_close *close, struct nfs4_stateowner **replay_owner)
+nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+            struct nfsd4_close *close)
 {
         __be32 status;
         struct nfs4_stateid *stp;
 
         dprintk("NFSD: nfsd4_close on file %.*s\n", 
-                        (int)current_fh->fh_dentry->d_name.len,
-                        current_fh->fh_dentry->d_name.name);
+                        (int)cstate->current_fh.fh_dentry->d_name.len,
+                        cstate->current_fh.fh_dentry->d_name.name);
 
         nfs4_lock_state();
         /* check close_lru for replay */
-        if ((status = nfs4_preprocess_seqid_op(current_fh, close->cl_seqid, 
+        if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh,
+                                        close->cl_seqid,
                                         &close->cl_stateid, 
                                         CHECK_FH | OPEN_STATE | CLOSE_STATE,
                                         &close->cl_stateowner, &stp, NULL)))
@@ -2397,22 +2407,24 @@ nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_clos
 out:
         if (close->cl_stateowner) {
                 nfs4_get_stateowner(close->cl_stateowner);
-                *replay_owner = close->cl_stateowner;
+                cstate->replay_owner = close->cl_stateowner;
         }
         nfs4_unlock_state();
         return status;
 }
 
 __be32
-nfsd4_delegreturn(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_delegreturn *dr)
+nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+                  struct nfsd4_delegreturn *dr)
 {
         __be32 status;
 
-        if ((status = fh_verify(rqstp, current_fh, S_IFREG, 0)))
+        if ((status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0)))
                 goto out;
 
         nfs4_lock_state();
-        status = nfs4_preprocess_stateid_op(current_fh, &dr->dr_stateid, DELEG_RET, NULL);
+        status = nfs4_preprocess_stateid_op(&cstate->current_fh,
+                                            &dr->dr_stateid, DELEG_RET, NULL);
         nfs4_unlock_state();
 out:
         return status;
@@ -2635,7 +2647,8 @@ check_lock_length(u64 offset, u64 length)
  *  LOCK operation 
  */
 __be32
-nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock *lock, struct nfs4_stateowner **replay_owner)
+nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+           struct nfsd4_lock *lock)
 {
         struct nfs4_stateowner *open_sop = NULL;
         struct nfs4_stateowner *lock_sop = NULL;
@@ -2654,7 +2667,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
         if (check_lock_length(lock->lk_offset, lock->lk_length))
                  return nfserr_inval;
 
-        if ((status = fh_verify(rqstp, current_fh, S_IFREG, MAY_LOCK))) {
+        if ((status = fh_verify(rqstp, &cstate->current_fh,
+                                S_IFREG, MAY_LOCK))) {
                 dprintk("NFSD: nfsd4_lock: permission denied!\n");
                 return status;
         }
@@ -2675,7 +2689,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
                         goto out;
 
                 /* validate and update open stateid and open seqid */
-                status = nfs4_preprocess_seqid_op(current_fh, 
+                status = nfs4_preprocess_seqid_op(&cstate->current_fh,
                                         lock->lk_new_open_seqid,
                                         &lock->lk_new_open_stateid,
                                         CHECK_FH | OPEN_STATE,
@@ -2702,7 +2716,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
                         goto out;
         } else {
                 /* lock (lock owner + lock stateid) already exists */
-                status = nfs4_preprocess_seqid_op(current_fh,
+                status = nfs4_preprocess_seqid_op(&cstate->current_fh,
                                        lock->lk_old_lock_seqid, 
                                        &lock->lk_old_lock_stateid, 
                                        CHECK_FH | LOCK_STATE, 
@@ -2759,7 +2773,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
         conflock.fl_ops = NULL;
         conflock.fl_lmops = NULL;
         err = posix_lock_file_conf(filp, &file_lock, &conflock);
-        dprintk("NFSD: nfsd4_lock: posix_lock_file_conf status %d\n",status);
         switch (-err) {
         case 0: /* success! */
                 update_stateid(&lock_stp->st_stateid);
@@ -2785,7 +2798,7 @@ out:
                 release_stateowner(lock_sop);
         if (lock->lk_replay_owner) {
                 nfs4_get_stateowner(lock->lk_replay_owner);
-                *replay_owner = lock->lk_replay_owner;
+                cstate->replay_owner = lock->lk_replay_owner;
         }
         nfs4_unlock_state();
         return status;
@@ -2795,7 +2808,8 @@ out:
  * LOCKT operation
  */
 __be32
-nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lockt *lockt)
+nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+            struct nfsd4_lockt *lockt)
 {
         struct inode *inode;
         struct file file;
@@ -2816,14 +2830,14 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
         if (STALE_CLIENTID(&lockt->lt_clientid))
                 goto out;
 
-        if ((status = fh_verify(rqstp, current_fh, S_IFREG, 0))) {
+        if ((status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0))) {
                 dprintk("NFSD: nfsd4_lockt: fh_verify() failed!\n");
                 if (status == nfserr_symlink)
                         status = nfserr_inval;
                 goto out;
         }
 
-        inode = current_fh->fh_dentry->d_inode;
+        inode = cstate->current_fh.fh_dentry->d_inode;
         locks_init_lock(&file_lock);
         switch (lockt->lt_type) {
                 case NFS4_READ_LT:
@@ -2862,7 +2876,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
          * only the dentry:inode set.
          */
         memset(&file, 0, sizeof (struct file));
-        file.f_path.dentry = current_fh->fh_dentry;
+        file.f_path.dentry = cstate->current_fh.fh_dentry;
 
         status = nfs_ok;
         if (posix_test_lock(&file, &file_lock, &conflock)) {
@@ -2875,7 +2889,8 @@ out:
 }
 
 __be32
-nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_locku *locku, struct nfs4_stateowner **replay_owner)
+nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+            struct nfsd4_locku *locku)
 {
         struct nfs4_stateid *stp;
         struct file *filp = NULL;
@@ -2892,7 +2907,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
 
         nfs4_lock_state();
                                                                                 
-        if ((status = nfs4_preprocess_seqid_op(current_fh, 
+        if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh,
                                         locku->lu_seqid, 
                                         &locku->lu_stateid, 
                                         CHECK_FH | LOCK_STATE, 
@@ -2933,7 +2948,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
 out:
         if (locku->lu_stateowner) {
                 nfs4_get_stateowner(locku->lu_stateowner);
-                *replay_owner = locku->lu_stateowner;
+                cstate->replay_owner = locku->lu_stateowner;
         }
         nfs4_unlock_state();
         return status;
@@ -2968,7 +2983,9 @@ out:
 }
 
 __be32
-nfsd4_release_lockowner(struct svc_rqst *rqstp, struct nfsd4_release_lockowner *rlockowner)
+nfsd4_release_lockowner(struct svc_rqst *rqstp,
+                        struct nfsd4_compound_state *cstate,
+                        struct nfsd4_release_lockowner *rlockowner)
 {
         clientid_t *clid = &rlockowner->rl_clientid;
         struct nfs4_stateowner *sop;
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index f3f239db04bb..fea46368afb2 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1845,15 +1845,11 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd,
 
         exp_get(exp);
         if (d_mountpoint(dentry)) {
-                if (nfsd_cross_mnt(cd->rd_rqstp, &dentry, &exp)) {
-                /*
-                 * -EAGAIN is the only error returned from
-                 * nfsd_cross_mnt() and it indicates that an
-                 * up-call has  been initiated to fill in the export
-                 * options on exp.  When the answer comes back,
-                 * this call will be retried.
-                 */
-                        nfserr = nfserr_dropit;
+                int err;
+
+                err = nfsd_cross_mnt(cd->rd_rqstp, &dentry, &exp);
+                if (err) {
+                        nfserr = nfserrno(err);
                         goto out_put;
                 }
 
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index 727ab3bd450d..b06bf9f70efc 100644
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -169,9 +169,11 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
                         exp = exp_find(rqstp->rq_client, 0, tfh, &rqstp->rq_chandle);
                 }
 
-                error = nfserr_dropit;
-                if (IS_ERR(exp) && PTR_ERR(exp) == -EAGAIN)
+                if (IS_ERR(exp) && (PTR_ERR(exp) == -EAGAIN
+                                || PTR_ERR(exp) == -ETIMEDOUT)) {
+                        error = nfserrno(PTR_ERR(exp));
                         goto out;
+                }
 
                 error = nfserr_stale; 
                 if (!exp || IS_ERR(exp))
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 4883d7586229..7a79c23aa6d4 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -99,7 +99,7 @@ static struct raparm_hbucket	raparm_hash[RAPARM_HASH_SIZE];
 /* 
  * Called from nfsd_lookup and encode_dirent. Check if we have crossed 
  * a mount point.
- * Returns -EAGAIN leaving *dpp and *expp unchanged, 
+ * Returns -EAGAIN or -ETIMEDOUT leaving *dpp and *expp unchanged,
  *  or nfs_ok having possibly changed *dpp and *expp
  */
 int
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index edc91ca3792a..f27e5378caf2 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -1959,7 +1959,7 @@ int ocfs2_prepare_truncate(struct ocfs2_super *osb,
                 goto bail;
         }
 
-        *tc = kcalloc(1, sizeof(struct ocfs2_truncate_context), GFP_KERNEL);
+        *tc = kzalloc(sizeof(struct ocfs2_truncate_context), GFP_KERNEL);
         if (!(*tc)) {
                 status = -ENOMEM;
                 mlog_errno(status);
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 4cd9a9580456..a25ef5a50386 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -1553,7 +1553,7 @@ static struct config_item *o2hb_heartbeat_group_make_item(struct config_group *g
         struct o2hb_region *reg = NULL;
         struct config_item *ret = NULL;
 
-        reg = kcalloc(1, sizeof(struct o2hb_region), GFP_KERNEL);
+        reg = kzalloc(sizeof(struct o2hb_region), GFP_KERNEL);
         if (reg == NULL)
                 goto out; /* ENOMEM */
 
@@ -1679,7 +1679,7 @@ struct config_group *o2hb_alloc_hb_set(void)
         struct o2hb_heartbeat_group *hs = NULL;
         struct config_group *ret = NULL;
 
-        hs = kcalloc(1, sizeof(struct o2hb_heartbeat_group), GFP_KERNEL);
+        hs = kzalloc(sizeof(struct o2hb_heartbeat_group), GFP_KERNEL);
         if (hs == NULL)
                 goto out;
 
diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c
index 357f1d551771..b17333a0606b 100644
--- a/fs/ocfs2/cluster/nodemanager.c
+++ b/fs/ocfs2/cluster/nodemanager.c
@@ -714,7 +714,7 @@ static struct config_item *o2nm_node_group_make_item(struct config_group *group,
         if (strlen(name) > O2NM_MAX_NAME_LEN)
                 goto out; /* ENAMETOOLONG */
 
-        node = kcalloc(1, sizeof(struct o2nm_node), GFP_KERNEL);
+        node = kzalloc(sizeof(struct o2nm_node), GFP_KERNEL);
         if (node == NULL)
                 goto out; /* ENOMEM */
 
@@ -825,8 +825,8 @@ static struct config_group *o2nm_cluster_group_make_group(struct config_group *g
         if (o2nm_single_cluster)
                 goto out; /* ENOSPC */
 
-        cluster = kcalloc(1, sizeof(struct o2nm_cluster), GFP_KERNEL);
-        ns = kcalloc(1, sizeof(struct o2nm_node_group), GFP_KERNEL);
+        cluster = kzalloc(sizeof(struct o2nm_cluster), GFP_KERNEL);
+        ns = kzalloc(sizeof(struct o2nm_node_group), GFP_KERNEL);
         defs = kcalloc(3, sizeof(struct config_group *), GFP_KERNEL);
         o2hb_group = o2hb_alloc_hb_set();
         if (cluster == NULL || ns == NULL || o2hb_group == NULL || defs == NULL)
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index 457753df1ae7..ae4ff4a6636b 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -324,7 +324,7 @@ static struct o2net_sock_container *sc_alloc(struct o2nm_node *node)
         struct page *page = NULL;
 
         page = alloc_page(GFP_NOFS);
-        sc = kcalloc(1, sizeof(*sc), GFP_NOFS);
+        sc = kzalloc(sizeof(*sc), GFP_NOFS);
         if (sc == NULL || page == NULL)
                 goto out;
 
@@ -714,7 +714,7 @@ int o2net_register_handler(u32 msg_type, u32 key, u32 max_len,
                 goto out;
         }
 
-        nmh = kcalloc(1, sizeof(struct o2net_msg_handler), GFP_NOFS);
+        nmh = kzalloc(sizeof(struct o2net_msg_handler), GFP_NOFS);
         if (nmh == NULL) {
                 ret = -ENOMEM;
                 goto out;
@@ -1918,9 +1918,9 @@ int o2net_init(void)
 
         o2quo_init();
 
-        o2net_hand = kcalloc(1, sizeof(struct o2net_handshake), GFP_KERNEL);
-        o2net_keep_req = kcalloc(1, sizeof(struct o2net_msg), GFP_KERNEL);
-        o2net_keep_resp = kcalloc(1, sizeof(struct o2net_msg), GFP_KERNEL);
+        o2net_hand = kzalloc(sizeof(struct o2net_handshake), GFP_KERNEL);
+        o2net_keep_req = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL);
+        o2net_keep_resp = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL);
         if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp) {
                 kfree(o2net_hand);
                 kfree(o2net_keep_req);
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 420a375a3949..f0b25f2dd205 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -920,7 +920,7 @@ static int dlm_try_to_join_domain(struct dlm_ctxt *dlm)
 
         mlog_entry("%p", dlm);
 
-        ctxt = kcalloc(1, sizeof(*ctxt), GFP_KERNEL);
+        ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL);
         if (!ctxt) {
                 status = -ENOMEM;
                 mlog_errno(status);
@@ -1223,7 +1223,7 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
         int i;
         struct dlm_ctxt *dlm = NULL;
 
-        dlm = kcalloc(1, sizeof(*dlm), GFP_KERNEL);
+        dlm = kzalloc(sizeof(*dlm), GFP_KERNEL);
         if (!dlm) {
                 mlog_errno(-ENOMEM);
                 goto leave;
diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c
index 42a1b91979b5..e5ca3db197f6 100644
--- a/fs/ocfs2/dlm/dlmlock.c
+++ b/fs/ocfs2/dlm/dlmlock.c
@@ -408,13 +408,13 @@ struct dlm_lock * dlm_new_lock(int type, u8 node, u64 cookie,
         struct dlm_lock *lock;
         int kernel_allocated = 0;
 
-        lock = kcalloc(1, sizeof(*lock), GFP_NOFS);
+        lock = kzalloc(sizeof(*lock), GFP_NOFS);
         if (!lock)
                 return NULL;
 
         if (!lksb) {
                 /* zero memory only if kernel-allocated */
-                lksb = kcalloc(1, sizeof(*lksb), GFP_NOFS);
+                lksb = kzalloc(sizeof(*lksb), GFP_NOFS);
                 if (!lksb) {
                         kfree(lock);
                         return NULL;
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 856012b4fa49..0ad872055cb3 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -1939,7 +1939,7 @@ int dlm_dispatch_assert_master(struct dlm_ctxt *dlm,
                                int ignore_higher, u8 request_from, u32 flags)
 {
         struct dlm_work_item *item;
-        item = kcalloc(1, sizeof(*item), GFP_NOFS);
+        item = kzalloc(sizeof(*item), GFP_NOFS);
         if (!item)
                 return -ENOMEM;
 
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index fb3e2b0817f1..367a11e9e2ed 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -757,7 +757,7 @@ static int dlm_init_recovery_area(struct dlm_ctxt *dlm, u8 dead_node)
                 }
                 BUG_ON(num == dead_node);
 
-                ndata = kcalloc(1, sizeof(*ndata), GFP_NOFS);
+                ndata = kzalloc(sizeof(*ndata), GFP_NOFS);
                 if (!ndata) {
                         dlm_destroy_recovery_area(dlm, dead_node);
                         return -ENOMEM;
@@ -842,7 +842,7 @@ int dlm_request_all_locks_handler(struct o2net_msg *msg, u32 len, void *data)
         }
         BUG_ON(lr->dead_node != dlm->reco.dead_node);
 
-        item = kcalloc(1, sizeof(*item), GFP_NOFS);
+        item = kzalloc(sizeof(*item), GFP_NOFS);
         if (!item) {
                 dlm_put(dlm);
                 return -ENOMEM;
@@ -1323,7 +1323,7 @@ int dlm_mig_lockres_handler(struct o2net_msg *msg, u32 len, void *data)
 
         ret = -ENOMEM;
         buf = kmalloc(be16_to_cpu(msg->data_len), GFP_NOFS);
-        item = kcalloc(1, sizeof(*item), GFP_NOFS);
+        item = kzalloc(sizeof(*item), GFP_NOFS);
         if (!buf || !item)
                 goto leave;
 
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index e9a82ad95c1e..9fd590b9bde3 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -153,6 +153,14 @@ int ocfs2_should_update_atime(struct inode *inode,
             ((vfsmnt->mnt_flags & MNT_NODIRATIME) && S_ISDIR(inode->i_mode)))
                 return 0;
 
+        if (vfsmnt->mnt_flags & MNT_RELATIME) {
+                if ((timespec_compare(&inode->i_atime, &inode->i_mtime) <= 0) ||
+                    (timespec_compare(&inode->i_atime, &inode->i_ctime) <= 0))
+                        return 1;
+
+                return 0;
+        }
+
         now = CURRENT_TIME;
         if ((now.tv_sec - inode->i_atime.tv_sec <= osb->s_atime_quantum))
                 return 0;
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
index 698d79a74ef8..4dedd9789108 100644
--- a/fs/ocfs2/localalloc.c
+++ b/fs/ocfs2/localalloc.c
@@ -776,7 +776,7 @@ static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb,
 {
         int status;
 
-        *ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
+        *ac = kzalloc(sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
         if (!(*ac)) {
                 status = -ENOMEM;
                 mlog_errno(status);
diff --git a/fs/ocfs2/slot_map.c b/fs/ocfs2/slot_map.c
index aa6f5aadedc4..2d3ac32cb74e 100644
--- a/fs/ocfs2/slot_map.c
+++ b/fs/ocfs2/slot_map.c
@@ -175,7 +175,7 @@ int ocfs2_init_slot_info(struct ocfs2_super *osb)
         struct buffer_head *bh = NULL;
         struct ocfs2_slot_info *si;
 
-        si = kcalloc(1, sizeof(struct ocfs2_slot_info), GFP_KERNEL);
+        si = kzalloc(sizeof(struct ocfs2_slot_info), GFP_KERNEL);
         if (!si) {
                 status = -ENOMEM;
                 mlog_errno(status);
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
index 000d71cca6c5..6dbb11762759 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -488,7 +488,7 @@ int ocfs2_reserve_new_metadata(struct ocfs2_super *osb,
         int status;
         u32 slot;
 
-        *ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
+        *ac = kzalloc(sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
         if (!(*ac)) {
                 status = -ENOMEM;
                 mlog_errno(status);
@@ -530,7 +530,7 @@ int ocfs2_reserve_new_inode(struct ocfs2_super *osb,
 {
         int status;
 
-        *ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
+        *ac = kzalloc(sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
         if (!(*ac)) {
                 status = -ENOMEM;
                 mlog_errno(status);
@@ -595,7 +595,7 @@ int ocfs2_reserve_clusters(struct ocfs2_super *osb,
 
         mlog_entry_void();
 
-        *ac = kcalloc(1, sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
+        *ac = kzalloc(sizeof(struct ocfs2_alloc_context), GFP_KERNEL);
         if (!(*ac)) {
                 status = -ENOMEM;
                 mlog_errno(status);
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index a6d2f8cc165b..6e300a88a47e 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1231,7 +1231,7 @@ static int ocfs2_setup_osb_uuid(struct ocfs2_super *osb, const unsigned char *uu
 
         BUG_ON(uuid_bytes != OCFS2_VOL_UUID_LEN);
 
-        osb->uuid_str = kcalloc(1, OCFS2_VOL_UUID_LEN * 2 + 1, GFP_KERNEL);
+        osb->uuid_str = kzalloc(OCFS2_VOL_UUID_LEN * 2 + 1, GFP_KERNEL);
         if (osb->uuid_str == NULL)
                 return -ENOMEM;
 
@@ -1262,7 +1262,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
 
         mlog_entry_void();
 
-        osb = kcalloc(1, sizeof(struct ocfs2_super), GFP_KERNEL);
+        osb = kzalloc(sizeof(struct ocfs2_super), GFP_KERNEL);
         if (!osb) {
                 status = -ENOMEM;
                 mlog_errno(status);
@@ -1387,7 +1387,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
          */
         /* initialize our journal structure */
 
-        journal = kcalloc(1, sizeof(struct ocfs2_journal), GFP_KERNEL);
+        journal = kzalloc(sizeof(struct ocfs2_journal), GFP_KERNEL);
         if (!journal) {
                 mlog(ML_ERROR, "unable to alloc journal\n");
                 status = -ENOMEM;
diff --git a/fs/ocfs2/vote.c b/fs/ocfs2/vote.c
index 0315a8b61ed6..0afd8b9af70f 100644
--- a/fs/ocfs2/vote.c
+++ b/fs/ocfs2/vote.c
@@ -479,7 +479,7 @@ static struct ocfs2_net_wait_ctxt *ocfs2_new_net_wait_ctxt(unsigned int response
 {
         struct ocfs2_net_wait_ctxt *w;
 
-        w = kcalloc(1, sizeof(*w), GFP_NOFS);
+        w = kzalloc(sizeof(*w), GFP_NOFS);
         if (!w) {
                 mlog_errno(-ENOMEM);
                 goto bail;
@@ -642,7 +642,7 @@ static struct ocfs2_vote_msg * ocfs2_new_vote_request(struct ocfs2_super *osb,
 
         BUG_ON(!ocfs2_is_valid_vote_request(type));
 
-        request = kcalloc(1, sizeof(*request), GFP_NOFS);
+        request = kzalloc(sizeof(*request), GFP_NOFS);
         if (!request) {
                 mlog_errno(-ENOMEM);
         } else {
diff --git a/fs/pipe.c b/fs/pipe.c
index f8b6bdcb879a..9a06e8e48e8d 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -207,7 +207,7 @@ int generic_pipe_buf_pin(struct pipe_inode_info *info, struct pipe_buffer *buf)
         return 0;
 }
 
-static struct pipe_buf_operations anon_pipe_buf_ops = {
+static const struct pipe_buf_operations anon_pipe_buf_ops = {
         .can_merge = 1,
         .map = generic_pipe_buf_map,
         .unmap = generic_pipe_buf_unmap,
@@ -243,7 +243,7 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov,
                 if (bufs) {
                         int curbuf = pipe->curbuf;
                         struct pipe_buffer *buf = pipe->bufs + curbuf;
-                        struct pipe_buf_operations *ops = buf->ops;
+                        const struct pipe_buf_operations *ops = buf->ops;
                         void *addr;
                         size_t chars = buf->len;
                         int error, atomic;
@@ -365,7 +365,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
                 int lastbuf = (pipe->curbuf + pipe->nrbufs - 1) &
                                                         (PIPE_BUFFERS-1);
                 struct pipe_buffer *buf = pipe->bufs + lastbuf;
-                struct pipe_buf_operations *ops = buf->ops;
+                const struct pipe_buf_operations *ops = buf->ops;
                 int offset = buf->offset + buf->len;
 
                 if (ops->can_merge && offset + chars <= PAGE_SIZE) {
@@ -756,7 +756,7 @@ const struct file_operations rdwr_fifo_fops = {
         .fasync         = pipe_rdwr_fasync,
 };
 
-static struct file_operations read_pipe_fops = {
+static const struct file_operations read_pipe_fops = {
         .llseek         = no_llseek,
         .read           = do_sync_read,
         .aio_read       = pipe_read,
@@ -768,7 +768,7 @@ static struct file_operations read_pipe_fops = {
         .fasync         = pipe_read_fasync,
 };
 
-static struct file_operations write_pipe_fops = {
+static const struct file_operations write_pipe_fops = {
         .llseek         = no_llseek,
         .read           = bad_pipe_r,
         .write          = do_sync_write,
@@ -780,7 +780,7 @@ static struct file_operations write_pipe_fops = {
         .fasync         = pipe_write_fasync,
 };
 
-static struct file_operations rdwr_pipe_fops = {
+static const struct file_operations rdwr_pipe_fops = {
         .llseek         = no_llseek,
         .read           = do_sync_read,
         .aio_read       = pipe_read,
diff --git a/fs/read_write.c b/fs/read_write.c
index 1d3dda4fa70c..707ac21700d3 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -450,8 +450,6 @@ unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to)
         return seg;
 }
 
-EXPORT_UNUSED_SYMBOL(iov_shorten);  /*  June 2006  */
-
 ssize_t do_sync_readv_writev(struct file *filp, const struct iovec *iov,
                 unsigned long nr_segs, size_t len, loff_t *ppos, iov_fn_t fn)
 {
diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c
index 97ae1b92bc47..5296a29cc5eb 100644
--- a/fs/reiserfs/xattr_acl.c
+++ b/fs/reiserfs/xattr_acl.c
@@ -135,7 +135,7 @@ static void *posix_acl_to_disk(const struct posix_acl *acl, size_t * size)
         int n;
 
         *size = reiserfs_acl_size(acl->a_count);
-        ext_acl = (reiserfs_acl_header *) kmalloc(sizeof(reiserfs_acl_header) +
+        ext_acl = kmalloc(sizeof(reiserfs_acl_header) +
                                                   acl->a_count *
                                                   sizeof(reiserfs_acl_entry),
                                                   GFP_NOFS);
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c
index 4af4cd729a5a..84dfe3f3482e 100644
--- a/fs/smbfs/inode.c
+++ b/fs/smbfs/inode.c
@@ -482,12 +482,13 @@ smb_put_super(struct super_block *sb)
         smb_close_socket(server);
 
         if (server->conn_pid)
-                kill_proc(server->conn_pid, SIGTERM, 1);
+                kill_pid(server->conn_pid, SIGTERM, 1);
 
         kfree(server->ops);
         smb_unload_nls(server);
         sb->s_fs_info = NULL;
         smb_unlock_server(server);
+        put_pid(server->conn_pid);
         kfree(server);
 }
 
@@ -530,7 +531,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
         INIT_LIST_HEAD(&server->xmitq);
         INIT_LIST_HEAD(&server->recvq);
         server->conn_error = 0;
-        server->conn_pid = 0;
+        server->conn_pid = NULL;
         server->state = CONN_INVALID; /* no connection yet */
         server->generation = 0;
 
diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c
index a5ced9e0c6c4..feac46050619 100644
--- a/fs/smbfs/proc.c
+++ b/fs/smbfs/proc.c
@@ -877,7 +877,7 @@ smb_newconn(struct smb_sb_info *server, struct smb_conn_opt *opt)
                 goto out_putf;
 
         server->sock_file = filp;
-        server->conn_pid = current->pid;
+        server->conn_pid = get_pid(task_pid(current));
         server->opt = *opt;
         server->generation += 1;
         server->state = CONN_VALID;
@@ -971,8 +971,8 @@ smb_newconn(struct smb_sb_info *server, struct smb_conn_opt *opt)
         }
 
         VERBOSE("protocol=%d, max_xmit=%d, pid=%d capabilities=0x%x\n",
-                server->opt.protocol, server->opt.max_xmit, server->conn_pid,
-                server->opt.capabilities);
+                server->opt.protocol, server->opt.max_xmit,
+                pid_nr(server->conn_pid), server->opt.capabilities);
 
         /* FIXME: this really should be done by smbmount. */
         if (server->opt.max_xmit > SMB_MAX_PACKET_SIZE) {
diff --git a/fs/smbfs/smbiod.c b/fs/smbfs/smbiod.c
index e67540441288..89eaf31f1d46 100644
--- a/fs/smbfs/smbiod.c
+++ b/fs/smbfs/smbiod.c
@@ -152,7 +152,7 @@ int smbiod_retry(struct smb_sb_info *server)
 {
         struct list_head *head;
         struct smb_request *req;
-        pid_t pid = server->conn_pid;
+        struct pid *pid = get_pid(server->conn_pid);
         int result = 0;
 
         VERBOSE("state: %d\n", server->state);
@@ -222,7 +222,7 @@ int smbiod_retry(struct smb_sb_info *server)
         /*
          * Note: use the "priv" flag, as a user process may need to reconnect.
          */
-        result = kill_proc(pid, SIGUSR1, 1);
+        result = kill_pid(pid, SIGUSR1, 1);
         if (result) {
                 /* FIXME: this is most likely fatal, umount? */
                 printk(KERN_ERR "smb_retry: signal failed [%d]\n", result);
@@ -233,6 +233,7 @@ int smbiod_retry(struct smb_sb_info *server)
         /* FIXME: The retried requests should perhaps get a "time boost". */
 
 out:
+        put_pid(pid);
         return result;
 }
 
diff --git a/fs/splice.c b/fs/splice.c
index bbd0aeb3f68e..2fca6ebf4cc2 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -42,7 +42,7 @@ struct splice_pipe_desc {
         struct partial_page *partial;   /* pages[] may not be contig */
         int nr_pages;                   /* number of pages in map */
         unsigned int flags;             /* splice flags */
-        struct pipe_buf_operations *ops;/* ops associated with output pipe */
+        const struct pipe_buf_operations *ops;/* ops associated with output pipe */
 };
 
 /*
@@ -139,7 +139,7 @@ error:
         return err;
 }
 
-static struct pipe_buf_operations page_cache_pipe_buf_ops = {
+static const struct pipe_buf_operations page_cache_pipe_buf_ops = {
         .can_merge = 0,
         .map = generic_pipe_buf_map,
         .unmap = generic_pipe_buf_unmap,
@@ -159,7 +159,7 @@ static int user_page_pipe_buf_steal(struct pipe_inode_info *pipe,
         return generic_pipe_buf_steal(pipe, buf);
 }
 
-static struct pipe_buf_operations user_page_pipe_buf_ops = {
+static const struct pipe_buf_operations user_page_pipe_buf_ops = {
         .can_merge = 0,
         .map = generic_pipe_buf_map,
         .unmap = generic_pipe_buf_unmap,
@@ -724,7 +724,7 @@ static ssize_t __splice_from_pipe(struct pipe_inode_info *pipe,
         for (;;) {
                 if (pipe->nrbufs) {
                         struct pipe_buffer *buf = pipe->bufs + pipe->curbuf;
-                        struct pipe_buf_operations *ops = buf->ops;
+                        const struct pipe_buf_operations *ops = buf->ops;
 
                         sd.len = buf->len;
                         if (sd.len > sd.total_len)
diff --git a/include/asm-alpha/cacheflush.h b/include/asm-alpha/cacheflush.h
index 805640b41078..b686cc7fc44e 100644
--- a/include/asm-alpha/cacheflush.h
+++ b/include/asm-alpha/cacheflush.h
@@ -6,6 +6,7 @@
 /* Caches aren't brain-dead on the Alpha. */
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 #define flush_dcache_page(page)                 do { } while (0)
diff --git a/include/asm-arm/cacheflush.h b/include/asm-arm/cacheflush.h
index f0845646aacb..378a3a2ce8d9 100644
--- a/include/asm-arm/cacheflush.h
+++ b/include/asm-arm/cacheflush.h
@@ -319,6 +319,8 @@ extern void flush_ptrace_access(struct vm_area_struct *vma, struct page *page,
                                 unsigned long len, int write);
 #endif
 
+#define flush_cache_dup_mm(mm) flush_cache_mm(mm)
+
 /*
  * flush_cache_user_range is used when we want to ensure that the
  * Harvard caches are synchronised for the user space address range.
diff --git a/include/asm-arm/thread_info.h b/include/asm-arm/thread_info.h
index d9b8bddc8732..5014794f9eb3 100644
--- a/include/asm-arm/thread_info.h
+++ b/include/asm-arm/thread_info.h
@@ -147,6 +147,7 @@ extern void iwmmxt_task_switch(struct thread_info *);
 #define TIF_POLLING_NRFLAG      16
 #define TIF_USING_IWMMXT        17
 #define TIF_MEMDIE              18
+#define TIF_FREEZE              19
 
 #define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
@@ -154,6 +155,7 @@ extern void iwmmxt_task_switch(struct thread_info *);
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
 #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
 #define _TIF_USING_IWMMXT       (1 << TIF_USING_IWMMXT)
+#define _TIF_FREEZE             (1 << TIF_FREEZE)
 
 /*
  * Change these and you break ASM code in entry-common.S
diff --git a/include/asm-arm26/cacheflush.h b/include/asm-arm26/cacheflush.h
index 9c1b9c7f2ebd..14ae15b6faab 100644
--- a/include/asm-arm26/cacheflush.h
+++ b/include/asm-arm26/cacheflush.h
@@ -22,6 +22,7 @@
 
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma,start,end)        do { } while (0)
 #define flush_cache_page(vma,vmaddr,pfn)        do { } while (0)
 #define flush_cache_vmap(start, end)            do { } while (0)
diff --git a/include/asm-avr32/cacheflush.h b/include/asm-avr32/cacheflush.h
index f1bf1708980e..dfaaa88cd412 100644
--- a/include/asm-avr32/cacheflush.h
+++ b/include/asm-avr32/cacheflush.h
@@ -87,6 +87,7 @@ void invalidate_icache_region(void *start, size_t len);
  */
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 #define flush_cache_vmap(start, end)            do { } while (0)
diff --git a/include/asm-avr32/pgalloc.h b/include/asm-avr32/pgalloc.h
index 7492cfb92ced..bb82e70cde8d 100644
--- a/include/asm-avr32/pgalloc.h
+++ b/include/asm-avr32/pgalloc.h
@@ -28,7 +28,7 @@ static __inline__ void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
 static __inline__ pgd_t *pgd_alloc(struct mm_struct *mm)
 {
         unsigned int pgd_size = (USER_PTRS_PER_PGD * sizeof(pgd_t));
-        pgd_t *pgd = (pgd_t *)kmalloc(pgd_size, GFP_KERNEL);
+        pgd_t *pgd = kmalloc(pgd_size, GFP_KERNEL);
 
         if (pgd)
                 memset(pgd, 0, pgd_size);
diff --git a/include/asm-cris/cacheflush.h b/include/asm-cris/cacheflush.h
index 72cc71dffe70..01af2de27c5b 100644
--- a/include/asm-cris/cacheflush.h
+++ b/include/asm-cris/cacheflush.h
@@ -9,6 +9,7 @@
  */
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 #define flush_dcache_page(page)                 do { } while (0)
diff --git a/include/asm-frv/cacheflush.h b/include/asm-frv/cacheflush.h
index eaa5826bc1c8..02500405a6fb 100644
--- a/include/asm-frv/cacheflush.h
+++ b/include/asm-frv/cacheflush.h
@@ -20,6 +20,7 @@
  */
 #define flush_cache_all()                       do {} while(0)
 #define flush_cache_mm(mm)                      do {} while(0)
+#define flush_cache_dup_mm(mm)                  do {} while(0)
 #define flush_cache_range(mm, start, end)       do {} while(0)
 #define flush_cache_page(vma, vmaddr, pfn)      do {} while(0)
 #define flush_cache_vmap(start, end)            do {} while(0)
diff --git a/include/asm-frv/thread_info.h b/include/asm-frv/thread_info.h
index d66c48e6ef14..d881f518e6a9 100644
--- a/include/asm-frv/thread_info.h
+++ b/include/asm-frv/thread_info.h
@@ -116,6 +116,7 @@ register struct thread_info *__current_thread_info asm("gr15");
 #define TIF_RESTORE_SIGMASK     6       /* restore signal mask in do_signal() */
 #define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              17      /* OOM killer killed process */
+#define TIF_FREEZE              18      /* freezing for suspend */
 
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
 #define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
@@ -125,6 +126,7 @@ register struct thread_info *__current_thread_info asm("gr15");
 #define _TIF_IRET               (1 << TIF_IRET)
 #define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
 #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
+#define _TIF_FREEZE             (1 << TIF_FREEZE)
 
 #define _TIF_WORK_MASK          0x0000FFFE      /* work to do on interrupt/exception return */
 #define _TIF_ALLWORK_MASK       0x0000FFFF      /* work to do on any return to u-space */
diff --git a/include/asm-h8300/cacheflush.h b/include/asm-h8300/cacheflush.h
index 1e4d95bb5ec9..71210d141b64 100644
--- a/include/asm-h8300/cacheflush.h
+++ b/include/asm-h8300/cacheflush.h
@@ -12,6 +12,7 @@
 
 #define flush_cache_all()
 #define flush_cache_mm(mm)
+#define flush_cache_dup_mm(mm)          do { } while (0)
 #define flush_cache_range(vma,a,b)
 #define flush_cache_page(vma,p,pfn)
 #define flush_dcache_page(page)
diff --git a/include/asm-i386/cacheflush.h b/include/asm-i386/cacheflush.h
index 7199f7b326f1..74e03c8f2e51 100644
--- a/include/asm-i386/cacheflush.h
+++ b/include/asm-i386/cacheflush.h
@@ -7,6 +7,7 @@
 /* Caches aren't brain-dead on the intel. */
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 #define flush_dcache_page(page)                 do { } while (0)
diff --git a/include/asm-i386/msr.h b/include/asm-i386/msr.h
index 5679d4993072..609a3899475c 100644
--- a/include/asm-i386/msr.h
+++ b/include/asm-i386/msr.h
@@ -100,6 +100,8 @@ static inline void wrmsrl (unsigned long msr, unsigned long long val)
 
 #define MSR_P6_PERFCTR0         0xc1
 #define MSR_P6_PERFCTR1         0xc2
+#define MSR_FSB_FREQ            0xcd
+
 
 #define MSR_IA32_BBL_CR_CTL             0x119
 
@@ -130,6 +132,9 @@ static inline void wrmsrl (unsigned long msr, unsigned long long val)
 #define MSR_IA32_PERF_STATUS            0x198
 #define MSR_IA32_PERF_CTL               0x199
 
+#define MSR_IA32_MPERF                  0xE7
+#define MSR_IA32_APERF                  0xE8
+
 #define MSR_IA32_THERM_CONTROL          0x19a
 #define MSR_IA32_THERM_INTERRUPT        0x19b
 #define MSR_IA32_THERM_STATUS           0x19c
diff --git a/include/asm-i386/thread_info.h b/include/asm-i386/thread_info.h
index 46d32ad92082..4b187bb377b4 100644
--- a/include/asm-i386/thread_info.h
+++ b/include/asm-i386/thread_info.h
@@ -134,6 +134,7 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_MEMDIE              16
 #define TIF_DEBUG               17      /* uses debug registers */
 #define TIF_IO_BITMAP           18      /* uses I/O bitmap */
+#define TIF_FREEZE              19      /* is freezing for suspend */
 
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
@@ -147,6 +148,7 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_DEBUG              (1<<TIF_DEBUG)
 #define _TIF_IO_BITMAP          (1<<TIF_IO_BITMAP)
+#define _TIF_FREEZE             (1<<TIF_FREEZE)
 
 /* work to do on interrupt/exception return */
 #define _TIF_WORK_MASK \
diff --git a/include/asm-ia64/break.h b/include/asm-ia64/break.h
index 8167828edc4b..f03402039896 100644
--- a/include/asm-ia64/break.h
+++ b/include/asm-ia64/break.h
@@ -12,8 +12,8 @@
  * OS-specific debug break numbers:
  */
 #define __IA64_BREAK_KDB                0x80100
-#define __IA64_BREAK_KPROBE             0x80200
-#define __IA64_BREAK_JPROBE             0x80300
+#define __IA64_BREAK_KPROBE             0x81000 /* .. 0x81fff */
+#define __IA64_BREAK_JPROBE             0x82000
 
 /*
  * OS-specific break numbers:
diff --git a/include/asm-ia64/cacheflush.h b/include/asm-ia64/cacheflush.h
index f2dacb4245ec..4906916d715b 100644
--- a/include/asm-ia64/cacheflush.h
+++ b/include/asm-ia64/cacheflush.h
@@ -18,6 +18,7 @@
 
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 #define flush_icache_page(vma,page)             do { } while (0)
diff --git a/include/asm-ia64/kprobes.h b/include/asm-ia64/kprobes.h
index 1b45b71c79b9..828ae00e47c1 100644
--- a/include/asm-ia64/kprobes.h
+++ b/include/asm-ia64/kprobes.h
@@ -115,6 +115,7 @@ struct arch_specific_insn {
  #define INST_FLAG_BREAK_INST                   4
         unsigned long inst_flag;
         unsigned short target_br_reg;
+        unsigned short slot;
 };
 
 extern int kprobe_exceptions_notify(struct notifier_block *self,
diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h
index 825eb7d882e6..556f53fa44cb 100644
--- a/include/asm-ia64/pci.h
+++ b/include/asm-ia64/pci.h
@@ -78,9 +78,6 @@ pcibios_penalize_isa_irq (int irq, int active)
 #define pci_dac_dma_sync_single_for_cpu(dev,dma_addr,len,dir)   do { } while (0)
 #define pci_dac_dma_sync_single_for_device(dev,dma_addr,len,dir)        do { mb(); } while (0)
 
-#define sg_dma_len(sg)          ((sg)->dma_length)
-#define sg_dma_address(sg)      ((sg)->dma_address)
-
 #ifdef CONFIG_PCI
 static inline void pci_dma_burst_advice(struct pci_dev *pdev,
                                         enum pci_dma_burst_strategy *strat,
diff --git a/include/asm-ia64/scatterlist.h b/include/asm-ia64/scatterlist.h
index 834a189ef189..9dbea8844d5e 100644
--- a/include/asm-ia64/scatterlist.h
+++ b/include/asm-ia64/scatterlist.h
@@ -25,4 +25,7 @@ struct scatterlist {
  */
 #define ISA_DMA_THRESHOLD       0xffffffff
 
+#define sg_dma_len(sg)          ((sg)->dma_length)
+#define sg_dma_address(sg)      ((sg)->dma_address)
+
 #endif /* _ASM_IA64_SCATTERLIST_H */
diff --git a/include/asm-ia64/sn/xpc.h b/include/asm-ia64/sn/xpc.h
index 1d45e1518fb3..e52b8508083b 100644
--- a/include/asm-ia64/sn/xpc.h
+++ b/include/asm-ia64/sn/xpc.h
@@ -673,7 +673,7 @@ extern irqreturn_t xpc_notify_IRQ_handler(int, void *);
 extern void xpc_dropped_IPI_check(struct xpc_partition *);
 extern void xpc_activate_partition(struct xpc_partition *);
 extern void xpc_activate_kthreads(struct xpc_channel *, int);
-extern void xpc_create_kthreads(struct xpc_channel *, int);
+extern void xpc_create_kthreads(struct xpc_channel *, int, int);
 extern void xpc_disconnect_wait(int);
 
 
diff --git a/include/asm-ia64/thread_info.h b/include/asm-ia64/thread_info.h
index 8adcde0934ca..9b505b25544f 100644
--- a/include/asm-ia64/thread_info.h
+++ b/include/asm-ia64/thread_info.h
@@ -88,6 +88,7 @@ struct thread_info {
 #define TIF_MEMDIE              17
 #define TIF_MCA_INIT            18      /* this task is processing MCA or INIT */
 #define TIF_DB_DISABLED         19      /* debug trap disabled for fsyscall */
+#define TIF_FREEZE              20      /* is freezing for suspend */
 
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
 #define _TIF_SYSCALL_AUDIT      (1 << TIF_SYSCALL_AUDIT)
@@ -98,6 +99,7 @@ struct thread_info {
 #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
 #define _TIF_MCA_INIT           (1 << TIF_MCA_INIT)
 #define _TIF_DB_DISABLED        (1 << TIF_DB_DISABLED)
+#define _TIF_FREEZE             (1 << TIF_FREEZE)
 
 /* "work to do on user-return" bits */
 #define TIF_ALLWORK_MASK        (_TIF_NOTIFY_RESUME|_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT)
diff --git a/include/asm-m32r/cacheflush.h b/include/asm-m32r/cacheflush.h
index 8b261b49149e..56961a9511b2 100644
--- a/include/asm-m32r/cacheflush.h
+++ b/include/asm-m32r/cacheflush.h
@@ -9,6 +9,7 @@ extern void _flush_cache_copyback_all(void);
 #if defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_OPSP) || defined(CONFIG_CHIP_M32104)
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 #define flush_dcache_page(page)                 do { } while (0)
@@ -29,6 +30,7 @@ extern void smp_flush_cache_all(void);
 #elif defined(CONFIG_CHIP_M32102)
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 #define flush_dcache_page(page)                 do { } while (0)
@@ -41,6 +43,7 @@ extern void smp_flush_cache_all(void);
 #else
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 #define flush_dcache_page(page)                 do { } while (0)
diff --git a/include/asm-m68k/cacheflush.h b/include/asm-m68k/cacheflush.h
index 24d3ff449135..16bf375fdbe1 100644
--- a/include/asm-m68k/cacheflush.h
+++ b/include/asm-m68k/cacheflush.h
@@ -89,6 +89,8 @@ static inline void flush_cache_mm(struct mm_struct *mm)
                 __flush_cache_030();
 }
 
+#define flush_cache_dup_mm(mm)                  flush_cache_mm(mm)
+
 /* flush_cache_range/flush_cache_page must be macros to avoid
    a dependency on linux/mm.h, which includes this file... */
 static inline void flush_cache_range(struct vm_area_struct *vma,
diff --git a/include/asm-m68k/swim_iop.h b/include/asm-m68k/swim_iop.h
deleted file mode 100644
index f29b67876b01..000000000000
--- a/include/asm-m68k/swim_iop.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * SWIM access through the IOP
- * Written by Joshua M. Thompson
- */
-
-/* IOP number and channel number for the SWIM */
-
-#define SWIM_IOP        IOP_NUM_ISM
-#define SWIM_CHAN       1
-
-/* Command code: */
-
-#define CMD_INIT                0x01    /* Initialize                  */
-#define CMD_SHUTDOWN            0x02    /* Shutdown                    */
-#define CMD_START_POLL          0x03    /* Start insert/eject polling  */
-#define CMD_STOP_POLL           0x04    /* Stop insert/eject polling   */
-#define CMD_SETHFSTAG           0x05    /* Set HFS tag buffer address  */
-#define CMD_STATUS              0x06    /* Status                      */
-#define CMD_EJECT               0x07    /* Eject                       */
-#define CMD_FORMAT              0x08    /* Format                      */
-#define CMD_FORMAT_VERIFY       0x09    /* Format and Verify           */
-#define CMD_WRITE               0x0A    /* Write                       */
-#define CMD_READ                0x0B    /* Read                        */
-#define CMD_READ_VERIFY         0x0C    /* Read and Verify             */
-#define CMD_CACHE_CTRL          0x0D    /* Cache control               */
-#define CMD_TAGBUFF_CTRL        0x0E    /* Tag buffer control          */
-#define CMD_GET_ICON            0x0F    /* Get Icon                    */
-
-/* Drive types: */
-
-/* note: apple sez DRV_FDHD is 4, but I get back a type */
-/*       of 5 when I do a drive status check on my FDHD */
-
-#define DRV_NONE        0       /* No drive             */
-#define DRV_UNKNOWN     1       /* Unspecified drive    */
-#define DRV_400K        2       /* 400K                 */
-#define DRV_800K        3       /* 400K/800K            */
-#define DRV_FDHD        5       /* 400K/800K/720K/1440K */
-#define DRV_HD20        7       /* Apple HD20           */
-
-/* Format types: */
-
-#define FMT_HD20        0x0001  /*  Apple HD20 */
-#define FMT_400K        0x0002  /*  400K (GCR) */
-#define FMT_800K        0x0004  /*  800K (GCR) */
-#define FMT_720K        0x0008  /*  720K (MFM) */
-#define FMT_1440K       0x0010  /* 1.44M (MFM) */
-
-#define FMD_KIND_400K   1
-#define FMD_KIND_800K   2
-#define FMD_KIND_720K   3
-#define FMD_KIND_1440K  1
-
-/* Icon Flags: */
-
-#define ICON_MEDIA      0x01    /* Have IOP supply media icon */
-#define ICON_DRIVE      0x01    /* Have IOP supply drive icon */
-
-/* Error codes: */
-
-#define gcrOnMFMErr     -400    /* GCR (400/800K) on HD media */
-#define verErr          -84     /* verify failed */
-#define fmt2Err         -83     /* can't get enough sync during format */
-#define fmt1Err         -82     /* can't find sector 0 after track format */
-#define sectNFErr       -81     /* can't find sector */
-#define seekErr         -80     /* drive error during seek */
-#define spdAdjErr       -79     /* can't set drive speed */
-#define twoSideErr      -78     /* drive is single-sided */
-#define initIWMErr      -77     /* error during initialization */
-#define tk0badErr       -76     /* track zero is bad */
-#define cantStepErr     -75     /* drive error during step */
-#define wrUnderrun      -74     /* write underrun occurred */
-#define badDBtSlp       -73     /* bad data bitslip marks */
-#define badDCksum       -72     /* bad data checksum */
-#define noDtaMkErr      -71     /* can't find data mark */
-#define badBtSlpErr     -70     /* bad address bitslip marks */
-#define badCksmErr      -69     /* bad address-mark checksum */
-#define dataVerErr      -68     /* read-verify failed */
-#define noAdrMkErr      -67     /* can't find an address mark */
-#define noNybErr        -66     /* no nybbles? disk is probably degaussed */
-#define offLinErr       -65     /* no disk in drive */
-#define noDriveErr      -64     /* drive isn't connected */
-#define nsDrvErr        -56     /* no such drive */
-#define paramErr        -50     /* bad positioning information */
-#define wPrErr          -44     /* write protected */
-#define openErr         -23     /* already initialized */
-
-#ifndef __ASSEMBLY__
-
-struct swim_drvstatus {
-        __u16   curr_track;     /* Current track number                   */
-        __u8    write_prot;     /* 0x80 if disk is write protected        */
-        __u8    disk_in_drive;  /* 0x01 or 0x02 if a disk is in the drive */
-        __u8    installed;      /* 0x01 if drive installed, 0xFF if not   */
-        __u8    num_sides;      /* 0x80 if two-sided format supported     */
-        __u8    two_sided;      /* 0xff if two-sided format diskette      */
-        __u8    new_interface;  /* 0x00 if old 400K drive, 0xFF if newer  */
-        __u16   errors;         /* Disk error count                       */
-        struct {                /* 32 bits */
-                __u16   reserved;
-                __u16   :4;
-                __u16   external:1;     /* Drive is external        */
-                __u16   scsi:1;         /* Drive is a SCSI drive    */
-                __u16   fixed:1;        /* Drive has fixed media    */
-                __u16   secondary:1;    /* Drive is secondary drive */
-                __u8    type;           /* Drive type               */
-        } info;
-        __u8    mfm_drive;      /* 0xFF if this is an FDHD drive    */
-        __u8    mfm_disk;       /* 0xFF if 720K/1440K (MFM) disk    */
-        __u8    mfm_format;     /* 0x00 if 720K, 0xFF if 1440K      */
-        __u8    ctlr_type;      /* 0x00 if IWM, 0xFF if SWIM        */
-        __u16   curr_format;    /* Current format type              */
-        __u16   allowed_fmt;    /* Allowed format types             */
-        __u32   num_blocks;     /* Number of blocks on disk         */
-        __u8    icon_flags;     /* Icon flags                       */
-        __u8    unusued;
-};
-
-/* Commands issued from the host to the IOP: */
-
-struct swimcmd_init {
-        __u8    code;           /* CMD_INIT */
-        __u8    unusued;
-        __u16   error;
-        __u8    drives[28];     /* drive type list */
-};
-
-struct swimcmd_startpoll {
-        __u8    code;           /* CMD_START_POLL */
-        __u8    unusued;
-        __u16   error;
-};
-
-struct swimcmd_sethfstag {
-        __u8    code;           /* CMD_SETHFSTAG */
-        __u8    unusued;
-        __u16   error;
-        caddr_t tagbuf;         /* HFS tag buffer address */
-};
-
-struct swimcmd_status {
-        __u8    code;           /* CMD_STATUS */
-        __u8    drive_num;
-        __u16   error;
-        struct swim_drvstatus status;
-};
-
-struct swimcmd_eject {
-        __u8    code;           /* CMD_EJECT */
-        __u8    drive_num;
-        __u16   error;
-        struct swim_drvstatus status;
-};
-
-struct swimcmd_format {
-        __u8    code;           /* CMD_FORMAT */
-        __u8    drive_num;
-        __u16   error;
-        union {
-                struct {
-                        __u16 fmt;         /* format kind                  */
-                        __u8  hdrbyte;     /* fmt byte for hdr (0=default) */
-                        __u8  interleave;  /* interleave (0 = default)     */
-                        caddr_t databuf;   /* sector data buff (0=default  */
-                        caddr_t tagbuf;    /* tag data buffer (0=default)  */
-                } f;
-                struct swim_drvstatus status;
-        } p;
-};
-
-struct swimcmd_fmtverify {
-        __u8    code;           /* CMD_FORMAT_VERIFY */
-        __u8    drive_num;
-        __u16   error;
-};
-
-struct swimcmd_rw {
-        __u8    code;           /* CMD_READ, CMD_WRITE or CMD_READ_VERIFY */
-        __u8    drive_num;
-        __u16   error;
-        caddr_t buffer;         /* R/W buffer address */
-        __u32   first_block;    /* Starting block     */
-        __u32   num_blocks;     /* Number of blocks   */
-        __u8    tag[12];        /* tag data           */
-};
-
-struct swimcmd_cachectl {
-        __u8    code;           /* CMD_CACHE_CTRL */
-        __u8    unused;
-        __u16   error;
-        __u8    enable;         /* Nonzero to enable cache                */
-        __u8    install;        /* +1 = install, -1 = remove, 0 = neither */
-};
-
-struct swimcmd_tagbufctl {
-        __u8    code;           /* CMD_TAGBUFF_CTRL */
-        __u8    unused;
-        __u16   error;
-        caddr_t buf;            /* buffer address or 0 to disable */
-};
-
-struct swimcmd_geticon {
-        __u8    code;           /* CMD_GET_ICON */
-        __u8    drive_num;
-        __u16   error;
-        caddr_t buffer;         /* Nuffer address */
-        __u16   kind;           /* 0 = media icon, 1 = drive icon */
-        __u16   unused;
-        __u16   max_bytes;      /* maximum  byte count */
-};
-
-/* Messages from the SWIM IOP to the host CPU: */
-
-struct swimmsg_status {
-        __u8    code;           /* 1 = insert, 2 = eject, 3 = status changed */
-        __u8    drive_num;
-        __u16   error;
-        struct swim_drvstatus status;
-};
-
-#endif /* __ASSEMBLY__ */
diff --git a/include/asm-m68knommu/cacheflush.h b/include/asm-m68knommu/cacheflush.h
index c3aadf3b0d88..163dcb1a9689 100644
--- a/include/asm-m68knommu/cacheflush.h
+++ b/include/asm-m68knommu/cacheflush.h
@@ -8,6 +8,7 @@
 
 #define flush_cache_all()                       __flush_cache_all()
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      __flush_cache_all()
 #define flush_cache_page(vma, vmaddr)           do { } while (0)
 #define flush_dcache_range(start,len)           __flush_cache_all()
diff --git a/include/asm-mips/cacheflush.h b/include/asm-mips/cacheflush.h
index e3c9925876a3..0ddada3bb0b6 100644
--- a/include/asm-mips/cacheflush.h
+++ b/include/asm-mips/cacheflush.h
@@ -17,6 +17,7 @@
  *
  *  - flush_cache_all() flushes entire cache
  *  - flush_cache_mm(mm) flushes the specified mm context's cache lines
+ *  - flush_cache_dup mm(mm) handles cache flushing when forking
  *  - flush_cache_page(mm, vmaddr, pfn) flushes a single page
  *  - flush_cache_range(vma, start, end) flushes a range of pages
  *  - flush_icache_range(start, end) flush a range of instructions
@@ -31,6 +32,7 @@
 extern void (*flush_cache_all)(void);
 extern void (*__flush_cache_all)(void);
 extern void (*flush_cache_mm)(struct mm_struct *mm);
+#define flush_cache_dup_mm(mm)  do { (void) (mm); } while (0)
 extern void (*flush_cache_range)(struct vm_area_struct *vma,
         unsigned long start, unsigned long end);
 extern void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page, unsigned long pfn);
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h
index 0dc1a45c27ed..2f9e1a9ec51f 100644
--- a/include/asm-mips/page.h
+++ b/include/asm-mips/page.h
@@ -35,7 +35,6 @@
 #ifndef __ASSEMBLY__
 
 #include <linux/pfn.h>
-#include <asm/cpu-features.h>
 #include <asm/io.h>
 
 extern void clear_page(void * page);
@@ -61,16 +60,13 @@ static inline void clear_user_page(void *addr, unsigned long vaddr,
                 flush_data_cache_page((unsigned long)addr);
 }
 
-static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
-        struct page *to)
-{
-        extern void (*flush_data_cache_page)(unsigned long addr);
+extern void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
+        struct page *to);
+struct vm_area_struct;
+extern void copy_user_highpage(struct page *to, struct page *from,
+        unsigned long vaddr, struct vm_area_struct *vma);
 
-        copy_page(vto, vfrom);
-        if (!cpu_has_ic_fills_f_dc ||
-            pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
-                flush_data_cache_page((unsigned long)vto);
-}
+#define __HAVE_ARCH_COPY_USER_HIGHPAGE
 
 /*
  * These are used to make use of C type-checking..
diff --git a/include/asm-parisc/cacheflush.h b/include/asm-parisc/cacheflush.h
index 2bc41f2e0271..aedb0512cb04 100644
--- a/include/asm-parisc/cacheflush.h
+++ b/include/asm-parisc/cacheflush.h
@@ -15,6 +15,8 @@
 #define flush_cache_mm(mm) flush_cache_all_local()
 #endif
 
+#define flush_cache_dup_mm(mm) flush_cache_mm(mm)
+
 #define flush_kernel_dcache_range(start,size) \
         flush_kernel_dcache_range_asm((start), (start)+(size));
 
diff --git a/include/asm-powerpc/cacheflush.h b/include/asm-powerpc/cacheflush.h
index 8a740c88d93d..08e93e789219 100644
--- a/include/asm-powerpc/cacheflush.h
+++ b/include/asm-powerpc/cacheflush.h
@@ -18,6 +18,7 @@
  */
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 #define flush_icache_page(vma, page)            do { } while (0)
diff --git a/include/asm-powerpc/thread_info.h b/include/asm-powerpc/thread_info.h
index d339e2e88b11..3f32ca8bfec9 100644
--- a/include/asm-powerpc/thread_info.h
+++ b/include/asm-powerpc/thread_info.h
@@ -122,6 +122,7 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_RESTOREALL          12      /* Restore all regs (implies NOERROR) */
 #define TIF_NOERROR             14      /* Force successful syscall return */
 #define TIF_RESTORE_SIGMASK     15      /* Restore signal mask in do_signal */
+#define TIF_FREEZE              16      /* Freezing for suspend */
 
 /* as above, but as bit values */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
@@ -138,6 +139,7 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_RESTOREALL         (1<<TIF_RESTOREALL)
 #define _TIF_NOERROR            (1<<TIF_NOERROR)
 #define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
+#define _TIF_FREEZE             (1<<TIF_FREEZE)
 #define _TIF_SYSCALL_T_OR_A     (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP)
 
 #define _TIF_USER_WORK_MASK     (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING | \
diff --git a/include/asm-s390/cacheflush.h b/include/asm-s390/cacheflush.h
index e399a8ba2ed7..f7cade8083f3 100644
--- a/include/asm-s390/cacheflush.h
+++ b/include/asm-s390/cacheflush.h
@@ -7,6 +7,7 @@
 /* Caches aren't brain-dead on the s390. */
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 #define flush_dcache_page(page)                 do { } while (0)
diff --git a/include/asm-sh/cpu-sh2/cacheflush.h b/include/asm-sh/cpu-sh2/cacheflush.h
index f556fa80ea97..2979efb26de3 100644
--- a/include/asm-sh/cpu-sh2/cacheflush.h
+++ b/include/asm-sh/cpu-sh2/cacheflush.h
@@ -15,6 +15,7 @@
  *
  *  - flush_cache_all() flushes entire cache
  *  - flush_cache_mm(mm) flushes the specified mm context's cache lines
+ *  - flush_cache_dup mm(mm) handles cache flushing when forking
  *  - flush_cache_page(mm, vmaddr, pfn) flushes a single page
  *  - flush_cache_range(vma, start, end) flushes a range of pages
  *
@@ -27,6 +28,7 @@
  */
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 #define flush_dcache_page(page)                 do { } while (0)
diff --git a/include/asm-sh/cpu-sh3/cacheflush.h b/include/asm-sh/cpu-sh3/cacheflush.h
index 03fde97a7fd0..f70d8ef76a15 100644
--- a/include/asm-sh/cpu-sh3/cacheflush.h
+++ b/include/asm-sh/cpu-sh3/cacheflush.h
@@ -15,6 +15,7 @@
  *
  *  - flush_cache_all() flushes entire cache
  *  - flush_cache_mm(mm) flushes the specified mm context's cache lines
+ *  - flush_cache_dup mm(mm) handles cache flushing when forking
  *  - flush_cache_page(mm, vmaddr, pfn) flushes a single page
  *  - flush_cache_range(vma, start, end) flushes a range of pages
  *
@@ -39,6 +40,7 @@
 
 void flush_cache_all(void);
 void flush_cache_mm(struct mm_struct *mm);
+#define flush_cache_dup_mm(mm) flush_cache_mm(mm)
 void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
                               unsigned long end);
 void flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn);
@@ -48,6 +50,7 @@ void flush_icache_page(struct vm_area_struct *vma, struct page *page);
 #else
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 #define flush_dcache_page(page)                 do { } while (0)
diff --git a/include/asm-sh/cpu-sh4/cacheflush.h b/include/asm-sh/cpu-sh4/cacheflush.h
index 515fd574267c..b01a10f31225 100644
--- a/include/asm-sh/cpu-sh4/cacheflush.h
+++ b/include/asm-sh/cpu-sh4/cacheflush.h
@@ -18,6 +18,7 @@
  */
 void flush_cache_all(void);
 void flush_cache_mm(struct mm_struct *mm);
+#define flush_cache_dup_mm(mm) flush_cache_mm(mm)
 void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
                        unsigned long end);
 void flush_cache_page(struct vm_area_struct *vma, unsigned long addr,
diff --git a/include/asm-sh/thread_info.h b/include/asm-sh/thread_info.h
index 0c01dc550819..879f741105db 100644
--- a/include/asm-sh/thread_info.h
+++ b/include/asm-sh/thread_info.h
@@ -106,6 +106,7 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_USEDFPU             16      /* FPU was used by this task this quantum (SMP) */
 #define TIF_POLLING_NRFLAG      17      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              18
+#define TIF_FREEZE              19
 
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
@@ -114,6 +115,7 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_USEDFPU            (1<<TIF_USEDFPU)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
+#define _TIF_FREEZE             (1<<TIF_FREEZE)
 
 #define _TIF_WORK_MASK          0x000000FE      /* work to do on interrupt/exception return */
 #define _TIF_ALLWORK_MASK       0x000000FF      /* work to do on any return to u-space */
diff --git a/include/asm-sh64/cacheflush.h b/include/asm-sh64/cacheflush.h
index 55f71aa0aa6b..1e53a47bdc97 100644
--- a/include/asm-sh64/cacheflush.h
+++ b/include/asm-sh64/cacheflush.h
@@ -21,6 +21,8 @@ extern void flush_icache_user_range(struct vm_area_struct *vma,
                                     struct page *page, unsigned long addr,
                                     int len);
 
+#define flush_cache_dup_mm(mm)  flush_cache_mm(mm)
+
 #define flush_dcache_mmap_lock(mapping)         do { } while (0)
 #define flush_dcache_mmap_unlock(mapping)       do { } while (0)
 
diff --git a/include/asm-sh64/pgalloc.h b/include/asm-sh64/pgalloc.h
index b29dd468817e..cb803e56cb64 100644
--- a/include/asm-sh64/pgalloc.h
+++ b/include/asm-sh64/pgalloc.h
@@ -41,7 +41,7 @@ static inline void pgd_init(unsigned long page)
 static inline pgd_t *get_pgd_slow(void)
 {
         unsigned int pgd_size = (USER_PTRS_PER_PGD * sizeof(pgd_t));
-        pgd_t *ret = (pgd_t *)kmalloc(pgd_size, GFP_KERNEL);
+        pgd_t *ret = kmalloc(pgd_size, GFP_KERNEL);
         return ret;
 }
 
diff --git a/include/asm-sparc/cacheflush.h b/include/asm-sparc/cacheflush.h
index fc632f811cd8..68ac10910271 100644
--- a/include/asm-sparc/cacheflush.h
+++ b/include/asm-sparc/cacheflush.h
@@ -48,6 +48,7 @@ BTFIXUPDEF_CALL(void, flush_cache_page, struct vm_area_struct *, unsigned long)
 
 #define flush_cache_all() BTFIXUP_CALL(flush_cache_all)()
 #define flush_cache_mm(mm) BTFIXUP_CALL(flush_cache_mm)(mm)
+#define flush_cache_dup_mm(mm) BTFIXUP_CALL(flush_cache_mm)(mm)
 #define flush_cache_range(vma,start,end) BTFIXUP_CALL(flush_cache_range)(vma,start,end)
 #define flush_cache_page(vma,addr,pfn) BTFIXUP_CALL(flush_cache_page)(vma,addr)
 #define flush_icache_range(start, end)          do { } while (0)
diff --git a/include/asm-sparc64/cacheflush.h b/include/asm-sparc64/cacheflush.h
index 745d1ab60371..122e4058dd9e 100644
--- a/include/asm-sparc64/cacheflush.h
+++ b/include/asm-sparc64/cacheflush.h
@@ -12,6 +12,7 @@
 /* These are the same regardless of whether this is an SMP kernel or not. */
 #define flush_cache_mm(__mm) \
         do { if ((__mm) == current->mm) flushw_user(); } while(0)
+#define flush_cache_dup_mm(mm) flush_cache_mm(mm)
 #define flush_cache_range(vma, start, end) \
         flush_cache_mm((vma)->vm_mm)
 #define flush_cache_page(vma, page, pfn) \
diff --git a/include/asm-v850/cacheflush.h b/include/asm-v850/cacheflush.h
index e1a87f82f1a4..9ece05a202ef 100644
--- a/include/asm-v850/cacheflush.h
+++ b/include/asm-v850/cacheflush.h
@@ -24,6 +24,7 @@
    systems with MMUs, so we don't need them.  */
 #define flush_cache_all()                       ((void)0)
 #define flush_cache_mm(mm)                      ((void)0)
+#define flush_cache_dup_mm(mm)                  ((void)0)
 #define flush_cache_range(vma, start, end)      ((void)0)
 #define flush_cache_page(vma, vmaddr, pfn)      ((void)0)
 #define flush_dcache_page(page)                 ((void)0)
diff --git a/include/asm-x86_64/cacheflush.h b/include/asm-x86_64/cacheflush.h
index d32f7f58752a..ab1cb5c7dc92 100644
--- a/include/asm-x86_64/cacheflush.h
+++ b/include/asm-x86_64/cacheflush.h
@@ -7,6 +7,7 @@
 /* Caches aren't brain-dead on the intel. */
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 #define flush_dcache_page(page)                 do { } while (0)
diff --git a/include/asm-x86_64/msr.h b/include/asm-x86_64/msr.h
index 952783d35c7b..3227bc93d69b 100644
--- a/include/asm-x86_64/msr.h
+++ b/include/asm-x86_64/msr.h
@@ -189,6 +189,7 @@ static inline unsigned int cpuid_edx(unsigned int op)
 
 #define MSR_IA32_PERFCTR0      0xc1
 #define MSR_IA32_PERFCTR1      0xc2
+#define MSR_FSB_FREQ            0xcd
 
 #define MSR_MTRRcap             0x0fe
 #define MSR_IA32_BBL_CR_CTL        0x119
@@ -311,6 +312,9 @@ static inline unsigned int cpuid_edx(unsigned int op)
 #define MSR_IA32_PERF_STATUS            0x198
 #define MSR_IA32_PERF_CTL               0x199
 
+#define MSR_IA32_MPERF                  0xE7
+#define MSR_IA32_APERF                  0xE8
+
 #define MSR_IA32_THERM_CONTROL          0x19a
 #define MSR_IA32_THERM_INTERRUPT        0x19b
 #define MSR_IA32_THERM_STATUS           0x19c
diff --git a/include/asm-x86_64/thread_info.h b/include/asm-x86_64/thread_info.h
index 787a08114b48..74a6c74397f7 100644
--- a/include/asm-x86_64/thread_info.h
+++ b/include/asm-x86_64/thread_info.h
@@ -122,6 +122,7 @@ static inline struct thread_info *stack_thread_info(void)
 #define TIF_MEMDIE              20
 #define TIF_DEBUG               21      /* uses debug registers */
 #define TIF_IO_BITMAP           22      /* uses I/O bitmap */
+#define TIF_FREEZE              23      /* is freezing for suspend */
 
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
@@ -137,6 +138,7 @@ static inline struct thread_info *stack_thread_info(void)
 #define _TIF_ABI_PENDING        (1<<TIF_ABI_PENDING)
 #define _TIF_DEBUG              (1<<TIF_DEBUG)
 #define _TIF_IO_BITMAP          (1<<TIF_IO_BITMAP)
+#define _TIF_FREEZE             (1<<TIF_FREEZE)
 
 /* work to do on interrupt/exception return */
 #define _TIF_WORK_MASK \
diff --git a/include/asm-xtensa/cacheflush.h b/include/asm-xtensa/cacheflush.h
index 337765b629de..22ef901b7845 100644
--- a/include/asm-xtensa/cacheflush.h
+++ b/include/asm-xtensa/cacheflush.h
@@ -75,6 +75,7 @@ extern void __flush_invalidate_dcache_range(unsigned long, unsigned long);
 
 #define flush_cache_all()               __flush_invalidate_cache_all();
 #define flush_cache_mm(mm)              __flush_invalidate_cache_all();
+#define flush_cache_dup_mm(mm)          __flush_invalidate_cache_all();
 
 #define flush_cache_vmap(start,end)     __flush_invalidate_cache_all();
 #define flush_cache_vunmap(start,end)   __flush_invalidate_cache_all();
@@ -88,6 +89,7 @@ extern void flush_cache_page(struct vm_area_struct*, unsigned long, unsigned lon
 
 #define flush_cache_all()                               do { } while (0)
 #define flush_cache_mm(mm)                              do { } while (0)
+#define flush_cache_dup_mm(mm)                          do { } while (0)
 
 #define flush_cache_vmap(start,end)                     do { } while (0)
 #define flush_cache_vunmap(start,end)                   do { } while (0)
diff --git a/include/asm-xtensa/termbits.h b/include/asm-xtensa/termbits.h
index c780593ff5f9..057b9a3d8f83 100644
--- a/include/asm-xtensa/termbits.h
+++ b/include/asm-xtensa/termbits.h
@@ -30,6 +30,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 
 #define VINTR 0
diff --git a/include/asm-xtensa/uaccess.h b/include/asm-xtensa/uaccess.h
index 88a64e1144d5..d6352da05b10 100644
--- a/include/asm-xtensa/uaccess.h
+++ b/include/asm-xtensa/uaccess.h
@@ -23,7 +23,6 @@
 
 #ifdef __ASSEMBLY__
 
-#define _ASMLANGUAGE
 #include <asm/current.h>
 #include <asm/asm-offsets.h>
 #include <asm/processor.h>
diff --git a/include/linux/aio.h b/include/linux/aio.h
index 3372ec6bf53a..a30ef13c9e62 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -105,6 +105,7 @@ struct kiocb {
         wait_queue_t            ki_wait;
         loff_t                  ki_pos;
 
+        atomic_t                ki_bio_count;   /* num bio used for this iocb */
         void                    *private;
         /* State that we remember to be able to restart/retry  */
         unsigned short          ki_opcode;
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 092dbd0e7658..08daf3272c02 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -309,6 +309,7 @@ extern struct bio *bio_map_kern(struct request_queue *, void *, unsigned int,
                                 gfp_t);
 extern void bio_set_pages_dirty(struct bio *bio);
 extern void bio_check_pages_dirty(struct bio *bio);
+extern void bio_release_pages(struct bio *bio);
 extern struct bio *bio_copy_user(struct request_queue *, unsigned long, unsigned int, int);
 extern int bio_uncopy_user(struct bio *);
 void zero_fill_bio(struct bio *bio);
diff --git a/include/linux/coda_linux.h b/include/linux/coda_linux.h
index be512cc98791..4c2632a8d31b 100644
--- a/include/linux/coda_linux.h
+++ b/include/linux/coda_linux.h
@@ -64,7 +64,7 @@ void coda_sysctl_clean(void);
 
 #define CODA_ALLOC(ptr, cast, size) do { \
     if (size < PAGE_SIZE) \
-        ptr = (cast)kmalloc((unsigned long) size, GFP_KERNEL); \
+        ptr = kmalloc((unsigned long) size, GFP_KERNEL); \
     else \
         ptr = (cast)vmalloc((unsigned long) size); \
     if (!ptr) \
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 538423d4a865..aca66984aafd 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -40,7 +40,7 @@ extern void __chk_io_ptr(void __iomem *);
 #error no compiler-gcc.h file for this gcc version
 #elif __GNUC__ == 4
 # include <linux/compiler-gcc4.h>
-#elif __GNUC__ == 3
+#elif __GNUC__ == 3 && __GNUC_MINOR__ >= 2
 # include <linux/compiler-gcc3.h>
 #else
 # error Sorry, your compiler is too old/not recognized.
diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index a7f015027535..fef6f3d0a4a7 100644
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -160,31 +160,6 @@ struct configfs_group_operations {
         void (*drop_item)(struct config_group *group, struct config_item *item);
 };
 
-
-
-/**
- * Use these macros to make defining attributes easier. See include/linux/device.h
- * for examples..
- */
-
-#if 0
-#define __ATTR(_name,_mode,_show,_store) { \
-        .attr = {.ca_name = __stringify(_name), .ca_mode = _mode, .ca_owner = THIS_MODULE },    \
-        .show   = _show,                                        \
-        .store  = _store,                                       \
-}
-
-#define __ATTR_RO(_name) { \
-        .attr   = { .ca_name = __stringify(_name), .ca_mode = 0444, .ca_owner = THIS_MODULE },  \
-        .show   = _name##_show, \
-}
-
-#define __ATTR_NULL { .attr = { .name = NULL } }
-
-#define attr_name(_attr) (_attr).attr.name
-#endif
-
-
 struct configfs_subsystem {
         struct config_group     su_group;
         struct semaphore        su_sem;
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 4ea39fee99c7..7f008f6bfdc3 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -172,6 +172,8 @@ extern int __cpufreq_driver_target(struct cpufreq_policy *policy,
                                    unsigned int relation);
 
 
+extern int cpufreq_driver_getavg(struct cpufreq_policy *policy);
+
 int cpufreq_register_governor(struct cpufreq_governor *governor);
 void cpufreq_unregister_governor(struct cpufreq_governor *governor);
 
@@ -204,6 +206,7 @@ struct cpufreq_driver {
         unsigned int    (*get)  (unsigned int cpu);
 
         /* optional */
+        unsigned int (*getavg)  (unsigned int cpu);
         int     (*exit)         (struct cpufreq_policy *policy);
         int     (*suspend)      (struct cpufreq_policy *policy, pm_message_t pmsg);
         int     (*resume)       (struct cpufreq_policy *policy);
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index 8821e1f75b44..826b15e914e2 100644
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@ -30,10 +30,19 @@ void cpuset_update_task_memory_state(void);
                 nodes_subset((nodes), current->mems_allowed)
 int cpuset_zonelist_valid_mems_allowed(struct zonelist *zl);
 
-extern int __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask);
-static int inline cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
+extern int __cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask);
+extern int __cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask);
+
+static int inline cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask)
+{
+        return number_of_cpusets <= 1 ||
+                __cpuset_zone_allowed_softwall(z, gfp_mask);
+}
+
+static int inline cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask)
 {
-        return number_of_cpusets <= 1 || __cpuset_zone_allowed(z, gfp_mask);
+        return number_of_cpusets <= 1 ||
+                __cpuset_zone_allowed_hardwall(z, gfp_mask);
 }
 
 extern int cpuset_excl_nodes_overlap(const struct task_struct *p);
@@ -94,7 +103,12 @@ static inline int cpuset_zonelist_valid_mems_allowed(struct zonelist *zl)
         return 1;
 }
 
-static inline int cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
+static inline int cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask)
+{
+        return 1;
+}
+
+static inline int cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask)
 {
         return 1;
 }
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 6fe56aaa6685..64177ec9a019 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -929,8 +929,6 @@ extern void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max)
 #define FB_MODE_IS_FIRST        16
 #define FB_MODE_IS_FROM_VAR     32
 
-extern int fbmon_valid_timings(u_int pixclock, u_int htotal, u_int vtotal,
-                               const struct fb_info *fb_info);
 extern int fbmon_dpms(const struct fb_info *fb_info);
 extern int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var,
                        struct fb_info *info);
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
index 393063096134..5e75e26d4787 100644
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@@ -16,16 +16,15 @@ static inline int frozen(struct task_struct *p)
  */
 static inline int freezing(struct task_struct *p)
 {
-        return p->flags & PF_FREEZE;
+        return test_tsk_thread_flag(p, TIF_FREEZE);
 }
 
 /*
  * Request that a process be frozen
- * FIXME: SMP problem. We may not modify other process' flags!
  */
 static inline void freeze(struct task_struct *p)
 {
-        p->flags |= PF_FREEZE;
+        set_tsk_thread_flag(p, TIF_FREEZE);
 }
 
 /*
@@ -33,7 +32,7 @@ static inline void freeze(struct task_struct *p)
  */
 static inline void do_not_freeze(struct task_struct *p)
 {
-        p->flags &= ~PF_FREEZE;
+        clear_tsk_thread_flag(p, TIF_FREEZE);
 }
 
 /*
@@ -54,7 +53,9 @@ static inline int thaw_process(struct task_struct *p)
  */
 static inline void frozen_process(struct task_struct *p)
 {
-        p->flags = (p->flags & ~PF_FREEZE) | PF_FROZEN;
+        p->flags |= PF_FROZEN;
+        wmb();
+        clear_tsk_thread_flag(p, TIF_FREEZE);
 }
 
 extern void refrigerator(void);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index adce6e1d70c2..186da813541e 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -120,6 +120,7 @@ extern int dir_notify_enable;
 #define MS_PRIVATE      (1<<18) /* change to private */
 #define MS_SLAVE        (1<<19) /* change to slave */
 #define MS_SHARED       (1<<20) /* change to shared */
+#define MS_RELATIME     (1<<21) /* Update atime relative to mtime/ctime. */
 #define MS_ACTIVE       (1<<30)
 #define MS_NOUSER       (1<<31)
 
diff --git a/include/linux/gameport.h b/include/linux/gameport.h
index 2cdba0c23957..afad95272841 100644
--- a/include/linux/gameport.h
+++ b/include/linux/gameport.h
@@ -105,7 +105,7 @@ static inline void gameport_set_phys(struct gameport *gameport,
 
 static inline struct gameport *gameport_allocate_port(void)
 {
-        struct gameport *gameport = kcalloc(1, sizeof(struct gameport), GFP_KERNEL);
+        struct gameport *gameport = kzalloc(sizeof(struct gameport), GFP_KERNEL);
 
         return gameport;
 }
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index 3d8768b619e9..ca9a602cffd7 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -96,7 +96,10 @@ static inline void memclear_highpage_flush(struct page *page, unsigned int offse
         kunmap_atomic(kaddr, KM_USER0);
 }
 
-static inline void copy_user_highpage(struct page *to, struct page *from, unsigned long vaddr)
+#ifndef __HAVE_ARCH_COPY_USER_HIGHPAGE
+
+static inline void copy_user_highpage(struct page *to, struct page *from,
+        unsigned long vaddr, struct vm_area_struct *vma)
 {
         char *vfrom, *vto;
 
@@ -109,6 +112,8 @@ static inline void copy_user_highpage(struct page *to, struct page *from, unsign
         smp_wmb();
 }
 
+#endif
+
 static inline void copy_highpage(struct page *to, struct page *from)
 {
         char *vfrom, *vto;
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 7ae3c3326643..d38778f2fbec 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -142,7 +142,6 @@
 #define I2C_DRIVERID_MTP008 1023
 #define I2C_DRIVERID_DS1621 1024
 #define I2C_DRIVERID_ADM1024 1025
-#define I2C_DRIVERID_IT87 1026
 #define I2C_DRIVERID_CH700X 1027 /* single driver for CH7003-7009 digital pc to tv encoders */
 #define I2C_DRIVERID_FSCPOS 1028
 #define I2C_DRIVERID_FSCSCY 1029
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index b5315150199e..6383d2d83bb0 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -75,7 +75,6 @@ extern struct nsproxy init_nsproxy;
         .pid_ns         = &init_pid_ns,                                 \
         .count          = ATOMIC_INIT(1),                               \
         .nslock         = __SPIN_LOCK_UNLOCKED(nsproxy.nslock),         \
-        .id             = 0,                                            \
         .uts_ns         = &init_uts_ns,                                 \
         .mnt_ns         = NULL,                                         \
         INIT_IPC_NS(ipc_ns)                                             \
diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h
index aa50d89eacd7..246de1d84a26 100644
--- a/include/linux/lockd/bind.h
+++ b/include/linux/lockd/bind.h
@@ -23,7 +23,7 @@ struct svc_rqst;
  * This is the set of functions for lockd->nfsd communication
  */
 struct nlmsvc_binding {
-        u32                     (*fopen)(struct svc_rqst *,
+        __be32                  (*fopen)(struct svc_rqst *,
                                                 struct nfs_fh *,
                                                 struct file **);
         void                    (*fclose)(struct file *);
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 0c962b82a9de..ac25b5649c59 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -191,7 +191,7 @@ __be32		  nlmsvc_cancel_blocked(struct nlm_file *, struct nlm_lock *);
 unsigned long     nlmsvc_retry_blocked(void);
 void              nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,
                                         nlm_host_match_fn_t match);
-void              nlmsvc_grant_reply(struct nlm_cookie *, u32);
+void              nlmsvc_grant_reply(struct nlm_cookie *, __be32);
 
 /*
  * File handling for the server personality
diff --git a/include/linux/lockd/sm_inter.h b/include/linux/lockd/sm_inter.h
index fc61d40964da..22a645828f26 100644
--- a/include/linux/lockd/sm_inter.h
+++ b/include/linux/lockd/sm_inter.h
@@ -24,7 +24,7 @@
  * Arguments for all calls to statd
  */
 struct nsm_args {
-        u32             addr;           /* remote address */
+        __be32          addr;           /* remote address */
         u32             prog;           /* RPC callback info */
         u32             vers;
         u32             proc;
diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h
index 29e7d9fc9dad..83a1f9f6237b 100644
--- a/include/linux/lockd/xdr.h
+++ b/include/linux/lockd/xdr.h
@@ -69,7 +69,7 @@ typedef struct nlm_args nlm_args;
  */
 struct nlm_res {
         struct nlm_cookie       cookie;
-        u32                     status;
+        __be32                  status;
         struct nlm_lock         lock;
 };
 
@@ -80,9 +80,9 @@ struct nlm_reboot {
         char *          mon;
         int             len;
         u32             state;
-        u32             addr;
-        u32             vers;
-        u32             proto;
+        __be32          addr;
+        __be32          vers;
+        __be32          proto;
 };
 
 /*
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 498bfbd3b4e1..ea097dddc44f 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -281,15 +281,25 @@ struct lock_class_key { };
 #if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_GENERIC_HARDIRQS)
 extern void early_init_irq_lock_class(void);
 #else
-# define early_init_irq_lock_class()            do { } while (0)
+static inline void early_init_irq_lock_class(void)
+{
+}
 #endif
 
 #ifdef CONFIG_TRACE_IRQFLAGS
 extern void early_boot_irqs_off(void);
 extern void early_boot_irqs_on(void);
+extern void print_irqtrace_events(struct task_struct *curr);
 #else
-# define early_boot_irqs_off()                  do { } while (0)
-# define early_boot_irqs_on()                   do { } while (0)
+static inline void early_boot_irqs_off(void)
+{
+}
+static inline void early_boot_irqs_on(void)
+{
+}
+static inline void print_irqtrace_events(struct task_struct *curr)
+{
+}
 #endif
 
 /*
diff --git a/include/linux/mount.h b/include/linux/mount.h
index e357dc86a4de..1b7e178b0d84 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -27,6 +27,7 @@ struct mnt_namespace;
 #define MNT_NOEXEC      0x04
 #define MNT_NOATIME     0x08
 #define MNT_NODIRATIME  0x10
+#define MNT_RELATIME    0x20
 
 #define MNT_SHRINKABLE  0x100
 
diff --git a/include/linux/n_r3964.h b/include/linux/n_r3964.h
index db4f3776978a..de24af79ebd3 100644
--- a/include/linux/n_r3964.h
+++ b/include/linux/n_r3964.h
@@ -116,7 +116,7 @@ struct r3964_message;
 
 struct r3964_client_info {
         spinlock_t     lock;
-        pid_t          pid;
+        struct pid    *pid;
         unsigned int   sig_flags;
 
         struct r3964_client_info *next;
diff --git a/include/linux/ncp_mount.h b/include/linux/ncp_mount.h
index f46bddcdbd3b..a2b549eb1eca 100644
--- a/include/linux/ncp_mount.h
+++ b/include/linux/ncp_mount.h
@@ -75,7 +75,7 @@ struct ncp_mount_data_kernel {
         unsigned int     int_flags;     /* internal flags */
 #define NCP_IMOUNT_LOGGEDIN_POSSIBLE    0x0001
         __kernel_uid32_t mounted_uid;   /* Who may umount() this filesystem? */
-        __kernel_pid_t   wdog_pid;              /* Who cares for our watchdog packets? */
+        struct pid      *wdog_pid;      /* Who cares for our watchdog packets? */
         unsigned int     ncp_fd;        /* The socket to the ncp port */
         unsigned int     time_out;      /* How long should I wait after
                                            sending a NCP request? */
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index edb54c3171b3..0727774772ba 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -275,12 +275,12 @@ static inline int is_fsid(struct svc_fh *fh, struct knfsd_fh *reffh)
  * we might process an operation with side effects, and be unable to
  * tell the client that the operation succeeded.
  *
- * COMPOUND_SLACK_SPACE - this is the minimum amount of buffer space
+ * COMPOUND_SLACK_SPACE - this is the minimum bytes of buffer space
  * needed to encode an "ordinary" _successful_ operation.  (GETATTR,
  * READ, READDIR, and READLINK have their own buffer checks.)  if we
  * fall below this level, we fail the next operation with NFS4ERR_RESOURCE.
  *
- * COMPOUND_ERR_SLACK_SPACE - this is the minimum amount of buffer space
+ * COMPOUND_ERR_SLACK_SPACE - this is the minimum bytes of buffer space
  * needed to encode an operation which has failed with NFS4ERR_RESOURCE.
  * care is taken to ensure that we never fall below this level for any
  * reason.
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index c3673f487e84..ab5c236bd9a7 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -273,7 +273,6 @@ struct nfs4_stateid {
         ((err) != nfserr_stale_stateid) &&      \
         ((err) != nfserr_bad_stateid))
 
-extern __be32 nfsd4_renew(clientid_t *clid);
 extern __be32 nfs4_preprocess_stateid_op(struct svc_fh *current_fh,
                 stateid_t *stateid, int flags, struct file **filp);
 extern void nfs4_lock_state(void);
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h
index 45ca01b5f844..09799bcee0ac 100644
--- a/include/linux/nfsd/xdr4.h
+++ b/include/linux/nfsd/xdr4.h
@@ -44,6 +44,12 @@
 #define NFSD4_MAX_TAGLEN        128
 #define XDR_LEN(n)                     (((n) + 3) & ~3)
 
+struct nfsd4_compound_state {
+        struct svc_fh current_fh;
+        struct svc_fh save_fh;
+        struct nfs4_stateowner *replay_owner;
+};
+
 struct nfsd4_change_info {
         u32             atomic;
         u32             before_ctime_sec;
@@ -430,35 +436,39 @@ __be32 nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
                        struct dentry *dentry, __be32 *buffer, int *countp,
                        u32 *bmval, struct svc_rqst *);
 extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
                 struct nfsd4_setclientid *setclid);
 extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
                 struct nfsd4_setclientid_confirm *setclientid_confirm);
 extern __be32 nfsd4_process_open1(struct nfsd4_open *open);
 extern __be32 nfsd4_process_open2(struct svc_rqst *rqstp,
                 struct svc_fh *current_fh, struct nfsd4_open *open);
 extern __be32 nfsd4_open_confirm(struct svc_rqst *rqstp,
-                struct svc_fh *current_fh, struct nfsd4_open_confirm *oc,
-                struct nfs4_stateowner **);
-extern __be32 nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh,
-                struct nfsd4_close *close,
-                struct nfs4_stateowner **replay_owner);
+                struct nfsd4_compound_state *, struct nfsd4_open_confirm *oc);
+extern __be32 nfsd4_close(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
+                struct nfsd4_close *close);
 extern __be32 nfsd4_open_downgrade(struct svc_rqst *rqstp,
-                struct svc_fh *current_fh, struct nfsd4_open_downgrade *od,
-                struct nfs4_stateowner **replay_owner);
-extern __be32 nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh,
-                struct nfsd4_lock *lock,
-                struct nfs4_stateowner **replay_owner);
-extern __be32 nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh,
+                struct nfsd4_compound_state *,
+                struct nfsd4_open_downgrade *od);
+extern __be32 nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *,
+                struct nfsd4_lock *lock);
+extern __be32 nfsd4_lockt(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
                 struct nfsd4_lockt *lockt);
-extern __be32 nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh,
-                struct nfsd4_locku *locku,
-                struct nfs4_stateowner **replay_owner);
+extern __be32 nfsd4_locku(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
+                struct nfsd4_locku *locku);
 extern __be32
 nfsd4_release_lockowner(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
                 struct nfsd4_release_lockowner *rlockowner);
 extern void nfsd4_release_compoundargs(struct nfsd4_compoundargs *);
 extern __be32 nfsd4_delegreturn(struct svc_rqst *rqstp,
-                struct svc_fh *current_fh, struct nfsd4_delegreturn *dr);
+                struct nfsd4_compound_state *, struct nfsd4_delegreturn *dr);
+extern __be32 nfsd4_renew(struct svc_rqst *rqstp,
+                          struct nfsd4_compound_state *, clientid_t *clid);
 #endif
 
 /*
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h
index fdfb0e44912f..0b9f0dc30d61 100644
--- a/include/linux/nsproxy.h
+++ b/include/linux/nsproxy.h
@@ -24,7 +24,6 @@ struct pid_namespace;
 struct nsproxy {
         atomic_t count;
         spinlock_t nslock;
-        unsigned long id;
         struct uts_namespace *uts_ns;
         struct ipc_namespace *ipc_ns;
         struct mnt_namespace *mnt_ns;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 51180dba9a98..95c1e74afebc 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2067,6 +2067,10 @@
 #define PCI_DEVICE_ID_JMICRON_JMB366    0x2366
 #define PCI_DEVICE_ID_JMICRON_JMB368    0x2368
 
+#define PCI_VENDOR_ID_KORENIX           0x1982
+#define PCI_DEVICE_ID_KORENIX_JETCARDF0 0x1600
+#define PCI_DEVICE_ID_KORENIX_JETCARDF1 0x16ff
+
 #define PCI_VENDOR_ID_TEKRAM            0x1de1
 #define PCI_DEVICE_ID_TEKRAM_DC290      0xdc29
 
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index ea4f7cd7bfd8..2e19478e9e84 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -12,7 +12,7 @@
 struct pipe_buffer {
         struct page *page;
         unsigned int offset, len;
-        struct pipe_buf_operations *ops;
+        const struct pipe_buf_operations *ops;
         unsigned int flags;
 };
 
@@ -41,9 +41,7 @@ struct pipe_buf_operations {
 struct pipe_inode_info {
         wait_queue_head_t wait;
         unsigned int nrbufs, curbuf;
-        struct pipe_buffer bufs[PIPE_BUFFERS];
         struct page *tmp_page;
-        unsigned int start;
         unsigned int readers;
         unsigned int writers;
         unsigned int waiting_writers;
@@ -52,6 +50,7 @@ struct pipe_inode_info {
         struct fasync_struct *fasync_readers;
         struct fasync_struct *fasync_writers;
         struct inode *inode;
+        struct pipe_buffer bufs[PIPE_BUFFERS];
 };
 
 /* Differs from PIPE_BUF in that PIPE_SIZE is the length of the actual
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 20f47b81d3fa..8bbd459eafdc 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -39,7 +39,7 @@ extern struct platform_device *platform_device_register_simple(char *, unsigned
 
 extern struct platform_device *platform_device_alloc(const char *name, unsigned int id);
 extern int platform_device_add_resources(struct platform_device *pdev, struct resource *res, unsigned int num);
-extern int platform_device_add_data(struct platform_device *pdev, void *data, size_t size);
+extern int platform_device_add_data(struct platform_device *pdev, const void *data, size_t size);
 extern int platform_device_add(struct platform_device *pdev);
 extern void platform_device_del(struct platform_device *pdev);
 extern void platform_device_put(struct platform_device *pdev);
diff --git a/include/linux/reciprocal_div.h b/include/linux/reciprocal_div.h
new file mode 100644
index 000000000000..f9c90b33285b
--- /dev/null
+++ b/include/linux/reciprocal_div.h
@@ -0,0 +1,32 @@
+#ifndef _LINUX_RECIPROCAL_DIV_H
+#define _LINUX_RECIPROCAL_DIV_H
+
+#include <linux/types.h>
+
+/*
+ * This file describes reciprocical division.
+ *
+ * This optimizes the (A/B) problem, when A and B are two u32
+ * and B is a known value (but not known at compile time)
+ *
+ * The math principle used is :
+ *   Let RECIPROCAL_VALUE(B) be (((1LL << 32) + (B - 1))/ B)
+ *   Then A / B = (u32)(((u64)(A) * (R)) >> 32)
+ *
+ * This replaces a divide by a multiply (and a shift), and
+ * is generally less expensive in CPU cycles.
+ */
+
+/*
+ * Computes the reciprocal value (R) for the value B of the divisor.
+ * Should not be called before each reciprocal_divide(),
+ * or else the performance is slower than a normal divide.
+ */
+extern u32 reciprocal_value(u32 B);
+
+
+static inline u32 reciprocal_divide(u32 A, u32 R)
+{
+        return (u32)(((u64)A * R) >> 32);
+}
+#endif
diff --git a/include/linux/sched.h b/include/linux/sched.h
index ea92e5c89089..446373535190 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1144,7 +1144,6 @@ static inline void put_task_struct(struct task_struct *t)
 #define PF_MEMALLOC     0x00000800      /* Allocating memory */
 #define PF_FLUSHER      0x00001000      /* responsible for disk writeback */
 #define PF_USED_MATH    0x00002000      /* if unset the fpu must be initialized before use */
-#define PF_FREEZE       0x00004000      /* this task is being frozen for suspend now */
 #define PF_NOFREEZE     0x00008000      /* this thread should not be frozen */
 #define PF_FROZEN       0x00010000      /* frozen for system suspend */
 #define PF_FSTRANS      0x00020000      /* inside a filesystem transaction */
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 2271886744f8..1ef822e31c77 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -1,7 +1,9 @@
 /*
- * linux/include/linux/slab.h
- * Written by Mark Hemment, 1996.
- * (markhe@nextd.demon.co.uk)
+ * Written by Mark Hemment, 1996 (markhe@nextd.demon.co.uk).
+ *
+ * (C) SGI 2006, Christoph Lameter <clameter@sgi.com>
+ *      Cleaned up and restructured to ease the addition of alternative
+ *      implementations of SLAB allocators.
  */
 
 #ifndef _LINUX_SLAB_H
@@ -10,64 +12,95 @@
 #ifdef __KERNEL__
 
 #include <linux/gfp.h>
-#include <linux/init.h>
 #include <linux/types.h>
-#include <asm/page.h>           /* kmalloc_sizes.h needs PAGE_SIZE */
-#include <asm/cache.h>          /* kmalloc_sizes.h needs L1_CACHE_BYTES */
-#include <linux/compiler.h>
 
-/* kmem_cache_t exists for legacy reasons and is not used by code in mm */
 typedef struct kmem_cache kmem_cache_t __deprecated;
 
-/* flags to pass to kmem_cache_create().
- * The first 3 are only valid when the allocator as been build
- * SLAB_DEBUG_SUPPORT.
+/*
+ * Flags to pass to kmem_cache_create().
+ * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
  */
-#define SLAB_DEBUG_FREE         0x00000100UL    /* Peform (expensive) checks on free */
-#define SLAB_DEBUG_INITIAL      0x00000200UL    /* Call constructor (as verifier) */
-#define SLAB_RED_ZONE           0x00000400UL    /* Red zone objs in a cache */
-#define SLAB_POISON             0x00000800UL    /* Poison objects */
-#define SLAB_HWCACHE_ALIGN      0x00002000UL    /* align objs on a h/w cache lines */
-#define SLAB_CACHE_DMA          0x00004000UL    /* use GFP_DMA memory */
-#define SLAB_MUST_HWCACHE_ALIGN 0x00008000UL    /* force alignment */
-#define SLAB_STORE_USER         0x00010000UL    /* store the last owner for bug hunting */
-#define SLAB_RECLAIM_ACCOUNT    0x00020000UL    /* track pages allocated to indicate
-                                                   what is reclaimable later*/
-#define SLAB_PANIC              0x00040000UL    /* panic if kmem_cache_create() fails */
-#define SLAB_DESTROY_BY_RCU     0x00080000UL    /* defer freeing pages to RCU */
+#define SLAB_DEBUG_FREE         0x00000100UL    /* DEBUG: Perform (expensive) checks on free */
+#define SLAB_DEBUG_INITIAL      0x00000200UL    /* DEBUG: Call constructor (as verifier) */
+#define SLAB_RED_ZONE           0x00000400UL    /* DEBUG: Red zone objs in a cache */
+#define SLAB_POISON             0x00000800UL    /* DEBUG: Poison objects */
+#define SLAB_HWCACHE_ALIGN      0x00002000UL    /* Align objs on cache lines */
+#define SLAB_CACHE_DMA          0x00004000UL    /* Use GFP_DMA memory */
+#define SLAB_MUST_HWCACHE_ALIGN 0x00008000UL    /* Force alignment even if debuggin is active */
+#define SLAB_STORE_USER         0x00010000UL    /* DEBUG: Store the last owner for bug hunting */
+#define SLAB_RECLAIM_ACCOUNT    0x00020000UL    /* Objects are reclaimable */
+#define SLAB_PANIC              0x00040000UL    /* Panic if kmem_cache_create() fails */
+#define SLAB_DESTROY_BY_RCU     0x00080000UL    /* Defer freeing slabs to RCU */
 #define SLAB_MEM_SPREAD         0x00100000UL    /* Spread some memory over cpuset */
 
-/* flags passed to a constructor func */
-#define SLAB_CTOR_CONSTRUCTOR   0x001UL         /* if not set, then deconstructor */
-#define SLAB_CTOR_ATOMIC        0x002UL         /* tell constructor it can't sleep */
-#define SLAB_CTOR_VERIFY        0x004UL         /* tell constructor it's a verify call */
+/* Flags passed to a constructor functions */
+#define SLAB_CTOR_CONSTRUCTOR   0x001UL         /* If not set, then deconstructor */
+#define SLAB_CTOR_ATOMIC        0x002UL         /* Tell constructor it can't sleep */
+#define SLAB_CTOR_VERIFY        0x004UL         /* Tell constructor it's a verify call */
 
-#ifndef CONFIG_SLOB
-
-/* prototypes */
-extern void __init kmem_cache_init(void);
+/*
+ * struct kmem_cache related prototypes
+ */
+void __init kmem_cache_init(void);
+extern int slab_is_available(void);
 
-extern struct kmem_cache *kmem_cache_create(const char *, size_t, size_t,
+struct kmem_cache *kmem_cache_create(const char *, size_t, size_t,
                         unsigned long,
                         void (*)(void *, struct kmem_cache *, unsigned long),
                         void (*)(void *, struct kmem_cache *, unsigned long));
-extern void kmem_cache_destroy(struct kmem_cache *);
-extern int kmem_cache_shrink(struct kmem_cache *);
-extern void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
-extern void *kmem_cache_zalloc(struct kmem_cache *, gfp_t);
-extern void kmem_cache_free(struct kmem_cache *, void *);
-extern unsigned int kmem_cache_size(struct kmem_cache *);
-extern const char *kmem_cache_name(struct kmem_cache *);
+void kmem_cache_destroy(struct kmem_cache *);
+int kmem_cache_shrink(struct kmem_cache *);
+void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
+void *kmem_cache_zalloc(struct kmem_cache *, gfp_t);
+void kmem_cache_free(struct kmem_cache *, void *);
+unsigned int kmem_cache_size(struct kmem_cache *);
+const char *kmem_cache_name(struct kmem_cache *);
+int kmem_ptr_validate(struct kmem_cache *cachep, const void *ptr);
+
+#ifdef CONFIG_NUMA
+extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
+#else
+static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
+                                        gfp_t flags, int node)
+{
+        return kmem_cache_alloc(cachep, flags);
+}
+#endif
+
+/*
+ * Common kmalloc functions provided by all allocators
+ */
+void *__kmalloc(size_t, gfp_t);
+void *__kzalloc(size_t, gfp_t);
+void kfree(const void *);
+unsigned int ksize(const void *);
+
+/**
+ * kcalloc - allocate memory for an array. The memory is set to zero.
+ * @n: number of elements.
+ * @size: element size.
+ * @flags: the type of memory to allocate.
+ */
+static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
+{
+        if (n != 0 && size > ULONG_MAX / n)
+                return NULL;
+        return __kzalloc(n * size, flags);
+}
 
-/* Size description struct for general caches. */
-struct cache_sizes {
-        size_t                  cs_size;
-        struct kmem_cache       *cs_cachep;
-        struct kmem_cache       *cs_dmacachep;
-};
-extern struct cache_sizes malloc_sizes[];
+/*
+ * Allocator specific definitions. These are mainly used to establish optimized
+ * ways to convert kmalloc() calls to kmem_cache_alloc() invocations by selecting
+ * the appropriate general cache at compile time.
+ */
 
-extern void *__kmalloc(size_t, gfp_t);
+#ifdef CONFIG_SLAB
+#include <linux/slab_def.h>
+#else
+/*
+ * Fallback definitions for an allocator not wanting to provide
+ * its own optimized kmalloc definitions (like SLOB).
+ */
 
 /**
  * kmalloc - allocate memory
@@ -116,46 +149,9 @@ extern void *__kmalloc(size_t, gfp_t);
  */
 static inline void *kmalloc(size_t size, gfp_t flags)
 {
-        if (__builtin_constant_p(size)) {
-                int i = 0;
-#define CACHE(x) \
-                if (size <= x) \
-                        goto found; \
-                else \
-                        i++;
-#include "kmalloc_sizes.h"
-#undef CACHE
-                {
-                        extern void __you_cannot_kmalloc_that_much(void);
-                        __you_cannot_kmalloc_that_much();
-                }
-found:
-                return kmem_cache_alloc((flags & GFP_DMA) ?
-                        malloc_sizes[i].cs_dmacachep :
-                        malloc_sizes[i].cs_cachep, flags);
-        }
         return __kmalloc(size, flags);
 }
 
-/*
- * kmalloc_track_caller is a special version of kmalloc that records the
- * calling function of the routine calling it for slab leak tracking instead
- * of just the calling function (confusing, eh?).
- * It's useful when the call to kmalloc comes from a widely-used standard
- * allocator where we care about the real place the memory allocation
- * request comes from.
- */
-#ifndef CONFIG_DEBUG_SLAB
-#define kmalloc_track_caller(size, flags) \
-        __kmalloc(size, flags)
-#else
-extern void *__kmalloc_track_caller(size_t, gfp_t, void*);
-#define kmalloc_track_caller(size, flags) \
-        __kmalloc_track_caller(size, flags, __builtin_return_address(0))
-#endif
-
-extern void *__kzalloc(size_t, gfp_t);
-
 /**
  * kzalloc - allocate memory. The memory is set to zero.
  * @size: how many bytes of memory are required.
@@ -163,72 +159,41 @@ extern void *__kzalloc(size_t, gfp_t);
  */
 static inline void *kzalloc(size_t size, gfp_t flags)
 {
-        if (__builtin_constant_p(size)) {
-                int i = 0;
-#define CACHE(x) \
-                if (size <= x) \
-                        goto found; \
-                else \
-                        i++;
-#include "kmalloc_sizes.h"
-#undef CACHE
-                {
-                        extern void __you_cannot_kzalloc_that_much(void);
-                        __you_cannot_kzalloc_that_much();
-                }
-found:
-                return kmem_cache_zalloc((flags & GFP_DMA) ?
-                        malloc_sizes[i].cs_dmacachep :
-                        malloc_sizes[i].cs_cachep, flags);
-        }
         return __kzalloc(size, flags);
 }
+#endif
 
-/**
- * kcalloc - allocate memory for an array. The memory is set to zero.
- * @n: number of elements.
- * @size: element size.
- * @flags: the type of memory to allocate.
- */
-static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
+#ifndef CONFIG_NUMA
+static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
 {
-        if (n != 0 && size > ULONG_MAX / n)
-                return NULL;
-        return kzalloc(n * size, flags);
+        return kmalloc(size, flags);
 }
 
-extern void kfree(const void *);
-extern unsigned int ksize(const void *);
-extern int slab_is_available(void);
-
-#ifdef CONFIG_NUMA
-extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
-extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
-
-static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
+static inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
 {
-        if (__builtin_constant_p(size)) {
-                int i = 0;
-#define CACHE(x) \
-                if (size <= x) \
-                        goto found; \
-                else \
-                        i++;
-#include "kmalloc_sizes.h"
-#undef CACHE
-                {
-                        extern void __you_cannot_kmalloc_that_much(void);
-                        __you_cannot_kmalloc_that_much();
-                }
-found:
-                return kmem_cache_alloc_node((flags & GFP_DMA) ?
-                        malloc_sizes[i].cs_dmacachep :
-                        malloc_sizes[i].cs_cachep, flags, node);
-        }
-        return __kmalloc_node(size, flags, node);
+        return __kmalloc(size, flags);
 }
+#endif /* !CONFIG_NUMA */
 
 /*
+ * kmalloc_track_caller is a special version of kmalloc that records the
+ * calling function of the routine calling it for slab leak tracking instead
+ * of just the calling function (confusing, eh?).
+ * It's useful when the call to kmalloc comes from a widely-used standard
+ * allocator where we care about the real place the memory allocation
+ * request comes from.
+ */
+#ifdef CONFIG_DEBUG_SLAB
+extern void *__kmalloc_track_caller(size_t, gfp_t, void*);
+#define kmalloc_track_caller(size, flags) \
+        __kmalloc_track_caller(size, flags, __builtin_return_address(0))
+#else
+#define kmalloc_track_caller(size, flags) \
+        __kmalloc(size, flags)
+#endif /* DEBUG_SLAB */
+
+#ifdef CONFIG_NUMA
+/*
  * kmalloc_node_track_caller is a special version of kmalloc_node that
  * records the calling function of the routine calling it for slab leak
  * tracking instead of just the calling function (confusing, eh?).
@@ -236,70 +201,23 @@ found:
  * standard allocator where we care about the real place the memory
  * allocation request comes from.
  */
-#ifndef CONFIG_DEBUG_SLAB
-#define kmalloc_node_track_caller(size, flags, node) \
-        __kmalloc_node(size, flags, node)
-#else
+#ifdef CONFIG_DEBUG_SLAB
 extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, void *);
 #define kmalloc_node_track_caller(size, flags, node) \
         __kmalloc_node_track_caller(size, flags, node, \
                         __builtin_return_address(0))
+#else
+#define kmalloc_node_track_caller(size, flags, node) \
+        __kmalloc_node(size, flags, node)
 #endif
+
 #else /* CONFIG_NUMA */
-static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
-                                        gfp_t flags, int node)
-{
-        return kmem_cache_alloc(cachep, flags);
-}
-static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
-{
-        return kmalloc(size, flags);
-}
 
 #define kmalloc_node_track_caller(size, flags, node) \
         kmalloc_track_caller(size, flags)
-#endif
 
-extern int FASTCALL(kmem_cache_reap(int));
-extern int FASTCALL(kmem_ptr_validate(struct kmem_cache *cachep, void *ptr));
-
-#else /* CONFIG_SLOB */
-
-/* SLOB allocator routines */
-
-void kmem_cache_init(void);
-struct kmem_cache *kmem_cache_create(const char *c, size_t, size_t,
-        unsigned long,
-        void (*)(void *, struct kmem_cache *, unsigned long),
-        void (*)(void *, struct kmem_cache *, unsigned long));
-void kmem_cache_destroy(struct kmem_cache *c);
-void *kmem_cache_alloc(struct kmem_cache *c, gfp_t flags);
-void *kmem_cache_zalloc(struct kmem_cache *, gfp_t);
-void kmem_cache_free(struct kmem_cache *c, void *b);
-const char *kmem_cache_name(struct kmem_cache *);
-void *kmalloc(size_t size, gfp_t flags);
-void *__kzalloc(size_t size, gfp_t flags);
-void kfree(const void *m);
-unsigned int ksize(const void *m);
-unsigned int kmem_cache_size(struct kmem_cache *c);
-
-static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
-{
-        return __kzalloc(n * size, flags);
-}
-
-#define kmem_cache_shrink(d) (0)
-#define kmem_cache_reap(a)
-#define kmem_ptr_validate(a, b) (0)
-#define kmem_cache_alloc_node(c, f, n) kmem_cache_alloc(c, f)
-#define kmalloc_node(s, f, n) kmalloc(s, f)
-#define kzalloc(s, f) __kzalloc(s, f)
-#define kmalloc_track_caller kmalloc
-
-#define kmalloc_node_track_caller kmalloc_node
-
-#endif /* CONFIG_SLOB */
+#endif /* DEBUG_SLAB */
 
 #endif  /* __KERNEL__ */
-
 #endif  /* _LINUX_SLAB_H */
+
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
new file mode 100644
index 000000000000..4b463e66ddea
--- /dev/null
+++ b/include/linux/slab_def.h
@@ -0,0 +1,100 @@
+#ifndef _LINUX_SLAB_DEF_H
+#define _LINUX_SLAB_DEF_H
+
+/*
+ * Definitions unique to the original Linux SLAB allocator.
+ *
+ * What we provide here is a way to optimize the frequent kmalloc
+ * calls in the kernel by selecting the appropriate general cache
+ * if kmalloc was called with a size that can be established at
+ * compile time.
+ */
+
+#include <linux/init.h>
+#include <asm/page.h>           /* kmalloc_sizes.h needs PAGE_SIZE */
+#include <asm/cache.h>          /* kmalloc_sizes.h needs L1_CACHE_BYTES */
+#include <linux/compiler.h>
+
+/* Size description struct for general caches. */
+struct cache_sizes {
+        size_t                  cs_size;
+        struct kmem_cache       *cs_cachep;
+        struct kmem_cache       *cs_dmacachep;
+};
+extern struct cache_sizes malloc_sizes[];
+
+static inline void *kmalloc(size_t size, gfp_t flags)
+{
+        if (__builtin_constant_p(size)) {
+                int i = 0;
+#define CACHE(x) \
+                if (size <= x) \
+                        goto found; \
+                else \
+                        i++;
+#include "kmalloc_sizes.h"
+#undef CACHE
+                {
+                        extern void __you_cannot_kmalloc_that_much(void);
+                        __you_cannot_kmalloc_that_much();
+                }
+found:
+                return kmem_cache_alloc((flags & GFP_DMA) ?
+                        malloc_sizes[i].cs_dmacachep :
+                        malloc_sizes[i].cs_cachep, flags);
+        }
+        return __kmalloc(size, flags);
+}
+
+static inline void *kzalloc(size_t size, gfp_t flags)
+{
+        if (__builtin_constant_p(size)) {
+                int i = 0;
+#define CACHE(x) \
+                if (size <= x) \
+                        goto found; \
+                else \
+                        i++;
+#include "kmalloc_sizes.h"
+#undef CACHE
+                {
+                        extern void __you_cannot_kzalloc_that_much(void);
+                        __you_cannot_kzalloc_that_much();
+                }
+found:
+                return kmem_cache_zalloc((flags & GFP_DMA) ?
+                        malloc_sizes[i].cs_dmacachep :
+                        malloc_sizes[i].cs_cachep, flags);
+        }
+        return __kzalloc(size, flags);
+}
+
+#ifdef CONFIG_NUMA
+extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
+
+static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
+{
+        if (__builtin_constant_p(size)) {
+                int i = 0;
+#define CACHE(x) \
+                if (size <= x) \
+                        goto found; \
+                else \
+                        i++;
+#include "kmalloc_sizes.h"
+#undef CACHE
+                {
+                        extern void __you_cannot_kmalloc_that_much(void);
+                        __you_cannot_kmalloc_that_much();
+                }
+found:
+                return kmem_cache_alloc_node((flags & GFP_DMA) ?
+                        malloc_sizes[i].cs_dmacachep :
+                        malloc_sizes[i].cs_cachep, flags, node);
+        }
+        return __kmalloc_node(size, flags, node);
+}
+
+#endif  /* CONFIG_NUMA */
+
+#endif  /* _LINUX_SLAB_DEF_H */
diff --git a/include/linux/smb_fs_sb.h b/include/linux/smb_fs_sb.h
index 5b4ae2cc445c..3aa97aa4277f 100644
--- a/include/linux/smb_fs_sb.h
+++ b/include/linux/smb_fs_sb.h
@@ -55,7 +55,7 @@ struct smb_sb_info {
          * generation is incremented.
          */
         unsigned int generation;
-        pid_t conn_pid;
+        struct pid *conn_pid;
         struct smb_conn_opt opt;
         wait_queue_head_t conn_wq;
         int conn_complete;
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 6d8846e7be6d..81480e613467 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -11,7 +11,7 @@
  **  the sysctl() binary interface.  Do *NOT* change the
  **  numbering of any existing values here, and do not change
  **  any numbers within any one set of values.  If you have to
- **  have to redefine an existing interface, use a new number for it.
+ **  redefine an existing interface, use a new number for it.
  **  The kernel will then return -ENOTDIR to any application using
  **  the old binary interface.
  **
diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
index 9df8833670cb..98a1d8cfb73d 100644
--- a/include/linux/sysrq.h
+++ b/include/linux/sysrq.h
@@ -37,23 +37,37 @@ struct sysrq_key_op {
 
 #ifdef CONFIG_MAGIC_SYSRQ
 
+extern int sysrq_on(void);
+
+/*
+ * Do not use this one directly:
+ */
+extern int __sysrq_enabled;
+
 /* Generic SysRq interface -- you may call it from any device driver, supplying
  * ASCII code of the key, pointer to registers and kbd/tty structs (if they
  * are available -- else NULL's).
  */
 
-void handle_sysrq(int, struct tty_struct *);
-void __handle_sysrq(int, struct tty_struct *, int check_mask);
-int register_sysrq_key(int, struct sysrq_key_op *);
-int unregister_sysrq_key(int, struct sysrq_key_op *);
+void handle_sysrq(int key, struct tty_struct *tty);
+void __handle_sysrq(int key, struct tty_struct *tty, int check_mask);
+int register_sysrq_key(int key, struct sysrq_key_op *op);
+int unregister_sysrq_key(int key, struct sysrq_key_op *op);
 struct sysrq_key_op *__sysrq_get_key_op(int key);
 
 #else
 
+static inline int sysrq_on(void)
+{
+        return 0;
+}
 static inline int __reterr(void)
 {
         return -EINVAL;
 }
+static inline void handle_sysrq(int key, struct tty_struct *tty)
+{
+}
 
 #define register_sysrq_key(ig,nore) __reterr()
 #define unregister_sysrq_key(ig,nore) __reterr()
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 10a3eec191fd..41456c148842 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -739,13 +739,13 @@ struct sockaddr_hci {
 struct hci_filter {
         unsigned long type_mask;
         unsigned long event_mask[2];
-        __u16   opcode;
+        __le16   opcode;
 };
 
 struct hci_ufilter {
         __u32   type_mask;
         __u32   event_mask[2];
-        __u16   opcode;
+        __le16   opcode;
 };
 
 #define HCI_FLT_TYPE_BITS       31
diff --git a/include/rdma/ib_marshall.h b/include/rdma/ib_marshall.h
index 66bf4d7d0dfb..db037205c9e8 100644
--- a/include/rdma/ib_marshall.h
+++ b/include/rdma/ib_marshall.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2005-2006 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
@@ -41,6 +41,9 @@
 void ib_copy_qp_attr_to_user(struct ib_uverbs_qp_attr *dst,
                              struct ib_qp_attr *src);
 
+void ib_copy_ah_attr_to_user(struct ib_uverbs_ah_attr *dst,
+                             struct ib_ah_attr *src);
+
 void ib_copy_path_rec_to_user(struct ib_user_path_rec *dst,
                               struct ib_sa_path_rec *src);
 
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 8eacc3510993..fd2353fa7e12 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -43,6 +43,8 @@
 
 #include <linux/types.h>
 #include <linux/device.h>
+#include <linux/mm.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/atomic.h>
 #include <asm/scatterlist.h>
@@ -848,6 +850,49 @@ struct ib_cache {
         u8                     *lmc_cache;
 };
 
+struct ib_dma_mapping_ops {
+        int             (*mapping_error)(struct ib_device *dev,
+                                         u64 dma_addr);
+        u64             (*map_single)(struct ib_device *dev,
+                                      void *ptr, size_t size,
+                                      enum dma_data_direction direction);
+        void            (*unmap_single)(struct ib_device *dev,
+                                        u64 addr, size_t size,
+                                        enum dma_data_direction direction);
+        u64             (*map_page)(struct ib_device *dev,
+                                    struct page *page, unsigned long offset,
+                                    size_t size,
+                                    enum dma_data_direction direction);
+        void            (*unmap_page)(struct ib_device *dev,
+                                      u64 addr, size_t size,
+                                      enum dma_data_direction direction);
+        int             (*map_sg)(struct ib_device *dev,
+                                  struct scatterlist *sg, int nents,
+                                  enum dma_data_direction direction);
+        void            (*unmap_sg)(struct ib_device *dev,
+                                    struct scatterlist *sg, int nents,
+                                    enum dma_data_direction direction);
+        u64             (*dma_address)(struct ib_device *dev,
+                                       struct scatterlist *sg);
+        unsigned int    (*dma_len)(struct ib_device *dev,
+                                   struct scatterlist *sg);
+        void            (*sync_single_for_cpu)(struct ib_device *dev,
+                                               u64 dma_handle,
+                                               size_t size,
+                                               enum dma_data_direction dir);
+        void            (*sync_single_for_device)(struct ib_device *dev,
+                                                  u64 dma_handle,
+                                                  size_t size,
+                                                  enum dma_data_direction dir);
+        void            *(*alloc_coherent)(struct ib_device *dev,
+                                           size_t size,
+                                           u64 *dma_handle,
+                                           gfp_t flag);
+        void            (*free_coherent)(struct ib_device *dev,
+                                         size_t size, void *cpu_addr,
+                                         u64 dma_handle);
+};
+
 struct iw_cm_verbs;
 
 struct ib_device {
@@ -992,6 +1037,8 @@ struct ib_device {
                                                   struct ib_mad *in_mad,
                                                   struct ib_mad *out_mad);
 
+        struct ib_dma_mapping_ops   *dma_ops;
+
         struct module               *owner;
         struct class_device          class_dev;
         struct kobject               ports_parent;
@@ -1395,10 +1442,216 @@ static inline int ib_req_ncomp_notif(struct ib_cq *cq, int wc_cnt)
  *   usable for DMA.
  * @pd: The protection domain associated with the memory region.
  * @mr_access_flags: Specifies the memory access rights.
+ *
+ * Note that the ib_dma_*() functions defined below must be used
+ * to create/destroy addresses used with the Lkey or Rkey returned
+ * by ib_get_dma_mr().
  */
 struct ib_mr *ib_get_dma_mr(struct ib_pd *pd, int mr_access_flags);
 
 /**
+ * ib_dma_mapping_error - check a DMA addr for error
+ * @dev: The device for which the dma_addr was created
+ * @dma_addr: The DMA address to check
+ */
+static inline int ib_dma_mapping_error(struct ib_device *dev, u64 dma_addr)
+{
+        return dev->dma_ops ?
+                dev->dma_ops->mapping_error(dev, dma_addr) :
+                dma_mapping_error(dma_addr);
+}
+
+/**
+ * ib_dma_map_single - Map a kernel virtual address to DMA address
+ * @dev: The device for which the dma_addr is to be created
+ * @cpu_addr: The kernel virtual address
+ * @size: The size of the region in bytes
+ * @direction: The direction of the DMA
+ */
+static inline u64 ib_dma_map_single(struct ib_device *dev,
+                                    void *cpu_addr, size_t size,
+                                    enum dma_data_direction direction)
+{
+        return dev->dma_ops ?
+                dev->dma_ops->map_single(dev, cpu_addr, size, direction) :
+                dma_map_single(dev->dma_device, cpu_addr, size, direction);
+}
+
+/**
+ * ib_dma_unmap_single - Destroy a mapping created by ib_dma_map_single()
+ * @dev: The device for which the DMA address was created
+ * @addr: The DMA address
+ * @size: The size of the region in bytes
+ * @direction: The direction of the DMA
+ */
+static inline void ib_dma_unmap_single(struct ib_device *dev,
+                                       u64 addr, size_t size,
+                                       enum dma_data_direction direction)
+{
+        dev->dma_ops ?
+                dev->dma_ops->unmap_single(dev, addr, size, direction) :
+                dma_unmap_single(dev->dma_device, addr, size, direction);
+}
+
+/**
+ * ib_dma_map_page - Map a physical page to DMA address
+ * @dev: The device for which the dma_addr is to be created
+ * @page: The page to be mapped
+ * @offset: The offset within the page
+ * @size: The size of the region in bytes
+ * @direction: The direction of the DMA
+ */
+static inline u64 ib_dma_map_page(struct ib_device *dev,
+                                  struct page *page,
+                                  unsigned long offset,
+                                  size_t size,
+                                         enum dma_data_direction direction)
+{
+        return dev->dma_ops ?
+                dev->dma_ops->map_page(dev, page, offset, size, direction) :
+                dma_map_page(dev->dma_device, page, offset, size, direction);
+}
+
+/**
+ * ib_dma_unmap_page - Destroy a mapping created by ib_dma_map_page()
+ * @dev: The device for which the DMA address was created
+ * @addr: The DMA address
+ * @size: The size of the region in bytes
+ * @direction: The direction of the DMA
+ */
+static inline void ib_dma_unmap_page(struct ib_device *dev,
+                                     u64 addr, size_t size,
+                                     enum dma_data_direction direction)
+{
+        dev->dma_ops ?
+                dev->dma_ops->unmap_page(dev, addr, size, direction) :
+                dma_unmap_page(dev->dma_device, addr, size, direction);
+}
+
+/**
+ * ib_dma_map_sg - Map a scatter/gather list to DMA addresses
+ * @dev: The device for which the DMA addresses are to be created
+ * @sg: The array of scatter/gather entries
+ * @nents: The number of scatter/gather entries
+ * @direction: The direction of the DMA
+ */
+static inline int ib_dma_map_sg(struct ib_device *dev,
+                                struct scatterlist *sg, int nents,
+                                enum dma_data_direction direction)
+{
+        return dev->dma_ops ?
+                dev->dma_ops->map_sg(dev, sg, nents, direction) :
+                dma_map_sg(dev->dma_device, sg, nents, direction);
+}
+
+/**
+ * ib_dma_unmap_sg - Unmap a scatter/gather list of DMA addresses
+ * @dev: The device for which the DMA addresses were created
+ * @sg: The array of scatter/gather entries
+ * @nents: The number of scatter/gather entries
+ * @direction: The direction of the DMA
+ */
+static inline void ib_dma_unmap_sg(struct ib_device *dev,
+                                   struct scatterlist *sg, int nents,
+                                   enum dma_data_direction direction)
+{
+        dev->dma_ops ?
+                dev->dma_ops->unmap_sg(dev, sg, nents, direction) :
+                dma_unmap_sg(dev->dma_device, sg, nents, direction);
+}
+
+/**
+ * ib_sg_dma_address - Return the DMA address from a scatter/gather entry
+ * @dev: The device for which the DMA addresses were created
+ * @sg: The scatter/gather entry
+ */
+static inline u64 ib_sg_dma_address(struct ib_device *dev,
+                                    struct scatterlist *sg)
+{
+        return dev->dma_ops ?
+                dev->dma_ops->dma_address(dev, sg) : sg_dma_address(sg);
+}
+
+/**
+ * ib_sg_dma_len - Return the DMA length from a scatter/gather entry
+ * @dev: The device for which the DMA addresses were created
+ * @sg: The scatter/gather entry
+ */
+static inline unsigned int ib_sg_dma_len(struct ib_device *dev,
+                                         struct scatterlist *sg)
+{
+        return dev->dma_ops ?
+                dev->dma_ops->dma_len(dev, sg) : sg_dma_len(sg);
+}
+
+/**
+ * ib_dma_sync_single_for_cpu - Prepare DMA region to be accessed by CPU
+ * @dev: The device for which the DMA address was created
+ * @addr: The DMA address
+ * @size: The size of the region in bytes
+ * @dir: The direction of the DMA
+ */
+static inline void ib_dma_sync_single_for_cpu(struct ib_device *dev,
+                                              u64 addr,
+                                              size_t size,
+                                              enum dma_data_direction dir)
+{
+        dev->dma_ops ?
+                dev->dma_ops->sync_single_for_cpu(dev, addr, size, dir) :
+                dma_sync_single_for_cpu(dev->dma_device, addr, size, dir);
+}
+
+/**
+ * ib_dma_sync_single_for_device - Prepare DMA region to be accessed by device
+ * @dev: The device for which the DMA address was created
+ * @addr: The DMA address
+ * @size: The size of the region in bytes
+ * @dir: The direction of the DMA
+ */
+static inline void ib_dma_sync_single_for_device(struct ib_device *dev,
+                                                 u64 addr,
+                                                 size_t size,
+                                                 enum dma_data_direction dir)
+{
+        dev->dma_ops ?
+                dev->dma_ops->sync_single_for_device(dev, addr, size, dir) :
+                dma_sync_single_for_device(dev->dma_device, addr, size, dir);
+}
+
+/**
+ * ib_dma_alloc_coherent - Allocate memory and map it for DMA
+ * @dev: The device for which the DMA address is requested
+ * @size: The size of the region to allocate in bytes
+ * @dma_handle: A pointer for returning the DMA address of the region
+ * @flag: memory allocator flags
+ */
+static inline void *ib_dma_alloc_coherent(struct ib_device *dev,
+                                           size_t size,
+                                           u64 *dma_handle,
+                                           gfp_t flag)
+{
+        return dev->dma_ops ?
+                dev->dma_ops->alloc_coherent(dev, size, dma_handle, flag) :
+                dma_alloc_coherent(dev->dma_device, size, dma_handle, flag);
+}
+
+/**
+ * ib_dma_free_coherent - Free memory allocated by ib_dma_alloc_coherent()
+ * @dev: The device for which the DMA addresses were allocated
+ * @size: The size of the region
+ * @cpu_addr: the address returned by ib_dma_alloc_coherent()
+ * @dma_handle: the DMA address returned by ib_dma_alloc_coherent()
+ */
+static inline void ib_dma_free_coherent(struct ib_device *dev,
+                                        size_t size, void *cpu_addr,
+                                        u64 dma_handle)
+{
+        dev->dma_ops ?
+                dev->dma_ops->free_coherent(dev, size, cpu_addr, dma_handle) :
+                dma_free_coherent(dev->dma_device, size, cpu_addr, dma_handle);
+}
+
+/**
  * ib_reg_phys_mr - Prepares a virtually addressed memory region for use
  *   by an HCA.
  * @pd: The protection domain associated assigned to the registered region.
diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h
index deb5a0a4cee5..36cd8a8526a0 100644
--- a/include/rdma/rdma_cm.h
+++ b/include/rdma/rdma_cm.h
@@ -77,11 +77,34 @@ struct rdma_route {
         int num_paths;
 };
 
+struct rdma_conn_param {
+        const void *private_data;
+        u8 private_data_len;
+        u8 responder_resources;
+        u8 initiator_depth;
+        u8 flow_control;
+        u8 retry_count;         /* ignored when accepting */
+        u8 rnr_retry_count;
+        /* Fields below ignored if a QP is created on the rdma_cm_id. */
+        u8 srq;
+        u32 qp_num;
+};
+
+struct rdma_ud_param {
+        const void *private_data;
+        u8 private_data_len;
+        struct ib_ah_attr ah_attr;
+        u32 qp_num;
+        u32 qkey;
+};
+
 struct rdma_cm_event {
         enum rdma_cm_event_type  event;
         int                      status;
-        void                    *private_data;
-        u8                       private_data_len;
+        union {
+                struct rdma_conn_param  conn;
+                struct rdma_ud_param    ud;
+        } param;
 };
 
 struct rdma_cm_id;
@@ -204,25 +227,17 @@ void rdma_destroy_qp(struct rdma_cm_id *id);
 int rdma_init_qp_attr(struct rdma_cm_id *id, struct ib_qp_attr *qp_attr,
                        int *qp_attr_mask);
 
-struct rdma_conn_param {
-        const void *private_data;
-        u8 private_data_len;
-        u8 responder_resources;
-        u8 initiator_depth;
-        u8 flow_control;
-        u8 retry_count;         /* ignored when accepting */
-        u8 rnr_retry_count;
-        /* Fields below ignored if a QP is created on the rdma_cm_id. */
-        u8 srq;
-        u32 qp_num;
-        enum ib_qp_type qp_type;
-};
-
 /**
  * rdma_connect - Initiate an active connection request.
+ * @id: Connection identifier to connect.
+ * @conn_param: Connection information used for connected QPs.
  *
  * Users must have resolved a route for the rdma_cm_id to connect with
  * by having called rdma_resolve_route before calling this routine.
+ *
+ * This call will either connect to a remote QP or obtain remote QP
+ * information for unconnected rdma_cm_id's.  The actual operation is
+ * based on the rdma_cm_id's port space.
  */
 int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param);
 
@@ -253,6 +268,21 @@ int rdma_listen(struct rdma_cm_id *id, int backlog);
 int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param);
 
 /**
+ * rdma_notify - Notifies the RDMA CM of an asynchronous event that has
+ * occurred on the connection.
+ * @id: Connection identifier to transition to established.
+ * @event: Asynchronous event.
+ *
+ * This routine should be invoked by users to notify the CM of relevant
+ * communication events.  Events that should be reported to the CM and
+ * when to report them are:
+ *
+ * IB_EVENT_COMM_EST - Used when a message is received on a connected
+ *    QP before an RTU has been received.
+ */
+int rdma_notify(struct rdma_cm_id *id, enum ib_event_type event);
+
+/**
  * rdma_reject - Called to reject a connection request or response.
  */
 int rdma_reject(struct rdma_cm_id *id, const void *private_data,
diff --git a/include/rdma/rdma_cm_ib.h b/include/rdma/rdma_cm_ib.h
index e8c3af1804d4..9b176df1d667 100644
--- a/include/rdma/rdma_cm_ib.h
+++ b/include/rdma/rdma_cm_ib.h
@@ -44,4 +44,7 @@
 int rdma_set_ib_paths(struct rdma_cm_id *id,
                       struct ib_sa_path_rec *path_rec, int num_paths);
 
+/* Global qkey for UD QPs and multicast groups. */
+#define RDMA_UD_QKEY 0x01234567
+
 #endif /* RDMA_CM_IB_H */
diff --git a/include/rdma/rdma_user_cm.h b/include/rdma/rdma_user_cm.h
new file mode 100644
index 000000000000..9572ab8eeac1
--- /dev/null
+++ b/include/rdma/rdma_user_cm.h
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2005-2006 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
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef RDMA_USER_CM_H
+#define RDMA_USER_CM_H
+
+#include <linux/types.h>
+#include <linux/in6.h>
+#include <rdma/ib_user_verbs.h>
+#include <rdma/ib_user_sa.h>
+
+#define RDMA_USER_CM_ABI_VERSION        3
+
+#define RDMA_MAX_PRIVATE_DATA           256
+
+enum {
+        RDMA_USER_CM_CMD_CREATE_ID,
+        RDMA_USER_CM_CMD_DESTROY_ID,
+        RDMA_USER_CM_CMD_BIND_ADDR,
+        RDMA_USER_CM_CMD_RESOLVE_ADDR,
+        RDMA_USER_CM_CMD_RESOLVE_ROUTE,
+        RDMA_USER_CM_CMD_QUERY_ROUTE,
+        RDMA_USER_CM_CMD_CONNECT,
+        RDMA_USER_CM_CMD_LISTEN,
+        RDMA_USER_CM_CMD_ACCEPT,
+        RDMA_USER_CM_CMD_REJECT,
+        RDMA_USER_CM_CMD_DISCONNECT,
+        RDMA_USER_CM_CMD_INIT_QP_ATTR,
+        RDMA_USER_CM_CMD_GET_EVENT,
+        RDMA_USER_CM_CMD_GET_OPTION,
+        RDMA_USER_CM_CMD_SET_OPTION,
+        RDMA_USER_CM_CMD_NOTIFY
+};
+
+/*
+ * command ABI structures.
+ */
+struct rdma_ucm_cmd_hdr {
+        __u32 cmd;
+        __u16 in;
+        __u16 out;
+};
+
+struct rdma_ucm_create_id {
+        __u64 uid;
+        __u64 response;
+        __u16 ps;
+        __u8  reserved[6];
+};
+
+struct rdma_ucm_create_id_resp {
+        __u32 id;
+};
+
+struct rdma_ucm_destroy_id {
+        __u64 response;
+        __u32 id;
+        __u32 reserved;
+};
+
+struct rdma_ucm_destroy_id_resp {
+        __u32 events_reported;
+};
+
+struct rdma_ucm_bind_addr {
+        __u64 response;
+        struct sockaddr_in6 addr;
+        __u32 id;
+};
+
+struct rdma_ucm_resolve_addr {
+        struct sockaddr_in6 src_addr;
+        struct sockaddr_in6 dst_addr;
+        __u32 id;
+        __u32 timeout_ms;
+};
+
+struct rdma_ucm_resolve_route {
+        __u32 id;
+        __u32 timeout_ms;
+};
+
+struct rdma_ucm_query_route {
+        __u64 response;
+        __u32 id;
+        __u32 reserved;
+};
+
+struct rdma_ucm_query_route_resp {
+        __u64 node_guid;
+        struct ib_user_path_rec ib_route[2];
+        struct sockaddr_in6 src_addr;
+        struct sockaddr_in6 dst_addr;
+        __u32 num_paths;
+        __u8 port_num;
+        __u8 reserved[3];
+};
+
+struct rdma_ucm_conn_param {
+        __u32 qp_num;
+        __u32 reserved;
+        __u8  private_data[RDMA_MAX_PRIVATE_DATA];
+        __u8  private_data_len;
+        __u8  srq;
+        __u8  responder_resources;
+        __u8  initiator_depth;
+        __u8  flow_control;
+        __u8  retry_count;
+        __u8  rnr_retry_count;
+        __u8  valid;
+};
+
+struct rdma_ucm_ud_param {
+        __u32 qp_num;
+        __u32 qkey;
+        struct ib_uverbs_ah_attr ah_attr;
+        __u8  private_data[RDMA_MAX_PRIVATE_DATA];
+        __u8  private_data_len;
+        __u8  reserved[7];
+};
+
+struct rdma_ucm_connect {
+        struct rdma_ucm_conn_param conn_param;
+        __u32 id;
+        __u32 reserved;
+};
+
+struct rdma_ucm_listen {
+        __u32 id;
+        __u32 backlog;
+};
+
+struct rdma_ucm_accept {
+        __u64 uid;
+        struct rdma_ucm_conn_param conn_param;
+        __u32 id;
+        __u32 reserved;
+};
+
+struct rdma_ucm_reject {
+        __u32 id;
+        __u8  private_data_len;
+        __u8  reserved[3];
+        __u8  private_data[RDMA_MAX_PRIVATE_DATA];
+};
+
+struct rdma_ucm_disconnect {
+        __u32 id;
+};
+
+struct rdma_ucm_init_qp_attr {
+        __u64 response;
+        __u32 id;
+        __u32 qp_state;
+};
+
+struct rdma_ucm_notify {
+        __u32 id;
+        __u32 event;
+};
+
+struct rdma_ucm_get_event {
+        __u64 response;
+};
+
+struct rdma_ucm_event_resp {
+        __u64 uid;
+        __u32 id;
+        __u32 event;
+        __u32 status;
+        union {
+                struct rdma_ucm_conn_param conn;
+                struct rdma_ucm_ud_param   ud;
+        } param;
+};
+
+#endif /* RDMA_USER_CM_H */
diff --git a/include/video/sstfb.h b/include/video/sstfb.h
index 5dbf5e7e50a8..baa163f770ab 100644
--- a/include/video/sstfb.h
+++ b/include/video/sstfb.h
@@ -119,7 +119,7 @@
 #define BACKPORCH               0x0208
 #define VIDEODIMENSIONS         0x020c
 #define FBIINIT0                0x0210          /* misc+fifo  controls */
-#  define EN_VGA_PASSTHROUGH      BIT(0)
+#  define DIS_VGA_PASSTHROUGH     BIT(0)
 #  define FBI_RESET               BIT(1)
 #  define FIFO_RESET              BIT(2)
 #define FBIINIT1                0x0214          /* PCI + video controls */
@@ -251,7 +251,7 @@
 #  define DACREG_ICS_CLK1_A       0     /* bit4 */
 
 /* sst default init registers */
-#define FBIINIT0_DEFAULT EN_VGA_PASSTHROUGH
+#define FBIINIT0_DEFAULT DIS_VGA_PASSTHROUGH
 
 #define FBIINIT1_DEFAULT        \
         (                       \
@@ -296,6 +296,11 @@
  *
  */
 
+/* ioctl to enable/disable VGA passthrough */
+#define SSTFB_SET_VGAPASS       _IOW('F', 0xdd, __u32)
+#define SSTFB_GET_VGAPASS       _IOR('F', 0xdd, __u32)
+
+
 /* used to know witch clock to set */
 enum {
         VID_CLOCK=0,
@@ -317,7 +322,7 @@ struct pll_timing {
 };
 
 struct dac_switch {
-        char * name;
+        const char *name;
         int (*detect) (struct fb_info *info);
         int (*set_pll) (struct fb_info *info, const struct pll_timing *t, const int clock);
         void (*set_vidmod) (struct fb_info *info, const int bpp);
@@ -345,7 +350,7 @@ struct sstfb_par {
         struct pci_dev          *dev;
         int     type;
         u8      revision;
-        int     gfx_clock;      /* status */
+        u8      vgapass;        /* VGA pass through: 1=enabled, 0=disabled */
 };
 
 #endif /* _SSTFB_H_ */
diff --git a/init/Kconfig b/init/Kconfig
index 9edf103b3ec3..f000edb3bb7a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -348,7 +348,7 @@ config SYSCTL_SYSCALL
           If unsure say Y here.
 
 config KALLSYMS
-         bool "Load all symbols for debugging/kksymoops" if EMBEDDED
+         bool "Load all symbols for debugging/ksymoops" if EMBEDDED
          default y
          help
            Say Y here to let the kernel print out symbolic crash information and
diff --git a/ipc/msgutil.c b/ipc/msgutil.c
index 0992616eeed6..c82c215693d7 100644
--- a/ipc/msgutil.c
+++ b/ipc/msgutil.c
@@ -36,7 +36,7 @@ struct msg_msg *load_msg(const void __user *src, int len)
         if (alen > DATALEN_MSG)
                 alen = DATALEN_MSG;
 
-        msg = (struct msg_msg *)kmalloc(sizeof(*msg) + alen, GFP_KERNEL);
+        msg = kmalloc(sizeof(*msg) + alen, GFP_KERNEL);
         if (msg == NULL)
                 return ERR_PTR(-ENOMEM);
 
@@ -56,7 +56,7 @@ struct msg_msg *load_msg(const void __user *src, int len)
                 alen = len;
                 if (alen > DATALEN_SEG)
                         alen = DATALEN_SEG;
-                seg = (struct msg_msgseg *)kmalloc(sizeof(*seg) + alen,
+                seg = kmalloc(sizeof(*seg) + alen,
                                                  GFP_KERNEL);
                 if (seg == NULL) {
                         err = -ENOMEM;
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 2c3b4431472b..232aed2b10f9 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -2342,32 +2342,48 @@ static const struct cpuset *nearest_exclusive_ancestor(const struct cpuset *cs)
 }
 
 /**
- * cpuset_zone_allowed - Can we allocate memory on zone z's memory node?
+ * cpuset_zone_allowed_softwall - Can we allocate on zone z's memory node?
  * @z: is this zone on an allowed node?
- * @gfp_mask: memory allocation flags (we use __GFP_HARDWALL)
+ * @gfp_mask: memory allocation flags
  *
- * If we're in interrupt, yes, we can always allocate.  If zone
+ * If we're in interrupt, yes, we can always allocate.  If
+ * __GFP_THISNODE is set, yes, we can always allocate.  If zone
  * z's node is in our tasks mems_allowed, yes.  If it's not a
  * __GFP_HARDWALL request and this zone's nodes is in the nearest
  * mem_exclusive cpuset ancestor to this tasks cpuset, yes.
  * Otherwise, no.
  *
+ * If __GFP_HARDWALL is set, cpuset_zone_allowed_softwall()
+ * reduces to cpuset_zone_allowed_hardwall().  Otherwise,
+ * cpuset_zone_allowed_softwall() might sleep, and might allow a zone
+ * from an enclosing cpuset.
+ *
+ * cpuset_zone_allowed_hardwall() only handles the simpler case of
+ * hardwall cpusets, and never sleeps.
+ *
+ * The __GFP_THISNODE placement logic is really handled elsewhere,
+ * by forcibly using a zonelist starting at a specified node, and by
+ * (in get_page_from_freelist()) refusing to consider the zones for
+ * any node on the zonelist except the first.  By the time any such
+ * calls get to this routine, we should just shut up and say 'yes'.
+ *
  * GFP_USER allocations are marked with the __GFP_HARDWALL bit,
  * and do not allow allocations outside the current tasks cpuset.
  * GFP_KERNEL allocations are not so marked, so can escape to the
- * nearest mem_exclusive ancestor cpuset.
+ * nearest enclosing mem_exclusive ancestor cpuset.
  *
- * Scanning up parent cpusets requires callback_mutex.  The __alloc_pages()
- * routine only calls here with __GFP_HARDWALL bit _not_ set if
- * it's a GFP_KERNEL allocation, and all nodes in the current tasks
- * mems_allowed came up empty on the first pass over the zonelist.
- * So only GFP_KERNEL allocations, if all nodes in the cpuset are
- * short of memory, might require taking the callback_mutex mutex.
+ * Scanning up parent cpusets requires callback_mutex.  The
+ * __alloc_pages() routine only calls here with __GFP_HARDWALL bit
+ * _not_ set if it's a GFP_KERNEL allocation, and all nodes in the
+ * current tasks mems_allowed came up empty on the first pass over
+ * the zonelist.  So only GFP_KERNEL allocations, if all nodes in the
+ * cpuset are short of memory, might require taking the callback_mutex
+ * mutex.
  *
  * The first call here from mm/page_alloc:get_page_from_freelist()
- * has __GFP_HARDWALL set in gfp_mask, enforcing hardwall cpusets, so
- * no allocation on a node outside the cpuset is allowed (unless in
- * interrupt, of course).
+ * has __GFP_HARDWALL set in gfp_mask, enforcing hardwall cpusets,
+ * so no allocation on a node outside the cpuset is allowed (unless
+ * in interrupt, of course).
  *
  * The second pass through get_page_from_freelist() doesn't even call
  * here for GFP_ATOMIC calls.  For those calls, the __alloc_pages()
@@ -2380,12 +2396,12 @@ static const struct cpuset *nearest_exclusive_ancestor(const struct cpuset *cs)
  *      GFP_USER     - only nodes in current tasks mems allowed ok.
  *
  * Rule:
- *    Don't call cpuset_zone_allowed() if you can't sleep, unless you
+ *    Don't call cpuset_zone_allowed_softwall if you can't sleep, unless you
  *    pass in the __GFP_HARDWALL flag set in gfp_flag, which disables
  *    the code that might scan up ancestor cpusets and sleep.
- **/
+ */
 
-int __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
+int __cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask)
 {
         int node;                       /* node that zone z is on */
         const struct cpuset *cs;        /* current cpuset ancestors */
@@ -2415,6 +2431,40 @@ int __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
         return allowed;
 }
 
+/*
+ * cpuset_zone_allowed_hardwall - Can we allocate on zone z's memory node?
+ * @z: is this zone on an allowed node?
+ * @gfp_mask: memory allocation flags
+ *
+ * If we're in interrupt, yes, we can always allocate.
+ * If __GFP_THISNODE is set, yes, we can always allocate.  If zone
+ * z's node is in our tasks mems_allowed, yes.   Otherwise, no.
+ *
+ * The __GFP_THISNODE placement logic is really handled elsewhere,
+ * by forcibly using a zonelist starting at a specified node, and by
+ * (in get_page_from_freelist()) refusing to consider the zones for
+ * any node on the zonelist except the first.  By the time any such
+ * calls get to this routine, we should just shut up and say 'yes'.
+ *
+ * Unlike the cpuset_zone_allowed_softwall() variant, above,
+ * this variant requires that the zone be in the current tasks
+ * mems_allowed or that we're in interrupt.  It does not scan up the
+ * cpuset hierarchy for the nearest enclosing mem_exclusive cpuset.
+ * It never sleeps.
+ */
+
+int __cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask)
+{
+        int node;                       /* node that zone z is on */
+
+        if (in_interrupt() || (gfp_mask & __GFP_THISNODE))
+                return 1;
+        node = zone_to_nid(z);
+        if (node_isset(node, current->mems_allowed))
+                return 1;
+        return 0;
+}
+
 /**
  * cpuset_lock - lock out any changes to cpuset structures
  *
diff --git a/kernel/fork.c b/kernel/fork.c
index d16c566eb645..fc723e595cd5 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -203,7 +203,7 @@ static inline int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
         struct mempolicy *pol;
 
         down_write(&oldmm->mmap_sem);
-        flush_cache_mm(oldmm);
+        flush_cache_dup_mm(oldmm);
         /*
          * Not linked in yet - no deadlock potential:
          */
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index b02032476dc2..01e750559034 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -43,13 +43,49 @@
 #include "lockdep_internals.h"
 
 /*
- * hash_lock: protects the lockdep hashes and class/list/hash allocators.
+ * lockdep_lock: protects the lockdep graph, the hashes and the
+ *               class/list/hash allocators.
  *
  * This is one of the rare exceptions where it's justified
  * to use a raw spinlock - we really dont want the spinlock
- * code to recurse back into the lockdep code.
+ * code to recurse back into the lockdep code...
  */
-static raw_spinlock_t hash_lock = (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
+static raw_spinlock_t lockdep_lock = (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
+
+static int graph_lock(void)
+{
+        __raw_spin_lock(&lockdep_lock);
+        /*
+         * Make sure that if another CPU detected a bug while
+         * walking the graph we dont change it (while the other
+         * CPU is busy printing out stuff with the graph lock
+         * dropped already)
+         */
+        if (!debug_locks) {
+                __raw_spin_unlock(&lockdep_lock);
+                return 0;
+        }
+        return 1;
+}
+
+static inline int graph_unlock(void)
+{
+        __raw_spin_unlock(&lockdep_lock);
+        return 0;
+}
+
+/*
+ * Turn lock debugging off and return with 0 if it was off already,
+ * and also release the graph lock:
+ */
+static inline int debug_locks_off_graph_unlock(void)
+{
+        int ret = debug_locks_off();
+
+        __raw_spin_unlock(&lockdep_lock);
+
+        return ret;
+}
 
 static int lockdep_initialized;
 
@@ -57,14 +93,15 @@ unsigned long nr_list_entries;
 static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];
 
 /*
- * Allocate a lockdep entry. (assumes hash_lock held, returns
+ * Allocate a lockdep entry. (assumes the graph_lock held, returns
  * with NULL on failure)
  */
 static struct lock_list *alloc_list_entry(void)
 {
         if (nr_list_entries >= MAX_LOCKDEP_ENTRIES) {
-                __raw_spin_unlock(&hash_lock);
-                debug_locks_off();
+                if (!debug_locks_off_graph_unlock())
+                        return NULL;
+
                 printk("BUG: MAX_LOCKDEP_ENTRIES too low!\n");
                 printk("turning off the locking correctness validator.\n");
                 return NULL;
@@ -145,9 +182,7 @@ EXPORT_SYMBOL(lockdep_on);
  */
 
 #define VERBOSE                 0
-#ifdef VERBOSE
-# define VERY_VERBOSE           0
-#endif
+#define VERY_VERBOSE            0
 
 #if VERBOSE
 # define HARDIRQ_VERBOSE        1
@@ -172,8 +207,8 @@ static int class_filter(struct lock_class *class)
                         !strcmp(class->name, "&struct->lockfield"))
                 return 1;
 #endif
-        /* Allow everything else. 0 would be filter everything else */
-        return 1;
+        /* Filter everything else. 1 would be to allow everything else */
+        return 0;
 }
 #endif
 
@@ -207,7 +242,7 @@ static int softirq_verbose(struct lock_class *class)
 
 /*
  * Stack-trace: tightly packed array of stack backtrace
- * addresses. Protected by the hash_lock.
+ * addresses. Protected by the graph_lock.
  */
 unsigned long nr_stack_trace_entries;
 static unsigned long stack_trace[MAX_STACK_TRACE_ENTRIES];
@@ -226,18 +261,15 @@ static int save_trace(struct stack_trace *trace)
         trace->max_entries = trace->nr_entries;
 
         nr_stack_trace_entries += trace->nr_entries;
-        if (DEBUG_LOCKS_WARN_ON(nr_stack_trace_entries > MAX_STACK_TRACE_ENTRIES)) {
-                __raw_spin_unlock(&hash_lock);
-                return 0;
-        }
 
         if (nr_stack_trace_entries == MAX_STACK_TRACE_ENTRIES) {
-                __raw_spin_unlock(&hash_lock);
-                if (debug_locks_off()) {
-                        printk("BUG: MAX_STACK_TRACE_ENTRIES too low!\n");
-                        printk("turning off the locking correctness validator.\n");
-                        dump_stack();
-                }
+                if (!debug_locks_off_graph_unlock())
+                        return 0;
+
+                printk("BUG: MAX_STACK_TRACE_ENTRIES too low!\n");
+                printk("turning off the locking correctness validator.\n");
+                dump_stack();
+
                 return 0;
         }
 
@@ -526,9 +558,7 @@ print_circular_bug_header(struct lock_list *entry, unsigned int depth)
 {
         struct task_struct *curr = current;
 
-        __raw_spin_unlock(&hash_lock);
-        debug_locks_off();
-        if (debug_locks_silent)
+        if (!debug_locks_off_graph_unlock() || debug_locks_silent)
                 return 0;
 
         printk("\n=======================================================\n");
@@ -556,12 +586,10 @@ static noinline int print_circular_bug_tail(void)
         if (debug_locks_silent)
                 return 0;
 
-        /* hash_lock unlocked by the header */
-        __raw_spin_lock(&hash_lock);
         this.class = check_source->class;
         if (!save_trace(&this.trace))
                 return 0;
-        __raw_spin_unlock(&hash_lock);
+
         print_circular_bug_entry(&this, 0);
 
         printk("\nother info that might help us debug this:\n\n");
@@ -577,8 +605,10 @@ static noinline int print_circular_bug_tail(void)
 
 static int noinline print_infinite_recursion_bug(void)
 {
-        __raw_spin_unlock(&hash_lock);
-        DEBUG_LOCKS_WARN_ON(1);
+        if (!debug_locks_off_graph_unlock())
+                return 0;
+
+        WARN_ON(1);
 
         return 0;
 }
@@ -713,9 +743,7 @@ print_bad_irq_dependency(struct task_struct *curr,
                          enum lock_usage_bit bit2,
                          const char *irqclass)
 {
-        __raw_spin_unlock(&hash_lock);
-        debug_locks_off();
-        if (debug_locks_silent)
+        if (!debug_locks_off_graph_unlock() || debug_locks_silent)
                 return 0;
 
         printk("\n======================================================\n");
@@ -796,9 +824,7 @@ static int
 print_deadlock_bug(struct task_struct *curr, struct held_lock *prev,
                    struct held_lock *next)
 {
-        debug_locks_off();
-        __raw_spin_unlock(&hash_lock);
-        if (debug_locks_silent)
+        if (!debug_locks_off_graph_unlock() || debug_locks_silent)
                 return 0;
 
         printk("\n=============================================\n");
@@ -974,14 +1000,14 @@ check_prev_add(struct task_struct *curr, struct held_lock *prev,
          * Debugging printouts:
          */
         if (verbose(prev->class) || verbose(next->class)) {
-                __raw_spin_unlock(&hash_lock);
+                graph_unlock();
                 printk("\n new dependency: ");
                 print_lock_name(prev->class);
                 printk(" => ");
                 print_lock_name(next->class);
                 printk("\n");
                 dump_stack();
-                __raw_spin_lock(&hash_lock);
+                return graph_lock();
         }
         return 1;
 }
@@ -1046,8 +1072,10 @@ check_prevs_add(struct task_struct *curr, struct held_lock *next)
         }
         return 1;
 out_bug:
-        __raw_spin_unlock(&hash_lock);
-        DEBUG_LOCKS_WARN_ON(1);
+        if (!debug_locks_off_graph_unlock())
+                return 0;
+
+        WARN_ON(1);
 
         return 0;
 }
@@ -1201,7 +1229,10 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
         hash_head = classhashentry(key);
 
         raw_local_irq_save(flags);
-        __raw_spin_lock(&hash_lock);
+        if (!graph_lock()) {
+                raw_local_irq_restore(flags);
+                return NULL;
+        }
         /*
          * We have to do the hash-walk again, to avoid races
          * with another CPU:
@@ -1214,9 +1245,12 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
          * the hash:
          */
         if (nr_lock_classes >= MAX_LOCKDEP_KEYS) {
-                __raw_spin_unlock(&hash_lock);
+                if (!debug_locks_off_graph_unlock()) {
+                        raw_local_irq_restore(flags);
+                        return NULL;
+                }
                 raw_local_irq_restore(flags);
-                debug_locks_off();
+
                 printk("BUG: MAX_LOCKDEP_KEYS too low!\n");
                 printk("turning off the locking correctness validator.\n");
                 return NULL;
@@ -1237,18 +1271,23 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
         list_add_tail_rcu(&class->hash_entry, hash_head);
 
         if (verbose(class)) {
-                __raw_spin_unlock(&hash_lock);
+                graph_unlock();
                 raw_local_irq_restore(flags);
+
                 printk("\nnew class %p: %s", class->key, class->name);
                 if (class->name_version > 1)
                         printk("#%d", class->name_version);
                 printk("\n");
                 dump_stack();
+
                 raw_local_irq_save(flags);
-                __raw_spin_lock(&hash_lock);
+                if (!graph_lock()) {
+                        raw_local_irq_restore(flags);
+                        return NULL;
+                }
         }
 out_unlock_set:
-        __raw_spin_unlock(&hash_lock);
+        graph_unlock();
         raw_local_irq_restore(flags);
 
         if (!subclass || force)
@@ -1264,7 +1303,7 @@ out_unlock_set:
  * add it and return 0 - in this case the new dependency chain is
  * validated. If the key is already hashed, return 1.
  */
-static inline int lookup_chain_cache(u64 chain_key)
+static inline int lookup_chain_cache(u64 chain_key, struct lock_class *class)
 {
         struct list_head *hash_head = chainhashentry(chain_key);
         struct lock_chain *chain;
@@ -1278,34 +1317,32 @@ static inline int lookup_chain_cache(u64 chain_key)
                 if (chain->chain_key == chain_key) {
 cache_hit:
                         debug_atomic_inc(&chain_lookup_hits);
-                        /*
-                         * In the debugging case, force redundant checking
-                         * by returning 1:
-                         */
-#ifdef CONFIG_DEBUG_LOCKDEP
-                        __raw_spin_lock(&hash_lock);
-                        return 1;
-#endif
+                        if (very_verbose(class))
+                                printk("\nhash chain already cached, key: %016Lx tail class: [%p] %s\n", chain_key, class->key, class->name);
                         return 0;
                 }
         }
+        if (very_verbose(class))
+                printk("\nnew hash chain, key: %016Lx tail class: [%p] %s\n", chain_key, class->key, class->name);
         /*
          * Allocate a new chain entry from the static array, and add
          * it to the hash:
          */
-        __raw_spin_lock(&hash_lock);
+        if (!graph_lock())
+                return 0;
         /*
          * We have to walk the chain again locked - to avoid duplicates:
          */
         list_for_each_entry(chain, hash_head, entry) {
                 if (chain->chain_key == chain_key) {
-                        __raw_spin_unlock(&hash_lock);
+                        graph_unlock();
                         goto cache_hit;
                 }
         }
         if (unlikely(nr_lock_chains >= MAX_LOCKDEP_CHAINS)) {
-                __raw_spin_unlock(&hash_lock);
-                debug_locks_off();
+                if (!debug_locks_off_graph_unlock())
+                        return 0;
+
                 printk("BUG: MAX_LOCKDEP_CHAINS too low!\n");
                 printk("turning off the locking correctness validator.\n");
                 return 0;
@@ -1381,9 +1418,7 @@ print_irq_inversion_bug(struct task_struct *curr, struct lock_class *other,
                         struct held_lock *this, int forwards,
                         const char *irqclass)
 {
-        __raw_spin_unlock(&hash_lock);
-        debug_locks_off();
-        if (debug_locks_silent)
+        if (!debug_locks_off_graph_unlock() || debug_locks_silent)
                 return 0;
 
         printk("\n=========================================================\n");
@@ -1453,7 +1488,7 @@ check_usage_backwards(struct task_struct *curr, struct held_lock *this,
         return print_irq_inversion_bug(curr, backwards_match, this, 0, irqclass);
 }
 
-static inline void print_irqtrace_events(struct task_struct *curr)
+void print_irqtrace_events(struct task_struct *curr)
 {
         printk("irq event stamp: %u\n", curr->irq_events);
         printk("hardirqs last  enabled at (%u): ", curr->hardirq_enable_event);
@@ -1466,19 +1501,13 @@ static inline void print_irqtrace_events(struct task_struct *curr)
         print_ip_sym(curr->softirq_disable_ip);
 }
 
-#else
-static inline void print_irqtrace_events(struct task_struct *curr)
-{
-}
 #endif
 
 static int
 print_usage_bug(struct task_struct *curr, struct held_lock *this,
                 enum lock_usage_bit prev_bit, enum lock_usage_bit new_bit)
 {
-        __raw_spin_unlock(&hash_lock);
-        debug_locks_off();
-        if (debug_locks_silent)
+        if (!debug_locks_off_graph_unlock() || debug_locks_silent)
                 return 0;
 
         printk("\n=================================\n");
@@ -1539,12 +1568,13 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this,
         if (likely(this->class->usage_mask & new_mask))
                 return 1;
 
-        __raw_spin_lock(&hash_lock);
+        if (!graph_lock())
+                return 0;
         /*
          * Make sure we didnt race:
          */
         if (unlikely(this->class->usage_mask & new_mask)) {
-                __raw_spin_unlock(&hash_lock);
+                graph_unlock();
                 return 1;
         }
 
@@ -1730,16 +1760,16 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this,
                 debug_atomic_dec(&nr_unused_locks);
                 break;
         default:
-                __raw_spin_unlock(&hash_lock);
-                debug_locks_off();
+                if (!debug_locks_off_graph_unlock())
+                        return 0;
                 WARN_ON(1);
                 return 0;
         }
 
-        __raw_spin_unlock(&hash_lock);
+        graph_unlock();
 
         /*
-         * We must printk outside of the hash_lock:
+         * We must printk outside of the graph_lock:
          */
         if (ret == 2) {
                 printk("\nmarked lock as {%s}:\n", usage_str[new_bit]);
@@ -2137,9 +2167,9 @@ out_calc_hash:
          * We look up the chain_key and do the O(N^2) check and update of
          * the dependencies only if this is a new dependency chain.
          * (If lookup_chain_cache() returns with 1 it acquires
-         * hash_lock for us)
+         * graph_lock for us)
          */
-        if (!trylock && (check == 2) && lookup_chain_cache(chain_key)) {
+        if (!trylock && (check == 2) && lookup_chain_cache(chain_key, class)) {
                 /*
                  * Check whether last held lock:
                  *
@@ -2170,7 +2200,7 @@ out_calc_hash:
                 if (!chain_head && ret != 2)
                         if (!check_prevs_add(curr, hlock))
                                 return 0;
-                __raw_spin_unlock(&hash_lock);
+                graph_unlock();
         }
         curr->lockdep_depth++;
         check_chain_key(curr);
@@ -2433,6 +2463,7 @@ EXPORT_SYMBOL_GPL(lock_release);
 void lockdep_reset(void)
 {
         unsigned long flags;
+        int i;
 
         raw_local_irq_save(flags);
         current->curr_chain_key = 0;
@@ -2443,6 +2474,8 @@ void lockdep_reset(void)
         nr_softirq_chains = 0;
         nr_process_chains = 0;
         debug_locks = 1;
+        for (i = 0; i < CHAINHASH_SIZE; i++)
+                INIT_LIST_HEAD(chainhash_table + i);
         raw_local_irq_restore(flags);
 }
 
@@ -2479,7 +2512,7 @@ void lockdep_free_key_range(void *start, unsigned long size)
         int i;
 
         raw_local_irq_save(flags);
-        __raw_spin_lock(&hash_lock);
+        graph_lock();
 
         /*
          * Unhash all classes that were created by this module:
@@ -2493,7 +2526,7 @@ void lockdep_free_key_range(void *start, unsigned long size)
                                 zap_class(class);
         }
 
-        __raw_spin_unlock(&hash_lock);
+        graph_unlock();
         raw_local_irq_restore(flags);
 }
 
@@ -2521,20 +2554,20 @@ void lockdep_reset_lock(struct lockdep_map *lock)
          * Debug check: in the end all mapped classes should
          * be gone.
          */
-        __raw_spin_lock(&hash_lock);
+        graph_lock();
         for (i = 0; i < CLASSHASH_SIZE; i++) {
                 head = classhash_table + i;
                 if (list_empty(head))
                         continue;
                 list_for_each_entry_safe(class, next, head, hash_entry) {
                         if (unlikely(class == lock->class_cache)) {
-                                __raw_spin_unlock(&hash_lock);
-                                DEBUG_LOCKS_WARN_ON(1);
+                                if (debug_locks_off_graph_unlock())
+                                        WARN_ON(1);
                                 goto out_restore;
                         }
                 }
         }
-        __raw_spin_unlock(&hash_lock);
+        graph_unlock();
 
 out_restore:
         raw_local_irq_restore(flags);
diff --git a/kernel/module.c b/kernel/module.c
index d9eae45d0145..b565eaeff7e6 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -824,9 +824,34 @@ static inline void module_unload_init(struct module *mod)
 }
 #endif /* CONFIG_MODULE_UNLOAD */
 
+static ssize_t show_initstate(struct module_attribute *mattr,
+                           struct module *mod, char *buffer)
+{
+        const char *state = "unknown";
+
+        switch (mod->state) {
+        case MODULE_STATE_LIVE:
+                state = "live";
+                break;
+        case MODULE_STATE_COMING:
+                state = "coming";
+                break;
+        case MODULE_STATE_GOING:
+                state = "going";
+                break;
+        }
+        return sprintf(buffer, "%s\n", state);
+}
+
+static struct module_attribute initstate = {
+        .attr = { .name = "initstate", .mode = 0444, .owner = THIS_MODULE },
+        .show = show_initstate,
+};
+
 static struct module_attribute *modinfo_attrs[] = {
         &modinfo_version,
         &modinfo_srcversion,
+        &initstate,
 #ifdef CONFIG_MODULE_UNLOAD
         &refcnt,
 #endif
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index e2ce748e96af..f5b9ee6f6bbb 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -46,10 +46,8 @@ static inline struct nsproxy *clone_namespaces(struct nsproxy *orig)
         struct nsproxy *ns;
 
         ns = kmemdup(orig, sizeof(struct nsproxy), GFP_KERNEL);
-        if (ns) {
+        if (ns)
                 atomic_set(&ns->count, 1);
-                ns->id = -1;
-        }
         return ns;
 }
 
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 710ed084e7c5..ed296225dcd4 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -20,13 +20,14 @@ config PM
           sending the processor to sleep and saving power.
 
 config PM_LEGACY
-        bool "Legacy Power Management API"
+        bool "Legacy Power Management API (DEPRECATED)"
         depends on PM
-        default y
+        default n
         ---help---
-           Support for pm_register() and friends.
+           Support for pm_register() and friends.  This old API is obsoleted
+           by the driver model.
 
-           If unsure, say Y.
+           If unsure, say N.
 
 config PM_DEBUG
         bool "Power Management Debug Support"
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 99eeb119b06d..6d566bf7085c 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -28,8 +28,7 @@ static inline int freezeable(struct task_struct * p)
         if ((p == current) || 
             (p->flags & PF_NOFREEZE) ||
             (p->exit_state == EXIT_ZOMBIE) ||
-            (p->exit_state == EXIT_DEAD) ||
-            (p->state == TASK_STOPPED))
+            (p->exit_state == EXIT_DEAD))
                 return 0;
         return 1;
 }
@@ -61,10 +60,16 @@ static inline void freeze_process(struct task_struct *p)
         unsigned long flags;
 
         if (!freezing(p)) {
-                freeze(p);
-                spin_lock_irqsave(&p->sighand->siglock, flags);
-                signal_wake_up(p, 0);
-                spin_unlock_irqrestore(&p->sighand->siglock, flags);
+                rmb();
+                if (!frozen(p)) {
+                        if (p->state == TASK_STOPPED)
+                                force_sig_specific(SIGSTOP, p);
+
+                        freeze(p);
+                        spin_lock_irqsave(&p->sighand->siglock, flags);
+                        signal_wake_up(p, p->state == TASK_STOPPED);
+                        spin_unlock_irqrestore(&p->sighand->siglock, flags);
+                }
         }
 }
 
@@ -103,9 +108,7 @@ static unsigned int try_to_freeze_tasks(int freeze_user_space)
                         if (frozen(p))
                                 continue;
 
-                        if (p->state == TASK_TRACED &&
-                            (frozen(p->parent) ||
-                             p->parent->state == TASK_STOPPED)) {
+                        if (p->state == TASK_TRACED && frozen(p->parent)) {
                                 cancel_freezing(p);
                                 continue;
                         }
diff --git a/kernel/relay.c b/kernel/relay.c
index 818e514729cf..a4701e7ba7d0 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -138,7 +138,7 @@ depopulate:
  */
 struct rchan_buf *relay_create_buf(struct rchan *chan)
 {
-        struct rchan_buf *buf = kcalloc(1, sizeof(struct rchan_buf), GFP_KERNEL);
+        struct rchan_buf *buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL);
         if (!buf)
                 return NULL;
 
@@ -479,7 +479,7 @@ struct rchan *relay_open(const char *base_filename,
         if (!(subbuf_size && n_subbufs))
                 return NULL;
 
-        chan = kcalloc(1, sizeof(struct rchan), GFP_KERNEL);
+        chan = kzalloc(sizeof(struct rchan), GFP_KERNEL);
         if (!chan)
                 return NULL;
 
diff --git a/kernel/sched.c b/kernel/sched.c
index 8a0afb97af71..5cd833bc2173 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3429,6 +3429,8 @@ asmlinkage void __sched schedule(void)
                         "%s/0x%08x/%d\n",
                         current->comm, preempt_count(), current->pid);
                 debug_show_held_locks(current);
+                if (irqs_disabled())
+                        print_irqtrace_events(current);
                 dump_stack();
         }
         profile_hit(SCHED_PROFILING, __builtin_return_address(0));
@@ -6977,6 +6979,8 @@ void __might_sleep(char *file, int line)
                 printk("in_atomic():%d, irqs_disabled():%d\n",
                         in_atomic(), irqs_disabled());
                 debug_show_held_locks(current);
+                if (irqs_disabled())
+                        print_irqtrace_events(current);
                 dump_stack();
         }
 #endif
diff --git a/kernel/signal.c b/kernel/signal.c
index 1921ffdc5e77..5630255d2e2a 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1705,7 +1705,9 @@ finish_stop(int stop_count)
                 read_unlock(&tasklist_lock);
         }
 
-        schedule();
+        do {
+                schedule();
+        } while (try_to_freeze());
         /*
          * Now we don't run again until continued.
          */
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 130c5ec9ee0b..600b33358ded 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -65,7 +65,6 @@ extern int sysctl_overcommit_memory;
 extern int sysctl_overcommit_ratio;
 extern int sysctl_panic_on_oom;
 extern int max_threads;
-extern int sysrq_enabled;
 extern int core_uses_pid;
 extern int suid_dumpable;
 extern char core_pattern[];
@@ -543,7 +542,7 @@ static ctl_table kern_table[] = {
         {
                 .ctl_name       = KERN_SYSRQ,
                 .procname       = "sysrq",
-                .data           = &sysrq_enabled,
+                .data           = &__sysrq_enabled,
                 .maxlen         = sizeof (int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec,
diff --git a/kernel/timer.c b/kernel/timer.c
index 0256ab443d8a..feddf817baa5 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1146,11 +1146,15 @@ static inline void calc_load(unsigned long ticks)
         unsigned long active_tasks; /* fixed-point */
         static int count = LOAD_FREQ;
 
-        active_tasks = count_active_tasks();
-        for (count -= ticks; count < 0; count += LOAD_FREQ) {
-                CALC_LOAD(avenrun[0], EXP_1, active_tasks);
-                CALC_LOAD(avenrun[1], EXP_5, active_tasks);
-                CALC_LOAD(avenrun[2], EXP_15, active_tasks);
+        count -= ticks;
+        if (unlikely(count < 0)) {
+                active_tasks = count_active_tasks();
+                do {
+                        CALC_LOAD(avenrun[0], EXP_1, active_tasks);
+                        CALC_LOAD(avenrun[1], EXP_5, active_tasks);
+                        CALC_LOAD(avenrun[2], EXP_15, active_tasks);
+                        count += LOAD_FREQ;
+                } while (count < 0);
         }
 }
 
diff --git a/lib/Kconfig b/lib/Kconfig
index 47b172df3e31..9b03581cdecb 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -101,4 +101,9 @@ config TEXTSEARCH_FSM
 config PLIST
         boolean
 
+config IOMAP_COPY
+        boolean
+        depends on !UML
+        default y
+
 endmenu
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 0701ddda1df8..818e4589f718 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -437,7 +437,7 @@ config FAIL_PAGE_ALLOC
           Provide fault-injection capability for alloc_pages().
 
 config FAIL_MAKE_REQUEST
-        bool "Fault-injection capabilitiy for disk IO"
+        bool "Fault-injection capability for disk IO"
         depends on FAULT_INJECTION
         help
           Provide fault-injection capability for disk IO.
diff --git a/lib/Makefile b/lib/Makefile
index 2d6106af53cd..77b4bad7d441 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -5,20 +5,21 @@
 lib-y := ctype.o string.o vsprintf.o cmdline.o \
          bust_spinlocks.o rbtree.o radix-tree.o dump_stack.o \
          idr.o div64.o int_sqrt.o bitmap.o extable.o prio_tree.o \
-         sha1.o irq_regs.o
+         sha1.o irq_regs.o reciprocal_div.o
 
 lib-$(CONFIG_MMU) += ioremap.o
 lib-$(CONFIG_SMP) += cpumask.o
 
 lib-y   += kobject.o kref.o kobject_uevent.o klist.o
 
-obj-y += sort.o parser.o halfmd4.o iomap_copy.o debug_locks.o random32.o
+obj-y += sort.o parser.o halfmd4.o debug_locks.o random32.o
 
 ifeq ($(CONFIG_DEBUG_KOBJECT),y)
 CFLAGS_kobject.o += -DDEBUG
 CFLAGS_kobject_uevent.o += -DDEBUG
 endif
 
+obj-$(CONFIG_IOMAP_COPY) += iomap_copy.o
 obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
 lib-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
diff --git a/lib/ioremap.c b/lib/ioremap.c
index 99fa277f9f7b..a9e4415b02dc 100644
--- a/lib/ioremap.c
+++ b/lib/ioremap.c
@@ -5,7 +5,6 @@
  *
  * (C) Copyright 1995 1996 Linus Torvalds
  */
-#include <linux/io.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
 
diff --git a/lib/reciprocal_div.c b/lib/reciprocal_div.c
new file mode 100644
index 000000000000..6a3bd48fa2a0
--- /dev/null
+++ b/lib/reciprocal_div.c
@@ -0,0 +1,9 @@
+#include <asm/div64.h>
+#include <linux/reciprocal_div.h>
+
+u32 reciprocal_value(u32 k)
+{
+        u64 val = (1LL << 32) + (k - 1);
+        do_div(val, k);
+        return (u32)val;
+}
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 0ccc7f230252..cb362f761f17 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -44,14 +44,14 @@ static void clear_huge_page(struct page *page, unsigned long addr)
 }
 
 static void copy_huge_page(struct page *dst, struct page *src,
-                           unsigned long addr)
+                           unsigned long addr, struct vm_area_struct *vma)
 {
         int i;
 
         might_sleep();
         for (i = 0; i < HPAGE_SIZE/PAGE_SIZE; i++) {
                 cond_resched();
-                copy_user_highpage(dst + i, src + i, addr + i*PAGE_SIZE);
+                copy_user_highpage(dst + i, src + i, addr + i*PAGE_SIZE, vma);
         }
 }
 
@@ -73,7 +73,7 @@ static struct page *dequeue_huge_page(struct vm_area_struct *vma,
 
         for (z = zonelist->zones; *z; z++) {
                 nid = zone_to_nid(*z);
-                if (cpuset_zone_allowed(*z, GFP_HIGHUSER) &&
+                if (cpuset_zone_allowed_softwall(*z, GFP_HIGHUSER) &&
                     !list_empty(&hugepage_freelists[nid]))
                         break;
         }
@@ -442,7 +442,7 @@ static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
         }
 
         spin_unlock(&mm->page_table_lock);
-        copy_huge_page(new_page, old_page, address);
+        copy_huge_page(new_page, old_page, address, vma);
         spin_lock(&mm->page_table_lock);
 
         ptep = huge_pte_offset(mm, address & HPAGE_MASK);
diff --git a/mm/memory.c b/mm/memory.c
index bf6100236e62..c00bac66ce9f 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1441,7 +1441,7 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma)
         return pte;
 }
 
-static inline void cow_user_page(struct page *dst, struct page *src, unsigned long va)
+static inline void cow_user_page(struct page *dst, struct page *src, unsigned long va, struct vm_area_struct *vma)
 {
         /*
          * If the source page was a PFN mapping, we don't have
@@ -1464,9 +1464,9 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
                 kunmap_atomic(kaddr, KM_USER0);
                 flush_dcache_page(dst);
                 return;
-                
+
         }
-        copy_user_highpage(dst, src, va);
+        copy_user_highpage(dst, src, va, vma);
 }
 
 /*
@@ -1577,7 +1577,7 @@ gotten:
                 new_page = alloc_page_vma(GFP_HIGHUSER, vma, address);
                 if (!new_page)
                         goto oom;
-                cow_user_page(new_page, old_page, address);
+                cow_user_page(new_page, old_page, address, vma);
         }
 
         /*
@@ -2200,7 +2200,7 @@ retry:
                         page = alloc_page_vma(GFP_HIGHUSER, vma, address);
                         if (!page)
                                 goto oom;
-                        copy_user_highpage(page, new_page, address);
+                        copy_user_highpage(page, new_page, address, vma);
                         page_cache_release(new_page);
                         new_page = page;
                         anon = 1;
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 223d9ccb7d64..64cf3c214634 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -177,7 +177,7 @@ static inline int constrained_alloc(struct zonelist *zonelist, gfp_t gfp_mask)
         nodemask_t nodes = node_online_map;
 
         for (z = zonelist->zones; *z; z++)
-                if (cpuset_zone_allowed(*z, gfp_mask))
+                if (cpuset_zone_allowed_softwall(*z, gfp_mask))
                         node_clear(zone_to_nid(*z), nodes);
                 else
                         return CONSTRAINT_CPUSET;
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index e6b17b2989e0..8c1a116875bc 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1162,7 +1162,7 @@ zonelist_scan:
                         zone->zone_pgdat != zonelist->zones[0]->zone_pgdat))
                                 break;
                 if ((alloc_flags & ALLOC_CPUSET) &&
-                        !cpuset_zone_allowed(zone, gfp_mask))
+                        !cpuset_zone_allowed_softwall(zone, gfp_mask))
                                 goto try_next_zone;
 
                 if (!(alloc_flags & ALLOC_NO_WATERMARKS)) {
diff --git a/mm/slab.c b/mm/slab.c
index 2c655532f5ef..909975f6e090 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -109,6 +109,7 @@
 #include        <linux/mutex.h>
 #include        <linux/fault-inject.h>
 #include        <linux/rtmutex.h>
+#include        <linux/reciprocal_div.h>
 
 #include        <asm/cacheflush.h>
 #include        <asm/tlbflush.h>
@@ -386,6 +387,7 @@ struct kmem_cache {
         unsigned int shared;
 
         unsigned int buffer_size;
+        u32 reciprocal_buffer_size;
 /* 3) touched by every alloc & free from the backend */
         struct kmem_list3 *nodelists[MAX_NUMNODES];
 
@@ -627,10 +629,17 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
         return slab->s_mem + cache->buffer_size * idx;
 }
 
-static inline unsigned int obj_to_index(struct kmem_cache *cache,
-                                        struct slab *slab, void *obj)
+/*
+ * We want to avoid an expensive divide : (offset / cache->buffer_size)
+ *   Using the fact that buffer_size is a constant for a particular cache,
+ *   we can replace (offset / cache->buffer_size) by
+ *   reciprocal_divide(offset, cache->reciprocal_buffer_size)
+ */
+static inline unsigned int obj_to_index(const struct kmem_cache *cache,
+                                        const struct slab *slab, void *obj)
 {
-        return (unsigned)(obj - slab->s_mem) / cache->buffer_size;
+        u32 offset = (obj - slab->s_mem);
+        return reciprocal_divide(offset, cache->reciprocal_buffer_size);
 }
 
 /*
@@ -1427,6 +1436,8 @@ void __init kmem_cache_init(void)
 
         cache_cache.buffer_size = ALIGN(cache_cache.buffer_size,
                                         cache_line_size());
+        cache_cache.reciprocal_buffer_size =
+                reciprocal_value(cache_cache.buffer_size);
 
         for (order = 0; order < MAX_ORDER; order++) {
                 cache_estimate(order, cache_cache.buffer_size,
@@ -2313,6 +2324,7 @@ kmem_cache_create (const char *name, size_t size, size_t align,
         if (flags & SLAB_CACHE_DMA)
                 cachep->gfpflags |= GFP_DMA;
         cachep->buffer_size = size;
+        cachep->reciprocal_buffer_size = reciprocal_value(size);
 
         if (flags & CFLGS_OFF_SLAB) {
                 cachep->slabp_cache = kmem_find_general_cachep(slab_size, 0u);
@@ -3252,6 +3264,7 @@ void *fallback_alloc(struct kmem_cache *cache, gfp_t flags)
         struct zone **z;
         void *obj = NULL;
         int nid;
+        gfp_t local_flags = (flags & GFP_LEVEL_MASK);
 
 retry:
         /*
@@ -3261,7 +3274,7 @@ retry:
         for (z = zonelist->zones; *z && !obj; z++) {
                 nid = zone_to_nid(*z);
 
-                if (cpuset_zone_allowed(*z, flags | __GFP_HARDWALL) &&
+                if (cpuset_zone_allowed_hardwall(*z, flags) &&
                         cache->nodelists[nid] &&
                         cache->nodelists[nid]->free_objects)
                                 obj = ____cache_alloc_node(cache,
@@ -3275,7 +3288,12 @@ retry:
                  * We may trigger various forms of reclaim on the allowed
                  * set and go into memory reserves if necessary.
                  */
+                if (local_flags & __GFP_WAIT)
+                        local_irq_enable();
+                kmem_flagcheck(cache, flags);
                 obj = kmem_getpages(cache, flags, -1);
+                if (local_flags & __GFP_WAIT)
+                        local_irq_disable();
                 if (obj) {
                         /*
                          * Insert into the appropriate per node queues
@@ -3535,7 +3553,7 @@ EXPORT_SYMBOL(kmem_cache_zalloc);
  *
  * Currently only used for dentry validation.
  */
-int fastcall kmem_ptr_validate(struct kmem_cache *cachep, void *ptr)
+int fastcall kmem_ptr_validate(struct kmem_cache *cachep, const void *ptr)
 {
         unsigned long addr = (unsigned long)ptr;
         unsigned long min_addr = PAGE_OFFSET;
diff --git a/mm/slob.c b/mm/slob.c
index 542394184a58..2e9236e10ed1 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -157,7 +157,7 @@ static int fastcall find_order(int size)
         return order;
 }
 
-void *kmalloc(size_t size, gfp_t gfp)
+void *__kmalloc(size_t size, gfp_t gfp)
 {
         slob_t *m;
         bigblock_t *bb;
@@ -186,8 +186,7 @@ void *kmalloc(size_t size, gfp_t gfp)
         slob_free(bb, sizeof(bigblock_t));
         return 0;
 }
-
-EXPORT_SYMBOL(kmalloc);
+EXPORT_SYMBOL(__kmalloc);
 
 void kfree(const void *block)
 {
@@ -329,6 +328,17 @@ EXPORT_SYMBOL(kmem_cache_name);
 static struct timer_list slob_timer = TIMER_INITIALIZER(
         (void (*)(unsigned long))kmem_cache_init, 0, 0);
 
+int kmem_cache_shrink(struct kmem_cache *d)
+{
+        return 0;
+}
+EXPORT_SYMBOL(kmem_cache_shrink);
+
+int kmem_ptr_validate(struct kmem_cache *a, const void *b)
+{
+        return 0;
+}
+
 void kmem_cache_init(void)
 {
         void *p = slob_alloc(PAGE_SIZE, 0, PAGE_SIZE-1);
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 093f5fe6dd77..e9813b06c7a3 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -984,7 +984,7 @@ static unsigned long shrink_zones(int priority, struct zone **zones,
                 if (!populated_zone(zone))
                         continue;
 
-                if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
+                if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
                         continue;
 
                 note_zone_scanning_priority(zone, priority);
@@ -1034,7 +1034,7 @@ unsigned long try_to_free_pages(struct zone **zones, gfp_t gfp_mask)
         for (i = 0; zones[i] != NULL; i++) {
                 struct zone *zone = zones[i];
 
-                if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
+                if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
                         continue;
 
                 lru_pages += zone->nr_active + zone->nr_inactive;
@@ -1089,7 +1089,7 @@ out:
         for (i = 0; zones[i] != 0; i++) {
                 struct zone *zone = zones[i];
 
-                if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
+                if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
                         continue;
 
                 zone->prev_priority = priority;
@@ -1354,7 +1354,7 @@ void wakeup_kswapd(struct zone *zone, int order)
                 return;
         if (pgdat->kswapd_max_order < order)
                 pgdat->kswapd_max_order = order;
-        if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
+        if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
                 return;
         if (!waitqueue_active(&pgdat->kswapd_wait))
                 return;
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 711a085eca5b..dbf98c49dbaa 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -123,10 +123,10 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb)
                         if (flt->opcode &&
                             ((evt == HCI_EV_CMD_COMPLETE &&
                               flt->opcode !=
-                              get_unaligned((__u16 *)(skb->data + 3))) ||
+                              get_unaligned((__le16 *)(skb->data + 3))) ||
                              (evt == HCI_EV_CMD_STATUS &&
                               flt->opcode !=
-                              get_unaligned((__u16 *)(skb->data + 4)))))
+                              get_unaligned((__le16 *)(skb->data + 4)))))
                                 continue;
                 }
 
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 74046efdf875..8ce00d3703da 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -565,7 +565,7 @@ static void ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
                 } else {
                         struct sk_buff *free_it = next;
 
-                        /* Old fragmnet is completely overridden with
+                        /* Old fragment is completely overridden with
                          * new one drop it.
                          */
                         next = next->next;
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 700353b330fd..066c64a97fd8 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -804,19 +804,19 @@ unwrap_integ_data(struct xdr_buf *buf, u32 seq, struct gss_ctx *ctx)
 
         integ_len = svc_getnl(&buf->head[0]);
         if (integ_len & 3)
-                goto out;
+                return stat;
         if (integ_len > buf->len)
-                goto out;
+                return stat;
         if (xdr_buf_subsegment(buf, &integ_buf, 0, integ_len))
                 BUG();
         /* copy out mic... */
         if (read_u32_from_xdr_buf(buf, integ_len, &mic.len))
                 BUG();
         if (mic.len > RPC_MAX_AUTH_SIZE)
-                goto out;
+                return stat;
         mic.data = kmalloc(mic.len, GFP_KERNEL);
         if (!mic.data)
-                goto out;
+                return stat;
         if (read_bytes_from_xdr_buf(buf, integ_len + 4, mic.data, mic.len))
                 goto out;
         maj_stat = gss_verify_mic(ctx, &integ_buf, &mic);
@@ -826,6 +826,7 @@ unwrap_integ_data(struct xdr_buf *buf, u32 seq, struct gss_ctx *ctx)
                 goto out;
         stat = 0;
 out:
+        kfree(mic.data);
         return stat;
 }
 
@@ -1065,7 +1066,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)
                 }
                 switch(cache_check(&rsi_cache, &rsip->h, &rqstp->rq_chandle)) {
                 case -EAGAIN:
-                        goto drop;
+                case -ETIMEDOUT:
                 case -ENOENT:
                         goto drop;
                 case 0:
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 80aff0474572..14274490f92e 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -34,7 +34,7 @@
 
 #define  RPCDBG_FACILITY RPCDBG_CACHE
 
-static void cache_defer_req(struct cache_req *req, struct cache_head *item);
+static int cache_defer_req(struct cache_req *req, struct cache_head *item);
 static void cache_revisit_request(struct cache_head *item);
 
 static void cache_init(struct cache_head *h)
@@ -185,6 +185,7 @@ static int cache_make_upcall(struct cache_detail *detail, struct cache_head *h);
  *
  * Returns 0 if the cache_head can be used, or cache_puts it and returns
  * -EAGAIN if upcall is pending,
+ * -ETIMEDOUT if upcall failed and should be retried,
  * -ENOENT if cache entry was negative
  */
 int cache_check(struct cache_detail *detail,
@@ -236,7 +237,8 @@ int cache_check(struct cache_detail *detail,
         }
 
         if (rv == -EAGAIN)
-                cache_defer_req(rqstp, h);
+                if (cache_defer_req(rqstp, h) != 0)
+                        rv = -ETIMEDOUT;
 
         if (rv)
                 cache_put(h, detail);
@@ -523,14 +525,21 @@ static LIST_HEAD(cache_defer_list);
 static struct list_head cache_defer_hash[DFR_HASHSIZE];
 static int cache_defer_cnt;
 
-static void cache_defer_req(struct cache_req *req, struct cache_head *item)
+static int cache_defer_req(struct cache_req *req, struct cache_head *item)
 {
         struct cache_deferred_req *dreq;
         int hash = DFR_HASH(item);
 
+        if (cache_defer_cnt >= DFR_MAX) {
+                /* too much in the cache, randomly drop this one,
+                 * or continue and drop the oldest below
+                 */
+                if (net_random()&1)
+                        return -ETIMEDOUT;
+        }
         dreq = req->defer(req);
         if (dreq == NULL)
-                return;
+                return -ETIMEDOUT;
 
         dreq->item = item;
         dreq->recv_time = get_seconds();
@@ -546,17 +555,8 @@ static void cache_defer_req(struct cache_req *req, struct cache_head *item)
         /* it is in, now maybe clean up */
         dreq = NULL;
         if (++cache_defer_cnt > DFR_MAX) {
-                /* too much in the cache, randomly drop
-                 * first or last
-                 */
-                if (net_random()&1) 
-                        dreq = list_entry(cache_defer_list.next,
-                                          struct cache_deferred_req,
-                                          recent);
-                else
-                        dreq = list_entry(cache_defer_list.prev,
-                                          struct cache_deferred_req,
-                                          recent);
+                dreq = list_entry(cache_defer_list.prev,
+                                  struct cache_deferred_req, recent);
                 list_del(&dreq->recent);
                 list_del(&dreq->hash);
                 cache_defer_cnt--;
@@ -571,6 +571,7 @@ static void cache_defer_req(struct cache_req *req, struct cache_head *item)
                 /* must have just been validated... */
                 cache_revisit_request(item);
         }
+        return 0;
 }
 
 static void cache_revisit_request(struct cache_head *item)
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index eb44ec929ca1..f3001f3626f6 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -308,7 +308,7 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
 
         serv->sv_nrpools = npools;
         serv->sv_pools =
-                kcalloc(sizeof(struct svc_pool), serv->sv_nrpools,
+                kcalloc(serv->sv_nrpools, sizeof(struct svc_pool),
                         GFP_KERNEL);
         if (!serv->sv_pools) {
                 kfree(serv);
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index a0a953a430c2..0d1e8fb83b93 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -53,6 +53,10 @@ struct auth_domain *unix_domain_find(char *name)
                         return NULL;
                 kref_init(&new->h.ref);
                 new->h.name = kstrdup(name, GFP_KERNEL);
+                if (new->h.name == NULL) {
+                        kfree(new);
+                        return NULL;
+                }
                 new->h.flavour = &svcauth_unix;
                 new->addr_changes = 0;
                 rv = auth_domain_lookup(name, &new->h);
@@ -435,6 +439,7 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
                 default:
                         BUG();
                 case -EAGAIN:
+                case -ETIMEDOUT:
                         return SVC_DROP;
                 case -ENOENT:
                         return SVC_DENIED;
diff --git a/net/tipc/config.c b/net/tipc/config.c
index 458a2c46cef3..baf55c459c8b 100644
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
@@ -208,7 +208,7 @@ static void cfg_cmd_event(struct tipc_cmd_msg *msg,
 
                         if (mng.link_subscriptions > 64)
                                 break;
-                        sub = (struct subscr_data *)kmalloc(sizeof(*sub),
+                        sub = kmalloc(sizeof(*sub),
                                                             GFP_ATOMIC);
                         if (sub == NULL) {
                                 warn("Memory squeeze; dropped remote link subscription\n");
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 4dcb8867b5f4..124b341a18c0 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -600,7 +600,7 @@ int main(int ac, char **av)
                         input_mode = ask_silent;
                         valid_stdin = 1;
                 }
-        } else if (sym_change_count) {
+        } else if (conf_get_changed()) {
                 name = getenv("KCONFIG_NOSILENTUPDATE");
                 if (name && *name) {
                         fprintf(stderr, _("\n*** Kernel configuration requires explicit update.\n\n"));
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 66b15ef02931..664fe29dacef 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -100,7 +100,7 @@ int conf_read_simple(const char *name, int def)
                 in = zconf_fopen(name);
                 if (in)
                         goto load;
-                sym_change_count++;
+                sym_add_change_count(1);
                 if (!sym_defconfig_list)
                         return 1;
 
@@ -312,7 +312,7 @@ int conf_read(const char *name)
         struct expr *e;
         int i, flags;
 
-        sym_change_count = 0;
+        sym_set_change_count(0);
 
         if (conf_read_simple(name, S_DEF_USER))
                 return 1;
@@ -364,7 +364,7 @@ int conf_read(const char *name)
                 sym->flags &= flags | ~SYMBOL_DEF_USER;
         }
 
-        sym_change_count += conf_warnings || conf_unsaved;
+        sym_add_change_count(conf_warnings || conf_unsaved);
 
         return 0;
 }
@@ -432,7 +432,7 @@ int conf_write(const char *name)
                      use_timestamp ? "# " : "",
                      use_timestamp ? ctime(&now) : "");
 
-        if (!sym_change_count)
+        if (!conf_get_changed())
                 sym_clear_all_valid();
 
         menu = rootmenu.list;
@@ -528,7 +528,7 @@ int conf_write(const char *name)
                  "# configuration written to %s\n"
                  "#\n"), newname);
 
-        sym_change_count = 0;
+        sym_set_change_count(0);
 
         return 0;
 }
@@ -765,3 +765,30 @@ int conf_write_autoconf(void)
 
         return 0;
 }
+
+static int sym_change_count;
+static void (*conf_changed_callback)(void);
+
+void sym_set_change_count(int count)
+{
+        int _sym_change_count = sym_change_count;
+        sym_change_count = count;
+        if (conf_changed_callback &&
+            (bool)_sym_change_count != (bool)count)
+                conf_changed_callback();
+}
+
+void sym_add_change_count(int count)
+{
+        sym_set_change_count(count + sym_change_count);
+}
+
+bool conf_get_changed(void)
+{
+        return sym_change_count;
+}
+
+void conf_set_changed_callback(void (*fn)(void))
+{
+        conf_changed_callback = fn;
+}
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 7b0d3a93d5c0..61d8166166ef 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -38,8 +38,6 @@ static gboolean show_all = FALSE;
 static gboolean show_debug = FALSE;
 static gboolean resizeable = FALSE;
 
-static gboolean config_changed = FALSE;
-
 static char nohelp_text[] =
     N_("Sorry, no help available for this option yet.\n");
 
@@ -50,6 +48,8 @@ GtkWidget *text_w = NULL;
 GtkWidget *hpaned = NULL;
 GtkWidget *vpaned = NULL;
 GtkWidget *back_btn = NULL;
+GtkWidget *save_btn = NULL;
+GtkWidget *save_menu_item = NULL;
 
 GtkTextTag *tag1, *tag2;
 GdkColor color;
@@ -75,7 +75,7 @@ static void display_tree_part(void);
 static void update_tree(struct menu *src, GtkTreeIter * dst);
 static void set_node(GtkTreeIter * node, struct menu *menu, gchar ** row);
 static gchar **fill_row(struct menu *menu);
-
+static void conf_changed(void);
 
 /* Helping/Debugging Functions */
 
@@ -224,6 +224,10 @@ void init_main_window(const gchar * glade_file)
         gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget,
                                        show_value);
 
+        save_btn = glade_xml_get_widget(xml, "button3");
+        save_menu_item = glade_xml_get_widget(xml, "save1");
+        conf_set_changed_callback(conf_changed);
+
         style = gtk_widget_get_style(main_wnd);
         widget = glade_xml_get_widget(xml, "toolbar1");
 
@@ -512,14 +516,14 @@ static void text_insert_msg(const char *title, const char *message)
 
 /* Main Windows Callbacks */
 
-void on_save1_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_save_activate(GtkMenuItem * menuitem, gpointer user_data);
 gboolean on_window1_delete_event(GtkWidget * widget, GdkEvent * event,
                                  gpointer user_data)
 {
         GtkWidget *dialog, *label;
         gint result;
 
-        if (config_changed == FALSE)
+        if (!conf_get_changed())
                 return FALSE;
 
         dialog = gtk_dialog_new_with_buttons(_("Warning !"),
@@ -543,7 +547,7 @@ gboolean on_window1_delete_event(GtkWidget * widget, GdkEvent * event,
         result = gtk_dialog_run(GTK_DIALOG(dialog));
         switch (result) {
         case GTK_RESPONSE_YES:
-                on_save1_activate(NULL, NULL);
+                on_save_activate(NULL, NULL);
                 return FALSE;
         case GTK_RESPONSE_NO:
                 return FALSE;
@@ -621,12 +625,10 @@ void on_load1_activate(GtkMenuItem * menuitem, gpointer user_data)
 }
 
 
-void on_save1_activate(GtkMenuItem * menuitem, gpointer user_data)
+void on_save_activate(GtkMenuItem * menuitem, gpointer user_data)
 {
         if (conf_write(NULL))
                 text_insert_msg(_("Error"), _("Unable to save configuration !"));
-
-        config_changed = FALSE;
 }
 
 
@@ -819,12 +821,6 @@ void on_load_clicked(GtkButton * button, gpointer user_data)
 }
 
 
-void on_save_clicked(GtkButton * button, gpointer user_data)
-{
-        on_save1_activate(NULL, user_data);
-}
-
-
 void on_single_clicked(GtkButton * button, gpointer user_data)
 {
         view_mode = SINGLE_VIEW;
@@ -899,7 +895,6 @@ static void renderer_edited(GtkCellRendererText * cell,
 
         sym_set_string_value(sym, new_def);
 
-        config_changed = TRUE;
         update_tree(&rootmenu, NULL);
 
         gtk_tree_path_free(path);
@@ -930,7 +925,6 @@ static void change_sym_value(struct menu *menu, gint col)
                 if (!sym_tristate_within_range(sym, newval))
                         newval = yes;
                 sym_set_tristate_value(sym, newval);
-                config_changed = TRUE;
                 if (view_mode == FULL_VIEW)
                         update_tree(&rootmenu, NULL);
                 else if (view_mode == SPLIT_VIEW) {
@@ -1633,3 +1627,10 @@ int main(int ac, char *av[])
 
         return 0;
 }
+
+static void conf_changed(void)
+{
+        bool changed = conf_get_changed();
+        gtk_widget_set_sensitive(save_btn, changed);
+        gtk_widget_set_sensitive(save_menu_item, changed);
+}
diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade
index f8744ed64967..803233fdd6dd 100644
--- a/scripts/kconfig/gconf.glade
+++ b/scripts/kconfig/gconf.glade
@@ -70,7 +70,7 @@
                       <property name="tooltip" translatable="yes">Save the config in .config</property>
                       <property name="label" translatable="yes">_Save</property>
                       <property name="use_underline">True</property>
-                      <signal name="activate" handler="on_save1_activate"/>
+                      <signal name="activate" handler="on_save_activate"/>
                       <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                       <child internal-child="image">
@@ -380,7 +380,7 @@
                   <property name="visible_horizontal">True</property>
                   <property name="visible_vertical">True</property>
                   <property name="is_important">False</property>
-                  <signal name="clicked" handler="on_save_clicked"/>
+                  <signal name="clicked" handler="on_save_activate"/>
                 </widget>
                 <packing>
                   <property name="expand">False</property>
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 2628023a1fe1..9b2706a41548 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -65,6 +65,8 @@ char *zconf_curname(void);
 
 /* confdata.c */
 char *conf_get_default_confname(void);
+void sym_set_change_count(int count);
+void sym_add_change_count(int count);
 
 /* kconfig_load.c */
 void kconfig_load(void);
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index a263746cfa7d..15030770d1ad 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -5,6 +5,8 @@ P(conf_read,int,(const char *name));
 P(conf_read_simple,int,(const char *name, int));
 P(conf_write,int,(const char *name));
 P(conf_write_autoconf,int,(void));
+P(conf_get_changed,bool,(void));
+P(conf_set_changed_callback, void,(void (*fn)(void)));
 
 /* menu.c */
 P(rootmenu,struct menu,);
@@ -16,7 +18,6 @@ P(menu_get_parent_menu,struct menu *,(struct menu *menu));
 
 /* symbol.c */
 P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]);
-P(sym_change_count,int,);
 
 P(sym_lookup,struct symbol *,(const char *name, int isconst));
 P(sym_find,struct symbol *,(const char *name));
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 08a4c7af93ea..3f9a1321b3e6 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -890,14 +890,19 @@ int main(int ac, char **av)
         do {
                 conf(&rootmenu);
                 dialog_clear();
-                res = dialog_yesno(NULL,
-                                   _("Do you wish to save your "
-                                     "new kernel configuration?\n"
-                                     "<ESC><ESC> to continue."),
-                                   6, 60);
+                if (conf_get_changed())
+                        res = dialog_yesno(NULL,
+                                           _("Do you wish to save your "
+                                             "new kernel configuration?\n"
+                                             "<ESC><ESC> to continue."),
+                                           6, 60);
+                else
+                        res = -1;
         } while (res == KEY_ESC);
         end_dialog();
-        if (res == 0) {
+
+        switch (res) {
+        case 0:
                 if (conf_write(NULL)) {
                         fprintf(stderr, _("\n\n"
                                 "Error during writing of the kernel configuration.\n"
@@ -905,11 +910,13 @@ int main(int ac, char **av)
                                 "\n\n"));
                         return 1;
                 }
+        case -1:
                 printf(_("\n\n"
                         "*** End of Linux kernel configuration.\n"
                         "*** Execute 'make' to build the kernel or try 'make help'."
                         "\n\n"));
-        } else {
+                break;
+        default:
                 fprintf(stderr, _("\n\n"
                         "Your kernel configuration changes were NOT saved."
                         "\n\n"));
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index f5628c57640b..0b2fcc417f59 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -38,6 +38,8 @@
 static QApplication *configApp;
 static ConfigSettings *configSettings;
 
+QAction *ConfigMainWindow::saveAction;
+
 static inline QString qgettext(const char* str)
 {
         return QString::fromLocal8Bit(gettext(str));
@@ -1306,8 +1308,11 @@ ConfigMainWindow::ConfigMainWindow(void)
           connect(quitAction, SIGNAL(activated()), SLOT(close()));
         QAction *loadAction = new QAction("Load", QPixmap(xpm_load), "&Load", CTRL+Key_L, this);
           connect(loadAction, SIGNAL(activated()), SLOT(loadConfig()));
-        QAction *saveAction = new QAction("Save", QPixmap(xpm_save), "&Save", CTRL+Key_S, this);
+        saveAction = new QAction("Save", QPixmap(xpm_save), "&Save", CTRL+Key_S, this);
           connect(saveAction, SIGNAL(activated()), SLOT(saveConfig()));
+        conf_set_changed_callback(conf_changed);
+        // Set saveAction's initial state
+        conf_changed();
         QAction *saveAsAction = new QAction("Save As...", "Save &As...", 0, this);
           connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs()));
         QAction *searchAction = new QAction("Search", "&Search", CTRL+Key_F, this);
@@ -1585,7 +1590,7 @@ void ConfigMainWindow::showFullView(void)
  */
 void ConfigMainWindow::closeEvent(QCloseEvent* e)
 {
-        if (!sym_change_count) {
+        if (!conf_get_changed()) {
                 e->accept();
                 return;
         }
@@ -1658,6 +1663,12 @@ void ConfigMainWindow::saveSettings(void)
         configSettings->writeSizes("/split2", split2->sizes());
 }
 
+void ConfigMainWindow::conf_changed(void)
+{
+        if (saveAction)
+                saveAction->setEnabled(conf_get_changed());
+}
+
 void fixup_rootmenu(struct menu *menu)
 {
         struct menu *child;
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index 6a9e3b14c227..6fc1c5f14425 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -297,6 +297,9 @@ protected:
 
 class ConfigMainWindow : public QMainWindow {
         Q_OBJECT
+
+        static QAction *saveAction;
+        static void conf_changed(void);
 public:
         ConfigMainWindow(void);
 public slots:
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index ee225ced2ce4..8f06c474d800 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -30,7 +30,6 @@ struct symbol symbol_yes = {
         .flags = SYMBOL_VALID,
 };
 
-int sym_change_count;
 struct symbol *sym_defconfig_list;
 struct symbol *modules_sym;
 tristate modules_val;
@@ -379,7 +378,7 @@ void sym_clear_all_valid(void)
 
         for_all_symbols(i, sym)
                 sym->flags &= ~SYMBOL_VALID;
-        sym_change_count++;
+        sym_add_change_count(1);
         if (modules_sym)
                 sym_calc_value(modules_sym);
 }
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index 2fb0a4fc61d0..d777fe85627f 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -2135,7 +2135,7 @@ void conf_parse(const char *name)
                 sym_check_deps(sym);
         }
 
-        sym_change_count = 1;
+        sym_set_change_count(1);
 }
 
 const char *zconf_tokenname(int token)
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index ab44feb3c600..04a5864c03b1 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -504,7 +504,7 @@ void conf_parse(const char *name)
                 sym_check_deps(sym);
         }
 
-        sym_change_count = 1;
+        sym_set_change_count(1);
 }
 
 const char *zconf_tokenname(int token)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index ac0a58222992..15ab5d02e80a 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -997,6 +997,7 @@ static int exit_section_ref_ok(const char *name)
                 "__bug_table", /* used by powerpc for BUG() */
                 ".exitcall.exit",
                 ".eh_frame",
+                ".parainstructions",
                 ".stab",
                 "__ex_table",
                 ".fixup",
diff --git a/sound/aoa/fabrics/Kconfig b/sound/aoa/fabrics/Kconfig
index c3bc7705c86a..50d7021ff677 100644
--- a/sound/aoa/fabrics/Kconfig
+++ b/sound/aoa/fabrics/Kconfig
@@ -1,6 +1,6 @@
 config SND_AOA_FABRIC_LAYOUT
         tristate "layout-id fabric"
-        depends SND_AOA
+        depends on SND_AOA
         select SND_AOA_SOUNDBUS
         select SND_AOA_SOUNDBUS_I2S
         ---help---
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index f4c67042e3ac..3391f2a9b4d1 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -1023,7 +1023,7 @@ static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer, struct snd_mix
         }
         up_read(&mixer->card->controls_rwsem);
         if (slot.present != 0) {
-                pslot = (struct slot *)kmalloc(sizeof(slot), GFP_KERNEL);
+                pslot = kmalloc(sizeof(slot), GFP_KERNEL);
                 if (! pslot)
                         return -ENOMEM;
                 *pslot = slot;
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index 0ffa9970bf0f..7cf9913a47b2 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -1992,7 +1992,7 @@ int ad1848_init (char *name, struct resource *ports, int irq, int dma_playback,
                         devc->audio_flags |= DMA_DUPLEX;
         }
 
-        portc = (ad1848_port_info *) kmalloc(sizeof(ad1848_port_info), GFP_KERNEL);
+        portc = kmalloc(sizeof(ad1848_port_info), GFP_KERNEL);
         if(portc==NULL) {
                 release_region(devc->base, 4);
                 return -1;
diff --git a/sound/oss/cs4232.c b/sound/oss/cs4232.c
index b6924c7f1484..de40e21bf279 100644
--- a/sound/oss/cs4232.c
+++ b/sound/oss/cs4232.c
@@ -408,7 +408,7 @@ static int __init cs4232_pnp_probe(struct pnp_dev *dev, const struct pnp_device_
 {
         struct address_info *isapnpcfg;
 
-        isapnpcfg=(struct address_info*)kmalloc(sizeof(*isapnpcfg),GFP_KERNEL);
+        isapnpcfg = kmalloc(sizeof(*isapnpcfg),GFP_KERNEL);
         if (!isapnpcfg)
                 return -ENOMEM;
 
diff --git a/sound/oss/emu10k1/audio.c b/sound/oss/emu10k1/audio.c
index 49f902f35c28..efcf589d7083 100644
--- a/sound/oss/emu10k1/audio.c
+++ b/sound/oss/emu10k1/audio.c
@@ -1139,7 +1139,7 @@ static int emu10k1_audio_open(struct inode *inode, struct file *file)
 
 match:
 
-        wave_dev = (struct emu10k1_wavedevice *) kmalloc(sizeof(struct emu10k1_wavedevice), GFP_KERNEL);
+        wave_dev = kmalloc(sizeof(struct emu10k1_wavedevice), GFP_KERNEL);
 
         if (wave_dev == NULL) { 
                 ERROR();
@@ -1155,7 +1155,7 @@ match:
                 /* Recording */
                 struct wiinst *wiinst;
 
-                if ((wiinst = (struct wiinst *) kmalloc(sizeof(struct wiinst), GFP_KERNEL)) == NULL) {
+                if ((wiinst = kmalloc(sizeof(struct wiinst), GFP_KERNEL)) == NULL) {
                         ERROR();
                         kfree(wave_dev);
                         return -ENOMEM;
@@ -1211,7 +1211,7 @@ match:
                 struct woinst *woinst;
                 int i;
 
-                if ((woinst = (struct woinst *) kmalloc(sizeof(struct woinst), GFP_KERNEL)) == NULL) {
+                if ((woinst = kmalloc(sizeof(struct woinst), GFP_KERNEL)) == NULL) {
                         ERROR();
                         kfree(wave_dev);
                         return -ENOMEM;
diff --git a/sound/oss/emu10k1/cardmi.c b/sound/oss/emu10k1/cardmi.c
index 0545814cc67d..57674f8c8a2e 100644
--- a/sound/oss/emu10k1/cardmi.c
+++ b/sound/oss/emu10k1/cardmi.c
@@ -157,7 +157,7 @@ int emu10k1_mpuin_add_buffer(struct emu10k1_mpuin *card_mpuin, struct midi_hdr *
         midihdr->flags |= MIDIBUF_INQUEUE;      /* set */
         midihdr->flags &= ~MIDIBUF_DONE;        /* clear */
 
-        if ((midiq = (struct midi_queue *) kmalloc(sizeof(struct midi_queue), GFP_ATOMIC)) == NULL) {
+        if ((midiq = kmalloc(sizeof(struct midi_queue), GFP_ATOMIC)) == NULL) {
                 /* Message lost */
                 return -1;
         }
diff --git a/sound/oss/emu10k1/cardmo.c b/sound/oss/emu10k1/cardmo.c
index 5938d31f9e21..a8cc75db3e45 100644
--- a/sound/oss/emu10k1/cardmo.c
+++ b/sound/oss/emu10k1/cardmo.c
@@ -117,7 +117,7 @@ int emu10k1_mpuout_add_buffer(struct emu10k1_card *card, struct midi_hdr *midihd
         midihdr->flags |= MIDIBUF_INQUEUE;
         midihdr->flags &= ~MIDIBUF_DONE;
 
-        if ((midiq = (struct midi_queue *) kmalloc(sizeof(struct midi_queue), GFP_KERNEL)) == NULL) {
+        if ((midiq = kmalloc(sizeof(struct midi_queue), GFP_KERNEL)) == NULL) {
                 /* Message lost */
                 return -1;
         }
diff --git a/sound/oss/emu10k1/midi.c b/sound/oss/emu10k1/midi.c
index 8ac77df86397..cca3dad2bdf4 100644
--- a/sound/oss/emu10k1/midi.c
+++ b/sound/oss/emu10k1/midi.c
@@ -58,7 +58,7 @@ static int midiin_add_buffer(struct emu10k1_mididevice *midi_dev, struct midi_hd
 {
         struct midi_hdr *midihdr;
 
-        if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct midi_hdr), GFP_KERNEL)) == NULL) {
+        if ((midihdr = kmalloc(sizeof(struct midi_hdr), GFP_KERNEL)) == NULL) {
                 ERROR();
                 return -EINVAL;
         }
@@ -128,7 +128,7 @@ match:
                 mutex_lock(&card->open_sem);
         }
 
-        if ((midi_dev = (struct emu10k1_mididevice *) kmalloc(sizeof(*midi_dev), GFP_KERNEL)) == NULL)
+        if ((midi_dev = kmalloc(sizeof(*midi_dev), GFP_KERNEL)) == NULL)
                 return -EINVAL;
 
         midi_dev->card = card;
@@ -328,7 +328,7 @@ static ssize_t emu10k1_midi_write(struct file *file, const char __user *buffer,
         if (!access_ok(VERIFY_READ, buffer, count))
                 return -EFAULT;
 
-        if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct midi_hdr), GFP_KERNEL)) == NULL)
+        if ((midihdr = kmalloc(sizeof(struct midi_hdr), GFP_KERNEL)) == NULL)
                 return -EINVAL;
 
         midihdr->bufferlength = count;
@@ -490,7 +490,7 @@ int emu10k1_seq_midi_open(int dev, int mode,
                         
         DPF(2, "emu10k1_seq_midi_open()\n");
         
-        if ((midi_dev = (struct emu10k1_mididevice *) kmalloc(sizeof(*midi_dev), GFP_KERNEL)) == NULL)
+        if ((midi_dev = kmalloc(sizeof(*midi_dev), GFP_KERNEL)) == NULL)
                 return -EINVAL;
 
         midi_dev->card = card;
@@ -540,7 +540,7 @@ int emu10k1_seq_midi_out(int dev, unsigned char midi_byte)
 
         card = midi_devs[dev]->devc;
 
-        if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct midi_hdr), GFP_KERNEL)) == NULL)
+        if ((midihdr = kmalloc(sizeof(struct midi_hdr), GFP_KERNEL)) == NULL)
                 return -EINVAL;
 
         midihdr->bufferlength = 1;
diff --git a/sound/oss/emu10k1/mixer.c b/sound/oss/emu10k1/mixer.c
index cbcaaa34189a..6419796c2ed7 100644
--- a/sound/oss/emu10k1/mixer.c
+++ b/sound/oss/emu10k1/mixer.c
@@ -194,7 +194,7 @@ static int emu10k1_private_mixer(struct emu10k1_card *card, unsigned int cmd, un
 
         case SOUND_MIXER_PRIVATE3:
 
-                ctl = (struct mixer_private_ioctl *) kmalloc(sizeof(struct mixer_private_ioctl), GFP_KERNEL);
+                ctl = kmalloc(sizeof(struct mixer_private_ioctl), GFP_KERNEL);
                 if (ctl == NULL)
                         return -ENOMEM;
 
diff --git a/sound/oss/hal2.c b/sound/oss/hal2.c
index 784bdd707055..d18286ccc14d 100644
--- a/sound/oss/hal2.c
+++ b/sound/oss/hal2.c
@@ -1435,7 +1435,7 @@ static int hal2_init_card(struct hal2_card **phal2, struct hpc3_regs *hpc3)
         int ret = 0;
         struct hal2_card *hal2;
 
-        hal2 = (struct hal2_card *) kmalloc(sizeof(struct hal2_card), GFP_KERNEL);
+        hal2 = kmalloc(sizeof(struct hal2_card), GFP_KERNEL);
         if (!hal2)
                 return -ENOMEM;
         memset(hal2, 0, sizeof(struct hal2_card));
diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c
index e96220541971..2796c0ef985f 100644
--- a/sound/oss/mpu401.c
+++ b/sound/oss/mpu401.c
@@ -1023,7 +1023,7 @@ int attach_mpu401(struct address_info *hw_config, struct module *owner)
                                 devc->capabilities |= MPU_CAP_INTLG;    /* Supports intelligent mode */
 
 
-        mpu401_synth_operations[m] = (struct synth_operations *)kmalloc(sizeof(struct synth_operations), GFP_KERNEL);
+        mpu401_synth_operations[m] = kmalloc(sizeof(struct synth_operations), GFP_KERNEL);
 
         if (mpu401_synth_operations[m] == NULL)
         {
diff --git a/sound/oss/opl3.c b/sound/oss/opl3.c
index 4799bc77f987..2e8cfa5481f2 100644
--- a/sound/oss/opl3.c
+++ b/sound/oss/opl3.c
@@ -166,7 +166,7 @@ int opl3_detect(int ioaddr, int *osp)
                 return 0;
         }
 
-        devc = (struct opl_devinfo *)kmalloc(sizeof(*devc), GFP_KERNEL);
+        devc = kmalloc(sizeof(*devc), GFP_KERNEL);
 
         if (devc == NULL)
         {
diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c
index 440537c72604..07cbacf63824 100644
--- a/sound/oss/sb_common.c
+++ b/sound/oss/sb_common.c
@@ -625,7 +625,7 @@ int sb_dsp_detect(struct address_info *hw_config, int pci, int pciio, struct sb_
          */
 
 
-        detected_devc = (sb_devc *)kmalloc(sizeof(sb_devc), GFP_KERNEL);
+        detected_devc = kmalloc(sizeof(sb_devc), GFP_KERNEL);
         if (detected_devc == NULL)
         {
                 printk(KERN_ERR "sb: Can't allocate memory for device information\n");
diff --git a/sound/oss/sb_midi.c b/sound/oss/sb_midi.c
index 2e3bc045caba..8b796704e112 100644
--- a/sound/oss/sb_midi.c
+++ b/sound/oss/sb_midi.c
@@ -173,7 +173,7 @@ void sb_dsp_midi_init(sb_devc * devc, struct module *owner)
                 return;
         }
         std_midi_synth.midi_dev = devc->my_mididev = dev;
-        midi_devs[dev] = (struct midi_operations *)kmalloc(sizeof(struct midi_operations), GFP_KERNEL);
+        midi_devs[dev] = kmalloc(sizeof(struct midi_operations), GFP_KERNEL);
         if (midi_devs[dev] == NULL)
         {
                 printk(KERN_WARNING "Sound Blaster:  failed to allocate MIDI memory.\n");
@@ -189,7 +189,7 @@ void sb_dsp_midi_init(sb_devc * devc, struct module *owner)
         midi_devs[dev]->devc = devc;
 
 
-        midi_devs[dev]->converter = (struct synth_operations *)kmalloc(sizeof(struct synth_operations), GFP_KERNEL);
+        midi_devs[dev]->converter = kmalloc(sizeof(struct synth_operations), GFP_KERNEL);
         if (midi_devs[dev]->converter == NULL)
         {
                   printk(KERN_WARNING "Sound Blaster:  failed to allocate MIDI memory.\n");
diff --git a/sound/oss/sb_mixer.c b/sound/oss/sb_mixer.c
index 238e2cf44b08..fad1a4f25ad6 100644
--- a/sound/oss/sb_mixer.c
+++ b/sound/oss/sb_mixer.c
@@ -734,7 +734,7 @@ int sb_mixer_init(sb_devc * devc, struct module *owner)
         if (m == -1)
                 return 0;
 
-        mixer_devs[m] = (struct mixer_operations *)kmalloc(sizeof(struct mixer_operations), GFP_KERNEL);
+        mixer_devs[m] = kmalloc(sizeof(struct mixer_operations), GFP_KERNEL);
         if (mixer_devs[m] == NULL)
         {
                 printk(KERN_ERR "sb_mixer: Can't allocate memory\n");
diff --git a/sound/oss/v_midi.c b/sound/oss/v_midi.c
index d952b2264da1..103940fd5b4f 100644
--- a/sound/oss/v_midi.c
+++ b/sound/oss/v_midi.c
@@ -183,7 +183,7 @@ static void __init attach_v_midi (struct address_info *hw_config)
                 return;
         }
         
-        m=(struct vmidi_memory *)kmalloc(sizeof(struct vmidi_memory), GFP_KERNEL);
+        m = kmalloc(sizeof(struct vmidi_memory), GFP_KERNEL);
         if (m == NULL)
         {
                 printk(KERN_WARNING "Loopback MIDI: Failed to allocate memory\n");
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index c5bf363d32c2..26a7c6af95bc 100644
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -1267,7 +1267,7 @@ static int __init waveartist_init(wavnc_info *devc)
         conf_printf2(dev_name, devc->hw.io_base, devc->hw.irq,
                      devc->hw.dma, devc->hw.dma2);
 
-        portc = (wavnc_port_info *)kmalloc(sizeof(wavnc_port_info), GFP_KERNEL);
+        portc = kmalloc(sizeof(wavnc_port_info), GFP_KERNEL);
         if (portc == NULL)
                 goto nomem;