211 files changed, 3733 insertions, 2197 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index fa75220f8d34..89a47b5aff07 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -354,14 +354,6 @@ Who:  Krzysztof Piotr Oledzki <ole@ans.pl>
 ---------------------------
-What:   fscher and fscpos drivers
-When:   June 2009
-Why:    Deprecated by the new fschmd driver.
-Who:    Hans de Goede <hdegoede@redhat.com>
-        Jean Delvare <khali@linux-fr.org>
---------------------------
 What:   sysfs ui for changing p4-clockmod parameters
 When:   September 2009
 Why:    See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and
diff --git a/Documentation/filesystems/9p.txt b/Documentation/filesystems/9p.txt
index 6208f55c44c3..57e0b80a5274 100644
--- a/Documentation/filesystems/9p.txt
+++ b/Documentation/filesystems/9p.txt
@@ -18,11 +18,11 @@ the 9p client is available in the form of a USENIX paper:
 Other applications are described in the following papers:
        * XCPU & Clustering
-                http://www.xcpu.org/xcpu-talk.pdf
+                http://xcpu.org/papers/xcpu-talk.pdf
        * KVMFS: control file system for KVM
-                http://www.xcpu.org/kvmfs.pdf
+                http://xcpu.org/papers/kvmfs.pdf
-        * CellFS: A New ProgrammingModel for the Cell BE
+        * CellFS: A New Programming Model for the Cell BE
-                http://www.xcpu.org/cellfs-talk.pdf
+                http://xcpu.org/papers/cellfs-talk.pdf
        * PROSE I/O: Using 9p to enable Application Partitions
                http://plan9.escet.urjc.es/iwp9/cready/PROSE_iwp9_2006.pdf
@@ -48,6 +48,7 @@ OPTIONS
                                (see rfdno and wfdno)
                        virtio  - connect to the next virtio channel available
                                (from lguest or KVM with trans_virtio module)
+                        rdma    - connect to a specified RDMA channel
  uname=name    user name to attempt mount as on the remote server.  The
                server may override or ignore this value.  Certain user
@@ -59,16 +60,22 @@ OPTIONS
  cache=mode    specifies a caching policy.  By default, no caches are used.
                        loose = no attempts are made at consistency,
                                intended for exclusive, read-only mounts
+                        fscache = use FS-Cache for a persistent, read-only
+                                cache backend.
  debug=n       specifies debug level.  The debug level is a bitmask.
-                        0x01 = display verbose error messages
+                        0x01  = display verbose error messages
-                        0x02 = developer debug (DEBUG_CURRENT)
+                        0x02  = developer debug (DEBUG_CURRENT)
-                        0x04 = display 9p trace
+                        0x04  = display 9p trace
-                        0x08 = display VFS trace
+                        0x08  = display VFS trace
-                        0x10 = display Marshalling debug
+                        0x10  = display Marshalling debug
-                        0x20 = display RPC debug
+                        0x20  = display RPC debug
-                        0x40 = display transport debug
+                        0x40  = display transport debug
-                        0x80 = display allocation debug
+                        0x80  = display allocation debug
+                        0x100 = display protocol message debug
+                        0x200 = display Fid debug
+                        0x400 = display packet debug
+                        0x800 = display fscache tracing debug
  rfdno=n       the file descriptor for reading with trans=fd
@@ -100,6 +107,10 @@ OPTIONS
                        any   = v9fs does single attach and performs all
                                operations as one user
+  cachetag      cache tag to use the specified persistent cache.
+                cache tags for existing cache sessions can be listed at
+                /sys/fs/9p/caches. (applies only to cache=fscache)
 RESOURCES
 =========
@@ -118,7 +129,7 @@ and export.
 A Linux version of the 9p server is now maintained under the npfs project
 on sourceforge (http://sourceforge.net/projects/npfs).  The currently
 maintained version is the single-threaded version of the server (named spfs)
-available from the same CVS repository.
+available from the same SVN repository.
 There are user and developer mailing lists available through the v9fs project
 on sourceforge (http://sourceforge.net/projects/v9fs).
@@ -126,7 +137,8 @@ on sourceforge (http://sourceforge.net/projects/v9fs).
 A stand-alone version of the module (which should build for any 2.6 kernel)
 is available via (http://github.com/ericvh/9p-sac/tree/master)
-News and other information is maintained on SWiK (http://swik.net/v9fs).
+News and other information is maintained on SWiK (http://swik.net/v9fs)
+and the Wiki (http://sf.net/apps/mediawiki/v9fs/index.php).
 Bug reports may be issued through the kernel.org bugzilla 
 (http://bugzilla.kernel.org)
diff --git a/Documentation/hwmon/coretemp b/Documentation/hwmon/coretemp
index dbbe6c7025b0..92267b62db59 100644
--- a/Documentation/hwmon/coretemp
+++ b/Documentation/hwmon/coretemp
@@ -4,7 +4,9 @@ Kernel driver coretemp
 Supported chips:
  * All Intel Core family
    Prefix: 'coretemp'
-    CPUID: family 0x6, models 0xe, 0xf, 0x16, 0x17
+    CPUID: family 0x6, models 0xe (Pentium M DC), 0xf (Core 2 DC 65nm),
+                              0x16 (Core 2 SC 65nm), 0x17 (Penryn 45nm),
+                              0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield)
    Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual
               Volume 3A: System Programming Guide
               http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
diff --git a/Documentation/hwmon/fscher b/Documentation/hwmon/fscher
deleted file mode 100644
index 64031659aff3..000000000000
--- a/Documentation/hwmon/fscher
+++ /dev/null
@@ -1,169 +0,0 @@
-Kernel driver fscher
-====================
-Supported chips:
-  * Fujitsu-Siemens Hermes chip
-    Prefix: 'fscher'
-    Addresses scanned: I2C 0x73
-Authors:
-        Reinhard Nissl <rnissl@gmx.de> based on work
-        from Hermann Jung <hej@odn.de>,
-        Frodo Looijaard <frodol@dds.nl>,
-        Philip Edelbrock <phil@netroedge.com>
-Description
-----------
-This driver implements support for the Fujitsu-Siemens Hermes chip. It is
-described in the 'Register Set Specification BMC Hermes based Systemboard'
-from Fujitsu-Siemens.
-The Hermes chip implements a hardware-based system management, e.g. for
-controlling fan speed and core voltage. There is also a watchdog counter on
-the chip which can trigger an alarm and even shut the system down.
-The chip provides three temperature values (CPU, motherboard and
-auxiliary), three voltage values (+12V, +5V and battery) and three fans
-(power supply, CPU and auxiliary).
-Temperatures are measured in degrees Celsius. The resolution is 1 degree.
-Fan rotation speeds are reported in RPM (rotations per minute). The value
-can be divided by a programmable divider (1, 2 or 4) which is stored on
-the chip.
-Voltage sensors (also known as "in" sensors) report their values in volts.
-All values are reported as final values from the driver. There is no need
-for further calculations.
-Detailed description
--------------------
-Below you'll find a single line description of all the bit values. With
-this information, you're able to decode e. g. alarms, wdog, etc. To make
-use of the watchdog, you'll need to set the watchdog time and enable the
-watchdog. After that it is necessary to restart the watchdog time within
-the specified period of time, or a system reset will occur.
-* revision
-  READING & 0xff = 0x??: HERMES revision identification
-* alarms
-  READING & 0x80 = 0x80: CPU throttling active
-  READING & 0x80 = 0x00: CPU running at full speed
-  READING & 0x10 = 0x10: software event (see control:1)
-  READING & 0x10 = 0x00: no software event
-  READING & 0x08 = 0x08: watchdog event (see wdog:2)
-  READING & 0x08 = 0x00: no watchdog event
-  READING & 0x02 = 0x02: thermal event (see temp*:1)
-  READING & 0x02 = 0x00: no thermal event
-  READING & 0x01 = 0x01: fan event (see fan*:1)
-  READING & 0x01 = 0x00: no fan event
-  READING & 0x13 ! 0x00: ALERT LED is flashing
-* control
-  READING & 0x01 = 0x01: software event
-  READING & 0x01 = 0x00: no software event
-  WRITING & 0x01 = 0x01: set software event
-  WRITING & 0x01 = 0x00: clear software event
-* watchdog_control
-  READING & 0x80 = 0x80: power off on watchdog event while thermal event
-  READING & 0x80 = 0x00: watchdog power off disabled (just system reset enabled)
-  READING & 0x40 = 0x40: watchdog timebase 60 seconds (see also wdog:1)
-  READING & 0x40 = 0x00: watchdog timebase  2 seconds
-  READING & 0x10 = 0x10: watchdog enabled
-  READING & 0x10 = 0x00: watchdog disabled
-  WRITING & 0x80 = 0x80: enable "power off on watchdog event while thermal event"
-  WRITING & 0x80 = 0x00: disable "power off on watchdog event while thermal event"
-  WRITING & 0x40 = 0x40: set watchdog timebase to 60 seconds
-  WRITING & 0x40 = 0x00: set watchdog timebase to  2 seconds
-  WRITING & 0x20 = 0x20: disable watchdog
-  WRITING & 0x10 = 0x10: enable watchdog / restart watchdog time
-* watchdog_state
-  READING & 0x02 = 0x02: watchdog system reset occurred
-  READING & 0x02 = 0x00: no watchdog system reset occurred
-  WRITING & 0x02 = 0x02: clear watchdog event
-* watchdog_preset
-  READING & 0xff = 0x??: configured watch dog time in units (see wdog:3 0x40)
-  WRITING & 0xff = 0x??: configure watch dog time in units
-* in*     (0: +5V, 1: +12V, 2: onboard 3V battery)
-  READING: actual voltage value
-* temp*_status   (1: CPU sensor, 2: onboard sensor, 3: auxiliary sensor)
-  READING & 0x02 = 0x02: thermal event (overtemperature)
-  READING & 0x02 = 0x00: no thermal event
-  READING & 0x01 = 0x01: sensor is working
-  READING & 0x01 = 0x00: sensor is faulty
-  WRITING & 0x02 = 0x02: clear thermal event
-* temp*_input   (1: CPU sensor, 2: onboard sensor, 3: auxiliary sensor)
-  READING: actual temperature value
-* fan*_status   (1: power supply fan, 2: CPU fan, 3: auxiliary fan)
-  READING & 0x04 = 0x04: fan event (fan fault)
-  READING & 0x04 = 0x00: no fan event
-  WRITING & 0x04 = 0x04: clear fan event
-* fan*_div (1: power supply fan, 2: CPU fan, 3: auxiliary fan)
-        Divisors 2,4 and 8 are supported, both for reading and writing
-* fan*_pwm   (1: power supply fan, 2: CPU fan, 3: auxiliary fan)
-  READING & 0xff = 0x00: fan may be switched off
-  READING & 0xff = 0x01: fan must run at least at minimum speed (supply: 6V)
-  READING & 0xff = 0xff: fan must run at maximum speed (supply: 12V)
-  READING & 0xff = 0x??: fan must run at least at given speed (supply: 6V..12V)
-  WRITING & 0xff = 0x00: fan may be switched off
-  WRITING & 0xff = 0x01: fan must run at least at minimum speed (supply: 6V)
-  WRITING & 0xff = 0xff: fan must run at maximum speed (supply: 12V)
-  WRITING & 0xff = 0x??: fan must run at least at given speed (supply: 6V..12V)
-* fan*_input   (1: power supply fan, 2: CPU fan, 3: auxiliary fan)
-  READING: actual RPM value
-Limitations
-----------
-* Measuring fan speed
-It seems that the chip counts "ripples" (typical fans produce 2 ripples per
-rotation while VERAX fans produce 18) in a 9-bit register. This register is
-read out every second, then the ripple prescaler (2, 4 or 8) is applied and
-the result is stored in the 8 bit output register. Due to the limitation of
-the counting register to 9 bits, it is impossible to measure a VERAX fan
-properly (even with a prescaler of 8). At its maximum speed of 3500 RPM the
-fan produces 1080 ripples per second which causes the counting register to
-overflow twice, leading to only 186 RPM.
-* Measuring input voltages
-in2 ("battery") reports the voltage of the onboard lithium battery and not
-+3.3V from the power supply.
-* Undocumented features
-Fujitsu-Siemens Computers has not documented all features of the chip so
-far. Their software, System Guard, shows that there are a still some
-features which cannot be controlled by this implementation.
diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt
index f3355b6812df..bb3bf38f03da 100644
--- a/Documentation/kbuild/kbuild.txt
+++ b/Documentation/kbuild/kbuild.txt
@@ -65,6 +65,22 @@ INSTALL_PATH
 INSTALL_PATH specifies where to place the updated kernel and system map
 images. Default is /boot, but you can set it to other values.
+INSTALLKERNEL
+--------------------------------------------------
+Install script called when using "make install".
+The default name is "installkernel".
+The script will be called with the following arguments:
+    $1 - kernel version
+    $2 - kernel image file
+    $3 - kernel map file
+    $4 - default install path (use root directory if blank)
+The implmentation of "make install" is architecture specific
+and it may differ from the above.
+INSTALLKERNEL is provided to enable the possibility to
+specify a custom installer when cross compiling a kernel.
 MODLIB
 --------------------------------------------------
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index d76cfd8712e1..71c602d61680 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -18,6 +18,7 @@ This document describes the Linux kernel Makefiles.
           --- 3.9 Dependency tracking
           --- 3.10 Special Rules
           --- 3.11 $(CC) support functions
+           --- 3.12 $(LD) support functions
        === 4 Host Program support
           --- 4.1 Simple Host Program
@@ -435,14 +436,14 @@ more details, with real examples.
        The second argument is optional, and if supplied will be used
        if first argument is not supported.
-    ld-option
+    cc-ldoption
-        ld-option is used to check if $(CC) when used to link object files
+        cc-ldoption is used to check if $(CC) when used to link object files
        supports the given option.  An optional second option may be
        specified if first option are not supported.
        Example:
                #arch/i386/kernel/Makefile
-                vsyscall-flags += $(call ld-option, -Wl$(comma)--hash-style=sysv)
+                vsyscall-flags += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
        In the above example, vsyscall-flags will be assigned the option
        -Wl$(comma)--hash-style=sysv if it is supported by $(CC).
@@ -570,6 +571,19 @@ more details, with real examples.
                        endif
                endif
+--- 3.12 $(LD) support functions
+    ld-option
+        ld-option is used to check if $(LD) supports the supplied option.
+        ld-option takes two options as arguments.
+        The second argument is an optional option that can be used if the
+        first option is not supported by $(LD).
+        Example:
+                #Makefile
+                LDFLAGS_vmlinux += $(call really-ld-option, -X)
 === 4 Host Program support
 Kbuild supports building executables on the host for use during the
diff --git a/Makefile b/Makefile
index 433493a2b77b..f908accd332b 100644
--- a/Makefile
+++ b/Makefile
@@ -179,9 +179,46 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
 # Alternatively CROSS_COMPILE can be set in the environment.
 # Default value for CROSS_COMPILE is not to prefix executables
 # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
+#
+# To force ARCH and CROSS_COMPILE settings include kernel.* files
+# in the kernel tree - do not patch this file.
 export KBUILD_BUILDHOST := $(SUBARCH)
-ARCH            ?= $(SUBARCH)
-CROSS_COMPILE   ?=
+# Kbuild save the ARCH and CROSS_COMPILE setting in kernel.* files.
+# Restore these settings and check that user did not specify
+# conflicting values.
+saved_arch  := $(shell cat include/generated/kernel.arch  2> /dev/null)
+saved_cross := $(shell cat include/generated/kernel.cross 2> /dev/null)
+ifneq ($(CROSS_COMPILE),)
+        ifneq ($(saved_cross),)
+                ifneq ($(CROSS_COMPILE),$(saved_cross))
+                        $(error CROSS_COMPILE changed from \
+                                "$(saved_cross)" to \
+                                 to "$(CROSS_COMPILE)". \
+                                 Use "make mrproper" to fix it up)
+                endif
+        endif
+else
+    CROSS_COMPILE := $(saved_cross)
+endif
+ifneq ($(ARCH),)
+        ifneq ($(saved_arch),)
+                ifneq ($(saved_arch),$(ARCH))
+                        $(error ARCH changed from \
+                                "$(saved_arch)" to "$(ARCH)". \
+                                 Use "make mrproper" to fix it up)
+                endif
+        endif
+else
+        ifneq ($(saved_arch),)
+                ARCH := $(saved_arch)
+        else
+                ARCH := $(SUBARCH)
+        endif
+endif
 # Architecture as present in compile.h
 UTS_MACHINE     := $(ARCH)
@@ -315,6 +352,7 @@ OBJCOPY		= $(CROSS_COMPILE)objcopy
 OBJDUMP         = $(CROSS_COMPILE)objdump
 AWK             = awk
 GENKSYMS        = scripts/genksyms/genksyms
+INSTALLKERNEL  := installkernel
 DEPMOD          = /sbin/depmod
 KALLSYMS        = scripts/kallsyms
 PERL            = perl
@@ -353,7 +391,8 @@ KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
 export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
-export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE
+export CPP AR NM STRIP OBJCOPY OBJDUMP
+export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE
 export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
 export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
@@ -444,6 +483,11 @@ ifeq ($(config-targets),1)
 include $(srctree)/arch/$(SRCARCH)/Makefile
 export KBUILD_DEFCONFIG KBUILD_KCONFIG
+# save ARCH & CROSS_COMPILE settings
+$(shell mkdir -p include/generated &&                            \
+        echo $(ARCH)          > include/generated/kernel.arch && \
+        echo $(CROSS_COMPILE) > include/generated/kernel.cross)
 config: scripts_basic outputmakefile FORCE
        $(Q)mkdir -p include/linux include/config
        $(Q)$(MAKE) $(build)=scripts/kconfig $@
@@ -571,6 +615,9 @@ KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)
 # revert to pre-gcc-4.4 behaviour of .eh_frame
 KBUILD_CFLAGS   += $(call cc-option,-fno-dwarf2-cfi-asm)
+# conserve stack if available
+KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)
 # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
 # But warn user when we do so
 warn-assign = \
@@ -591,12 +638,12 @@ endif
 # Use --build-id when available.
 LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\
-                              $(call ld-option, -Wl$(comma)--build-id,))
+                              $(call cc-ldoption, -Wl$(comma)--build-id,))
 LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID)
 LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID)
 ifeq ($(CONFIG_STRIP_ASM_SYMS),y)
-LDFLAGS_vmlinux += -X
+LDFLAGS_vmlinux += $(call ld-option, -X,)
 endif
 # Default kernel image to build when no specific target is given.
@@ -980,11 +1027,6 @@ prepare0: archprepare FORCE
 # All the preparing..
 prepare: prepare0
-# Leave this as default for preprocessing vmlinux.lds.S, which is now
-# done in arch/$(ARCH)/kernel/Makefile
-export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH)
 # The asm symlink changes when $(ARCH) changes.
 # Detect this and ask user to run make mrproper
 # If asm is a stale symlink (point to dir that does not exist) remove it
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index 3a2fb7a02db4..289039bb6bb2 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -19,7 +19,6 @@
 #include <linux/ptrace.h>
 #include <linux/slab.h>
 #include <linux/user.h>
-#include <linux/utsname.h>
 #include <linux/time.h>
 #include <linux/major.h>
 #include <linux/stat.h>
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 54661125a8bf..a73caaf66763 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -14,7 +14,7 @@ LDFLAGS_vmlinux	:=-p --no-undefined -X
 ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)
 LDFLAGS_vmlinux += --be8
 endif
-CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)
 OBJCOPYFLAGS    :=-O binary -R .note -R .note.gnu.build-id -R .comment -S
 GZFLAGS         :=-9
 #KBUILD_CFLAGS  +=-pipe
@@ -279,7 +279,7 @@ define archhelp
  echo  '                  (supply initrd image via make variable INITRD=<path>)'
  echo  '  install       - Install uncompressed kernel'
  echo  '  zinstall      - Install compressed kernel'
-  echo  '                  Install using (your) ~/bin/installkernel or'
+  echo  '                  Install using (your) ~/bin/$(INSTALLKERNEL) or'
-  echo  '                  (distribution) /sbin/installkernel or'
+  echo  '                  (distribution) /sbin/$(INSTALLKERNEL) or'
  echo  '                  install to $$(INSTALL_PATH) and run lilo'
 endef
diff --git a/arch/arm/boot/install.sh b/arch/arm/boot/install.sh
index 9f9bed207345..06ea7d42ce8e 100644
--- a/arch/arm/boot/install.sh
+++ b/arch/arm/boot/install.sh
@@ -21,8 +21,8 @@
 #
 # User may have a custom install script
-if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi
+if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
-if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi
+if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
 if [ "$(basename $2)" = "zImage" ]; then
 # Compressed install
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 3213c9382b17..c446aeff7b89 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -2,7 +2,8 @@
 # Makefile for the linux kernel.
 #
-AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
+CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET)
+AFLAGS_head.o        := -DTEXT_OFFSET=$(TEXT_OFFSET)
 ifdef CONFIG_DYNAMIC_FTRACE
 CFLAGS_REMOVE_ftrace.o = -pg
diff --git a/arch/arm/kernel/init_task.c b/arch/arm/kernel/init_task.c
index 3f470866bb89..e7cbb50dc356 100644
--- a/arch/arm/kernel/init_task.c
+++ b/arch/arm/kernel/init_task.c
@@ -24,9 +24,8 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 *
 * The things we do for performance..
 */
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-                { INIT_THREAD_INFO(init_task) };
 /*
 * Initial task structure.
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index b3ec641b5cf8..78ecaac65206 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -25,7 +25,6 @@
 #include <linux/mman.h>
 #include <linux/fs.h>
 #include <linux/file.h>
-#include <linux/utsname.h>
 #include <linux/ipc.h>
 #include <linux/uaccess.h>
diff --git a/arch/avr32/kernel/init_task.c b/arch/avr32/kernel/init_task.c
index 57ec9f2dcd95..6b2343e6fe33 100644
--- a/arch/avr32/kernel/init_task.c
+++ b/arch/avr32/kernel/init_task.c
@@ -18,9 +18,8 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 /*
 * Initial thread structure. Must be aligned on an 8192-byte boundary.
 */
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-                { INIT_THREAD_INFO(init_task) };
 /*
 * Initial task structure.
diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c
index 376f18c4a6cb..94925641e53e 100644
--- a/arch/avr32/mm/init.c
+++ b/arch/avr32/mm/init.c
@@ -24,11 +24,9 @@
 #include <asm/setup.h>
 #include <asm/sections.h>
-#define __page_aligned  __attribute__((section(".data.page_aligned")))
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned;
+pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_data;
 struct page *empty_zero_page;
 EXPORT_SYMBOL(empty_zero_page);
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile
index 6f9533c3d752..f063b772934b 100644
--- a/arch/blackfin/Makefile
+++ b/arch/blackfin/Makefile
@@ -155,7 +155,7 @@ define archhelp
  echo  '* vmImage.gz      - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.gz)'
  echo  '  vmImage.lzma    - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzma)'
  echo  '  install         - Install kernel using'
-  echo  '                     (your) ~/bin/$(CROSS_COMPILE)installkernel or'
+  echo  '                     (your) ~/bin/$(INSTALLKERNEL) or'
-  echo  '                     (distribution) PATH: $(CROSS_COMPILE)installkernel or'
+  echo  '                     (distribution) PATH: $(INSTALLKERNEL) or'
  echo  '                     install to $$(INSTALL_PATH)'
 endef
diff --git a/arch/blackfin/boot/install.sh b/arch/blackfin/boot/install.sh
index 9560a6b29100..e2c6e40902b7 100644
--- a/arch/blackfin/boot/install.sh
+++ b/arch/blackfin/boot/install.sh
@@ -36,9 +36,9 @@ verify "$3"
 # User may have a custom install script
-if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi
+if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
-if which ${CROSS_COMPILE}installkernel >/dev/null 2>&1; then
+if which ${INSTALLKERNEL} >/dev/null 2>&1; then
-        exec ${CROSS_COMPILE}installkernel "$@"
+        exec ${INSTALLKERNEL} "$@"
 fi
 # Default install - same as make zlilo
diff --git a/arch/cris/Makefile b/arch/cris/Makefile
index 71e17d3eeddb..29c2ceb38a76 100644
--- a/arch/cris/Makefile
+++ b/arch/cris/Makefile
@@ -42,8 +42,6 @@ LD = $(CROSS_COMPILE)ld -mcrislinux
 OBJCOPYFLAGS := -O binary -R .note -R .comment -S
-CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
 KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
 KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
 KBUILD_CPPFLAGS += $(inc)
diff --git a/arch/cris/kernel/Makefile b/arch/cris/kernel/Makefile
index ee7bcd4d20b2..b45640b3e600 100644
--- a/arch/cris/kernel/Makefile
+++ b/arch/cris/kernel/Makefile
@@ -3,6 +3,7 @@
 # Makefile for the linux kernel.
 #
+CPPFLAGS_vmlinux.lds := -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
 extra-y := vmlinux.lds
 obj-y   := process.o traps.o irq.o ptrace.o setup.o time.o sys_cris.o
diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c
index 51dcd04d2777..c99aeab7cef7 100644
--- a/arch/cris/kernel/process.c
+++ b/arch/cris/kernel/process.c
@@ -45,9 +45,8 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 * way process stacks are handled. This is done by having a special
 * "init_task" linker map entry..
 */
-union thread_union init_thread_union 
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-                { INIT_THREAD_INFO(init_task) };
 /*
 * Initial task structure.
diff --git a/arch/frv/kernel/init_task.c b/arch/frv/kernel/init_task.c
index 1d3df1d9495c..3c3e0b336a9d 100644
--- a/arch/frv/kernel/init_task.c
+++ b/arch/frv/kernel/init_task.c
@@ -19,9 +19,8 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 * way process stacks are handled. This is done by having a special
 * "init_task" linker map entry..
 */
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-                { INIT_THREAD_INFO(init_task) };
 /*
 * Initial task structure.
diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c
index baadc97f8627..2b6b5289cdcc 100644
--- a/arch/frv/kernel/sys_frv.c
+++ b/arch/frv/kernel/sys_frv.c
@@ -21,7 +21,6 @@
 #include <linux/stat.h>
 #include <linux/mman.h>
 #include <linux/file.h>
-#include <linux/utsname.h>
 #include <linux/syscalls.h>
 #include <linux/ipc.h>
diff --git a/arch/h8300/kernel/init_task.c b/arch/h8300/kernel/init_task.c
index 089c65ed6eb3..54c1062ee80e 100644
--- a/arch/h8300/kernel/init_task.c
+++ b/arch/h8300/kernel/init_task.c
@@ -31,7 +31,6 @@ EXPORT_SYMBOL(init_task);
 * way process stacks are handled. This is done by having a special
 * "init_task" linker map entry..
 */
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-                { INIT_THREAD_INFO(init_task) };
diff --git a/arch/h8300/kernel/sys_h8300.c b/arch/h8300/kernel/sys_h8300.c
index 2745656dcc52..8cb5d73a0e35 100644
--- a/arch/h8300/kernel/sys_h8300.c
+++ b/arch/h8300/kernel/sys_h8300.c
@@ -17,7 +17,6 @@
 #include <linux/syscalls.h>
 #include <linux/mman.h>
 #include <linux/file.h>
-#include <linux/utsname.h>
 #include <linux/fs.h>
 #include <linux/ipc.h>
diff --git a/arch/ia64/install.sh b/arch/ia64/install.sh
index 929e780026d1..0e932f5dcd1a 100644
--- a/arch/ia64/install.sh
+++ b/arch/ia64/install.sh
@@ -21,8 +21,8 @@
 # User may have a custom install script
-if [ -x ~/bin/installkernel ]; then exec ~/bin/installkernel "$@"; fi
+if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
-if [ -x /sbin/installkernel ]; then exec /sbin/installkernel "$@"; fi
+if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
 # Default install - same as make zlilo
diff --git a/arch/ia64/kernel/Makefile.gate b/arch/ia64/kernel/Makefile.gate
index 1d87f84069b3..ab9b03a9adcc 100644
--- a/arch/ia64/kernel/Makefile.gate
+++ b/arch/ia64/kernel/Makefile.gate
@@ -10,7 +10,7 @@ quiet_cmd_gate = GATE $@
      cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
 GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1 \
-                     $(call ld-option, -Wl$(comma)--hash-style=sysv)
+                     $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
 $(obj)/gate.so: $(obj)/gate.lds $(obj)/gate.o FORCE
        $(call if_changed,gate)
diff --git a/arch/ia64/kernel/init_task.c b/arch/ia64/kernel/init_task.c
index c475fc281be7..e253ab8fcbc8 100644
--- a/arch/ia64/kernel/init_task.c
+++ b/arch/ia64/kernel/init_task.c
@@ -33,7 +33,8 @@ union {
                struct thread_info thread_info;
        } s;
        unsigned long stack[KERNEL_STACK_SIZE/sizeof (unsigned long)];
-} init_task_mem asm ("init_task") __attribute__((section(".data.init_task"))) = {{
+} init_task_mem asm ("init_task") __init_task_data =
+        {{
        .task =         INIT_TASK(init_task_mem.s.task),
        .thread_info =  INIT_THREAD_INFO(init_task_mem.s.task)
 }};
diff --git a/arch/m32r/boot/compressed/install.sh b/arch/m32r/boot/compressed/install.sh
index 6d72e9e72697..16e5a0a13437 100644
--- a/arch/m32r/boot/compressed/install.sh
+++ b/arch/m32r/boot/compressed/install.sh
@@ -24,8 +24,8 @@
 # User may have a custom install script
-if [ -x /sbin/installkernel ]; then
+if [ -x /sbin/${INSTALLKERNEL} ]; then
-  exec /sbin/installkernel "$@"
+  exec /sbin/${INSTALLKERNEL} "$@"
 fi
 if [ "$2" = "zImage" ]; then
diff --git a/arch/m32r/kernel/init_task.c b/arch/m32r/kernel/init_task.c
index fce57e5d3f91..6c42d5f8df50 100644
--- a/arch/m32r/kernel/init_task.c
+++ b/arch/m32r/kernel/init_task.c
@@ -20,9 +20,8 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 * way process stacks are handled. This is done by having a special
 * "init_task" linker map entry..
 */
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-                { INIT_THREAD_INFO(init_task) };
 /*
 * Initial task structure.
diff --git a/arch/m68k/install.sh b/arch/m68k/install.sh
index 9c6bae6112e3..57d640d4382c 100644
--- a/arch/m68k/install.sh
+++ b/arch/m68k/install.sh
@@ -33,8 +33,8 @@ verify "$3"
 # User may have a custom install script
-if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi
+if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
-if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi
+if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
 # Default install - same as make zlilo
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index 72bad65dba3a..41230c595a8e 100644
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -42,9 +42,9 @@
 */
 static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
 static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data
-__attribute__((section(".data.init_task"), aligned(THREAD_SIZE)))
+        __attribute__((aligned(THREAD_SIZE))) =
-       = { INIT_THREAD_INFO(init_task) };
+                { INIT_THREAD_INFO(init_task) };
 /* initial task structure */
 struct task_struct init_task = INIT_TASK(init_task);
diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c
index 7f54efaf60bb..7deb402bfc75 100644
--- a/arch/m68k/kernel/sys_m68k.c
+++ b/arch/m68k/kernel/sys_m68k.c
@@ -20,7 +20,6 @@
 #include <linux/syscalls.h>
 #include <linux/mman.h>
 #include <linux/file.h>
-#include <linux/utsname.h>
 #include <linux/ipc.h>
 #include <asm/setup.h>
diff --git a/arch/m68knommu/kernel/init_task.c b/arch/m68knommu/kernel/init_task.c
index 45e97a207fed..cbf9dc3cc51d 100644
--- a/arch/m68knommu/kernel/init_task.c
+++ b/arch/m68knommu/kernel/init_task.c
@@ -31,7 +31,6 @@ EXPORT_SYMBOL(init_task);
 * way process stacks are handled. This is done by having a special
 * "init_task" linker map entry..
 */
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-                { INIT_THREAD_INFO(init_task) };
diff --git a/arch/m68knommu/kernel/sys_m68k.c b/arch/m68knommu/kernel/sys_m68k.c
index 700281638629..efdd090778a3 100644
--- a/arch/m68knommu/kernel/sys_m68k.c
+++ b/arch/m68knommu/kernel/sys_m68k.c
@@ -17,7 +17,6 @@
 #include <linux/syscalls.h>
 #include <linux/mman.h>
 #include <linux/file.h>
-#include <linux/utsname.h>
 #include <linux/ipc.h>
 #include <linux/fs.h>
diff --git a/arch/microblaze/kernel/init_task.c b/arch/microblaze/kernel/init_task.c
index 67da22579b62..b5d711f94ff8 100644
--- a/arch/microblaze/kernel/init_task.c
+++ b/arch/microblaze/kernel/init_task.c
@@ -19,9 +19,8 @@
 static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
 static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-{ INIT_THREAD_INFO(init_task) };
 struct task_struct init_task = INIT_TASK(init_task);
 EXPORT_SYMBOL(init_task);
diff --git a/arch/microblaze/kernel/sys_microblaze.c b/arch/microblaze/kernel/sys_microblaze.c
index b96f1682bb24..07cabed4b947 100644
--- a/arch/microblaze/kernel/sys_microblaze.c
+++ b/arch/microblaze/kernel/sys_microblaze.c
@@ -23,7 +23,6 @@
 #include <linux/mman.h>
 #include <linux/sys.h>
 #include <linux/ipc.h>
-#include <linux/utsname.h>
 #include <linux/file.h>
 #include <linux/module.h>
 #include <linux/err.h>
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index c825b14b4ed0..77f5021218d3 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -627,16 +627,6 @@ endif
 cflags-y                        += -I$(srctree)/arch/mips/include/asm/mach-generic
 drivers-$(CONFIG_PCI)           += arch/mips/pci/
-ifdef CONFIG_32BIT
-ifdef CONFIG_CPU_LITTLE_ENDIAN
-JIFFIES                 = jiffies_64
-else
-JIFFIES                 = jiffies_64 + 4
-endif
-else
-JIFFIES                 = jiffies_64
-endif
 #
 # Automatically detect the build format. By default we choose
 # the elf format according to the load address.
@@ -660,8 +650,9 @@ ifdef CONFIG_64BIT
 endif
 KBUILD_AFLAGS   += $(cflags-y)
-KBUILD_CFLAGS   += $(cflags-y) \
+KBUILD_CFLAGS   += $(cflags-y)
-                        -D"VMLINUX_LOAD_ADDRESS=$(load-y)"
+KBUILD_CPPFLAGS += -D"VMLINUX_LOAD_ADDRESS=$(load-y)"
+KBUILD_CPPFLAGS += -D"DATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)"
 LDFLAGS                 += -m $(ld-emul)
@@ -676,18 +667,6 @@ endif
 OBJCOPYFLAGS            += --remove-section=.reginfo
-#
-# Choosing incompatible machines durings configuration will result in
-# error messages during linking.  Select a default linkscript if
-# none has been choosen above.
-#
-CPPFLAGS_vmlinux.lds := \
-        $(KBUILD_CFLAGS) \
-        -D"LOADADDR=$(load-y)" \
-        -D"JIFFIES=$(JIFFIES)" \
-        -D"DATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)"
 head-y := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
 libs-y                  += arch/mips/lib/
diff --git a/arch/mips/kernel/init_task.c b/arch/mips/kernel/init_task.c
index 5b457a40c784..6d6ca5305895 100644
--- a/arch/mips/kernel/init_task.c
+++ b/arch/mips/kernel/init_task.c
@@ -21,9 +21,8 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 *
 * The things we do for performance..
 */
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data
-        __attribute__((__section__(".data.init_task"),
+        __attribute__((__aligned__(THREAD_SIZE))) =
-                       __aligned__(THREAD_SIZE))) =
                { INIT_THREAD_INFO(init_task) };
 /*
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 2769bed3d2af..9bf0e3df7c5a 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -10,7 +10,16 @@ PHDRS {
        text PT_LOAD FLAGS(7);  /* RWX */
        note PT_NOTE FLAGS(4);  /* R__ */
 }
-jiffies = JIFFIES;
+ifdef CONFIG_32BIT
+        ifdef CONFIG_CPU_LITTLE_ENDIAN
+                jiffies  = jiffies_64;
+        else
+                jiffies  = jiffies_64 + 4;
+        endif
+else
+        jiffies  = jiffies_64;
+endif
 SECTIONS
 {
@@ -29,7 +38,7 @@ SECTIONS
        /* . = 0xa800000000300000; */
        . = 0xffffffff80300000;
 #endif
-        . = LOADADDR;
+        . = VMLINUX_LOAD_ADDRESS;
        /* read-only */
        _text = .;      /* Text and read-only data */
        .text : {
diff --git a/arch/mn10300/kernel/init_task.c b/arch/mn10300/kernel/init_task.c
index 80d423b80af3..a481b043bea7 100644
--- a/arch/mn10300/kernel/init_task.c
+++ b/arch/mn10300/kernel/init_task.c
@@ -27,9 +27,8 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 * way process stacks are handled. This is done by having a special
 * "init_task" linker map entry..
 */
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-                { INIT_THREAD_INFO(init_task) };
 /*
 * Initial task structure.
diff --git a/arch/mn10300/kernel/sys_mn10300.c b/arch/mn10300/kernel/sys_mn10300.c
index 3e52a1054327..8ca5af00334c 100644
--- a/arch/mn10300/kernel/sys_mn10300.c
+++ b/arch/mn10300/kernel/sys_mn10300.c
@@ -19,7 +19,6 @@
 #include <linux/stat.h>
 #include <linux/mman.h>
 #include <linux/file.h>
-#include <linux/utsname.h>
 #include <linux/tty.h>
 #include <asm/uaccess.h>
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index da6f66901c92..55cca1dac431 100644
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -118,8 +118,8 @@ define archhelp
        @echo  '* vmlinux       - Uncompressed kernel image (./vmlinux)'
        @echo  '  palo          - Bootable image (./lifimage)'
        @echo  '  install       - Install kernel using'
-        @echo  '                  (your) ~/bin/installkernel or'
+        @echo  '                  (your) ~/bin/$(INSTALLKERNEL) or'
-        @echo  '                  (distribution) /sbin/installkernel or'
+        @echo  '                  (distribution) /sbin/$(INSTALLKERNEL) or'
        @echo  '                  copy to $$(INSTALL_PATH)'
 endef
diff --git a/arch/parisc/install.sh b/arch/parisc/install.sh
index 9632b3e164c7..e593fc8d58bc 100644
--- a/arch/parisc/install.sh
+++ b/arch/parisc/install.sh
@@ -21,8 +21,8 @@
 # User may have a custom install script
-if [ -x ~/bin/installkernel ]; then exec ~/bin/installkernel "$@"; fi
+if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
-if [ -x /sbin/installkernel ]; then exec /sbin/installkernel "$@"; fi
+if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
 # Default install
diff --git a/arch/parisc/kernel/init_task.c b/arch/parisc/kernel/init_task.c
index 82974b20fc10..d020eae6525c 100644
--- a/arch/parisc/kernel/init_task.c
+++ b/arch/parisc/kernel/init_task.c
@@ -43,8 +43,8 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 * way process stacks are handled. This is done by having a special
 * "init_task" linker map entry..
 */
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data
-        __attribute__((aligned(128))) __attribute__((__section__(".data.init_task"))) =
+        __attribute__((aligned(128))) =
                { INIT_THREAD_INFO(init_task) };
 #if PT_NLEVELS == 3
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index 92a0acaa0d12..561388b17c91 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -18,7 +18,6 @@
 #include <linux/signal.h>
 #include <linux/resource.h>
 #include <linux/times.h>
-#include <linux/utsname.h>
 #include <linux/time.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 952a3963e9e8..aacf629c1a9f 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -158,8 +158,6 @@ drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/
 # Default to zImage, override when needed
 all: zImage
-CPPFLAGS_vmlinux.lds    := -Upowerpc
 BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% simpleImage.%
 PHONY += $(BOOT_TARGETS)
@@ -182,8 +180,8 @@ define archhelp
  @echo '  simpleImage.<dt> - Firmware independent image.'
  @echo '  treeImage.<dt>  - Support for older IBM 4xx firmware (not U-Boot)'
  @echo '  install         - Install kernel using'
-  @echo '                    (your) ~/bin/installkernel or'
+  @echo '                    (your) ~/bin/$(INSTALLKERNEL) or'
-  @echo '                    (distribution) /sbin/installkernel or'
+  @echo '                    (distribution) /sbin/$(INSTALLKERNEL) or'
  @echo '                    install to $$(INSTALL_PATH) and run lilo'
  @echo '  *_defconfig     - Select default config from arch/$(ARCH)/configs'
  @echo ''
diff --git a/arch/powerpc/boot/install.sh b/arch/powerpc/boot/install.sh
index 98312d169c85..b6a256bc96ee 100644
--- a/arch/powerpc/boot/install.sh
+++ b/arch/powerpc/boot/install.sh
@@ -23,8 +23,8 @@ set -e
 # User may have a custom install script
-if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi
+if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
-if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi
+if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
 # Default install
diff --git a/arch/powerpc/kernel/init_task.c b/arch/powerpc/kernel/init_task.c
index ffc4253fef55..2375b7eb1c76 100644
--- a/arch/powerpc/kernel/init_task.c
+++ b/arch/powerpc/kernel/init_task.c
@@ -16,9 +16,8 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 * way process stacks are handled. This is done by having a special
 * "init_task" linker map entry..
 */
-union thread_union init_thread_union 
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-                { INIT_THREAD_INFO(init_task) };
 /*
 * Initial task structure.
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index 49e705fcee6d..040bd1de8d99 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -13,6 +13,7 @@
 #include <linux/kexec.h>
 #include <linux/smp.h>
 #include <linux/thread_info.h>
+#include <linux/init_task.h>
 #include <linux/errno.h>
 #include <asm/page.h>
@@ -249,8 +250,8 @@ static void kexec_prepare_cpus(void)
 * We could use a smaller stack if we don't care about anything using
 * current, but that audit has not been performed.
 */
-static union thread_union kexec_stack
+static union thread_union kexec_stack __init_task_data =
-        __attribute__((__section__(".data.init_task"))) = { };
+        { };
 /* Our assembly helper, in kexec_stub.S */
 extern NORET_TYPE void kexec_sequence(void *newstack, unsigned long start,
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 9837d9153c4b..4271f7a655a3 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -24,7 +24,6 @@
 #include <linux/seq_file.h>
 #include <linux/ioport.h>
 #include <linux/console.h>
-#include <linux/utsname.h>
 #include <linux/screen_info.h>
 #include <linux/root_dev.h>
 #include <linux/notifier.h>
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index 1cc5e9e5da96..b97c2d67f4ac 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -22,7 +22,6 @@
 #include <linux/signal.h>
 #include <linux/resource.h>
 #include <linux/times.h>
-#include <linux/utsname.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/sem.h>
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index a0abce251d0a..3faaf29bdb29 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -1,3 +1,4 @@
 /*
 *    Copyright (C) 2004 Benjamin Herrenschmidt, IBM Corp.
 *                       <benh@kernel.crashing.org>
@@ -74,7 +75,7 @@ static int vdso_ready;
 static union {
        struct vdso_data        data;
        u8                      page[PAGE_SIZE];
-} vdso_data_store __attribute__((__section__(".data.page_aligned")));
+} vdso_data_store __page_aligned_data;
 struct vdso_data *vdso_data = &vdso_data_store.data;
 /* Format of the patch table */
diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile
index b54b81688132..51ead52141bd 100644
--- a/arch/powerpc/kernel/vdso32/Makefile
+++ b/arch/powerpc/kernel/vdso32/Makefile
@@ -16,7 +16,7 @@ GCOV_PROFILE := n
 EXTRA_CFLAGS := -shared -fno-common -fno-builtin
 EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso32.so.1 \
-                $(call ld-option, -Wl$(comma)--hash-style=sysv)
+                $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
 EXTRA_AFLAGS := -D__VDSO32__ -s
 obj-y += vdso32_wrapper.o
diff --git a/arch/powerpc/kernel/vdso32/vdso32_wrapper.S b/arch/powerpc/kernel/vdso32/vdso32_wrapper.S
index 556f0caa5d84..6e8f507ed32b 100644
--- a/arch/powerpc/kernel/vdso32/vdso32_wrapper.S
+++ b/arch/powerpc/kernel/vdso32/vdso32_wrapper.S
@@ -1,7 +1,8 @@
 #include <linux/init.h>
+#include <linux/linkage.h>
 #include <asm/page.h>
-        .section ".data.page_aligned"
+        __PAGE_ALIGNED_DATA
        .globl vdso32_start, vdso32_end
        .balign PAGE_SIZE
diff --git a/arch/powerpc/kernel/vdso64/Makefile b/arch/powerpc/kernel/vdso64/Makefile
index dd0c8e936775..79da65d44a2a 100644
--- a/arch/powerpc/kernel/vdso64/Makefile
+++ b/arch/powerpc/kernel/vdso64/Makefile
@@ -11,7 +11,7 @@ GCOV_PROFILE := n
 EXTRA_CFLAGS := -shared -fno-common -fno-builtin
 EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso64.so.1 \
-                $(call ld-option, -Wl$(comma)--hash-style=sysv)
+                $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
 EXTRA_AFLAGS := -D__VDSO64__ -s
 obj-y += vdso64_wrapper.o
diff --git a/arch/powerpc/kernel/vdso64/vdso64_wrapper.S b/arch/powerpc/kernel/vdso64/vdso64_wrapper.S
index 0529cb9e3b97..b8553d62b792 100644
--- a/arch/powerpc/kernel/vdso64/vdso64_wrapper.S
+++ b/arch/powerpc/kernel/vdso64/vdso64_wrapper.S
@@ -1,7 +1,8 @@
 #include <linux/init.h>
+#include <linux/linkage.h>
 #include <asm/page.h>
-        .section ".data.page_aligned"
+        __PAGE_ALIGNED_DATA
        .globl vdso64_start, vdso64_end
        .balign PAGE_SIZE
diff --git a/arch/s390/boot/install.sh b/arch/s390/boot/install.sh
index d4026f62cb06..aed3069699bd 100644
--- a/arch/s390/boot/install.sh
+++ b/arch/s390/boot/install.sh
@@ -21,8 +21,8 @@
 # User may have a custom install script
-if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi
+if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
-if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi
+if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
 # Default install - same as make zlilo
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 5519cb745106..0debcec23a39 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -24,7 +24,6 @@
 #include <linux/signal.h>
 #include <linux/resource.h>
 #include <linux/times.h>
-#include <linux/utsname.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/sem.h>
diff --git a/arch/s390/kernel/init_task.c b/arch/s390/kernel/init_task.c
index fe787f9e5f3f..4d1c9fb0b540 100644
--- a/arch/s390/kernel/init_task.c
+++ b/arch/s390/kernel/init_task.c
@@ -25,9 +25,8 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 * way process stacks are handled. This is done by having a special
 * "init_task" linker map entry..
 */
-union thread_union init_thread_union 
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-                { INIT_THREAD_INFO(init_task) };
 /*
 * Initial task structure.
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 59fe6ecc6ed3..5417eb57271a 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -27,7 +27,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/notifier.h>
-#include <linux/utsname.h>
 #include <linux/tick.h>
 #include <linux/elfcore.h>
 #include <linux/kernel_stat.h>
diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
index 45e1708b70fd..45a3e9a7ae21 100644
--- a/arch/s390/kernel/vdso.c
+++ b/arch/s390/kernel/vdso.c
@@ -75,7 +75,7 @@ __setup("vdso=", vdso_setup);
 static union {
        struct vdso_data        data;
        u8                      page[PAGE_SIZE];
-} vdso_data_store __attribute__((__section__(".data.page_aligned")));
+} vdso_data_store __page_aligned_data;
 struct vdso_data *vdso_data = &vdso_data_store.data;
 /*
diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile
index ca78ad60ba24..d13e8755a8cc 100644
--- a/arch/s390/kernel/vdso32/Makefile
+++ b/arch/s390/kernel/vdso32/Makefile
@@ -13,7 +13,7 @@ KBUILD_AFLAGS_31 += -m31 -s
 KBUILD_CFLAGS_31 := $(filter-out -m64,$(KBUILD_CFLAGS))
 KBUILD_CFLAGS_31 += -m31 -fPIC -shared -fno-common -fno-builtin
 KBUILD_CFLAGS_31 += -nostdlib -Wl,-soname=linux-vdso32.so.1 \
-                        $(call ld-option, -Wl$(comma)--hash-style=sysv)
+                        $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
 $(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_31)
 $(targets:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_31)
diff --git a/arch/s390/kernel/vdso32/vdso32_wrapper.S b/arch/s390/kernel/vdso32/vdso32_wrapper.S
index 61639a89e70b..ae42f8ce350b 100644
--- a/arch/s390/kernel/vdso32/vdso32_wrapper.S
+++ b/arch/s390/kernel/vdso32/vdso32_wrapper.S
@@ -1,7 +1,8 @@
 #include <linux/init.h>
+#include <linux/linkage.h>
 #include <asm/page.h>
-        .section ".data.page_aligned"
+        __PAGE_ALIGNED_DATA
        .globl vdso32_start, vdso32_end
        .balign PAGE_SIZE
diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile
index 6fc8e829258c..449352dda9cd 100644
--- a/arch/s390/kernel/vdso64/Makefile
+++ b/arch/s390/kernel/vdso64/Makefile
@@ -13,7 +13,7 @@ KBUILD_AFLAGS_64 += -m64 -s
 KBUILD_CFLAGS_64 := $(filter-out -m64,$(KBUILD_CFLAGS))
 KBUILD_CFLAGS_64 += -m64 -fPIC -shared -fno-common -fno-builtin
 KBUILD_CFLAGS_64 += -nostdlib -Wl,-soname=linux-vdso64.so.1 \
-                        $(call ld-option, -Wl$(comma)--hash-style=sysv)
+                        $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
 $(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_64)
 $(targets:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_64)
diff --git a/arch/s390/kernel/vdso64/vdso64_wrapper.S b/arch/s390/kernel/vdso64/vdso64_wrapper.S
index d8e2ac14d564..c245842b516f 100644
--- a/arch/s390/kernel/vdso64/vdso64_wrapper.S
+++ b/arch/s390/kernel/vdso64/vdso64_wrapper.S
@@ -1,7 +1,8 @@
 #include <linux/init.h>
+#include <linux/linkage.h>
 #include <asm/page.h>
-        .section ".data.page_aligned"
+        __PAGE_ALIGNED_DATA
        .globl vdso64_start, vdso64_end
        .balign PAGE_SIZE
diff --git a/arch/score/kernel/init_task.c b/arch/score/kernel/init_task.c
index ff952f6c63fd..baa03ee217d1 100644
--- a/arch/score/kernel/init_task.c
+++ b/arch/score/kernel/init_task.c
@@ -34,9 +34,8 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 * way process stacks are handled. This is done by having a special
 * "init_task" linker map entry..
 */
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"), __aligned__(THREAD_SIZE))) =
+        { INIT_THREAD_INFO(init_task) };
-                { INIT_THREAD_INFO(init_task) };
 /*
 * Initial task structure.
diff --git a/arch/sh/boot/compressed/install.sh b/arch/sh/boot/compressed/install.sh
index 90589f0fec12..f9f41818b17e 100644
--- a/arch/sh/boot/compressed/install.sh
+++ b/arch/sh/boot/compressed/install.sh
@@ -23,8 +23,8 @@
 # User may have a custom install script
-if [ -x /sbin/installkernel ]; then
+if [ -x /sbin/${INSTALLKERNEL} ]; then
-  exec /sbin/installkernel "$@"
+  exec /sbin/${INSTALLKERNEL} "$@"
 fi
 if [ "$2" = "zImage" ]; then
diff --git a/arch/sh/kernel/init_task.c b/arch/sh/kernel/init_task.c
index 1719957c0a69..11f2ea556a6b 100644
--- a/arch/sh/kernel/init_task.c
+++ b/arch/sh/kernel/init_task.c
@@ -17,9 +17,8 @@ struct pt_regs fake_swapper_regs;
 * way process stacks are handled. This is done by having a special
 * "init_task" linker map entry..
 */
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-                { INIT_THREAD_INFO(init_task) };
 /*
 * Initial task structure.
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index 60f8af4497c7..7cb933ba4957 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -165,11 +165,9 @@ asmlinkage int do_IRQ(unsigned int irq, struct pt_regs *regs)
 }
 #ifdef CONFIG_IRQSTACKS
-static char softirq_stack[NR_CPUS * THREAD_SIZE]
+static char softirq_stack[NR_CPUS * THREAD_SIZE] __page_aligned_bss;
-                __attribute__((__section__(".bss.page_aligned")));
-static char hardirq_stack[NR_CPUS * THREAD_SIZE]
+static char hardirq_stack[NR_CPUS * THREAD_SIZE] __page_aligned_bss;
-                __attribute__((__section__(".bss.page_aligned")));
 /*
 * allocate per-cpu stacks for hardirq and for softirq processing
diff --git a/arch/sh/kernel/sys_sh32.c b/arch/sh/kernel/sys_sh32.c
index 63ba12836eae..eb68bfdd86e6 100644
--- a/arch/sh/kernel/sys_sh32.c
+++ b/arch/sh/kernel/sys_sh32.c
@@ -9,7 +9,6 @@
 #include <linux/syscalls.h>
 #include <linux/mman.h>
 #include <linux/file.h>
-#include <linux/utsname.h>
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/ipc.h>
diff --git a/arch/sh/kernel/sys_sh64.c b/arch/sh/kernel/sys_sh64.c
index 91fb8445a5a0..287235768bc5 100644
--- a/arch/sh/kernel/sys_sh64.c
+++ b/arch/sh/kernel/sys_sh64.c
@@ -23,7 +23,6 @@
 #include <linux/stat.h>
 #include <linux/mman.h>
 #include <linux/file.h>
-#include <linux/utsname.h>
 #include <linux/syscalls.h>
 #include <linux/ipc.h>
 #include <asm/uaccess.h>
diff --git a/arch/sh/kernel/vsyscall/Makefile b/arch/sh/kernel/vsyscall/Makefile
index 4bbce1cfa359..8f0ea5fc835c 100644
--- a/arch/sh/kernel/vsyscall/Makefile
+++ b/arch/sh/kernel/vsyscall/Makefile
@@ -15,7 +15,7 @@ quiet_cmd_syscall = SYSCALL $@
 export CPPFLAGS_vsyscall.lds += -P -C -Ush
 vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \
-                $(call ld-option, -Wl$(comma)--hash-style=sysv)
+                $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
 SYSCFLAGS_vsyscall-trapa.so     = $(vsyscall-flags)
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 467221dd5702..dfe272d14465 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -31,7 +31,6 @@ export BITS    := 32
 #KBUILD_CFLAGS += -g -pipe -fcall-used-g5 -fcall-used-g7
 KBUILD_CFLAGS += -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7
 KBUILD_AFLAGS += -m32
-CPPFLAGS_vmlinux.lds += -m32
 #LDFLAGS_vmlinux = -N -Ttext 0xf0004000
 #  Since 2.5.40, the first stage is left not btfix-ed.
@@ -45,9 +44,6 @@ else
 CHECKFLAGS      += -D__sparc__ -D__sparc_v9__ -D__arch64__ -m64
-# Undefine sparc when processing vmlinux.lds - it is used
-# And teach CPP we are doing 64 bit builds (for this case)
-CPPFLAGS_vmlinux.lds += -m64 -Usparc
 LDFLAGS              := -m elf64_sparc
 export BITS          := 64
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
index 3a048fad7ee2..5b47fab9966e 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
@@ -7,7 +7,11 @@ ccflags-y := -Werror
 extra-y     := head_$(BITS).o
 extra-y     += init_task.o
-extra-y     += vmlinux.lds
+# Undefine sparc when processing vmlinux.lds - it is used
+# And teach CPP we are doing $(BITS) builds (for this case)
+CPPFLAGS_vmlinux.lds := -Usparc -m$(BITS)
+extra-y              += vmlinux.lds
 obj-$(CONFIG_SPARC32)   += entry.o wof.o wuf.o
 obj-$(CONFIG_SPARC32)   += etrap_32.o
diff --git a/arch/sparc/kernel/init_task.c b/arch/sparc/kernel/init_task.c
index 28125c5b3d3c..5fe3d65581f7 100644
--- a/arch/sparc/kernel/init_task.c
+++ b/arch/sparc/kernel/init_task.c
@@ -18,6 +18,5 @@ EXPORT_SYMBOL(init_task);
 * If this is not aligned on a 8k boundry, then you should change code
 * in etrap.S which assumes it.
 */
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data =
-        __attribute__((section (".data.init_task")))
+        { INIT_THREAD_INFO(init_task) };
-        = { INIT_THREAD_INFO(init_task) };
diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c
index f5000a460c05..04e28b2671c8 100644
--- a/arch/sparc/kernel/sys_sparc32.c
+++ b/arch/sparc/kernel/sys_sparc32.c
@@ -16,7 +16,6 @@
 #include <linux/signal.h>
 #include <linux/resource.h>
 #include <linux/times.h>
-#include <linux/utsname.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/sem.h>
diff --git a/arch/sparc/kernel/systbls.h b/arch/sparc/kernel/systbls.h
index 15c2d752b2bc..a63c5d2d9849 100644
--- a/arch/sparc/kernel/systbls.h
+++ b/arch/sparc/kernel/systbls.h
@@ -3,10 +3,11 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <linux/utsname.h>
 #include <asm/utrap.h>
 #include <asm/signal.h>
+struct new_utsname;
 extern asmlinkage unsigned long sys_getpagesize(void);
 extern asmlinkage unsigned long sparc_brk(unsigned long brk);
 extern asmlinkage long sparc_pipe(struct pt_regs *regs);
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 0728def32234..fc633dbacf84 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -96,11 +96,10 @@ CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,)
        $(call cc-option, -fno-stack-protector,) \
        $(call cc-option, -fno-stack-protector-all,)
-CONFIG_KERNEL_STACK_ORDER ?= 2
+# Options used by linker script
-STACK_SIZE := $(shell echo $$[ 4096 * (1 << $(CONFIG_KERNEL_STACK_ORDER)) ] )
+export LDS_START      := $(START)
+export LDS_ELF_ARCH   := $(ELF_ARCH)
-CPPFLAGS_vmlinux.lds = -U$(SUBARCH) -DSTART=$(START) -DELF_ARCH=$(ELF_ARCH) \
+export LDS_ELF_FORMAT := $(ELF_FORMAT)
-        -DELF_FORMAT="$(ELF_FORMAT)" -DKERNEL_STACK_SIZE=$(STACK_SIZE)
 # The wrappers will select whether using "malloc" or the kernel allocator.
 LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
index 388ec0a3ea9b..1119233597a1 100644
--- a/arch/um/kernel/Makefile
+++ b/arch/um/kernel/Makefile
@@ -3,6 +3,9 @@
 # Licensed under the GPL
 #
+CPPFLAGS_vmlinux.lds := -U$(SUBARCH) -DSTART=$(LDS_START) \
+                        -DELF_ARCH=$(LDS_ELF_ARCH)        \
+                        -DELF_FORMAT=$(LDS_ELF_FORMAT)
 extra-y := vmlinux.lds
 clean-files :=
diff --git a/arch/um/kernel/init_task.c b/arch/um/kernel/init_task.c
index b25121b537d8..8aa77b61a5ff 100644
--- a/arch/um/kernel/init_task.c
+++ b/arch/um/kernel/init_task.c
@@ -30,9 +30,8 @@ EXPORT_SYMBOL(init_task);
 * "init_task" linker map entry..
 */
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-                { INIT_THREAD_INFO(init_task) };
 union thread_union cpu0_irqstack
        __attribute__((__section__(".data.init_irqstack"))) =
diff --git a/arch/um/kernel/vmlinux.lds.S b/arch/um/kernel/vmlinux.lds.S
index f8aeb448aab6..16e49bfa2b42 100644
--- a/arch/um/kernel/vmlinux.lds.S
+++ b/arch/um/kernel/vmlinux.lds.S
@@ -1,3 +1,6 @@
+KERNEL_STACK_SIZE = 4096 * (1 << CONFIG_KERNEL_STACK_ORDER);
 #ifdef CONFIG_LD_SCRIPT_STATIC
 #include "uml.lds.S"
 #else
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 7983c420eaf2..a012ee8ef803 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -179,8 +179,8 @@ archclean:
 define archhelp
  echo  '* bzImage      - Compressed kernel image (arch/x86/boot/bzImage)'
  echo  '  install      - Install kernel using'
-  echo  '                  (your) ~/bin/installkernel or'
+  echo  '                  (your) ~/bin/$(INSTALLKERNEL) or'
-  echo  '                  (distribution) /sbin/installkernel or'
+  echo  '                  (distribution) /sbin/$(INSTALLKERNEL) or'
  echo  '                  install to $$(INSTALL_PATH) and run lilo'
  echo  '  fdimage      - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)'
  echo  '  fdimage144   - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)'
diff --git a/arch/x86/boot/install.sh b/arch/x86/boot/install.sh
index 8d60ee15dfd9..d13ec1c38640 100644
--- a/arch/x86/boot/install.sh
+++ b/arch/x86/boot/install.sh
@@ -33,8 +33,8 @@ verify "$3"
 # User may have a custom install script
-if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi
+if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
-if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi
+if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
 # Default install - same as make zlilo
diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
index 5d367caa0e36..549860d3be8f 100644
--- a/arch/x86/include/asm/cache.h
+++ b/arch/x86/include/asm/cache.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_X86_CACHE_H
 #define _ASM_X86_CACHE_H
+#include <linux/linkage.h>
 /* L1 cache line size */
 #define L1_CACHE_SHIFT  (CONFIG_X86_L1_CACHE_SHIFT)
 #define L1_CACHE_BYTES  (1 << L1_CACHE_SHIFT)
@@ -13,7 +15,7 @@
 #ifdef CONFIG_SMP
 #define __cacheline_aligned_in_smp                                      \
        __attribute__((__aligned__(1 << (INTERNODE_CACHE_SHIFT))))      \
-        __attribute__((__section__(".data.page_aligned")))
+        __page_aligned_data
 #endif
 #endif
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
index bca5fba91c9e..f7dd2a7c3bf4 100644
--- a/arch/x86/kernel/dumpstack_32.c
+++ b/arch/x86/kernel/dumpstack_32.c
@@ -5,7 +5,6 @@
 #include <linux/kallsyms.h>
 #include <linux/kprobes.h>
 #include <linux/uaccess.h>
-#include <linux/utsname.h>
 #include <linux/hardirq.h>
 #include <linux/kdebug.h>
 #include <linux/module.h>
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index 54b0a3276766..a071e6be177e 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -5,7 +5,6 @@
 #include <linux/kallsyms.h>
 #include <linux/kprobes.h>
 #include <linux/uaccess.h>
-#include <linux/utsname.h>
 #include <linux/hardirq.h>
 #include <linux/kdebug.h>
 #include <linux/module.h>
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index b766e8c7252d..218aad7ee76e 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -608,7 +608,7 @@ ENTRY(initial_code)
 /*
 * BSS section
 */
-.section ".bss.page_aligned","wa"
+__PAGE_ALIGNED_BSS
        .align PAGE_SIZE_asm
 #ifdef CONFIG_X86_PAE
 swapper_pg_pmd:
@@ -626,7 +626,7 @@ ENTRY(empty_zero_page)
 * This starts the data section.
 */
 #ifdef CONFIG_X86_PAE
-.section ".data.page_aligned","wa"
+__PAGE_ALIGNED_DATA
        /* Page-aligned for the benefit of paravirt? */
        .align PAGE_SIZE_asm
 ENTRY(swapper_pg_dir)
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index fa54f78e2a05..d0bc0a13a437 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -418,7 +418,7 @@ ENTRY(phys_base)
 ENTRY(idt_table)
        .skip IDT_ENTRIES * 16
-        .section .bss.page_aligned, "aw", @nobits
+        __PAGE_ALIGNED_BSS
        .align PAGE_SIZE
 ENTRY(empty_zero_page)
        .skip PAGE_SIZE
diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c
index 270ff83efc11..3a54dcb9cd0e 100644
--- a/arch/x86/kernel/init_task.c
+++ b/arch/x86/kernel/init_task.c
@@ -20,9 +20,8 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 * way process stacks are handled. This is done by having a special
 * "init_task" linker map entry..
 */
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-                { INIT_THREAD_INFO(init_task) };
 /*
 * Initial task structure.
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 9346e102338d..a665c71352b8 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -14,7 +14,6 @@
 #include <linux/spinlock.h>
 #include <linux/kprobes.h>
 #include <linux/uaccess.h>
-#include <linux/utsname.h>
 #include <linux/kdebug.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
index 88112b49f02c..6b4ffedb93c9 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO    $@
                       $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
                       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
-VDSO_LDFLAGS = -fPIC -shared $(call ld-option, -Wl$(comma)--hash-style=sysv)
+VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
 GCOV_PROFILE := n
 #
diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile
index fe3186de6a33..6f56d95f2c1e 100644
--- a/arch/xtensa/kernel/Makefile
+++ b/arch/xtensa/kernel/Makefile
@@ -27,7 +27,8 @@ sed-y = -e 's/(\(\.[a-z]*it\|\.ref\|\)\.text)/(\1.literal \1.text)/g'	\
        -e 's/(\(\.text\.[a-z]*\))/(\1.literal \1)/g'
 quiet_cmd__cpp_lds_S = LDS     $@
-      cmd__cpp_lds_S = $(CPP) $(cpp_flags) -D__ASSEMBLY__ $< | sed $(sed-y) >$@
+      cmd__cpp_lds_S = $(CPP) $(cpp_flags) -P -C -Uxtensa -D__ASSEMBLY__ $< \
+                       | sed $(sed-y) >$@
 $(obj)/vmlinux.lds: $(src)/vmlinux.lds.S FORCE
        $(call if_changed_dep,_cpp_lds_S)
diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S
index d9ddc1ba761c..d215adcfd4ea 100644
--- a/arch/xtensa/kernel/head.S
+++ b/arch/xtensa/kernel/head.S
@@ -235,7 +235,7 @@ should_never_return:
 * BSS section
 */
        
-.section ".bss.page_aligned", "w"
+__PAGE_ALIGNED_BSS
 #ifdef CONFIG_MMU
 ENTRY(swapper_pg_dir)
        .fill   PAGE_SIZE, 1, 0
diff --git a/arch/xtensa/kernel/init_task.c b/arch/xtensa/kernel/init_task.c
index c4302f0e4ba0..cd122fb7e48a 100644
--- a/arch/xtensa/kernel/init_task.c
+++ b/arch/xtensa/kernel/init_task.c
@@ -23,9 +23,8 @@
 static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
 static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
-union thread_union init_thread_union
+union thread_union init_thread_union __init_task_data =
-        __attribute__((__section__(".data.init_task"))) =
+        { INIT_THREAD_INFO(init_task) };
-{ INIT_THREAD_INFO(init_task) };
 struct task_struct init_task = INIT_TASK(init_task);
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 32b957efa420..45d58002b06c 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -742,7 +742,7 @@ EXPORT_SYMBOL_GPL(tpm_pcr_read);
 * the module usage count.
 */
 #define TPM_ORD_PCR_EXTEND cpu_to_be32(20)
-#define EXTEND_PCR_SIZE 34
+#define EXTEND_PCR_RESULT_SIZE 34
 static struct tpm_input_header pcrextend_header = {
        .tag = TPM_TAG_RQU_COMMAND,
        .length = cpu_to_be32(34),
@@ -760,10 +760,9 @@ int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash)
                return -ENODEV;
        cmd.header.in = pcrextend_header;
-        BUG_ON(be32_to_cpu(cmd.header.in.length) > EXTEND_PCR_SIZE);
        cmd.params.pcrextend_in.pcr_idx = cpu_to_be32(pcr_idx);
        memcpy(cmd.params.pcrextend_in.hash, hash, TPM_DIGEST_SIZE);
-        rc = transmit_cmd(chip, &cmd, cmd.header.in.length,
+        rc = transmit_cmd(chip, &cmd, EXTEND_PCR_RESULT_SIZE,
                          "attempting extend a PCR value");
        module_put(chip->dev->driver->owner);
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index ed7711d11ae8..6857560144bd 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -325,34 +325,6 @@ config SENSORS_F75375S
          This driver can also be built as a module.  If so, the module
          will be called f75375s.
-config SENSORS_FSCHER
-        tristate "FSC Hermes (DEPRECATED)"
-        depends on X86 && I2C
-        help
-          This driver is DEPRECATED please use the new merged fschmd
-          ("FSC Poseidon, Scylla, Hermes, Heimdall and Heracles") driver
-          instead.
-          If you say yes here you get support for Fujitsu Siemens
-          Computers Hermes sensor chips.
-          This driver can also be built as a module.  If so, the module
-          will be called fscher.
-config SENSORS_FSCPOS
-        tristate "FSC Poseidon (DEPRECATED)"
-        depends on X86 && I2C
-        help
-          This driver is DEPRECATED please use the new merged fschmd
-          ("FSC Poseidon, Scylla, Hermes, Heimdall and Heracles") driver
-          instead.
-          If you say yes here you get support for Fujitsu Siemens
-          Computers Poseidon sensor chips.
-          This driver can also be built as a module.  If so, the module
-          will be called fscpos.
 config SENSORS_FSCHMD
        tristate "Fujitsu Siemens Computers sensor chips"
        depends on X86 && I2C
@@ -401,12 +373,12 @@ config SENSORS_GL520SM
          will be called gl520sm.
 config SENSORS_CORETEMP
-        tristate "Intel Core (2) Duo/Solo temperature sensor"
+        tristate "Intel Core/Core2/Atom temperature sensor"
        depends on X86 && EXPERIMENTAL
        help
          If you say yes here you get support for the temperature
-          sensor inside your CPU. Supported all are all known variants
+          sensor inside your CPU. Most of the family 6 CPUs
-          of Intel Core family.
+          are supported. Check documentation/driver for details.
 config SENSORS_IBMAEM
        tristate "IBM Active Energy Manager temperature/power sensors and control"
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index bcf73a9bb619..9f46cb019cc6 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -42,9 +42,7 @@ obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
 obj-$(CONFIG_SENSORS_F71805F)   += f71805f.o
 obj-$(CONFIG_SENSORS_F71882FG)  += f71882fg.o
 obj-$(CONFIG_SENSORS_F75375S)   += f75375s.o
-obj-$(CONFIG_SENSORS_FSCHER)    += fscher.o
 obj-$(CONFIG_SENSORS_FSCHMD)    += fschmd.o
-obj-$(CONFIG_SENSORS_FSCPOS)    += fscpos.o
 obj-$(CONFIG_SENSORS_G760A)     += g760a.o
 obj-$(CONFIG_SENSORS_GL518SM)   += gl518sm.o
 obj-$(CONFIG_SENSORS_GL520SM)   += gl520sm.o
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index 789441830cd8..56905955352c 100644
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -37,6 +37,7 @@
 #define ADM1031_REG_PWM                 (0x22)
 #define ADM1031_REG_FAN_MIN(nr)         (0x10 + (nr))
+#define ADM1031_REG_TEMP_OFFSET(nr)     (0x0d + (nr))
 #define ADM1031_REG_TEMP_MAX(nr)        (0x14 + 4 * (nr))
 #define ADM1031_REG_TEMP_MIN(nr)        (0x15 + 4 * (nr))
 #define ADM1031_REG_TEMP_CRIT(nr)       (0x16 + 4 * (nr))
@@ -93,6 +94,7 @@ struct adm1031_data {
        u8 auto_temp_min[3];
        u8 auto_temp_off[3];
        u8 auto_temp_max[3];
+        s8 temp_offset[3];
        s8 temp_min[3];
        s8 temp_max[3];
        s8 temp_crit[3];
@@ -145,6 +147,10 @@ adm1031_write_value(struct i2c_client *client, u8 reg, unsigned int value)
 #define TEMP_FROM_REG_EXT(val, ext)     (TEMP_FROM_REG(val) + (ext) * 125)
+#define TEMP_OFFSET_TO_REG(val)         (TEMP_TO_REG(val) & 0x8f)
+#define TEMP_OFFSET_FROM_REG(val)       TEMP_FROM_REG((val) < 0 ? \
+                                                      (val) | 0x70 : (val))
 #define FAN_FROM_REG(reg, div)          ((reg) ? (11250 * 60) / ((reg) * (div)) : 0)
 static int FAN_TO_REG(int reg, int div)
@@ -585,6 +591,14 @@ static ssize_t show_temp(struct device *dev,
            (((data->ext_temp[nr] >> ((nr - 1) * 3)) & 7));
        return sprintf(buf, "%d\n", TEMP_FROM_REG_EXT(data->temp[nr], ext));
 }
+static ssize_t show_temp_offset(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        int nr = to_sensor_dev_attr(attr)->index;
+        struct adm1031_data *data = adm1031_update_device(dev);
+        return sprintf(buf, "%d\n",
+                       TEMP_OFFSET_FROM_REG(data->temp_offset[nr]));
+}
 static ssize_t show_temp_min(struct device *dev,
                             struct device_attribute *attr, char *buf)
 {
@@ -606,6 +620,24 @@ static ssize_t show_temp_crit(struct device *dev,
        struct adm1031_data *data = adm1031_update_device(dev);
        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[nr]));
 }
+static ssize_t set_temp_offset(struct device *dev,
+                               struct device_attribute *attr, const char *buf,
+                               size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adm1031_data *data = i2c_get_clientdata(client);
+        int nr = to_sensor_dev_attr(attr)->index;
+        int val;
+        val = simple_strtol(buf, NULL, 10);
+        val = SENSORS_LIMIT(val, -15000, 15000);
+        mutex_lock(&data->update_lock);
+        data->temp_offset[nr] = TEMP_OFFSET_TO_REG(val);
+        adm1031_write_value(client, ADM1031_REG_TEMP_OFFSET(nr),
+                            data->temp_offset[nr]);
+        mutex_unlock(&data->update_lock);
+        return count;
+}
 static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
                            const char *buf, size_t count)
 {
@@ -661,6 +693,8 @@ static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr,
 #define temp_reg(offset)                                                \
 static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO,                \
                show_temp, NULL, offset - 1);                           \
+static SENSOR_DEVICE_ATTR(temp##offset##_offset, S_IRUGO | S_IWUSR,     \
+                show_temp_offset, set_temp_offset, offset - 1);         \
 static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,        \
                show_temp_min, set_temp_min, offset - 1);               \
 static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,        \
@@ -714,6 +748,7 @@ static struct attribute *adm1031_attributes[] = {
        &sensor_dev_attr_pwm1.dev_attr.attr,
        &sensor_dev_attr_auto_fan1_channel.dev_attr.attr,
        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        &sensor_dev_attr_temp1_offset.dev_attr.attr,
        &sensor_dev_attr_temp1_min.dev_attr.attr,
        &sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
        &sensor_dev_attr_temp1_max.dev_attr.attr,
@@ -721,6 +756,7 @@ static struct attribute *adm1031_attributes[] = {
        &sensor_dev_attr_temp1_crit.dev_attr.attr,
        &sensor_dev_attr_temp1_crit_alarm.dev_attr.attr,
        &sensor_dev_attr_temp2_input.dev_attr.attr,
+        &sensor_dev_attr_temp2_offset.dev_attr.attr,
        &sensor_dev_attr_temp2_min.dev_attr.attr,
        &sensor_dev_attr_temp2_min_alarm.dev_attr.attr,
        &sensor_dev_attr_temp2_max.dev_attr.attr,
@@ -757,6 +793,7 @@ static struct attribute *adm1031_attributes_opt[] = {
        &sensor_dev_attr_pwm2.dev_attr.attr,
        &sensor_dev_attr_auto_fan2_channel.dev_attr.attr,
        &sensor_dev_attr_temp3_input.dev_attr.attr,
+        &sensor_dev_attr_temp3_offset.dev_attr.attr,
        &sensor_dev_attr_temp3_min.dev_attr.attr,
        &sensor_dev_attr_temp3_min_alarm.dev_attr.attr,
        &sensor_dev_attr_temp3_max.dev_attr.attr,
@@ -937,6 +974,9 @@ static struct adm1031_data *adm1031_update_device(struct device *dev)
                        }
                        data->temp[chan] = newh;
+                        data->temp_offset[chan] =
+                            adm1031_read_value(client,
+                                               ADM1031_REG_TEMP_OFFSET(chan));
                        data->temp_min[chan] =
                            adm1031_read_value(client,
                                               ADM1031_REG_TEMP_MIN(chan));
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 972cf4ba963c..caef39cda8c8 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -157,17 +157,26 @@ static int __devinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *
        /* The 100C is default for both mobile and non mobile CPUs */
        int tjmax = 100000;
-        int ismobile = 1;
+        int tjmax_ee = 85000;
+        int usemsr_ee = 1;
        int err;
        u32 eax, edx;
        /* Early chips have no MSR for TjMax */
        if ((c->x86_model == 0xf) && (c->x86_mask < 4)) {
-                ismobile = 0;
+                usemsr_ee = 0;
        }
-        if ((c->x86_model > 0xe) && (ismobile)) {
+        /* Atoms seems to have TjMax at 90C */
+        if (c->x86_model == 0x1c) {
+                usemsr_ee = 0;
+                tjmax = 90000;
+        }
+        if ((c->x86_model > 0xe) && (usemsr_ee)) {
+                u8 platform_id;
                /* Now we can detect the mobile CPU using Intel provided table
                   http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
@@ -179,13 +188,29 @@ static int __devinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *
                        dev_warn(dev,
                                 "Unable to access MSR 0x17, assuming desktop"
                                 " CPU\n");
-                        ismobile = 0;
+                        usemsr_ee = 0;
-                } else if (!(eax & 0x10000000)) {
+                } else if (c->x86_model < 0x17 && !(eax & 0x10000000)) {
-                        ismobile = 0;
+                        /* Trust bit 28 up to Penryn, I could not find any
+                           documentation on that; if you happen to know
+                           someone at Intel please ask */
+                        usemsr_ee = 0;
+                } else {
+                        /* Platform ID bits 52:50 (EDX starts at bit 32) */
+                        platform_id = (edx >> 18) & 0x7;
+                        /* Mobile Penryn CPU seems to be platform ID 7 or 5
+                          (guesswork) */
+                        if ((c->x86_model == 0x17) &&
+                            ((platform_id == 5) || (platform_id == 7))) {
+                                /* If MSR EE bit is set, set it to 90 degrees C,
+                                   otherwise 105 degrees C */
+                                tjmax_ee = 90000;
+                                tjmax = 105000;
+                        }
                }
        }
-        if (ismobile || c->x86_model == 0x1c) {
+        if (usemsr_ee) {
                err = rdmsr_safe_on_cpu(id, 0xee, &eax, &edx);
                if (err) {
@@ -193,9 +218,11 @@ static int __devinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *
                                 "Unable to access MSR 0xEE, for Tjmax, left"
                                 " at default");
                } else if (eax & 0x40000000) {
-                        tjmax = 85000;
+                        tjmax = tjmax_ee;
                }
-        } else {
+        /* if we dont use msr EE it means we are desktop CPU (with exeception
+           of Atom) */
+        } else if (tjmax == 100000) {
                dev_warn(dev, "Using relative temperature scale!\n");
        }
@@ -248,9 +275,9 @@ static int __devinit coretemp_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, data);
        /* read the still undocumented IA32_TEMPERATURE_TARGET it exists
-           on older CPUs but not in this register */
+           on older CPUs but not in this register, Atoms don't have it either */
-        if (c->x86_model > 0xe) {
+        if ((c->x86_model > 0xe) && (c->x86_model != 0x1c)) {
                err = rdmsr_safe_on_cpu(data->id, 0x1a2, &eax, &edx);
                if (err) {
                        dev_warn(&pdev->dev, "Unable to read"
@@ -413,11 +440,15 @@ static int __init coretemp_init(void)
        for_each_online_cpu(i) {
                struct cpuinfo_x86 *c = &cpu_data(i);
-                /* check if family 6, models 0xe, 0xf, 0x16, 0x17, 0x1A */
+                /* check if family 6, models 0xe (Pentium M DC),
+                  0xf (Core 2 DC 65nm), 0x16 (Core 2 SC 65nm),
+                  0x17 (Penryn 45nm), 0x1a (Nehalem), 0x1c (Atom),
+                  0x1e (Lynnfield) */
                if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
                    !((c->x86_model == 0xe) || (c->x86_model == 0xf) ||
                        (c->x86_model == 0x16) || (c->x86_model == 0x17) ||
-                        (c->x86_model == 0x1A) || (c->x86_model == 0x1c))) {
+                        (c->x86_model == 0x1a) || (c->x86_model == 0x1c) ||
+                        (c->x86_model == 0x1e))) {
                        /* supported CPU not found, but report the unknown
                           family 6 CPU */
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
deleted file mode 100644
index 12c70e402cb2..000000000000
--- a/drivers/hwmon/fscher.c
+++ /dev/null
@@ -1,680 +0,0 @@
-/*
- * fscher.c - Part of lm_sensors, Linux kernel modules for hardware
- * monitoring
- * Copyright (C) 2003, 2004 Reinhard Nissl <rnissl@gmx.de>
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/* 
- *  fujitsu siemens hermes chip, 
- *  module based on fscpos.c 
- *  Copyright (C) 2000 Hermann Jung <hej@odn.de>
- *  Copyright (C) 1998, 1999 Frodo Looijaard <frodol@dds.nl>
- *  and Philip Edelbrock <phil@netroedge.com>
- */
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/jiffies.h>
-#include <linux/i2c.h>
-#include <linux/hwmon.h>
-#include <linux/err.h>
-#include <linux/mutex.h>
-#include <linux/sysfs.h>
-/*
- * Addresses to scan
- */
-static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
-/*
- * Insmod parameters
- */
-I2C_CLIENT_INSMOD_1(fscher);
-/*
- * The FSCHER registers
- */
-/* chip identification */
-#define FSCHER_REG_IDENT_0              0x00
-#define FSCHER_REG_IDENT_1              0x01
-#define FSCHER_REG_IDENT_2              0x02
-#define FSCHER_REG_REVISION             0x03
-/* global control and status */
-#define FSCHER_REG_EVENT_STATE          0x04
-#define FSCHER_REG_CONTROL              0x05
-/* watchdog */
-#define FSCHER_REG_WDOG_PRESET          0x28
-#define FSCHER_REG_WDOG_STATE           0x23
-#define FSCHER_REG_WDOG_CONTROL         0x21
-/* fan 0 */
-#define FSCHER_REG_FAN0_MIN             0x55
-#define FSCHER_REG_FAN0_ACT             0x0e
-#define FSCHER_REG_FAN0_STATE           0x0d
-#define FSCHER_REG_FAN0_RIPPLE          0x0f
-/* fan 1 */
-#define FSCHER_REG_FAN1_MIN             0x65
-#define FSCHER_REG_FAN1_ACT             0x6b
-#define FSCHER_REG_FAN1_STATE           0x62
-#define FSCHER_REG_FAN1_RIPPLE          0x6f
-/* fan 2 */
-#define FSCHER_REG_FAN2_MIN             0xb5
-#define FSCHER_REG_FAN2_ACT             0xbb
-#define FSCHER_REG_FAN2_STATE           0xb2
-#define FSCHER_REG_FAN2_RIPPLE          0xbf
-/* voltage supervision */
-#define FSCHER_REG_VOLT_12              0x45
-#define FSCHER_REG_VOLT_5               0x42
-#define FSCHER_REG_VOLT_BATT            0x48
-/* temperature 0 */
-#define FSCHER_REG_TEMP0_ACT            0x64
-#define FSCHER_REG_TEMP0_STATE          0x71
-/* temperature 1 */
-#define FSCHER_REG_TEMP1_ACT            0x32
-#define FSCHER_REG_TEMP1_STATE          0x81
-/* temperature 2 */
-#define FSCHER_REG_TEMP2_ACT            0x35
-#define FSCHER_REG_TEMP2_STATE          0x91
-/*
- * Functions declaration
- */
-static int fscher_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id);
-static int fscher_detect(struct i2c_client *client, int kind,
-                         struct i2c_board_info *info);
-static int fscher_remove(struct i2c_client *client);
-static struct fscher_data *fscher_update_device(struct device *dev);
-static void fscher_init_client(struct i2c_client *client);
-static int fscher_read_value(struct i2c_client *client, u8 reg);
-static int fscher_write_value(struct i2c_client *client, u8 reg, u8 value);
-/*
- * Driver data (common to all clients)
- */
- 
-static const struct i2c_device_id fscher_id[] = {
-        { "fscher", fscher },
-        { }
-};
-static struct i2c_driver fscher_driver = {
-        .class          = I2C_CLASS_HWMON,
-        .driver = {
-                .name   = "fscher",
-        },
-        .probe          = fscher_probe,
-        .remove         = fscher_remove,
-        .id_table       = fscher_id,
-        .detect         = fscher_detect,
-        .address_data   = &addr_data,
-};
-/*
- * Client data (each client gets its own)
- */
-struct fscher_data {
-        struct device *hwmon_dev;
-        struct mutex update_lock;
-        char valid; /* zero until following fields are valid */
-        unsigned long last_updated; /* in jiffies */
-        /* register values */
-        u8 revision;            /* revision of chip */
-        u8 global_event;        /* global event status */
-        u8 global_control;      /* global control register */
-        u8 watchdog[3];         /* watchdog */
-        u8 volt[3];             /* 12, 5, battery voltage */ 
-        u8 temp_act[3];         /* temperature */
-        u8 temp_status[3];      /* status of sensor */
-        u8 fan_act[3];          /* fans revolutions per second */
-        u8 fan_status[3];       /* fan status */
-        u8 fan_min[3];          /* fan min value for rps */
-        u8 fan_ripple[3];       /* divider for rps */
-};
-/*
- * Sysfs stuff
- */
-#define sysfs_r(kind, sub, offset, reg) \
-static ssize_t show_##kind##sub (struct fscher_data *, char *, int); \
-static ssize_t show_##kind##offset##sub (struct device *, struct device_attribute *attr, char *); \
-static ssize_t show_##kind##offset##sub (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct fscher_data *data = fscher_update_device(dev); \
-        return show_##kind##sub(data, buf, (offset)); \
-}
-#define sysfs_w(kind, sub, offset, reg) \
-static ssize_t set_##kind##sub (struct i2c_client *, struct fscher_data *, const char *, size_t, int, int); \
-static ssize_t set_##kind##offset##sub (struct device *, struct device_attribute *attr, const char *, size_t); \
-static ssize_t set_##kind##offset##sub (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct fscher_data *data = i2c_get_clientdata(client); \
-        return set_##kind##sub(client, data, buf, count, (offset), reg); \
-}
-#define sysfs_rw_n(kind, sub, offset, reg) \
-sysfs_r(kind, sub, offset, reg) \
-sysfs_w(kind, sub, offset, reg) \
-static DEVICE_ATTR(kind##offset##sub, S_IRUGO | S_IWUSR, show_##kind##offset##sub, set_##kind##offset##sub);
-#define sysfs_rw(kind, sub, reg) \
-sysfs_r(kind, sub, 0, reg) \
-sysfs_w(kind, sub, 0, reg) \
-static DEVICE_ATTR(kind##sub, S_IRUGO | S_IWUSR, show_##kind##0##sub, set_##kind##0##sub);
-#define sysfs_ro_n(kind, sub, offset, reg) \
-sysfs_r(kind, sub, offset, reg) \
-static DEVICE_ATTR(kind##offset##sub, S_IRUGO, show_##kind##offset##sub, NULL);
-#define sysfs_ro(kind, sub, reg) \
-sysfs_r(kind, sub, 0, reg) \
-static DEVICE_ATTR(kind, S_IRUGO, show_##kind##0##sub, NULL);
-#define sysfs_fan(offset, reg_status, reg_min, reg_ripple, reg_act) \
-sysfs_rw_n(pwm,        , offset, reg_min) \
-sysfs_rw_n(fan, _status, offset, reg_status) \
-sysfs_rw_n(fan, _div   , offset, reg_ripple) \
-sysfs_ro_n(fan, _input , offset, reg_act)
-#define sysfs_temp(offset, reg_status, reg_act) \
-sysfs_rw_n(temp, _status, offset, reg_status) \
-sysfs_ro_n(temp, _input , offset, reg_act)
-    
-#define sysfs_in(offset, reg_act) \
-sysfs_ro_n(in, _input, offset, reg_act)
-#define sysfs_revision(reg_revision) \
-sysfs_ro(revision, , reg_revision)
-#define sysfs_alarms(reg_events) \
-sysfs_ro(alarms, , reg_events)
-#define sysfs_control(reg_control) \
-sysfs_rw(control, , reg_control)
-#define sysfs_watchdog(reg_control, reg_status, reg_preset) \
-sysfs_rw(watchdog, _control, reg_control) \
-sysfs_rw(watchdog, _status , reg_status) \
-sysfs_rw(watchdog, _preset , reg_preset)
-sysfs_fan(1, FSCHER_REG_FAN0_STATE, FSCHER_REG_FAN0_MIN,
-             FSCHER_REG_FAN0_RIPPLE, FSCHER_REG_FAN0_ACT)
-sysfs_fan(2, FSCHER_REG_FAN1_STATE, FSCHER_REG_FAN1_MIN,
-             FSCHER_REG_FAN1_RIPPLE, FSCHER_REG_FAN1_ACT)
-sysfs_fan(3, FSCHER_REG_FAN2_STATE, FSCHER_REG_FAN2_MIN,
-             FSCHER_REG_FAN2_RIPPLE, FSCHER_REG_FAN2_ACT)
-sysfs_temp(1, FSCHER_REG_TEMP0_STATE, FSCHER_REG_TEMP0_ACT)
-sysfs_temp(2, FSCHER_REG_TEMP1_STATE, FSCHER_REG_TEMP1_ACT)
-sysfs_temp(3, FSCHER_REG_TEMP2_STATE, FSCHER_REG_TEMP2_ACT)
-sysfs_in(0, FSCHER_REG_VOLT_12)
-sysfs_in(1, FSCHER_REG_VOLT_5)
-sysfs_in(2, FSCHER_REG_VOLT_BATT)
-sysfs_revision(FSCHER_REG_REVISION)
-sysfs_alarms(FSCHER_REG_EVENTS)
-sysfs_control(FSCHER_REG_CONTROL)
-sysfs_watchdog(FSCHER_REG_WDOG_CONTROL, FSCHER_REG_WDOG_STATE, FSCHER_REG_WDOG_PRESET)
-  
-static struct attribute *fscher_attributes[] = {
-        &dev_attr_revision.attr,
-        &dev_attr_alarms.attr,
-        &dev_attr_control.attr,
-        &dev_attr_watchdog_status.attr,
-        &dev_attr_watchdog_control.attr,
-        &dev_attr_watchdog_preset.attr,
-        &dev_attr_in0_input.attr,
-        &dev_attr_in1_input.attr,
-        &dev_attr_in2_input.attr,
-        &dev_attr_fan1_status.attr,
-        &dev_attr_fan1_div.attr,
-        &dev_attr_fan1_input.attr,
-        &dev_attr_pwm1.attr,
-        &dev_attr_fan2_status.attr,
-        &dev_attr_fan2_div.attr,
-        &dev_attr_fan2_input.attr,
-        &dev_attr_pwm2.attr,
-        &dev_attr_fan3_status.attr,
-        &dev_attr_fan3_div.attr,
-        &dev_attr_fan3_input.attr,
-        &dev_attr_pwm3.attr,
-        &dev_attr_temp1_status.attr,
-        &dev_attr_temp1_input.attr,
-        &dev_attr_temp2_status.attr,
-        &dev_attr_temp2_input.attr,
-        &dev_attr_temp3_status.attr,
-        &dev_attr_temp3_input.attr,
-        NULL
-};
-static const struct attribute_group fscher_group = {
-        .attrs = fscher_attributes,
-};
-/*
- * Real code
- */
-/* Return 0 if detection is successful, -ENODEV otherwise */
-static int fscher_detect(struct i2c_client *new_client, int kind,
-                         struct i2c_board_info *info)
-{
-        struct i2c_adapter *adapter = new_client->adapter;
-        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-                return -ENODEV;
-        /* Do the remaining detection unless force or force_fscher parameter */
-        if (kind < 0) {
-                if ((i2c_smbus_read_byte_data(new_client,
-                     FSCHER_REG_IDENT_0) != 0x48)       /* 'H' */
-                 || (i2c_smbus_read_byte_data(new_client,
-                     FSCHER_REG_IDENT_1) != 0x45)       /* 'E' */
-                 || (i2c_smbus_read_byte_data(new_client,
-                     FSCHER_REG_IDENT_2) != 0x52))      /* 'R' */
-                        return -ENODEV;
-        }
-        strlcpy(info->type, "fscher", I2C_NAME_SIZE);
-        return 0;
-}
-static int fscher_probe(struct i2c_client *new_client,
-                        const struct i2c_device_id *id)
-{
-        struct fscher_data *data;
-        int err;
-        data = kzalloc(sizeof(struct fscher_data), GFP_KERNEL);
-        if (!data) {
-                err = -ENOMEM;
-                goto exit;
-        }
-        i2c_set_clientdata(new_client, data);
-        data->valid = 0;
-        mutex_init(&data->update_lock);
-        fscher_init_client(new_client);
-        /* Register sysfs hooks */
-        if ((err = sysfs_create_group(&new_client->dev.kobj, &fscher_group)))
-                goto exit_free;
-        data->hwmon_dev = hwmon_device_register(&new_client->dev);
-        if (IS_ERR(data->hwmon_dev)) {
-                err = PTR_ERR(data->hwmon_dev);
-                goto exit_remove_files;
-        }
-        return 0;
-exit_remove_files:
-        sysfs_remove_group(&new_client->dev.kobj, &fscher_group);
-exit_free:
-        kfree(data);
-exit:
-        return err;
-}
-static int fscher_remove(struct i2c_client *client)
-{
-        struct fscher_data *data = i2c_get_clientdata(client);
-        hwmon_device_unregister(data->hwmon_dev);
-        sysfs_remove_group(&client->dev.kobj, &fscher_group);
-        kfree(data);
-        return 0;
-}
-static int fscher_read_value(struct i2c_client *client, u8 reg)
-{
-        dev_dbg(&client->dev, "read reg 0x%02x\n", reg);
-        return i2c_smbus_read_byte_data(client, reg);
-}
-static int fscher_write_value(struct i2c_client *client, u8 reg, u8 value)
-{
-        dev_dbg(&client->dev, "write reg 0x%02x, val 0x%02x\n",
-                reg, value);
-        return i2c_smbus_write_byte_data(client, reg, value);
-}
-/* Called when we have found a new FSC Hermes. */
-static void fscher_init_client(struct i2c_client *client)
-{
-        struct fscher_data *data = i2c_get_clientdata(client);
-        /* Read revision from chip */
-        data->revision =  fscher_read_value(client, FSCHER_REG_REVISION);
-}
-static struct fscher_data *fscher_update_device(struct device *dev)
-{
-        struct i2c_client *client = to_i2c_client(dev);
-        struct fscher_data *data = i2c_get_clientdata(client);
-        mutex_lock(&data->update_lock);
-        if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) {
-                dev_dbg(&client->dev, "Starting fscher update\n");
-                data->temp_act[0] = fscher_read_value(client, FSCHER_REG_TEMP0_ACT);
-                data->temp_act[1] = fscher_read_value(client, FSCHER_REG_TEMP1_ACT);
-                data->temp_act[2] = fscher_read_value(client, FSCHER_REG_TEMP2_ACT);
-                data->temp_status[0] = fscher_read_value(client, FSCHER_REG_TEMP0_STATE);
-                data->temp_status[1] = fscher_read_value(client, FSCHER_REG_TEMP1_STATE);
-                data->temp_status[2] = fscher_read_value(client, FSCHER_REG_TEMP2_STATE);
-                data->volt[0] = fscher_read_value(client, FSCHER_REG_VOLT_12);
-                data->volt[1] = fscher_read_value(client, FSCHER_REG_VOLT_5);
-                data->volt[2] = fscher_read_value(client, FSCHER_REG_VOLT_BATT);
-                data->fan_act[0] = fscher_read_value(client, FSCHER_REG_FAN0_ACT);
-                data->fan_act[1] = fscher_read_value(client, FSCHER_REG_FAN1_ACT);
-                data->fan_act[2] = fscher_read_value(client, FSCHER_REG_FAN2_ACT);
-                data->fan_status[0] = fscher_read_value(client, FSCHER_REG_FAN0_STATE);
-                data->fan_status[1] = fscher_read_value(client, FSCHER_REG_FAN1_STATE);
-                data->fan_status[2] = fscher_read_value(client, FSCHER_REG_FAN2_STATE);
-                data->fan_min[0] = fscher_read_value(client, FSCHER_REG_FAN0_MIN);
-                data->fan_min[1] = fscher_read_value(client, FSCHER_REG_FAN1_MIN);
-                data->fan_min[2] = fscher_read_value(client, FSCHER_REG_FAN2_MIN);
-                data->fan_ripple[0] = fscher_read_value(client, FSCHER_REG_FAN0_RIPPLE);
-                data->fan_ripple[1] = fscher_read_value(client, FSCHER_REG_FAN1_RIPPLE);
-                data->fan_ripple[2] = fscher_read_value(client, FSCHER_REG_FAN2_RIPPLE);
-                data->watchdog[0] = fscher_read_value(client, FSCHER_REG_WDOG_PRESET);
-                data->watchdog[1] = fscher_read_value(client, FSCHER_REG_WDOG_STATE);
-                data->watchdog[2] = fscher_read_value(client, FSCHER_REG_WDOG_CONTROL);
-                data->global_event = fscher_read_value(client, FSCHER_REG_EVENT_STATE);
-                data->global_control = fscher_read_value(client,
-                                                        FSCHER_REG_CONTROL);
-                data->last_updated = jiffies;
-                data->valid = 1;                 
-        }
-        mutex_unlock(&data->update_lock);
-        return data;
-}
-#define FAN_INDEX_FROM_NUM(nr)  ((nr) - 1)
-static ssize_t set_fan_status(struct i2c_client *client, struct fscher_data *data,
-                              const char *buf, size_t count, int nr, int reg)
-{
-        /* bits 0..1, 3..7 reserved => mask with 0x04 */  
-        unsigned long v = simple_strtoul(buf, NULL, 10) & 0x04;
-        
-        mutex_lock(&data->update_lock);
-        data->fan_status[FAN_INDEX_FROM_NUM(nr)] &= ~v;
-        fscher_write_value(client, reg, v);
-        mutex_unlock(&data->update_lock);
-        return count;
-}
-static ssize_t show_fan_status(struct fscher_data *data, char *buf, int nr)
-{
-        /* bits 0..1, 3..7 reserved => mask with 0x04 */  
-        return sprintf(buf, "%u\n", data->fan_status[FAN_INDEX_FROM_NUM(nr)] & 0x04);
-}
-static ssize_t set_pwm(struct i2c_client *client, struct fscher_data *data,
-                       const char *buf, size_t count, int nr, int reg)
-{
-        unsigned long v = simple_strtoul(buf, NULL, 10);
-        mutex_lock(&data->update_lock);
-        data->fan_min[FAN_INDEX_FROM_NUM(nr)] = v > 0xff ? 0xff : v;
-        fscher_write_value(client, reg, data->fan_min[FAN_INDEX_FROM_NUM(nr)]);
-        mutex_unlock(&data->update_lock);
-        return count;
-}
-static ssize_t show_pwm(struct fscher_data *data, char *buf, int nr)
-{
-        return sprintf(buf, "%u\n", data->fan_min[FAN_INDEX_FROM_NUM(nr)]);
-}
-static ssize_t set_fan_div(struct i2c_client *client, struct fscher_data *data,
-                           const char *buf, size_t count, int nr, int reg)
-{
-        /* supported values: 2, 4, 8 */
-        unsigned long v = simple_strtoul(buf, NULL, 10);
-        switch (v) {
-        case 2: v = 1; break;
-        case 4: v = 2; break;
-        case 8: v = 3; break;
-        default:
-                dev_err(&client->dev, "fan_div value %ld not "
-                         "supported. Choose one of 2, 4 or 8!\n", v);
-                return -EINVAL;
-        }
-        mutex_lock(&data->update_lock);
-        /* bits 2..7 reserved => mask with 0x03 */
-        data->fan_ripple[FAN_INDEX_FROM_NUM(nr)] &= ~0x03;
-        data->fan_ripple[FAN_INDEX_FROM_NUM(nr)] |= v;
-        fscher_write_value(client, reg, data->fan_ripple[FAN_INDEX_FROM_NUM(nr)]);
-        mutex_unlock(&data->update_lock);
-        return count;
-}
-static ssize_t show_fan_div(struct fscher_data *data, char *buf, int nr)
-{
-        /* bits 2..7 reserved => mask with 0x03 */  
-        return sprintf(buf, "%u\n", 1 << (data->fan_ripple[FAN_INDEX_FROM_NUM(nr)] & 0x03));
-}
-#define RPM_FROM_REG(val)       (val*60)
-static ssize_t show_fan_input (struct fscher_data *data, char *buf, int nr)
-{
-        return sprintf(buf, "%u\n", RPM_FROM_REG(data->fan_act[FAN_INDEX_FROM_NUM(nr)]));
-}
-#define TEMP_INDEX_FROM_NUM(nr)         ((nr) - 1)
-static ssize_t set_temp_status(struct i2c_client *client, struct fscher_data *data,
-                               const char *buf, size_t count, int nr, int reg)
-{
-        /* bits 2..7 reserved, 0 read only => mask with 0x02 */  
-        unsigned long v = simple_strtoul(buf, NULL, 10) & 0x02;
-        mutex_lock(&data->update_lock);
-        data->temp_status[TEMP_INDEX_FROM_NUM(nr)] &= ~v;
-        fscher_write_value(client, reg, v);
-        mutex_unlock(&data->update_lock);
-        return count;
-}
-static ssize_t show_temp_status(struct fscher_data *data, char *buf, int nr)
-{
-        /* bits 2..7 reserved => mask with 0x03 */
-        return sprintf(buf, "%u\n", data->temp_status[TEMP_INDEX_FROM_NUM(nr)] & 0x03);
-}
-#define TEMP_FROM_REG(val)      (((val) - 128) * 1000)
-static ssize_t show_temp_input(struct fscher_data *data, char *buf, int nr)
-{
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_act[TEMP_INDEX_FROM_NUM(nr)]));
-}
-/*
- * The final conversion is specified in sensors.conf, as it depends on
- * mainboard specific values. We export the registers contents as
- * pseudo-hundredths-of-Volts (range 0V - 2.55V). Not that it makes much
- * sense per se, but it minimizes the conversions count and keeps the
- * values within a usual range.
- */
-#define VOLT_FROM_REG(val)      ((val) * 10)
-static ssize_t show_in_input(struct fscher_data *data, char *buf, int nr)
-{
-        return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[nr]));
-}
-static ssize_t show_revision(struct fscher_data *data, char *buf, int nr)
-{
-        return sprintf(buf, "%u\n", data->revision);
-}
-static ssize_t show_alarms(struct fscher_data *data, char *buf, int nr)
-{
-        /* bits 2, 5..6 reserved => mask with 0x9b */
-        return sprintf(buf, "%u\n", data->global_event & 0x9b);
-}
-static ssize_t set_control(struct i2c_client *client, struct fscher_data *data,
-                           const char *buf, size_t count, int nr, int reg)
-{
-        /* bits 1..7 reserved => mask with 0x01 */  
-        unsigned long v = simple_strtoul(buf, NULL, 10) & 0x01;
-        mutex_lock(&data->update_lock);
-        data->global_control = v;
-        fscher_write_value(client, reg, v);
-        mutex_unlock(&data->update_lock);
-        return count;
-}
-static ssize_t show_control(struct fscher_data *data, char *buf, int nr)
-{
-        /* bits 1..7 reserved => mask with 0x01 */
-        return sprintf(buf, "%u\n", data->global_control & 0x01);
-}
-static ssize_t set_watchdog_control(struct i2c_client *client, struct
-                                    fscher_data *data, const char *buf, size_t count,
-                                    int nr, int reg)
-{
-        /* bits 0..3 reserved => mask with 0xf0 */  
-        unsigned long v = simple_strtoul(buf, NULL, 10) & 0xf0;
-        mutex_lock(&data->update_lock);
-        data->watchdog[2] &= ~0xf0;
-        data->watchdog[2] |= v;
-        fscher_write_value(client, reg, data->watchdog[2]);
-        mutex_unlock(&data->update_lock);
-        return count;
-}
-static ssize_t show_watchdog_control(struct fscher_data *data, char *buf, int nr)
-{
-        /* bits 0..3 reserved, bit 5 write only => mask with 0xd0 */
-        return sprintf(buf, "%u\n", data->watchdog[2] & 0xd0);
-}
-static ssize_t set_watchdog_status(struct i2c_client *client, struct fscher_data *data,
-                                   const char *buf, size_t count, int nr, int reg)
-{
-        /* bits 0, 2..7 reserved => mask with 0x02 */  
-        unsigned long v = simple_strtoul(buf, NULL, 10) & 0x02;
-        mutex_lock(&data->update_lock);
-        data->watchdog[1] &= ~v;
-        fscher_write_value(client, reg, v);
-        mutex_unlock(&data->update_lock);
-        return count;
-}
-static ssize_t show_watchdog_status(struct fscher_data *data, char *buf, int nr)
-{
-        /* bits 0, 2..7 reserved => mask with 0x02 */
-        return sprintf(buf, "%u\n", data->watchdog[1] & 0x02);
-}
-static ssize_t set_watchdog_preset(struct i2c_client *client, struct fscher_data *data,
-                                   const char *buf, size_t count, int nr, int reg)
-{
-        unsigned long v = simple_strtoul(buf, NULL, 10) & 0xff;
-        
-        mutex_lock(&data->update_lock);
-        data->watchdog[0] = v;
-        fscher_write_value(client, reg, data->watchdog[0]);
-        mutex_unlock(&data->update_lock);
-        return count;
-}
-static ssize_t show_watchdog_preset(struct fscher_data *data, char *buf, int nr)
-{
-        return sprintf(buf, "%u\n", data->watchdog[0]);
-}
-static int __init sensors_fscher_init(void)
-{
-        return i2c_add_driver(&fscher_driver);
-}
-static void __exit sensors_fscher_exit(void)
-{
-        i2c_del_driver(&fscher_driver);
-}
-MODULE_AUTHOR("Reinhard Nissl <rnissl@gmx.de>");
-MODULE_DESCRIPTION("FSC Hermes driver");
-MODULE_LICENSE("GPL");
-module_init(sensors_fscher_init);
-module_exit(sensors_fscher_exit);
diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c
deleted file mode 100644
index 8a7bcf500b4e..000000000000
--- a/drivers/hwmon/fscpos.c
+++ /dev/null
@@ -1,654 +0,0 @@
-/*
-        fscpos.c - Kernel module for hardware monitoring with FSC Poseidon chips
-        Copyright (C) 2004, 2005 Stefan Ott <stefan@desire.ch>
-        This program is free software; you can redistribute it and/or modify
-        it under the terms of the GNU General Public License as published by
-        the Free Software Foundation; either version 2 of the License, or
-        (at your option) any later version.
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-        GNU General Public License for more details.
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to the Free Software
-        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-/*
-        fujitsu siemens poseidon chip,
-        module based on the old fscpos module by Hermann Jung <hej@odn.de> and
-        the fscher module by Reinhard Nissl <rnissl@gmx.de>
-        original module based on lm80.c
-        Copyright (C) 1998, 1999 Frodo Looijaard <frodol@dds.nl>
-        and Philip Edelbrock <phil@netroedge.com>
-        Thanks to Jean Delvare for reviewing my code and suggesting a lot of
-        improvements.
-*/
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/jiffies.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/hwmon.h>
-#include <linux/err.h>
-#include <linux/mutex.h>
-#include <linux/sysfs.h>
-/*
- * Addresses to scan
- */
-static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
-/*
- * Insmod parameters
- */
-I2C_CLIENT_INSMOD_1(fscpos);
-/*
- * The FSCPOS registers
- */
-/* chip identification */
-#define FSCPOS_REG_IDENT_0              0x00
-#define FSCPOS_REG_IDENT_1              0x01
-#define FSCPOS_REG_IDENT_2              0x02
-#define FSCPOS_REG_REVISION             0x03
-/* global control and status */
-#define FSCPOS_REG_EVENT_STATE          0x04
-#define FSCPOS_REG_CONTROL              0x05
-/* watchdog */
-#define FSCPOS_REG_WDOG_PRESET          0x28
-#define FSCPOS_REG_WDOG_STATE           0x23
-#define FSCPOS_REG_WDOG_CONTROL         0x21
-/* voltages */
-#define FSCPOS_REG_VOLT_12              0x45
-#define FSCPOS_REG_VOLT_5               0x42
-#define FSCPOS_REG_VOLT_BATT            0x48
-/* fans - the chip does not support minimum speed for fan2 */
-static u8 FSCPOS_REG_PWM[] = { 0x55, 0x65 };
-static u8 FSCPOS_REG_FAN_ACT[] = { 0x0e, 0x6b, 0xab };
-static u8 FSCPOS_REG_FAN_STATE[] = { 0x0d, 0x62, 0xa2 };
-static u8 FSCPOS_REG_FAN_RIPPLE[] = { 0x0f, 0x6f, 0xaf };
-/* temperatures */
-static u8 FSCPOS_REG_TEMP_ACT[] = { 0x64, 0x32, 0x35 };
-static u8 FSCPOS_REG_TEMP_STATE[] = { 0x71, 0x81, 0x91 };
-/*
- * Functions declaration
- */
-static int fscpos_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id);
-static int fscpos_detect(struct i2c_client *client, int kind,
-                         struct i2c_board_info *info);
-static int fscpos_remove(struct i2c_client *client);
-static int fscpos_read_value(struct i2c_client *client, u8 reg);
-static int fscpos_write_value(struct i2c_client *client, u8 reg, u8 value);
-static struct fscpos_data *fscpos_update_device(struct device *dev);
-static void fscpos_init_client(struct i2c_client *client);
-static void reset_fan_alarm(struct i2c_client *client, int nr);
-/*
- * Driver data (common to all clients)
- */
-static const struct i2c_device_id fscpos_id[] = {
-        { "fscpos", fscpos },
-        { }
-};
-static struct i2c_driver fscpos_driver = {
-        .class          = I2C_CLASS_HWMON,
-        .driver = {
-                .name   = "fscpos",
-        },
-        .probe          = fscpos_probe,
-        .remove         = fscpos_remove,
-        .id_table       = fscpos_id,
-        .detect         = fscpos_detect,
-        .address_data   = &addr_data,
-};
-/*
- * Client data (each client gets its own)
- */
-struct fscpos_data {
-        struct device *hwmon_dev;
-        struct mutex update_lock;
-        char valid;             /* 0 until following fields are valid */
-        unsigned long last_updated;     /* In jiffies */
-        /* register values */
-        u8 revision;            /* revision of chip */
-        u8 global_event;        /* global event status */
-        u8 global_control;      /* global control register */
-        u8 wdog_control;        /* watchdog control */
-        u8 wdog_state;          /* watchdog status */
-        u8 wdog_preset;         /* watchdog preset */
-        u8 volt[3];             /* 12, 5, battery current */
-        u8 temp_act[3];         /* temperature */
-        u8 temp_status[3];      /* status of sensor */
-        u8 fan_act[3];          /* fans revolutions per second */
-        u8 fan_status[3];       /* fan status */
-        u8 pwm[2];              /* fan min value for rps */
-        u8 fan_ripple[3];       /* divider for rps */
-};
-/* Temperature */
-#define TEMP_FROM_REG(val)      (((val) - 128) * 1000)
-static ssize_t show_temp_input(struct fscpos_data *data, char *buf, int nr)
-{
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_act[nr - 1]));
-}
-static ssize_t show_temp_status(struct fscpos_data *data, char *buf, int nr)
-{
-        /* bits 2..7 reserved => mask with 0x03 */
-        return sprintf(buf, "%u\n", data->temp_status[nr - 1] & 0x03);
-}
-static ssize_t show_temp_reset(struct fscpos_data *data, char *buf, int nr)
-{
-        return sprintf(buf, "1\n");
-}
-static ssize_t set_temp_reset(struct i2c_client *client, struct fscpos_data
-                        *data, const char *buf, size_t count, int nr, int reg)
-{
-        unsigned long v = simple_strtoul(buf, NULL, 10);
-        if (v != 1) {
-                dev_err(&client->dev, "temp_reset value %ld not supported. "
-                                        "Use 1 to reset the alarm!\n", v);
-                return -EINVAL;
-        }
-        dev_info(&client->dev, "You used the temp_reset feature which has not "
-                                "been proplerly tested. Please report your "
-                                "experience to the module author.\n");
-        /* Supported value: 2 (clears the status) */
-        fscpos_write_value(client, FSCPOS_REG_TEMP_STATE[nr - 1], 2);
-        return count;
-}
-/* Fans */
-#define RPM_FROM_REG(val)       ((val) * 60)
-static ssize_t show_fan_status(struct fscpos_data *data, char *buf, int nr)
-{
-        /* bits 0..1, 3..7 reserved => mask with 0x04 */
-        return sprintf(buf, "%u\n", data->fan_status[nr - 1] & 0x04);
-}
-static ssize_t show_fan_input(struct fscpos_data *data, char *buf, int nr)
-{
-        return sprintf(buf, "%u\n", RPM_FROM_REG(data->fan_act[nr - 1]));
-}
-static ssize_t show_fan_ripple(struct fscpos_data *data, char *buf, int nr)
-{
-        /* bits 2..7 reserved => mask with 0x03 */
-        return sprintf(buf, "%u\n", data->fan_ripple[nr - 1] & 0x03);
-}
-static ssize_t set_fan_ripple(struct i2c_client *client, struct fscpos_data
-                        *data, const char *buf, size_t count, int nr, int reg)
-{
-        /* supported values: 2, 4, 8 */
-        unsigned long v = simple_strtoul(buf, NULL, 10);
-        switch (v) {
-                case 2: v = 1; break;
-                case 4: v = 2; break;
-                case 8: v = 3; break;
-        default:
-                dev_err(&client->dev, "fan_ripple value %ld not supported. "
-                                        "Must be one of 2, 4 or 8!\n", v);
-                return -EINVAL;
-        }
-        
-        mutex_lock(&data->update_lock);
-        /* bits 2..7 reserved => mask with 0x03 */
-        data->fan_ripple[nr - 1] &= ~0x03;
-        data->fan_ripple[nr - 1] |= v;
-        
-        fscpos_write_value(client, reg, data->fan_ripple[nr - 1]);
-        mutex_unlock(&data->update_lock);
-        return count;
-}
-static ssize_t show_pwm(struct fscpos_data *data, char *buf, int nr)
-{
-        return sprintf(buf, "%u\n", data->pwm[nr - 1]);
-}
-static ssize_t set_pwm(struct i2c_client *client, struct fscpos_data *data,
-                                const char *buf, size_t count, int nr, int reg)
-{
-        unsigned long v = simple_strtoul(buf, NULL, 10);
-        /* Range: 0..255 */
-        if (v < 0) v = 0;
-        if (v > 255) v = 255;
-        mutex_lock(&data->update_lock);
-        data->pwm[nr - 1] = v;
-        fscpos_write_value(client, reg, data->pwm[nr - 1]);
-        mutex_unlock(&data->update_lock);
-        return count;
-}
-static void reset_fan_alarm(struct i2c_client *client, int nr)
-{
-        fscpos_write_value(client, FSCPOS_REG_FAN_STATE[nr], 4);
-}
-/* Volts */
-#define VOLT_FROM_REG(val, mult)        ((val) * (mult) / 255)
-static ssize_t show_volt_12(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct fscpos_data *data = fscpos_update_device(dev);
-        return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[0], 14200));
-}
-static ssize_t show_volt_5(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct fscpos_data *data = fscpos_update_device(dev);
-        return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[1], 6600));
-}
-static ssize_t show_volt_batt(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct fscpos_data *data = fscpos_update_device(dev);
-        return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[2], 3300));
-}
-/* Watchdog */
-static ssize_t show_wdog_control(struct fscpos_data *data, char *buf)
-{
-        /* bits 0..3 reserved, bit 6 write only => mask with 0xb0 */
-        return sprintf(buf, "%u\n", data->wdog_control & 0xb0);
-}
-static ssize_t set_wdog_control(struct i2c_client *client, struct fscpos_data
-                                *data, const char *buf, size_t count, int reg)
-{
-        /* bits 0..3 reserved => mask with 0xf0 */
-        unsigned long v = simple_strtoul(buf, NULL, 10) & 0xf0;
-        mutex_lock(&data->update_lock);
-        data->wdog_control &= ~0xf0;
-        data->wdog_control |= v;
-        fscpos_write_value(client, reg, data->wdog_control);
-        mutex_unlock(&data->update_lock);
-        return count;
-}
-static ssize_t show_wdog_state(struct fscpos_data *data, char *buf)
-{
-        /* bits 0, 2..7 reserved => mask with 0x02 */
-        return sprintf(buf, "%u\n", data->wdog_state & 0x02);
-}
-static ssize_t set_wdog_state(struct i2c_client *client, struct fscpos_data
-                                *data, const char *buf, size_t count, int reg)
-{
-        unsigned long v = simple_strtoul(buf, NULL, 10) & 0x02;
-        /* Valid values: 2 (clear) */
-        if (v != 2) {
-                dev_err(&client->dev, "wdog_state value %ld not supported. "
-                                        "Must be 2 to clear the state!\n", v);
-                return -EINVAL;
-        }
-        mutex_lock(&data->update_lock);
-        data->wdog_state &= ~v;
-        fscpos_write_value(client, reg, v);
-        mutex_unlock(&data->update_lock);
-        return count;
-}
-static ssize_t show_wdog_preset(struct fscpos_data *data, char *buf)
-{
-        return sprintf(buf, "%u\n", data->wdog_preset);
-}
-static ssize_t set_wdog_preset(struct i2c_client *client, struct fscpos_data
-                                *data, const char *buf, size_t count, int reg)
-{
-        unsigned long v = simple_strtoul(buf, NULL, 10) & 0xff;
-        mutex_lock(&data->update_lock);
-        data->wdog_preset = v;
-        fscpos_write_value(client, reg, data->wdog_preset);
-        mutex_unlock(&data->update_lock);
-        return count;
-}
-/* Event */
-static ssize_t show_event(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        /* bits 5..7 reserved => mask with 0x1f */
-        struct fscpos_data *data = fscpos_update_device(dev);
-        return sprintf(buf, "%u\n", data->global_event & 0x9b);
-}
-/*
- * Sysfs stuff
- */
-#define create_getter(kind, sub) \
-        static ssize_t sysfs_show_##kind##sub(struct device *dev, struct device_attribute *attr, char *buf) \
-        { \
-                struct fscpos_data *data = fscpos_update_device(dev); \
-                return show_##kind##sub(data, buf); \
-        }
-#define create_getter_n(kind, offset, sub) \
-        static ssize_t sysfs_show_##kind##offset##sub(struct device *dev, struct device_attribute *attr, char\
-                                                                        *buf) \
-        { \
-                struct fscpos_data *data = fscpos_update_device(dev); \
-                return show_##kind##sub(data, buf, offset); \
-        }
-#define create_setter(kind, sub, reg) \
-        static ssize_t sysfs_set_##kind##sub (struct device *dev, struct device_attribute *attr, const char \
-                                                        *buf, size_t count) \
-        { \
-                struct i2c_client *client = to_i2c_client(dev); \
-                struct fscpos_data *data = i2c_get_clientdata(client); \
-                return set_##kind##sub(client, data, buf, count, reg); \
-        }
-#define create_setter_n(kind, offset, sub, reg) \
-        static ssize_t sysfs_set_##kind##offset##sub (struct device *dev, struct device_attribute *attr, \
-                                        const char *buf, size_t count) \
-        { \
-                struct i2c_client *client = to_i2c_client(dev); \
-                struct fscpos_data *data = i2c_get_clientdata(client); \
-                return set_##kind##sub(client, data, buf, count, offset, reg);\
-        }
-#define create_sysfs_device_ro(kind, sub, offset) \
-        static DEVICE_ATTR(kind##offset##sub, S_IRUGO, \
-                                        sysfs_show_##kind##offset##sub, NULL);
-#define create_sysfs_device_rw(kind, sub, offset) \
-        static DEVICE_ATTR(kind##offset##sub, S_IRUGO | S_IWUSR, \
-                sysfs_show_##kind##offset##sub, sysfs_set_##kind##offset##sub);
-#define sysfs_ro_n(kind, sub, offset) \
-        create_getter_n(kind, offset, sub); \
-        create_sysfs_device_ro(kind, sub, offset);
-#define sysfs_rw_n(kind, sub, offset, reg) \
-        create_getter_n(kind, offset, sub); \
-        create_setter_n(kind, offset, sub, reg); \
-        create_sysfs_device_rw(kind, sub, offset);
-#define sysfs_rw(kind, sub, reg) \
-        create_getter(kind, sub); \
-        create_setter(kind, sub, reg); \
-        create_sysfs_device_rw(kind, sub,);
-#define sysfs_fan_with_min(offset, reg_status, reg_ripple, reg_min) \
-        sysfs_fan(offset, reg_status, reg_ripple); \
-        sysfs_rw_n(pwm,, offset, reg_min);
-#define sysfs_fan(offset, reg_status, reg_ripple) \
-        sysfs_ro_n(fan, _input, offset); \
-        sysfs_ro_n(fan, _status, offset); \
-        sysfs_rw_n(fan, _ripple, offset, reg_ripple);
-#define sysfs_temp(offset, reg_status) \
-        sysfs_ro_n(temp, _input, offset); \
-        sysfs_ro_n(temp, _status, offset); \
-        sysfs_rw_n(temp, _reset, offset, reg_status);
-#define sysfs_watchdog(reg_wdog_preset, reg_wdog_state, reg_wdog_control) \
-        sysfs_rw(wdog, _control, reg_wdog_control); \
-        sysfs_rw(wdog, _preset, reg_wdog_preset); \
-        sysfs_rw(wdog, _state, reg_wdog_state);
-sysfs_fan_with_min(1, FSCPOS_REG_FAN_STATE[0], FSCPOS_REG_FAN_RIPPLE[0],
-                                                        FSCPOS_REG_PWM[0]);
-sysfs_fan_with_min(2, FSCPOS_REG_FAN_STATE[1], FSCPOS_REG_FAN_RIPPLE[1],
-                                                        FSCPOS_REG_PWM[1]);
-sysfs_fan(3, FSCPOS_REG_FAN_STATE[2], FSCPOS_REG_FAN_RIPPLE[2]);
-sysfs_temp(1, FSCPOS_REG_TEMP_STATE[0]);
-sysfs_temp(2, FSCPOS_REG_TEMP_STATE[1]);
-sysfs_temp(3, FSCPOS_REG_TEMP_STATE[2]);
-sysfs_watchdog(FSCPOS_REG_WDOG_PRESET, FSCPOS_REG_WDOG_STATE,
-                                                FSCPOS_REG_WDOG_CONTROL);
-static DEVICE_ATTR(event, S_IRUGO, show_event, NULL);
-static DEVICE_ATTR(in0_input, S_IRUGO, show_volt_12, NULL);
-static DEVICE_ATTR(in1_input, S_IRUGO, show_volt_5, NULL);
-static DEVICE_ATTR(in2_input, S_IRUGO, show_volt_batt, NULL);
-static struct attribute *fscpos_attributes[] = {
-        &dev_attr_event.attr,
-        &dev_attr_in0_input.attr,
-        &dev_attr_in1_input.attr,
-        &dev_attr_in2_input.attr,
-        &dev_attr_wdog_control.attr,
-        &dev_attr_wdog_preset.attr,
-        &dev_attr_wdog_state.attr,
-        &dev_attr_temp1_input.attr,
-        &dev_attr_temp1_status.attr,
-        &dev_attr_temp1_reset.attr,
-        &dev_attr_temp2_input.attr,
-        &dev_attr_temp2_status.attr,
-        &dev_attr_temp2_reset.attr,
-        &dev_attr_temp3_input.attr,
-        &dev_attr_temp3_status.attr,
-        &dev_attr_temp3_reset.attr,
-        &dev_attr_fan1_input.attr,
-        &dev_attr_fan1_status.attr,
-        &dev_attr_fan1_ripple.attr,
-        &dev_attr_pwm1.attr,
-        &dev_attr_fan2_input.attr,
-        &dev_attr_fan2_status.attr,
-        &dev_attr_fan2_ripple.attr,
-        &dev_attr_pwm2.attr,
-        &dev_attr_fan3_input.attr,
-        &dev_attr_fan3_status.attr,
-        &dev_attr_fan3_ripple.attr,
-        NULL
-};
-static const struct attribute_group fscpos_group = {
-        .attrs = fscpos_attributes,
-};
-/* Return 0 if detection is successful, -ENODEV otherwise */
-static int fscpos_detect(struct i2c_client *new_client, int kind,
-                         struct i2c_board_info *info)
-{
-        struct i2c_adapter *adapter = new_client->adapter;
-        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-                return -ENODEV;
-        /* Do the remaining detection unless force or force_fscpos parameter */
-        if (kind < 0) {
-                if ((fscpos_read_value(new_client, FSCPOS_REG_IDENT_0)
-                        != 0x50) /* 'P' */
-                || (fscpos_read_value(new_client, FSCPOS_REG_IDENT_1)
-                        != 0x45) /* 'E' */
-                || (fscpos_read_value(new_client, FSCPOS_REG_IDENT_2)
-                        != 0x47))/* 'G' */
-                        return -ENODEV;
-        }
-        strlcpy(info->type, "fscpos", I2C_NAME_SIZE);
-        return 0;
-}
-static int fscpos_probe(struct i2c_client *new_client,
-                        const struct i2c_device_id *id)
-{
-        struct fscpos_data *data;
-        int err;
-        data = kzalloc(sizeof(struct fscpos_data), GFP_KERNEL);
-        if (!data) {
-                err = -ENOMEM;
-                goto exit;
-        }
-        i2c_set_clientdata(new_client, data);
-        data->valid = 0;
-        mutex_init(&data->update_lock);
-        /* Inizialize the fscpos chip */
-        fscpos_init_client(new_client);
-        /* Announce that the chip was found */
-        dev_info(&new_client->dev, "Found fscpos chip, rev %u\n", data->revision);
-        /* Register sysfs hooks */
-        if ((err = sysfs_create_group(&new_client->dev.kobj, &fscpos_group)))
-                goto exit_free;
-        data->hwmon_dev = hwmon_device_register(&new_client->dev);
-        if (IS_ERR(data->hwmon_dev)) {
-                err = PTR_ERR(data->hwmon_dev);
-                goto exit_remove_files;
-        }
-        return 0;
-exit_remove_files:
-        sysfs_remove_group(&new_client->dev.kobj, &fscpos_group);
-exit_free:
-        kfree(data);
-exit:
-        return err;
-}
-static int fscpos_remove(struct i2c_client *client)
-{
-        struct fscpos_data *data = i2c_get_clientdata(client);
-        hwmon_device_unregister(data->hwmon_dev);
-        sysfs_remove_group(&client->dev.kobj, &fscpos_group);
-        kfree(data);
-        return 0;
-}
-static int fscpos_read_value(struct i2c_client *client, u8 reg)
-{
-        dev_dbg(&client->dev, "Read reg 0x%02x\n", reg);
-        return i2c_smbus_read_byte_data(client, reg);
-}
-static int fscpos_write_value(struct i2c_client *client, u8 reg, u8 value)
-{
-        dev_dbg(&client->dev, "Write reg 0x%02x, val 0x%02x\n", reg, value);
-        return i2c_smbus_write_byte_data(client, reg, value);
-}
-/* Called when we have found a new FSCPOS chip */
-static void fscpos_init_client(struct i2c_client *client)
-{
-        struct fscpos_data *data = i2c_get_clientdata(client);
-        /* read revision from chip */
-        data->revision = fscpos_read_value(client, FSCPOS_REG_REVISION);
-}
-static struct fscpos_data *fscpos_update_device(struct device *dev)
-{
-        struct i2c_client *client = to_i2c_client(dev);
-        struct fscpos_data *data = i2c_get_clientdata(client);
-        mutex_lock(&data->update_lock);
-        if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) {
-                int i;
-                dev_dbg(&client->dev, "Starting fscpos update\n");
-                for (i = 0; i < 3; i++) {
-                        data->temp_act[i] = fscpos_read_value(client,
-                                                FSCPOS_REG_TEMP_ACT[i]);
-                        data->temp_status[i] = fscpos_read_value(client,
-                                                FSCPOS_REG_TEMP_STATE[i]);
-                        data->fan_act[i] = fscpos_read_value(client,
-                                                FSCPOS_REG_FAN_ACT[i]);
-                        data->fan_status[i] = fscpos_read_value(client,
-                                                FSCPOS_REG_FAN_STATE[i]);
-                        data->fan_ripple[i] = fscpos_read_value(client,
-                                                FSCPOS_REG_FAN_RIPPLE[i]);
-                        if (i < 2) {
-                                /* fan2_min is not supported by the chip */
-                                data->pwm[i] = fscpos_read_value(client,
-                                                        FSCPOS_REG_PWM[i]);
-                        }
-                        /* reset fan status if speed is back to > 0 */
-                        if (data->fan_status[i] != 0 && data->fan_act[i] > 0) {
-                                reset_fan_alarm(client, i);
-                        }
-                }
-                data->volt[0] = fscpos_read_value(client, FSCPOS_REG_VOLT_12);
-                data->volt[1] = fscpos_read_value(client, FSCPOS_REG_VOLT_5);
-                data->volt[2] = fscpos_read_value(client, FSCPOS_REG_VOLT_BATT);
-                data->wdog_preset = fscpos_read_value(client,
-                                                        FSCPOS_REG_WDOG_PRESET);
-                data->wdog_state = fscpos_read_value(client,
-                                                        FSCPOS_REG_WDOG_STATE);
-                data->wdog_control = fscpos_read_value(client,
-                                                FSCPOS_REG_WDOG_CONTROL);
-                data->global_event = fscpos_read_value(client,
-                                                FSCPOS_REG_EVENT_STATE);
-                data->last_updated = jiffies;
-                data->valid = 1;
-        }
-        mutex_unlock(&data->update_lock);
-        return data;
-}
-static int __init sm_fscpos_init(void)
-{
-        return i2c_add_driver(&fscpos_driver);
-}
-static void __exit sm_fscpos_exit(void)
-{
-        i2c_del_driver(&fscpos_driver);
-}
-MODULE_AUTHOR("Stefan Ott <stefan@desire.ch> based on work from Hermann Jung "
-                                "<hej@odn.de>, Frodo Looijaard <frodol@dds.nl>"
-                                " and Philip Edelbrock <phil@netroedge.com>");
-MODULE_DESCRIPTION("fujitsu siemens poseidon chip driver");
-MODULE_LICENSE("GPL");
-module_init(sm_fscpos_init);
-module_exit(sm_fscpos_exit);
diff --git a/drivers/hwmon/ltc4215.c b/drivers/hwmon/ltc4215.c
index 9386e2a39211..6c9a04136e0a 100644
--- a/drivers/hwmon/ltc4215.c
+++ b/drivers/hwmon/ltc4215.c
@@ -259,7 +259,7 @@ static int ltc4215_probe(struct i2c_client *client,
        mutex_init(&data->update_lock);
        /* Initialize the LTC4215 chip */
-        /* TODO */
+        i2c_smbus_write_byte_data(client, LTC4215_FAULT, 0x00);
        /* Register sysfs hooks */
        ret = sysfs_create_group(&client->dev.kobj, &ltc4215_group);
diff --git a/drivers/hwmon/ltc4245.c b/drivers/hwmon/ltc4245.c
index 034b2c515848..e38964333612 100644
--- a/drivers/hwmon/ltc4245.c
+++ b/drivers/hwmon/ltc4245.c
@@ -382,7 +382,8 @@ static int ltc4245_probe(struct i2c_client *client,
        mutex_init(&data->update_lock);
        /* Initialize the LTC4245 chip */
-        /* TODO */
+        i2c_smbus_write_byte_data(client, LTC4245_FAULT1, 0x00);
+        i2c_smbus_write_byte_data(client, LTC4245_FAULT2, 0x00);
        /* Register sysfs hooks */
        ret = sysfs_create_group(&client->dev.kobj, &ltc4245_group);
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 556539d617a4..e828aab7dace 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -11,6 +11,7 @@
 */
 #include <linux/init.h>
+#include <linux/types.h>
 #include <linux/input.h>
 #include <linux/module.h>
 #include <linux/random.h>
@@ -514,7 +515,7 @@ static void input_disconnect_device(struct input_dev *dev)
         * that there are no threads in the middle of input_open_device()
         */
        mutex_lock(&dev->mutex);
-        dev->going_away = 1;
+        dev->going_away = true;
        mutex_unlock(&dev->mutex);
        spin_lock_irq(&dev->event_lock);
@@ -1259,10 +1260,71 @@ static int input_dev_uevent(struct device *device, struct kobj_uevent_env *env)
        return 0;
 }
+#define INPUT_DO_TOGGLE(dev, type, bits, on)                    \
+        do {                                                    \
+                int i;                                          \
+                if (!test_bit(EV_##type, dev->evbit))           \
+                        break;                                  \
+                for (i = 0; i < type##_MAX; i++) {              \
+                        if (!test_bit(i, dev->bits##bit) ||     \
+                            !test_bit(i, dev->bits))            \
+                                continue;                       \
+                        dev->event(dev, EV_##type, i, on);      \
+                }                                               \
+        } while (0)
+static void input_dev_reset(struct input_dev *dev, bool activate)
+{
+        if (!dev->event)
+                return;
+        INPUT_DO_TOGGLE(dev, LED, led, activate);
+        INPUT_DO_TOGGLE(dev, SND, snd, activate);
+        if (activate && test_bit(EV_REP, dev->evbit)) {
+                dev->event(dev, EV_REP, REP_PERIOD, dev->rep[REP_PERIOD]);
+                dev->event(dev, EV_REP, REP_DELAY, dev->rep[REP_DELAY]);
+        }
+}
+#ifdef CONFIG_PM
+static int input_dev_suspend(struct device *dev)
+{
+        struct input_dev *input_dev = to_input_dev(dev);
+        mutex_lock(&input_dev->mutex);
+        input_dev_reset(input_dev, false);
+        mutex_unlock(&input_dev->mutex);
+        return 0;
+}
+static int input_dev_resume(struct device *dev)
+{
+        struct input_dev *input_dev = to_input_dev(dev);
+        mutex_lock(&input_dev->mutex);
+        input_dev_reset(input_dev, true);
+        mutex_unlock(&input_dev->mutex);
+        return 0;
+}
+static const struct dev_pm_ops input_dev_pm_ops = {
+        .suspend        = input_dev_suspend,
+        .resume         = input_dev_resume,
+        .poweroff       = input_dev_suspend,
+        .restore        = input_dev_resume,
+};
+#endif /* CONFIG_PM */
 static struct device_type input_dev_type = {
        .groups         = input_dev_attr_groups,
        .release        = input_dev_release,
        .uevent         = input_dev_uevent,
+#ifdef CONFIG_PM
+        .pm             = &input_dev_pm_ops,
+#endif
 };
 static char *input_devnode(struct device *dev, mode_t *mode)
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 3525c19be428..ee98b1bc5d89 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -24,6 +24,16 @@ config KEYBOARD_AAED2000
          To compile this driver as a module, choose M here: the
          module will be called aaed2000_kbd.
+config KEYBOARD_ADP5588
+        tristate "ADP5588 I2C QWERTY Keypad and IO Expander"
+        depends on I2C
+        help
+          Say Y here if you want to use a ADP5588 attached to your
+          system I2C bus.
+          To compile this driver as a module, choose M here: the
+          module will be called adp5588-keys.
 config KEYBOARD_AMIGA
        tristate "Amiga keyboard"
        depends on AMIGA
@@ -104,6 +114,16 @@ config KEYBOARD_ATKBD_RDI_KEYCODES
          right-hand column will be interpreted as the key shown in the
          left-hand column.
+config QT2160
+        tristate "Atmel AT42QT2160 Touch Sensor Chip"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for Atmel AT42QT2160 Touch
+          Sensor chip as a keyboard input.
+          This driver can also be built as a module. If so, the module
+          will be called qt2160.
 config KEYBOARD_BFIN
        tristate "Blackfin BF54x keypad support"
        depends on (BF54x && !BF544)
@@ -251,6 +271,17 @@ config KEYBOARD_MAPLE
          To compile this driver as a module, choose M here: the
          module will be called maple_keyb.
+config KEYBOARD_MAX7359
+        tristate "Maxim MAX7359 Key Switch Controller"
+        depends on I2C
+        help
+          If you say yes here you get support for the Maxim MAX7359 Key
+          Switch Controller chip. This providers microprocessors with
+          management of up to 64 key switches
+          To compile this driver as a module, choose M here: the
+          module will be called max7359_keypad.
 config KEYBOARD_NEWTON
        tristate "Newton keyboard"
        select SERIO
@@ -260,6 +291,15 @@ config KEYBOARD_NEWTON
          To compile this driver as a module, choose M here: the
          module will be called newtonkbd.
+config KEYBOARD_OPENCORES
+        tristate "OpenCores Keyboard Controller"
+        help
+          Say Y here if you want to use the OpenCores Keyboard Controller
+          http://www.opencores.org/project,keyboardcontroller
+          To compile this driver as a module, choose M here; the
+          module will be called opencores-kbd.
 config KEYBOARD_PXA27x
        tristate "PXA27x/PXA3xx keypad support"
        depends on PXA27x || PXA3xx
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 8a7a22b30266..babad5e58b77 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -5,6 +5,7 @@
 # Each configuration option enables a list of files.
 obj-$(CONFIG_KEYBOARD_AAED2000)         += aaed2000_kbd.o
+obj-$(CONFIG_KEYBOARD_ADP5588)          += adp5588-keys.o
 obj-$(CONFIG_KEYBOARD_AMIGA)            += amikbd.o
 obj-$(CONFIG_KEYBOARD_ATARI)            += atakbd.o
 obj-$(CONFIG_KEYBOARD_ATKBD)            += atkbd.o
@@ -21,10 +22,13 @@ obj-$(CONFIG_KEYBOARD_LM8323)		+= lm8323.o
 obj-$(CONFIG_KEYBOARD_LOCOMO)           += locomokbd.o
 obj-$(CONFIG_KEYBOARD_MAPLE)            += maple_keyb.o
 obj-$(CONFIG_KEYBOARD_MATRIX)           += matrix_keypad.o
+obj-$(CONFIG_KEYBOARD_MAX7359)          += max7359_keypad.o
 obj-$(CONFIG_KEYBOARD_NEWTON)           += newtonkbd.o
 obj-$(CONFIG_KEYBOARD_OMAP)             += omap-keypad.o
+obj-$(CONFIG_KEYBOARD_OPENCORES)        += opencores-kbd.o
 obj-$(CONFIG_KEYBOARD_PXA27x)           += pxa27x_keypad.o
 obj-$(CONFIG_KEYBOARD_PXA930_ROTARY)    += pxa930_rotary.o
+obj-$(CONFIG_KEYBOARD_QT2160)           += qt2160.o
 obj-$(CONFIG_KEYBOARD_SH_KEYSC)         += sh_keysc.o
 obj-$(CONFIG_KEYBOARD_SPITZ)            += spitzkbd.o
 obj-$(CONFIG_KEYBOARD_STOWAWAY)         += stowaway.o
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
new file mode 100644
index 000000000000..d48c808d5928
--- /dev/null
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -0,0 +1,361 @@
+/*
+ * File: drivers/input/keyboard/adp5588_keys.c
+ * Description:  keypad driver for ADP5588 I2C QWERTY Keypad and IO Expander
+ * Bugs: Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Copyright (C) 2008-2009 Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/workqueue.h>
+#include <linux/errno.h>
+#include <linux/pm.h>
+#include <linux/platform_device.h>
+#include <linux/input.h>
+#include <linux/i2c.h>
+#include <linux/i2c/adp5588.h>
+ /* Configuration Register1 */
+#define AUTO_INC        (1 << 7)
+#define GPIEM_CFG       (1 << 6)
+#define OVR_FLOW_M      (1 << 5)
+#define INT_CFG         (1 << 4)
+#define OVR_FLOW_IEN    (1 << 3)
+#define K_LCK_IM        (1 << 2)
+#define GPI_IEN         (1 << 1)
+#define KE_IEN          (1 << 0)
+/* Interrupt Status Register */
+#define CMP2_INT        (1 << 5)
+#define CMP1_INT        (1 << 4)
+#define OVR_FLOW_INT    (1 << 3)
+#define K_LCK_INT       (1 << 2)
+#define GPI_INT         (1 << 1)
+#define KE_INT          (1 << 0)
+/* Key Lock and Event Counter Register */
+#define K_LCK_EN        (1 << 6)
+#define LCK21           0x30
+#define KEC             0xF
+/* Key Event Register xy */
+#define KEY_EV_PRESSED          (1 << 7)
+#define KEY_EV_MASK             (0x7F)
+#define KP_SEL(x)               (0xFFFF >> (16 - x))    /* 2^x-1 */
+#define KEYP_MAX_EVENT          10
+/*
+ * Early pre 4.0 Silicon required to delay readout by at least 25ms,
+ * since the Event Counter Register updated 25ms after the interrupt
+ * asserted.
+ */
+#define WA_DELAYED_READOUT_REVID(rev)           ((rev) < 4)
+struct adp5588_kpad {
+        struct i2c_client *client;
+        struct input_dev *input;
+        struct delayed_work work;
+        unsigned long delay;
+        unsigned short keycode[ADP5588_KEYMAPSIZE];
+};
+static int adp5588_read(struct i2c_client *client, u8 reg)
+{
+        int ret = i2c_smbus_read_byte_data(client, reg);
+        if (ret < 0)
+                dev_err(&client->dev, "Read Error\n");
+        return ret;
+}
+static int adp5588_write(struct i2c_client *client, u8 reg, u8 val)
+{
+        return i2c_smbus_write_byte_data(client, reg, val);
+}
+static void adp5588_work(struct work_struct *work)
+{
+        struct adp5588_kpad *kpad = container_of(work,
+                                                struct adp5588_kpad, work.work);
+        struct i2c_client *client = kpad->client;
+        int i, key, status, ev_cnt;
+        status = adp5588_read(client, INT_STAT);
+        if (status & OVR_FLOW_INT)      /* Unlikely and should never happen */
+                dev_err(&client->dev, "Event Overflow Error\n");
+        if (status & KE_INT) {
+                ev_cnt = adp5588_read(client, KEY_LCK_EC_STAT) & KEC;
+                if (ev_cnt) {
+                        for (i = 0; i < ev_cnt; i++) {
+                                key = adp5588_read(client, Key_EVENTA + i);
+                                input_report_key(kpad->input,
+                                        kpad->keycode[(key & KEY_EV_MASK) - 1],
+                                        key & KEY_EV_PRESSED);
+                        }
+                        input_sync(kpad->input);
+                }
+        }
+        adp5588_write(client, INT_STAT, status); /* Status is W1C */
+}
+static irqreturn_t adp5588_irq(int irq, void *handle)
+{
+        struct adp5588_kpad *kpad = handle;
+        /*
+         * use keventd context to read the event fifo registers
+         * Schedule readout at least 25ms after notification for
+         * REVID < 4
+         */
+        schedule_delayed_work(&kpad->work, kpad->delay);
+        return IRQ_HANDLED;
+}
+static int __devinit adp5588_setup(struct i2c_client *client)
+{
+        struct adp5588_kpad_platform_data *pdata = client->dev.platform_data;
+        int i, ret;
+        ret = adp5588_write(client, KP_GPIO1, KP_SEL(pdata->rows));
+        ret |= adp5588_write(client, KP_GPIO2, KP_SEL(pdata->cols) & 0xFF);
+        ret |= adp5588_write(client, KP_GPIO3, KP_SEL(pdata->cols) >> 8);
+        if (pdata->en_keylock) {
+                ret |= adp5588_write(client, UNLOCK1, pdata->unlock_key1);
+                ret |= adp5588_write(client, UNLOCK2, pdata->unlock_key2);
+                ret |= adp5588_write(client, KEY_LCK_EC_STAT, K_LCK_EN);
+        }
+        for (i = 0; i < KEYP_MAX_EVENT; i++)
+                ret |= adp5588_read(client, Key_EVENTA);
+        ret |= adp5588_write(client, INT_STAT, CMP2_INT | CMP1_INT |
+                                        OVR_FLOW_INT | K_LCK_INT |
+                                        GPI_INT | KE_INT); /* Status is W1C */
+        ret |= adp5588_write(client, CFG, INT_CFG | OVR_FLOW_IEN | KE_IEN);
+        if (ret < 0) {
+                dev_err(&client->dev, "Write Error\n");
+                return ret;
+        }
+        return 0;
+}
+static int __devinit adp5588_probe(struct i2c_client *client,
+                                        const struct i2c_device_id *id)
+{
+        struct adp5588_kpad *kpad;
+        struct adp5588_kpad_platform_data *pdata = client->dev.platform_data;
+        struct input_dev *input;
+        unsigned int revid;
+        int ret, i;
+        int error;
+        if (!i2c_check_functionality(client->adapter,
+                                        I2C_FUNC_SMBUS_BYTE_DATA)) {
+                dev_err(&client->dev, "SMBUS Byte Data not Supported\n");
+                return -EIO;
+        }
+        if (!pdata) {
+                dev_err(&client->dev, "no platform data?\n");
+                return -EINVAL;
+        }
+        if (!pdata->rows || !pdata->cols || !pdata->keymap) {
+                dev_err(&client->dev, "no rows, cols or keymap from pdata\n");
+                return -EINVAL;
+        }
+        if (pdata->keymapsize != ADP5588_KEYMAPSIZE) {
+                dev_err(&client->dev, "invalid keymapsize\n");
+                return -EINVAL;
+        }
+        if (!client->irq) {
+                dev_err(&client->dev, "no IRQ?\n");
+                return -EINVAL;
+        }
+        kpad = kzalloc(sizeof(*kpad), GFP_KERNEL);
+        input = input_allocate_device();
+        if (!kpad || !input) {
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+        kpad->client = client;
+        kpad->input = input;
+        INIT_DELAYED_WORK(&kpad->work, adp5588_work);
+        ret = adp5588_read(client, DEV_ID);
+        if (ret < 0) {
+                error = ret;
+                goto err_free_mem;
+        }
+        revid = (u8) ret & ADP5588_DEVICE_ID_MASK;
+        if (WA_DELAYED_READOUT_REVID(revid))
+                kpad->delay = msecs_to_jiffies(30);
+        input->name = client->name;
+        input->phys = "adp5588-keys/input0";
+        input->dev.parent = &client->dev;
+        input_set_drvdata(input, kpad);
+        input->id.bustype = BUS_I2C;
+        input->id.vendor = 0x0001;
+        input->id.product = 0x0001;
+        input->id.version = revid;
+        input->keycodesize = sizeof(kpad->keycode[0]);
+        input->keycodemax = pdata->keymapsize;
+        input->keycode = kpad->keycode;
+        memcpy(kpad->keycode, pdata->keymap,
+                pdata->keymapsize * input->keycodesize);
+        /* setup input device */
+        __set_bit(EV_KEY, input->evbit);
+        if (pdata->repeat)
+                __set_bit(EV_REP, input->evbit);
+        for (i = 0; i < input->keycodemax; i++)
+                __set_bit(kpad->keycode[i] & KEY_MAX, input->keybit);
+        __clear_bit(KEY_RESERVED, input->keybit);
+        error = input_register_device(input);
+        if (error) {
+                dev_err(&client->dev, "unable to register input device\n");
+                goto err_free_mem;
+        }
+        error = request_irq(client->irq, adp5588_irq,
+                            IRQF_TRIGGER_FALLING | IRQF_DISABLED,
+                            client->dev.driver->name, kpad);
+        if (error) {
+                dev_err(&client->dev, "irq %d busy?\n", client->irq);
+                goto err_unreg_dev;
+        }
+        error = adp5588_setup(client);
+        if (error)
+                goto err_free_irq;
+        device_init_wakeup(&client->dev, 1);
+        i2c_set_clientdata(client, kpad);
+        dev_info(&client->dev, "Rev.%d keypad, irq %d\n", revid, client->irq);
+        return 0;
+ err_free_irq:
+        free_irq(client->irq, kpad);
+ err_unreg_dev:
+        input_unregister_device(input);
+        input = NULL;
+ err_free_mem:
+        input_free_device(input);
+        kfree(kpad);
+        return error;
+}
+static int __devexit adp5588_remove(struct i2c_client *client)
+{
+        struct adp5588_kpad *kpad = i2c_get_clientdata(client);
+        adp5588_write(client, CFG, 0);
+        free_irq(client->irq, kpad);
+        cancel_delayed_work_sync(&kpad->work);
+        input_unregister_device(kpad->input);
+        i2c_set_clientdata(client, NULL);
+        kfree(kpad);
+        return 0;
+}
+#ifdef CONFIG_PM
+static int adp5588_suspend(struct device *dev)
+{
+        struct adp5588_kpad *kpad = dev_get_drvdata(dev);
+        struct i2c_client *client = kpad->client;
+        disable_irq(client->irq);
+        cancel_delayed_work_sync(&kpad->work);
+        if (device_may_wakeup(&client->dev))
+                enable_irq_wake(client->irq);
+        return 0;
+}
+static int adp5588_resume(struct device *dev)
+{
+        struct adp5588_kpad *kpad = dev_get_drvdata(dev);
+        struct i2c_client *client = kpad->client;
+        if (device_may_wakeup(&client->dev))
+                disable_irq_wake(client->irq);
+        enable_irq(client->irq);
+        return 0;
+}
+static struct dev_pm_ops adp5588_dev_pm_ops = {
+        .suspend = adp5588_suspend,
+        .resume  = adp5588_resume,
+};
+#endif
+static const struct i2c_device_id adp5588_id[] = {
+        { KBUILD_MODNAME, 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, adp5588_id);
+static struct i2c_driver adp5588_driver = {
+        .driver = {
+                .name = KBUILD_MODNAME,
+#ifdef CONFIG_PM
+                .pm   = &adp5588_dev_pm_ops,
+#endif
+        },
+        .probe    = adp5588_probe,
+        .remove   = __devexit_p(adp5588_remove),
+        .id_table = adp5588_id,
+};
+static int __init adp5588_init(void)
+{
+        return i2c_add_driver(&adp5588_driver);
+}
+module_init(adp5588_init);
+static void __exit adp5588_exit(void)
+{
+        i2c_del_driver(&adp5588_driver);
+}
+module_exit(adp5588_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+MODULE_DESCRIPTION("ADP5588 Keypad driver");
+MODULE_ALIAS("platform:adp5588-keys");
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index adb09e2ba394..4709e15af607 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -773,23 +773,6 @@ static int atkbd_select_set(struct atkbd *atkbd, int target_set, int allow_extra
 static int atkbd_activate(struct atkbd *atkbd)
 {
        struct ps2dev *ps2dev = &atkbd->ps2dev;
-        unsigned char param[1];
-/*
- * Set the LEDs to a defined state.
- */
-        param[0] = 0;
-        if (ps2_command(ps2dev, param, ATKBD_CMD_SETLEDS))
-                return -1;
-/*
- * Set autorepeat to fastest possible.
- */
-        param[0] = 0;
-        if (ps2_command(ps2dev, param, ATKBD_CMD_SETREP))
-                return -1;
 /*
 * Enable the keyboard to receive keystrokes.
@@ -1158,14 +1141,6 @@ static int atkbd_reconnect(struct serio *serio)
                        return -1;
                atkbd_activate(atkbd);
-/*
- * Restore repeat rate and LEDs (that were reset by atkbd_activate)
- * to pre-resume state
- */
-                if (!atkbd->softrepeat)
-                        atkbd_set_repeat_rate(atkbd);
-                atkbd_set_leds(atkbd);
        }
        atkbd_enable(atkbd);
diff --git a/drivers/input/keyboard/max7359_keypad.c b/drivers/input/keyboard/max7359_keypad.c
new file mode 100644
index 000000000000..3b5b948eba39
--- /dev/null
+++ b/drivers/input/keyboard/max7359_keypad.c
@@ -0,0 +1,330 @@
+/*
+ * max7359_keypad.c - MAX7359 Key Switch Controller Driver
+ *
+ * Copyright (C) 2009 Samsung Electronics
+ * Kim Kyuwon <q1.kim@samsung.com>
+ *
+ * Based on pxa27x_keypad.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Datasheet: http://www.maxim-ic.com/quick_view2.cfm/qv_pk/5456
+ */
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/input.h>
+#include <linux/input/matrix_keypad.h>
+#define MAX7359_MAX_KEY_ROWS    8
+#define MAX7359_MAX_KEY_COLS    8
+#define MAX7359_MAX_KEY_NUM     (MAX7359_MAX_KEY_ROWS * MAX7359_MAX_KEY_COLS)
+#define MAX7359_ROW_SHIFT       3
+/*
+ * MAX7359 registers
+ */
+#define MAX7359_REG_KEYFIFO     0x00
+#define MAX7359_REG_CONFIG      0x01
+#define MAX7359_REG_DEBOUNCE    0x02
+#define MAX7359_REG_INTERRUPT   0x03
+#define MAX7359_REG_PORTS       0x04
+#define MAX7359_REG_KEYREP      0x05
+#define MAX7359_REG_SLEEP       0x06
+/*
+ * Configuration register bits
+ */
+#define MAX7359_CFG_SLEEP       (1 << 7)
+#define MAX7359_CFG_INTERRUPT   (1 << 5)
+#define MAX7359_CFG_KEY_RELEASE (1 << 3)
+#define MAX7359_CFG_WAKEUP      (1 << 1)
+#define MAX7359_CFG_TIMEOUT     (1 << 0)
+/*
+ * Autosleep register values (ms)
+ */
+#define MAX7359_AUTOSLEEP_8192  0x01
+#define MAX7359_AUTOSLEEP_4096  0x02
+#define MAX7359_AUTOSLEEP_2048  0x03
+#define MAX7359_AUTOSLEEP_1024  0x04
+#define MAX7359_AUTOSLEEP_512   0x05
+#define MAX7359_AUTOSLEEP_256   0x06
+struct max7359_keypad {
+        /* matrix key code map */
+        unsigned short keycodes[MAX7359_MAX_KEY_NUM];
+        struct input_dev *input_dev;
+        struct i2c_client *client;
+};
+static int max7359_write_reg(struct i2c_client *client, u8 reg, u8 val)
+{
+        int ret = i2c_smbus_write_byte_data(client, reg, val);
+        if (ret < 0)
+                dev_err(&client->dev, "%s: reg 0x%x, val 0x%x, err %d\n",
+                        __func__, reg, val, ret);
+        return ret;
+}
+static int max7359_read_reg(struct i2c_client *client, int reg)
+{
+        int ret = i2c_smbus_read_byte_data(client, reg);
+        if (ret < 0)
+                dev_err(&client->dev, "%s: reg 0x%x, err %d\n",
+                        __func__, reg, ret);
+        return ret;
+}
+static void max7359_build_keycode(struct max7359_keypad *keypad,
+                                const struct matrix_keymap_data *keymap_data)
+{
+        struct input_dev *input_dev = keypad->input_dev;
+        int i;
+        for (i = 0; i < keymap_data->keymap_size; i++) {
+                unsigned int key = keymap_data->keymap[i];
+                unsigned int row = KEY_ROW(key);
+                unsigned int col = KEY_COL(key);
+                unsigned int scancode = MATRIX_SCAN_CODE(row, col,
+                                                MAX7359_ROW_SHIFT);
+                unsigned short keycode = KEY_VAL(key);
+                keypad->keycodes[scancode] = keycode;
+                __set_bit(keycode, input_dev->keybit);
+        }
+        __clear_bit(KEY_RESERVED, input_dev->keybit);
+}
+/* runs in an IRQ thread -- can (and will!) sleep */
+static irqreturn_t max7359_interrupt(int irq, void *dev_id)
+{
+        struct max7359_keypad *keypad = dev_id;
+        struct input_dev *input_dev = keypad->input_dev;
+        int val, row, col, release, code;
+        val = max7359_read_reg(keypad->client, MAX7359_REG_KEYFIFO);
+        row = val & 0x7;
+        col = (val >> 3) & 0x7;
+        release = val & 0x40;
+        code = MATRIX_SCAN_CODE(row, col, MAX7359_ROW_SHIFT);
+        dev_dbg(&keypad->client->dev,
+                "key[%d:%d] %s\n", row, col, release ? "release" : "press");
+        input_event(input_dev, EV_MSC, MSC_SCAN, code);
+        input_report_key(input_dev, keypad->keycodes[code], !release);
+        input_sync(input_dev);
+        return IRQ_HANDLED;
+}
+/*
+ * Let MAX7359 fall into a deep sleep:
+ * If no keys are pressed, enter sleep mode for 8192 ms. And if any
+ * key is pressed, the MAX7359 returns to normal operating mode.
+ */
+static inline void max7359_fall_deepsleep(struct i2c_client *client)
+{
+        max7359_write_reg(client, MAX7359_REG_SLEEP, MAX7359_AUTOSLEEP_8192);
+}
+/*
+ * Let MAX7359 take a catnap:
+ * Autosleep just for 256 ms.
+ */
+static inline void max7359_take_catnap(struct i2c_client *client)
+{
+        max7359_write_reg(client, MAX7359_REG_SLEEP, MAX7359_AUTOSLEEP_256);
+}
+static int max7359_open(struct input_dev *dev)
+{
+        struct max7359_keypad *keypad = input_get_drvdata(dev);
+        max7359_take_catnap(keypad->client);
+        return 0;
+}
+static void max7359_close(struct input_dev *dev)
+{
+        struct max7359_keypad *keypad = input_get_drvdata(dev);
+        max7359_fall_deepsleep(keypad->client);
+}
+static void max7359_initialize(struct i2c_client *client)
+{
+        max7359_write_reg(client, MAX7359_REG_CONFIG,
+                MAX7359_CFG_INTERRUPT | /* Irq clears after host read */
+                MAX7359_CFG_KEY_RELEASE | /* Key release enable */
+                MAX7359_CFG_WAKEUP); /* Key press wakeup enable */
+        /* Full key-scan functionality */
+        max7359_write_reg(client, MAX7359_REG_DEBOUNCE, 0x1F);
+        /* nINT asserts every debounce cycles */
+        max7359_write_reg(client, MAX7359_REG_INTERRUPT, 0x01);
+        max7359_fall_deepsleep(client);
+}
+static int __devinit max7359_probe(struct i2c_client *client,
+                                        const struct i2c_device_id *id)
+{
+        const struct matrix_keymap_data *keymap_data = client->dev.platform_data;
+        struct max7359_keypad *keypad;
+        struct input_dev *input_dev;
+        int ret;
+        int error;
+        if (!client->irq) {
+                dev_err(&client->dev, "The irq number should not be zero\n");
+                return -EINVAL;
+        }
+        /* Detect MAX7359: The initial Keys FIFO value is '0x3F' */
+        ret = max7359_read_reg(client, MAX7359_REG_KEYFIFO);
+        if (ret < 0) {
+                dev_err(&client->dev, "failed to detect device\n");
+                return -ENODEV;
+        }
+        dev_dbg(&client->dev, "keys FIFO is 0x%02x\n", ret);
+        keypad = kzalloc(sizeof(struct max7359_keypad), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!keypad || !input_dev) {
+                dev_err(&client->dev, "failed to allocate memory\n");
+                error = -ENOMEM;
+                goto failed_free_mem;
+        }
+        keypad->client = client;
+        keypad->input_dev = input_dev;
+        input_dev->name = client->name;
+        input_dev->id.bustype = BUS_I2C;
+        input_dev->open = max7359_open;
+        input_dev->close = max7359_close;
+        input_dev->dev.parent = &client->dev;
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
+        input_dev->keycodesize = sizeof(keypad->keycodes[0]);
+        input_dev->keycodemax = ARRAY_SIZE(keypad->keycodes);
+        input_dev->keycode = keypad->keycodes;
+        input_set_capability(input_dev, EV_MSC, MSC_SCAN);
+        input_set_drvdata(input_dev, keypad);
+        max7359_build_keycode(keypad, keymap_data);
+        error = request_threaded_irq(client->irq, NULL, max7359_interrupt,
+                                     IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+                                     client->name, keypad);
+        if (error) {
+                dev_err(&client->dev, "failed to register interrupt\n");
+                goto failed_free_mem;
+        }
+        /* Register the input device */
+        error = input_register_device(input_dev);
+        if (error) {
+                dev_err(&client->dev, "failed to register input device\n");
+                goto failed_free_irq;
+        }
+        /* Initialize MAX7359 */
+        max7359_initialize(client);
+        i2c_set_clientdata(client, keypad);
+        device_init_wakeup(&client->dev, 1);
+        return 0;
+failed_free_irq:
+        free_irq(client->irq, keypad);
+failed_free_mem:
+        input_free_device(input_dev);
+        kfree(keypad);
+        return error;
+}
+static int __devexit max7359_remove(struct i2c_client *client)
+{
+        struct max7359_keypad *keypad = i2c_get_clientdata(client);
+        free_irq(client->irq, keypad);
+        input_unregister_device(keypad->input_dev);
+        i2c_set_clientdata(client, NULL);
+        kfree(keypad);
+        return 0;
+}
+#ifdef CONFIG_PM
+static int max7359_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+        max7359_fall_deepsleep(client);
+        if (device_may_wakeup(&client->dev))
+                enable_irq_wake(client->irq);
+        return 0;
+}
+static int max7359_resume(struct i2c_client *client)
+{
+        if (device_may_wakeup(&client->dev))
+                disable_irq_wake(client->irq);
+        /* Restore the default setting */
+        max7359_take_catnap(client);
+        return 0;
+}
+#else
+#define max7359_suspend NULL
+#define max7359_resume  NULL
+#endif
+static const struct i2c_device_id max7359_ids[] = {
+        { "max7359", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, max7359_ids);
+static struct i2c_driver max7359_i2c_driver = {
+        .driver = {
+                .name = "max7359",
+        },
+        .probe          = max7359_probe,
+        .remove         = __devexit_p(max7359_remove),
+        .suspend        = max7359_suspend,
+        .resume         = max7359_resume,
+        .id_table       = max7359_ids,
+};
+static int __init max7359_init(void)
+{
+        return i2c_add_driver(&max7359_i2c_driver);
+}
+module_init(max7359_init);
+static void __exit max7359_exit(void)
+{
+        i2c_del_driver(&max7359_i2c_driver);
+}
+module_exit(max7359_exit);
+MODULE_AUTHOR("Kim Kyuwon <q1.kim@samsung.com>");
+MODULE_DESCRIPTION("MAX7359 Key Switch Controller Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/input/keyboard/opencores-kbd.c b/drivers/input/keyboard/opencores-kbd.c
new file mode 100644
index 000000000000..78cccddbf551
--- /dev/null
+++ b/drivers/input/keyboard/opencores-kbd.c
@@ -0,0 +1,180 @@
+/*
+ * OpenCores Keyboard Controller Driver
+ * http://www.opencores.org/project,keyboardcontroller
+ *
+ * Copyright 2007-2009 HV Sistemas S.L.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+struct opencores_kbd {
+        struct input_dev *input;
+        struct resource *addr_res;
+        void __iomem *addr;
+        int irq;
+        unsigned short keycodes[128];
+};
+static irqreturn_t opencores_kbd_isr(int irq, void *dev_id)
+{
+        struct opencores_kbd *opencores_kbd = dev_id;
+        struct input_dev *input = opencores_kbd->input;
+        unsigned char c;
+        c = readb(opencores_kbd->addr);
+        input_report_key(input, c & 0x7f, c & 0x80 ? 0 : 1);
+        input_sync(input);
+        return IRQ_HANDLED;
+}
+static int __devinit opencores_kbd_probe(struct platform_device *pdev)
+{
+        struct input_dev *input;
+        struct opencores_kbd *opencores_kbd;
+        struct resource *res;
+        int irq, i, error;
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "missing board memory resource\n");
+                return -EINVAL;
+        }
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "missing board IRQ resource\n");
+                return -EINVAL;
+        }
+        opencores_kbd = kzalloc(sizeof(*opencores_kbd), GFP_KERNEL);
+        input = input_allocate_device();
+        if (!opencores_kbd || !input) {
+                dev_err(&pdev->dev, "failed to allocate device structures\n");
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+        opencores_kbd->addr_res = res;
+        res = request_mem_region(res->start, resource_size(res), pdev->name);
+        if (!res) {
+                dev_err(&pdev->dev, "failed to request I/O memory\n");
+                error = -EBUSY;
+                goto err_free_mem;
+        }
+        opencores_kbd->addr = ioremap(res->start, resource_size(res));
+        if (!opencores_kbd->addr) {
+                dev_err(&pdev->dev, "failed to remap I/O memory\n");
+                error = -ENXIO;
+                goto err_rel_mem;
+        }
+        opencores_kbd->input = input;
+        opencores_kbd->irq = irq;
+        input->name = pdev->name;
+        input->phys = "opencores-kbd/input0";
+        input->dev.parent = &pdev->dev;
+        input_set_drvdata(input, opencores_kbd);
+        input->id.bustype = BUS_HOST;
+        input->id.vendor = 0x0001;
+        input->id.product = 0x0001;
+        input->id.version = 0x0100;
+        input->keycode = opencores_kbd->keycodes;
+        input->keycodesize = sizeof(opencores_kbd->keycodes[0]);
+        input->keycodemax = ARRAY_SIZE(opencores_kbd->keycodes);
+        __set_bit(EV_KEY, input->evbit);
+        for (i = 0; i < ARRAY_SIZE(opencores_kbd->keycodes); i++) {
+                /*
+                 * OpenCores controller happens to have scancodes match
+                 * our KEY_* definitions.
+                 */
+                opencores_kbd->keycodes[i] = i;
+                __set_bit(opencores_kbd->keycodes[i], input->keybit);
+        }
+        __clear_bit(KEY_RESERVED, input->keybit);
+        error = request_irq(irq, &opencores_kbd_isr,
+                            IRQF_TRIGGER_RISING, pdev->name, opencores_kbd);
+        if (error) {
+                dev_err(&pdev->dev, "unable to claim irq %d\n", irq);
+                goto err_unmap_mem;
+        }
+        error = input_register_device(input);
+        if (error) {
+                dev_err(&pdev->dev, "unable to register input device\n");
+                goto err_free_irq;
+        }
+        platform_set_drvdata(pdev, opencores_kbd);
+        return 0;
+ err_free_irq:
+        free_irq(irq, opencores_kbd);
+ err_unmap_mem:
+        iounmap(opencores_kbd->addr);
+ err_rel_mem:
+        release_mem_region(res->start, resource_size(res));
+ err_free_mem:
+        input_free_device(input);
+        kfree(opencores_kbd);
+        return error;
+}
+static int __devexit opencores_kbd_remove(struct platform_device *pdev)
+{
+        struct opencores_kbd *opencores_kbd = platform_get_drvdata(pdev);
+        free_irq(opencores_kbd->irq, opencores_kbd);
+        iounmap(opencores_kbd->addr);
+        release_mem_region(opencores_kbd->addr_res->start,
+                resource_size(opencores_kbd->addr_res));
+        input_unregister_device(opencores_kbd->input);
+        kfree(opencores_kbd);
+        platform_set_drvdata(pdev, NULL);
+        return 0;
+}
+static struct platform_driver opencores_kbd_device_driver = {
+        .probe    = opencores_kbd_probe,
+        .remove   = __devexit_p(opencores_kbd_remove),
+        .driver   = {
+                .name = "opencores-kbd",
+        },
+};
+static int __init opencores_kbd_init(void)
+{
+        return platform_driver_register(&opencores_kbd_device_driver);
+}
+module_init(opencores_kbd_init);
+static void __exit opencores_kbd_exit(void)
+{
+        platform_driver_unregister(&opencores_kbd_device_driver);
+}
+module_exit(opencores_kbd_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Javier Herrero <jherrero@hvsistemas.es>");
+MODULE_DESCRIPTION("Keyboard driver for OpenCores Keyboard Controller");
diff --git a/drivers/input/keyboard/qt2160.c b/drivers/input/keyboard/qt2160.c
new file mode 100644
index 000000000000..191cc51d6cf8
--- /dev/null
+++ b/drivers/input/keyboard/qt2160.c
@@ -0,0 +1,397 @@
+/*
+ *  qt2160.c - Atmel AT42QT2160 Touch Sense Controller
+ *
+ *  Copyright (C) 2009 Raphael Derosso Pereira <raphaelpereira@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/input.h>
+#define QT2160_VALID_CHIPID  0x11
+#define QT2160_CMD_CHIPID     0
+#define QT2160_CMD_CODEVER    1
+#define QT2160_CMD_GSTAT      2
+#define QT2160_CMD_KEYS3      3
+#define QT2160_CMD_KEYS4      4
+#define QT2160_CMD_SLIDE      5
+#define QT2160_CMD_GPIOS      6
+#define QT2160_CMD_SUBVER     7
+#define QT2160_CMD_CALIBRATE  10
+#define QT2160_CYCLE_INTERVAL   (2*HZ)
+static unsigned char qt2160_key2code[] = {
+        KEY_0, KEY_1, KEY_2, KEY_3,
+        KEY_4, KEY_5, KEY_6, KEY_7,
+        KEY_8, KEY_9, KEY_A, KEY_B,
+        KEY_C, KEY_D, KEY_E, KEY_F,
+};
+struct qt2160_data {
+        struct i2c_client *client;
+        struct input_dev *input;
+        struct delayed_work dwork;
+        spinlock_t lock;        /* Protects canceling/rescheduling of dwork */
+        unsigned short keycodes[ARRAY_SIZE(qt2160_key2code)];
+        u16 key_matrix;
+};
+static int qt2160_read_block(struct i2c_client *client,
+                             u8 inireg, u8 *buffer, unsigned int count)
+{
+        int error, idx = 0;
+        /*
+         * Can't use SMBus block data read. Check for I2C functionality to speed
+         * things up whenever possible. Otherwise we will be forced to read
+         * sequentially.
+         */
+        if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C))     {
+                error = i2c_smbus_write_byte(client, inireg + idx);
+                if (error) {
+                        dev_err(&client->dev,
+                                "couldn't send request. Returned %d\n", error);
+                        return error;
+                }
+                error = i2c_master_recv(client, buffer, count);
+                if (error != count) {
+                        dev_err(&client->dev,
+                                "couldn't read registers. Returned %d bytes\n", error);
+                        return error;
+                }
+        } else {
+                while (count--) {
+                        int data;
+                        error = i2c_smbus_write_byte(client, inireg + idx);
+                        if (error) {
+                                dev_err(&client->dev,
+                                        "couldn't send request. Returned %d\n", error);
+                                return error;
+                        }
+                        data = i2c_smbus_read_byte(client);
+                        if (data < 0) {
+                                dev_err(&client->dev,
+                                        "couldn't read register. Returned %d\n", data);
+                                return data;
+                        }
+                        buffer[idx++] = data;
+                }
+        }
+        return 0;
+}
+static int qt2160_get_key_matrix(struct qt2160_data *qt2160)
+{
+        struct i2c_client *client = qt2160->client;
+        struct input_dev *input = qt2160->input;
+        u8 regs[6];
+        u16 old_matrix, new_matrix;
+        int ret, i, mask;
+        dev_dbg(&client->dev, "requesting keys...\n");
+        /*
+         * Read all registers from General Status Register
+         * to GPIOs register
+         */
+        ret = qt2160_read_block(client, QT2160_CMD_GSTAT, regs, 6);
+        if (ret) {
+                dev_err(&client->dev,
+                        "could not perform chip read.\n");
+                return ret;
+        }
+        old_matrix = qt2160->key_matrix;
+        qt2160->key_matrix = new_matrix = (regs[2] << 8) | regs[1];
+        mask = 0x01;
+        for (i = 0; i < 16; ++i, mask <<= 1) {
+                int keyval = new_matrix & mask;
+                if ((old_matrix & mask) != keyval) {
+                        input_report_key(input, qt2160->keycodes[i], keyval);
+                        dev_dbg(&client->dev, "key %d %s\n",
+                                i, keyval ? "pressed" : "released");
+                }
+        }
+        input_sync(input);
+        return 0;
+}
+static irqreturn_t qt2160_irq(int irq, void *_qt2160)
+{
+        struct qt2160_data *qt2160 = _qt2160;
+        unsigned long flags;
+        spin_lock_irqsave(&qt2160->lock, flags);
+        __cancel_delayed_work(&qt2160->dwork);
+        schedule_delayed_work(&qt2160->dwork, 0);
+        spin_unlock_irqrestore(&qt2160->lock, flags);
+        return IRQ_HANDLED;
+}
+static void qt2160_schedule_read(struct qt2160_data *qt2160)
+{
+        spin_lock_irq(&qt2160->lock);
+        schedule_delayed_work(&qt2160->dwork, QT2160_CYCLE_INTERVAL);
+        spin_unlock_irq(&qt2160->lock);
+}
+static void qt2160_worker(struct work_struct *work)
+{
+        struct qt2160_data *qt2160 =
+                container_of(work, struct qt2160_data, dwork.work);
+        dev_dbg(&qt2160->client->dev, "worker\n");
+        qt2160_get_key_matrix(qt2160);
+        /* Avoid device lock up by checking every so often */
+        qt2160_schedule_read(qt2160);
+}
+static int __devinit qt2160_read(struct i2c_client *client, u8 reg)
+{
+        int ret;
+        ret = i2c_smbus_write_byte(client, reg);
+        if (ret) {
+                dev_err(&client->dev,
+                        "couldn't send request. Returned %d\n", ret);
+                return ret;
+        }
+        ret = i2c_smbus_read_byte(client);
+        if (ret < 0) {
+                dev_err(&client->dev,
+                        "couldn't read register. Returned %d\n", ret);
+                return ret;
+        }
+        return ret;
+}
+static int __devinit qt2160_write(struct i2c_client *client, u8 reg, u8 data)
+{
+        int error;
+        error = i2c_smbus_write_byte(client, reg);
+        if (error) {
+                dev_err(&client->dev,
+                        "couldn't send request. Returned %d\n", error);
+                return error;
+        }
+        error = i2c_smbus_write_byte(client, data);
+        if (error) {
+                dev_err(&client->dev,
+                        "couldn't write data. Returned %d\n", error);
+                return error;
+        }
+        return error;
+}
+static bool __devinit qt2160_identify(struct i2c_client *client)
+{
+        int id, ver, rev;
+        /* Read Chid ID to check if chip is valid */
+        id = qt2160_read(client, QT2160_CMD_CHIPID);
+        if (id != QT2160_VALID_CHIPID) {
+                dev_err(&client->dev, "ID %d not supported\n", id);
+                return false;
+        }
+        /* Read chip firmware version */
+        ver = qt2160_read(client, QT2160_CMD_CODEVER);
+        if (ver < 0) {
+                dev_err(&client->dev, "could not get firmware version\n");
+                return false;
+        }
+        /* Read chip firmware revision */
+        rev = qt2160_read(client, QT2160_CMD_SUBVER);
+        if (rev < 0) {
+                dev_err(&client->dev, "could not get firmware revision\n");
+                return false;
+        }
+        dev_info(&client->dev, "AT42QT2160 firmware version %d.%d.%d\n",
+                        ver >> 4, ver & 0xf, rev);
+        return true;
+}
+static int __devinit qt2160_probe(struct i2c_client *client,
+                                  const struct i2c_device_id *id)
+{
+        struct qt2160_data *qt2160;
+        struct input_dev *input;
+        int i;
+        int error;
+        /* Check functionality */
+        error = i2c_check_functionality(client->adapter,
+                        I2C_FUNC_SMBUS_BYTE);
+        if (!error) {
+                dev_err(&client->dev, "%s adapter not supported\n",
+                                dev_driver_string(&client->adapter->dev));
+                return -ENODEV;
+        }
+        if (!qt2160_identify(client))
+                return -ENODEV;
+        /* Chip is valid and active. Allocate structure */
+        qt2160 = kzalloc(sizeof(struct qt2160_data), GFP_KERNEL);
+        input = input_allocate_device();
+        if (!qt2160 || !input) {
+                dev_err(&client->dev, "insufficient memory\n");
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+        qt2160->client = client;
+        qt2160->input = input;
+        INIT_DELAYED_WORK(&qt2160->dwork, qt2160_worker);
+        spin_lock_init(&qt2160->lock);
+        input->name = "AT42QT2160 Touch Sense Keyboard";
+        input->id.bustype = BUS_I2C;
+        input->keycode = qt2160->keycodes;
+        input->keycodesize = sizeof(qt2160->keycodes[0]);
+        input->keycodemax = ARRAY_SIZE(qt2160_key2code);
+        __set_bit(EV_KEY, input->evbit);
+        __clear_bit(EV_REP, input->evbit);
+        for (i = 0; i < ARRAY_SIZE(qt2160_key2code); i++) {
+                qt2160->keycodes[i] = qt2160_key2code[i];
+                __set_bit(qt2160_key2code[i], input->keybit);
+        }
+        __clear_bit(KEY_RESERVED, input->keybit);
+        /* Calibrate device */
+        error = qt2160_write(client, QT2160_CMD_CALIBRATE, 1);
+        if (error) {
+                dev_err(&client->dev, "failed to calibrate device\n");
+                goto err_free_mem;
+        }
+        if (client->irq) {
+                error = request_irq(client->irq, qt2160_irq,
+                                    IRQF_TRIGGER_FALLING, "qt2160", qt2160);
+                if (error) {
+                        dev_err(&client->dev,
+                                "failed to allocate irq %d\n", client->irq);
+                        goto err_free_mem;
+                }
+        }
+        error = input_register_device(qt2160->input);
+        if (error) {
+                dev_err(&client->dev,
+                        "Failed to register input device\n");
+                goto err_free_irq;
+        }
+        i2c_set_clientdata(client, qt2160);
+        qt2160_schedule_read(qt2160);
+        return 0;
+err_free_irq:
+        if (client->irq)
+                free_irq(client->irq, qt2160);
+err_free_mem:
+        input_free_device(input);
+        kfree(qt2160);
+        return error;
+}
+static int __devexit qt2160_remove(struct i2c_client *client)
+{
+        struct qt2160_data *qt2160 = i2c_get_clientdata(client);
+        /* Release IRQ so no queue will be scheduled */
+        if (client->irq)
+                free_irq(client->irq, qt2160);
+        cancel_delayed_work_sync(&qt2160->dwork);
+        input_unregister_device(qt2160->input);
+        kfree(qt2160);
+        i2c_set_clientdata(client, NULL);
+        return 0;
+}
+static struct i2c_device_id qt2160_idtable[] = {
+        { "qt2160", 0, },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, qt2160_idtable);
+static struct i2c_driver qt2160_driver = {
+        .driver = {
+                .name   = "qt2160",
+                .owner  = THIS_MODULE,
+        },
+        .id_table       = qt2160_idtable,
+        .probe          = qt2160_probe,
+        .remove         = __devexit_p(qt2160_remove),
+};
+static int __init qt2160_init(void)
+{
+        return i2c_add_driver(&qt2160_driver);
+}
+module_init(qt2160_init);
+static void __exit qt2160_cleanup(void)
+{
+        i2c_del_driver(&qt2160_driver);
+}
+module_exit(qt2160_cleanup);
+MODULE_AUTHOR("Raphael Derosso Pereira <raphaelpereira@gmail.com>");
+MODULE_DESCRIPTION("Driver for AT42QT2160 Touch Sensor");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c
index 0918acae584a..f2b67dc81d80 100644
--- a/drivers/input/misc/dm355evm_keys.c
+++ b/drivers/input/misc/dm355evm_keys.c
@@ -96,7 +96,13 @@ static struct {
        { 0x3169, KEY_PAUSE, },
 };
-/* runs in an IRQ thread -- can (and will!) sleep */
+/*
+ * Because we communicate with the MSP430 using I2C, and all I2C calls
+ * in Linux sleep, we use a threaded IRQ handler.  The IRQ itself is
+ * active low, but we go through the GPIO controller so we can trigger
+ * on falling edges and not worry about enabling/disabling the IRQ in
+ * the keypress handling path.
+ */
 static irqreturn_t dm355evm_keys_irq(int irq, void *_keys)
 {
        struct dm355evm_keys    *keys = _keys;
@@ -171,18 +177,6 @@ static irqreturn_t dm355evm_keys_irq(int irq, void *_keys)
        return IRQ_HANDLED;
 }
-/*
- * Because we communicate with the MSP430 using I2C, and all I2C calls
- * in Linux sleep, we use a threaded IRQ handler.  The IRQ itself is
- * active low, but we go through the GPIO controller so we can trigger
- * on falling edges and not worry about enabling/disabling the IRQ in
- * the keypress handling path.
- */
-static irqreturn_t dm355evm_keys_hardirq(int irq, void *_keys)
-{
-        return IRQ_WAKE_THREAD;
-}
 static int dm355evm_setkeycode(struct input_dev *dev, int index, int keycode)
 {
        u16             old_keycode;
@@ -257,10 +251,8 @@ static int __devinit dm355evm_keys_probe(struct platform_device *pdev)
        /* REVISIT:  flush the event queue? */
-        status = request_threaded_irq(keys->irq,
+        status = request_threaded_irq(keys->irq, NULL, dm355evm_keys_irq,
-                        dm355evm_keys_hardirq, dm355evm_keys_irq,
+                        IRQF_TRIGGER_FALLING, dev_name(&pdev->dev), keys);
-                        IRQF_TRIGGER_FALLING,
-                        dev_name(&pdev->dev), keys);
        if (status < 0)
                goto fail1;
diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c
index 84e2fc04d11b..f84cbd97c884 100644
--- a/drivers/input/mouse/sentelic.c
+++ b/drivers/input/mouse/sentelic.c
@@ -92,7 +92,8 @@ static int fsp_reg_read(struct psmouse *psmouse, int reg_addr, int *reg_val)
         */
        ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE);
        psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
-        mutex_lock(&ps2dev->cmd_mutex);
+        ps2_begin_command(ps2dev);
        if (ps2_sendbyte(ps2dev, 0xf3, FSP_CMD_TIMEOUT) < 0)
                goto out;
@@ -126,7 +127,7 @@ static int fsp_reg_read(struct psmouse *psmouse, int reg_addr, int *reg_val)
        rc = 0;
 out:
-        mutex_unlock(&ps2dev->cmd_mutex);
+        ps2_end_command(ps2dev);
        ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE);
        psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
        dev_dbg(&ps2dev->serio->dev, "READ REG: 0x%02x is 0x%02x (rc = %d)\n",
@@ -140,7 +141,7 @@ static int fsp_reg_write(struct psmouse *psmouse, int reg_addr, int reg_val)
        unsigned char v;
        int rc = -1;
-        mutex_lock(&ps2dev->cmd_mutex);
+        ps2_begin_command(ps2dev);
        if (ps2_sendbyte(ps2dev, 0xf3, FSP_CMD_TIMEOUT) < 0)
                goto out;
@@ -179,7 +180,7 @@ static int fsp_reg_write(struct psmouse *psmouse, int reg_addr, int reg_val)
        rc = 0;
 out:
-        mutex_unlock(&ps2dev->cmd_mutex);
+        ps2_end_command(ps2dev);
        dev_dbg(&ps2dev->serio->dev, "WRITE REG: 0x%02x to 0x%02x (rc = %d)\n",
                reg_addr, reg_val, rc);
        return rc;
@@ -214,7 +215,8 @@ static int fsp_page_reg_read(struct psmouse *psmouse, int *reg_val)
        ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE);
        psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
-        mutex_lock(&ps2dev->cmd_mutex);
+        ps2_begin_command(ps2dev);
        if (ps2_sendbyte(ps2dev, 0xf3, FSP_CMD_TIMEOUT) < 0)
                goto out;
@@ -236,7 +238,7 @@ static int fsp_page_reg_read(struct psmouse *psmouse, int *reg_val)
        rc = 0;
 out:
-        mutex_unlock(&ps2dev->cmd_mutex);
+        ps2_end_command(ps2dev);
        ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE);
        psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
        dev_dbg(&ps2dev->serio->dev, "READ PAGE REG: 0x%02x (rc = %d)\n",
@@ -250,7 +252,7 @@ static int fsp_page_reg_write(struct psmouse *psmouse, int reg_val)
        unsigned char v;
        int rc = -1;
-        mutex_lock(&ps2dev->cmd_mutex);
+        ps2_begin_command(ps2dev);
        if (ps2_sendbyte(ps2dev, 0xf3, FSP_CMD_TIMEOUT) < 0)
                goto out;
@@ -275,7 +277,7 @@ static int fsp_page_reg_write(struct psmouse *psmouse, int reg_val)
        rc = 0;
 out:
-        mutex_unlock(&ps2dev->cmd_mutex);
+        ps2_end_command(ps2dev);
        dev_dbg(&ps2dev->serio->dev, "WRITE PAGE REG: to 0x%02x (rc = %d)\n",
                reg_val, rc);
        return rc;
diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c
index eac9fdde7ee9..7283c78044af 100644
--- a/drivers/input/mouse/synaptics_i2c.c
+++ b/drivers/input/mouse/synaptics_i2c.c
@@ -203,7 +203,7 @@ MODULE_PARM_DESC(no_filter, "No Filter. Default = 0 (off)");
 * and the irq configuration should be set to Falling Edge Trigger
 */
 /* Control IRQ / Polling option */
-static int polling_req;
+static bool polling_req;
 module_param(polling_req, bool, 0444);
 MODULE_PARM_DESC(polling_req, "Request Polling. Default = 0 (use irq)");
@@ -217,6 +217,7 @@ struct synaptics_i2c {
        struct i2c_client       *client;
        struct input_dev        *input;
        struct delayed_work     dwork;
+        spinlock_t              lock;
        int                     no_data_count;
        int                     no_decel_param;
        int                     reduce_report_param;
@@ -366,17 +367,28 @@ static bool synaptics_i2c_get_input(struct synaptics_i2c *touch)
        return xy_delta || gesture;
 }
-static irqreturn_t synaptics_i2c_irq(int irq, void *dev_id)
+static void synaptics_i2c_reschedule_work(struct synaptics_i2c *touch,
+                                          unsigned long delay)
 {
-        struct synaptics_i2c *touch = dev_id;
+        unsigned long flags;
+        spin_lock_irqsave(&touch->lock, flags);
        /*
-         * We want to have the work run immediately but it might have
+         * If work is already scheduled then subsequent schedules will not
-         * already been scheduled with a delay, that's why we have to
+         * change the scheduled time that's why we have to cancel it first.
-         * cancel it first.
         */
-        cancel_delayed_work(&touch->dwork);
+        __cancel_delayed_work(&touch->dwork);
-        schedule_delayed_work(&touch->dwork, 0);
+        schedule_delayed_work(&touch->dwork, delay);
+        spin_unlock_irqrestore(&touch->lock, flags);
+}
+static irqreturn_t synaptics_i2c_irq(int irq, void *dev_id)
+{
+        struct synaptics_i2c *touch = dev_id;
+        synaptics_i2c_reschedule_work(touch, 0);
        return IRQ_HANDLED;
 }
@@ -452,7 +464,7 @@ static void synaptics_i2c_work_handler(struct work_struct *work)
         * We poll the device once in THREAD_IRQ_SLEEP_SECS and
         * if error is detected, we try to reset and reconfigure the touchpad.
         */
-        schedule_delayed_work(&touch->dwork, delay);
+        synaptics_i2c_reschedule_work(touch, delay);
 }
 static int synaptics_i2c_open(struct input_dev *input)
@@ -465,8 +477,8 @@ static int synaptics_i2c_open(struct input_dev *input)
                return ret;
        if (polling_req)
-                schedule_delayed_work(&touch->dwork,
+                synaptics_i2c_reschedule_work(touch,
-                                       msecs_to_jiffies(NO_DATA_SLEEP_MSECS));
+                                msecs_to_jiffies(NO_DATA_SLEEP_MSECS));
        return 0;
 }
@@ -521,6 +533,7 @@ struct synaptics_i2c *synaptics_i2c_touch_create(struct i2c_client *client)
        touch->scan_rate_param = scan_rate;
        set_scan_rate(touch, scan_rate);
        INIT_DELAYED_WORK(&touch->dwork, synaptics_i2c_work_handler);
+        spin_lock_init(&touch->lock);
        return touch;
 }
@@ -535,14 +548,12 @@ static int __devinit synaptics_i2c_probe(struct i2c_client *client,
        if (!touch)
                return -ENOMEM;
-        i2c_set_clientdata(client, touch);
        ret = synaptics_i2c_reset_config(client);
        if (ret)
                goto err_mem_free;
        if (client->irq < 1)
-                polling_req = 1;
+                polling_req = true;
        touch->input = input_allocate_device();
        if (!touch->input) {
@@ -563,7 +574,7 @@ static int __devinit synaptics_i2c_probe(struct i2c_client *client,
                        dev_warn(&touch->client->dev,
                                  "IRQ request failed: %d, "
                                  "falling back to polling\n", ret);
-                        polling_req = 1;
+                        polling_req = true;
                        synaptics_i2c_reg_set(touch->client,
                                              INTERRUPT_EN_REG, 0);
                }
@@ -580,12 +591,14 @@ static int __devinit synaptics_i2c_probe(struct i2c_client *client,
                         "Input device register failed: %d\n", ret);
                goto err_input_free;
        }
+        i2c_set_clientdata(client, touch);
        return 0;
 err_input_free:
        input_free_device(touch->input);
 err_mem_free:
-        i2c_set_clientdata(client, NULL);
        kfree(touch);
        return ret;
@@ -596,7 +609,7 @@ static int __devexit synaptics_i2c_remove(struct i2c_client *client)
        struct synaptics_i2c *touch = i2c_get_clientdata(client);
        if (!polling_req)
-                free_irq(touch->client->irq, touch);
+                free_irq(client->irq, touch);
        input_unregister_device(touch->input);
        i2c_set_clientdata(client, NULL);
@@ -627,8 +640,8 @@ static int synaptics_i2c_resume(struct i2c_client *client)
        if (ret)
                return ret;
-        schedule_delayed_work(&touch->dwork,
+        synaptics_i2c_reschedule_work(touch,
-                               msecs_to_jiffies(NO_DATA_SLEEP_MSECS));
+                                msecs_to_jiffies(NO_DATA_SLEEP_MSECS));
        return 0;
 }
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index eb3ff94af58c..bc56e52b945f 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -87,8 +87,22 @@ static bool i8042_bypass_aux_irq_test;
 #include "i8042.h"
+/*
+ * i8042_lock protects serialization between i8042_command and
+ * the interrupt handler.
+ */
 static DEFINE_SPINLOCK(i8042_lock);
+/*
+ * Writers to AUX and KBD ports as well as users issuing i8042_command
+ * directly should acquire i8042_mutex (by means of calling
+ * i8042_lock_chip() and i8042_unlock_ship() helpers) to ensure that
+ * they do not disturb each other (unfortunately in many i8042
+ * implementations write to one of the ports will immediately abort
+ * command that is being processed by another port).
+ */
+static DEFINE_MUTEX(i8042_mutex);
 struct i8042_port {
        struct serio *serio;
        int irq;
@@ -113,6 +127,18 @@ static struct platform_device *i8042_platform_device;
 static irqreturn_t i8042_interrupt(int irq, void *dev_id);
+void i8042_lock_chip(void)
+{
+        mutex_lock(&i8042_mutex);
+}
+EXPORT_SYMBOL(i8042_lock_chip);
+void i8042_unlock_chip(void)
+{
+        mutex_unlock(&i8042_mutex);
+}
+EXPORT_SYMBOL(i8042_unlock_chip);
 /*
 * The i8042_wait_read() and i8042_wait_write functions wait for the i8042 to
 * be ready for reading values from it / writing values to it.
@@ -1161,6 +1187,21 @@ static void __devexit i8042_unregister_ports(void)
        }
 }
+/*
+ * Checks whether port belongs to i8042 controller.
+ */
+bool i8042_check_port_owner(const struct serio *port)
+{
+        int i;
+        for (i = 0; i < I8042_NUM_PORTS; i++)
+                if (i8042_ports[i].serio == port)
+                        return true;
+        return false;
+}
+EXPORT_SYMBOL(i8042_check_port_owner);
 static void i8042_free_irqs(void)
 {
        if (i8042_aux_irq_registered)
diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c
index 3a95b508bf27..769ba65a585a 100644
--- a/drivers/input/serio/libps2.c
+++ b/drivers/input/serio/libps2.c
@@ -17,6 +17,7 @@
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/serio.h>
+#include <linux/i8042.h>
 #include <linux/init.h>
 #include <linux/libps2.h>
@@ -54,6 +55,24 @@ int ps2_sendbyte(struct ps2dev *ps2dev, unsigned char byte, int timeout)
 }
 EXPORT_SYMBOL(ps2_sendbyte);
+void ps2_begin_command(struct ps2dev *ps2dev)
+{
+        mutex_lock(&ps2dev->cmd_mutex);
+        if (i8042_check_port_owner(ps2dev->serio))
+                i8042_lock_chip();
+}
+EXPORT_SYMBOL(ps2_begin_command);
+void ps2_end_command(struct ps2dev *ps2dev)
+{
+        if (i8042_check_port_owner(ps2dev->serio))
+                i8042_unlock_chip();
+        mutex_unlock(&ps2dev->cmd_mutex);
+}
+EXPORT_SYMBOL(ps2_end_command);
 /*
 * ps2_drain() waits for device to transmit requested number of bytes
 * and discards them.
@@ -66,7 +85,7 @@ void ps2_drain(struct ps2dev *ps2dev, int maxbytes, int timeout)
                maxbytes = sizeof(ps2dev->cmdbuf);
        }
-        mutex_lock(&ps2dev->cmd_mutex);
+        ps2_begin_command(ps2dev);
        serio_pause_rx(ps2dev->serio);
        ps2dev->flags = PS2_FLAG_CMD;
@@ -76,7 +95,8 @@ void ps2_drain(struct ps2dev *ps2dev, int maxbytes, int timeout)
        wait_event_timeout(ps2dev->wait,
                           !(ps2dev->flags & PS2_FLAG_CMD),
                           msecs_to_jiffies(timeout));
-        mutex_unlock(&ps2dev->cmd_mutex);
+        ps2_end_command(ps2dev);
 }
 EXPORT_SYMBOL(ps2_drain);
@@ -237,9 +257,9 @@ int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command)
 {
        int rc;
-        mutex_lock(&ps2dev->cmd_mutex);
+        ps2_begin_command(ps2dev);
        rc = __ps2_command(ps2dev, param, command);
-        mutex_unlock(&ps2dev->cmd_mutex);
+        ps2_end_command(ps2dev);
        return rc;
 }
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index ab02d72afbf3..8cc453c85ea7 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -48,8 +48,8 @@ config TOUCHSCREEN_AD7879_I2C
        select TOUCHSCREEN_AD7879
        help
          Say Y here if you have a touchscreen interface using the
-          AD7879-1 controller, and your board-specific initialization
+          AD7879-1/AD7889-1 controller, and your board-specific
-          code includes that in its table of I2C devices.
+          initialization code includes that in its table of I2C devices.
          If unsure, say N (but it's safe to say "Y").
@@ -62,7 +62,7 @@ config TOUCHSCREEN_AD7879_SPI
        select TOUCHSCREEN_AD7879
        help
          Say Y here if you have a touchscreen interface using the
-          AD7879 controller, and your board-specific initialization
+          AD7879/AD7889 controller, and your board-specific initialization
          code includes that in its table of SPI devices.
          If unsure, say N (but it's safe to say "Y").
@@ -169,6 +169,17 @@ config TOUCHSCREEN_WACOM_W8001
          To compile this driver as a module, choose M here: the
          module will be called wacom_w8001.
+config TOUCHSCREEN_MCS5000
+        tristate "MELFAS MCS-5000 touchscreen"
+        depends on I2C
+        help
+          Say Y here if you have the MELFAS MCS-5000 touchscreen controller
+          chip in your system.
+          If unsure, say N.
+          To compile this driver as a module, choose M here: the
+          module will be called mcs5000_ts.
 config TOUCHSCREEN_MTOUCH
        tristate "MicroTouch serial touchscreens"
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 4599bf7ad819..15fa62cffc77 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_TOUCHSCREEN_EETI)		+= eeti_ts.o
 obj-$(CONFIG_TOUCHSCREEN_ELO)           += elo.o
 obj-$(CONFIG_TOUCHSCREEN_FUJITSU)       += fujitsu_ts.o
 obj-$(CONFIG_TOUCHSCREEN_INEXIO)        += inexio.o
+obj-$(CONFIG_TOUCHSCREEN_MCS5000)       += mcs5000_ts.o
 obj-$(CONFIG_TOUCHSCREEN_MIGOR)         += migor_ts.o
 obj-$(CONFIG_TOUCHSCREEN_MTOUCH)        += mtouch.o
 obj-$(CONFIG_TOUCHSCREEN_MK712)         += mk712.o
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index 19b4db7e974d..f06332c9e21b 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -1,7 +1,8 @@
 /*
- * Copyright (C) 2008 Michael Hennerich, Analog Devices Inc.
+ * Copyright (C) 2008-2009 Michael Hennerich, Analog Devices Inc.
 *
- * Description: AD7879 based touchscreen, and GPIO driver (I2C/SPI Interface)
+ * Description: AD7879/AD7889 based touchscreen, and GPIO driver
+ *              (I2C/SPI Interface)
 *
 * Bugs:        Enter bugs at http://blackfin.uclinux.org/
 *
@@ -747,6 +748,7 @@ static int __devexit ad7879_remove(struct i2c_client *client)
 static const struct i2c_device_id ad7879_id[] = {
        { "ad7879", 0 },
+        { "ad7889", 0 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, ad7879_id);
diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c
new file mode 100644
index 000000000000..4c28b89757f9
--- /dev/null
+++ b/drivers/input/touchscreen/mcs5000_ts.c
@@ -0,0 +1,318 @@
+/*
+ * mcs5000_ts.c - Touchscreen driver for MELFAS MCS-5000 controller
+ *
+ * Copyright (C) 2009 Samsung Electronics Co.Ltd
+ * Author: Joonyoung Shim <jy0922.shim@samsung.com>
+ *
+ * Based on wm97xx-core.c
+ *
+ *  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/init.h>
+#include <linux/i2c.h>
+#include <linux/i2c/mcs5000_ts.h>
+#include <linux/interrupt.h>
+#include <linux/input.h>
+#include <linux/irq.h>
+/* Registers */
+#define MCS5000_TS_STATUS               0x00
+#define STATUS_OFFSET                   0
+#define STATUS_NO                       (0 << STATUS_OFFSET)
+#define STATUS_INIT                     (1 << STATUS_OFFSET)
+#define STATUS_SENSING                  (2 << STATUS_OFFSET)
+#define STATUS_COORD                    (3 << STATUS_OFFSET)
+#define STATUS_GESTURE                  (4 << STATUS_OFFSET)
+#define ERROR_OFFSET                    4
+#define ERROR_NO                        (0 << ERROR_OFFSET)
+#define ERROR_POWER_ON_RESET            (1 << ERROR_OFFSET)
+#define ERROR_INT_RESET                 (2 << ERROR_OFFSET)
+#define ERROR_EXT_RESET                 (3 << ERROR_OFFSET)
+#define ERROR_INVALID_REG_ADDRESS       (8 << ERROR_OFFSET)
+#define ERROR_INVALID_REG_VALUE         (9 << ERROR_OFFSET)
+#define MCS5000_TS_OP_MODE              0x01
+#define RESET_OFFSET                    0
+#define RESET_NO                        (0 << RESET_OFFSET)
+#define RESET_EXT_SOFT                  (1 << RESET_OFFSET)
+#define OP_MODE_OFFSET                  1
+#define OP_MODE_SLEEP                   (0 << OP_MODE_OFFSET)
+#define OP_MODE_ACTIVE                  (1 << OP_MODE_OFFSET)
+#define GESTURE_OFFSET                  4
+#define GESTURE_DISABLE                 (0 << GESTURE_OFFSET)
+#define GESTURE_ENABLE                  (1 << GESTURE_OFFSET)
+#define PROXIMITY_OFFSET                5
+#define PROXIMITY_DISABLE               (0 << PROXIMITY_OFFSET)
+#define PROXIMITY_ENABLE                (1 << PROXIMITY_OFFSET)
+#define SCAN_MODE_OFFSET                6
+#define SCAN_MODE_INTERRUPT             (0 << SCAN_MODE_OFFSET)
+#define SCAN_MODE_POLLING               (1 << SCAN_MODE_OFFSET)
+#define REPORT_RATE_OFFSET              7
+#define REPORT_RATE_40                  (0 << REPORT_RATE_OFFSET)
+#define REPORT_RATE_80                  (1 << REPORT_RATE_OFFSET)
+#define MCS5000_TS_SENS_CTL             0x02
+#define MCS5000_TS_FILTER_CTL           0x03
+#define PRI_FILTER_OFFSET               0
+#define SEC_FILTER_OFFSET               4
+#define MCS5000_TS_X_SIZE_UPPER         0x08
+#define MCS5000_TS_X_SIZE_LOWER         0x09
+#define MCS5000_TS_Y_SIZE_UPPER         0x0A
+#define MCS5000_TS_Y_SIZE_LOWER         0x0B
+#define MCS5000_TS_INPUT_INFO           0x10
+#define INPUT_TYPE_OFFSET               0
+#define INPUT_TYPE_NONTOUCH             (0 << INPUT_TYPE_OFFSET)
+#define INPUT_TYPE_SINGLE               (1 << INPUT_TYPE_OFFSET)
+#define INPUT_TYPE_DUAL                 (2 << INPUT_TYPE_OFFSET)
+#define INPUT_TYPE_PALM                 (3 << INPUT_TYPE_OFFSET)
+#define INPUT_TYPE_PROXIMITY            (7 << INPUT_TYPE_OFFSET)
+#define GESTURE_CODE_OFFSET             3
+#define GESTURE_CODE_NO                 (0 << GESTURE_CODE_OFFSET)
+#define MCS5000_TS_X_POS_UPPER          0x11
+#define MCS5000_TS_X_POS_LOWER          0x12
+#define MCS5000_TS_Y_POS_UPPER          0x13
+#define MCS5000_TS_Y_POS_LOWER          0x14
+#define MCS5000_TS_Z_POS                0x15
+#define MCS5000_TS_WIDTH                0x16
+#define MCS5000_TS_GESTURE_VAL          0x17
+#define MCS5000_TS_MODULE_REV           0x20
+#define MCS5000_TS_FIRMWARE_VER         0x21
+/* Touchscreen absolute values */
+#define MCS5000_MAX_XC                  0x3ff
+#define MCS5000_MAX_YC                  0x3ff
+enum mcs5000_ts_read_offset {
+        READ_INPUT_INFO,
+        READ_X_POS_UPPER,
+        READ_X_POS_LOWER,
+        READ_Y_POS_UPPER,
+        READ_Y_POS_LOWER,
+        READ_BLOCK_SIZE,
+};
+/* Each client has this additional data */
+struct mcs5000_ts_data {
+        struct i2c_client *client;
+        struct input_dev *input_dev;
+        const struct mcs5000_ts_platform_data *platform_data;
+};
+static irqreturn_t mcs5000_ts_interrupt(int irq, void *dev_id)
+{
+        struct mcs5000_ts_data *data = dev_id;
+        struct i2c_client *client = data->client;
+        u8 buffer[READ_BLOCK_SIZE];
+        int err;
+        int x;
+        int y;
+        err = i2c_smbus_read_i2c_block_data(client, MCS5000_TS_INPUT_INFO,
+                        READ_BLOCK_SIZE, buffer);
+        if (err < 0) {
+                dev_err(&client->dev, "%s, err[%d]\n", __func__, err);
+                goto out;
+        }
+        switch (buffer[READ_INPUT_INFO]) {
+        case INPUT_TYPE_NONTOUCH:
+                input_report_key(data->input_dev, BTN_TOUCH, 0);
+                input_sync(data->input_dev);
+                break;
+        case INPUT_TYPE_SINGLE:
+                x = (buffer[READ_X_POS_UPPER] << 8) | buffer[READ_X_POS_LOWER];
+                y = (buffer[READ_Y_POS_UPPER] << 8) | buffer[READ_Y_POS_LOWER];
+                input_report_key(data->input_dev, BTN_TOUCH, 1);
+                input_report_abs(data->input_dev, ABS_X, x);
+                input_report_abs(data->input_dev, ABS_Y, y);
+                input_sync(data->input_dev);
+                break;
+        case INPUT_TYPE_DUAL:
+                /* TODO */
+                break;
+        case INPUT_TYPE_PALM:
+                /* TODO */
+                break;
+        case INPUT_TYPE_PROXIMITY:
+                /* TODO */
+                break;
+        default:
+                dev_err(&client->dev, "Unknown ts input type %d\n",
+                                buffer[READ_INPUT_INFO]);
+                break;
+        }
+ out:
+        return IRQ_HANDLED;
+}
+static void mcs5000_ts_phys_init(struct mcs5000_ts_data *data)
+{
+        const struct mcs5000_ts_platform_data *platform_data =
+                data->platform_data;
+        struct i2c_client *client = data->client;
+        /* Touch reset & sleep mode */
+        i2c_smbus_write_byte_data(client, MCS5000_TS_OP_MODE,
+                        RESET_EXT_SOFT | OP_MODE_SLEEP);
+        /* Touch size */
+        i2c_smbus_write_byte_data(client, MCS5000_TS_X_SIZE_UPPER,
+                        platform_data->x_size >> 8);
+        i2c_smbus_write_byte_data(client, MCS5000_TS_X_SIZE_LOWER,
+                        platform_data->x_size & 0xff);
+        i2c_smbus_write_byte_data(client, MCS5000_TS_Y_SIZE_UPPER,
+                        platform_data->y_size >> 8);
+        i2c_smbus_write_byte_data(client, MCS5000_TS_Y_SIZE_LOWER,
+                        platform_data->y_size & 0xff);
+        /* Touch active mode & 80 report rate */
+        i2c_smbus_write_byte_data(data->client, MCS5000_TS_OP_MODE,
+                        OP_MODE_ACTIVE | REPORT_RATE_80);
+}
+static int __devinit mcs5000_ts_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        struct mcs5000_ts_data *data;
+        struct input_dev *input_dev;
+        int ret;
+        if (!client->dev.platform_data)
+                return -EINVAL;
+        data = kzalloc(sizeof(struct mcs5000_ts_data), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!data || !input_dev) {
+                dev_err(&client->dev, "Failed to allocate memory\n");
+                ret = -ENOMEM;
+                goto err_free_mem;
+        }
+        data->client = client;
+        data->input_dev = input_dev;
+        data->platform_data = client->dev.platform_data;
+        input_dev->name = "MELPAS MCS-5000 Touchscreen";
+        input_dev->id.bustype = BUS_I2C;
+        input_dev->dev.parent = &client->dev;
+        __set_bit(EV_ABS, input_dev->evbit);
+        __set_bit(EV_KEY, input_dev->evbit);
+        __set_bit(BTN_TOUCH, input_dev->keybit);
+        input_set_abs_params(input_dev, ABS_X, 0, MCS5000_MAX_XC, 0, 0);
+        input_set_abs_params(input_dev, ABS_Y, 0, MCS5000_MAX_YC, 0, 0);
+        input_set_drvdata(input_dev, data);
+        if (data->platform_data->cfg_pin)
+                data->platform_data->cfg_pin();
+        ret = request_threaded_irq(client->irq, NULL, mcs5000_ts_interrupt,
+                        IRQF_TRIGGER_LOW | IRQF_ONESHOT, "mcs5000_ts", data);
+        if (ret < 0) {
+                dev_err(&client->dev, "Failed to register interrupt\n");
+                goto err_free_mem;
+        }
+        ret = input_register_device(data->input_dev);
+        if (ret < 0)
+                goto err_free_irq;
+        mcs5000_ts_phys_init(data);
+        i2c_set_clientdata(client, data);
+        return 0;
+err_free_irq:
+        free_irq(client->irq, data);
+err_free_mem:
+        input_free_device(input_dev);
+        kfree(data);
+        return ret;
+}
+static int __devexit mcs5000_ts_remove(struct i2c_client *client)
+{
+        struct mcs5000_ts_data *data = i2c_get_clientdata(client);
+        free_irq(client->irq, data);
+        input_unregister_device(data->input_dev);
+        kfree(data);
+        i2c_set_clientdata(client, NULL);
+        return 0;
+}
+#ifdef CONFIG_PM
+static int mcs5000_ts_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+        /* Touch sleep mode */
+        i2c_smbus_write_byte_data(client, MCS5000_TS_OP_MODE, OP_MODE_SLEEP);
+        return 0;
+}
+static int mcs5000_ts_resume(struct i2c_client *client)
+{
+        struct mcs5000_ts_data *data = i2c_get_clientdata(client);
+        mcs5000_ts_phys_init(data);
+        return 0;
+}
+#else
+#define mcs5000_ts_suspend      NULL
+#define mcs5000_ts_resume       NULL
+#endif
+static const struct i2c_device_id mcs5000_ts_id[] = {
+        { "mcs5000_ts", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, mcs5000_ts_id);
+static struct i2c_driver mcs5000_ts_driver = {
+        .probe          = mcs5000_ts_probe,
+        .remove         = __devexit_p(mcs5000_ts_remove),
+        .suspend        = mcs5000_ts_suspend,
+        .resume         = mcs5000_ts_resume,
+        .driver = {
+                .name = "mcs5000_ts",
+        },
+        .id_table       = mcs5000_ts_id,
+};
+static int __init mcs5000_ts_init(void)
+{
+        return i2c_add_driver(&mcs5000_ts_driver);
+}
+static void __exit mcs5000_ts_exit(void)
+{
+        i2c_del_driver(&mcs5000_ts_driver);
+}
+module_init(mcs5000_ts_init);
+module_exit(mcs5000_ts_exit);
+/* Module information */
+MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>");
+MODULE_DESCRIPTION("Touchscreen driver for MELFAS MCS-5000 controller");
+MODULE_LICENSE("GPL");
diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
index 1813c84ea5fc..f2242db54016 100644
--- a/drivers/leds/leds-clevo-mail.c
+++ b/drivers/leds/leds-clevo-mail.c
@@ -93,6 +93,8 @@ static struct dmi_system_id __initdata mail_led_whitelist[] = {
 static void clevo_mail_led_set(struct led_classdev *led_cdev,
                                enum led_brightness value)
 {
+        i8042_lock_chip();
        if (value == LED_OFF)
                i8042_command(NULL, CLEVO_MAIL_LED_OFF);
        else if (value <= LED_HALF)
@@ -100,6 +102,8 @@ static void clevo_mail_led_set(struct led_classdev *led_cdev,
        else
                i8042_command(NULL, CLEVO_MAIL_LED_BLINK_1HZ);
+        i8042_unlock_chip();
 }
 static int clevo_mail_led_blink(struct led_classdev *led_cdev,
@@ -108,6 +112,8 @@ static int clevo_mail_led_blink(struct led_classdev *led_cdev,
 {
        int status = -EINVAL;
+        i8042_lock_chip();
        if (*delay_on == 0 /* ms */ && *delay_off == 0 /* ms */) {
                /* Special case: the leds subsystem requested us to
                 * chose one user friendly blinking of the LED, and
@@ -135,6 +141,8 @@ static int clevo_mail_led_blink(struct led_classdev *led_cdev,
                       *delay_on, *delay_off);
        }
+        i8042_unlock_chip();
        return status;
 }
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index 6ba16abeebdd..e0f91e4ab653 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -28,7 +28,6 @@
 #include <linux/timer.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/utsname.h>
 #include <linux/highmem.h>
 #include <linux/vmalloc.h>
 #include <linux/module.h>
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index f97fd06d5948..c19f51dba2ee 100644
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -28,7 +28,6 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <linux/utsname.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>
 #include <linux/ioport.h>
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 90d9b5c0e9a7..a2a50d608a3f 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -52,7 +52,6 @@
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include <linux/mm.h>
-#include <linux/utsname.h>
 #include <linux/highmem.h>
 #include <linux/vmalloc.h>
 #include <linux/module.h>
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index fb45f5ee8df1..454970d2d701 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -746,7 +746,9 @@ static acpi_status WMID_set_u32(u32 value, u32 cap, struct wmi_interface *iface)
                        return AE_BAD_PARAMETER;
                if (quirks->mailled == 1) {
                        param = value ? 0x92 : 0x93;
+                        i8042_lock_chip();
                        i8042_command(&param, 0x1059);
+                        i8042_unlock_chip();
                        return 0;
                }
                break;
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index c431198bdbc4..82daa3c1dc9c 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -14,7 +14,6 @@
 #include <linux/init.h>
 #include <linux/miscdevice.h>
-#include <linux/utsname.h>
 #include <linux/debugfs.h>
 #include <asm/ipl.h>
 #include <asm/sclp.h>
diff --git a/drivers/usb/gadget/f_loopback.c b/drivers/usb/gadget/f_loopback.c
index eb6ddfc20857..6cb29d3df575 100644
--- a/drivers/usb/gadget/f_loopback.c
+++ b/drivers/usb/gadget/f_loopback.c
@@ -22,7 +22,6 @@
 /* #define VERBOSE_DEBUG */
 #include <linux/kernel.h>
-#include <linux/utsname.h>
 #include <linux/device.h>
 #include "g_zero.h"
diff --git a/drivers/usb/gadget/f_obex.c b/drivers/usb/gadget/f_obex.c
index 46d6266f30ec..b4a3ba654ea5 100644
--- a/drivers/usb/gadget/f_obex.c
+++ b/drivers/usb/gadget/f_obex.c
@@ -24,7 +24,6 @@
 /* #define VERBOSE_DEBUG */
 #include <linux/kernel.h>
-#include <linux/utsname.h>
 #include <linux/device.h>
 #include "u_serial.h"
diff --git a/drivers/usb/gadget/f_sourcesink.c b/drivers/usb/gadget/f_sourcesink.c
index bffe91d525f9..09cba273d2db 100644
--- a/drivers/usb/gadget/f_sourcesink.c
+++ b/drivers/usb/gadget/f_sourcesink.c
@@ -22,7 +22,6 @@
 /* #define VERBOSE_DEBUG */
 #include <linux/kernel.h>
-#include <linux/utsname.h>
 #include <linux/device.h>
 #include "g_zero.h"
diff --git a/drivers/usb/gadget/u_audio.c b/drivers/usb/gadget/u_audio.c
index b5200d551458..8252595d619d 100644
--- a/drivers/usb/gadget/u_audio.c
+++ b/drivers/usb/gadget/u_audio.c
@@ -10,7 +10,6 @@
 */
 #include <linux/kernel.h>
-#include <linux/utsname.h>
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/ctype.h>
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c
index f8751ff863cd..2fc02bd95848 100644
--- a/drivers/usb/gadget/u_ether.c
+++ b/drivers/usb/gadget/u_ether.c
@@ -23,7 +23,6 @@
 /* #define VERBOSE_DEBUG */
 #include <linux/kernel.h>
-#include <linux/utsname.h>
 #include <linux/device.h>
 #include <linux/ctype.h>
 #include <linux/etherdevice.h>
diff --git a/fs/9p/Kconfig b/fs/9p/Kconfig
index 74e0723e90bc..795233702a4e 100644
--- a/fs/9p/Kconfig
+++ b/fs/9p/Kconfig
@@ -8,3 +8,12 @@ config 9P_FS
          See <http://v9fs.sf.net> for more information.
          If unsure, say N.
+config 9P_FSCACHE
+        bool "Enable 9P client caching support (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        depends on 9P_FS=m && FSCACHE || 9P_FS=y && FSCACHE=y
+        help
+          Choose Y here to enable persistent, read-only local
+          caching support for 9p clients using FS-Cache
diff --git a/fs/9p/Makefile b/fs/9p/Makefile
index bc7f0d1551e6..1a940ec7af61 100644
--- a/fs/9p/Makefile
+++ b/fs/9p/Makefile
@@ -8,5 +8,6 @@ obj-$(CONFIG_9P_FS) := 9p.o
        vfs_dir.o \
        vfs_dentry.o \
        v9fs.o \
-        fid.o \
+        fid.o
+9p-$(CONFIG_9P_FSCACHE) += cache.o
diff --git a/fs/9p/cache.c b/fs/9p/cache.c
new file mode 100644
index 000000000000..51c94e26a346
--- /dev/null
+++ b/fs/9p/cache.c
@@ -0,0 +1,474 @@
+/*
+ * V9FS cache definitions.
+ *
+ *  Copyright (C) 2009 by Abhishek Kulkarni <adkulkar@umail.iu.edu>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to:
+ *  Free Software Foundation
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02111-1301  USA
+ *
+ */
+#include <linux/jiffies.h>
+#include <linux/file.h>
+#include <linux/stat.h>
+#include <linux/sched.h>
+#include <linux/fs.h>
+#include <net/9p/9p.h>
+#include "v9fs.h"
+#include "cache.h"
+#define CACHETAG_LEN  11
+struct kmem_cache *vcookie_cache;
+struct fscache_netfs v9fs_cache_netfs = {
+        .name           = "9p",
+        .version        = 0,
+};
+static void init_once(void *foo)
+{
+        struct v9fs_cookie *vcookie = (struct v9fs_cookie *) foo;
+        vcookie->fscache = NULL;
+        vcookie->qid = NULL;
+        inode_init_once(&vcookie->inode);
+}
+/**
+ * v9fs_init_vcookiecache - initialize a cache for vcookies to maintain
+ *                          vcookie to inode mapping
+ *
+ * Returns 0 on success.
+ */
+static int v9fs_init_vcookiecache(void)
+{
+        vcookie_cache = kmem_cache_create("vcookie_cache",
+                                          sizeof(struct v9fs_cookie),
+                                          0, (SLAB_RECLAIM_ACCOUNT|
+                                              SLAB_MEM_SPREAD),
+                                          init_once);
+        if (!vcookie_cache)
+                return -ENOMEM;
+        return 0;
+}
+/**
+ * v9fs_destroy_vcookiecache - destroy the cache of vcookies
+ *
+ */
+static void v9fs_destroy_vcookiecache(void)
+{
+        kmem_cache_destroy(vcookie_cache);
+}
+int __v9fs_cache_register(void)
+{
+        int ret;
+        ret = v9fs_init_vcookiecache();
+        if (ret < 0)
+                return ret;
+        return fscache_register_netfs(&v9fs_cache_netfs);
+}
+void __v9fs_cache_unregister(void)
+{
+        v9fs_destroy_vcookiecache();
+        fscache_unregister_netfs(&v9fs_cache_netfs);
+}
+/**
+ * v9fs_random_cachetag - Generate a random tag to be associated
+ *                        with a new cache session.
+ *
+ * The value of jiffies is used for a fairly randomly cache tag.
+ */
+static
+int v9fs_random_cachetag(struct v9fs_session_info *v9ses)
+{
+        v9ses->cachetag = kmalloc(CACHETAG_LEN, GFP_KERNEL);
+        if (!v9ses->cachetag)
+                return -ENOMEM;
+        return scnprintf(v9ses->cachetag, CACHETAG_LEN, "%lu", jiffies);
+}
+static uint16_t v9fs_cache_session_get_key(const void *cookie_netfs_data,
+                                           void *buffer, uint16_t bufmax)
+{
+        struct v9fs_session_info *v9ses;
+        uint16_t klen = 0;
+        v9ses = (struct v9fs_session_info *)cookie_netfs_data;
+        P9_DPRINTK(P9_DEBUG_FSC, "session %p buf %p size %u", v9ses,
+                   buffer, bufmax);
+        if (v9ses->cachetag)
+                klen = strlen(v9ses->cachetag);
+        if (klen > bufmax)
+                return 0;
+        memcpy(buffer, v9ses->cachetag, klen);
+        P9_DPRINTK(P9_DEBUG_FSC, "cache session tag %s", v9ses->cachetag);
+        return klen;
+}
+const struct fscache_cookie_def v9fs_cache_session_index_def = {
+        .name           = "9P.session",
+        .type           = FSCACHE_COOKIE_TYPE_INDEX,
+        .get_key        = v9fs_cache_session_get_key,
+};
+void v9fs_cache_session_get_cookie(struct v9fs_session_info *v9ses)
+{
+        /* If no cache session tag was specified, we generate a random one. */
+        if (!v9ses->cachetag)
+                v9fs_random_cachetag(v9ses);
+        v9ses->fscache = fscache_acquire_cookie(v9fs_cache_netfs.primary_index,
+                                                &v9fs_cache_session_index_def,
+                                                v9ses);
+        P9_DPRINTK(P9_DEBUG_FSC, "session %p get cookie %p", v9ses,
+                   v9ses->fscache);
+}
+void v9fs_cache_session_put_cookie(struct v9fs_session_info *v9ses)
+{
+        P9_DPRINTK(P9_DEBUG_FSC, "session %p put cookie %p", v9ses,
+                   v9ses->fscache);
+        fscache_relinquish_cookie(v9ses->fscache, 0);
+        v9ses->fscache = NULL;
+}
+static uint16_t v9fs_cache_inode_get_key(const void *cookie_netfs_data,
+                                         void *buffer, uint16_t bufmax)
+{
+        const struct v9fs_cookie *vcookie = cookie_netfs_data;
+        memcpy(buffer, &vcookie->qid->path, sizeof(vcookie->qid->path));
+        P9_DPRINTK(P9_DEBUG_FSC, "inode %p get key %llu", &vcookie->inode,
+                   vcookie->qid->path);
+        return sizeof(vcookie->qid->path);
+}
+static void v9fs_cache_inode_get_attr(const void *cookie_netfs_data,
+                                      uint64_t *size)
+{
+        const struct v9fs_cookie *vcookie = cookie_netfs_data;
+        *size = i_size_read(&vcookie->inode);
+        P9_DPRINTK(P9_DEBUG_FSC, "inode %p get attr %llu", &vcookie->inode,
+                   *size);
+}
+static uint16_t v9fs_cache_inode_get_aux(const void *cookie_netfs_data,
+                                         void *buffer, uint16_t buflen)
+{
+        const struct v9fs_cookie *vcookie = cookie_netfs_data;
+        memcpy(buffer, &vcookie->qid->version, sizeof(vcookie->qid->version));
+        P9_DPRINTK(P9_DEBUG_FSC, "inode %p get aux %u", &vcookie->inode,
+                   vcookie->qid->version);
+        return sizeof(vcookie->qid->version);
+}
+static enum
+fscache_checkaux v9fs_cache_inode_check_aux(void *cookie_netfs_data,
+                                            const void *buffer,
+                                            uint16_t buflen)
+{
+        const struct v9fs_cookie *vcookie = cookie_netfs_data;
+        if (buflen != sizeof(vcookie->qid->version))
+                return FSCACHE_CHECKAUX_OBSOLETE;
+        if (memcmp(buffer, &vcookie->qid->version,
+                   sizeof(vcookie->qid->version)))
+                return FSCACHE_CHECKAUX_OBSOLETE;
+        return FSCACHE_CHECKAUX_OKAY;
+}
+static void v9fs_cache_inode_now_uncached(void *cookie_netfs_data)
+{
+        struct v9fs_cookie *vcookie = cookie_netfs_data;
+        struct pagevec pvec;
+        pgoff_t first;
+        int loop, nr_pages;
+        pagevec_init(&pvec, 0);
+        first = 0;
+        for (;;) {
+                nr_pages = pagevec_lookup(&pvec, vcookie->inode.i_mapping,
+                                          first,
+                                          PAGEVEC_SIZE - pagevec_count(&pvec));
+                if (!nr_pages)
+                        break;
+                for (loop = 0; loop < nr_pages; loop++)
+                        ClearPageFsCache(pvec.pages[loop]);
+                first = pvec.pages[nr_pages - 1]->index + 1;
+                pvec.nr = nr_pages;
+                pagevec_release(&pvec);
+                cond_resched();
+        }
+}
+const struct fscache_cookie_def v9fs_cache_inode_index_def = {
+        .name           = "9p.inode",
+        .type           = FSCACHE_COOKIE_TYPE_DATAFILE,
+        .get_key        = v9fs_cache_inode_get_key,
+        .get_attr       = v9fs_cache_inode_get_attr,
+        .get_aux        = v9fs_cache_inode_get_aux,
+        .check_aux      = v9fs_cache_inode_check_aux,
+        .now_uncached   = v9fs_cache_inode_now_uncached,
+};
+void v9fs_cache_inode_get_cookie(struct inode *inode)
+{
+        struct v9fs_cookie *vcookie;
+        struct v9fs_session_info *v9ses;
+        if (!S_ISREG(inode->i_mode))
+                return;
+        vcookie = v9fs_inode2cookie(inode);
+        if (vcookie->fscache)
+                return;
+        v9ses = v9fs_inode2v9ses(inode);
+        vcookie->fscache = fscache_acquire_cookie(v9ses->fscache,
+                                                  &v9fs_cache_inode_index_def,
+                                                  vcookie);
+        P9_DPRINTK(P9_DEBUG_FSC, "inode %p get cookie %p", inode,
+                   vcookie->fscache);
+}
+void v9fs_cache_inode_put_cookie(struct inode *inode)
+{
+        struct v9fs_cookie *vcookie = v9fs_inode2cookie(inode);
+        if (!vcookie->fscache)
+                return;
+        P9_DPRINTK(P9_DEBUG_FSC, "inode %p put cookie %p", inode,
+                   vcookie->fscache);
+        fscache_relinquish_cookie(vcookie->fscache, 0);
+        vcookie->fscache = NULL;
+}
+void v9fs_cache_inode_flush_cookie(struct inode *inode)
+{
+        struct v9fs_cookie *vcookie = v9fs_inode2cookie(inode);
+        if (!vcookie->fscache)
+                return;
+        P9_DPRINTK(P9_DEBUG_FSC, "inode %p flush cookie %p", inode,
+                   vcookie->fscache);
+        fscache_relinquish_cookie(vcookie->fscache, 1);
+        vcookie->fscache = NULL;
+}
+void v9fs_cache_inode_set_cookie(struct inode *inode, struct file *filp)
+{
+        struct v9fs_cookie *vcookie = v9fs_inode2cookie(inode);
+        struct p9_fid *fid;
+        if (!vcookie->fscache)
+                return;
+        spin_lock(&vcookie->lock);
+        fid = filp->private_data;
+        if ((filp->f_flags & O_ACCMODE) != O_RDONLY)
+                v9fs_cache_inode_flush_cookie(inode);
+        else
+                v9fs_cache_inode_get_cookie(inode);
+        spin_unlock(&vcookie->lock);
+}
+void v9fs_cache_inode_reset_cookie(struct inode *inode)
+{
+        struct v9fs_cookie *vcookie = v9fs_inode2cookie(inode);
+        struct v9fs_session_info *v9ses;
+        struct fscache_cookie *old;
+        if (!vcookie->fscache)
+                return;
+        old = vcookie->fscache;
+        spin_lock(&vcookie->lock);
+        fscache_relinquish_cookie(vcookie->fscache, 1);
+        v9ses = v9fs_inode2v9ses(inode);
+        vcookie->fscache = fscache_acquire_cookie(v9ses->fscache,
+                                                  &v9fs_cache_inode_index_def,
+                                                  vcookie);
+        P9_DPRINTK(P9_DEBUG_FSC, "inode %p revalidating cookie old %p new %p",
+                   inode, old, vcookie->fscache);
+        spin_unlock(&vcookie->lock);
+}
+int __v9fs_fscache_release_page(struct page *page, gfp_t gfp)
+{
+        struct inode *inode = page->mapping->host;
+        struct v9fs_cookie *vcookie = v9fs_inode2cookie(inode);
+        BUG_ON(!vcookie->fscache);
+        if (PageFsCache(page)) {
+                if (fscache_check_page_write(vcookie->fscache, page)) {
+                        if (!(gfp & __GFP_WAIT))
+                                return 0;
+                        fscache_wait_on_page_write(vcookie->fscache, page);
+                }
+                fscache_uncache_page(vcookie->fscache, page);
+                ClearPageFsCache(page);
+        }
+        return 1;
+}
+void __v9fs_fscache_invalidate_page(struct page *page)
+{
+        struct inode *inode = page->mapping->host;
+        struct v9fs_cookie *vcookie = v9fs_inode2cookie(inode);
+        BUG_ON(!vcookie->fscache);
+        if (PageFsCache(page)) {
+                fscache_wait_on_page_write(vcookie->fscache, page);
+                BUG_ON(!PageLocked(page));
+                fscache_uncache_page(vcookie->fscache, page);
+                ClearPageFsCache(page);
+        }
+}
+static void v9fs_vfs_readpage_complete(struct page *page, void *data,
+                                       int error)
+{
+        if (!error)
+                SetPageUptodate(page);
+        unlock_page(page);
+}
+/**
+ * __v9fs_readpage_from_fscache - read a page from cache
+ *
+ * Returns 0 if the pages are in cache and a BIO is submitted,
+ * 1 if the pages are not in cache and -error otherwise.
+ */
+int __v9fs_readpage_from_fscache(struct inode *inode, struct page *page)
+{
+        int ret;
+        const struct v9fs_cookie *vcookie = v9fs_inode2cookie(inode);
+        P9_DPRINTK(P9_DEBUG_FSC, "inode %p page %p", inode, page);
+        if (!vcookie->fscache)
+                return -ENOBUFS;
+        ret = fscache_read_or_alloc_page(vcookie->fscache,
+                                         page,
+                                         v9fs_vfs_readpage_complete,
+                                         NULL,
+                                         GFP_KERNEL);
+        switch (ret) {
+        case -ENOBUFS:
+        case -ENODATA:
+                P9_DPRINTK(P9_DEBUG_FSC, "page/inode not in cache %d", ret);
+                return 1;
+        case 0:
+                P9_DPRINTK(P9_DEBUG_FSC, "BIO submitted");
+                return ret;
+        default:
+                P9_DPRINTK(P9_DEBUG_FSC, "ret %d", ret);
+                return ret;
+        }
+}
+/**
+ * __v9fs_readpages_from_fscache - read multiple pages from cache
+ *
+ * Returns 0 if the pages are in cache and a BIO is submitted,
+ * 1 if the pages are not in cache and -error otherwise.
+ */
+int __v9fs_readpages_from_fscache(struct inode *inode,
+                                  struct address_space *mapping,
+                                  struct list_head *pages,
+                                  unsigned *nr_pages)
+{
+        int ret;
+        const struct v9fs_cookie *vcookie = v9fs_inode2cookie(inode);
+        P9_DPRINTK(P9_DEBUG_FSC, "inode %p pages %u", inode, *nr_pages);
+        if (!vcookie->fscache)
+                return -ENOBUFS;
+        ret = fscache_read_or_alloc_pages(vcookie->fscache,
+                                          mapping, pages, nr_pages,
+                                          v9fs_vfs_readpage_complete,
+                                          NULL,
+                                          mapping_gfp_mask(mapping));
+        switch (ret) {
+        case -ENOBUFS:
+        case -ENODATA:
+                P9_DPRINTK(P9_DEBUG_FSC, "pages/inodes not in cache %d", ret);
+                return 1;
+        case 0:
+                BUG_ON(!list_empty(pages));
+                BUG_ON(*nr_pages != 0);
+                P9_DPRINTK(P9_DEBUG_FSC, "BIO submitted");
+                return ret;
+        default:
+                P9_DPRINTK(P9_DEBUG_FSC, "ret %d", ret);
+                return ret;
+        }
+}
+/**
+ * __v9fs_readpage_to_fscache - write a page to the cache
+ *
+ */
+void __v9fs_readpage_to_fscache(struct inode *inode, struct page *page)
+{
+        int ret;
+        const struct v9fs_cookie *vcookie = v9fs_inode2cookie(inode);
+        P9_DPRINTK(P9_DEBUG_FSC, "inode %p page %p", inode, page);
+        ret = fscache_write_page(vcookie->fscache, page, GFP_KERNEL);
+        P9_DPRINTK(P9_DEBUG_FSC, "ret =  %d", ret);
+        if (ret != 0)
+                v9fs_uncache_page(inode, page);
+}
diff --git a/fs/9p/cache.h b/fs/9p/cache.h
new file mode 100644
index 000000000000..a94192bfaee8
--- /dev/null
+++ b/fs/9p/cache.h
@@ -0,0 +1,176 @@
+/*
+ * V9FS cache definitions.
+ *
+ *  Copyright (C) 2009 by Abhishek Kulkarni <adkulkar@umail.iu.edu>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to:
+ *  Free Software Foundation
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02111-1301  USA
+ *
+ */
+#ifndef _9P_CACHE_H
+#ifdef CONFIG_9P_FSCACHE
+#include <linux/fscache.h>
+#include <linux/spinlock.h>
+extern struct kmem_cache *vcookie_cache;
+struct v9fs_cookie {
+        spinlock_t lock;
+        struct inode inode;
+        struct fscache_cookie *fscache;
+        struct p9_qid *qid;
+};
+static inline struct v9fs_cookie *v9fs_inode2cookie(const struct inode *inode)
+{
+        return container_of(inode, struct v9fs_cookie, inode);
+}
+extern struct fscache_netfs v9fs_cache_netfs;
+extern const struct fscache_cookie_def v9fs_cache_session_index_def;
+extern const struct fscache_cookie_def v9fs_cache_inode_index_def;
+extern void v9fs_cache_session_get_cookie(struct v9fs_session_info *v9ses);
+extern void v9fs_cache_session_put_cookie(struct v9fs_session_info *v9ses);
+extern void v9fs_cache_inode_get_cookie(struct inode *inode);
+extern void v9fs_cache_inode_put_cookie(struct inode *inode);
+extern void v9fs_cache_inode_flush_cookie(struct inode *inode);
+extern void v9fs_cache_inode_set_cookie(struct inode *inode, struct file *filp);
+extern void v9fs_cache_inode_reset_cookie(struct inode *inode);
+extern int __v9fs_cache_register(void);
+extern void __v9fs_cache_unregister(void);
+extern int __v9fs_fscache_release_page(struct page *page, gfp_t gfp);
+extern void __v9fs_fscache_invalidate_page(struct page *page);
+extern int __v9fs_readpage_from_fscache(struct inode *inode,
+                                        struct page *page);
+extern int __v9fs_readpages_from_fscache(struct inode *inode,
+                                         struct address_space *mapping,
+                                         struct list_head *pages,
+                                         unsigned *nr_pages);
+extern void __v9fs_readpage_to_fscache(struct inode *inode, struct page *page);
+/**
+ * v9fs_cache_register - Register v9fs file system with the cache
+ */
+static inline int v9fs_cache_register(void)
+{
+        return __v9fs_cache_register();
+}
+/**
+ * v9fs_cache_unregister - Unregister v9fs from the cache
+ */
+static inline void v9fs_cache_unregister(void)
+{
+        __v9fs_cache_unregister();
+}
+static inline int v9fs_fscache_release_page(struct page *page,
+                                            gfp_t gfp)
+{
+        return __v9fs_fscache_release_page(page, gfp);
+}
+static inline void v9fs_fscache_invalidate_page(struct page *page)
+{
+        __v9fs_fscache_invalidate_page(page);
+}
+static inline int v9fs_readpage_from_fscache(struct inode *inode,
+                                             struct page *page)
+{
+        return __v9fs_readpage_from_fscache(inode, page);
+}
+static inline int v9fs_readpages_from_fscache(struct inode *inode,
+                                              struct address_space *mapping,
+                                              struct list_head *pages,
+                                              unsigned *nr_pages)
+{
+        return __v9fs_readpages_from_fscache(inode, mapping, pages,
+                                             nr_pages);
+}
+static inline void v9fs_readpage_to_fscache(struct inode *inode,
+                                            struct page *page)
+{
+        if (PageFsCache(page))
+                __v9fs_readpage_to_fscache(inode, page);
+}
+static inline void v9fs_uncache_page(struct inode *inode, struct page *page)
+{
+        struct v9fs_cookie *vcookie = v9fs_inode2cookie(inode);
+        fscache_uncache_page(vcookie->fscache, page);
+        BUG_ON(PageFsCache(page));
+}
+static inline void v9fs_vcookie_set_qid(struct inode *inode,
+                                        struct p9_qid *qid)
+{
+        struct v9fs_cookie *vcookie = v9fs_inode2cookie(inode);
+        spin_lock(&vcookie->lock);
+        vcookie->qid = qid;
+        spin_unlock(&vcookie->lock);
+}
+#else /* CONFIG_9P_FSCACHE */
+static inline int v9fs_cache_register(void)
+{
+        return 1;
+}
+static inline void v9fs_cache_unregister(void) {}
+static inline int v9fs_fscache_release_page(struct page *page,
+                                            gfp_t gfp) {
+        return 1;
+}
+static inline void v9fs_fscache_invalidate_page(struct page *page) {}
+static inline int v9fs_readpage_from_fscache(struct inode *inode,
+                                             struct page *page)
+{
+        return -ENOBUFS;
+}
+static inline int v9fs_readpages_from_fscache(struct inode *inode,
+                                              struct address_space *mapping,
+                                              struct list_head *pages,
+                                              unsigned *nr_pages)
+{
+        return -ENOBUFS;
+}
+static inline void v9fs_readpage_to_fscache(struct inode *inode,
+                                            struct page *page)
+{}
+static inline void v9fs_uncache_page(struct inode *inode, struct page *page)
+{}
+static inline void v9fs_vcookie_set_qid(struct inode *inode,
+                                        struct p9_qid *qid)
+{}
+#endif /* CONFIG_9P_FSCACHE */
+#endif /* _9P_CACHE_H */
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index f7003cfac63d..cf62b05e296a 100644
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -34,21 +34,25 @@
 #include <net/9p/transport.h>
 #include "v9fs.h"
 #include "v9fs_vfs.h"
+#include "cache.h"
+static DEFINE_SPINLOCK(v9fs_sessionlist_lock);
+static LIST_HEAD(v9fs_sessionlist);
 /*
-  * Option Parsing (code inspired by NFS code)
+ * Option Parsing (code inspired by NFS code)
-  *  NOTE: each transport will parse its own options
+ *  NOTE: each transport will parse its own options
-  */
+ */
 enum {
        /* Options that take integer arguments */
        Opt_debug, Opt_dfltuid, Opt_dfltgid, Opt_afid,
        /* String options */
-        Opt_uname, Opt_remotename, Opt_trans,
+        Opt_uname, Opt_remotename, Opt_trans, Opt_cache, Opt_cachetag,
        /* Options that take no arguments */
        Opt_nodevmap,
        /* Cache options */
-        Opt_cache_loose,
+        Opt_cache_loose, Opt_fscache,
        /* Access options */
        Opt_access,
        /* Error token */
@@ -63,8 +67,10 @@ static const match_table_t tokens = {
        {Opt_uname, "uname=%s"},
        {Opt_remotename, "aname=%s"},
        {Opt_nodevmap, "nodevmap"},
-        {Opt_cache_loose, "cache=loose"},
+        {Opt_cache, "cache=%s"},
        {Opt_cache_loose, "loose"},
+        {Opt_fscache, "fscache"},
+        {Opt_cachetag, "cachetag=%s"},
        {Opt_access, "access=%s"},
        {Opt_err, NULL}
 };
@@ -89,16 +95,16 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
        v9ses->afid = ~0;
        v9ses->debug = 0;
        v9ses->cache = 0;
+#ifdef CONFIG_9P_FSCACHE
+        v9ses->cachetag = NULL;
+#endif
        if (!opts)
                return 0;
        options = kstrdup(opts, GFP_KERNEL);
-        if (!options) {
+        if (!options)
-                P9_DPRINTK(P9_DEBUG_ERROR,
+                goto fail_option_alloc;
-                           "failed to allocate copy of option string\n");
-                return -ENOMEM;
-        }
        while ((p = strsep(&options, ",")) != NULL) {
                int token;
@@ -143,16 +149,33 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
                case Opt_cache_loose:
                        v9ses->cache = CACHE_LOOSE;
                        break;
+                case Opt_fscache:
+                        v9ses->cache = CACHE_FSCACHE;
+                        break;
+                case Opt_cachetag:
+#ifdef CONFIG_9P_FSCACHE
+                        v9ses->cachetag = match_strdup(&args[0]);
+#endif
+                        break;
+                case Opt_cache:
+                        s = match_strdup(&args[0]);
+                        if (!s)
+                                goto fail_option_alloc;
+                        if (strcmp(s, "loose") == 0)
+                                v9ses->cache = CACHE_LOOSE;
+                        else if (strcmp(s, "fscache") == 0)
+                                v9ses->cache = CACHE_FSCACHE;
+                        else
+                                v9ses->cache = CACHE_NONE;
+                        kfree(s);
+                        break;
                case Opt_access:
                        s = match_strdup(&args[0]);
-                        if (!s) {
+                        if (!s)
-                                P9_DPRINTK(P9_DEBUG_ERROR,
+                                goto fail_option_alloc;
-                                           "failed to allocate copy"
-                                           " of option argument\n");
-                                ret = -ENOMEM;
-                                break;
-                        }
                        v9ses->flags &= ~V9FS_ACCESS_MASK;
                        if (strcmp(s, "user") == 0)
                                v9ses->flags |= V9FS_ACCESS_USER;
@@ -173,6 +196,11 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
        }
        kfree(options);
        return ret;
+fail_option_alloc:
+        P9_DPRINTK(P9_DEBUG_ERROR,
+                   "failed to allocate copy of option argument\n");
+        return -ENOMEM;
 }
 /**
@@ -200,6 +228,10 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses,
                return ERR_PTR(-ENOMEM);
        }
+        spin_lock(&v9fs_sessionlist_lock);
+        list_add(&v9ses->slist, &v9fs_sessionlist);
+        spin_unlock(&v9fs_sessionlist_lock);
        v9ses->flags = V9FS_EXTENDED | V9FS_ACCESS_USER;
        strcpy(v9ses->uname, V9FS_DEFUSER);
        strcpy(v9ses->aname, V9FS_DEFANAME);
@@ -249,6 +281,11 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses,
        else
                fid->uid = ~0;
+#ifdef CONFIG_9P_FSCACHE
+        /* register the session for caching */
+        v9fs_cache_session_get_cookie(v9ses);
+#endif
        return fid;
 error:
@@ -268,8 +305,18 @@ void v9fs_session_close(struct v9fs_session_info *v9ses)
                v9ses->clnt = NULL;
        }
+#ifdef CONFIG_9P_FSCACHE
+        if (v9ses->fscache) {
+                v9fs_cache_session_put_cookie(v9ses);
+                kfree(v9ses->cachetag);
+        }
+#endif
        __putname(v9ses->uname);
        __putname(v9ses->aname);
+        spin_lock(&v9fs_sessionlist_lock);
+        list_del(&v9ses->slist);
+        spin_unlock(&v9fs_sessionlist_lock);
 }
 /**
@@ -286,25 +333,132 @@ void v9fs_session_cancel(struct v9fs_session_info *v9ses) {
 extern int v9fs_error_init(void);
+static struct kobject *v9fs_kobj;
+#ifdef CONFIG_9P_FSCACHE
 /**
- * v9fs_init - Initialize module
+ * caches_show - list caches associated with a session
+ *
+ * Returns the size of buffer written.
+ */
+static ssize_t caches_show(struct kobject *kobj,
+                           struct kobj_attribute *attr,
+                           char *buf)
+{
+        ssize_t n = 0, count = 0, limit = PAGE_SIZE;
+        struct v9fs_session_info *v9ses;
+        spin_lock(&v9fs_sessionlist_lock);
+        list_for_each_entry(v9ses, &v9fs_sessionlist, slist) {
+                if (v9ses->cachetag) {
+                        n = snprintf(buf, limit, "%s\n", v9ses->cachetag);
+                        if (n < 0) {
+                                count = n;
+                                break;
+                        }
+                        count += n;
+                        limit -= n;
+                }
+        }
+        spin_unlock(&v9fs_sessionlist_lock);
+        return count;
+}
+static struct kobj_attribute v9fs_attr_cache = __ATTR_RO(caches);
+#endif /* CONFIG_9P_FSCACHE */
+static struct attribute *v9fs_attrs[] = {
+#ifdef CONFIG_9P_FSCACHE
+        &v9fs_attr_cache.attr,
+#endif
+        NULL,
+};
+static struct attribute_group v9fs_attr_group = {
+        .attrs = v9fs_attrs,
+};
+/**
+ * v9fs_sysfs_init - Initialize the v9fs sysfs interface
+ *
+ */
+static int v9fs_sysfs_init(void)
+{
+        v9fs_kobj = kobject_create_and_add("9p", fs_kobj);
+        if (!v9fs_kobj)
+                return -ENOMEM;
+        if (sysfs_create_group(v9fs_kobj, &v9fs_attr_group)) {
+                kobject_put(v9fs_kobj);
+                return -ENOMEM;
+        }
+        return 0;
+}
+/**
+ * v9fs_sysfs_cleanup - Unregister the v9fs sysfs interface
+ *
+ */
+static void v9fs_sysfs_cleanup(void)
+{
+        sysfs_remove_group(v9fs_kobj, &v9fs_attr_group);
+        kobject_put(v9fs_kobj);
+}
+/**
+ * init_v9fs - Initialize module
 *
 */
 static int __init init_v9fs(void)
 {
+        int err;
        printk(KERN_INFO "Installing v9fs 9p2000 file system support\n");
        /* TODO: Setup list of registered trasnport modules */
-        return register_filesystem(&v9fs_fs_type);
+        err = register_filesystem(&v9fs_fs_type);
+        if (err < 0) {
+                printk(KERN_ERR "Failed to register filesystem\n");
+                return err;
+        }
+        err = v9fs_cache_register();
+        if (err < 0) {
+                printk(KERN_ERR "Failed to register v9fs for caching\n");
+                goto out_fs_unreg;
+        }
+        err = v9fs_sysfs_init();
+        if (err < 0) {
+                printk(KERN_ERR "Failed to register with sysfs\n");
+                goto out_sysfs_cleanup;
+        }
+        return 0;
+out_sysfs_cleanup:
+        v9fs_sysfs_cleanup();
+out_fs_unreg:
+        unregister_filesystem(&v9fs_fs_type);
+        return err;
 }
 /**
- * v9fs_init - shutdown module
+ * exit_v9fs - shutdown module
 *
 */
 static void __exit exit_v9fs(void)
 {
+        v9fs_sysfs_cleanup();
+        v9fs_cache_unregister();
        unregister_filesystem(&v9fs_fs_type);
 }
diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h
index 38762bf102a9..019f4ccb70c1 100644
--- a/fs/9p/v9fs.h
+++ b/fs/9p/v9fs.h
@@ -51,6 +51,7 @@ enum p9_session_flags {
 enum p9_cache_modes {
        CACHE_NONE,
        CACHE_LOOSE,
+        CACHE_FSCACHE,
 };
 /**
@@ -60,6 +61,8 @@ enum p9_cache_modes {
 * @debug: debug level
 * @afid: authentication handle
 * @cache: cache mode of type &p9_cache_modes
+ * @cachetag: the tag of the cache associated with this session
+ * @fscache: session cookie associated with FS-Cache
 * @options: copy of options string given by user
 * @uname: string user name to mount hierarchy as
 * @aname: mount specifier for remote hierarchy
@@ -68,7 +71,7 @@ enum p9_cache_modes {
 * @dfltgid: default numeric groupid to mount hierarchy as
 * @uid: if %V9FS_ACCESS_SINGLE, the numeric uid which mounted the hierarchy
 * @clnt: reference to 9P network client instantiated for this session
- * @debugfs_dir: reference to debugfs_dir which can be used for add'l debug
+ * @slist: reference to list of registered 9p sessions
 *
 * This structure holds state for each session instance established during
 * a sys_mount() .
@@ -84,6 +87,10 @@ struct v9fs_session_info {
        unsigned short debug;
        unsigned int afid;
        unsigned int cache;
+#ifdef CONFIG_9P_FSCACHE
+        char *cachetag;
+        struct fscache_cookie *fscache;
+#endif
        char *uname;            /* user name to mount as */
        char *aname;            /* name of remote hierarchy being mounted */
@@ -92,11 +99,9 @@ struct v9fs_session_info {
        unsigned int dfltgid;   /* default gid for legacy support */
        u32 uid;                /* if ACCESS_SINGLE, the uid that has access */
        struct p9_client *clnt; /* 9p client */
-        struct dentry *debugfs_dir;
+        struct list_head slist; /* list of sessions registered with v9fs */
 };
-extern struct dentry *v9fs_debugfs_root;
 struct p9_fid *v9fs_session_init(struct v9fs_session_info *, const char *,
                                                                        char *);
 void v9fs_session_close(struct v9fs_session_info *v9ses);
diff --git a/fs/9p/v9fs_vfs.h b/fs/9p/v9fs_vfs.h
index f0c7de78e205..3a7560e35865 100644
--- a/fs/9p/v9fs_vfs.h
+++ b/fs/9p/v9fs_vfs.h
@@ -44,7 +44,13 @@ extern const struct file_operations v9fs_dir_operations;
 extern const struct dentry_operations v9fs_dentry_operations;
 extern const struct dentry_operations v9fs_cached_dentry_operations;
+#ifdef CONFIG_9P_FSCACHE
+struct inode *v9fs_alloc_inode(struct super_block *sb);
+void v9fs_destroy_inode(struct inode *inode);
+#endif
 struct inode *v9fs_get_inode(struct super_block *sb, int mode);
+void v9fs_clear_inode(struct inode *inode);
 ino_t v9fs_qid2ino(struct p9_qid *qid);
 void v9fs_stat2inode(struct p9_wstat *, struct inode *, struct super_block *);
 int v9fs_dir_release(struct inode *inode, struct file *filp);
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
index 92828281a30b..90e38449f4b3 100644
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
@@ -38,6 +38,7 @@
 #include "v9fs.h"
 #include "v9fs_vfs.h"
+#include "cache.h"
 /**
 * v9fs_vfs_readpage - read an entire page in from 9P
@@ -52,18 +53,31 @@ static int v9fs_vfs_readpage(struct file *filp, struct page *page)
        int retval;
        loff_t offset;
        char *buffer;
+        struct inode *inode;
+        inode = page->mapping->host;
        P9_DPRINTK(P9_DEBUG_VFS, "\n");
+        BUG_ON(!PageLocked(page));
+        retval = v9fs_readpage_from_fscache(inode, page);
+        if (retval == 0)
+                return retval;
        buffer = kmap(page);
        offset = page_offset(page);
        retval = v9fs_file_readn(filp, buffer, NULL, PAGE_CACHE_SIZE, offset);
-        if (retval < 0)
+        if (retval < 0) {
+                v9fs_uncache_page(inode, page);
                goto done;
+        }
        memset(buffer + retval, 0, PAGE_CACHE_SIZE - retval);
        flush_dcache_page(page);
        SetPageUptodate(page);
+        v9fs_readpage_to_fscache(inode, page);
        retval = 0;
 done:
@@ -72,6 +86,78 @@ done:
        return retval;
 }
+/**
+ * v9fs_vfs_readpages - read a set of pages from 9P
+ *
+ * @filp: file being read
+ * @mapping: the address space
+ * @pages: list of pages to read
+ * @nr_pages: count of pages to read
+ *
+ */
+static int v9fs_vfs_readpages(struct file *filp, struct address_space *mapping,
+                             struct list_head *pages, unsigned nr_pages)
+{
+        int ret = 0;
+        struct inode *inode;
+        inode = mapping->host;
+        P9_DPRINTK(P9_DEBUG_VFS, "inode: %p file: %p\n", inode, filp);
+        ret = v9fs_readpages_from_fscache(inode, mapping, pages, &nr_pages);
+        if (ret == 0)
+                return ret;
+        ret = read_cache_pages(mapping, pages, (void *)v9fs_vfs_readpage, filp);
+        P9_DPRINTK(P9_DEBUG_VFS, "  = %d\n", ret);
+        return ret;
+}
+/**
+ * v9fs_release_page - release the private state associated with a page
+ *
+ * Returns 1 if the page can be released, false otherwise.
+ */
+static int v9fs_release_page(struct page *page, gfp_t gfp)
+{
+        if (PagePrivate(page))
+                return 0;
+        return v9fs_fscache_release_page(page, gfp);
+}
+/**
+ * v9fs_invalidate_page - Invalidate a page completely or partially
+ *
+ * @page: structure to page
+ * @offset: offset in the page
+ */
+static void v9fs_invalidate_page(struct page *page, unsigned long offset)
+{
+        if (offset == 0)
+                v9fs_fscache_invalidate_page(page);
+}
+/**
+ * v9fs_launder_page - Writeback a dirty page
+ * Since the writes go directly to the server, we simply return a 0
+ * here to indicate success.
+ *
+ * Returns 0 on success.
+ */
+static int v9fs_launder_page(struct page *page)
+{
+        return 0;
+}
 const struct address_space_operations v9fs_addr_operations = {
      .readpage = v9fs_vfs_readpage,
+      .readpages = v9fs_vfs_readpages,
+      .releasepage = v9fs_release_page,
+      .invalidatepage = v9fs_invalidate_page,
+      .launder_page = v9fs_launder_page,
 };
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 68bf2af6c389..3902bf43a088 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -32,6 +32,7 @@
 #include <linux/string.h>
 #include <linux/inet.h>
 #include <linux/list.h>
+#include <linux/pagemap.h>
 #include <asm/uaccess.h>
 #include <linux/idr.h>
 #include <net/9p/9p.h>
@@ -40,6 +41,7 @@
 #include "v9fs.h"
 #include "v9fs_vfs.h"
 #include "fid.h"
+#include "cache.h"
 static const struct file_operations v9fs_cached_file_operations;
@@ -72,7 +74,7 @@ int v9fs_file_open(struct inode *inode, struct file *file)
                        return err;
                }
                if (omode & P9_OTRUNC) {
-                        inode->i_size = 0;
+                        i_size_write(inode, 0);
                        inode->i_blocks = 0;
                }
                if ((file->f_flags & O_APPEND) && (!v9fs_extended(v9ses)))
@@ -85,6 +87,10 @@ int v9fs_file_open(struct inode *inode, struct file *file)
                /* enable cached file options */
                if(file->f_op == &v9fs_file_operations)
                        file->f_op = &v9fs_cached_file_operations;
+#ifdef CONFIG_9P_FSCACHE
+                v9fs_cache_inode_set_cookie(inode, file);
+#endif
        }
        return 0;
@@ -210,6 +216,7 @@ v9fs_file_write(struct file *filp, const char __user * data,
        struct p9_client *clnt;
        struct inode *inode = filp->f_path.dentry->d_inode;
        int origin = *offset;
+        unsigned long pg_start, pg_end;
        P9_DPRINTK(P9_DEBUG_VFS, "data %p count %d offset %x\n", data,
                (int)count, (int)*offset);
@@ -225,7 +232,7 @@ v9fs_file_write(struct file *filp, const char __user * data,
                if (count < rsize)
                        rsize = count;
-                n = p9_client_write(fid, NULL, data+total, *offset+total,
+                n = p9_client_write(fid, NULL, data+total, origin+total,
                                                                        rsize);
                if (n <= 0)
                        break;
@@ -234,14 +241,14 @@ v9fs_file_write(struct file *filp, const char __user * data,
        } while (count > 0);
        if (total > 0) {
-                invalidate_inode_pages2_range(inode->i_mapping, origin,
+                pg_start = origin >> PAGE_CACHE_SHIFT;
-                                                                origin+total);
+                pg_end = (origin + total - 1) >> PAGE_CACHE_SHIFT;
+                if (inode->i_mapping && inode->i_mapping->nrpages)
+                        invalidate_inode_pages2_range(inode->i_mapping,
+                                                      pg_start, pg_end);
                *offset += total;
-        }
+                i_size_write(inode, i_size_read(inode) + total);
+                inode->i_blocks = (i_size_read(inode) + 512 - 1) >> 9;
-        if (*offset > inode->i_size) {
-                inode->i_size = *offset;
-                inode->i_blocks = (inode->i_size + 512 - 1) >> 9;
        }
        if (n < 0)
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 06a223d50a81..5947628aefef 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -40,6 +40,7 @@
 #include "v9fs.h"
 #include "v9fs_vfs.h"
 #include "fid.h"
+#include "cache.h"
 static const struct inode_operations v9fs_dir_inode_operations;
 static const struct inode_operations v9fs_dir_inode_operations_ext;
@@ -197,6 +198,39 @@ v9fs_blank_wstat(struct p9_wstat *wstat)
        wstat->extension = NULL;
 }
+#ifdef CONFIG_9P_FSCACHE
+/**
+ * v9fs_alloc_inode - helper function to allocate an inode
+ * This callback is executed before setting up the inode so that we
+ * can associate a vcookie with each inode.
+ *
+ */
+struct inode *v9fs_alloc_inode(struct super_block *sb)
+{
+        struct v9fs_cookie *vcookie;
+        vcookie = (struct v9fs_cookie *)kmem_cache_alloc(vcookie_cache,
+                                                         GFP_KERNEL);
+        if (!vcookie)
+                return NULL;
+        vcookie->fscache = NULL;
+        vcookie->qid = NULL;
+        spin_lock_init(&vcookie->lock);
+        return &vcookie->inode;
+}
+/**
+ * v9fs_destroy_inode - destroy an inode
+ *
+ */
+void v9fs_destroy_inode(struct inode *inode)
+{
+        kmem_cache_free(vcookie_cache, v9fs_inode2cookie(inode));
+}
+#endif
 /**
 * v9fs_get_inode - helper function to setup an inode
 * @sb: superblock
@@ -326,6 +360,21 @@ error:
 }
 */
+/**
+ * v9fs_clear_inode - release an inode
+ * @inode: inode to release
+ *
+ */
+void v9fs_clear_inode(struct inode *inode)
+{
+        filemap_fdatawrite(inode->i_mapping);
+#ifdef CONFIG_9P_FSCACHE
+        v9fs_cache_inode_put_cookie(inode);
+#endif
+}
 /**
 * v9fs_inode_from_fid - populate an inode by issuing a attribute request
 * @v9ses: session information
@@ -356,8 +405,14 @@ v9fs_inode_from_fid(struct v9fs_session_info *v9ses, struct p9_fid *fid,
        v9fs_stat2inode(st, ret, sb);
        ret->i_ino = v9fs_qid2ino(&st->qid);
+#ifdef CONFIG_9P_FSCACHE
+        v9fs_vcookie_set_qid(ret, &st->qid);
+        v9fs_cache_inode_get_cookie(ret);
+#endif
        p9stat_free(st);
        kfree(st);
        return ret;
 error:
@@ -751,7 +806,7 @@ v9fs_vfs_getattr(struct vfsmount *mnt, struct dentry *dentry,
        P9_DPRINTK(P9_DEBUG_VFS, "dentry: %p\n", dentry);
        err = -EPERM;
        v9ses = v9fs_inode2v9ses(dentry->d_inode);
-        if (v9ses->cache == CACHE_LOOSE)
+        if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE)
                return simple_getattr(mnt, dentry, stat);
        fid = v9fs_fid_lookup(dentry);
@@ -872,10 +927,10 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode,
        } else
                inode->i_rdev = 0;
-        inode->i_size = stat->length;
+        i_size_write(inode, stat->length);
        /* not real number of blocks, but 512 byte ones ... */
-        inode->i_blocks = (inode->i_size + 512 - 1) >> 9;
+        inode->i_blocks = (i_size_read(inode) + 512 - 1) >> 9;
 }
 /**
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index 8961f1a8f668..14a86448572c 100644
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -44,21 +44,9 @@
 #include "v9fs_vfs.h"
 #include "fid.h"
-static void v9fs_clear_inode(struct inode *);
 static const struct super_operations v9fs_super_ops;
 /**
- * v9fs_clear_inode - release an inode
- * @inode: inode to release
- *
- */
-static void v9fs_clear_inode(struct inode *inode)
-{
-        filemap_fdatawrite(inode->i_mapping);
-}
-/**
 * v9fs_set_super - set the superblock
 * @s: super block
 * @data: file system specific data
@@ -220,6 +208,10 @@ v9fs_umount_begin(struct super_block *sb)
 }
 static const struct super_operations v9fs_super_ops = {
+#ifdef CONFIG_9P_FSCACHE
+        .alloc_inode = v9fs_alloc_inode,
+        .destroy_inode = v9fs_destroy_inode,
+#endif
        .statfs = simple_statfs,
        .clear_inode = v9fs_clear_inode,
        .show_options = generic_show_options,
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index c3ac18054057..247436c10deb 100644
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -12,7 +12,6 @@
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <linux/namei.h>
-#include <linux/utsname.h>
 #include <linux/mm.h>
 #include <linux/xattr.h>
 #include <linux/posix_acl.h>
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
index 0336f2beacde..b583ab0a4cbb 100644
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -8,7 +8,6 @@
 #include <linux/types.h>
 #include <linux/sched.h>
-#include <linux/utsname.h>
 #include <linux/nfs.h>
 #include <linux/sunrpc/xdr.h>
diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c
index e1d528653192..ad9dbbc9145d 100644
--- a/fs/lockd/xdr4.c
+++ b/fs/lockd/xdr4.c
@@ -9,7 +9,6 @@
 #include <linux/types.h>
 #include <linux/sched.h>
-#include <linux/utsname.h>
 #include <linux/nfs.h>
 #include <linux/sunrpc/xdr.h>
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 152025358dad..63976c0ccc25 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -648,8 +648,6 @@ static int nfs_start_lockd(struct nfs_server *server)
                .hostname       = clp->cl_hostname,
                .address        = (struct sockaddr *)&clp->cl_addr,
                .addrlen        = clp->cl_addrlen,
-                .protocol       = server->flags & NFS_MOUNT_TCP ?
-                                                IPPROTO_TCP : IPPROTO_UDP,
                .nfs_version    = clp->rpc_ops->version,
                .noresvport     = server->flags & NFS_MOUNT_NORESVPORT ?
                                        1 : 0,
@@ -660,6 +658,14 @@ static int nfs_start_lockd(struct nfs_server *server)
        if (server->flags & NFS_MOUNT_NONLM)
                return 0;
+        switch (clp->cl_proto) {
+                default:
+                        nlm_init.protocol = IPPROTO_TCP;
+                        break;
+                case XPRT_TRANSPORT_UDP:
+                        nlm_init.protocol = IPPROTO_UDP;
+        }
        host = nlmclnt_init(&nlm_init);
        if (IS_ERR(host))
                return PTR_ERR(host);
@@ -787,7 +793,7 @@ static int nfs_init_server(struct nfs_server *server,
        dprintk("--> nfs_init_server()\n");
 #ifdef CONFIG_NFS_V3
-        if (data->flags & NFS_MOUNT_VER3)
+        if (data->version == 3)
                cl_init.rpc_ops = &nfs_v3_clientops;
 #endif
@@ -964,6 +970,7 @@ static void nfs_server_copy_userdata(struct nfs_server *target, struct nfs_serve
        target->acdirmin = source->acdirmin;
        target->acdirmax = source->acdirmax;
        target->caps = source->caps;
+        target->options = source->options;
 }
 /*
diff --git a/fs/nfs/fscache.c b/fs/nfs/fscache.c
index 379be678cb7e..70fad69eb959 100644
--- a/fs/nfs/fscache.c
+++ b/fs/nfs/fscache.c
@@ -58,17 +58,34 @@ void nfs_fscache_release_client_cookie(struct nfs_client *clp)
 /*
 * Get the cache cookie for an NFS superblock.  We have to handle
 * uniquification here because the cache doesn't do it for us.
+ *
+ * The default uniquifier is just an empty string, but it may be overridden
+ * either by the 'fsc=xxx' option to mount, or by inheriting it from the parent
+ * superblock across an automount point of some nature.
 */
-void nfs_fscache_get_super_cookie(struct super_block *sb,
+void nfs_fscache_get_super_cookie(struct super_block *sb, const char *uniq,
-                                  struct nfs_parsed_mount_data *data)
+                                  struct nfs_clone_mount *mntdata)
 {
        struct nfs_fscache_key *key, *xkey;
        struct nfs_server *nfss = NFS_SB(sb);
        struct rb_node **p, *parent;
-        const char *uniq = data->fscache_uniq ?: "";
        int diff, ulen;
-        ulen = strlen(uniq);
+        if (uniq) {
+                ulen = strlen(uniq);
+        } else if (mntdata) {
+                struct nfs_server *mnt_s = NFS_SB(mntdata->sb);
+                if (mnt_s->fscache_key) {
+                        uniq = mnt_s->fscache_key->key.uniquifier;
+                        ulen = mnt_s->fscache_key->key.uniq_len;
+                }
+        }
+        if (!uniq) {
+                uniq = "";
+                ulen = 1;
+        }
        key = kzalloc(sizeof(*key) + ulen, GFP_KERNEL);
        if (!key)
                return;
diff --git a/fs/nfs/fscache.h b/fs/nfs/fscache.h
index 6e809bb0ff08..b9c572d0679f 100644
--- a/fs/nfs/fscache.h
+++ b/fs/nfs/fscache.h
@@ -74,7 +74,8 @@ extern void nfs_fscache_get_client_cookie(struct nfs_client *);
 extern void nfs_fscache_release_client_cookie(struct nfs_client *);
 extern void nfs_fscache_get_super_cookie(struct super_block *,
-                                         struct nfs_parsed_mount_data *);
+                                         const char *,
+                                         struct nfs_clone_mount *);
 extern void nfs_fscache_release_super_cookie(struct super_block *);
 extern void nfs_fscache_init_inode_cookie(struct inode *);
@@ -173,7 +174,8 @@ static inline void nfs_fscache_release_client_cookie(struct nfs_client *clp) {}
 static inline void nfs_fscache_get_super_cookie(
        struct super_block *sb,
-        struct nfs_parsed_mount_data *data)
+        const char *uniq,
+        struct nfs_clone_mount *mntdata)
 {
 }
 static inline void nfs_fscache_release_super_cookie(struct super_block *sb) {}
diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c
index c862c9340f9a..5e078b222b4e 100644
--- a/fs/nfs/nfs2xdr.c
+++ b/fs/nfs/nfs2xdr.c
@@ -13,7 +13,6 @@
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
-#include <linux/utsname.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/in.h>
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index ee6a13f05443..3f8881d1a050 100644
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -7,7 +7,6 @@
 */
 #include <linux/mm.h>
-#include <linux/utsname.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/sunrpc/clnt.h>
diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c
index 35869a4921f1..5fe5492fbd29 100644
--- a/fs/nfs/nfs3xdr.c
+++ b/fs/nfs/nfs3xdr.c
@@ -10,7 +10,6 @@
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
-#include <linux/utsname.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/in.h>
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index be6544aef41f..ed7c269e2514 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -36,7 +36,6 @@
 */
 #include <linux/mm.h>
-#include <linux/utsname.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/string.h>
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index cfc30d362f94..83ad47cbdd8a 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -39,7 +39,6 @@
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
-#include <linux/utsname.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/in.h>
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 7be72d90d49d..ef583854d8d0 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -32,7 +32,6 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/mm.h>
-#include <linux/utsname.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/in.h>
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index f1cc0587cfef..810770f96816 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -728,6 +728,27 @@ static void nfs_umount_begin(struct super_block *sb)
        unlock_kernel();
 }
+static struct nfs_parsed_mount_data *nfs_alloc_parsed_mount_data(int flags)
+{
+        struct nfs_parsed_mount_data *data;
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        if (data) {
+                data->flags             = flags;
+                data->rsize             = NFS_MAX_FILE_IO_SIZE;
+                data->wsize             = NFS_MAX_FILE_IO_SIZE;
+                data->acregmin          = NFS_DEF_ACREGMIN;
+                data->acregmax          = NFS_DEF_ACREGMAX;
+                data->acdirmin          = NFS_DEF_ACDIRMIN;
+                data->acdirmax          = NFS_DEF_ACDIRMAX;
+                data->nfs_server.port   = NFS_UNSPEC_PORT;
+                data->auth_flavors[0]   = RPC_AUTH_UNIX;
+                data->auth_flavor_len   = 1;
+                data->minorversion      = 0;
+        }
+        return data;
+}
 /*
 * Sanity-check a server address provided by the mount command.
 *
@@ -1430,10 +1451,13 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args,
        int status;
        if (args->mount_server.version == 0) {
-                if (args->flags & NFS_MOUNT_VER3)
+                switch (args->version) {
-                        args->mount_server.version = NFS_MNT3_VERSION;
+                        default:
-                else
+                                args->mount_server.version = NFS_MNT3_VERSION;
-                        args->mount_server.version = NFS_MNT_VERSION;
+                                break;
+                        case 2:
+                                args->mount_server.version = NFS_MNT_VERSION;
+                }
        }
        request.version = args->mount_server.version;
@@ -1634,20 +1658,6 @@ static int nfs_validate_mount_data(void *options,
        if (data == NULL)
                goto out_no_data;
-        args->flags             = (NFS_MOUNT_VER3 | NFS_MOUNT_TCP);
-        args->rsize             = NFS_MAX_FILE_IO_SIZE;
-        args->wsize             = NFS_MAX_FILE_IO_SIZE;
-        args->acregmin          = NFS_DEF_ACREGMIN;
-        args->acregmax          = NFS_DEF_ACREGMAX;
-        args->acdirmin          = NFS_DEF_ACDIRMIN;
-        args->acdirmax          = NFS_DEF_ACDIRMAX;
-        args->mount_server.port = NFS_UNSPEC_PORT;
-        args->nfs_server.port   = NFS_UNSPEC_PORT;
-        args->nfs_server.protocol = XPRT_TRANSPORT_TCP;
-        args->auth_flavors[0]   = RPC_AUTH_UNIX;
-        args->auth_flavor_len   = 1;
-        args->minorversion      = 0;
        switch (data->version) {
        case 1:
                data->namlen = 0;
@@ -1778,7 +1788,7 @@ static int nfs_validate_mount_data(void *options,
        }
 #ifndef CONFIG_NFS_V3
-        if (args->flags & NFS_MOUNT_VER3)
+        if (args->version == 3)
                goto out_v3_not_compiled;
 #endif /* !CONFIG_NFS_V3 */
@@ -1936,7 +1946,7 @@ static void nfs_fill_super(struct super_block *sb,
        if (data->bsize)
                sb->s_blocksize = nfs_block_size(data->bsize, &sb->s_blocksize_bits);
-        if (server->flags & NFS_MOUNT_VER3) {
+        if (server->nfs_client->rpc_ops->version == 3) {
                /* The VFS shouldn't apply the umask to mode bits. We will do
                 * so ourselves when necessary.
                 */
@@ -1960,7 +1970,7 @@ static void nfs_clone_super(struct super_block *sb,
        sb->s_blocksize = old_sb->s_blocksize;
        sb->s_maxbytes = old_sb->s_maxbytes;
-        if (server->flags & NFS_MOUNT_VER3) {
+        if (server->nfs_client->rpc_ops->version == 3) {
                /* The VFS shouldn't apply the umask to mode bits. We will do
                 * so ourselves when necessary.
                 */
@@ -2094,7 +2104,7 @@ static int nfs_get_sb(struct file_system_type *fs_type,
        };
        int error = -ENOMEM;
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        data = nfs_alloc_parsed_mount_data(NFS_MOUNT_VER3 | NFS_MOUNT_TCP);
        mntfh = kzalloc(sizeof(*mntfh), GFP_KERNEL);
        if (data == NULL || mntfh == NULL)
                goto out_free_fh;
@@ -2144,7 +2154,8 @@ static int nfs_get_sb(struct file_system_type *fs_type,
        if (!s->s_root) {
                /* initial superblock/root creation */
                nfs_fill_super(s, data);
-                nfs_fscache_get_super_cookie(s, data);
+                nfs_fscache_get_super_cookie(
+                        s, data ? data->fscache_uniq : NULL, NULL);
        }
        mntroot = nfs_get_root(s, mntfh);
@@ -2245,6 +2256,7 @@ static int nfs_xdev_get_sb(struct file_system_type *fs_type, int flags,
        if (!s->s_root) {
                /* initial superblock/root creation */
                nfs_clone_super(s, data->sb);
+                nfs_fscache_get_super_cookie(s, NULL, data);
        }
        mntroot = nfs_get_root(s, data->fh);
@@ -2362,18 +2374,7 @@ static int nfs4_validate_mount_data(void *options,
        if (data == NULL)
                goto out_no_data;
-        args->rsize             = NFS_MAX_FILE_IO_SIZE;
-        args->wsize             = NFS_MAX_FILE_IO_SIZE;
-        args->acregmin          = NFS_DEF_ACREGMIN;
-        args->acregmax          = NFS_DEF_ACREGMAX;
-        args->acdirmin          = NFS_DEF_ACDIRMIN;
-        args->acdirmax          = NFS_DEF_ACDIRMAX;
-        args->nfs_server.port   = NFS_UNSPEC_PORT;
-        args->auth_flavors[0]   = RPC_AUTH_UNIX;
-        args->auth_flavor_len   = 1;
        args->version           = 4;
-        args->minorversion      = 0;
        switch (data->version) {
        case 1:
                if (data->host_addrlen > sizeof(args->nfs_server.address))
@@ -2508,7 +2509,8 @@ static int nfs4_remote_get_sb(struct file_system_type *fs_type,
        if (!s->s_root) {
                /* initial superblock/root creation */
                nfs4_fill_super(s);
-                nfs_fscache_get_super_cookie(s, data);
+                nfs_fscache_get_super_cookie(
+                        s, data ? data->fscache_uniq : NULL, NULL);
        }
        mntroot = nfs4_get_root(s, mntfh);
@@ -2656,7 +2658,7 @@ static int nfs4_get_sb(struct file_system_type *fs_type,
        struct nfs_parsed_mount_data *data;
        int error = -ENOMEM;
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        data = nfs_alloc_parsed_mount_data(0);
        if (data == NULL)
                goto out_free_data;
@@ -2741,6 +2743,7 @@ static int nfs4_xdev_get_sb(struct file_system_type *fs_type, int flags,
        if (!s->s_root) {
                /* initial superblock/root creation */
                nfs4_clone_super(s, data->sb);
+                nfs_fscache_get_super_cookie(s, NULL, data);
        }
        mntroot = nfs4_get_root(s, data->fh);
@@ -2822,6 +2825,7 @@ static int nfs4_remote_referral_get_sb(struct file_system_type *fs_type,
        if (!s->s_root) {
                /* initial superblock/root creation */
                nfs4_fill_super(s);
+                nfs_fscache_get_super_cookie(s, NULL, data);
        }
        mntroot = nfs4_get_root(s, &mntfh);
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index cdfa86fa1471..ba2c199592fd 100644
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -38,7 +38,6 @@
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <linux/utsname.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/sunrpc/clnt.h>
diff --git a/fs/ocfs2/dlm/dlmast.c b/fs/ocfs2/dlm/dlmast.c
index 81eff8e58322..01cf8cc3d286 100644
--- a/fs/ocfs2/dlm/dlmast.c
+++ b/fs/ocfs2/dlm/dlmast.c
@@ -30,7 +30,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
-#include <linux/utsname.h>
 #include <linux/init.h>
 #include <linux/sysctl.h>
 #include <linux/random.h>
diff --git a/fs/ocfs2/dlm/dlmconvert.c b/fs/ocfs2/dlm/dlmconvert.c
index 75997b4deaf3..ca96bce50e18 100644
--- a/fs/ocfs2/dlm/dlmconvert.c
+++ b/fs/ocfs2/dlm/dlmconvert.c
@@ -30,7 +30,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
-#include <linux/utsname.h>
 #include <linux/init.h>
 #include <linux/sysctl.h>
 #include <linux/random.h>
diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index c5c88124096d..ca46002ec10e 100644
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -27,7 +27,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
-#include <linux/utsname.h>
 #include <linux/sysctl.h>
 #include <linux/spinlock.h>
 #include <linux/debugfs.h>
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 4d9e6b288dd8..0334000676d3 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -28,7 +28,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
-#include <linux/utsname.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/delay.h>
diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c
index 83a9f2972ac8..437698e9465f 100644
--- a/fs/ocfs2/dlm/dlmlock.c
+++ b/fs/ocfs2/dlm/dlmlock.c
@@ -30,7 +30,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
-#include <linux/utsname.h>
 #include <linux/init.h>
 #include <linux/sysctl.h>
 #include <linux/random.h>
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index f8b653fcd4dd..83bcaf266b35 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -30,7 +30,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
-#include <linux/utsname.h>
 #include <linux/init.h>
 #include <linux/sysctl.h>
 #include <linux/random.h>
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index 43e6e3280569..d9fa3d22e17c 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -30,7 +30,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
-#include <linux/utsname.h>
 #include <linux/init.h>
 #include <linux/sysctl.h>
 #include <linux/random.h>
diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c
index 98569e86c613..52ec020ea78b 100644
--- a/fs/ocfs2/dlm/dlmthread.c
+++ b/fs/ocfs2/dlm/dlmthread.c
@@ -30,7 +30,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
-#include <linux/utsname.h>
 #include <linux/init.h>
 #include <linux/sysctl.h>
 #include <linux/random.h>
diff --git a/fs/ocfs2/dlm/dlmunlock.c b/fs/ocfs2/dlm/dlmunlock.c
index 756f5b0998e0..00f53b2aea76 100644
--- a/fs/ocfs2/dlm/dlmunlock.c
+++ b/fs/ocfs2/dlm/dlmunlock.c
@@ -30,7 +30,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
-#include <linux/utsname.h>
 #include <linux/init.h>
 #include <linux/sysctl.h>
 #include <linux/random.h>
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 24feb449a1dc..4cc3c890a2cd 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -28,7 +28,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
-#include <linux/utsname.h>
 #include <linux/init.h>
 #include <linux/random.h>
 #include <linux/statfs.h>
diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
index 579dd1b1110f..e3421030a69f 100644
--- a/fs/ocfs2/symlink.c
+++ b/fs/ocfs2/symlink.c
@@ -38,7 +38,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/pagemap.h>
-#include <linux/utsname.h>
 #include <linux/namei.h>
 #define MLOG_MASK_PREFIX ML_NAMEI
diff --git a/include/linux/cred.h b/include/linux/cred.h
index fb371601a3b4..4e3387a89cb9 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -176,23 +176,7 @@ extern void __invalid_creds(const struct cred *, const char *, unsigned);
 extern void __validate_process_creds(struct task_struct *,
                                     const char *, unsigned);
-static inline bool creds_are_invalid(const struct cred *cred)
+extern bool creds_are_invalid(const struct cred *cred);
-{
-        if (cred->magic != CRED_MAGIC)
-                return true;
-        if (atomic_read(&cred->usage) < atomic_read(&cred->subscribers))
-                return true;
-#ifdef CONFIG_SECURITY_SELINUX
-        if (selinux_is_enabled()) {
-                if ((unsigned long) cred->security < PAGE_SIZE)
-                        return true;
-                if ((*(u32 *)cred->security & 0xffffff00) ==
-                    (POISON_FREE << 24 | POISON_FREE << 16 | POISON_FREE << 8))
-                        return true;
-        }
-#endif
-        return false;
-}
 static inline void __validate_creds(const struct cred *cred,
                                    const char *file, unsigned line)
diff --git a/include/linux/i2c/adp5588.h b/include/linux/i2c/adp5588.h
new file mode 100644
index 000000000000..fc5db826b48e
--- /dev/null
+++ b/include/linux/i2c/adp5588.h
@@ -0,0 +1,92 @@
+/*
+ * Analog Devices ADP5588 I/O Expander and QWERTY Keypad Controller
+ *
+ * Copyright 2009 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#ifndef _ADP5588_H
+#define _ADP5588_H
+#define DEV_ID 0x00             /* Device ID */
+#define CFG 0x01                /* Configuration Register1 */
+#define INT_STAT 0x02           /* Interrupt Status Register */
+#define KEY_LCK_EC_STAT 0x03    /* Key Lock and Event Counter Register */
+#define Key_EVENTA 0x04         /* Key Event Register A */
+#define Key_EVENTB 0x05         /* Key Event Register B */
+#define Key_EVENTC 0x06         /* Key Event Register C */
+#define Key_EVENTD 0x07         /* Key Event Register D */
+#define Key_EVENTE 0x08         /* Key Event Register E */
+#define Key_EVENTF 0x09         /* Key Event Register F */
+#define Key_EVENTG 0x0A         /* Key Event Register G */
+#define Key_EVENTH 0x0B         /* Key Event Register H */
+#define Key_EVENTI 0x0C         /* Key Event Register I */
+#define Key_EVENTJ 0x0D         /* Key Event Register J */
+#define KP_LCK_TMR 0x0E         /* Keypad Lock1 to Lock2 Timer */
+#define UNLOCK1 0x0F            /* Unlock Key1 */
+#define UNLOCK2 0x10            /* Unlock Key2 */
+#define GPIO_INT_STAT1 0x11     /* GPIO Interrupt Status */
+#define GPIO_INT_STAT2 0x12     /* GPIO Interrupt Status */
+#define GPIO_INT_STAT3 0x13     /* GPIO Interrupt Status */
+#define GPIO_DAT_STAT1 0x14     /* GPIO Data Status, Read twice to clear */
+#define GPIO_DAT_STAT2 0x15     /* GPIO Data Status, Read twice to clear */
+#define GPIO_DAT_STAT3 0x16     /* GPIO Data Status, Read twice to clear */
+#define GPIO_DAT_OUT1 0x17      /* GPIO DATA OUT */
+#define GPIO_DAT_OUT2 0x18      /* GPIO DATA OUT */
+#define GPIO_DAT_OUT3 0x19      /* GPIO DATA OUT */
+#define GPIO_INT_EN1 0x1A       /* GPIO Interrupt Enable */
+#define GPIO_INT_EN2 0x1B       /* GPIO Interrupt Enable */
+#define GPIO_INT_EN3 0x1C       /* GPIO Interrupt Enable */
+#define KP_GPIO1 0x1D           /* Keypad or GPIO Selection */
+#define KP_GPIO2 0x1E           /* Keypad or GPIO Selection */
+#define KP_GPIO3 0x1F           /* Keypad or GPIO Selection */
+#define GPI_EM1 0x20            /* GPI Event Mode 1 */
+#define GPI_EM2 0x21            /* GPI Event Mode 2 */
+#define GPI_EM3 0x22            /* GPI Event Mode 3 */
+#define GPIO_DIR1 0x23          /* GPIO Data Direction */
+#define GPIO_DIR2 0x24          /* GPIO Data Direction */
+#define GPIO_DIR3 0x25          /* GPIO Data Direction */
+#define GPIO_INT_LVL1 0x26      /* GPIO Edge/Level Detect */
+#define GPIO_INT_LVL2 0x27      /* GPIO Edge/Level Detect */
+#define GPIO_INT_LVL3 0x28      /* GPIO Edge/Level Detect */
+#define Debounce_DIS1 0x29      /* Debounce Disable */
+#define Debounce_DIS2 0x2A      /* Debounce Disable */
+#define Debounce_DIS3 0x2B      /* Debounce Disable */
+#define GPIO_PULL1 0x2C         /* GPIO Pull Disable */
+#define GPIO_PULL2 0x2D         /* GPIO Pull Disable */
+#define GPIO_PULL3 0x2E         /* GPIO Pull Disable */
+#define CMP_CFG_STAT 0x30       /* Comparator Configuration and Status Register */
+#define CMP_CONFG_SENS1 0x31    /* Sensor1 Comparator Configuration Register */
+#define CMP_CONFG_SENS2 0x32    /* L2 Light Sensor Reference Level, Output Falling for Sensor 1 */
+#define CMP1_LVL2_TRIP 0x33     /* L2 Light Sensor Hysteresis (Active when Output Rising) for Sensor 1 */
+#define CMP1_LVL2_HYS 0x34      /* L3 Light Sensor Reference Level, Output Falling For Sensor 1 */
+#define CMP1_LVL3_TRIP 0x35     /* L3 Light Sensor Hysteresis (Active when Output Rising) For Sensor 1 */
+#define CMP1_LVL3_HYS 0x36      /* Sensor 2 Comparator Configuration Register */
+#define CMP2_LVL2_TRIP 0x37     /* L2 Light Sensor Reference Level, Output Falling for Sensor 2 */
+#define CMP2_LVL2_HYS 0x38      /* L2 Light Sensor Hysteresis (Active when Output Rising) for Sensor 2 */
+#define CMP2_LVL3_TRIP 0x39     /* L3 Light Sensor Reference Level, Output Falling For Sensor 2 */
+#define CMP2_LVL3_HYS 0x3A      /* L3 Light Sensor Hysteresis (Active when Output Rising) For Sensor 2 */
+#define CMP1_ADC_DAT_R1 0x3B    /* Comparator 1 ADC data Register1 */
+#define CMP1_ADC_DAT_R2 0x3C    /* Comparator 1 ADC data Register2 */
+#define CMP2_ADC_DAT_R1 0x3D    /* Comparator 2 ADC data Register1 */
+#define CMP2_ADC_DAT_R2 0x3E    /* Comparator 2 ADC data Register2 */
+#define ADP5588_DEVICE_ID_MASK  0xF
+/* Put one of these structures in i2c_board_info platform_data */
+#define ADP5588_KEYMAPSIZE      80
+struct adp5588_kpad_platform_data {
+        int rows;                       /* Number of rows */
+        int cols;                       /* Number of columns */
+        const unsigned short *keymap;   /* Pointer to keymap */
+        unsigned short keymapsize;      /* Keymap size */
+        unsigned repeat:1;              /* Enable key repeat */
+        unsigned en_keylock:1;          /* Enable Key Lock feature */
+        unsigned short unlock_key1;     /* Unlock Key 1 */
+        unsigned short unlock_key2;     /* Unlock Key 2 */
+};
+#endif
diff --git a/include/linux/i2c/mcs5000_ts.h b/include/linux/i2c/mcs5000_ts.h
new file mode 100644
index 000000000000..5a117b5ca15e
--- /dev/null
+++ b/include/linux/i2c/mcs5000_ts.h
@@ -0,0 +1,24 @@
+/*
+ * mcs5000_ts.h
+ *
+ * Copyright (C) 2009 Samsung Electronics Co.Ltd
+ * Author: Joonyoung Shim <jy0922.shim@samsung.com>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+#ifndef __LINUX_MCS5000_TS_H
+#define __LINUX_MCS5000_TS_H
+/* platform data for the MELFAS MCS-5000 touchscreen driver */
+struct mcs5000_ts_platform_data {
+        void (*cfg_pin)(void);
+        int x_size;
+        int y_size;
+};
+#endif  /* __LINUX_MCS5000_TS_H */
diff --git a/include/linux/i8042.h b/include/linux/i8042.h
index 7907a72403ee..60c3360ef6ad 100644
--- a/include/linux/i8042.h
+++ b/include/linux/i8042.h
@@ -7,6 +7,7 @@
 * the Free Software Foundation.
 */
+#include <linux/types.h>
 /*
 * Standard commands.
@@ -30,6 +31,35 @@
 #define I8042_CMD_MUX_PFX       0x0090
 #define I8042_CMD_MUX_SEND      0x1090
+struct serio;
+#if defined(CONFIG_SERIO_I8042) || defined(CONFIG_SERIO_I8042_MODULE)
+void i8042_lock_chip(void);
+void i8042_unlock_chip(void);
 int i8042_command(unsigned char *param, int command);
+bool i8042_check_port_owner(const struct serio *);
+#else
+void i8042_lock_chip(void)
+{
+}
+void i8042_unlock_chip(void)
+{
+}
+int i8042_command(unsigned char *param, int command)
+{
+        return -ENOSYS;
+}
+bool i8042_check_port_owner(const struct serio *serio)
+{
+        return false;
+}
+#endif
 #endif
diff --git a/include/linux/input.h b/include/linux/input.h
index 8b3bc3e0d146..0ccfc30cd40f 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -1123,7 +1123,7 @@ struct input_dev {
        struct mutex mutex;
        unsigned int users;
-        int going_away;
+        bool going_away;
        struct device dev;
diff --git a/include/linux/libps2.h b/include/linux/libps2.h
index fcf5fbe6a50c..79603a6c356f 100644
--- a/include/linux/libps2.h
+++ b/include/linux/libps2.h
@@ -44,6 +44,8 @@ struct ps2dev {
 void ps2_init(struct ps2dev *ps2dev, struct serio *serio);
 int ps2_sendbyte(struct ps2dev *ps2dev, unsigned char byte, int timeout);
 void ps2_drain(struct ps2dev *ps2dev, int maxbytes, int timeout);
+void ps2_begin_command(struct ps2dev *ps2dev);
+void ps2_end_command(struct ps2dev *ps2dev);
 int __ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command);
 int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command);
 int ps2_handle_ack(struct ps2dev *ps2dev, unsigned char data);
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 691f59171c6c..5126cceb6ae9 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -57,6 +57,7 @@
 #ifdef __ASSEMBLY__
+#ifndef LINKER_SCRIPT
 #define ALIGN __ALIGN
 #define ALIGN_STR __ALIGN_STR
@@ -66,6 +67,7 @@
  ALIGN; \
  name:
 #endif
+#endif /* LINKER_SCRIPT */
 #ifndef WEAK
 #define WEAK(name)         \
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 7da466ba4b0d..f5cc0898bc53 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -11,6 +11,7 @@
 #include <linux/uio.h>
 #include <asm/byteorder.h>
+#include <asm/unaligned.h>
 #include <linux/scatterlist.h>
 /*
@@ -117,14 +118,14 @@ static inline __be32 *xdr_encode_array(__be32 *p, const void *s, unsigned int le
 static inline __be32 *
 xdr_encode_hyper(__be32 *p, __u64 val)
 {
-        *(__be64 *)p = cpu_to_be64(val);
+        put_unaligned_be64(val, p);
        return p + 2;
 }
 static inline __be32 *
 xdr_decode_hyper(__be32 *p, __u64 *valp)
 {
-        *valp = be64_to_cpup((__be64 *)p);
+        *valp = get_unaligned_be64(p);
        return p + 2;
 }
diff --git a/include/linux/utsname.h b/include/linux/utsname.h
index 3656b300de3a..69f39974c041 100644
--- a/include/linux/utsname.h
+++ b/include/linux/utsname.h
@@ -36,7 +36,6 @@ struct new_utsname {
 #include <linux/kref.h>
 #include <linux/nsproxy.h>
 #include <linux/err.h>
-#include <asm/atomic.h>
 struct uts_namespace {
        struct kref kref;
diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h
index b77c1478c99f..a7fb54808a23 100644
--- a/include/net/9p/9p.h
+++ b/include/net/9p/9p.h
@@ -38,6 +38,8 @@
 * @P9_DEBUG_SLABS: memory management tracing
 * @P9_DEBUG_FCALL: verbose dump of protocol messages
 * @P9_DEBUG_FID: fid allocation/deallocation tracking
+ * @P9_DEBUG_PKT: packet marshalling/unmarshalling
+ * @P9_DEBUG_FSC: FS-cache tracing
 *
 * These flags are passed at mount time to turn on various levels of
 * verbosity and tracing which will be output to the system logs.
@@ -54,6 +56,7 @@ enum p9_debug_flags {
        P9_DEBUG_FCALL =        (1<<8),
        P9_DEBUG_FID =          (1<<9),
        P9_DEBUG_PKT =          (1<<10),
+        P9_DEBUG_FSC =          (1<<11),
 };
 #ifdef CONFIG_NET_9P_DEBUG
diff --git a/init/Kconfig b/init/Kconfig
index 0aa6579504cc..c7bac39d6c61 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1006,14 +1006,6 @@ config SLUB_DEBUG
          SLUB sysfs support. /sys/slab will not exist and there will be
          no support for cache validation etc.
-config STRIP_ASM_SYMS
-        bool "Strip assembler-generated symbols during link"
-        default n
-        help
-          Strip internal assembler-generated symbols during a link (symbols
-          that look like '.Lxxx') so they don't pollute the output of
-          get_wchan() and suchlike.
 config COMPAT_BRK
        bool "Disable heap randomization"
        default y
diff --git a/init/main.c b/init/main.c
index 51695cee1864..7449819a4805 100644
--- a/init/main.c
+++ b/init/main.c
@@ -18,7 +18,6 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
-#include <linux/utsname.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>
diff --git a/kernel/cred.c b/kernel/cred.c
index d7f7a01082eb..dd76cfe5f5b0 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -782,6 +782,25 @@ EXPORT_SYMBOL(set_create_files_as);
 #ifdef CONFIG_DEBUG_CREDENTIALS
+bool creds_are_invalid(const struct cred *cred)
+{
+        if (cred->magic != CRED_MAGIC)
+                return true;
+        if (atomic_read(&cred->usage) < atomic_read(&cred->subscribers))
+                return true;
+#ifdef CONFIG_SECURITY_SELINUX
+        if (selinux_is_enabled()) {
+                if ((unsigned long) cred->security < PAGE_SIZE)
+                        return true;
+                if ((*(u32 *)cred->security & 0xffffff00) ==
+                    (POISON_FREE << 24 | POISON_FREE << 16 | POISON_FREE << 8))
+                        return true;
+        }
+#endif
+        return false;
+}
+EXPORT_SYMBOL(creds_are_invalid);
 /*
 * dump invalid credentials
 */
diff --git a/kernel/kmod.c b/kernel/kmod.c
index 689d20f39305..9fcb53a11f87 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -143,7 +143,6 @@ struct subprocess_info {
 static int ____call_usermodehelper(void *data)
 {
        struct subprocess_info *sub_info = data;
-        enum umh_wait wait = sub_info->wait;
        int retval;
        BUG_ON(atomic_read(&sub_info->cred->usage) != 1);
@@ -185,14 +184,10 @@ static int ____call_usermodehelper(void *data)
         */
        set_user_nice(current, 0);
-        if (wait == UMH_WAIT_EXEC)
-                complete(sub_info->complete);
        retval = kernel_execve(sub_info->path, sub_info->argv, sub_info->envp);
        /* Exec failed? */
-        if (wait != UMH_WAIT_EXEC)
+        sub_info->retval = retval;
-                sub_info->retval = retval;
        do_exit(0);
 }
@@ -271,14 +266,16 @@ static void __call_usermodehelper(struct work_struct *work)
        switch (wait) {
        case UMH_NO_WAIT:
-        case UMH_WAIT_EXEC:
                break;
        case UMH_WAIT_PROC:
                if (pid > 0)
                        break;
                sub_info->retval = pid;
-                break;
+                /* FALLTHROUGH */
+        case UMH_WAIT_EXEC:
+                complete(sub_info->complete);
        }
 }
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 8ba052c86d48..b101cdc4df3f 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -13,7 +13,6 @@
 #include <linux/module.h>
 #include <linux/file.h>
-#include <linux/utsname.h>
 #include <linux/delay.h>
 #include <linux/bitops.h>
 #include <linux/genhd.h>
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 0dfaa47d7cb6..7f4f57bea4ce 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -26,7 +26,6 @@
 #include <linux/proc_fs.h>
 #include <linux/security.h>
 #include <linux/ctype.h>
-#include <linux/utsname.h>
 #include <linux/kmemcheck.h>
 #include <linux/smp_lock.h>
 #include <linux/fs.h>
diff --git a/kernel/uid16.c b/kernel/uid16.c
index 0314501688b9..419209893d87 100644
--- a/kernel/uid16.c
+++ b/kernel/uid16.c
@@ -4,7 +4,6 @@
 */
 #include <linux/mm.h>
-#include <linux/utsname.h>
 #include <linux/mman.h>
 #include <linux/notifier.h>
 #include <linux/reboot.h>
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index d57b12f59c8c..891155817bc6 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -50,6 +50,14 @@ config MAGIC_SYSRQ
          keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
          unless you really know what this hack does.
+config STRIP_ASM_SYMS
+        bool "Strip assembler-generated symbols during link"
+        default n
+        help
+          Strip internal assembler-generated symbols during a link (symbols
+          that look like '.Lxxx') so they don't pollute the output of
+          get_wchan() and suchlike.
 config UNUSED_SYMBOLS
        bool "Enable unused/obsolete exported symbols"
        default y if X86
diff --git a/net/sunrpc/auth_null.c b/net/sunrpc/auth_null.c
index c70dd7f5258e..1db618f56ecb 100644
--- a/net/sunrpc/auth_null.c
+++ b/net/sunrpc/auth_null.c
@@ -8,7 +8,6 @@
 #include <linux/types.h>
 #include <linux/module.h>
-#include <linux/utsname.h>
 #include <linux/sunrpc/clnt.h>
 #ifdef RPC_DEBUG
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 858a443f418f..49278f830367 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -860,7 +860,8 @@ static void rpc_clntdir_depopulate(struct dentry *dentry)
 /**
 * rpc_create_client_dir - Create a new rpc_client directory in rpc_pipefs
- * @path: path from the rpc_pipefs root to the new directory
+ * @dentry: dentry from the rpc_pipefs root to the new directory
+ * @name: &struct qstr for the name
 * @rpc_client: rpc client to associate with this directory
 *
 * This creates a directory at the given @path associated with
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index bee415465754..37c5475ba258 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -773,6 +773,7 @@ static void xs_close(struct rpc_xprt *xprt)
        dprintk("RPC:       xs_close xprt %p\n", xprt);
        xs_reset_transport(transport);
+        xprt->reestablish_timeout = 0;
        smp_mb__before_clear_bit();
        clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);
@@ -1264,6 +1265,12 @@ static void xs_tcp_data_ready(struct sock *sk, int bytes)
        if (xprt->shutdown)
                goto out;
+        /* Any data means we had a useful conversation, so
+         * the we don't need to delay the next reconnect
+         */
+        if (xprt->reestablish_timeout)
+                xprt->reestablish_timeout = 0;
        /* We use rd_desc to pass struct xprt to xs_tcp_data_recv */
        rd_desc.arg.data = xprt;
        do {
@@ -2034,6 +2041,8 @@ static void xs_connect(struct rpc_task *task)
                                   &transport->connect_worker,
                                   xprt->reestablish_timeout);
                xprt->reestablish_timeout <<= 1;
+                if (xprt->reestablish_timeout < XS_TCP_INIT_REEST_TO)
+                        xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
                if (xprt->reestablish_timeout > XS_TCP_MAX_REEST_TO)
                        xprt->reestablish_timeout = XS_TCP_MAX_REEST_TO;
        } else {
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index c29be8f90248..4f9c1908593b 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -83,11 +83,12 @@ TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/)
 # is automatically cleaned up.
 try-run = $(shell set -e;               \
        TMP="$(TMPOUT).$$$$.tmp";       \
+        TMPO="$(TMPOUT).$$$$.o";        \
        if ($(1)) >/dev/null 2>&1;      \
        then echo "$(2)";               \
        else echo "$(3)";               \
        fi;                             \
-        rm -f "$$TMP")
+        rm -f "$$TMP" "$$TMPO")
 # as-option
 # Usage: cflags-y += $(call as-option,-Wa$(comma)-isa=foo,)
@@ -105,12 +106,12 @@ as-instr = $(call try-run,\
 # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)
 cc-option = $(call try-run,\
-        $(CC) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",$(1),$(2))
+        $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",$(1),$(2))
 # cc-option-yn
 # Usage: flag := $(call cc-option-yn,-march=winchip-c6)
 cc-option-yn = $(call try-run,\
-        $(CC) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",y,n)
+        $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",y,n)
 # cc-option-align
 # Prefix align with either -falign or -malign
@@ -130,10 +131,15 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \
 # Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
 cc-ifversion = $(shell [ $(call cc-version, $(CC)) $(1) $(2) ] && echo $(3))
+# cc-ldoption
+# Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
+cc-ldoption = $(call try-run,\
+        $(CC) $(1) -nostdlib -xc /dev/null -o "$$TMP",$(1),$(2))
 # ld-option
-# Usage: ldflags += $(call ld-option, -Wl$(comma)--hash-style=both)
+# Usage: LDFLAGS += $(call ld-option, -X)
 ld-option = $(call try-run,\
-        $(CC) $(1) -nostdlib -xc /dev/null -o "$$TMP",$(1),$(2))
+        $(CC) /dev/null -c -o "$$TMPO" ; $(LD) $(1) "$$TMPO" -o "$$TMP",$(1),$(2))
 ######
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 5c4b7a400c18..341b58902ffc 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -206,7 +206,7 @@ cmd_modversions =							\
 endif
 ifdef CONFIG_FTRACE_MCOUNT_RECORD
-cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
+cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
        "$(if $(CONFIG_64BIT),64,32)" \
        "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" \
        "$(if $(part-of-module),1,0)" "$(@)";
@@ -216,6 +216,7 @@ define rule_cc_o_c
        $(call echo-cmd,checksrc) $(cmd_checksrc)                         \
        $(call echo-cmd,cc_o_c) $(cmd_cc_o_c);                            \
        $(cmd_modversions)                                                \
+        $(call echo-cmd,record_mcount)                                    \
        $(cmd_record_mcount)                                              \
        scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' >    \
                                                      $(dot-target).tmp;  \
@@ -269,7 +270,8 @@ targets += $(extra-y) $(MAKECMDGOALS) $(always)
 # Linker scripts preprocessor (.lds.S -> .lds)
 # ---------------------------------------------------------------------------
 quiet_cmd_cpp_lds_S = LDS     $@
-      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -D__ASSEMBLY__ -o $@ $<
+      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \
+                             -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
 $(obj)/%.lds: $(src)/%.lds.S FORCE
        $(call if_changed_dep,cpp_lds_S)
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index 99ca7a698687..79ab973fb43a 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -71,7 +71,7 @@ FILELINE * docsection;
 static char *srctree, *kernsrctree;
-void usage (void)
+static void usage (void)
 {
        fprintf(stderr, "Usage: docproc {doc|depend} file\n");
        fprintf(stderr, "Input is read from file.tmpl. Output is sent to stdout\n");
@@ -84,7 +84,7 @@ void usage (void)
 /*
 * Execute kernel-doc with parameters given in svec
 */
-void exec_kernel_doc(char **svec)
+static void exec_kernel_doc(char **svec)
 {
        pid_t pid;
        int ret;
@@ -129,7 +129,7 @@ struct symfile
 struct symfile symfilelist[MAXFILES];
 int symfilecnt = 0;
-void add_new_symbol(struct symfile *sym, char * symname)
+static void add_new_symbol(struct symfile *sym, char * symname)
 {
        sym->symbollist =
          realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *));
@@ -137,14 +137,14 @@ void add_new_symbol(struct symfile *sym, char * symname)
 }
 /* Add a filename to the list */
-struct symfile * add_new_file(char * filename)
+static struct symfile * add_new_file(char * filename)
 {
        symfilelist[symfilecnt++].filename = strdup(filename);
        return &symfilelist[symfilecnt - 1];
 }
 /* Check if file already are present in the list */
-struct symfile * filename_exist(char * filename)
+static struct symfile * filename_exist(char * filename)
 {
        int i;
        for (i=0; i < symfilecnt; i++)
@@ -157,20 +157,20 @@ struct symfile * filename_exist(char * filename)
 * List all files referenced within the template file.
 * Files are separated by tabs.
 */
-void adddep(char * file)                   { printf("\t%s", file); }
+static void adddep(char * file)            { printf("\t%s", file); }
-void adddep2(char * file, char * line)     { line = line; adddep(file); }
+static void adddep2(char * file, char * line)     { line = line; adddep(file); }
-void noaction(char * line)                 { line = line; }
+static void noaction(char * line)                  { line = line; }
-void noaction2(char * file, char * line)   { file = file; line = line; }
+static void noaction2(char * file, char * line)   { file = file; line = line; }
 /* Echo the line without further action */
-void printline(char * line)               { printf("%s", line); }
+static void printline(char * line)               { printf("%s", line); }
 /*
 * Find all symbols in filename that are exported with EXPORT_SYMBOL &
 * EXPORT_SYMBOL_GPL (& EXPORT_SYMBOL_GPL_FUTURE implicitly).
 * All symbols located are stored in symfilelist.
 */
-void find_export_symbols(char * filename)
+static void find_export_symbols(char * filename)
 {
        FILE * fp;
        struct symfile *sym;
@@ -227,7 +227,7 @@ void find_export_symbols(char * filename)
 * intfunc uses -nofunction
 * extfunc uses -function
 */
-void docfunctions(char * filename, char * type)
+static void docfunctions(char * filename, char * type)
 {
        int i,j;
        int symcnt = 0;
@@ -258,15 +258,15 @@ void docfunctions(char * filename, char * type)
        fflush(stdout);
        free(vec);
 }
-void intfunc(char * filename) { docfunctions(filename, NOFUNCTION); }
+static void intfunc(char * filename) {  docfunctions(filename, NOFUNCTION); }
-void extfunc(char * filename) { docfunctions(filename, FUNCTION);   }
+static void extfunc(char * filename) { docfunctions(filename, FUNCTION);   }
 /*
 * Document specific function(s) in a file.
 * Call kernel-doc with the following parameters:
 * kernel-doc -docbook -function function1 [-function function2]
 */
-void singfunc(char * filename, char * line)
+static void singfunc(char * filename, char * line)
 {
        char *vec[200]; /* Enough for specific functions */
        int i, idx = 0;
@@ -297,7 +297,7 @@ void singfunc(char * filename, char * line)
 * Call kernel-doc with the following parameters:
 * kernel-doc -docbook -function "doc section" filename
 */
-void docsect(char *filename, char *line)
+static void docsect(char *filename, char *line)
 {
        char *vec[6]; /* kerneldoc -docbook -function "section" file NULL */
        char *s;
@@ -324,7 +324,7 @@ void docsect(char *filename, char *line)
 * 5) Lines containing !P
 * 6) Default lines - lines not matching the above
 */
-void parse_file(FILE *infile)
+static void parse_file(FILE *infile)
 {
        char line[MAXLINESZ];
        char * s;
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 8ab448611680..6bf21f83837d 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -124,7 +124,7 @@ char *target;
 char *depfile;
 char *cmdline;
-void usage(void)
+static void usage(void)
 {
        fprintf(stderr, "Usage: fixdep <depfile> <target> <cmdline>\n");
        exit(1);
@@ -133,7 +133,7 @@ void usage(void)
 /*
 * Print out the commandline prefixed with cmd_<target filename> :=
 */
-void print_cmdline(void)
+static void print_cmdline(void)
 {
        printf("cmd_%s := %s\n\n", target, cmdline);
 }
@@ -146,7 +146,7 @@ int    len_config  = 0;
 * Grow the configuration string to a desired length.
 * Usually the first growth is plenty.
 */
-void grow_config(int len)
+static void grow_config(int len)
 {
        while (len_config + len > size_config) {
                if (size_config == 0)
@@ -162,7 +162,7 @@ void grow_config(int len)
 /*
 * Lookup a value in the configuration string.
 */
-int is_defined_config(const char * name, int len)
+static int is_defined_config(const char * name, int len)
 {
        const char * pconfig;
        const char * plast = str_config + len_config - len;
@@ -178,7 +178,7 @@ int is_defined_config(const char * name, int len)
 /*
 * Add a new value to the configuration string.
 */
-void define_config(const char * name, int len)
+static void define_config(const char * name, int len)
 {
        grow_config(len + 1);
@@ -190,7 +190,7 @@ void define_config(const char * name, int len)
 /*
 * Clear the set of configuration strings.
 */
-void clear_config(void)
+static void clear_config(void)
 {
        len_config = 0;
        define_config("", 0);
@@ -199,7 +199,7 @@ void clear_config(void)
 /*
 * Record the use of a CONFIG_* word.
 */
-void use_config(char *m, int slen)
+static void use_config(char *m, int slen)
 {
        char s[PATH_MAX];
        char *p;
@@ -220,7 +220,7 @@ void use_config(char *m, int slen)
        printf("    $(wildcard include/config/%s.h) \\\n", s);
 }
-void parse_config_file(char *map, size_t len)
+static void parse_config_file(char *map, size_t len)
 {
        int *end = (int *) (map + len);
        /* start at +1, so that p can never be < map */
@@ -254,7 +254,7 @@ void parse_config_file(char *map, size_t len)
 }
 /* test is s ends in sub */
-int strrcmp(char *s, char *sub)
+static int strrcmp(char *s, char *sub)
 {
        int slen = strlen(s);
        int sublen = strlen(sub);
@@ -265,7 +265,7 @@ int strrcmp(char *s, char *sub)
        return memcmp(s + slen - sublen, sub, sublen);
 }
-void do_config_file(char *filename)
+static void do_config_file(char *filename)
 {
        struct stat st;
        int fd;
@@ -296,7 +296,7 @@ void do_config_file(char *filename)
        close(fd);
 }
-void parse_dep_file(void *map, size_t len)
+static void parse_dep_file(void *map, size_t len)
 {
        char *m = map;
        char *end = m + len;
@@ -336,7 +336,7 @@ void parse_dep_file(void *map, size_t len)
        printf("$(deps_%s):\n", target);
 }
-void print_deps(void)
+static void print_deps(void)
 {
        struct stat st;
        int fd;
@@ -368,7 +368,7 @@ void print_deps(void)
        close(fd);
 }
-void traps(void)
+static void traps(void)
 {
        static char test[] __attribute__((aligned(sizeof(int)))) = "CONF";
        int *p = (int *)test;
diff --git a/scripts/basic/hash.c b/scripts/basic/hash.c
index 3299ad7fc8c0..2ef5d3f666b8 100644
--- a/scripts/basic/hash.c
+++ b/scripts/basic/hash.c
@@ -21,7 +21,7 @@ static void usage(void)
 * http://www.cse.yorku.ca/~oz/hash.html
 */
-unsigned int djb2_hash(char *str)
+static unsigned int djb2_hash(char *str)
 {
        unsigned long hash = 5381;
        int c;
@@ -34,7 +34,7 @@ unsigned int djb2_hash(char *str)
        return (unsigned int)(hash & ((1 << DYNAMIC_DEBUG_HASH_BITS) - 1));
 }
-unsigned int r5_hash(char *str)
+static unsigned int r5_hash(char *str)
 {
        unsigned long hash = 0;
        int c;
diff --git a/scripts/checkincludes.pl b/scripts/checkincludes.pl
index 8e6b716c191c..676ddc07d6fa 100755
--- a/scripts/checkincludes.pl
+++ b/scripts/checkincludes.pl
@@ -1,24 +1,85 @@
 #!/usr/bin/perl
 #
-# checkincludes: Find files included more than once in (other) files.
+# checkincludes: find/remove files included more than once
+#
 # Copyright abandoned, 2000, Niels Kristian Bech Jensen <nkbj@image.dk>.
+# Copyright 2009 Luis R. Rodriguez <mcgrof@gmail.com>
+#
+# This script checks for duplicate includes. It also has support
+# to remove them in place. Note that this will not take into
+# consideration macros so you should run this only if you know
+# you do have real dups and do not have them under #ifdef's. You
+# could also just review the results.
+sub usage {
+        print "Usage: checkincludes.pl [-r]\n";
+        print "By default we just warn of duplicates\n";
+        print "To remove duplicated includes in place use -r\n";
+        exit 1;
+}
+my $remove = 0;
+if ($#ARGV < 0) {
+        usage();
+}
+if ($#ARGV >= 1) {
+        if ($ARGV[0] =~ /^-/) {
+                if ($ARGV[0] eq "-r") {
+                        $remove = 1;
+                        shift;
+                } else {
+                        usage();
+                }
+        }
+}
 foreach $file (@ARGV) {
        open(FILE, $file) or die "Cannot open $file: $!.\n";
        my %includedfiles = ();
+        my @file_lines = ();
        while (<FILE>) {
                if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
                        ++$includedfiles{$1};
                }
+                push(@file_lines, $_);
        }
-        
-        foreach $filename (keys %includedfiles) {
+        close(FILE);
-                if ($includedfiles{$filename} > 1) {
-                        print "$file: $filename is included more than once.\n";
+        if (!$remove) {
+                foreach $filename (keys %includedfiles) {
+                        if ($includedfiles{$filename} > 1) {
+                                print "$file: $filename is included more than once.\n";
+                        }
                }
+                next;
        }
+        open(FILE,">$file") || die("Cannot write to $file: $!");
+        my $dups = 0;
+        foreach (@file_lines) {
+                if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
+                        foreach $filename (keys %includedfiles) {
+                                if ($1 eq $filename) {
+                                        if ($includedfiles{$filename} > 1) {
+                                                $includedfiles{$filename}--;
+                                                $dups++;
+                                        } else {
+                                                print FILE $_;
+                                        }
+                                }
+                        }
+                } else {
+                        print FILE $_;
+                }
+        }
+        if ($dups > 0) {
+                print "$file: removed $dups duplicate includes\n";
+        }
        close(FILE);
 }
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 3baaaecd6b13..9960d1c303f8 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -38,14 +38,14 @@ static int conf_cnt;
 static char line[128];
 static struct menu *rootEntry;
-static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n");
+static void print_help(struct menu *menu)
-static const char *get_help(struct menu *menu)
 {
-        if (menu_has_help(menu))
+        struct gstr help = str_new();
-                return _(menu_get_help(menu));
-        else
+        menu_get_ext_help(menu, &help);
-                return nohelp_text;
+        printf("\n%s\n", str_get(&help));
+        str_free(&help);
 }
 static void strip(char *str)
@@ -121,7 +121,7 @@ static int conf_askvalue(struct symbol *sym, const char *def)
        return 1;
 }
-int conf_string(struct menu *menu)
+static int conf_string(struct menu *menu)
 {
        struct symbol *sym = menu->sym;
        const char *def;
@@ -140,7 +140,7 @@ int conf_string(struct menu *menu)
                case '?':
                        /* print help */
                        if (line[1] == '\n') {
-                                printf("\n%s\n", get_help(menu));
+                                print_help(menu);
                                def = NULL;
                                break;
                        }
@@ -220,7 +220,7 @@ static int conf_sym(struct menu *menu)
                if (sym_set_tristate_value(sym, newval))
                        return 0;
 help:
-                printf("\n%s\n", get_help(menu));
+                print_help(menu);
        }
 }
@@ -307,7 +307,7 @@ static int conf_choice(struct menu *menu)
                        fgets(line, 128, stdin);
                        strip(line);
                        if (line[0] == '?') {
-                                printf("\n%s\n", get_help(menu));
+                                print_help(menu);
                                continue;
                        }
                        if (!line[0])
@@ -331,7 +331,7 @@ static int conf_choice(struct menu *menu)
                if (!child)
                        continue;
                if (line[strlen(line) - 1] == '?') {
-                        printf("\n%s\n", get_help(child));
+                        print_help(child);
                        continue;
                }
                sym_set_choice_value(sym, child->sym);
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index a04da3459f0f..b55e72ff2fc6 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -560,7 +560,7 @@ int conf_write(const char *name)
        return 0;
 }
-int conf_split_config(void)
+static int conf_split_config(void)
 {
        const char *name;
        char path[128];
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index 579ece4fa584..edd3f39a080a 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -348,7 +348,7 @@ struct expr *expr_trans_bool(struct expr *e)
 /*
 * e1 || e2 -> ?
 */
-struct expr *expr_join_or(struct expr *e1, struct expr *e2)
+static struct expr *expr_join_or(struct expr *e1, struct expr *e2)
 {
        struct expr *tmp;
        struct symbol *sym1, *sym2;
@@ -412,7 +412,7 @@ struct expr *expr_join_or(struct expr *e1, struct expr *e2)
        return NULL;
 }
-struct expr *expr_join_and(struct expr *e1, struct expr *e2)
+static struct expr *expr_join_and(struct expr *e1, struct expr *e2)
 {
        struct expr *tmp;
        struct symbol *sym1, *sym2;
@@ -1098,6 +1098,8 @@ void expr_fprint(struct expr *e, FILE *out)
 static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *str)
 {
        str_append((struct gstr*)data, str);
+        if (sym)
+                str_printf((struct gstr*)data, " [=%s]", sym_get_string_value(sym));
 }
 void expr_gstr_print(struct expr *e, struct gstr *gs)
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 199b22bb49e2..65464366fe38 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -456,19 +456,9 @@ static void text_insert_help(struct menu *menu)
        GtkTextBuffer *buffer;
        GtkTextIter start, end;
        const char *prompt = _(menu_get_prompt(menu));
-        gchar *name;
+        struct gstr help = str_new();
-        const char *help;
-        help = menu_get_help(menu);
+        menu_get_ext_help(menu, &help);
-        /* Gettextize if the help text not empty */
-        if ((help != 0) && (help[0] != 0))
-                help = _(help);
-        if (menu->sym && menu->sym->name)
-                name = g_strdup_printf(menu->sym->name);
-        else
-                name = g_strdup("");
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w));
        gtk_text_buffer_get_bounds(buffer, &start, &end);
@@ -478,14 +468,11 @@ static void text_insert_help(struct menu *menu)
        gtk_text_buffer_get_end_iter(buffer, &end);
        gtk_text_buffer_insert_with_tags(buffer, &end, prompt, -1, tag1,
                                         NULL);
-        gtk_text_buffer_insert_at_cursor(buffer, " ", 1);
-        gtk_text_buffer_get_end_iter(buffer, &end);
-        gtk_text_buffer_insert_with_tags(buffer, &end, name, -1, tag1,
-                                         NULL);
        gtk_text_buffer_insert_at_cursor(buffer, "\n\n", 2);
        gtk_text_buffer_get_end_iter(buffer, &end);
-        gtk_text_buffer_insert_with_tags(buffer, &end, help, -1, tag2,
+        gtk_text_buffer_insert_with_tags(buffer, &end, str_get(&help), -1, tag2,
                                         NULL);
+        str_free(&help);
 }
diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade
index 803233fdd6dd..b1c86c19292c 100644
--- a/scripts/kconfig/gconf.glade
+++ b/scripts/kconfig/gconf.glade
@@ -547,7 +547,7 @@
                  <property name="headers_visible">True</property>
                  <property name="rules_hint">False</property>
                  <property name="reorderable">False</property>
-                  <property name="enable_search">True</property>
+                  <property name="enable_search">False</property>
                  <signal name="cursor_changed" handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003 15:58:22 GMT"/>
                  <signal name="button_press_event" handler="on_treeview1_button_press_event" last_modification_time="Sun, 12 Jan 2003 16:03:52 GMT"/>
                  <signal name="key_press_event" handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003 16:11:44 GMT"/>
@@ -582,7 +582,7 @@
                      <property name="headers_visible">True</property>
                      <property name="rules_hint">False</property>
                      <property name="reorderable">False</property>
-                      <property name="enable_search">True</property>
+                      <property name="enable_search">False</property>
                      <signal name="cursor_changed" handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003 15:57:55 GMT"/>
                      <signal name="button_press_event" handler="on_treeview2_button_press_event" last_modification_time="Sun, 12 Jan 2003 15:57:58 GMT"/>
                      <signal name="key_press_event" handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003 15:58:01 GMT"/>
diff --git a/scripts/kconfig/kxgettext.c b/scripts/kconfig/kxgettext.c
index 8d9ce22b0fc5..dcc3fcc0cc9a 100644
--- a/scripts/kconfig/kxgettext.c
+++ b/scripts/kconfig/kxgettext.c
@@ -166,7 +166,7 @@ static int message__add(const char *msg, char *option, char *file, int lineno)
        return rc;
 }
-void menu_build_message_list(struct menu *menu)
+static void menu_build_message_list(struct menu *menu)
 {
        struct menu *child;
@@ -211,7 +211,7 @@ static void message__print_gettext_msgid_msgstr(struct message *self)
               "msgstr \"\"\n", self->msg);
 }
-void menu__xgettext(void)
+static void menu__xgettext(void)
 {
        struct message *m = message__list;
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index 8e69461313d1..ffeb532b2cff 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -17,6 +17,8 @@ P(menu_get_root_menu,struct menu *,(struct menu *menu));
 P(menu_get_parent_menu,struct menu *,(struct menu *menu));
 P(menu_has_help,bool,(struct menu *menu));
 P(menu_get_help,const char *,(struct menu *menu));
+P(get_symbol_str,void,(struct gstr *r, struct symbol *sym));
+P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help));
 /* symbol.c */
 P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]);
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 25b60bc117f7..d82953573588 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -199,8 +199,6 @@ inputbox_instructions_string[] = N_(
 setmod_text[] = N_(
        "This feature depends on another which has been configured as a module.\n"
        "As a result, this feature will be built as a module."),
-nohelp_text[] = N_(
-        "There is no help available for this kernel option.\n"),
 load_config_text[] = N_(
        "Enter the name of the configuration file you wish to load.  "
        "Accept the name shown to restore the configuration you "
@@ -284,66 +282,6 @@ static void show_textbox(const char *title, const char *text, int r, int c);
 static void show_helptext(const char *title, const char *text);
 static void show_help(struct menu *menu);
-static void get_prompt_str(struct gstr *r, struct property *prop)
-{
-        int i, j;
-        struct menu *submenu[8], *menu;
-        str_printf(r, _("Prompt: %s\n"), _(prop->text));
-        str_printf(r, _("  Defined at %s:%d\n"), prop->menu->file->name,
-                prop->menu->lineno);
-        if (!expr_is_yes(prop->visible.expr)) {
-                str_append(r, _("  Depends on: "));
-                expr_gstr_print(prop->visible.expr, r);
-                str_append(r, "\n");
-        }
-        menu = prop->menu->parent;
-        for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent)
-                submenu[i++] = menu;
-        if (i > 0) {
-                str_printf(r, _("  Location:\n"));
-                for (j = 4; --i >= 0; j += 2) {
-                        menu = submenu[i];
-                        str_printf(r, "%*c-> %s", j, ' ', _(menu_get_prompt(menu)));
-                        if (menu->sym) {
-                                str_printf(r, " (%s [=%s])", menu->sym->name ?
-                                        menu->sym->name : _("<choice>"),
-                                        sym_get_string_value(menu->sym));
-                        }
-                        str_append(r, "\n");
-                }
-        }
-}
-static void get_symbol_str(struct gstr *r, struct symbol *sym)
-{
-        bool hit;
-        struct property *prop;
-        if (sym && sym->name)
-                str_printf(r, "Symbol: %s [=%s]\n", sym->name,
-                                                    sym_get_string_value(sym));
-        for_all_prompts(sym, prop)
-                get_prompt_str(r, prop);
-        hit = false;
-        for_all_properties(sym, prop, P_SELECT) {
-                if (!hit) {
-                        str_append(r, "  Selects: ");
-                        hit = true;
-                } else
-                        str_printf(r, " && ");
-                expr_gstr_print(prop->expr, r);
-        }
-        if (hit)
-                str_append(r, "\n");
-        if (sym->rev_dep.expr) {
-                str_append(r, _("  Selected by: "));
-                expr_gstr_print(sym->rev_dep.expr, r);
-                str_append(r, "\n");
-        }
-        str_append(r, "\n\n");
-}
 static struct gstr get_relations_str(struct symbol **sym_arr)
 {
        struct symbol *sym;
@@ -699,19 +637,9 @@ static void show_helptext(const char *title, const char *text)
 static void show_help(struct menu *menu)
 {
        struct gstr help = str_new();
-        struct symbol *sym = menu->sym;
+        menu_get_ext_help(menu, &help);
-        if (menu_has_help(menu))
-        {
-                if (sym->name) {
-                        str_printf(&help, "CONFIG_%s:\n\n", sym->name);
-                        str_append(&help, _(menu_get_help(menu)));
-                        str_append(&help, "\n");
-                }
-        } else {
-                str_append(&help, nohelp_text);
-        }
-        get_symbol_str(&help, sym);
        show_helptext(_(menu_get_prompt(menu)), str_get(&help));
        str_free(&help);
 }
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 07ff8d105c9d..059a2465c574 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -9,6 +9,9 @@
 #define LKC_DIRECT_LINK
 #include "lkc.h"
+static const char nohelp_text[] = N_(
+        "There is no help available for this kernel option.\n");
 struct menu rootmenu;
 static struct menu **last_entry_ptr;
@@ -74,7 +77,7 @@ void menu_end_menu(void)
        current_menu = current_menu->parent;
 }
-struct expr *menu_check_dep(struct expr *e)
+static struct expr *menu_check_dep(struct expr *e)
 {
        if (!e)
                return e;
@@ -184,7 +187,7 @@ static int menu_range_valid_sym(struct symbol *sym, struct symbol *sym2)
               (sym2->type == S_UNKNOWN && sym_string_valid(sym, sym2->name));
 }
-void sym_check_prop(struct symbol *sym)
+static void sym_check_prop(struct symbol *sym)
 {
        struct property *prop;
        struct symbol *sym2;
@@ -451,3 +454,80 @@ const char *menu_get_help(struct menu *menu)
        else
                return "";
 }
+static void get_prompt_str(struct gstr *r, struct property *prop)
+{
+        int i, j;
+        struct menu *submenu[8], *menu;
+        str_printf(r, _("Prompt: %s\n"), _(prop->text));
+        str_printf(r, _("  Defined at %s:%d\n"), prop->menu->file->name,
+                prop->menu->lineno);
+        if (!expr_is_yes(prop->visible.expr)) {
+                str_append(r, _("  Depends on: "));
+                expr_gstr_print(prop->visible.expr, r);
+                str_append(r, "\n");
+        }
+        menu = prop->menu->parent;
+        for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent)
+                submenu[i++] = menu;
+        if (i > 0) {
+                str_printf(r, _("  Location:\n"));
+                for (j = 4; --i >= 0; j += 2) {
+                        menu = submenu[i];
+                        str_printf(r, "%*c-> %s", j, ' ', _(menu_get_prompt(menu)));
+                        if (menu->sym) {
+                                str_printf(r, " (%s [=%s])", menu->sym->name ?
+                                        menu->sym->name : _("<choice>"),
+                                        sym_get_string_value(menu->sym));
+                        }
+                        str_append(r, "\n");
+                }
+        }
+}
+void get_symbol_str(struct gstr *r, struct symbol *sym)
+{
+        bool hit;
+        struct property *prop;
+        if (sym && sym->name)
+                str_printf(r, "Symbol: %s [=%s]\n", sym->name,
+                           sym_get_string_value(sym));
+        for_all_prompts(sym, prop)
+                get_prompt_str(r, prop);
+        hit = false;
+        for_all_properties(sym, prop, P_SELECT) {
+                if (!hit) {
+                        str_append(r, "  Selects: ");
+                        hit = true;
+                } else
+                        str_printf(r, " && ");
+                expr_gstr_print(prop->expr, r);
+        }
+        if (hit)
+                str_append(r, "\n");
+        if (sym->rev_dep.expr) {
+                str_append(r, _("  Selected by: "));
+                expr_gstr_print(sym->rev_dep.expr, r);
+                str_append(r, "\n");
+        }
+        str_append(r, "\n\n");
+}
+void menu_get_ext_help(struct menu *menu, struct gstr *help)
+{
+        struct symbol *sym = menu->sym;
+        if (menu_has_help(menu)) {
+                if (sym->name) {
+                        str_printf(help, "CONFIG_%s:\n\n", sym->name);
+                        str_append(help, _(menu_get_help(menu)));
+                        str_append(help, "\n");
+                }
+        } else {
+                str_append(help, nohelp_text);
+        }
+        if (sym)
+                get_symbol_str(help, sym);
+}
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index ce7d508c7520..00c51507cfcc 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1042,12 +1042,10 @@ void ConfigInfoView::menuInfo(void)
                if (showDebug())
                        debug = debug_info(sym);
-                help = menu_get_help(menu);
+                struct gstr help_gstr = str_new();
-                /* Gettextize if the help text not empty */
+                menu_get_ext_help(menu, &help_gstr);
-                if (help.isEmpty())
+                help = print_filter(str_get(&help_gstr));
-                        help = print_filter(menu_get_help(menu));
+                str_free(&help_gstr);
-                else
-                        help = print_filter(_(menu_get_help(menu)));
        } else if (menu->prompt) {
                head += "<big><b>";
                head += print_filter(_(menu->prompt->text));
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 18f3e5c33634..6c8fbbb66ebc 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -36,7 +36,7 @@ tristate modules_val;
 struct expr *sym_env_list;
-void sym_add_default(struct symbol *sym, const char *def)
+static void sym_add_default(struct symbol *sym, const char *def)
 {
        struct property *prop = prop_alloc(P_DEFAULT, sym);
@@ -125,7 +125,7 @@ struct property *sym_get_default_prop(struct symbol *sym)
        return NULL;
 }
-struct property *sym_get_range_prop(struct symbol *sym)
+static struct property *sym_get_range_prop(struct symbol *sym)
 {
        struct property *prop;
@@ -943,7 +943,7 @@ const char *prop_get_type_name(enum prop_type type)
        return "unknown";
 }
-void prop_add_env(const char *env)
+static void prop_add_env(const char *env)
 {
        struct symbol *sym, *sym2;
        struct property *prop;
diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl
index 89774011965d..5f0fcb712e29 100644
--- a/scripts/markup_oops.pl
+++ b/scripts/markup_oops.pl
@@ -184,10 +184,7 @@ if ($target eq "0") {
 # if it's a module, we need to find the .ko file and calculate a load offset
 if ($module ne "") {
-        my $dir = dirname($filename);
+        my $modulefile = `modinfo $module | grep '^filename:' | awk '{ print \$2 }'`;
-        $dir = $dir . "/";
-        my $mod = $module . ".ko";
-        my $modulefile = `find $dir -name $mod | head -1`;
        chomp($modulefile);
        $filename = $modulefile;
        if ($filename eq "") {
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 4a34ec591e8c..d52f7a01557c 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -101,7 +101,8 @@ exuberant()
        -I ____cacheline_aligned_in_smp                         \
        -I ____cacheline_internodealigned_in_smp                \
        -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL                      \
-        --extra=+f --c-kinds=+px                                \
+        -I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \
+        --extra=+f --c-kinds=-px                                \
        --regex-asm='/^ENTRY\(([^)]*)\).*/\1/'                  \
        --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/'
diff --git a/security/keys/gc.c b/security/keys/gc.c
index 485fc6233c38..4770be375ffe 100644
--- a/security/keys/gc.c
+++ b/security/keys/gc.c
@@ -169,9 +169,9 @@ static void key_garbage_collector(struct work_struct *work)
        /* trawl through the keys looking for keyrings */
        for (;;) {
-                if (key->expiry > now && key->expiry < new_timer) {
+                if (key->expiry > limit && key->expiry < new_timer) {
                        kdebug("will expire %x in %ld",
-                               key_serial(key), key->expiry - now);
+                               key_serial(key), key->expiry - limit);
                        new_timer = key->expiry;
                }
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 1ed0f076aadc..b4b5da1c0a42 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -868,8 +868,19 @@ u32 avc_policy_seqno(void)
 void avc_disable(void)
 {
-        avc_flush();
+        /*
-        synchronize_rcu();
+         * If you are looking at this because you have realized that we are
-        if (avc_node_cachep)
+         * not destroying the avc_node_cachep it might be easy to fix, but
-                kmem_cache_destroy(avc_node_cachep);
+         * I don't know the memory barrier semantics well enough to know.  It's
+         * possible that some other task dereferenced security_ops when
+         * it still pointed to selinux operations.  If that is the case it's
+         * possible that it is about to use the avc and is about to need the
+         * avc_node_cachep.  I know I could wrap the security.c security_ops call
+         * in an rcu_lock, but seriously, it's not worth it.  Instead I just flush
+         * the cache and get that memory back.
+         */
+        if (avc_node_cachep) {
+                avc_flush();
+                /* kmem_cache_destroy(avc_node_cachep); */
+        }
 }
diff --git a/usr/.gitignore b/usr/.gitignore
index 69b2e89fa165..8e48117a3f3d 100644
--- a/usr/.gitignore
+++ b/usr/.gitignore
@@ -4,5 +4,7 @@
 gen_init_cpio
 initramfs_data.cpio
 initramfs_data.cpio.gz
+initramfs_data.cpio.bz2
+initramfs_data.cpio.lzma
 initramfs_list
 include
diff --git a/usr/Makefile b/usr/Makefile
index 245145a99c10..1e6a9e4a72cc 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -6,7 +6,7 @@ klibcdirs:;
 PHONY += klibcdirs
-# Gzip, but no bzip2
+# Gzip
 suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP)   = .gz
 # Bzip2